暂存

assets/Script/Block.ts

@@ -153,6 +153,7 @@ export default class Block extends cc.Component {
     //计时器
     private scheduleCallback: any = null;
     private scheduleCallback2: any = null;
+    private scheduleCallback3: any = null;
     isEliminatedByHammer: boolean = false; // 标记是否被锤子消除过
 
     onLoad() {
@@ -747,58 +748,14 @@ export default class Block extends cc.Component {
     eliminate() {
         clearTimeout(this.scheduleCallback2);
         clearTimeout(this.scheduleCallback);
+        clearTimeout(this.scheduleCallback3);
         let self = this;
         //锤子状态消失
         MapConroler._instance.pause = true;
 
         if (MapConroler._instance.ismagic) {
             this.scheduleCallback = setTimeout(() => {
-                // 记录添加magic时的锚点
+                this.createLabelsForBlocksWithCustomDelay(0.2)
-                this.node.anchorX = 0.5;
-                this.node.anchorY = 0.5;
-                this.node.addChild(new cc.Node("magic"));
-                let effectNode = this.node.getChildByName("magic");
-                effectNode.setPosition(0, 0);
-
-                // 改锚点后，修正magic的位置
-
-                this.node.anchorX = 1;
-                this.node.anchorY = 0;
-
-                // 重新设置magic的位置，使其视觉上不变
-                let parentSize = this.node.getContentSize();
-                effectNode.setPosition(
-                    effectNode.x + parentSize.width * (0.5 - 1),
-                    effectNode.y + parentSize.height * (0.5 - 0)
-                );
-                switch (this.node.name) {
-                    case "block14":
-                        this.node.anchorX = 0.66;
-                        this.node.anchorY = 0;
-                        effectNode.setPosition(-50, 120);
-                        break;
-                    case "block18":
-                        this.node.anchorX = 0.66;
-                        this.node.anchorY = 0;
-                        effectNode.setPosition(-50, 200);
-                        break;
-                    case "block10":
-                        effectNode.setPosition(0, 200);
-                        break;
-                    case "block21":
-                        effectNode.setPosition(0, 130);
-                        break;
-                    case "block16":
-                        effectNode.setPosition(0, 180);
-                        break;
-                    default:
-                        break;
-                }
-                effectNode.zIndex = 1000;
-                effectNode.addComponent(sp.Skeleton);
-                effectNode.getComponent(sp.Skeleton).skeletonData = this.magic_SkeletonData;
-                effectNode.getComponent(sp.Skeleton).setAnimation(0, "play", false);
-
                 if (this.type == BlockType.冻结块) {
                     this.node.getChildByName("freeze").getComponent("Freeze").reduce(2);
                     MapConroler._instance.ismagic = false;
@@ -829,10 +786,14 @@ 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);
+        }, 950);
+        this.scheduleCallback2 = setTimeout(() => {
+            //如果方块可以消除
+
+            // MapConroler._instance.blockNum -= 1;
+            // MapConroler._instance.special_Treatment(this.node);
             var self = this;
             this.removeMapBlock();
             MapConroler._instance.judgeWin(1);
@@ -860,10 +821,10 @@ export default class Block extends cc.Component {
                         MapConroler._instance.failLevel("lock");
                     }
                 }
-            }, 500);
+            }, 900);
             MapConroler._instance.ismagic = false;
 
-        }, 950);
+        }, 1350);
 
     }
 
@@ -1598,6 +1559,271 @@ export default class Block extends cc.Component {
             this.node.y = this.node.y - distance;
         }
     }
