暂存
This commit is contained in:
parent
77e60e648c
commit
414725cb21
|
|
@ -417,7 +417,7 @@ export default class Block extends cc.Component {
|
|||
this.setMapBlock();
|
||||
this.level = 50 + this.posX - this.posY * 3;
|
||||
if (this.type != BlockType.单色地块) this.node.zIndex = this.level;
|
||||
else this.node.zIndex = 1000;
|
||||
// else this.node.zIndex = 1000;
|
||||
this.node.x = mapInfo[i].x + 65;
|
||||
this.node.y = mapInfo[i].y - 60;
|
||||
this.startPos = this.node.position;
|
||||
|
|
@ -1086,7 +1086,7 @@ export default class Block extends cc.Component {
|
|||
this.setMapBlock();
|
||||
this.level = 50 + this.posX - this.posY * 3;
|
||||
if (this.type != BlockType.单色地块) this.node.zIndex = this.level;
|
||||
else this.node.zIndex = 1000;
|
||||
// else this.node.zIndex = 1000;
|
||||
//console.log("方块层级", this.node.zIndex);
|
||||
this.node.x = mapBlock.x + 65;
|
||||
this.node.y = mapBlock.y - 60;
|
||||
|
|
@ -1513,7 +1513,7 @@ export default class Block extends cc.Component {
|
|||
else
|
||||
cc.fx.AudioManager._instance.playEffect("hit", null);
|
||||
if (this.type != BlockType.单色地块) this.node.zIndex = 200;
|
||||
else this.node.zIndex = 1000;
|
||||
// else this.node.zIndex = 1000;
|
||||
|
||||
if (this.type == 9) {
|
||||
if (this.block_Info.node) {
|
||||
|
|
@ -1677,7 +1677,7 @@ export default class Block extends cc.Component {
|
|||
MapConroler._instance.removeOneBlock();
|
||||
this.isTouch = false;
|
||||
if (this.type != BlockType.单色地块) this.node.zIndex = this.level;
|
||||
else this.node.zIndex = 1000;
|
||||
// else this.node.zIndex = 1000;
|
||||
this.hit.active = false;
|
||||
let otherBlocks = null;
|
||||
if (this.type == 9) {
|
||||
|
|
@ -1758,7 +1758,7 @@ export default class Block extends cc.Component {
|
|||
MapConroler._instance.removeOneBlock();
|
||||
this.isTouch = false;
|
||||
if (this.type != BlockType.单色地块) this.node.zIndex = this.level;
|
||||
else this.node.zIndex = 1000;
|
||||
// else this.node.zIndex = 1000;
|
||||
this.hit.active = false;
|
||||
if (this.type == 9) {
|
||||
if (this.block_Info.node) {
|
||||
|
|
|
|||
|
|
@ -4948,6 +4948,19 @@ export default class MapConroler extends cc.Component {
|
|||
// MiniGameSdk.API.showToast("魔法棒数量不足,自动购买魔法棒");
|
||||
}
|
||||
else {
|
||||
if (cc.fx.GameConfig.GM_INFO.otherLevel == 0) {
|
||||
if (cc.fx.GameConfig.GM_INFO.tasks.useProp.value < cc.fx.GameConfig.GM_INFO.tasks.useProp.target) {
|
||||
cc.fx.GameConfig.GM_INFO.tasks.useProp.value += 1;
|
||||
cc.fx.GameTool.setDailyQuestInfo();
|
||||
if (cc.fx.GameConfig.GM_INFO.tasks.useProp.value == cc.fx.GameConfig.GM_INFO.tasks.useProp.target) {
|
||||
let data = {
|
||||
id: 3,
|
||||
status: "complete"
|
||||
}
|
||||
cc.fx.GameTool.shushu_Track("daily_task", data);
|
||||
}
|
||||
}
|
||||
}
|
||||
const timestamp = Date.now();
|
||||
cc.fx.GameConfig.GM_INFO.magicAmount -= 1;
|
||||
if (cc.fx.GameConfig.GM_INFO.magicAmount < 0)
|
||||
|
|
@ -4976,19 +4989,7 @@ export default class MapConroler extends cc.Component {
|
|||
//使用魔法棒随机消除两个方块
|
||||
runMagic() {
|
||||
let magicBtn = this.node.parent.getChildByName("Bottom").getChildByName("magicBtn");
|
||||
if (cc.fx.GameConfig.GM_INFO.otherLevel == 0) {
|
||||
if (cc.fx.GameConfig.GM_INFO.tasks.useProp.value < cc.fx.GameConfig.GM_INFO.tasks.useProp.target) {
|
||||
cc.fx.GameConfig.GM_INFO.tasks.useProp.value += 1;
|
||||
cc.fx.GameTool.setDailyQuestInfo();
|
||||
if (cc.fx.GameConfig.GM_INFO.tasks.useProp.value == cc.fx.GameConfig.GM_INFO.tasks.useProp.target) {
|
||||
let data = {
|
||||
id: 3,
|
||||
status: "complete"
|
||||
}
|
||||
cc.fx.GameTool.shushu_Track("daily_task", data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const timestamp = Date.now();
|
||||
this.magicMask.active = true;
|
||||
setTimeout(() => {
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
{
|
||||
"ver": "1.1.3",
|
||||
"uuid": "87056b96-7f04-4f1f-a3bb-a13a087d1ff5",
|
||||
"importer": "folder",
|
||||
"isBundle": false,
|
||||
"bundleName": "",
|
||||
"priority": 1,
|
||||
"compressionType": {},
|
||||
"optimizeHotUpdate": {},
|
||||
"inlineSpriteFrames": {},
|
||||
"isRemoteBundle": {},
|
||||
"subMetas": {}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user