更新 loading,增加音效

assets/FirstScene/lizi.prefab

@@ -0,0 +1,190 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lizi",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_prefab": {
+      "__id__": 3
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -320,
+        -516.426,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ParticleSystem",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 1,
+    "_custom": true,
+    "_file": {
+      "__uuid__": "b2687ac4-099e-403c-a192-ff477686f4f5"
+    },
+    "_spriteFrame": {
+      "__uuid__": "2fdf5c03-b33d-4d22-a79a-0eff900dae7d"
+    },
+    "_texture": null,
+    "_stopped": true,
+    "playOnLoad": true,
+    "autoRemoveOnFinish": false,
+    "totalParticles": 100,
+    "duration": -1,
+    "emissionRate": 999.999985098839,
+    "life": 2,
+    "lifeVar": 4,
+    "_startColor": {
+      "__type__": "cc.Color",
+      "r": 49,
+      "g": 255,
+      "b": 15,
+      "a": 157
+    },
+    "_startColorVar": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 242,
+      "b": 34,
+      "a": 226
+    },
+    "_endColor": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 255,
+      "b": 55,
+      "a": 255
+    },
+    "_endColorVar": {
+      "__type__": "cc.Color",
+      "r": 240,
+      "g": 249,
+      "b": 107,
+      "a": 255
+    },
+    "angle": -20,
+    "angleVar": 40,
+    "startSize": 3.369999885559082,
+    "startSizeVar": 50,
+    "endSize": 20,
+    "endSizeVar": 0,
+    "startSpin": -47.369998931884766,
+    "startSpinVar": 0,
+    "endSpin": -47.369998931884766,
+    "endSpinVar": -142.11000061035156,
+    "sourcePos": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "posVar": {
+      "__type__": "cc.Vec2",
+      "x": 30,
+      "y": 40
+    },
+    "_positionType": 1,
+    "positionType": 1,
+    "emitterMode": 1,
+    "gravity": {
+      "__type__": "cc.Vec2",
+      "x": 0.25,
+      "y": 0.8600000143051147
+    },
+    "speed": 60,
+    "speedVar": 190.7899932861328,
+    "tangentialAccel": -92.11000061035156,
+    "tangentialAccelVar": 65.79000091552734,
+    "radialAccel": -671.0499877929688,
+    "radialAccelVar": 65.79000091552734,
+    "rotationIsDir": false,
+    "startRadius": 0,
+    "startRadiusVar": 0,
+    "endRadius": 50,
+    "endRadiusVar": 60,
+    "rotatePerS": 0,
+    "rotatePerSVar": 0,
+    "_N$preview": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/FirstScene/lizi.prefab.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.3.2",
+  "uuid": "fdde0ca1-1962-430c-b522-0bed950628d8",
+  "importer": "prefab",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/FirstScene/progress.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "6b69fcc2-ce78-4f40-9308-817cba3f97cf",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 669,
+  "height": 30,
+  "platformSettings": {},
+  "subMetas": {
+    "progress": {
+      "ver": "1.0.6",
+      "uuid": "aa820e02-799b-4a93-a62b-aab352ecd6d1",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "6b69fcc2-ce78-4f40-9308-817cba3f97cf",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 669,
+      "height": 30,
+      "rawWidth": 669,
+      "rawHeight": 30,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/FirstScene/progressBg.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "10ab019f-0fd9-4b97-ab1d-bcbd5fbdb241",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 669,
+  "height": 30,
+  "platformSettings": {},
+  "subMetas": {
+    "progressBg": {
+      "ver": "1.0.6",
+      "uuid": "04f18921-795a-4684-ab24-a06ddf99cf7e",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "10ab019f-0fd9-4b97-ab1d-bcbd5fbdb241",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 669,
+      "height": 30,
+      "rawWidth": 669,
+      "rawHeight": 30,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/Scene/HomeScene.fire

@@ -172,6 +172,63 @@
     "zhuan2": {
       "__uuid__": "998a24bd-ffa0-4f96-bc39-a9789f42bd9b"
     },
+    "adhesive": {
+      "__uuid__": "e0f2c22c-d8dd-4dad-9fa2-7b73d15a5518"
+    },
+    "freezeBlock": {
+      "__uuid__": "9a056601-12c6-45dd-abde-a847d6f15247"
+    },
+    "freezeDoor": {
+      "__uuid__": "20367986-5fa0-4558-9c73-861dc7bc1293"
+    },
+    "hammer": {
+      "__uuid__": "a25b43cf-deba-4061-a5da-e87aa343269d"
+    },
+    "lockBlock1": {
+      "__uuid__": "227cb730-4de8-41e2-93d1-f9e8cfdffd11"
+    },
+    "lockBlock2": {
+      "__uuid__": "2cfcd2ad-bb5d-47c0-be0a-3a8135d89c1f"
+    },
+    "lockDoor": {
+      "__uuid__": "25ca59d5-b522-472d-83e4-de16fd1cdd5c"
+    },
+    "magic1": {
+      "__uuid__": "b8ec297a-cc2d-4a82-ac2c-345db075ce84"
+    },
+    "magic2": {
+      "__uuid__": "e09b4699-ba82-4ac8-9894-d8b88640d041"
+    },
+    "simpleColor": {
+      "__uuid__": "6f213771-d0ef-45ba-b87d-e878f291886b"
+    },
+    "stacking": {
+      "__uuid__": "2c418573-4beb-49f8-bafe-6a9ae7906195"
+    },
+    "starBlock": {
+      "__uuid__": "643d1ba5-fd6f-45ab-928e-c271afddbcef"
+    },
+    "timePause1": {
+      "__uuid__": "f5c8c01d-aa75-4518-a7c6-82599ad31e58"
+    },
+    "timePause2": {
+      "__uuid__": "37c7f2a9-e0d2-4f3e-9ed6-1ad2ef1862c0"
+    },
+    "hit1": {
+      "__uuid__": "e16fd77e-9bbb-4bd1-b149-e1dd5a409c8f"
+    },
+    "hit2": {
+      "__uuid__": "bab2f84c-f988-4355-8fc7-2c55a09cc089"
+    },
+    "hit3": {
+      "__uuid__": "e06aa433-8f1d-4787-8e6d-7fe6a29ca6f5"
+    },
+    "hit4": {
+      "__uuid__": "ed4cf450-ae51-46ce-997a-50dd75d9a519"
+    },
+    "hit5": {
+      "__uuid__": "b27d353c-e4fe-46de-b7c9-75d2b96363d3"
+    },
     "_id": "24lN1LYRdNia3ZOiLsINIp"
   },
   {

assets/Script/Block.ts

@@ -440,6 +440,7 @@ export default class Block extends cc.Component {
 
     removeAdhesive(action) {
         if (this.adhesiveNode.length > 0) {
+            cc.fx.AudioManager._instance.playEffect("adhesive", null);
             for (let i = 0; i < this.adhesiveNode.length; i++) {
                 let adhesive = this.adhesiveNode[i];
                 // if (action == true)
@@ -547,6 +548,7 @@ export default class Block extends cc.Component {
         let self = this;
         let pos = this.node.getPosition();
         if (this.type == BlockType.叠加块下) {
+            cc.fx.AudioManager._instance.playEffect("stacking", null);
             let scaleX = this.node.scaleX;
             let scaleY = this.node.scaleY;
             this.block_Info.node.getComponent("Block").restoreNomal(this.posX, this.posY, true);
@@ -555,26 +557,34 @@ export default class Block extends cc.Component {
                 .start();
         }
         else if (this.type == BlockType.粘合块) {
+
             this.removeAdhesive(true);
             this.block_Info.node.getComponent("Block").removeAdhesive(true);
             this.block_Info.node.getComponent("Block").restoreNomal(this.block_Info.node.getComponent("Block").posX,
                 this.block_Info.node.getComponent("Block").posY, false);
             this.block_Info.node = null;
         }
+        else if (this.type == BlockType.星星块) {
+            cc.fx.AudioManager._instance.playEffect("starBlock", null);
+        }
         else if (this.type == BlockType.炸弹块) {
             this.node.getChildByName("boom").getComponent("Boom").destroyBoom(false);
         }
-
+        else if (this.type == BlockType.钥匙块) {
+            cc.fx.AudioManager._instance.playEffect("lockBlock2", null);
+        }
+        else {
+        }
+        setTimeout(() => {
+            cc.fx.AudioManager._instance.playEffect("xiaochu", null);
+            MapConroler._instance.playHitSound();
+        }, 0);
 
         let time = 0.33;
         // this.node.zIndex = 0;
         let width = Math.floor(this.node.width / 120);
         let height = Math.floor(this.node.height / 120);
 
-
-        setTimeout(() => {
-            cc.fx.AudioManager._instance.playEffect("xiaochu", null);
-        }, 300);
         this.setVibrate("light", 3)
 
         if (diraction == 0) {
@@ -680,6 +690,9 @@ export default class Block extends cc.Component {
             }
             if (this.type != BlockType.上锁块 && this.type != BlockType.冻结块) {
                 MapConroler._instance.startUpdate();
+                if (this.type == BlockType.钥匙块)
+                    cc.fx.AudioManager._instance.playEffect("lockBlock1", null);
+                else
                     cc.fx.AudioManager._instance.playEffect("hit", null);
                 this.node.zIndex = 200;
                 if (this.type == 9) {
@@ -722,7 +735,9 @@ export default class Block extends cc.Component {
     }
 
     touchEnd(event) {
-        if (MapConroler._instance.gameOver) return;
+        if (MapConroler._instance.gameOver) {
+            return;
+        }
         if (this.isTouch) {
             this.touchDelta = cc.v2(0, 0);
             this.checkCollision = false;
@@ -757,7 +772,37 @@ export default class Block extends cc.Component {
     }
 
     touchMove(event: cc.Event.EventTouch) {
-        if (MapConroler._instance.gameOver) return;
+        if (MapConroler._instance.gameOver) {
+            if (this.isTouch == true) {
+                this.touchDelta = cc.v2(0, 0);
+                this.checkCollision = false;
+                MapConroler._instance.changeRiseFall(this.color, false);
+                MapConroler._instance.removeOneBlock();
+                this.isTouch = false;
+                this.node.zIndex = this.level;
+                this.hit.active = false;
+                if (this.type == 9) {
+                    if (this.block_Info.node) {
+                        this.block_Info.node.getComponent("Block").hit.active = false;
+                    }
+                }
+
+                this.touchPoint = event.getLocation();
+                let local = cc.v2(this.node.x - 50, this.node.y + 50);
+                if (this.type != 10) {
+                    //@ts-ignore
+                    this.blockFall(local, true);
+                    if (this.type == 9) {
+                        if (this.block_Info.node) {
+                            let localTemp = cc.v2(this.block_Info.node.x - 50, this.block_Info.node.y + 50);
+                            this.block_Info.node.getComponent("Block").blockFall(localTemp, false);
+                        }
+                    }
+                }
+                this.moveLeft = this.moveRight = this.moveUp = this.moveDown = true;
+            }
+            return;
+        }
 
         if (this.isTouch) {
             const delta = event.getDelta();
@@ -860,7 +905,15 @@ export default class Block extends cc.Component {
             else if (self.type == BlockType.炸弹块) {
                 this.node.getChildByName("boom").getComponent("Boom").destroyBoom(false);
             }
-
+            else if (this.type == BlockType.叠加块下) {
+                cc.fx.AudioManager._instance.playEffect("stacking", null);
+            }
+            else if (this.type == BlockType.星星块) {
+                cc.fx.AudioManager._instance.playEffect("starBlock", null);
+            }
+            else if (this.type == BlockType.钥匙块) {
+                cc.fx.AudioManager._instance.playEffect("lockBlock2", null);
+            }
             MapConroler._instance.nextLevel(0);
             this.node.active = false;
             this.node.removeFromParent();
@@ -879,7 +932,7 @@ export default class Block extends cc.Component {
             }, 900);
             MapConroler._instance.ismagic = false;
 
-        }, 1350);
+        }, 1200);
 
     }
 
@@ -892,7 +945,9 @@ export default class Block extends cc.Component {
         MapConroler._instance.pause = true;
         if (MapConroler._instance.ishammer == true) {
             let parentSize = this.node.getContentSize();
-
+            setTimeout(() => {
+                cc.fx.AudioManager._instance.playEffect("hammer", null);
+            }, 300);
             let pos = cc.v3(0, 0, 0)
             if (this.node.anchorX == 1) {
                 pos = cc.v3(this.node.position.x - parentSize.width / 2,
@@ -986,6 +1041,7 @@ export default class Block extends cc.Component {
             this.node.getChildByName("boom").getComponent("Boom").stopBoom();
         }
         this.scheduleCallback2 = setTimeout(() => {
+
             //如果方块可以消除
             MapConroler._instance.blockNum -= 1;
             MapConroler._instance.special_Treatment(this.node, true);
@@ -1004,6 +1060,15 @@ export default class Block extends cc.Component {
             else if (self.type == BlockType.炸弹块) {
                 this.node.getChildByName("boom").getComponent("Boom").destroyBoom(false);
             }
+            else if (this.type == BlockType.叠加块下) {
+                cc.fx.AudioManager._instance.playEffect("stacking", null);
+            }
+            else if (this.type == BlockType.星星块) {
+                cc.fx.AudioManager._instance.playEffect("starBlock", null);
+            }
+            else if (this.type == BlockType.钥匙块) {
+                cc.fx.AudioManager._instance.playEffect("lockBlock2", null);
+            }
 
             MapConroler._instance.nextLevel(0);
             this.node.active = false;

assets/Script/GameManager.ts

@@ -17,6 +17,12 @@ export default class GameManager extends cc.Component {
     @property(cc.Label)
     label: cc.Label = null;
 
+    @property(cc.Sprite)
+    progress: cc.Sprite = null;
+
+    @property(cc.Node)
+    lizi: cc.Node = null;
+
     @property
     text: string = 'hello';
     static _instance: GameManager = null;
@@ -49,7 +55,9 @@ export default class GameManager extends cc.Component {
     /** 游戏入口初始化 */
     onLoad() {
         window.initMgr();
-        this.timeNumber = 1;
+        this.timeNumber = 2;
+        // cc.director.preloadScene("HomeScene", (err, asset) => {
+        // });
         this.startTimeCutDown();
         cc.fx.GameConfig.init(true);
         cc.fx.GameConfig.GM_INFO.gameState = false;
@@ -85,6 +93,13 @@ export default class GameManager extends cc.Component {
             });
         }
 
+        cc.tween(this.progress)
+            .to(1.8, { fillRange: 0.7 })
+            .start();
+        cc.tween(this.lizi)
+            .to(1.8, { position: cc.v3(-345 + 669 * 0.7, -520, 0) })
+            .start();
+
     }
     checkDailyQuests() {
         cc.fx.GameTool.getDailyQuestsInfo((data) => {
@@ -155,6 +170,12 @@ export default class GameManager extends cc.Component {
     //#region  开始游戏
     /** 开始游戏，执行逻辑 */
     startGame() {
+        cc.tween(this.progress)
+            .to(0.5, { fillRange: 1 })
+            .start();
+        cc.tween(this.lizi)
+            .to(0.5, { position: cc.v3(320, -516.426, 0) })
+            .start();
         // 加载成功后进入 HomeScene
         cc.assetManager.loadBundle('shop', (err, bundle) => {
             if (err) {
@@ -165,10 +186,20 @@ export default class GameManager extends cc.Component {
                     if (err) {
                         console.error('加载 music bundle 失败:', err);
                         // 加载失败时仍尝试进入 HomeScene
-                        cc.director.loadScene("HomeScene");
                     } else {
                     }
+                    // cc.tween(this.progress)
+                    //     .to(0.2, { fillRange: 1 })
+                    //     .start();
+                    // cc.tween(this.lizi)
+                    //     .to(0.2, { x: 320 })
+                    //     .call(() => {
+                    //     })
+                    //     .start();
+                    setTimeout(() => {
                         cc.director.loadScene("HomeScene");
+                    }, 300);
+
                 });
 
             }

assets/Script/Load.ts

@@ -47,34 +47,6 @@ export default class NewClass extends cc.Component {
         //     cc.debug.setDisplayStats(true);
         // }
 
-
-
-        cc.tween(this.node1)
-            .delay(0 * 0.3)
-            .to(0.3, { scale: 1 })
-            .to(0.3, { scale: 1.3 })
-            .to(0.3, { scale: 1 })
-            .union()
-            .repeatForever()
-            .start();
-
-        cc.tween(this.node2)
-            .delay(1 * 0.3)
-            .to(0.3, { scale: 1 })
-            .to(0.3, { scale: 1.3 })
-            .to(0.3, { scale: 1 })
-            .union()
-            .repeatForever()
-            .start();
-
-        cc.tween(this.node3)
-            .delay(2 * 0.3)
-            .to(0.3, { scale: 1 })
-            .to(0.3, { scale: 1.3 })
-            .to(0.3, { scale: 1 })
-            .union()
-            .repeatForever()
-            .start();
         //this.SubContext();
     }
 

assets/Script/Map.ts

@@ -151,7 +151,8 @@ export default class MapConroler extends cc.Component {
     lastHammerTime: number;//上次使用锤子的时间
     revolving_state: number = 0;//是否是旋转门关卡,0:不是,1:顺时针旋转,2:逆时针旋转
     revolvingWallArray: any; //旋转门数组
-
+    hitSoundCount: number;
+    hitSoundTime: number;
     // mapInfo: number[][] = [];
 
     onLoad() {
@@ -194,6 +195,8 @@ export default class MapConroler extends cc.Component {
         this.isreview = false;
         this.is_frenzy = false;
         this.revolving_state = 0;
+        this.hitSoundCount = 0;
+        this.hitSoundTime = 0;
         //this.iceLabel.string = cc.fx.GameConfig.GM_INFO.freezeAmount.toString();
         // this.hammerLabel.string = cc.fx.GameConfig.GM_INFO.hammerAmount.toString();
         // this.magicLabel.string = cc.fx.GameConfig.GM_INFO.magicAmount.toString();
@@ -1123,6 +1126,14 @@ export default class MapConroler extends cc.Component {
             }
         }
 
+        for (let i = 0; i < this.revolvingWallArray.length; i++) {
+            let wall = this.revolvingWallArray[i][0].getChildByName("wall").getComponent("Wall");
+            if (wall.special == 2) {
+                this.revolvingWallArray.splice(i, 1);
+                i--;
+            }
+        }
+
         // console.log("排序后的WALL_INFO数组:", this.revolvingWallArray);
     }
 
@@ -1474,6 +1485,7 @@ export default class MapConroler extends cc.Component {
     changeState(type) {
         if (type) {
             if (this.openWall.length != 0) {
+                cc.fx.AudioManager._instance.playEffect("lockDoor", null);
                 for (let i = 0; i < this.openWall.length; i++) {
                     this.openWall[i].getChildByName("wall").getComponent("Wall").changeLock();
                 }
@@ -2216,6 +2228,9 @@ export default class MapConroler extends cc.Component {
         if (this.gameOver == true || this.gameWin == true) {
             return;
         }
+        // for (let i = 0; i < this.blocks.length; i++) {
+        //     this.blocks[i].getComponent("Block").blockFall();
+        // }
         this.stopTimeCutDown();
         let time = 0;
         this.gameOver = true;
@@ -2453,6 +2468,7 @@ export default class MapConroler extends cc.Component {
                             }
                         }
                     }
+                    cc.fx.AudioManager._instance.playEffect("timePause1", null);
                     const timestamp = Date.now();
                     this.freezeMask.active = true;
                     this.stopBoom();
@@ -2501,6 +2517,15 @@ export default class MapConroler extends cc.Component {
     //解开时间冻结
     openIce() {
         if (this.node.parent.getChildByName("Ice").active) {
+            cc.fx.AudioManager._instance.playEffect("timePause2", null);
+            setTimeout(() => {
+                if (!this.node.parent.getChildByName("Ice").active)
+                    cc.fx.AudioManager._instance.playEffect("timePause2", null);
+            }, 1000);
+            setTimeout(() => {
+                if (!this.node.parent.getChildByName("Ice").active)
+                    cc.fx.AudioManager._instance.playEffect("timePause2", null);
+            }, 2000);
             this.freezeMask.active = false;
             let freezeBtn = this.node.parent.getChildByName("Bottom").getChildByName("timeBtn");
             freezeBtn.getComponent("btnControl").setTouch(true);
@@ -3115,7 +3140,10 @@ export default class MapConroler extends cc.Component {
                 }, 0);
 
 
-
+                cc.fx.AudioManager._instance.playEffect("magic1", null);
+                setTimeout(() => {
+                    cc.fx.AudioManager._instance.playEffect("magic2", null);
+                }, 1200);
                 cc.fx.GameConfig.GM_INFO.magicAmount -= 1;
                 if (cc.fx.GameConfig.GM_INFO.magicAmount < 0)
                     cc.fx.GameConfig.GM_INFO.magicAmount = 0;
@@ -3799,6 +3827,7 @@ export default class MapConroler extends cc.Component {
         }
     }
 
+    //连胜特殊锤子
     useHammerSpecial() {
         if (this.gameOver == true || this.gameWin == true) {
             return;
@@ -3821,13 +3850,22 @@ export default class MapConroler extends cc.Component {
             this.destroyBtn.node.getChildByName("mul10").opacity = 255;
         }
         else MiniGameSdk.API.showToast("道具使用中，请稍后再试");
+    }
 
-
+    //连击播放声音
-
+    playHitSound() {
-
+        this.hitSoundCount++;
+        if (this.hitSoundCount >= 5) {
+            this.hitSoundCount = 5;
+        }
+        cc.fx.AudioManager._instance.playEffect("hit" + (this.hitSoundCount), null);
+        this.hitSoundTime = Date.now(); // 记录当前播放时间
     }
 
     update(dt) {
-
+        // 检测连击超时，如果超过3秒没有播放音效，重置连击计数
+        if (this.hitSoundCount > 0 && this.hitSoundTime && Date.now() - this.hitSoundTime > 3000) {
+            this.hitSoundCount = 0;
+        }
     }
 }

assets/Script/Wall.ts

@@ -352,6 +352,7 @@ export default class Wall extends cc.Component {
     resetFreeze() {
         this.special = 0;
         if (this.freezeNode) {
+            cc.fx.AudioManager._instance.playEffect("freezeDoor", null);
             this.freezeNode.active = false;
         }
         // if (this.wall_Info.length != 0) {

assets/Script/lq_collide_system/lq_collide.ts

@@ -189,6 +189,7 @@ export class LQCollide extends Component {
     public collide_map: { [key: number]: { collide: LQCollide, status: 1 | 2 } } = {};
     public follow_target_category: number | undefined;
     private static id_maker: number = 1;
+    public is_music: boolean = false;
 
     //检测绘制组件是否添加
     private checkDebugDrawValid() {
@@ -361,6 +362,32 @@ export class LQCollide extends Component {
         // if (LQCollideConfig.switch_print_log) {
         //     console.log(this.node.name + ' on_enter');
         // }
+        let block = this.node.parent.getComponent("Block");
+
+        if (collide.node.name == "rise" && block.type == 9) {
+            let otherColor = collide.node.parent.getChildByName("risefall").getChildByName("color").getComponent(cc.Label).string;
+            if (block.color == otherColor && this.data_string != "-1") {
+                return;
+            }
+            if (block.block_Info.node.getComponent("Block").color == otherColor && this.data_string == "-1") {
+                return;
+            }
+            // if (this.is_music == false) {
+            //     this.is_music = true;
+            cc.fx.AudioManager._instance.playEffect("simpleColor", null);
+            // }
+
+        }
+        else if (collide.node.name == "rise" && block.type != 9) {
+            let otherColor = collide.node.parent.getChildByName("risefall").getChildByName("color").getComponent(cc.Label).string;
+            if (block.color == otherColor) {
+                return;
+            }
+            // if (this.is_music == false) {
+            //     this.is_music = true;
+            cc.fx.AudioManager._instance.playEffect("simpleColor", null);
+            // }
+        }
     }
 
     //@ts-ignore
@@ -387,6 +414,9 @@ export class LQCollide extends Component {
                 if (this.node.name === "right") {
                     block.moveRight = true;
                 }
+                // if (collide.node.name == "rise") {
+                //     this.is_music = false;
+                // }
             }
         }
     }

assets/Script/module/Music/AudioManager.ts

@@ -33,6 +33,46 @@ export default class AudioManager extends cc.Component {
     @property(cc.AudioClip)
     zhuan2: cc.AudioClip = null;
 
+
+    @property(cc.AudioClip)
+    adhesive: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    freezeBlock: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    freezeDoor: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    hammer: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    lockBlock1: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    lockBlock2: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    lockDoor: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    magic1: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    magic2: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    simpleColor: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    stacking: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    starBlock: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    timePause1: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    timePause2: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    hit1: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    hit2: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    hit3: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    hit4: cc.AudioClip = null;
+    @property(cc.AudioClip)
+    hit5: cc.AudioClip = null;
+
     mAudioMap: {};
     bgMusicVolume: number;
     effectMusicVolume: number;

assets/Script/module/Tool/GameTool.ts

@@ -398,8 +398,8 @@ var GameTool = {
     //关卡上限
     maxLevel() {
         let jg = false;
-        if (cc.fx.GameConfig.GM_INFO.level > 440) {
+        if (cc.fx.GameConfig.GM_INFO.level > 439) {
-            cc.fx.GameConfig.GM_INFO.level = 441;
+            cc.fx.GameConfig.GM_INFO.level = 440;
             jg = true;
         }
         return jg;

assets/Script/prop/Freeze.ts

@@ -55,7 +55,7 @@ export default class Freeze extends cc.Component {
             cc.tween(this.node.getChildByName("icon"))
                 .to(0.5, { opacity: 0 })
                 .start();
-
+            cc.fx.AudioManager._instance.playEffect("freezeBlock", null);
             // this.node.getChildByName("icon").getComponent(cc.Sprite).setMaterial(0,this.freeze);
             // this.node.children.forEach(element => {
             //     element.destroy();

assets/StartScene/LoadScene.fire

@@ -17,7 +17,7 @@
         "__id__": 2
       },
       {
-        "__id__": 6
+        "__id__": 7
       }
     ],
     "_active": false,
@@ -77,7 +77,7 @@
         "__id__": 3
       },
       {
-        "__id__": 19
+        "__id__": 4
       }
     ],
     "_prefab": null,
@@ -136,32 +136,79 @@
       "__id__": 2
     },
     "_enabled": true,
-    "node1": {
+    "node1": null,
-      "__id__": 4
+    "node2": null,
-    },
+    "node3": null,
-    "node2": {
-      "__id__": 14
-    },
-    "node3": {
-      "__id__": 12
-    },
     "localTest": false,
     "clientTestVersion": "1.0.0",
     "testVersion": null,
     "_id": "ac/PqMKZlO95wACtRGBFbA"
   },
+  {
+    "__type__": "df248lSLllOZpCHwGqQ5Ye3",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "label": null,
+    "progress": {
+      "__id__": 5
+    },
+    "lizi": {
+      "__id__": 16
+    },
+    "text": "hello",
+    "Block_Array": [],
+    "Wall_Prefab": [],
+    "Block_Color": [],
+    "_id": "de33dd/4JKb4L0+kEatmTv"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "aa820e02-799b-4a93-a62b-aab352ecd6d1"
+    },
+    "_type": 3,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": "81gLvXSYhLqIbsAcsf3xNF"
+  },
   {
     "__type__": "cc.Node",
-    "_name": "jiazai1",
+    "_name": "progress",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 7
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 5
       }
     ],
     "_prefab": null,
@@ -175,8 +222,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 52,
+      "width": 669,
-      "height": 49
+      "height": 30
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -187,8 +234,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -97.164,
+        0,
-        -417.143,
+        -516.426,
         0,
         0,
         0,
@@ -210,82 +257,7 @@
     "_is3DNode": false,
     "_groupIndex": 0,
     "groupIndex": 0,
-    "_id": "65yrYdwqdG+ojlKn3md91o"
+    "_id": "d03Wa3iYhM9KJaGn6mBqLM"
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "bg",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 6
-    },
-    "_children": [
-      {
-        "__id__": 4
-      },
-      {
-        "__id__": 12
-      },
-      {
-        "__id__": 14
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 16
-      },
-      {
-        "__id__": 17
-      }
-    ],
-    "_prefab": null,
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 1080,
-      "height": 1920
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": "b7i0z42uZCe6L6/4fdasjO"
   },
   {
     "__type__": "cc.Node",
@@ -296,19 +268,28 @@
     },
     "_children": [
       {
-        "__id__": 7
+        "__id__": 8
       },
       {
-        "__id__": 5
+        "__id__": 11
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 16
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 19
       },
       {
-        "__id__": 11
+        "__id__": 20
       }
     ],
     "_prefab": null,
@@ -364,16 +345,16 @@
     "_name": "Main Camera",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 6
+      "__id__": 7
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 9
       },
       {
-        "__id__": 9
+        "__id__": 10
       }
     ],
     "_prefab": null,
@@ -429,7 +410,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 8
     },
     "_enabled": true,
     "_cullingMask": 4294967295,
@@ -465,65 +446,24 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 8
     },
     "_enabled": true,
     "_id": "82rBHh8bJIGKuGw03a3Yrd"
   },
-  {
-    "__type__": "cc.Canvas",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 6
-    },
-    "_enabled": true,
-    "_designResolution": {
-      "__type__": "cc.Size",
-      "width": 1080,
-      "height": 1920
-    },
-    "_fitWidth": true,
-    "_fitHeight": false,
-    "_id": "59Cd0ovbdF4byw5sbjJDx7"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 6
-    },
-    "_enabled": true,
-    "alignMode": 1,
-    "_target": null,
-    "_alignFlags": 45,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_verticalCenter": 0,
-    "_horizontalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
-    "_id": "29zXboiXFBKoIV4PQ2liTe"
-  },
   {
     "__type__": "cc.Node",
-    "_name": "jiazai3",
+    "_name": "bg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 7
     },
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 12
+      },
       {
         "__id__": 13
       }
@@ -539,8 +479,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 50,
+      "width": 1080,
-      "height": 53
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -551,8 +491,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        83.039,
+        0,
-        -417.143,
+        0,
         0,
         0,
         0,
@@ -574,140 +514,14 @@
     "_is3DNode": false,
     "_groupIndex": 0,
     "groupIndex": 0,
-    "_id": "7dezOD8dVAhqWjyJdZ9zJ7"
+    "_id": "b7i0z42uZCe6L6/4fdasjO"
   },
   {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 11
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "9a639b00-f202-4b8e-98f0-6be5cece1cc6"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": "50bbTw60NKz6wVtFH5z2K9"
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "jiazai2",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 5
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 15
-      }
-    ],
-    "_prefab": null,
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 69,
-      "height": 64
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        -6.077,
-        -417.143,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": "9dmdxyFsVEN6G83f8DvJ0l"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 14
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "24e560c5-22d5-44e4-8b55-85431fd8a61b"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": "d6csD0iDBH4LhhASlK5PWc"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 5
     },
     "_enabled": true,
     "_materials": [
@@ -739,7 +553,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 5
+      "__id__": 11
     },
     "_enabled": true,
     "alignMode": 1,
@@ -761,12 +575,74 @@
     "_originalHeight": 2340,
     "_id": "c0sWn10ZdBD6+shoZmPwoN"
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Sprite",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 669,
+      "height": 30
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -516.426,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": "78UKXOKiBCeaKkIqEI3YDo"
+  },
   {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 4
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -777,7 +653,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "081a89e4-cd4d-49b7-81a3-bd2b3321ca26"
+      "__uuid__": "04f18921-795a-4684-ab24-a06ddf99cf7e"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -791,21 +667,228 @@
     "_fillRange": 0,
     "_isTrimmedMode": true,
     "_atlas": null,
-    "_id": "1cgewKbYRMtIgKEetpfwI+"
+    "_id": "26U0id8b9EartAyeGNj1sj"
   },
   {
-    "__type__": "df248lSLllOZpCHwGqQ5Ye3",
+    "__type__": "cc.Node",
+    "_name": "lizi",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -345,
+        -520,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": "fdvodKwbhK+ZiTc2NAzLpy"
+  },
+  {
+    "__type__": "cc.ParticleSystem",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 16
     },
     "_enabled": true,
-    "label": null,
+    "_materials": [
-    "text": "hello",
+      {
-    "Block_Array": [],
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-    "Wall_Prefab": [],
+      }
-    "Block_Color": [],
+    ],
-    "_id": "de33dd/4JKb4L0+kEatmTv"
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 1,
+    "_custom": true,
+    "_file": {
+      "__uuid__": "b2687ac4-099e-403c-a192-ff477686f4f5"
+    },
+    "_spriteFrame": {
+      "__uuid__": "2fdf5c03-b33d-4d22-a79a-0eff900dae7d"
+    },
+    "_texture": null,
+    "_stopped": false,
+    "playOnLoad": true,
+    "autoRemoveOnFinish": false,
+    "totalParticles": 100,
+    "duration": -1,
+    "emissionRate": 999.999985098839,
+    "life": 2,
+    "lifeVar": 4,
+    "_startColor": {
+      "__type__": "cc.Color",
+      "r": 49,
+      "g": 255,
+      "b": 15,
+      "a": 157
+    },
+    "_startColorVar": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 242,
+      "b": 34,
+      "a": 226
+    },
+    "_endColor": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 255,
+      "b": 55,
+      "a": 255
+    },
+    "_endColorVar": {
+      "__type__": "cc.Color",
+      "r": 240,
+      "g": 249,
+      "b": 107,
+      "a": 255
+    },
+    "angle": -20,
+    "angleVar": 40,
+    "startSize": 3.369999885559082,
+    "startSizeVar": 50,
+    "endSize": 20,
+    "endSizeVar": 0,
+    "startSpin": -47.369998931884766,
+    "startSpinVar": 0,
+    "endSpin": -47.369998931884766,
+    "endSpinVar": -142.11000061035156,
+    "sourcePos": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "posVar": {
+      "__type__": "cc.Vec2",
+      "x": 30,
+      "y": 40
+    },
+    "_positionType": 2,
+    "positionType": 2,
+    "emitterMode": 1,
+    "gravity": {
+      "__type__": "cc.Vec2",
+      "x": 0.25,
+      "y": 0.8600000143051147
+    },
+    "speed": 60,
+    "speedVar": 190.7899932861328,
+    "tangentialAccel": -92.11000061035156,
+    "tangentialAccelVar": 65.79000091552734,
+    "radialAccel": -671.0499877929688,
+    "radialAccelVar": 65.79000091552734,
+    "rotationIsDir": false,
+    "startRadius": 0,
+    "startRadiusVar": 0,
+    "endRadius": 50,
+    "endRadiusVar": 60,
+    "rotatePerS": 0,
+    "rotatePerSVar": 0,
+    "_N$preview": true,
+    "_id": "5a9sNk019IQYBlXfr29Y25"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 16
+    },
+    "asset": {
+      "__uuid__": "fdde0ca1-1962-430c-b522-0bed950628d8"
+    },
+    "fileId": "",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Canvas",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "_designResolution": {
+      "__type__": "cc.Size",
+      "width": 1080,
+      "height": 1920
+    },
+    "_fitWidth": true,
+    "_fitHeight": false,
+    "_id": "59Cd0ovbdF4byw5sbjJDx7"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": "29zXboiXFBKoIV4PQ2liTe"
   }
 ]

assets/custom/Json/level375.json

@@ -254,7 +254,8 @@
         "num": 2,
         "color": 2,
         "special": 0,
-        "length": 2
+        "length": 2,
+        "lock": true
       },
       {
         "id": 377,

assets/music/adhesive.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "e0f2c22c-d8dd-4dad-9fa2-7b73d15a5518",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.9657,
+  "subMetas": {}
+}

assets/music/freezeBlock.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "9a056601-12c6-45dd-abde-a847d6f15247",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.8874,
+  "subMetas": {}
+}

assets/music/freezeDoor.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "20367986-5fa0-4558-9c73-861dc7bc1293",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.2871,
+  "subMetas": {}
+}

assets/music/hammer.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "a25b43cf-deba-4061-a5da-e87aa343269d",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.783,
+  "subMetas": {}
+}

assets/music/hit1.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "e16fd77e-9bbb-4bd1-b149-e1dd5a409c8f",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.1223,
+  "subMetas": {}
+}

assets/music/hit2.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "bab2f84c-f988-4355-8fc7-2c55a09cc089",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.1223,
+  "subMetas": {}
+}

assets/music/hit3.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "e06aa433-8f1d-4787-8e6d-7fe6a29ca6f5",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.1223,
+  "subMetas": {}
+}

assets/music/hit4.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "ed4cf450-ae51-46ce-997a-50dd75d9a519",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.1223,
+  "subMetas": {}
+}

assets/music/hit5.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "b27d353c-e4fe-46de-b7c9-75d2b96363d3",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.2006,
+  "subMetas": {}
+}

