From a08820a4c98e231e5d152deb082bd8b0516bdaeb Mon Sep 17 00:00:00 2001
From: "COMPUTER\\EDY" <249929363@qq.com>
Date: Thu, 12 Feb 2026 17:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/Script/Wall.ts                 |  4 ++--
 assets/Script/module/Pay/Utils.ts     |  6 ++++++
 assets/Script/module/Tool/GameTool.ts | 19 ++++++-------------
 assets/custom/Json/level1122.json     |  2 +-
 assets/custom/Json/level1158.json     | 18 +++++++++++-------
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/assets/Script/Wall.ts b/assets/Script/Wall.ts
index 707872f..2a68d31 100644
--- a/assets/Script/Wall.ts
+++ b/assets/Script/Wall.ts
@@ -202,14 +202,15 @@ export default class Wall extends cc.Component {
             this.length = this.wall_Info.length;
             let name2 = "rotate" + this.wall_Info.length;
             this.revolvingNode = this.node.parent.getChildByName("revolving").getChildByName(name2);
+            //跳跃门
             if (this.wall_Info.jump != undefined) {
                 this.jumpInit();
             }
             else {
                 this.jump = null;
             }
-            //跳跃门
 
+            //变色门
             if (this.wall_Info.colorArray) {
                 this.colorArray = this.wall_Info.colorArray.split('').map(char => parseInt(char) + 1);
                 this.colorStartArray = this.wall_Info.colorArray.split('').map(char => parseInt(char) + 1);
@@ -283,7 +284,6 @@ export default class Wall extends cc.Component {
 
     //创建特殊类型门
     initType() {
-
         switch (this.special) {
             case WallSpecial.星星门:
                 let star = cc.instantiate(MapConroler._instance.Block_Prop[this.special]);
diff --git a/assets/Script/module/Pay/Utils.ts b/assets/Script/module/Pay/Utils.ts
index 7c93b4f..63e969b 100644
--- a/assets/Script/module/Pay/Utils.ts
+++ b/assets/Script/module/Pay/Utils.ts
@@ -17,6 +17,7 @@ export default class Utils {
             wx.login({
                 success(res) {
                     console.log("微信login成功");
+                    let restart = 0;
                     //console.log(res.code);
                     if (res.code) {
                         // 标志位，用于记录 callBack 是否已经被调用
@@ -47,6 +48,11 @@ export default class Utils {
                             });
                             // 如果回调未调用，6 秒后再次请求
                             if (!isCallBackCalled) {
+                                restart++;
+                                if (restart > 5) {
+                                    console.log("登录失败，重试次数超过5次");
+                                    cc.fx.GameTool.trackErrorToShushu({ message: "登录失败，重试次数超过5次" })
+                                }
                                 setTimeout(pollLogin, 6000);
                             }
                         };
diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts
index 0f79911..4174d5a 100644
--- a/assets/Script/module/Tool/GameTool.ts
+++ b/assets/Script/module/Tool/GameTool.ts
@@ -450,8 +450,8 @@ var GameTool = {
     //关卡上限
     maxLevel() {
         let jg = false;
-        if (cc.fx.GameConfig.GM_INFO.level > 1199) {
-            cc.fx.GameConfig.GM_INFO.level = 1200;
+        if (cc.fx.GameConfig.GM_INFO.level > 1169) {
+            cc.fx.GameConfig.GM_INFO.level = 1170;
             jg = true;
         }
         return jg;
@@ -2094,6 +2094,7 @@ var GameTool = {
     },
 
     trackErrorToShushu(error: any) {
+        // console.log("进入报错系统", error);
         if (error == null) {
             return;
         }
@@ -2125,17 +2126,8 @@ var GameTool = {
         else if (error.message.includes("null is not an object(evaluating 'n.setPosition')")) {
             return;
         }
-        else if (error.message.includes("")) {
-            return;
-        }
-        else if (error.message.includes("")) {
-            return;
-        }
-        else if (error.message.includes("")) {
-            return;
-        }
 
-        console.log("_____________________上报错误");
+
         if (!cc.fx.GameConfig.GM_INFO.error_message.includes(error.message)) {
             cc.fx.GameConfig.GM_INFO.error_message.push(error.message);
         }
@@ -2143,8 +2135,9 @@ var GameTool = {
             console.log("_____________________上报结束，关闭重复");
             //@ts-ignore
             wx.offError();
+            return;
         }
-
+        // console.log("_____________________上报错误", error);
         let errorData = {
             error_type: "javascript",
             error_message: error.message,
diff --git a/assets/custom/Json/level1122.json b/assets/custom/Json/level1122.json
index 67ab0b5..9656189 100644
--- a/assets/custom/Json/level1122.json
+++ b/assets/custom/Json/level1122.json
@@ -169,7 +169,7 @@
           "y": -120,
           "z": 0
         },
-        "stacking": 5,
+        "stacking": 4,
         "colorChange": true,
         "id": 310
       },
diff --git a/assets/custom/Json/level1158.json b/assets/custom/Json/level1158.json
index 0b620e3..175da6d 100644
--- a/assets/custom/Json/level1158.json
+++ b/assets/custom/Json/level1158.json
@@ -197,7 +197,7 @@
         "floor": 1,
         "floorTime": 7,
         "floorMove": true,
-        "id": 330
+        "id": 370
       },
       {
         "block": 0,
@@ -209,36 +209,40 @@
           "z": 0
         },
         "adhesiveTime": 1,
-        "id": 340
+        "floor": 1,
+        "floorTime": 7,
+        "floorMove": true,
+        "id": 380
       },
       {
         "block": 0,
         "color": 2,
-        "type": 0,
+        "type": 9,
         "position": {
           "x": 120,
           "y": -120,
           "z": 0
         },
+        "adhesiveTime": 2,
         "floor": 2,
         "floorTime": 2,
         "floorMove": true,
-        "id": 350
+        "id": 370
       },
       {
         "block": 0,
         "color": 4,
-        "type": 16,
+        "type": 9,
         "position": {
           "x": 0,
           "y": -120,
           "z": 0
         },
-        "questionTime": 5,
+        "adhesiveTime": 1,
         "floor": 2,
         "floorTime": 2,
         "floorMove": true,
-        "id": 360
+        "id": 380
       }
     ]
   ],