20210206

.idea/workspace.xml

@@ -2,15 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
-      <change afterPath="$PROJECT_DIR$/resource/FailedPanel/failedBtn.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/FailedPanel/failedTxt.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/FailedPanel/失败Bg.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/FailedPanel/失败重新闯关.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/panels/FailedPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FailedPanel.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$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -115,7 +109,7 @@
       <option name="presentableId" value="Default" />
       <updated>1612576978320</updated>
       <workItem from="1612576979459" duration="13000" />
-      <workItem from="1612577003915" duration="19756000" />
+      <workItem from="1612577003915" duration="21073000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -166,7 +160,14 @@
       <option name="project" value="LOCAL" />
       <updated>1612602696160</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <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>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -182,6 +183,7 @@
     <MESSAGE value="Rule" />
     <MESSAGE value="NoEnergyPanel" />
     <MESSAGE value="NoStep" />
-    <option name="LAST_COMMIT_MESSAGE" value="NoStep" />
+    <MESSAGE value="Failed" />
+    <option name="LAST_COMMIT_MESSAGE" value="Failed" />
   </component>
 </project>
\ No newline at end of file

src/SkinJson.ts

@@ -329,16 +329,6 @@ export const SkinJson = {
                     },
                     "id": "startBtn"
                 },
-                {
-                    "name": "开始闯关不要能量",
-                    "x": 163,
-                    "y": 1120,
-                    "type": "button",
-                    "props": {
-                        "tUp": "开始闯关不要能量.png"
-                    },
-                    "id": "startBtn2"
-                },
                 {
                     "name": "prize",
                     "x": 130,

src/panels/StartPanel.ts

@@ -37,7 +37,6 @@ export class StartPanel extends Panel {
 
     closeBtn: FYGE.Button;
     startBtn: FYGE.Button;
-    startBtn2: FYGE.Button;
     tipsTex: FYGE.TextField;
     checkTex: FYGE.TextField;
     prizeImg: Sprite;
@@ -48,9 +47,6 @@ export class StartPanel extends Panel {
         this.checkTex.x = 0;
         this.checkTex.text = `第\t${this.data.level}\t关`;
 
-        this.startBtn.visible = !this.data.isPlayed;
-        this.startBtn2.visible = this.data.isPlayed;
-
         this.addChild(new StartTarget(this.data.level))
             .position.set(0, 682);
 
@@ -89,13 +85,11 @@ export class StartPanel extends Panel {
     initEvents() {
         super.initEvents();
         this.startBtn.addEventListener(MouseEvent.CLICK, this.startGame, this);
-        this.startBtn2.addEventListener(MouseEvent.CLICK, this.startGame, this);
     }
 
     removeEvents() {
         super.removeEvents();
         this.startBtn.removeEventListener(MouseEvent.CLICK, this.startGame, this);
-        this.startBtn2.removeEventListener(MouseEvent.CLICK, this.startGame, this);
     }
 }
 

src/scene/LoadingScene.ts

@@ -93,8 +93,8 @@ export class LoadingScene extends Scene {
             .call(() => {
                 if (pro >= 1) {
                     this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
-                    // changeScene(MapScene, {from: "loading"})
-                    changeScene(PlayScene, { chapter: 1 });
+                    changeScene(MapScene, {from: "loading"})
+                    // changeScene(PlayScene, { chapter: 1 });
                     // changeScene(LotteryScene,{level:1});
                 }
             })