assets/music/lockBlock1.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "227cb730-4de8-41e2-93d1-f9e8cfdffd11",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.6264,
+  "subMetas": {}
+}

assets/music/lockBlock2.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "2cfcd2ad-bb5d-47c0-be0a-3a8135d89c1f",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.6264,
+  "subMetas": {}
+}

assets/music/lockDoor.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "25ca59d5-b522-472d-83e4-de16fd1cdd5c",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.9918,
+  "subMetas": {}
+}

assets/music/magic1.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "b8ec297a-cc2d-4a82-ac2c-345db075ce84",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 2.5839,
+  "subMetas": {}
+}

assets/music/magic2.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "e09b4699-ba82-4ac8-9894-d8b88640d041",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.0179,
+  "subMetas": {}
+}

assets/music/simpleColor.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "6f213771-d0ef-45ba-b87d-e878f291886b",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.4176,
+  "subMetas": {}
+}

assets/music/stacking.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "2c418573-4beb-49f8-bafe-6a9ae7906195",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.4176,
+  "subMetas": {}
+}

assets/music/starBlock.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "643d1ba5-fd6f-45ab-928e-c271afddbcef",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.8874,
+  "subMetas": {}
+}

assets/music/timePause1.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "f5c8c01d-aa75-4518-a7c6-82599ad31e58",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 2.5056,
+  "subMetas": {}
+}