+
+    createSingleBlockEffect(blockPos: any, index: number, blockSize: number, baseOffset: cc.Vec2) {
+        const effectNode = new cc.Node(`magic_effect_${index}`);
+
+        const skeletonComponent = effectNode.addComponent(sp.Skeleton);
+        if (!this.magic_SkeletonData) {
+            console.error("magic_SkeletonData 资源未加载或为空");
+            return;
+        }
+        skeletonComponent.skeletonData = this.magic_SkeletonData;
+        skeletonComponent.premultipliedAlpha = false;
+        let actualX = blockPos.x * blockSize + baseOffset.x;
+        let actualY = blockPos.y * blockSize + baseOffset.y;
+
+        effectNode.setAnchorPoint(0.5, 0.5);
+
+        // 计算在世界坐标系中的位置
+        const worldPos = this.node.convertToWorldSpaceAR(cc.v2(actualX - 65, actualY + 70));
+
+        // 获取 Canvas 节点
+        const canvas = cc.find('Canvas');
+        if (!canvas) {
+            console.error("找不到 Canvas 节点");
+            return;
+        }
+
+        // 将世界坐标转换为 Canvas 的本地坐标
+        const canvasPos = canvas.convertToNodeSpaceAR(worldPos);
+        effectNode.setPosition(canvasPos);
+
+        // 设置最高层级，确保在所有其他节点之上
+        effectNode.zIndex = 9999;
+
+        // 添加到 Canvas 节点下
+        canvas.addChild(effectNode);
+
+        this.playMagicAnimation(skeletonComponent, index);
+
+        // 可选：添加自动清理机制
+        this.scheduleOnce(() => {
+            if (effectNode && effectNode.isValid) {
+                effectNode.removeFromParent();
+                effectNode.destroy();
+            }
+        }, 3); // 3秒后自动清理
+    }
+
+
+    // 播放魔法动画的辅助方法
+    playMagicAnimation(skeletonComponent: sp.Skeleton, index: number) {
+        try {
+            // 检查动画是否存在
+            if (!skeletonComponent.findAnimation("play")) {
+                console.error(`动画 "play" 不存在于 Spine 资源中`);
+                return;
+            }
+            skeletonComponent.setAnimation(0, "play", false);
+            //播放完自动清理
+            // 监听动画完成事件
+            skeletonComponent.setCompleteListener((trackEntry, loopCount) => {
+                // 动画播放完成后自动清理节点
+                if (skeletonComponent.node && skeletonComponent.node.isValid) {
+                    console.log(`第 ${index} 个特效动画播放完成，开始清理节点`);
+
+                    // 移除节点并销毁
+                    skeletonComponent.node.removeFromParent();
+                    skeletonComponent.node.destroy();
+                }
+            });
+
+        } catch (error) {
+            console.error(`播放第 ${index} 个方块动画时出错:`, error);
+        }
+    }
+
+    // 清理
+    clearPreviousEffects() {
+        const children = this.node.children;
+        for (let i = children.length - 1; i >= 0; i--) {
+            const child = children[i];
+            if (child.name.startsWith('magic_effect_')) {
+                child.removeFromParent();
+                child.destroy();
+            }
+        }
+    }
+
+    createLabelsForBlocksWithCustomDelay(delayBetweenBlocks: number = 0.1) {
+        if (!this.allBlocks || this.allBlocks.length === 0) {
+            console.warn("allBlocks 数组为空或未定义");
+            return;
+        }
+        const blockSize = 120;
+        const baseOffset = cc.v2(0, 0);
+        this.clearPreviousEffects();
+        let createOrder = [
+            [0],
+        ];
+
+        switch (this.node.name) {
+            case "block0":
+                createOrder = [
+                    [0]
+                ];
+                break;
+            case "block1":
+                createOrder = [
+                    [1],
+                    [0]
+                ];
+                break;
+            case "block2":
+                createOrder = [
+                    [1],
+                    [0]
+                ];
+                break;
+            case "block3":
+                createOrder = [
+                    [1],
+                    [0, 2],
+                ];
+                break;
+            case "block4":
+                createOrder = [
+                    [1],
+                    [0, 2]
+                ];
+                break;
+            case "block5":
+                createOrder = [
+                    [0],
+                    [1, 3],
+                    [2]
+                ];
+
+                break;
+            case "block6":
+                createOrder = [
+                    [2],
+                    [1, 3],
+                    [0]
+                ];
+                break;
+            case "block7":
+                createOrder = [
+                    [2],
+                    [1, 3],
+                    [0]
+                ];
+                break;
+            case "block8":
+                createOrder = [
+                    [1],
+                    [0, 2],
+                    [3]
+                ];
+                break;
+            case "block9":
+                createOrder = [
+                    [0],
+                    [1, 3],
+                    [2]
+                ];
+                break;
+            case "block10":
+                createOrder = [
+                    [3],
+                    [1, 2],
+                    [0]
+                ];
+                break;
+            case "block11":
+                createOrder = [
+                    [3],
+                    [0, 2],
+                    [1]
+                ];
+                break;
+            case "block12":
+                createOrder = [
+                    [0],
+                    [1, 3],
+                    [2]
+                ];
+                break;
+            case "block13":
+                createOrder = [
+                    [2],
+                    [1, 3],
+                    [0]
+                ];
+                break;
+            case "block14":
+                createOrder = [
+                    [1],
+                    [0, 2, 3],
+                ];
+                break;
+            case "block15":
+                createOrder = [
+                    [1],
+                    [0, 2, 3],
+                ];
+                break;
+            case "block16":
+                createOrder = [
+                    [2],
+                    [0, 1, 3],
+                ];
+                break;
+            case "block17":
+                createOrder = [
+                    [1],
+                    [0, 2, 3],
+                ];
+                break;
+            case "block18":
+                createOrder = [
+                    [1],
+                    [0, 2, 3, 4],
+                ];
+                break;
+            case "block19":
+                createOrder = [
+                    [0],
+                    [1, 2],
+
+                ];
+                break;
+            case "block20":
+                createOrder = [
+                    [1],
+                    [2, 0],
+
+                ];
+                break;
+            case "block21":
+                createOrder = [
+                    [1],
+                    [2, 0],
+
+                ];
+                break;
+            case "block22":
+                createOrder = [
+                    [1],
+                    [2, 0],
+
+                ];
+                break;
+        }
+        let currentDelay = 0;
+        createOrder.forEach((batch, batchIndex) => {
+            batch.forEach(blockIndex => {
+                if (blockIndex < this.allBlocks.length) {
+                    const blockPos = this.allBlocks[blockIndex];
+                    this.scheduleOnce(() => {
+                        this.createSingleBlockEffect(blockPos, blockIndex, blockSize, baseOffset);
+                    }, currentDelay);
+                }
+            });
+            currentDelay += delayBetweenBlocks;
+        });
+    }
 }
 
 

