m

.idea/workspace.xml

@@ -3,10 +3,8 @@
   <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$/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/panels/NoEnergyPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/NoEnergyPanel.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.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/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -65,7 +63,7 @@
       <recent name="$PROJECT_DIR$/lotties" />
     </key>
   </component>
-  <component name="RunManager" selected="npm.buildTS">
+  <component name="RunManager" selected="npm.dev">
     <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
       <package-json value="$PROJECT_DIR$/package.json" />
       <command value="run" />
@@ -118,10 +116,10 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="npm.dev" />
         <item itemvalue="npm.buildTS" />
         <item itemvalue="npm.build" />
         <item itemvalue="npm.flushRes" />
-        <item itemvalue="npm.dev" />
         <item itemvalue="npm.copyJs" />
       </list>
     </recent_temporary>
@@ -137,7 +135,7 @@
       <workItem from="1612576979459" duration="13000" />
       <workItem from="1612577003915" duration="21094000" />
       <workItem from="1612662929222" duration="40609000" />
-      <workItem from="1613698993022" duration="7731000" />
+      <workItem from="1613698993022" duration="11457000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -272,7 +270,14 @@
       <option name="project" value="LOCAL" />
       <updated>1613706865023</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="m">
+      <created>1613707149083</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1613707149083</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

src/scene/LoadingScene.ts

@@ -4,9 +4,10 @@ import { ProgressBarS } from "../common/ProgressBarS";
 import { RES } from "../../module/RES";
 import { sendTbNet, TbNetName } from "../TaoBaoNet";
 import { layers } from "../../module/views/layers";
-import { changeScene, showPanel, showToast } from "../../module/ctrls";
-import { LotteryPanel } from "../panels/LotteryPanel";
-import { MapScene } from "./map/MapScene";
+import { showToast } from "../../module/ctrls";
+import TEXT_ALIGN = FYGE.TEXT_ALIGN;
+import TextField = FYGE.TextField;
+import Tween = FYGE.Tween;
 
 export class LoadingScene extends Scene {
     get groupNames() {
@@ -14,6 +15,7 @@ export class LoadingScene extends Scene {
     }
 
     progressBar: ProgressBarS;
+    loadingTxt: TextField;
 
     initUi() {
         //适配
@@ -27,6 +29,32 @@ export class LoadingScene extends Scene {
 
         //@ts-ignore 进度条托管
         this.progressBar = new ProgressBarS(pro);
+
+        this.loadingTxt = this.addChild(Tools.getText(
+            `loading...`, 28, "#feeeea",
+            TEXT_ALIGN.CENTER, 750, 0, 841
+        ));
+
+        this.dotTween = Tween.get(FYGE, { loop: true })
+            .to({}, 500)
+            .call(() => {
+                this.dotCount = ++this.dotCount % 3 || 3;
+                this.loadingTxt.text = `loading${this.strMul('.', this.dotCount)}`;
+            });
+    }
+
+    dotTween = null;
+    dotCount = 0;
+
+    /**
+     * string 乘法
+     * @param str
+     * @param by
+     */
+    strMul(str, by) {
+        by = (by >> 0);
+        const t = (by > 1 ? this.strMul(str, by / 2) : '');
+        return t + (by % 2 ? t + str : t);
     }
 
     async start() {
@@ -65,16 +93,16 @@ export class LoadingScene extends Scene {
     progressEvent(e: FYGE.Event) {
         let pro = e.data;
         FYGE.Tween.get(this.progressBar, null, null, true)
-            .to({value: pro}, 2000/**(p-this.lastP)*/)
+            .to({ value: pro }, 2000/**(p-this.lastP)*/)
             .call(() => {
                 if (pro >= 1) {
                     this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
-                    changeScene(MapScene, {from: "loading"})
+                    // changeScene(MapScene, {from: "loading"});
                     // showPanel(LotteryPanel);
                     // changeScene(PlayScene, { chapter: 1 });
                     // changeScene(LotteryScene,{level:1});
                 }
-            })
+            });
         // this.lastP=p
     }
 
@@ -83,6 +111,8 @@ export class LoadingScene extends Scene {
         // FYGE.Tween.removeTweens()
         super.destroy()
         //到时如果内存炸了，考虑销毁用过的贴图缓存，待测试，在RES里写个根据销毁组内贴图的方法
+
+        Tween.removeTweenSelf(this.dotTween);
     }
 }