增加冻结们

assets/Script/GameManager.ts

@@ -224,11 +224,13 @@ export default class GameManager extends cc.Component {
             MiniGameSdk.API.shushu_Init();
             Utils.getUserInfo((data) => {
                 console.log("登陆成功_____________", data);
+                console.log("uid", data.data.onlyId);
                 if (data.data._id) {
                     cc.fx.GameConfig.GM_INFO.uid = data.data._id;
                     cc.fx.StorageMessage.setStorage("uid", data.data._id);
                 }
                 if (data.data.onlyId) {
+                    console.log(":应该进入这里");
                     console.log("_______________Uid:", data.data.onlyId);
                     cc.fx.GameConfig.GM_INFO.userId = data.data.onlyId;
                 }

assets/Script/JiaZai.ts

@@ -26,22 +26,16 @@ export default class JiaZai extends cc.Component {
     // 缓存 reward 奖励窗口 节点
     private RewardNode: cc.Node | null = null;
 
-    @property(cc.Node)
+    @property(cc.EditBox)
-    node1: cc.Node = null;
+    custom: cc.EditBox = null;
-
-    @property(cc.Node)
-    node2: cc.Node = null;
-
-    @property(cc.Node)
-    node3: cc.Node = null;
 
 
 
     @property({ type: [cc.SpriteAtlas], tooltip: "方块颜色" })
     Block_Color: Array<cc.SpriteAtlas> = [];
 
-    @property(cc.EditBox)
+    @property(cc.SpriteAtlas)
-    custom: cc.EditBox = null;
+    liuGuang: cc.SpriteAtlas = null;
 
 
 
@@ -143,6 +137,7 @@ export default class JiaZai extends cc.Component {
         }
         //console.log("音乐开关", cc.fx.GameConfig.GM_INFO.musicOpen);
         AudioManager._instance.playMusicGame();
+
     }
 
     start() {
@@ -155,7 +150,7 @@ export default class JiaZai extends cc.Component {
         setTimeout(() => {
             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();
+            this.setHealthInfo(true);
         }, 0);
         if (cc.fx.GameConfig.GM_INFO.gameState) {
             this.node.getChildByName("zhuanchang").active = true;
@@ -195,9 +190,10 @@ export default class JiaZai extends cc.Component {
         let switchButtons = health.getComponent("heathnum").switchButtons;
         let coin = health.getComponent("heathnum").coin;
         // 启动弹窗自己的倒计时
-        if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max) {
+        if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_Max) {
             this.startHeathTimeCutDown(timeNode);
         }
+
         if (cc.fx.GameConfig.GM_INFO.hp == 0) {
             if (cc.fx.GameConfig.GM_INFO.userPowerTime == 0) {
                 // 体力为0，显示spriteFrames[1]，只显示第二个按钮
@@ -209,11 +205,11 @@ export default class JiaZai extends cc.Component {
                 if (switchButtons[1]) { switchButtons[1].active = false; swichs[1].active = true; }
             }
 
-        } else if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max && cc.fx.GameConfig.GM_INFO.hp > 0) {
+        } else if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_Max && cc.fx.GameConfig.GM_INFO.hp > 0) {
             // 体力小于5但大于0，显示spriteFrames[1]，只显示第一个按钮
             if (switchButtons[0]) { switchButtons[0].active = true; swichs[0].active = false; }
             if (switchButtons[1]) { switchButtons[1].active = false; swichs[1].active = true; }
-        } else if (cc.fx.GameConfig.GM_INFO.hp >= cc.fx.GameConfig.GM_INFO.hp_max) {
+        } else if (cc.fx.GameConfig.GM_INFO.hp >= cc.fx.GameConfig.GM_INFO.hp_Max) {
 
             // 体力为5，显示spriteFrames[0]，只显示第一个按钮
             if (switchButtons[0]) { switchButtons[0].active = true; swichs[0].active = true; }
@@ -260,6 +256,7 @@ export default class JiaZai extends cc.Component {
     }
     //开始倒计时  恢复体力
     startTimeCutDown() {
+        this.stopTimeCutDown();
         this.scheduleCallback = function () {
             if (cc.fx.GameConfig.GM_INFO.min_Time <= 0) {
                 this.stopTimeCutDown();
@@ -268,11 +265,11 @@ export default class JiaZai extends cc.Component {
                 if (this.Stamina && this.Stamina.getChildByName("time")) {
                     this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp;
                 }
-                if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max) {
+                if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_Max) {
                     MiniGameSdk.API.showToast("恢复一点体力");
                     cc.fx.GameTool.setUserHealth(1, (data) => {
                         cc.fx.GameTool.getHealth(null);
-                        this.setHealthInfo();
+                        this.setHealthInfo(true);
                     })
                 }
 
@@ -282,6 +279,9 @@ export default class JiaZai extends cc.Component {
                 var timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
                 // 同步显示
                 if (this.Stamina && this.Stamina.getChildByName("time")) {
+                    let power = cc.fx.GameTool.getUserPowerTime();
+                    if (!power) this.Stamina.getChildByName("time").opacity = 255;
+                    else this.Stamina.getChildByName("time").opacity = 0;
                     this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp;
                 }
             }
@@ -292,17 +292,21 @@ export default class JiaZai extends cc.Component {
     stopTimeCutDown() {
         if (this.scheduleCallback) {
             this.unschedule(this.scheduleCallback);
+            this.scheduleCallback = null;
         }
     }
 
     startPowerTime() {
+        this.stopPowerTime();
+        if (this.scheduleCallback2) {
+            this.unschedule(this.scheduleCallback2);
+        }
         this.scheduleCallback2 = function () {
             let nowTime = Math.floor(Date.now() / 1000);
             if (cc.fx.GameConfig.GM_INFO.userPowerTime < nowTime) {
                 this.Stamina.getChildByName("skyLine").active = false;
-                this.Stamina.getChildByName("time").opacity = 255;
-                this.Stamina.getChildByName("man").active = true;
                 this.stopPowerTime();
+                this.setHealthInfo(true);
                 return;
             }
             else {
@@ -313,7 +317,9 @@ export default class JiaZai extends cc.Component {
             let time = cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime;
             if (time <= 0) {
                 time = 0;
-                this.stopTimeCutDown();
+                this.Stamina.getChildByName("skyLine").active = false;
+                this.stopPowerTime();
+                this.setHealthInfo(true);
                 var timeTemp = cc.fx.GameTool.getTimeMargin2(time);
                 // 同步显示
                 if (this.Stamina && this.Stamina.getChildByName("skyLine").getChildByName("skyTime")) {
@@ -332,8 +338,10 @@ export default class JiaZai extends cc.Component {
     }
 
     stopPowerTime() {
+        cc.fx.GameTool.getUserPowerTime();
         if (this.scheduleCallback2) {
             this.unschedule(this.scheduleCallback2);
+            this.scheduleCallback2 = null;
         }
     }
 
@@ -351,8 +359,8 @@ export default class JiaZai extends cc.Component {
     }
 
 
-    setHealthInfo() {
+    setHealthInfo(type) {
-        if (cc.fx.GameConfig.GM_INFO.hp >= 5) {
+        if (cc.fx.GameConfig.GM_INFO.hp >= cc.fx.GameConfig.GM_INFO.hp_Max) {
             this.Stamina.getChildByName("man").active = true;
             this.Stamina.getChildByName("health").active = true;
             NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false);
@@ -366,7 +374,11 @@ export default class JiaZai extends cc.Component {
             if (cc.fx.GameConfig.GM_INFO.min_Time != 0) {
                 let time = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
                 this.Stamina.getChildByName("time").getComponent(cc.Label).string = time;
+                let power = cc.fx.GameTool.getUserPowerTime();
+                if (!power) this.Stamina.getChildByName("time").opacity = 255;
+                else this.Stamina.getChildByName("time").opacity = 0;
                 console.log("______________________启动计时器");
+                this.stopTimeCutDown();
                 this.startTimeCutDown();
             }
         }
@@ -595,7 +607,7 @@ export default class JiaZai extends cc.Component {
                                     else if (order.itemid == "unlimited_health_bundle_3") { coinTemp = 30000; }
                                     let title = "充值补发奖励金币：" + coinTemp;
                                     MiniGameSdk.API.showToast(title);
-                                    cc.fx.GameTool.shopBuy(productId);
+                                    cc.fx.GameTool.shopBuy(productId, true);
                                     console.log("充值成功获得金币");
                                 } else {
                                     MiniGameSdk.API.showToast("网络异常，充值奖励将在登录后再次发放");
@@ -641,6 +653,7 @@ export default class JiaZai extends cc.Component {
         if (cc.fx.GameConfig.GM_INFO.userPowerTime != 0) {
             let nowTime = Math.floor(Date.now() / 1000);
             if (cc.fx.GameConfig.GM_INFO.userPowerTime > nowTime) {
+                this.stopPowerTime();
                 this.startPowerTime();
                 console.log("还有无限体力时间_____________", (cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime));
                 this.Stamina.getChildByName("skyLine").active = true;
@@ -650,8 +663,7 @@ export default class JiaZai extends cc.Component {
             else {
                 this.Stamina.getChildByName("skyLine").active = false;
                 console.log("无限体力时间已过期");
-                this.Stamina.getChildByName("time").opacity = 255;
+                this.setHealthInfo(true);
-                this.Stamina.getChildByName("man").active = true;
             }
         }
         else {
@@ -659,6 +671,7 @@ export default class JiaZai extends cc.Component {
             this.Stamina.getChildByName("time").opacity = 255;
             this.Stamina.getChildByName("man").active = true;
             console.log("没有无限体力时间");
+            this.setHealthInfo(true);
         }
     }
     // update (dt) {}

assets/Script/Map.ts

@@ -326,6 +326,7 @@ export default class MapConroler extends cc.Component {
                 this.guideNode.active = false;
             }
             cc.fx.GameTool.shushu_Track("enter_stage");
+            this.stopTimeCutDown();
             this.startTimeCutDown();
         }
     }
@@ -1476,7 +1477,7 @@ export default class MapConroler extends cc.Component {
             // alert("游戏成功");
             MiniGameSdk.API.showToast(cc.fx.GameConfig.GM_INFO.level);
             this.gameWin = true;
-            if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max) {
+            if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_Max) {
                 console.log("恢复一点体力", cc.fx.GameConfig.GM_INFO.level);
                 if (!this.powerState) {
                     cc.fx.GameTool.setUserHealth(1, (data) => {
@@ -1487,11 +1488,11 @@ export default class MapConroler extends cc.Component {
             this.stopTimeCutDown();
             // console.log("即将上报成功________________________:",this.add_Time);
             // console.log("成功消除一个",this.add_Time);
-            cc.fx.GameTool.changeCoin(40);
+            cc.fx.GameTool.changeCoin(40 * cc.fx.GameConfig.GM_INFO.doubleCoin);
             const data = {
                 change_reason: "level",
                 id: (1001 + ""),
-                num: 40
+                num: 40 * cc.fx.GameConfig.GM_INFO.doubleCoin
             }
             cc.fx.GameTool.shushu_Track("resource_get", data);
             let overTime = Date.now();
@@ -1588,10 +1589,10 @@ export default class MapConroler extends cc.Component {
 
     againLevel() {
         cc.fx.AudioManager._instance.playEffect("anniu_Big", null);
-        if (cc.fx.GameConfig.GM_INFO.hp < 1) {
+        // if (cc.fx.GameConfig.GM_INFO.hp < 1) {
-            MiniGameSdk.API.showToast("体力值不足");
+        //     MiniGameSdk.API.showToast("体力值不足");
-            return;
+        //     return;
-        }
+        // }
         if (!this.againCanTouch) return;
 
         this.againCanTouch = false;
@@ -1687,6 +1688,7 @@ export default class MapConroler extends cc.Component {
         setTimeout(() => {
             this.reviewState = false;
         }, 200);
+        this.stopTimeCutDown();
         this.startTimeCutDown();
     }
 

assets/Script/Uid.ts

@@ -20,7 +20,7 @@ export default class Uid extends cc.Component {
             return;
         }
         if (cc.fx.GameConfig.GM_INFO.userId > 0) {
-            this.uid_Number.string = cc.fx.GameConfig.GM_INFO.userId;
+            this.uid_Number.string = cc.fx.GameConfig.GM_INFO.userId + "";
         }
     }
 

assets/Script/heathnum.ts

@@ -81,7 +81,7 @@ export default class NewClass extends cc.Component {
             if (parentNode) {
                 const jiazaiComp = parentNode.getComponent(JiaZai);
                 if (jiazaiComp) {
-                    jiazaiComp.setHealthInfo();
+                    jiazaiComp.setHealthInfo(false);
                     jiazaiComp.updateCoin();
                 }
             }

assets/Script/module/Config/GameConfig.ts

@@ -105,7 +105,7 @@ export class GameConfig {
         hammerFirst: boolean; //锤子道具第一次
         magicAFirst: boolean; //魔法棒道具第一次
         hp_Max: number; //体力最大值    
-        doubleCoin: boolean;//是否翻倍
+        doubleCoin: number;//是否翻倍
     };
 
 
@@ -255,7 +255,7 @@ export class GameConfig {
             hammerFirst: false,         //锤子道具第一次
             magicAFirst: false,         //魔法棒道具第一次
             hp_Max: 5,                  //体力最大值    
-            doubleCoin: false,           //是否双倍
+            doubleCoin: 1,           //是否双倍
         };
         // this.setCode(this.getKey("scode"));
         // this.GM_INFO.level = 0;

assets/Script/module/Tool/GameTool.ts

@@ -617,7 +617,7 @@ var GameTool = {
     //设置用户体力值  有可能加，有可能定时器减
     setUserHealth(health, callback) {
         if (health > 0) {
-            if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_max) {
+            if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_Max) {
                 cc.fx.GameConfig.GM_INFO.hp += health;
             }
         }
@@ -729,12 +729,11 @@ var GameTool = {
             cc.fx.GameTool.setUserProp(propid, propNumber, (data) => {
             })
 
-
-
             const data = {
                 change_reason: "game",
                 id: propid,
-                num: num
+                num: num,
+                compensate: false
             }
             cc.fx.GameTool.shushu_Track("resource_get", data);
 
@@ -921,7 +920,7 @@ var GameTool = {
     },
 
     //商城购买
-    shopBuy(productId) {
+    shopBuy(productId, compensate) {
         let coin = 0;
         let price = 0;
         let getCoin = 0;
@@ -987,7 +986,7 @@ var GameTool = {
                 cc.fx.GameTool.changeCoin(5000);
                 coin = 5000;
                 price = 1800;
-                this.setUserPowerTime(1800);
+                this.setUserPowerTime(20);
                 // MiniGameSdk.API.showToast("获得无限体力小组合包");
                 rewardData = [
                     { type: "coin", count: coin },
@@ -1004,7 +1003,7 @@ var GameTool = {
                     "magic_wand": 2,
                     "price": price
                 }
-                this.getShopProp(propData, null);
+                this.getShopProp(propData, compensate);
                 this.setUserPowerTime(3600);
                 // MiniGameSdk.API.showToast("获得无限体力大组合包");
                 rewardData = [
@@ -1025,7 +1024,7 @@ var GameTool = {
                     "magic_wand": 6,
                     "price": price
                 }
-                this.getShopProp(propData2, null);
+                this.getShopProp(propData2, compensate);
                 this.setUserPowerTime(7200);
                 // MiniGameSdk.API.showToast("获得无限体力超组合包");
                 rewardData = [
@@ -1055,7 +1054,8 @@ var GameTool = {
         const dataTemp = {
             change_reason: "shop",
             id: "1001",
-            num: coin
+            num: coin,
+            compensate: compensate
         }
         cc.fx.GameTool.shushu_Track("resource_get", dataTemp);
 
@@ -1063,7 +1063,8 @@ var GameTool = {
             item_id: productId,
             item_num: coin,
             item_price: price,
-            cost_type: "cash"
+            cost_type: "cash",
+            compensate: compensate
         }
         cc.fx.GameTool.shushu_Track("shop_buy", buyData);
         MiniGameSdk.API.shushu_SetSuperProperties(null, true);
@@ -1123,7 +1124,8 @@ var GameTool = {
                 eventData = {
                     change_reason: data.change_reason,   //获得来源
                     change_num: data.num,       //获得数量
-                    resource_id: data.id        //道具id
+                    resource_id: data.id,        //道具id
+                    compensate: data.compensate || false, //是否是补发
                 }
                 break;
             case "resource_cost":
@@ -1236,7 +1238,7 @@ var GameTool = {
 
 
     //购买行为，获得道具
-    getShopProp(propData, callback: Function) {
+    getShopProp(propData, compensate) {
         //@ts-ignore
         if (typeof wx !== 'undefined' && wx !== null) {
             const num = propData.freeze;
@@ -1249,19 +1251,22 @@ var GameTool = {
             const data1 = {
                 change_reason: "shop",
                 id: 2001,
-                num: propData.freeze
+                num: propData.freeze,
+                compensate: compensate
             }
             cc.fx.GameTool.shushu_Track("resource_get", data1);
             const data2 = {
                 change_reason: "shop",
                 id: 2002,
-                num: propData.hammer
+                num: propData.hammer,
+                compensate: compensate
             }
             cc.fx.GameTool.shushu_Track("resource_get", data2);
             const data3 = {
                 change_reason: "shop",
                 id: 2003,
-                num: propData.magic_wand
+                num: propData.magic_wand,
+                compensate: compensate
             }
             cc.fx.GameTool.shushu_Track("resource_get", data3);
             const buyData1 = {
@@ -1288,10 +1293,6 @@ var GameTool = {
             }
 
             cc.fx.GameTool.shushu_Track("shop_buy", buyData3);
-
-            if (callback) {
-                callback();
-            }
         }
     },
 

assets/Script/setUi.ts

@@ -8,6 +8,7 @@
 import JiaZai from "./JiaZai";
 import MapConroler from "./Map";
 import SceneManager from "./SceneManager";
+import { MiniGameSdk } from "./Sdk/MiniGameSdk";
 
 
 const { ccclass, property } = cc._decorator;
@@ -132,13 +133,34 @@ export default class setUi extends cc.Component {
 
     //退出游戏
     clickExit() {
+        cc.fx.AudioManager._instance.playEffect("anniu_little", null);
         if (MapConroler._instance.gameStart == true && MapConroler._instance.powerState == false) {
             this.exit.active = true;
+            this.exit.getChildByName("Health").getChildByName("queding").active = false;
         }
         else {
             MapConroler._instance.returnHome();
         }
     }
+
+    //重开游戏
+    clickRestart(event, customEventData) {
+        cc.fx.AudioManager._instance.playEffect("anniu_little", null);
+        if (MapConroler._instance.gameStart == true && MapConroler._instance.powerState == false && customEventData != "hp") {
+            this.exit.active = true;
+            this.exit.getChildByName("Health").getChildByName("queding").active = true;
+        }
+        else {
+            if (customEventData == "hp") {
+                if (cc.fx.GameConfig.GM_INFO.hp <= 0) {
+                    MiniGameSdk.API.showToast("体力值不足");
+                    return;
+                }
+            }
+            MapConroler._instance.againLevel();
+        }
+    }
+
     //取消
     cancelExit() {
         this.exit.active = false;
@@ -157,6 +179,7 @@ export default class setUi extends cc.Component {
     }
     //关闭ui
     closeUi() {
+        cc.fx.AudioManager._instance.playEffect("anniu_little", null);
         cc.fx.AudioManager._instance.playEffect("anniu_little", null);
         this.node.active = false;
     }

assets/TextureBlock/block/down.plist

@@ -15,9 +15,9 @@
                 <key>spriteSourceSize</key>
                 <string>{122,45}</string>
                 <key>textureRect</key>
-                <string>{{628,1023},{122,45}}</string>
+                <string>{{920,1065},{122,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>10down2.png</key>
             <dict>
@@ -30,9 +30,9 @@
                 <key>spriteSourceSize</key>
                 <string>{243,45}</string>
                 <key>textureRect</key>
-                <string>{{205,733},{243,45}}</string>
+                <string>{{435,777},{243,45}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>10down3.png</key>
             <dict>
@@ -45,9 +45,9 @@
                 <key>spriteSourceSize</key>
                 <string>{363,45}</string>
                 <key>textureRect</key>
-                <string>{{237,368},{363,45}}</string>
+                <string>{{432,95},{363,45}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>10down4.png</key>
             <dict>
@@ -60,9 +60,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,124}</string>
                 <key>textureRect</key>
-                <string>{{237,1019},{45,124}}</string>
+                <string>{{935,678},{45,124}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>10down5.png</key>
             <dict>
@@ -75,7 +75,7 @@
                 <key>spriteSourceSize</key>
                 <string>{45,245}</string>
                 <key>textureRect</key>
-                <string>{{331,378},{45,245}}</string>
+                <string>{{675,388},{45,245}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -90,9 +90,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,365}</string>
                 <key>textureRect</key>
-                <string>{{299,143},{45,365}}</string>
+                <string>{{64,402},{45,365}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>1down1.png</key>
             <dict>
@@ -105,9 +105,9 @@
                 <key>spriteSourceSize</key>
                 <string>{122,45}</string>
                 <key>textureRect</key>
-                <string>{{793,949},{122,45}}</string>
+                <string>{{49,1022},{122,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1down2.png</key>
             <dict>
@@ -120,9 +120,9 @@
                 <key>spriteSourceSize</key>
                 <string>{243,45}</string>
                 <key>textureRect</key>
-                <string>{{378,378},{243,45}}</string>
+                <string>{{49,777},{243,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1down3.png</key>
             <dict>
@@ -135,9 +135,9 @@
                 <key>spriteSourceSize</key>
                 <string>{363,45}</string>
                 <key>textureRect</key>
-                <string>{{299,190},{363,45}}</string>
+                <string>{{111,402},{363,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1down4.png</key>
             <dict>
@@ -150,7 +150,7 @@
                 <key>spriteSourceSize</key>
                 <string>{45,124}</string>
                 <key>textureRect</key>
-                <string>{{913,1},{45,124}}</string>
+                <string>{{488,1024},{45,124}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -165,9 +165,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,245}</string>
                 <key>textureRect</key>
-                <string>{{666,49},{45,245}}</string>
+                <string>{{440,388},{45,245}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>1down6.png</key>
             <dict>
@@ -180,9 +180,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,365}</string>
                 <key>textureRect</key>
-                <string>{{64,1},{45,365}}</string>
+                <string>{{65,72},{45,365}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2down1.png</key>
             <dict>
@@ -195,7 +195,7 @@
                 <key>spriteSourceSize</key>
                 <string>{122,45}</string>
                 <key>textureRect</key>
-                <string>{{793,996},{122,45}}</string>
+                <string>{{813,847},{122,45}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -210,9 +210,9 @@
                 <key>spriteSourceSize</key>
                 <string>{243,45}</string>
                 <key>textureRect</key>
-                <string>{{378,425},{243,45}}</string>
+                <string>{{96,769},{243,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2down3.png</key>
             <dict>
@@ -225,9 +225,9 @@
                 <key>spriteSourceSize</key>
                 <string>{363,45}</string>
                 <key>textureRect</key>
-                <string>{{299,237},{363,45}}</string>
+                <string>{{158,402},{363,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2down4.png</key>
             <dict>
@@ -240,7 +240,7 @@
                 <key>spriteSourceSize</key>
                 <string>{45,124}</string>
                 <key>textureRect</key>
-                <string>{{960,1},{45,124}}</string>
+                <string>{{535,1024},{45,124}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -255,9 +255,9 @@
                 <key>spriteSourceSize</key>
                 <string>{61,266}</string>
                 <key>textureRect</key>
-                <string>{{1,757},{61,266}}</string>
+                <string>{{432,206},{61,266}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2down6.png</key>
             <dict>
@@ -270,7 +270,7 @@
                 <key>spriteSourceSize</key>
                 <string>{61,386}</string>
                 <key>textureRect</key>
-                <string>{{1,1},{61,386}}</string>
+                <string>{{1,389},{61,386}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -285,9 +285,9 @@
                 <key>spriteSourceSize</key>
                 <string>{122,45}</string>
                 <key>textureRect</key>
-                <string>{{913,127},{122,45}}</string>
+                <string>{{815,894},{122,45}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>3down2.png</key>
             <dict>
@@ -300,7 +300,7 @@
                 <key>spriteSourceSize</key>
                 <string>{243,45}</string>
                 <key>textureRect</key>
-                <string>{{378,472},{243,45}}</string>
+                <string>{{143,767},{243,45}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -315,9 +315,9 @@
                 <key>spriteSourceSize</key>
                 <string>{363,45}</string>
                 <key>textureRect</key>
-                <string>{{299,284},{363,45}}</string>
+                <string>{{205,402},{363,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>3down4.png</key>
             <dict>
@@ -330,7 +330,7 @@
                 <key>spriteSourceSize</key>
                 <string>{45,124}</string>
                 <key>textureRect</key>
-                <string>{{380,747},{45,124}}</string>
+                <string>{{956,127},{45,124}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -345,9 +345,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,245}</string>
                 <key>textureRect</key>
-                <string>{{666,96},{45,245}}</string>
+                <string>{{487,388},{45,245}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>3down6.png</key>
             <dict>
@@ -360,9 +360,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,365}</string>
                 <key>textureRect</key>
-                <string>{{111,1},{45,365}}</string>
+                <string>{{445,1},{45,365}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>4down1.png</key>
             <dict>
@@ -375,7 +375,7 @@
                 <key>spriteSourceSize</key>
                 <string>{122,45}</string>
                 <key>textureRect</key>
-                <string>{{960,127},{122,45}}</string>
+                <string>{{826,941},{122,45}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -390,7 +390,7 @@
                 <key>spriteSourceSize</key>
                 <string>{243,45}</string>
                 <key>textureRect</key>
-                <string>{{378,519},{243,45}}</string>
+                <string>{{143,814},{243,45}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -405,9 +405,9 @@
                 <key>spriteSourceSize</key>
                 <string>{363,45}</string>
                 <key>textureRect</key>
-                <string>{{299,331},{363,45}}</string>
+                <string>{{252,402},{363,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>4down4.png</key>
             <dict>
@@ -420,9 +420,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,124}</string>
                 <key>textureRect</key>
-                <string>{{380,873},{45,124}}</string>
+                <string>{{831,265},{45,124}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>4down5.png</key>
             <dict>
@@ -435,9 +435,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,245}</string>
                 <key>textureRect</key>
-                <string>{{666,143},{45,245}}</string>
+                <string>{{534,388},{45,245}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>4down6.png</key>
             <dict>
@@ -450,9 +450,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,365}</string>
                 <key>textureRect</key>
-                <string>{{158,1},{45,365}}</string>
+                <string>{{65,119},{45,365}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>5down1.png</key>
             <dict>
@@ -465,7 +465,7 @@
                 <key>spriteSourceSize</key>
                 <string>{122,45}</string>
                 <key>textureRect</key>
-                <string>{{911,251},{122,45}}</string>
+                <string>{{826,1065},{122,45}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -480,7 +480,7 @@
                 <key>spriteSourceSize</key>
                 <string>{243,45}</string>
                 <key>textureRect</key>
-                <string>{{378,566},{243,45}}</string>
+                <string>{{143,861},{243,45}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -495,7 +495,7 @@
                 <key>spriteSourceSize</key>
                 <string>{363,45}</string>
                 <key>textureRect</key>
-                <string>{{49,389},{363,45}}</string>
+                <string>{{299,402},{363,45}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -510,9 +510,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,124}</string>
                 <key>textureRect</key>
-                <string>{{915,759},{45,124}}</string>
+                <string>{{722,621},{45,124}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>5down5.png</key>
             <dict>
@@ -525,9 +525,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,245}</string>
                 <key>textureRect</key>
-                <string>{{664,190},{45,245}}</string>
+                <string>{{581,388},{45,245}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>5down6.png</key>
             <dict>
@@ -540,9 +540,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,365}</string>
                 <key>textureRect</key>
-                <string>{{205,1},{45,365}}</string>
+                <string>{{65,166},{45,365}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>6down1.png</key>
             <dict>
@@ -555,7 +555,7 @@
                 <key>spriteSourceSize</key>
                 <string>{122,45}</string>
                 <key>textureRect</key>
-                <string>{{958,251},{122,45}}</string>
+                <string>{{873,941},{122,45}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -570,9 +570,9 @@
                 <key>spriteSourceSize</key>
                 <string>{243,45}</string>
                 <key>textureRect</key>
-                <string>{{64,754},{243,45}}</string>
+                <string>{{143,908},{243,45}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>6down3.png</key>
             <dict>
@@ -585,7 +585,7 @@
                 <key>spriteSourceSize</key>
                 <string>{363,45}</string>
                 <key>textureRect</key>
-                <string>{{96,368},{363,45}}</string>
+                <string>{{346,402},{363,45}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -600,9 +600,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,124}</string>
                 <key>textureRect</key>
-                <string>{{962,759},{45,124}}</string>
+                <string>{{224,1138},{45,124}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>6down5.png</key>
             <dict>
@@ -615,9 +615,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,245}</string>
                 <key>textureRect</key>
-                <string>{{664,237},{45,245}}</string>
+                <string>{{628,388},{45,245}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>6down6.png</key>
             <dict>
@@ -630,9 +630,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,365}</string>
                 <key>textureRect</key>
-                <string>{{252,1},{45,365}}</string>
+                <string>{{65,213},{45,365}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>7down1.png</key>
             <dict>
@@ -645,7 +645,7 @@
                 <key>spriteSourceSize</key>
                 <string>{122,46}</string>
                 <key>textureRect</key>
-                <string>{{793,901},{122,46}}</string>
+                <string>{{691,912},{122,46}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -660,7 +660,7 @@
                 <key>spriteSourceSize</key>
                 <string>{244,46}</string>
                 <key>textureRect</key>
-                <string>{{664,284},{244,46}}</string>
+                <string>{{440,635},{244,46}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -675,7 +675,7 @@
                 <key>spriteSourceSize</key>
                 <string>{364,46}</string>
                 <key>textureRect</key>
-                <string>{{299,1},{364,46}}</string>
+                <string>{{65,260},{364,46}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -690,7 +690,7 @@
                 <key>spriteSourceSize</key>
                 <string>{46,124}</string>
                 <key>textureRect</key>
-                <string>{{542,613},{46,124}}</string>
+                <string>{{948,1},{46,124}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -705,7 +705,7 @@
                 <key>spriteSourceSize</key>
                 <string>{46,246}</string>
                 <key>textureRect</key>
-                <string>{{665,1},{46,246}}</string>
+                <string>{{432,340},{46,246}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -720,7 +720,7 @@
                 <key>spriteSourceSize</key>
                 <string>{46,366}</string>
                 <key>textureRect</key>
-                <string>{{1,389},{46,366}}</string>
+                <string>{{1,777},{46,366}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -735,9 +735,9 @@
                 <key>spriteSourceSize</key>
                 <string>{122,45}</string>
                 <key>textureRect</key>
-                <string>{{380,999},{122,45}}</string>
+                <string>{{873,1065},{122,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>8down2.png</key>
             <dict>
@@ -750,9 +750,9 @@
                 <key>spriteSourceSize</key>
                 <string>{243,45}</string>
                 <key>textureRect</key>
-                <string>{{111,733},{243,45}}</string>
+                <string>{{143,955},{243,45}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>8down3.png</key>
             <dict>
@@ -765,7 +765,7 @@
                 <key>spriteSourceSize</key>
                 <string>{363,45}</string>
                 <key>textureRect</key>
-                <string>{{143,368},{363,45}}</string>
+                <string>{{393,402},{363,45}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -780,9 +780,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,124}</string>
                 <key>textureRect</key>
-                <string>{{917,885},{45,124}}</string>
+                <string>{{350,1152},{45,124}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>8down5.png</key>
             <dict>
@@ -795,7 +795,7 @@
                 <key>spriteSourceSize</key>
                 <string>{45,245}</string>
                 <key>textureRect</key>
-                <string>{{664,332},{45,245}}</string>
+                <string>{{440,683},{45,245}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -810,7 +810,7 @@
                 <key>spriteSourceSize</key>
                 <string>{45,365}</string>
                 <key>textureRect</key>
-                <string>{{299,49},{45,365}}</string>
+                <string>{{65,308},{45,365}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -825,9 +825,9 @@
                 <key>spriteSourceSize</key>
                 <string>{122,45}</string>
                 <key>textureRect</key>
-                <string>{{504,1015},{122,45}}</string>
+                <string>{{920,941},{122,45}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>9down2.png</key>
             <dict>
@@ -840,7 +840,7 @@
                 <key>spriteSourceSize</key>
                 <string>{243,45}</string>
                 <key>textureRect</key>
-                <string>{{158,733},{243,45}}</string>
+                <string>{{388,767},{243,45}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -855,9 +855,9 @@
                 <key>spriteSourceSize</key>
                 <string>{363,45}</string>
                 <key>textureRect</key>
-                <string>{{190,368},{363,45}}</string>
+                <string>{{445,48},{363,45}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>9down4.png</key>
             <dict>
@@ -870,7 +870,7 @@
                 <key>spriteSourceSize</key>
                 <string>{45,124}</string>
                 <key>textureRect</key>
-                <string>{{111,978},{45,124}}</string>
+                <string>{{809,678},{45,124}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -885,9 +885,9 @@
                 <key>spriteSourceSize</key>
                 <string>{45,245}</string>
                 <key>textureRect</key>
-                <string>{{284,378},{45,245}}</string>
+                <string>{{440,730},{45,245}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>9down6.png</key>
             <dict>
@@ -900,10 +900,55 @@
                 <key>spriteSourceSize</key>
                 <string>{45,365}</string>
                 <key>textureRect</key>
-                <string>{{299,96},{45,365}}</string>
+                <string>{{65,355},{45,365}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
+            <key>heng1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{138,69}</string>
+                <key>spriteSourceSize</key>
+                <string>{138,69}</string>
+                <key>textureRect</key>
+                <string>{{691,278},{138,69}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>heng2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{257,69}</string>
+                <key>spriteSourceSize</key>
+                <string>{257,69}</string>
+                <key>textureRect</key>
+                <string>{{432,269},{257,69}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>heng3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{378,69}</string>
+                <key>spriteSourceSize</key>
+                <string>{378,69}</string>
+                <key>textureRect</key>
+                <string>{{65,1},{378,69}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
             <key>risefall1.png</key>
             <dict>
                 <key>aliases</key>
@@ -915,7 +960,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{284,625},{120,120}}</string>
+                <string>{{582,960},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -930,7 +975,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{793,779},{120,120}}</string>
+                <string>{{813,725},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -945,7 +990,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{887,515},{120,120}}</string>
+                <string>{{582,1082},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -960,7 +1005,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{887,637},{120,120}}</string>
+                <string>{{850,312},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -975,7 +1020,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{427,741},{120,120}}</string>
+                <string>{{850,434},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -990,7 +1035,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{427,863},{120,120}}</string>
+                <string>{{850,556},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1005,7 +1050,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{549,771},{120,120}}</string>
+                <string>{{687,668},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1020,7 +1065,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{549,893},{120,120}}</string>
+                <string>{{691,790},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1035,7 +1080,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{671,779},{120,120}}</string>
+                <string>{{704,960},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1050,7 +1095,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,120}</string>
                 <key>textureRect</key>
-                <string>{{671,901},{120,120}}</string>
+                <string>{{704,1082},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1065,7 +1110,7 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{623,379},{126,134}}</string>
+                <string>{{435,824},{126,134}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1080,7 +1125,7 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{726,651},{126,134}}</string>
+                <string>{{352,1024},{126,134}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1095,7 +1140,7 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{751,379},{126,134}}</string>
+                <string>{{563,824},{126,134}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1110,9 +1155,9 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{623,515},{126,134}}</string>
+                <string>{{700,142},{126,134}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>riseup4.png</key>
             <dict>
@@ -1125,7 +1170,7 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{759,515},{126,134}}</string>
+                <string>{{722,349},{126,134}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1140,9 +1185,9 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{406,613},{126,134}}</string>
+                <string>{{722,485},{126,134}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>riseup6.png</key>
             <dict>
@@ -1155,9 +1200,9 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{252,747},{126,134}}</string>
+                <string>{{812,1},{126,134}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>riseup7.png</key>
             <dict>
@@ -1170,7 +1215,7 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{252,883},{126,134}}</string>
+                <string>{{828,129},{126,134}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1185,7 +1230,7 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{879,379},{126,134}}</string>
+                <string>{{96,1014},{126,134}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1200,10 +1245,55 @@
                 <key>spriteSourceSize</key>
                 <string>{126,134}</string>
                 <key>textureRect</key>
-                <string>{{590,643},{126,134}}</string>
+                <string>{{224,1002},{126,134}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>shu1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{62,145}</string>
+                <key>spriteSourceSize</key>
+                <string>{62,145}</string>
+                <key>textureRect</key>
+                <string>{{435,960},{62,145}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
+            <key>shu2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{62,266}</string>
+                <key>spriteSourceSize</key>
+                <string>{62,266}</string>
+                <key>textureRect</key>
+                <string>{{432,142},{62,266}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>shu3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{62,386}</string>
+                <key>spriteSourceSize</key>
+                <string>{62,386}</string>
+                <key>textureRect</key>
+                <string>{{1,1},{62,386}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
         </dict>
         <key>metadata</key>
         <dict>
@@ -1216,9 +1306,9 @@
             <key>realTextureFileName</key>
             <string>down.png</string>
             <key>size</key>
-            <string>{1008,1069}</string>
+            <string>{1002,1203}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:bcd0c185191512da3445ee7c39e234b1:03c71043c08664016169e35c84d6ee5a:1f82f659e2591d395bca4b2a7c74dd8a$</string>
+            <string>$TexturePacker:SmartUpdate:023ee28010b7b78b3524864d7aaa0703:2e5eba970909b112ab8d79782e9f74f8:1f82f659e2591d395bca4b2a7c74dd8a$</string>
             <key>textureFileName</key>
             <string>down.png</string>
         </dict>

assets/TextureBlock/block/down.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 986,
+  "width": 1002,
-  "height": 708,
+  "height": 1203,
   "platformSettings": {},
   "subMetas": {}
 }

assets/UI/UI/pop/queding.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "5abf048c-550a-4a99-a7c4-146e5dcb1d5f",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 434,
+  "height": 144,
+  "platformSettings": {},
+  "subMetas": {
+    "queding": {
+      "ver": "1.0.6",
+      "uuid": "2fcdd5c3-1633-4fc7-bd96-ada7c7f34102",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "5abf048c-550a-4a99-a7c4-146e5dcb1d5f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 434,
+      "height": 144,
+      "rawWidth": 434,
+      "rawHeight": 144,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/effect/hp.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "6cf5ea5a-e66e-4b12-bb69-bb226ae3cc92",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/effect/hp/light.atlas

@@ -0,0 +1,447 @@
+
+light.png
+size: 1024,160
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+xulie/000
+  rotate: false
+  xy: 1002, 31
+  size: 19, 19
+  orig: 440, 120
+  offset: 78, 70
+  index: -1
+xulie/001
+  rotate: false
+  xy: 821, 2
+  size: 24, 23
+  orig: 440, 120
+  offset: 73, 70
+  index: -1
+xulie/002
+  rotate: false
+  xy: 640, 62
+  size: 28, 25
+  orig: 440, 120
+  offset: 68, 71
+  index: -1
+xulie/003
+  rotate: true
+  xy: 995, 126
+  size: 33, 27
+  orig: 440, 120
+  offset: 62, 71
+  index: -1
+xulie/004
+  rotate: false
+  xy: 904, 22
+  size: 38, 26
+  orig: 440, 120
+  offset: 56, 73
+  index: -1
+xulie/005
+  rotate: false
+  xy: 499, 0
+  size: 42, 23
+  orig: 440, 120
+  offset: 49, 75
+  index: -1
+xulie/006
+  rotate: false
+  xy: 721, 7
+  size: 46, 28
+  orig: 440, 120
+  offset: 43, 70
+  index: -1
+xulie/007
+  rotate: false
+  xy: 207, 10
+  size: 44, 33
+  orig: 440, 120
+  offset: 41, 63
+  index: -1
+xulie/008
+  rotate: false
+  xy: 328, 23
+  size: 39, 42
+  orig: 440, 120
+  offset: 41, 52
+  index: -1
+xulie/009
+  rotate: true
+  xy: 597, 18
+  size: 32, 52
+  orig: 440, 120
+  offset: 42, 40
+  index: -1
+xulie/010
+  rotate: true
+  xy: 578, 52
+  size: 35, 60
+  orig: 440, 120
+  offset: 44, 30
+  index: -1
+xulie/011
+  rotate: true
+  xy: 680, 90
+  size: 43, 65
+  orig: 440, 120
+  offset: 46, 23
+  index: -1
+xulie/012
+  rotate: false
+  xy: 61, 94
+  size: 53, 65
+  orig: 440, 120
+  offset: 48, 17
+  index: -1
+xulie/013
+  rotate: false
+  xy: 0, 99
+  size: 59, 60
+  orig: 440, 120
+  offset: 49, 15
+  index: -1
+xulie/014
+  rotate: true
+  xy: 116, 88
+  size: 71, 48
+  orig: 440, 120
+  offset: 52, 16
+  index: -1
+xulie/015
+  rotate: false
+  xy: 909, 123
+  size: 84, 36
+  orig: 440, 120
+  offset: 58, 17
+  index: -1
+xulie/016
+  rotate: false
+  xy: 869, 73
+  size: 95, 25
+  orig: 440, 120
+  offset: 67, 17
+  index: -1
+xulie/017
+  rotate: false
+  xy: 747, 68
+  size: 105, 21
+  orig: 440, 120
+  offset: 77, 17
+  index: -1
+xulie/018
+  rotate: false
+  xy: 166, 88
+  size: 112, 21
+  orig: 440, 120
+  offset: 89, 17
+  index: -1
+xulie/019
+  rotate: false
+  xy: 545, 89
+  size: 125, 21
+  orig: 440, 120
+  offset: 96, 17
+  index: -1
+xulie/020
+  rotate: false
+  xy: 893, 100
+  size: 130, 21
+  orig: 440, 120
+  offset: 110, 17
+  index: -1
+xulie/021
+  rotate: false
+  xy: 281, 115
+  size: 131, 21
+  orig: 440, 120
+  offset: 129, 17
+  index: -1
+xulie/022
+  rotate: false
+  xy: 281, 92
+  size: 130, 21
+  orig: 440, 120
+  offset: 149, 17
+  index: -1
+xulie/023
+  rotate: false
+  xy: 414, 115
+  size: 131, 21
+  orig: 440, 120
+  offset: 168, 17
+  index: -1
+xulie/024
+  rotate: false
+  xy: 413, 92
+  size: 130, 21
+  orig: 440, 120
+  offset: 188, 17
+  index: -1
+xulie/025
+  rotate: false
+  xy: 760, 115
+  size: 131, 21
+  orig: 440, 120
+  offset: 207, 17
+  index: -1
+xulie/026
+  rotate: false
+  xy: 747, 91
+  size: 120, 22
+  orig: 440, 120
+  offset: 227, 15
+  index: -1
+xulie/027
+  rotate: false
+  xy: 382, 69
+  size: 107, 21
+  orig: 440, 120
+  offset: 246, 15
+  index: -1
+xulie/028
+  rotate: false
+  xy: 113, 64
+  size: 93, 22
+  orig: 440, 120
+  offset: 266, 14
+  index: -1
+xulie/029
+  rotate: false
+  xy: 70, 40
+  size: 81, 22
+  orig: 440, 120
+  offset: 285, 14
+  index: -1
+xulie/030
+  rotate: false
+  xy: 0, 16
+  size: 67, 22
+  orig: 440, 120
+  offset: 305, 14
+  index: -1
+xulie/031
+  rotate: false
+  xy: 651, 3
+  size: 54, 22
+  orig: 440, 120
+  offset: 324, 14
+  index: -1
+xulie/032
+  rotate: false
+  xy: 769, 3
+  size: 50, 22
+  orig: 440, 120
+  offset: 335, 14
+  index: -1
+xulie/033
+  rotate: false
+  xy: 369, 7
+  size: 52, 24
+  orig: 440, 120
+  offset: 341, 15
+  index: -1
+xulie/034
+  rotate: false
+  xy: 851, 18
+  size: 51, 30
+  orig: 440, 120
+  offset: 348, 16
+  index: -1
+xulie/035
+  rotate: false
+  xy: 802, 27
+  size: 47, 39
+  orig: 440, 120
+  offset: 354, 18
+  index: -1
+xulie/036
+  rotate: true
+  xy: 208, 45
+  size: 41, 49
+  orig: 440, 120
+  offset: 360, 20
+  index: -1
+xulie/037
+  rotate: true
+  xy: 382, 33
+  size: 34, 58
+  orig: 440, 120
+  offset: 367, 23
+  index: -1
+xulie/038
+  rotate: true
+  xy: 259, 37
+  size: 28, 67
+  orig: 440, 120
+  offset: 373, 23
+  index: -1
+xulie/039
+  rotate: true
+  xy: 525, 25
+  size: 25, 70
+  orig: 440, 120
+  offset: 375, 27
+  index: -1
+xulie/040
+  rotate: true
+  xy: 733, 37
+  size: 29, 67
+  orig: 440, 120
+  offset: 370, 34
+  index: -1
+xulie/041
+  rotate: true
+  xy: 672, 52
+  size: 36, 59
+  orig: 440, 120
+  offset: 361, 44
+  index: -1
+xulie/042
+  rotate: false
+  xy: 966, 52
+  size: 44, 46
+  orig: 440, 120
+  offset: 351, 57
+  index: -1
+xulie/043
+  rotate: false
+  xy: 153, 28
+  size: 52, 34
+  orig: 440, 120
+  offset: 341, 69
+  index: -1
+xulie/044
+  rotate: false
+  xy: 69, 14
+  size: 61, 24
+  orig: 440, 120
+  offset: 331, 79
+  index: -1
+xulie/045
+  rotate: false
+  xy: 253, 14
+  size: 61, 21
+  orig: 440, 120
+  offset: 326, 82
+  index: -1
+xulie/046
+  rotate: false
+  xy: 132, 5
+  size: 58, 21
+  orig: 440, 120
+  offset: 324, 81
+  index: -1
+xulie/047
+  rotate: false
+  xy: 442, 12
+  size: 55, 24
+  orig: 440, 120
+  offset: 319, 78
+  index: -1
+xulie/048
+  rotate: false
+  xy: 651, 27
+  size: 68, 23
+  orig: 440, 120
+  offset: 296, 78
+  index: -1
+xulie/049
+  rotate: false
+  xy: 442, 38
+  size: 81, 22
+  orig: 440, 120
+  offset: 273, 78
+  index: -1
+xulie/050
+  rotate: false
+  xy: 854, 50
+  size: 94, 21
+  orig: 440, 120
+  offset: 250, 78
+  index: -1
+xulie/051
+  rotate: false
+  xy: 0, 71
+  size: 111, 21
+  orig: 440, 120
+  offset: 227, 78
+  index: -1
+xulie/052
+  rotate: false
+  xy: 547, 112
+  size: 131, 21
+  orig: 440, 120
+  offset: 204, 78
+  index: -1
+xulie/053
+  rotate: false
+  xy: 166, 138
+  size: 152, 21
+  orig: 440, 120
+  offset: 181, 78
+  index: -1
+xulie/054
+  rotate: false
+  xy: 320, 138
+  size: 152, 21
+  orig: 440, 120
+  offset: 158, 78
+  index: -1
+xulie/055
+  rotate: false
+  xy: 474, 138
+  size: 152, 21
+  orig: 440, 120
+  offset: 135, 78
+  index: -1
+xulie/056
+  rotate: false
+  xy: 760, 138
+  size: 147, 21
+  orig: 440, 120
+  offset: 117, 78
+  index: -1
+xulie/057
+  rotate: false
+  xy: 628, 135
+  size: 130, 24
+  orig: 440, 120
+  offset: 111, 79
+  index: -1
+xulie/058
+  rotate: false
+  xy: 166, 111
+  size: 113, 25
+  orig: 440, 120
+  offset: 105, 80
+  index: -1
+xulie/059
+  rotate: false
+  xy: 280, 67
+  size: 100, 23
+  orig: 440, 120
+  offset: 95, 82
+  index: -1
+xulie/060
+  rotate: false
+  xy: 491, 62
+  size: 85, 25
+  orig: 440, 120
+  offset: 87, 79
+  index: -1
+xulie/061
+  rotate: false
+  xy: 0, 40
+  size: 68, 29
+  orig: 440, 120
+  offset: 81, 73
+  index: -1
+xulie/062
+  rotate: false
+  xy: 950, 19
+  size: 50, 31
+  orig: 440, 120
+  offset: 78, 70
+  index: -1

assets/effect/hp/light.atlas.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.3",
+  "uuid": "d076133b-baba-4159-a75a-548ca30c09b2",
+  "importer": "asset",
+  "subMetas": {}
+}

assets/effect/hp/light.json.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.2.5",
+  "uuid": "a1baaeba-23ec-42c0-ad56-f76655ebcb96",
+  "importer": "spine",
+  "textures": [
+    "a7836302-b6b9-444e-abea-fb63bd9c4bff"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

assets/effect/hp/light.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "a7836302-b6b9-444e-abea-fb63bd9c4bff",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 1024,
+  "height": 160,
+  "platformSettings": {},
+  "subMetas": {
+    "light": {
+      "ver": "1.0.6",
+      "uuid": "b50561c2-888d-4304-99d7-3e157cb65353",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a7836302-b6b9-444e-abea-fb63bd9c4bff",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 1023,
+      "height": 159,
+      "rawWidth": 1024,
+      "rawHeight": 160,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/effect/hp/tili.atlas

@@ -0,0 +1,20 @@
+
+tili.png
+size: 16,16
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+star
+  rotate: false
+  xy: 0, 6
+  size: 9, 10
+  orig: 9, 10
+  offset: 0, 0
+  index: -1
+yuan
+  rotate: false
+  xy: 0, 0
+  size: 4, 4
+  orig: 4, 4
+  offset: 0, 0
+  index: -1

assets/effect/hp/tili.atlas.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.3",
+  "uuid": "812be425-ba87-4171-9650-18f1a3e8cd65",
+  "importer": "asset",
+  "subMetas": {}
+}

assets/effect/hp/tili.json.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.2.5",
+  "uuid": "0dec3546-fb91-46f1-8ef8-9689b3f561db",
+  "importer": "spine",
+  "textures": [
+    "ba2acce8-140f-4fad-85f7-be49cb40d5e9"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

assets/effect/hp/tili.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "ba2acce8-140f-4fad-85f7-be49cb40d5e9",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 16,
+  "height": 16,
+  "platformSettings": {},
+  "subMetas": {
+    "tili": {
+      "ver": "1.0.6",
+      "uuid": "98a53d3a-df59-4378-8ed5-1ac8d17dcf7a",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "ba2acce8-140f-4fad-85f7-be49cb40d5e9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -3.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 9,
+      "height": 16,
+      "rawWidth": 16,
+      "rawHeight": 16,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/prefab/pop/heathpop.prefab

@@ -2506,7 +2506,7 @@
       "__id__": 15
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 67

assets/resources/prefab/wall/down.prefab

@@ -1106,7 +1106,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 22.25,
+      "width": 0,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1325,7 +1325,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 22.25,
+      "width": 0,
       "height": 50.4
     },
     "_anchorPoint": {

assets/shop/script/shop.ts

@@ -38,6 +38,7 @@ export default class NewClass extends cc.Component {
     private iosProductId: string = "";
     private iosCount: number = 1;
     scheduleCallback3: any;
+    scheduleCallback2: Function;
 
 
     onLoad() {
@@ -56,16 +57,20 @@ export default class NewClass extends cc.Component {
     start() {
         this.btn_Touch = true;
         this.openShop();
-        this.setHealthInfo();
+        this.init();
     }
 
     init() {
         this.btn_Touch = true;
         var timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
         // 同步显示
-        if (this.Stamina && this.Stamina.getChildByName("time")) {
+        // if (this.Stamina && this.Stamina.getChildByName("time")) {
-            this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp;
+        //     this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp;
-        }
+        // }
+        this.stopTimeCutDown();
+        this.stopPowerTime();
+        this.updatePower();
+        this.setHealthInfo(true);
     }
     //打开商店界面
     openShop() {
@@ -184,7 +189,13 @@ export default class NewClass extends cc.Component {
                                     if (res.code === 1) {
                                         console.log("_________正式发货");
                                         MiniGameSdk.API.showToast("充值成功");
-                                        cc.fx.GameTool.shopBuy(this.iosProductId);
+                                        cc.fx.GameTool.shopBuy(this.iosProductId, false);
+                                        if (this.iosProductId == "unlimited_health_bundle_1" ||
+                                            this.iosProductId == "unlimited_health_bundle_2" ||
+                                            this.iosProductId == "unlimited_health_bundle_3"
+                                        ) {
+                                            this.updatePower();
+                                        }
                                         //console.log("充值成功获得金币");
                                     }
                                     else {
@@ -255,8 +266,8 @@ export default class NewClass extends cc.Component {
         this.node.getChildByName("Loading").active = false;
     }
 
-    setHealthInfo() {
+    setHealthInfo(type) {
-        if (cc.fx.GameConfig.GM_INFO.hp >= 5) {
+        if (cc.fx.GameConfig.GM_INFO.hp >= cc.fx.GameConfig.GM_INFO.hp_Max) {
             this.Stamina.getChildByName("man").active = true;
             this.Stamina.getChildByName("health").active = true;
             NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false);
@@ -270,12 +281,20 @@ export default class NewClass extends cc.Component {
             if (cc.fx.GameConfig.GM_INFO.min_Time != 0) {
                 let time = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
                 this.Stamina.getChildByName("time").getComponent(cc.Label).string = time;
+                let power = cc.fx.GameTool.getUserPowerTime();
+                if (!power) this.Stamina.getChildByName("time").opacity = 255;
+                else this.Stamina.getChildByName("time").opacity = 0;
+                this.stopTimeCutDown();
                 this.startTimeCutDown();
             }
         }
     }
 
     startTimeCutDown() {
+        this.stopTimeCutDown();
+        if (this.scheduleCallback3) {
+            this.unschedule(this.scheduleCallback3);
+        }
         this.scheduleCallback3 = function () {
             if (this.pause) return;
             if (cc.fx.GameConfig.GM_INFO.min_Time <= 0) {
@@ -288,7 +307,7 @@ export default class NewClass extends cc.Component {
                 MiniGameSdk.API.showToast("恢复一点滴点体力");
                 cc.fx.GameTool.setUserHealth(1, (data) => {
                     cc.fx.GameTool.getHealth(null);
-                    this.setHealthInfo();
+                    this.setHealthInfo(true);
                 })
             }
             else {
@@ -298,6 +317,9 @@ export default class NewClass extends cc.Component {
                 var timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time);
                 // 同步显示
                 if (this.Stamina && this.Stamina.getChildByName("time")) {
+                    let power = cc.fx.GameTool.getUserPowerTime();
+                    if (!power) this.Stamina.getChildByName("time").opacity = 255;
+                    else this.Stamina.getChildByName("time").opacity = 0;
                     this.Stamina.getChildByName("time").getComponent(cc.Label).string = timeTemp;
                 }
             }
@@ -309,6 +331,7 @@ export default class NewClass extends cc.Component {
     stopTimeCutDown() {
         if (this.scheduleCallback3) {
             this.unschedule(this.scheduleCallback3);
+            this.scheduleCallback3 = null;
         }
     }
 
@@ -384,6 +407,18 @@ export default class NewClass extends cc.Component {
             });
         }
         else {
+            // MiniGameSdk.API.showToast("充值成功");
+            // cc.fx.GameTool.shopBuy(productId, false);
+            // setTimeout(() => {
+            //     if (productId == "unlimited_health_bundle_1" ||
+            //         productId == "unlimited_health_bundle_2" ||
+            //         productId == "unlimited_health_bundle_3"
+            //     ) {
+            //         console.log("触发————————updatePower");
+            //         this.updatePower();
+            //     }
+            // }, 500);
+
             this.openLoad();
             //console.log("7.14_____________________", "调用充值接口");
             Utils.buyProp(id, count, price, systemType, productId, (res) => {
@@ -460,7 +495,13 @@ export default class NewClass extends cc.Component {
                                     if (res.code === 1) {
                                         console.log("7.14_________正式发货");
                                         MiniGameSdk.API.showToast("充值成功");
-                                        cc.fx.GameTool.shopBuy(productId);
+                                        cc.fx.GameTool.shopBuy(productId, false);
+                                        if (productId == "unlimited_health_bundle_1" ||
+                                            productId == "unlimited_health_bundle_2" ||
+                                            productId == "unlimited_health_bundle_3"
+                                        ) {
+                                            this.updatePower();
+                                        }
                                         //console.log("充值成功获得金币");
                                     }
                                     else {
@@ -507,5 +548,79 @@ export default class NewClass extends cc.Component {
         }
 
     }
+
+
+    //无限体力刷新功能
+    updatePower() {
+        console.log("无限体力时间戳:", cc.fx.GameConfig.GM_INFO.userPowerTime)
+        if (cc.fx.GameConfig.GM_INFO.userPowerTime != 0) {
+            let nowTime = Math.floor(Date.now() / 1000);
+            if (cc.fx.GameConfig.GM_INFO.userPowerTime > nowTime) {
+                this.stopPowerTime();
+                this.startPowerTime();
+                console.log("还有无限体力时间_____________", (cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime));
+                this.Stamina.getChildByName("skyLine").active = true;
+                this.Stamina.getChildByName("time").opacity = 0;
+                this.Stamina.getChildByName("man").active = false;
+            }
+            else {
+                this.Stamina.getChildByName("skyLine").active = false;
+                console.log("无限体力时间已过期");
+                this.setHealthInfo(true);
+            }
+        }
+        else {
+            this.Stamina.getChildByName("skyLine").active = false;
+            this.setHealthInfo(true);
+            console.log("没有无限体力时间");
+        }
+    }
+
+    startPowerTime() {
+        this.stopPowerTime();
+        this.scheduleCallback2 = function () {
+            let nowTime = Math.floor(Date.now() / 1000);
+            if (cc.fx.GameConfig.GM_INFO.userPowerTime < nowTime) {
+                this.Stamina.getChildByName("skyLine").active = false;
+                this.stopPowerTime();
+                this.setHealthInfo(true);
+                return;
+            }
+            else {
+                this.Stamina.getChildByName("skyLine").active = true;
+                this.Stamina.getChildByName("time").opacity = 0;
+                this.Stamina.getChildByName("man").active = false;
+            }
+            let time = cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime;
+            if (time <= 0) {
+                time = 0;
+                this.Stamina.getChildByName("skyLine").active = false;
+                this.stopPowerTime();
+                this.setHealthInfo(true);
+                var timeTemp = cc.fx.GameTool.getTimeMargin2(time);
+                // 同步显示
+                if (this.Stamina && this.Stamina.getChildByName("skyLine").getChildByName("skyTime")) {
+                    this.Stamina.getChildByName("skyLine").getChildByName("skyTime").getComponent(cc.Label).string = timeTemp;
+                }
+            }
+            else {
+                var timeTemp = cc.fx.GameTool.getTimeMargin2(time);
+                // 同步显示
+                if (this.Stamina && this.Stamina.getChildByName("skyLine").getChildByName("skyTime")) {
+                    this.Stamina.getChildByName("skyLine").getChildByName("skyTime").getComponent(cc.Label).string = timeTemp;
+                }
+            }
+        }.bind(this);
+        this.schedule(this.scheduleCallback2, 1);
+    }
+
+    stopPowerTime() {
+        cc.fx.GameTool.getUserPowerTime();
+        if (this.scheduleCallback2) {
+            this.unschedule(this.scheduleCallback2);
+            this.scheduleCallback2 = null;
+        }
+    }
+
     // update (dt) {}
 }