m

.idea/workspace.xml

@@ -5,8 +5,8 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/loadingScene/loadingBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/loadingScene/loadingBg.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -65,7 +65,7 @@
       <recent name="$PROJECT_DIR$/lotties" />
     </key>
   </component>
-  <component name="RunManager" selected="npm.buildTS">
+  <component name="RunManager" selected="npm.build">
     <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
       <package-json value="$PROJECT_DIR$/package.json" />
       <command value="run" />
@@ -114,9 +114,9 @@
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="npm.build" />
         <item itemvalue="npm.buildTS" />
         <item itemvalue="npm.dev" />
-        <item itemvalue="npm.build" />
         <item itemvalue="npm.flushRes" />
       </list>
     </recent_temporary>
@@ -135,14 +135,8 @@
       <workItem from="1613698993022" duration="22309000" />
       <workItem from="1613785579125" duration="17751000" />
       <workItem from="1613958457445" duration="19850000" />
-      <workItem from="1614131869846" duration="4728000" />
-    </task>
-    <task id="LOCAL-00008" summary="Failed">
-      <created>1612603219646</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1612603219647</updated>
+      <workItem from="1614131869846" duration="4880000" />
+      <workItem from="1614219160308" duration="168000" />
     </task>
     <task id="LOCAL-00009" summary="20210206">
       <created>1612608155005</created>
@@ -480,7 +474,14 @@
       <option name="project" value="LOCAL" />
       <updated>1614138351793</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="m">
+      <created>1614139182774</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1614139182774</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

output.js

@@ -7694,7 +7694,7 @@ exports.ResJson = {
             }
         }
     ],
-    "path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1614064773/resource/"
+    "path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1614219232/resource/"
 };
 
 
@@ -8294,6 +8294,7 @@ var Tools = (function () {
     };
     Tools.addSteps = 5;
     Tools.maxLevel = 99;
+    Tools.musicOn = true;
     Tools.cacheKey = "guideFLXXL";
     Tools.actEnd = false;
     return Tools;
@@ -15045,23 +15046,22 @@ var PlayScene = (function (_super) {
     return PlayScene;
 }(Scene_1.Scene));
 exports.PlayScene = PlayScene;
-var isOn = true;
 var MusicBtn = (function (_super) {
     __extends(MusicBtn, _super);
     function MusicBtn() {
         var _this = this;
-        var t = RES_1.RES.getRes("musicOn.png");
+        var t = RES_1.RES.getRes(Tools_1.Tools.musicOn ? "musicOn.png" : "musicOff.png");
         _this = _super.call(this, t) || this;
         _this.addEventListener(FYGE.MouseEvent.CLICK, function () {
-            isOn = !isOn;
-            _this.texture = RES_1.RES.getRes(isOn ? "musicOn.png" : "musicOff.png");
-            TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: isOn });
+            Tools_1.Tools.musicOn = !Tools_1.Tools.musicOn;
+            _this.texture = RES_1.RES.getRes(Tools_1.Tools.musicOn ? "musicOn.png" : "musicOff.png");
+            TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: Tools_1.Tools.musicOn });
         }, _this);
         Main_1.GDispatcher.addEventListener(G_EVENT_1.G_EVENT.ON_SHOW, _this.onShow, _this);
         return _this;
     }
     MusicBtn.prototype.onShow = function () {
-        if (isOn)
+        if (Tools_1.Tools.musicOn)
             TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: true });
     };
     MusicBtn.prototype.destroy = function () {

src/ResJson.ts

@@ -5821,5 +5821,5 @@ export const ResJson = {
 			}
 		}
 	],
-	"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1614064773/resource/"
+	"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1614219232/resource/"
 }
\ No newline at end of file