From b57f7af6ff83b5ee0f4d9d1df98e275e153f5e70 Mon Sep 17 00:00:00 2001
From: "COMPUTER\\EDY" <249929363@qq.com>
Date: Thu, 29 Jan 2026 14:34:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=B3=E5=8D=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/Script/lq_collide_system/lq_collide.ts | 9 +++++++--
 assets/custom/Json/level1055.json             | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/assets/Script/lq_collide_system/lq_collide.ts b/assets/Script/lq_collide_system/lq_collide.ts
index e7fd73c..dbb8b1d 100644
--- a/assets/Script/lq_collide_system/lq_collide.ts
+++ b/assets/Script/lq_collide_system/lq_collide.ts
@@ -369,9 +369,14 @@ export class LQCollide extends Component {
             if (block.color == otherColor && this.data_string != "-1" && this.data_string != "-2") {
                 return;
             }
-            if (block.block_Info.node.getComponent("Block").color == otherColor && this.data_string != "-1" && this.data_string != "-2") {
-                return;
+            if (block) {
+                if (block.block_Info) {
+                    if (block.block_Info.node.getComponent("Block").color == otherColor && this.data_string != "-1" && this.data_string != "-2") {
+                        return;
+                    }
+                }
             }
+
             // if (this.is_music == false) {
             //     this.is_music = true;
             cc.fx.AudioManager._instance.playEffect("simpleColor", null);
diff --git a/assets/custom/Json/level1055.json b/assets/custom/Json/level1055.json
index 7f62667..8ff2a1a 100644
--- a/assets/custom/Json/level1055.json
+++ b/assets/custom/Json/level1055.json
@@ -335,18 +335,18 @@
       {
         "id": 1067,
         "num": 20,
-        "color": 5,
+        "color": 8,
         "special": 0,
         "length": 2,
-        "colorArray": "474"
+        "colorArray": "744"
       },
       {
         "id": 1068,
         "num": 22,
-        "color": 5,
+        "color": 8,
         "special": 0,
         "length": 0,
-        "colorArray": "474"
+        "colorArray": "744"
       }
     ]
   ]