m

.idea/workspace.xml

@@ -3,11 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mock/miniTb/aa.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/aa.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -136,14 +135,7 @@
       <workItem from="1613698993022" duration="22309000" />
       <workItem from="1613785579125" duration="17751000" />
       <workItem from="1613958457445" duration="19850000" />
-      <workItem from="1614131869846" duration="4308000" />
-    </task>
-    <task id="LOCAL-00007" summary="NoStep">
-      <created>1612602696160</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1612602696160</updated>
+      <workItem from="1614131869846" duration="4728000" />
     </task>
     <task id="LOCAL-00008" summary="Failed">
       <created>1612603219646</created>
@@ -481,7 +473,14 @@
       <option name="project" value="LOCAL" />
       <updated>1614135665220</updated>
     </task>
-    <option name="localTasksCounter" value="56" />
+    <task id="LOCAL-00056" summary="m">
+      <created>1614138351793</created>
+      <option name="number" value="00056" />
+      <option name="presentableId" value="LOCAL-00056" />
+      <option name="project" value="LOCAL" />
+      <updated>1614138351793</updated>
+    </task>
+    <option name="localTasksCounter" value="57" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

output.js

@@ -8064,6 +8064,19 @@ var Tools = (function () {
                         Tools.gameData.prizeLevels.push(+k.split('level')[1]);
                     }
                     Tools.gameData.prizeLevels.sort(function (a, b) { return a - b; });
+                    if (my && my.getServerTime) {
+                        my.getServerTime({
+                            success: function (t) {
+                                Tools.actEnd = (+res.data.endTime <= +t.time);
+                            },
+                            failed: function () {
+                                Tools.actEnd = (+res.data.endTime <= Date.now());
+                            }
+                        });
+                    }
+                    else {
+                        Tools.actEnd = (+res.data.endTime <= Date.now());
+                    }
                 }
                 r(s);
             });
@@ -8282,6 +8295,7 @@ var Tools = (function () {
     Tools.addSteps = 5;
     Tools.maxLevel = 99;
     Tools.cacheKey = "guideFLXXL";
+    Tools.actEnd = false;
     return Tools;
 }());
 exports.Tools = Tools;
@@ -15848,6 +15862,10 @@ var MapUI = (function (_super) {
                 }, true);
                 break;
             case this.taskBtn:
+                if (Tools_1.Tools.actEnd) {
+                    ctrls_1.showToast("活动已结束");
+                    return;
+                }
                 Tools_1.Tools.openTask();
                 break;
             case this.clearanceBtn:

src/Tools.ts

@@ -20,6 +20,7 @@ export class Tools {
 
     public static addSteps = 5;
     public static maxLevel = 99;
+    public static musicOn = true;
 
     /**
      * 缓存key

src/scene/PlayScene.ts

@@ -2884,17 +2884,15 @@ export class PlayScene extends Scene {
 //     }
 //     return currentTarget
 // }
-let isOn: boolean = true;
 class MusicBtn extends FYGE.Sprite {
-    // private isOn: boolean;
     constructor() {
-        var t = RES.getRes("musicOn.png")
+        var t = RES.getRes(Tools.musicOn ? "musicOn.png" : "musicOff.png");
         super(t)
         this.addEventListener(FYGE.MouseEvent.CLICK, () => {
-            isOn = !isOn;
-            this.texture = RES.getRes(isOn ? "musicOn.png" : "musicOff.png");
+            Tools.musicOn = !Tools.musicOn;
+            this.texture = RES.getRes(Tools.musicOn ? "musicOn.png" : "musicOff.png");
             //播放或暂停音乐接口
-            sendTbNet(TbNetName.openMusic, { isOn: isOn })
+            sendTbNet(TbNetName.openMusic, { isOn: Tools.musicOn })
         }, this);
         //默认开启
         // this.isOn = true;
@@ -2903,7 +2901,7 @@ class MusicBtn extends FYGE.Sprite {
         GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.onShow, this)
     }
     onShow() {
-        if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
+        if (Tools.musicOn) sendTbNet(TbNetName.openMusic, { isOn: true })
     }
     destroy() {
         // sendTbNet(TbNetName.openMusic, { isOn: false })