From 40799f73b2352e285028e5868c73136a38b26704 Mon Sep 17 00:00:00 2001
From: "COMPUTER\\EDY" <249929363@qq.com>
Date: Wed, 17 Dec 2025 15:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E6=8F=90=E5=89=8D?=
 =?UTF-8?q?=E5=88=A4=E8=BE=93=E6=B8=B8=E6=88=8F=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/Script/Block.ts | 15 ++++++++++++---
 assets/Script/Map.ts   | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts
index 57641b6..9a96c2d 100644
--- a/assets/Script/Block.ts
+++ b/assets/Script/Block.ts
@@ -765,12 +765,15 @@ export default class Block extends cc.Component {
             this.node.removeFromParent();
             setTimeout(() => {
                 if (MapConroler._instance.blockNum != 0 && (MapConroler._instance.openWall.length > 0 ||
-                    MapConroler._instance.revolving_state != 0)
+                    MapConroler._instance.revolving_state != 0 || MapConroler._instance.longAndShortWall.length > 0)
                     && !MapConroler._instance.gameOver && !MapConroler._instance.gameWin) {
                     let gameover = MapConroler._instance.predict_End(colorTemp);
                     if (gameover == false) {
                         if (MapConroler._instance.revolving_state == 0)
                             MapConroler._instance.failLevel("lock");
+                        else if (MapConroler._instance.longAndShortWall.length > 0) {
+                            console.log("长墙和短墙无法通过");
+                        }
                         else
                             MapConroler._instance.failLevel("rotate");
                     }
@@ -1060,12 +1063,15 @@ export default class Block extends cc.Component {
             MapConroler._instance.checkColor(colorTemp, true);
             setTimeout(() => {
                 if (MapConroler._instance.blockNum != 0 && (MapConroler._instance.openWall.length > 0 ||
-                    MapConroler._instance.revolving_state != 0)
+                    MapConroler._instance.revolving_state != 0 || MapConroler._instance.longAndShortWall.length > 0)
                     && !MapConroler._instance.gameOver && !MapConroler._instance.gameWin) {
                     let gameover = MapConroler._instance.predict_End(colorTemp);
                     if (gameover == false) {
                         if (MapConroler._instance.revolving_state == 0)
                             MapConroler._instance.failLevel("lock");
+                        else if (MapConroler._instance.longAndShortWall.length > 0) {
+                            console.log("长墙和短墙无法通过");
+                        }
                         else
                             MapConroler._instance.failLevel("rotate");
                     }
@@ -1213,12 +1219,15 @@ export default class Block extends cc.Component {
             MapConroler._instance.checkColor(colorTemp, true);
             setTimeout(() => {
                 if (MapConroler._instance.blockNum != 0 && (MapConroler._instance.openWall.length > 0 ||
-                    MapConroler._instance.revolving_state != 0)
+                    MapConroler._instance.revolving_state != 0 || MapConroler._instance.longAndShortWall.length > 0)
                     && !MapConroler._instance.gameOver && !MapConroler._instance.gameWin) {
                     let gameover = MapConroler._instance.predict_End(colorTemp);
                     if (gameover == false) {
                         if (MapConroler._instance.revolving_state == 0)
                             MapConroler._instance.failLevel("lock");
+                        else if (MapConroler._instance.longAndShortWall.length > 0) {
+                            console.log("长墙和短墙无法通过");
+                        }
                         else
                             MapConroler._instance.failLevel("rotate");
                     }
diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts
index 6c0c1ba..27fd3ac 100644
--- a/assets/Script/Map.ts
+++ b/assets/Script/Map.ts
@@ -184,7 +184,7 @@ export default class MapConroler extends cc.Component {
     questionArray: any[];
 
     onLoad() {
-
+        alert("最新版11点");
         MiniGameSdk.API.setNewCloudlevel();
         cc.fx.GameConfig.GM_INFO.review = 0;
         cc.fx.GameConfig.GM_INFO.reviewBoom = 0;
@@ -4114,12 +4114,14 @@ export default class MapConroler extends cc.Component {
         let shu = block.getComponent("Block").shu;
         let direction = wall.node.parent.name;
         if (direction == "left" || direction == "right") {
-            if (wall.wall_Info.length >= shu) {
+            if (wall.length >= shu) {
+                console.log("竖方向长短不够");
                 jg = true;
             }
         }
         else {
-            if (wall.wall_Info.length >= heng) {
+            if (wall.length >= heng) {
+                console.log("横方向长短不够");
                 jg = true;
             }
         }
@@ -4129,12 +4131,14 @@ export default class MapConroler extends cc.Component {
         return jg;
     }
 
+
     //判断方块是否是可移动类型,或者可消除类型
     blockCanMove(block) {
         if (block.getComponent("Block").type == 10 || block.getComponent("Block").type == 3
             || block.getComponent("Block").type == 4) {
             return false;
         }
+        //开关方块不能通过
         // if (block.getComponent("Block").type == 10 || block.getComponent("Block").type == 3
         //     || block.getComponent("Block").type == 4 || block.getComponent("Block").type == 16) {
         //     return false;
@@ -4157,12 +4161,10 @@ export default class MapConroler extends cc.Component {
             return true;
         }
         //有变色门，且无开关门
-        if (this.changeColor == true && this.openWall.length == 0) {
-            alert("11111111");
+        if (this.changeColor == true && this.openWall.length == 0 && this.longAndShortWall.length == 0) {
             return true;
         }
         if (this.blocks.length == 0) {
-            alert("2222222");
             return true;
         }
         let result = false;
@@ -4209,8 +4211,11 @@ export default class MapConroler extends cc.Component {
                                 console.log("冻结门,不可通行");
                                 continue;
                             }
+                            // else if (this.wall_Pass[j].longAndShort) {
+                            //     console.log("长短门,判断是否可通行");
+                            // }
                             else {
-                                // console.log("普通门,判断是否可通行");
+                                console.log("普通门,判断是否可通行");
                                 result = this.blockCanPass(this.blocks[i], this.wall_Pass[j]);
                                 if (result == true)
                                     return result;