assets/Script/JiaZai.ts

@@ -63,6 +63,7 @@ export default class JiaZai extends cc.Component {
     @property(cc.Node)
     setUi: cc.Node = null;
     scheduleCallback2: any;
+    private isFirstLaunch: boolean = true;  // 添加首次启动标志
     // //月卡
     // @property(cc.Node)
     // monthCardBtn: cc.Node = null;
@@ -78,6 +79,9 @@ export default class JiaZai extends cc.Component {
     @property(cc.Node)
     cardTime: cc.Node = null;
     // LIFE-CYCLE CALLBACKS:
+    private onShowListener: () => void;
+    private onHideListener: () => void;
+    // LIFE-CYCLE CALLBACKS:
 
     onLoad() {
         this.closeLoad();
@@ -172,7 +176,54 @@ export default class JiaZai extends cc.Component {
         //console.log("音乐开关", cc.fx.GameConfig.GM_INFO.musicOpen);
         AudioManager._instance.playMusicGame();
         // this.openMonthCard();
+        this.onGames();
+    }
+    //监听后台
+    onGames() {
+        if (typeof wx !== 'undefined') {
+            this.onShowListener = null;
+            this.onHideListener = null;
+            // 定义监听函数
+            this.onShowListener = () => {
+                this.onGameShow();
 
+            };
+            this.onHideListener = () => {
+                this.onGameHide();
+            };
+            wx.onShow(this.onShowListener);
+            wx.onHide(this.onHideListener);
+
+        }
+    }
+    onGameHide() {
+        console.log("执行onGameHide", cc.fx.GameConfig.GM_INFO.min_Time);
+        this.isFirstLaunch = false;
+        this.stopHeathTimeCutDown();
+        this.stopTimeCutDown();
+        this.stopPowerTime();
+    }
+
+    onGameShow() {
+
+        cc.fx.GameTool.getHealth((data) => {
+            NumberToImage.numberToImageNodes((cc.fx.GameConfig.GM_INFO.level + 1), 43, 15, "level_", this.level, true);
+            NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "coin_", this.coin, true);
+            this.setHealthInfo(true);
+        });
+
+        console.log("执行on", cc.fx.GameConfig.GM_INFO.min_Time);
+        if (this.node.getChildByName("heathpop")) {
+            if (this.node.getChildByName("heathpop").active == true) {
+                const heathComponent = this.node.getChildByName("heathpop").getComponent("heathnum");
+                if (heathComponent && heathComponent.timeNode &&
+                    cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_Max) {
+                    this.startHeathTimeCutDown(heathComponent.timeNode);
+
+                }
+            }
+
+        }
     }
 
     start() {
@@ -232,6 +283,7 @@ export default class JiaZai extends cc.Component {
         let heathPop = health.getComponent("heathnum").heatht;
         heathPop.scale = 0.7;
         this.heath = heathPop; // 保存heath预制体引用
+        console.log("Health:", this.node.children)
         let swichs = health.getComponent("heathnum").switchNode;
         let timeNode = health.getComponent("heathnum").timeNode;
         let switchButtons = health.getComponent("heathnum").switchButtons;
@@ -450,6 +502,12 @@ export default class JiaZai extends cc.Component {
             }, 500);
             return;
         }
+        if (typeof wx !== 'undefined') {
+            //@ts-ignore
+            wx.offShow(this.onShowListener);
+            wx.offHide(this.onHideListener);
+        }
+
         if (this.node.getChildByName("Load").getChildByName("startBtn").getComponent("btnControl")._touch) {
             this.node.getChildByName("Load").getChildByName("startBtn").getComponent("btnControl").setTouch(false);
             let version = cc.fx.GameTool.getWechatGameVersion();
@@ -509,6 +567,11 @@ export default class JiaZai extends cc.Component {
             this.shopNode.active = true;
             this.shopNode.getComponent("shop").init();
         }
+        if (typeof wx !== 'undefined') {
+            //@ts-ignore
+            wx.offShow(this.onShowListener);
+            wx.offHide(this.onHideListener);
+        }
         // //console.log("shopNode parent:", this.shopNode.parent);
     }
 
@@ -552,6 +615,11 @@ export default class JiaZai extends cc.Component {
             this.monthlyCardNode.getComponent("monthlyCard").init();
             this.monthlyCardNode.getComponent("monthlyCard").juwai = true;
         }
+        if (typeof wx !== 'undefined') {
+            //@ts-ignore
+            wx.offShow(this.onShowListener);
+            wx.offHide(this.onHideListener);
+        }
     }
 
     // 关闭商店
@@ -663,8 +731,8 @@ export default class JiaZai extends cc.Component {
                     console.log("需要补发数据", order);
                     if (order.itemid == "gold_1" || order.itemid == "gold_2" || order.itemid == "gold_3"
                         || order.itemid == "gold_4" || order.itemid == "gold_5" || order.itemid == "gold_6"
-                        || order.itemid == "unlimited_health_bundle_1" || order.itemid == "unlimited_health_bundle_2"
+                        || order.itemid == "unlimited_health_bundle_10" || order.itemid == "unlimited_health_bundle_20"
-                        || order.itemid == "unlimited_health_bundle_3" || order.itemid == "month_Card" || "reborn_Gift"
+                        || order.itemid == "unlimited_health_bundle_30" || order.itemid == "month_Card" || "reborn_Gift"
                     ) {
                         this.openLoad();
                         console.log("补发名称:", order.itemid);
@@ -682,9 +750,9 @@ export default class JiaZai extends cc.Component {
                                     else if (order.itemid == "gold_4") { coinTemp = 32000; }
                                     else if (order.itemid == "gold_5") { coinTemp = 100000; }
                                     else if (order.itemid == "gold_6") { coinTemp = 240000; }
-                                    else if (order.itemid == "unlimited_health_bundle_1") { coinTemp = 5000; }
+                                    else if (order.itemid == "unlimited_health_bundle_10") { coinTemp = 2500; }
-                                    else if (order.itemid == "unlimited_health_bundle_2") { coinTemp = 12000; }
+                                    else if (order.itemid == "unlimited_health_bundle_20") { coinTemp = 5000; }
-                                    else if (order.itemid == "unlimited_health_bundle_3") { coinTemp = 30000; }
+                                    else if (order.itemid == "unlimited_health_bundle_30") { coinTemp = 7500; }
                                     else if (order.itemid == "month_Card") {
                                         coinTemp = 6000;
                                         cc.fx.GameConfig.GM_INFO.doubleCoin = 2;
@@ -751,7 +819,6 @@ export default class JiaZai extends cc.Component {
     closeLoad() {
         this.node.getChildByName("Loading").active = false;
     }
-
     updatePower() {
         if (cc.fx.GameConfig.GM_INFO.userPowerTime != 0) {
             let nowTime = Math.floor(Date.now() / 1000);

assets/Script/Map.ts

@@ -1778,8 +1778,9 @@ export default class MapConroler extends cc.Component {
         if (data.type == "time") {
             this.timeNumber = 21;
             this.add_Time += 20;
+            NumberToImage.getTimeMargin(20, 50, "time_", this.timeLabel)
         }
-        // NumberToImage.getTimeMargin(20, 50, "time_", this.timeLabel)
+
         this.blockNum = this.blocks.length;
         if (this.blockNum == 0) this.nextLevel();
 

assets/Script/module/Tool/GameTool.ts

@@ -1031,21 +1031,21 @@ var GameTool = {
                     { type: "coin", count: coin },
                 ]
                 break;
-            case "unlimited_health_bundle_1":
+            case "unlimited_health_bundle_10":
-                cc.fx.GameTool.changeCoin(5000);
+                cc.fx.GameTool.changeCoin(2500);
-                coin = 5000;
+                coin = 2500;
-                price = 1800;
+                price = 1000;
-                this.setUserPowerTime(1800);
+                this.setUserPowerTime(3600);
                 // MiniGameSdk.API.showToast("获得无限体力小组合包");
                 rewardData = [
                     { type: "coin", count: coin },
-                    { type: "infinite_health", count: 1800 },
+                    { type: "infinite_health", count: 3600 },
                 ]
                 break;
-            case "unlimited_health_bundle_2":
+            case "unlimited_health_bundle_20":
-                cc.fx.GameTool.changeCoin(12000);
+                cc.fx.GameTool.changeCoin(5000);
-                coin = 12000;
+                coin = 5000;
-                price = 6600;
+                price = 2000;
                 let propData = {
                     "freeze": 2,
                     "hammer": 2,
@@ -1053,35 +1053,35 @@ var GameTool = {
                     "price": price
                 }
                 this.getShopProp(propData, compensate);
-                this.setUserPowerTime(3600);
+                this.setUserPowerTime(7200);
                 // MiniGameSdk.API.showToast("获得无限体力大组合包");
                 rewardData = [
                     { type: "coin", count: coin },
                     { type: "freeze", count: 2 },
                     { type: "hammer", count: 2 },
                     { type: "magic", count: 2 },
-                    { type: "infinite_health", count: 3600 },
+                    { type: "infinite_health", count: 7200 },
                 ]
                 break;
-            case "unlimited_health_bundle_3":
+            case "unlimited_health_bundle_30":
-                cc.fx.GameTool.changeCoin(30000);
+                cc.fx.GameTool.changeCoin(7500);
-                coin = 30000;
+                coin = 7500;
-                price = 10800;
+                price = 3000;
                 let propData2 = {
-                    "freeze": 6,
+                    "freeze": 5,
-                    "hammer": 6,
+                    "hammer": 5,
-                    "magic_wand": 6,
+                    "magic_wand": 5,
                     "price": price
                 }
                 this.getShopProp(propData2, compensate);
-                this.setUserPowerTime(7200);
+                this.setUserPowerTime(14400);
                 // MiniGameSdk.API.showToast("获得无限体力超组合包");
                 rewardData = [
                     { type: "coin", count: coin },
-                    { type: "freeze", count: 6 },
+                    { type: "freeze", count: 5 },
-                    { type: "hammer", count: 6 },
+                    { type: "hammer", count: 5 },
-                    { type: "magic", count: 6 },
+                    { type: "magic", count: 5 },
-                    { type: "infinite_health", count: 7200 },
+                    { type: "infinite_health", count: 14400 },
                 ]
                 break;
             case "month_Card":

assets/Script/monthlyCard.ts

@@ -289,6 +289,11 @@ export default class NewClass extends cc.Component {
             jiazaiComp.rewarded();
             console.log("123iiiii222")
         }
+        if (jiazaiComp) {
+            jiazaiComp.onGames();
+            console.log("1222")
+        }
+
         this.node.active = false;
     }
 

assets/res/font/font.plist.meta

@@ -1299,7 +1299,7 @@
     },
     "discount_0.png": {
       "ver": "1.0.6",
-      "uuid": "f99cb6b9-efed-48bb-81c7-3e5a8a194dff",
+      "uuid": "8bf71b2d-8110-4f80-b372-7664958fa972",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",
@@ -1322,7 +1322,7 @@
     },
     "discount_1.png": {
       "ver": "1.0.6",
-      "uuid": "0c3d3261-ef38-43bf-91e5-68a6b1670c34",
+      "uuid": "573856d6-bcf2-4f74-a296-b938735b3a6e",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",
@@ -1345,7 +1345,7 @@
     },
     "discount_2.png": {
       "ver": "1.0.6",
-      "uuid": "14be48df-47df-43c6-8dfe-3f58fd4ec953",
+      "uuid": "e81e3849-47b0-4002-8396-1c6890c56208",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",
@@ -1368,7 +1368,7 @@
     },
     "discount_3.png": {
       "ver": "1.0.6",
-      "uuid": "c70710d1-3b7d-48a5-b5c5-3fc673884b1b",
+      "uuid": "d7e579d0-af4f-4a02-9c38-e1fe585db121",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",
@@ -1391,7 +1391,7 @@
     },
     "discount_4.png": {
       "ver": "1.0.6",
-      "uuid": "04587c66-e0a8-4e96-8a3d-108ece008a2f",
+      "uuid": "7a51cfc8-dc08-482d-91e8-d851ed02b4d0",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",
@@ -1414,7 +1414,7 @@
     },
     "discount_5.png": {
       "ver": "1.0.6",
-      "uuid": "68593393-51e9-4951-9696-ea88a9aba1d8",
+      "uuid": "6143b77a-3c94-42ca-9026-dca9db58f56b",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",
@@ -1437,7 +1437,7 @@
     },
     "discount_6.png": {
       "ver": "1.0.6",
-      "uuid": "83d73907-8f24-4b02-9c17-44a50e0ede38",
+      "uuid": "e8659f41-d9d0-4e43-adc8-f13b0cbf66a1",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",
@@ -1460,7 +1460,7 @@
     },
     "discount_7.png": {
       "ver": "1.0.6",
-      "uuid": "0d9b3cdd-8615-44df-b4ef-0f2406b798dc",
+      "uuid": "535a83dd-d70a-480e-9190-b8776cc97c65",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",
@@ -1483,7 +1483,7 @@
     },
     "discount_8.png": {
       "ver": "1.0.6",
-      "uuid": "320888d6-aa36-4e07-a7a6-8a6c02783aeb",
+      "uuid": "d458276c-fa7a-452d-a01a-fa19cd196e1d",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",
@@ -1506,7 +1506,7 @@
     },
     "discount_9.png": {
       "ver": "1.0.6",
-      "uuid": "90fdf128-4208-4569-96cb-253868445849",
+      "uuid": "e61fdba9-d3ad-47c9-ba96-14f843fc2f6b",
       "importer": "sprite-frame",
       "rawTextureUuid": "f8d067a0-98d0-4a97-8159-506946262d4b",
       "trimType": "auto",

assets/shop/img/texture_atlas-1.plist

@@ -45,7 +45,7 @@
                 <key>spriteSourceSize</key>
                 <string>{130,38}</string>
                 <key>textureRect</key>
-                <string>{{292,0},{130,38}}</string>
+                <string>{{425,0},{130,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -60,7 +60,7 @@
                 <key>spriteSourceSize</key>
                 <string>{135,38}</string>
                 <key>textureRect</key>
-                <string>{{422,0},{135,38}}</string>
+                <string>{{555,0},{135,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -75,7 +75,22 @@
                 <key>spriteSourceSize</key>
                 <string>{162,38}</string>
                 <key>textureRect</key>
-                <string>{{557,0},{162,38}}</string>
+                <string>{{690,0},{162,38}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>4h.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{133,38}</string>
+                <key>spriteSourceSize</key>
+                <string>{133,38}</string>
+                <key>textureRect</key>
+                <string>{{292,0},{133,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -90,7 +105,7 @@
                 <key>spriteSourceSize</key>
                 <string>{1000,406}</string>
                 <key>textureRect</key>
-                <string>{{492,516},{1000,406}}</string>
+                <string>{{492,490},{1000,406}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -120,7 +135,7 @@
                 <key>spriteSourceSize</key>
                 <string>{464,132}</string>
                 <key>textureRect</key>
-                <string>{{1176,96},{464,132}}</string>
+                <string>{{1382,96},{464,132}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -135,7 +150,7 @@
                 <key>spriteSourceSize</key>
                 <string>{123,90}</string>
                 <key>textureRect</key>
-                <string>{{1385,0},{123,90}}</string>
+                <string>{{1563,0},{123,90}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -150,7 +165,7 @@
                 <key>spriteSourceSize</key>
                 <string>{322,96}</string>
                 <key>textureRect</key>
-                <string>{{1508,0},{322,96}}</string>
+                <string>{{1686,0},{322,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -165,7 +180,7 @@
                 <key>spriteSourceSize</key>
                 <string>{246,246}</string>
                 <key>textureRect</key>
-                <string>{{188,270},{246,246}}</string>
+                <string>{{342,244},{246,246}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -180,7 +195,7 @@
                 <key>spriteSourceSize</key>
                 <string>{246,246}</string>
                 <key>textureRect</key>
-                <string>{{434,270},{246,246}}</string>
+                <string>{{588,244},{246,246}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -195,7 +210,7 @@
                 <key>spriteSourceSize</key>
                 <string>{246,246}</string>
                 <key>textureRect</key>
-                <string>{{680,270},{246,246}}</string>
+                <string>{{834,244},{246,246}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -210,7 +225,7 @@
                 <key>spriteSourceSize</key>
                 <string>{246,246}</string>
                 <key>textureRect</key>
-                <string>{{926,270},{246,246}}</string>
+                <string>{{1080,244},{246,246}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -225,7 +240,7 @@
                 <key>spriteSourceSize</key>
                 <string>{246,246}</string>
                 <key>textureRect</key>
-                <string>{{1172,270},{246,246}}</string>
+                <string>{{1326,244},{246,246}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -240,7 +255,7 @@
                 <key>spriteSourceSize</key>
                 <string>{246,246}</string>
                 <key>textureRect</key>
-                <string>{{1418,270},{246,246}}</string>
+                <string>{{1572,244},{246,246}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -255,7 +270,7 @@
                 <key>spriteSourceSize</key>
                 <string>{246,246}</string>
                 <key>textureRect</key>
-                <string>{{0,516},{246,246}}</string>
+                <string>{{0,490},{246,246}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -270,7 +285,7 @@
                 <key>spriteSourceSize</key>
                 <string>{246,246}</string>
                 <key>textureRect</key>
-                <string>{{246,516},{246,246}}</string>
+                <string>{{246,490},{246,246}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -285,7 +300,37 @@
                 <key>spriteSourceSize</key>
                 <string>{304,448}</string>
                 <key>textureRect</key>
-                <string>{{1492,516},{304,448}}</string>
+                <string>{{1492,490},{304,448}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>r_bq.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{148,148}</string>
+                <key>spriteSourceSize</key>
+                <string>{148,148}</string>
+                <key>textureRect</key>
+                <string>{{1846,96},{148,148}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>s_bq.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{206,122}</string>
+                <key>spriteSourceSize</key>
+                <string>{206,122}</string>
+                <key>textureRect</key>
+                <string>{{1176,96},{206,122}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -300,7 +345,7 @@
                 <key>spriteSourceSize</key>
                 <string>{286,42}</string>
                 <key>textureRect</key>
-                <string>{{800,0},{286,42}}</string>
+                <string>{{933,0},{286,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -315,7 +360,7 @@
                 <key>spriteSourceSize</key>
                 <string>{44,40}</string>
                 <key>textureRect</key>
-                <string>{{719,0},{44,40}}</string>
+                <string>{{852,0},{44,40}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -330,7 +375,7 @@
                 <key>spriteSourceSize</key>
                 <string>{188,207}</string>
                 <key>textureRect</key>
-                <string>{{0,270},{188,207}}</string>
+                <string>{{154,244},{188,207}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -360,7 +405,7 @@
                 <key>spriteSourceSize</key>
                 <string>{148,65}</string>
                 <key>textureRect</key>
-                <string>{{1086,0},{148,65}}</string>
+                <string>{{1264,0},{148,65}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -375,7 +420,7 @@
                 <key>spriteSourceSize</key>
                 <string>{151,65}</string>
                 <key>textureRect</key>
-                <string>{{1234,0},{151,65}}</string>
+                <string>{{1412,0},{151,65}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -405,7 +450,7 @@
                 <key>spriteSourceSize</key>
                 <string>{154,174}</string>
                 <key>textureRect</key>
-                <string>{{1640,96},{154,174}}</string>
+                <string>{{0,244},{154,174}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -420,7 +465,22 @@
                 <key>spriteSourceSize</key>
                 <string>{37,40}</string>
                 <key>textureRect</key>
-                <string>{{763,0},{37,40}}</string>
+                <string>{{896,0},{37,40}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>zhe.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{45,46}</string>
+                <key>spriteSourceSize</key>
+                <string>{45,46}</string>
+                <key>textureRect</key>
+                <string>{{1219,0},{45,46}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -436,9 +496,9 @@
             <key>realTextureFileName</key>
             <string>texture_atlas-1.png</string>
             <key>size</key>
-            <string>{1830,964}</string>
+            <string>{2008,938}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:922b75cadd6e1a6365b192ddd2ada1b0:20640123229c1eef91916ad6809a7ed2:7574d8513b69ec3112d43152279b5c18$</string>
+            <string>$TexturePacker:SmartUpdate:451d50daa7daadaa9dd8412f5040c29d:21230410b68532ee0c6da2e54da431cb:7574d8513b69ec3112d43152279b5c18$</string>
             <key>textureFileName</key>
             <string>texture_atlas-1.png</string>
         </dict>

assets/shop/img/texture_atlas-1.plist.meta

@@ -4,8 +4,8 @@
   "importer": "asset",
   "rawTextureUuid": "6971355d-0542-42f6-96ec-4244dbcc5897",
   "size": {
-    "width": 1830,
+    "width": 2008,
-    "height": 964
+    "height": 938
   },
   "type": "Texture Packer",
   "subMetas": {
@@ -65,7 +65,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 292,
+      "trimX": 425,
       "trimY": 0,
       "width": 130,
       "height": 38,
@@ -88,7 +88,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 422,
+      "trimX": 555,
       "trimY": 0,
       "width": 135,
       "height": 38,
@@ -111,7 +111,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 557,
+      "trimX": 690,
       "trimY": 0,
       "width": 162,
       "height": 38,
@@ -124,6 +124,29 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "4h.png": {
+      "ver": "1.0.6",
+      "uuid": "75fc2652-6239-434e-b00b-bd2406dcf50a",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "6971355d-0542-42f6-96ec-4244dbcc5897",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 292,
+      "trimY": 0,
+      "width": 133,
+      "height": 38,
+      "rawWidth": 133,
+      "rawHeight": 38,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "banre.png": {
       "ver": "1.0.6",
       "uuid": "295fa69f-086d-4229-8dcd-446292dc31b0",
@@ -135,7 +158,7 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 492,
-      "trimY": 516,
+      "trimY": 490,
       "width": 1000,
       "height": 406,
       "rawWidth": 1000,
@@ -180,7 +203,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1176,
+      "trimX": 1382,
       "trimY": 96,
       "width": 464,
       "height": 132,
@@ -203,7 +226,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1385,
+      "trimX": 1563,
       "trimY": 0,
       "width": 123,
       "height": 90,
@@ -226,7 +249,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1508,
+      "trimX": 1686,
       "trimY": 0,
       "width": 322,
       "height": 96,
@@ -249,8 +272,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 188,
+      "trimX": 342,
-      "trimY": 270,
+      "trimY": 244,
       "width": 246,
       "height": 246,
       "rawWidth": 246,
@@ -272,8 +295,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 434,
+      "trimX": 588,
-      "trimY": 270,
+      "trimY": 244,
       "width": 246,
       "height": 246,
       "rawWidth": 246,
@@ -295,8 +318,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 680,
+      "trimX": 834,
-      "trimY": 270,
+      "trimY": 244,
       "width": 246,
       "height": 246,
       "rawWidth": 246,
@@ -318,8 +341,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 926,
+      "trimX": 1080,
-      "trimY": 270,
+      "trimY": 244,
       "width": 246,
       "height": 246,
       "rawWidth": 246,
@@ -341,8 +364,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1172,
+      "trimX": 1326,
-      "trimY": 270,
+      "trimY": 244,
       "width": 246,
       "height": 246,
       "rawWidth": 246,
@@ -364,8 +387,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1418,
+      "trimX": 1572,
-      "trimY": 270,
+      "trimY": 244,
       "width": 246,
       "height": 246,
       "rawWidth": 246,
@@ -388,7 +411,7 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 0,
-      "trimY": 516,
+      "trimY": 490,
       "width": 246,
       "height": 246,
       "rawWidth": 246,
@@ -411,7 +434,7 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 246,
-      "trimY": 516,
+      "trimY": 490,
       "width": 246,
       "height": 246,
       "rawWidth": 246,
@@ -434,7 +457,7 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 1492,
-      "trimY": 516,
+      "trimY": 490,
       "width": 304,
       "height": 448,
       "rawWidth": 304,
@@ -446,6 +469,52 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "r_bq.png": {
+      "ver": "1.0.6",
+      "uuid": "e314ab10-ab70-4ff7-8513-4254be9264ee",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "6971355d-0542-42f6-96ec-4244dbcc5897",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1846,
+      "trimY": 96,
+      "width": 148,
+      "height": 148,
+      "rawWidth": 148,
+      "rawHeight": 148,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "s_bq.png": {
+      "ver": "1.0.6",
+      "uuid": "3d3ea606-2949-41b9-a98f-86f6f3122b0c",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "6971355d-0542-42f6-96ec-4244dbcc5897",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1176,
+      "trimY": 96,
+      "width": 206,
+      "height": 122,
+      "rawWidth": 206,
+      "rawHeight": 122,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "shengxiaozhong.png": {
       "ver": "1.0.6",
       "uuid": "af474d63-41a4-4bdd-a7f1-5666c397332a",
@@ -456,7 +525,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 800,
+      "trimX": 933,
       "trimY": 0,
       "width": 286,
       "height": 42,
@@ -479,7 +548,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 719,
+      "trimX": 852,
       "trimY": 0,
       "width": 44,
       "height": 40,
@@ -502,8 +571,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 154,
-      "trimY": 270,
+      "trimY": 244,
       "width": 188,
       "height": 207,
       "rawWidth": 188,
@@ -548,7 +617,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1086,
+      "trimX": 1264,
       "trimY": 0,
       "width": 148,
       "height": 65,
@@ -571,7 +640,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1234,
+      "trimX": 1412,
       "trimY": 0,
       "width": 151,
       "height": 65,
@@ -617,8 +686,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1640,
+      "trimX": 0,
-      "trimY": 96,
+      "trimY": 244,
       "width": 154,
       "height": 174,
       "rawWidth": 154,
@@ -640,7 +709,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 763,
+      "trimX": 896,
       "trimY": 0,
       "width": 37,
       "height": 40,
@@ -652,6 +721,29 @@
       "borderRight": 0,
       "spriteType": "normal",
       "subMetas": {}
+    },
+    "zhe.png": {
+      "ver": "1.0.6",
+      "uuid": "bd09a391-0f09-4dd6-a17e-29e44be01ed3",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "6971355d-0542-42f6-96ec-4244dbcc5897",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 1219,
+      "trimY": 0,
+      "width": 45,
+      "height": 46,
+      "rawWidth": 45,
+      "rawHeight": 46,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
     }
   }
 }

assets/shop/img/texture_atlas-1.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 1830,
+  "width": 1966,
-  "height": 964,
+  "height": 922,
   "platformSettings": {},
   "subMetas": {}
 }