游戏结束中体力

mock/miniTb/popmartXXL2c.doJoin.json

@@ -4,6 +4,6 @@
     "message": "成功",
     "data": {
         "power": 100,
-        "isGiftPrizeLevel": false
+        "isGiftPrizeLevel": true
     }
 }

mock/miniTb/popmartXXL2c.drawLotteryPrize.json

 {
     "code": "000000",
     "data": {
-        "image": "https://img.alicdn.com/imgextra/i3/2885348004/O1CN01Lw5ZoM28zsjhMDLVE_!!2885348004-0-miniprogram.jpg",
-        "name": "游戏测试3",
-        "id": "5f8059c8e5c0d7c634f186c5",
-        "type": 1
+        "name": "体力",
+        "type": 6,
+        "toolType": "power"
     },
     "success": true,
     "message": "成功"
-}
+}
\ No newline at end of file

mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json

 {
     "code": "000000",
     "data": {
-        "currentLevel": 1,
+        "currentLevel": 4,
         "isFirstLogin": false,
         "records": [{
             "score": 0,
@@ -28,4 +28,4 @@
     },
     "success": true,
     "message": "成功"
-}
+}
\ No newline at end of file

output.js

@@ -13565,13 +13565,15 @@ var Tools = (function () {
                 if (s) {
                     _this.propInfo[type] -= 1;
                     TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getToolsInfo, {}, function (st, rt) {
-                        if (!st)
+                        if (!st) {
+                            resolve(true);
                             return;
-                        _this.propInfo.booms = +rt.data.tools.booms;
-                        _this.propInfo.steps = +rt.data.tools.steps;
-                        _this.propInfo.hammers = +rt.data.tools.hammers;
+                        }
+                        _this.propInfo.booms = Tools.propInfo.booms = +rt.data.tools.booms;
+                        _this.propInfo.steps = Tools.propInfo.steps = +rt.data.tools.steps;
+                        _this.propInfo.hammers = Tools.propInfo.hammers = +rt.data.tools.hammers;
+                        resolve(true);
                     });
-                    resolve(true);
                 }
                 else {
                     resolve(false);

resource/res.json

@@ -49,7 +49,7 @@
 			"name": "bonus"
 		},
 		{
-			"keys": "boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,开心收下.png,确定.png,继续闯关大.png,继续闯关小.png",
+			"keys": "boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,power.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,开心收下.png,确定.png,继续闯关大.png,继续闯关小.png",
 			"name": "common"
 		},
 		{

src/panels/FesRedPrizePanel.ts

 import { Panel } from "../../module/views/Panel";
-import { PropType } from "../something/enum/PropType";
 import { RES } from "../../module/RES";
 import { Tools } from "../Tools";
 import { getTbData, TbNetName } from "../TaoBaoNet";
@@ -9,12 +8,6 @@ import Sprite = FYGE.Sprite;
 import MouseEvent = FYGE.MouseEvent;
 import Button = FYGE.Button;
 
-const propImg = {
-    [PropType.BOOMS]: 'boomBtn.png',
-    [PropType.HAMMERS]: 'hammerBtn.png',
-    [PropType.STEPS]: 'stepBtn.png'
-}
-
 export class FesRedPrizePanel extends Panel {
     get groupNames() {
         return ['FesRedPrizePanel']
@@ -38,7 +31,7 @@ export class FesRedPrizePanel extends Panel {
 
     initUi() {
 
-        // const {stars, tool, prize} = this.data; 
+        // const {stars, tool, prize} = this.data;
 
         this.addChild(Tools.getSprite('FesRedPrizeBg.png'))
             .position.set(53, 209);

src/panels/SuccessPrizePanel.ts

@@ -16,7 +16,8 @@ import { sendTbNet, TbNetName } from "../TaoBaoNet";
 const propImg = {
     [PropType.BOOMS]: 'boomBtn.png',
     [PropType.HAMMERS]: 'hammerBtn.png',
-    [PropType.STEPS]: 'stepBtn.png'
+    [PropType.STEPS]: 'stepBtn.png',
+    [PropType.POWER]:'power.png'
 }
 
 export class SuccessPrizePanel extends Panel {

src/scene/LoadingScene.ts

@@ -29,7 +29,7 @@ export class LoadingScene extends Scene {
 
         const loadingTitle = this.addChild(new Lottie(pop_loading_title));
         console.log(loadingTitle);
-        
+
         loadingTitle.play(1);
 
         //进度条底图
@@ -61,15 +61,12 @@ export class LoadingScene extends Scene {
     async start() {
         super.start()
 
-        // 访问页面埋点
-        sendTbNet(TbNetName.reportAnalytics, {logkey: 'visit'});
-
         this.addEventListener(FYGE.Event.PROGRESS, this.progressEvent, this)
         //首次进度一点
         this.dispatchEvent(FYGE.Event.PROGRESS, 0.2)
 
         //获取app数据
-        Tools.getAppData();
+        await Tools.getAppData();
 
         this.dispatchEvent(FYGE.Event.PROGRESS, 0.3)
         //询问读取权限，不阻止进程