更新到1280

2026-03-09 16:32:19 +08:00 · 2026-03-09 16:32:19 +08:00 · 6a8553906f
parent a67703d6b3
commit 6a8553906f
10 changed files with 84 additions and 55 deletions
--- a/assets/Scene/GameScene.fire
+++ b/assets/Scene/GameScene.fire
@ -4259,8 +4259,8 @@
      "__type__": "TypedArray",
      "ctor": "Float64Array",
      "array": [
-        18.985,
-        3.454,
+        15,
+        3.54,
        0,
        0,
        0,
@ -6288,8 +6288,8 @@
      "__type__": "TypedArray",
      "ctor": "Float64Array",
      "array": [
-        18.985,
-        3.454,
+        15,
+        3.54,
        0,
        0,
        0,
@ -7105,8 +7105,8 @@
      "__type__": "TypedArray",
      "ctor": "Float64Array",
      "array": [
-        18.985,
-        3.454,
+        15,
+        3.54,
        0,
        0,
        0,
--- a/assets/Script/Block.ts
+++ b/assets/Script/Block.ts
@ -953,6 +953,7 @@ export default class Block extends cc.Component {

        MapConroler._instance.judgeWin(0);
        MapConroler._instance.propCanbeUse = false; //是否能使用道具
+        this.moveFlower();

        setTimeout(() => {
            let tempColor = this.color;
@ -964,7 +965,6 @@ export default class Block extends cc.Component {
            MapConroler._instance.nextLevel(1);
            let colorTemp = this.color;
            if (this.node) {
-                this.moveFlower();
                this.over = true;
                this.node.active = false;
                this.node.removeFromParent();
@ -1314,6 +1314,10 @@ export default class Block extends cc.Component {
        else if (this.type == BlockType.加时间块 && this.block_Info.addTime) {
            MapConroler._instance.addTime(this.block_Info.addTime);
        }
+
+        if (this.node) {
+            this.moveFlower();
+        }
        this.scheduleCallback2 = setTimeout(() => {
            MapConroler._instance.blockNum -= 1;
            MapConroler._instance.special_Treatment(this.node, type, false);
@ -1353,7 +1357,6 @@ export default class Block extends cc.Component {
            MapConroler._instance.nextLevel(0);
            let colorTemp = this.color;
            if (this.node) {
-                this.moveFlower();
                this.over = true;
                this.node.active = false;
                this.node.removeFromParent();
@ -1477,6 +1480,11 @@ export default class Block extends cc.Component {
        else if (this.type == BlockType.加时间块 && this.block_Info.addTime) {
            MapConroler._instance.addTime(this.block_Info.addTime);
        }
+
+        if (this.node) {
+            this.moveFlower();
+        }
+
        this.scheduleCallback2 = setTimeout(() => {

            //如果方块可以消除
@ -1515,7 +1523,7 @@ export default class Block extends cc.Component {

            MapConroler._instance.nextLevel(0);
            if (this.node) {
-                this.moveFlower();
+                // this.moveFlower();
                this.over = true;
                this.node.active = false;
                this.node.removeFromParent();
--- a/assets/Script/GameManager.ts
+++ b/assets/Script/GameManager.ts
@ -271,8 +271,17 @@ export default class GameManager extends cc.Component {
                        }

                        if (data.data.register_time) {
+                            const timestamp2 = Date.now();
                            cc.fx.GameConfig.GM_INFO.firstTime = data.data.register_time;
                            console.log("注册时间:", cc.fx.GameConfig.GM_INFO.firstTime);
+                            if (data.register_time) {
+                                console.log("是否是服务器中的新用户", data.isFirst, "发送setOnce");
+                                let time = data.register_time;
+                                if (time == undefined || time == null) {
+                                    time = timestamp2;
+                                }
+                                MiniGameSdk.API.shushu_userSet(time);
+                            }
                        }

                        if (data.data.task) {
@ -492,17 +501,9 @@ export default class GameManager extends cc.Component {
                // 新用户，走一遍 track注册事件
                this.setFirstInfo();
            }
-            else {
-            }
+
            //无论是不是新用户，以防新用户第一次退出了 没有isFirst但是没发送setonce注册，统一走一遍
-            if (data.register_time) {
-                console.log("是否是服务器中的新用户", data.isFirst, "发送setOnce");
-                let time = data.register_time;
-                if (time == undefined || time == null) {
-                    time = timestamp;
-                }
-                MiniGameSdk.API.shushu_userSet(time);
-            }
+
            this.load3 = true;
            this.load4 = true;
            if (data.levelAmount == null || data.levelAmount == undefined) {
@ -676,7 +677,6 @@ export default class GameManager extends cc.Component {
        // console.log("注册时间:", time);
        cc.fx.GameTool.shushu_Track("register", data);
        MiniGameSdk.API.shushu_SetSuperProperties(time, false);
-
    }
    /** 主循环，判断是否各项加载完成进入游戏 */
    update(dt) {
--- a/assets/Script/Map.ts
+++ b/assets/Script/Map.ts
@ -2369,7 +2369,7 @@ export default class MapConroler extends cc.Component {
                }
            }
        }
-
+        console.log("__________特殊处理，处理减1");
        let questionBlock = this.node.children.filter(child => {
            if (child.getComponent("Block")) {
                if (child.getComponent("Block").type == 16)
@ -3087,25 +3087,25 @@ export default class MapConroler extends cc.Component {
        }
    }

-    runReviveAndCheck(data): boolean {
-        let retryCount = 0;
+    // runReviveAndCheck(data): boolean {
+    //     let retryCount = 0;

-        while (retryCount < this.MAX_RETRY_COUNT) {
-            this.runChangeState(data);  // 执行复活操作
+    //     while (retryCount < this.MAX_RETRY_COUNT) {
+    //         this.runChangeState(data);  // 执行复活操作

-            if (this.predict_End()) {
-                return true;  // 成功，继续往下执行
-            }
+    //         if (this.predict_End()) {
+    //             return true;  // 成功，继续往下执行
+    //         }

-            retryCount++;
-        }
+    //         retryCount++;
+    //     }

-        MiniGameSdk.API.showToast("复活失败!!!!!!! 5次循环依然失败");
-        setTimeout(() => {
-            MiniGameSdk.API.showToast("复活失败!!!!!!! 5次循环依然失败");
-        }, 2000);
-        return false;
-    }
+    //     MiniGameSdk.API.showToast("复活失败!!!!!!! 5次循环依然失败");
+    //     setTimeout(() => {
+    //         MiniGameSdk.API.showToast("复活失败!!!!!!! 5次循环依然失败");
+    //     }, 2000);
+    //     return false;
+    // }

    //执行复活函数
    runRewive(data) {
@ -3122,11 +3122,11 @@ export default class MapConroler extends cc.Component {

        MiniGameSdk.API.showToast("继续游戏");

-        const success = this.runReviveAndCheck(data);  // 👈 接收返回值
+        // const success = this.runReviveAndCheck(data);  // 👈 接收返回值

-        if (!success) {
-            return;  // 复活失败，停止后续执行
-        }
+        // if (!success) {
+        //     return;  // 复活失败，停止后续执行
+        // }


        if (this.node.parent.getChildByName("Ice").active) {
--- a/assets/Script/module/Tool/GameTool.ts
+++ b/assets/Script/module/Tool/GameTool.ts
@ -820,7 +820,6 @@ var GameTool = {
    // 检查是否有足够的硬币
    consumeCoins(requiredCoins: number, propName: string, amount: number, callback) {

-
    },

    // 设置用户信息
--- a/assets/Script/prop/Question.ts
+++ b/assets/Script/prop/Question.ts
@ -44,6 +44,7 @@ export default class Question extends cc.Component {
    reduce(number) {
        if (this.node.parent) {
            if (this.node.parent.getComponent("Block").block_Info.floor) {
+                console.log("__________问号块，减少时，还在地板下面");
                return;
            }
        }
--- a/assets/custom/Json/level1261.json
+++ b/assets/custom/Json/level1261.json
@ -263,6 +263,7 @@
          "z": 0
        },
        "questionTime": 13,
+        "vertical": true,
        "id": 350
      },
      {
@ -275,6 +276,7 @@
          "z": 0
        },
        "questionTime": 16,
+        "vertical": true,
        "id": 360
      },
      {
@ -287,6 +289,7 @@
          "z": 0
        },
        "questionTime": 7,
+        "horizontal": true,
        "id": 370
      },
      {
@ -299,6 +302,7 @@
          "z": 0
        },
        "questionTime": 10,
+        "horizontal": true,
        "id": 380
      },
      {
--- a/assets/custom/Json/level1262.json
+++ b/assets/custom/Json/level1262.json
@ -220,6 +220,7 @@
          "z": 0
        },
        "questionTime": 9,
+        "horizontal": true,
        "id": 340
      },
      {
--- a/assets/custom/Json/level1264.json
+++ b/assets/custom/Json/level1264.json
@ -198,20 +198,6 @@
        "questionTime": 6,
        "id": 340
      },
-      {
-        "block": 1,
-        "color": 7,
-        "type": 0,
-        "position": {
-          "x": 360,
-          "y": -240,
-          "z": 0
-        },
-        "floor": 1,
-        "floorTime": null,
-        "floorMove": false,
-        "id": 350
-      },
      {
        "block": 2,
        "color": 3,
@ -254,6 +240,20 @@
        "floorTime": 3,
        "floorMove": true,
        "id": 380
+      },
+      {
+        "block": 1,
+        "color": 7,
+        "type": 0,
+        "position": {
+          "x": 360,
+          "y": -240,
+          "z": 0
+        },
+        "floor": 1,
+        "floorTime": 7,
+        "floorMove": false,
+        "id": 420
      }
    ]
  ],
--- a/assets/custom/Json/level1276.json
+++ b/assets/custom/Json/level1276.json
@ -193,6 +193,22 @@
  ],
  "WALL_INFO": [
    [
+      {
+        "id": 1231,
+        "num": 9,
+        "color": 5,
+        "special": 3,
+        "length": 2,
+        "freeze": 10
+      },
+      {
+        "id": 1232,
+        "num": 11,
+        "color": 5,
+        "special": 3,
+        "length": 0,
+        "freeze": 10
+      },
      {
        "id": 1233,
        "num": 17,