1

output.js

@@ -13554,13 +13554,23 @@ var Tools = (function () {
                         Tools.propInfo.hammers = data.tools.hammers || 0;
                     }
                     Tools.propInfo.power = data.power || 0;
+                    if (my && my.getServerTime) {
                         my.getServerTime({
                             success: function (t) {
                                 Tools.actEnd = (+res.data.endTime <= +t.time);
                                 Tools.actStart = (+t.time >= +res.data.startTime);
+                            },
+                            failed: function () {
+                                Tools.actEnd = (+res.data.endTime <= Date.now());
+                                Tools.actStart = (Date.now() >= +res.data.startTime);
                             }
                         });
                     }
+                    else {
+                        Tools.actEnd = (+res.data.endTime <= Date.now());
+                        Tools.actStart = (Date.now() >= +res.data.startTime);
+                    }
+                }
                 r(s);
             });
         });
@@ -20965,7 +20975,6 @@ var MapScene_1 = __webpack_require__(/*! ../scene/map/MapScene */ "./src/scene/m
 var MouseEvent = FYGE.MouseEvent;
 var Button = FYGE.Button;
 var Texture = FYGE.Texture;
-var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
 var propImg = (_a = {},
     _a[PropType_1.PropType.BOOMS] = 'boomBtn.png',
     _a[PropType_1.PropType.HAMMERS] = 'hammerBtn.png',
@@ -21055,9 +21064,7 @@ var SuccessPrizePanel = (function (_super) {
         _super.prototype.start.call(this);
     };
     SuccessPrizePanel.prototype.lookPrize = function () {
-        ctrls_1.changeScene(MapScene_1.MapScene);
-        TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateTo, { url: '/pages/myprize/myprize' }, function () {
-        }, true);
+        ctrls_1.changeScene(MapScene_1.MapScene, { doSomething: 'toMyPrize' });
         _super.prototype.hidePanel.call(this);
     };
     SuccessPrizePanel.prototype.again = function () {
@@ -21187,13 +21194,13 @@ var TaskPanel = (function (_super) {
         this.isShowing = true;
         this.y = layers_1.layers.stageHeight + this.height;
         Tween.get(this)
-            .to({ y: 0 }, 500, Ease.quartOut)
+            .to({ y: 80 - layers_1.layers.stageOffsetY }, 500, Ease.quartOut)
             .call(function () {
             _this.isShowing = false;
         });
     };
     TaskPanel.prototype.initUi = function () {
-        this.scroll = this.addChild(new ScrollList(TaskItem, 700, 180, 700, 808));
+        this.scroll = this.addChild(new ScrollList(TaskItem, 700, 180, 700, 878));
         this.scroll.position.set(25, 670);
     };
     TaskPanel.prototype.start = function (data) {
@@ -24464,6 +24471,12 @@ var MapScene = (function (_super) {
             ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel);
             Tools_1.Tools.globalData.loginAddPower = false;
         }
+        if (this.data && this.data.doSomething && this.data.doSomething == 'toMyPrize') {
+            setTimeout(function () {
+                TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateTo, { url: '/pages/myprize/myprize' }, function () {
+                }, true);
+            }, 100);
+        }
     };
     MapScene.prototype.updateMapCheck = function () {
         var _this = this;

src/panels/SuccessPrizePanel.ts

@@ -110,14 +110,14 @@ export class SuccessPrizePanel extends Panel {
      * 查看奖品
      */
     private lookPrize() {
-        changeScene(MapScene);
-        sendTbNet(
-            TbNetName.navigateTo,
-            { url: '/pages/myprize/myprize' },
-            () => {
-            },
-            true
-        );
+        changeScene(MapScene, {doSomething:'toMyPrize'});
+        // sendTbNet(
+        //     TbNetName.navigateTo,
+        //     { url: '/pages/myprize/myprize' },
+        //     () => {
+        //     },
+        //     true
+        // );
         super.hidePanel();
     }
 

src/scene/map/MapScene.ts

@@ -56,6 +56,18 @@ export class MapScene extends Scene {
             Tools.globalData.loginAddPower = false;
         }
 
+        if (this.data && this.data.doSomething && this.data.doSomething == 'toMyPrize') {
+            setTimeout(() => {
+                sendTbNet(
+                    TbNetName.navigateTo,
+                    {url: '/pages/myprize/myprize'},
+                    () => {
+                    },
+                    true
+                );
+            }, 100);
+        }
+
     }
 
     private updateMapCheck() {
@@ -93,7 +105,7 @@ export class MapScene extends Scene {
         mapGuide.mouseEnable = false;
 
 
-        const guide_check = guide.addChild(new CheckBtn({ check: 1 }));
+        const guide_check = guide.addChild(new CheckBtn({check: 1}));
         guide_check.enabled = true;
         guide_check.type = CHECK_TYPE.CUR;
         guide_check.position.set(MapScene.checkArr[1].x, MapScene.checkArr[1].y + 140 * layers.stageOffsetY / 812);
@@ -120,7 +132,7 @@ export class MapScene extends Scene {
         guide.alpha = 0;
 
         Tween.get(guide)
-            .to({ alpha: 1 }, 600, Ease.quadInOut);
+            .to({alpha: 1}, 600, Ease.quadInOut);
 
         // Tween.get(guide_fox)
         //     .wait(300)
@@ -178,7 +190,7 @@ export class MapScene extends Scene {
         const arr = new Array(120);
 
         for (let i = 0; i < 120; i++) {
-            arr[i] = { check: i + 1 };
+            arr[i] = {check: i + 1};
         }
         arr.reverse();
 
@@ -243,7 +255,7 @@ export class MapScene extends Scene {
 
         // 如果有邀请人就去助力
         if (Tools.globalData.inviteId) {
-            sendTbNet(TbNetName.doHelp, { inviteId: Tools.globalData.inviteId },
+            sendTbNet(TbNetName.doHelp, {inviteId: Tools.globalData.inviteId},
                 (success, res) => {
                     Tools.globalData.inviteId = null;
                     if (success) showToast('助力成功');