diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts index ba6135f..76d8982 100644 --- a/assets/Script/Block.ts +++ b/assets/Script/Block.ts @@ -1977,7 +1977,7 @@ export default class Block extends cc.Component { this.scheduleCallback2 = setTimeout(() => { MapConroler._instance.blockNum -= 1; - MapConroler._instance.special_Treatment(this.node, type, false); + MapConroler._instance.special_Treatment(this.node, type, true); if (this.node) { this.moveFlower(); } @@ -2191,7 +2191,7 @@ export default class Block extends cc.Component { //如果方块可以消除 MapConroler._instance.blockNum -= 1; - MapConroler._instance.special_Treatment(this.node, true, false); + MapConroler._instance.special_Treatment(this.node, true, true); if (this.node) { this.moveFlower(); } diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 3642ed9..7e40e0c 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -2957,7 +2957,7 @@ export default class MapConroler extends cc.Component { if (freezeBlock.length > 0) { for (let i = 0; i < freezeBlock.length; i++) { if (freezeBlock[i]) - freezeBlock[i].getChildByName("freeze").getComponent("Freeze").reduce(1); + freezeBlock[i].getChildByName("freeze").getComponent("Freeze").reduce(1, prop); } } @@ -2989,7 +2989,7 @@ export default class MapConroler extends cc.Component { if (questionBlock.length > 0) { for (let i = 0; i < questionBlock.length; i++) { if (questionBlock[i]) - questionBlock[i].getChildByName("question").getComponent("Question").reduce(1); + questionBlock[i].getChildByName("question").getComponent("Question").reduce(1, prop); } } diff --git a/assets/Script/Sdk/MiniGameSdk.ts b/assets/Script/Sdk/MiniGameSdk.ts index b0c9281..37c0495 100644 --- a/assets/Script/Sdk/MiniGameSdk.ts +++ b/assets/Script/Sdk/MiniGameSdk.ts @@ -1618,9 +1618,9 @@ export namespace MiniGameSdk { current_level: (cc.fx.GameConfig.GM_INFO.level + 1), //当前关卡等级 number current_health: cc.fx.GameConfig.GM_INFO.hp, //当前体力值 tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币 - freeze_amount: cc.fx.GameConfig.GM_INFO.freeze_amount,//当前道具 - hammer_amount: cc.fx.GameConfig.GM_INFO.hammer_amount,//当前道具 - magic_amount: cc.fx.GameConfig.GM_INFO.magic_amount,//当前道具 + freeze_amount: cc.fx.GameConfig.GM_INFO.freezeAmount,//当前道具 + hammer_amount: cc.fx.GameConfig.GM_INFO.hammerAmount,//当前道具 + magic_amount: cc.fx.GameConfig.GM_INFO.magicAmount,//当前道具 version: cc.fx.GameConfig.GM_INFO.version.toString(),//当前版本号 user_id: cc.fx.GameConfig.GM_INFO.userId //用户id }; @@ -1630,9 +1630,9 @@ export namespace MiniGameSdk { current_level: (cc.fx.GameConfig.GM_INFO.level + 1), //当前关卡等级 number current_health: cc.fx.GameConfig.GM_INFO.hp, //当前体力值 tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币 - freeze_amount: cc.fx.GameConfig.GM_INFO.freeze_amount,//当前道具 - hammer_amount: cc.fx.GameConfig.GM_INFO.hammer_amount,//当前道具 - magic_amount: cc.fx.GameConfig.GM_INFO.magic_amount,//当前道具 + freeze_amount: cc.fx.GameConfig.GM_INFO.freezeAmount,//当前道具 + hammer_amount: cc.fx.GameConfig.GM_INFO.hammerAmount,//当前道具 + magic_amount: cc.fx.GameConfig.GM_INFO.magicAmount,//当前道具 version: cc.fx.GameConfig.GM_INFO.version.toString(), register_time: register_time, user_id: cc.fx.GameConfig.GM_INFO.userId, //用户id @@ -1646,16 +1646,16 @@ export namespace MiniGameSdk { current_level: (cc.fx.GameConfig.GM_INFO.level + 1), //当前关卡等级 number current_health: cc.fx.GameConfig.GM_INFO.hp, //当前体力值 tmp_coin: cc.fx.GameConfig.GM_INFO.coin,//当前金币 - freeze_amount: cc.fx.GameConfig.GM_INFO.freeze_amount,//当前道具 - hammer_amount: cc.fx.GameConfig.GM_INFO.hammer_amount,//当前道具 - magic_amount: cc.fx.GameConfig.GM_INFO.magic_amount,//当前道具 + freeze_amount: cc.fx.GameConfig.GM_INFO.freezeAmount,//当前道具 + hammer_amount: cc.fx.GameConfig.GM_INFO.hammerAmount,//当前道具 + magic_amount: cc.fx.GameConfig.GM_INFO.magicAmount,//当前道具 version: cc.fx.GameConfig.GM_INFO.version.toString(), user_id: cc.fx.GameConfig.GM_INFO.userId, //用户id pay_user: pay_user } } // @ts-ignore - // console.log("设置公共属性时:————————————", superProperties.uid); + console.log("设置公共属性时:————————————", superProperties); API._ta.setSuperProperties(superProperties);//设置公共事件属性 API.updateCoinAndLevel(); } diff --git a/assets/Script/prop/Freeze.ts b/assets/Script/prop/Freeze.ts index 9288408..85bd0a6 100644 --- a/assets/Script/prop/Freeze.ts +++ b/assets/Script/prop/Freeze.ts @@ -41,9 +41,9 @@ export default class Freeze extends cc.Component { } - reduce(number) { + reduce(number, type) { if (this.node.parent) { - if (this.node.parent.getComponent("Block").block_Info.floor) { + if (this.node.parent.getComponent("Block").block_Info.floor && type == false) { return; } } diff --git a/assets/Script/prop/Question.ts b/assets/Script/prop/Question.ts index f993df9..aa6f6f6 100644 --- a/assets/Script/prop/Question.ts +++ b/assets/Script/prop/Question.ts @@ -41,9 +41,9 @@ export default class Question extends cc.Component { } - reduce(number) { + reduce(number, type) { if (this.node.parent) { - if (this.node.parent.getComponent("Block").block_Info.floor) { + if (this.node.parent.getComponent("Block").block_Info.floor && type == false) { console.log("__________问号块，减少时，还在地板下面"); return; } diff --git a/assets/Script/prop/Switchs.ts b/assets/Script/prop/Switchs.ts index ce02ba2..cb6ecf6 100644 --- a/assets/Script/prop/Switchs.ts +++ b/assets/Script/prop/Switchs.ts @@ -13,7 +13,7 @@ const { ccclass, property } = cc._decorator; @ccclass -export default class Question extends cc.Component { +export default class Switchs extends cc.Component { static _instance: any; time: number = 60;