assets/music/timePause2.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "37c7f2a9-e0d2-4f3e-9ed6-1ad2ef1862c0",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.1566,
+  "subMetas": {}
+}

assets/res/texture_Block/door.png.meta

@@ -1,15 +0,0 @@
-{
-  "ver": "2.3.7",
-  "uuid": "418b4767-01bf-4ac2-823b-9880f2a79215",
-  "importer": "texture",
-  "type": "raw",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 1337,
-  "height": 975,
-  "platformSettings": {},
-  "subMetas": {}
-}

assets/resources/prefab/block/block23.prefab

@@ -349,7 +349,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "e200ed15-b2bf-49eb-864b-d0ead7b9fbd6"
+      "__uuid__": "ef7dfa4e-4d74-4723-b2b9-4dd028f6bbfe"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -363,7 +363,7 @@
     "_fillRange": 0,
     "_isTrimmedMode": true,
     "_atlas": {
-      "__uuid__": "cc01997d-495e-480d-871e-be405a6c38b5"
+      "__uuid__": "f2c494b7-b6df-488f-b194-358235b0f180"
     },
     "_id": ""
   },

settings/project.json

@@ -1,5 +1,5 @@
 {
-  "last-module-event-record-time": 1758181829513,
+  "last-module-event-record-time": 1758787650955,
   "group-list": [
     "default",
     "Map"