m

.idea/workspace.xml

@@ -3,6 +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/feile.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -129,7 +133,7 @@
       <workItem from="1612577003915" duration="21094000" />
       <workItem from="1612662929222" duration="40609000" />
       <workItem from="1613698993022" duration="22309000" />
-      <workItem from="1613785579125" duration="6509000" />
+      <workItem from="1613785579125" duration="7288000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -341,7 +345,14 @@
       <option name="project" value="LOCAL" />
       <updated>1613792877469</updated>
     </task>
-    <option name="localTasksCounter" value="31" />
+    <task id="LOCAL-00031" summary="m">
+      <created>1613792960890</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1613792960890</updated>
+    </task>
+    <option name="localTasksCounter" value="32" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

mock/miniTb/feile.getActivityBaseInfoById.json

 {
   "code": "000000",
   "data": {
-    "currentLevel": 1,
+    "currentLevel": 99,
     "topLevelVisitSuccess": true,
     "isDrawTopLevelPrize": false,
     "power": 10,

src/panels/LotteryPanel.ts

@@ -44,7 +44,6 @@ export class LotteryPanel extends Panel {
         this.addChild(new FYGE.Sprite(RES.getRes("lotteryReturnBtn.png")))
             .addEventListener(FYGE.MouseEvent.CLICK, () => {
                 this.hidePanel();
-                changeScene(MapScene);
             }, this)
             .position.set(0, 250)
         //刷新奖品列表和摇奖列表
@@ -70,6 +69,7 @@ export class LotteryPanel extends Panel {
                         } else {
                             showToast('奖品发放失败\n请前往我的奖品处进行处理');
                         }
+                        this.data.callFun && this.data.callFun();
                         this.hidePanel();
                     }, true
                 );
@@ -94,6 +94,11 @@ export class LotteryPanel extends Panel {
         }
     }
 
+    hidePanel() {
+        this.data.callFun && this.data.callFun();
+        super.hidePanel();
+    }
+
     async updatePrizes() {
         showWaiting();
         const { data: prizeList } = await sendTbNet(TbNetName.getTopLevelPrizes/*, { level: this.data.level }*/);

src/panels/SuccessNoPrizePanel.ts

@@ -3,13 +3,13 @@ import { Tools } from "../Tools";
 import { RES } from "../../module/RES";
 import { changeScene, showPanel } from "../../module/ctrls";
 import { MapScene } from "../scene/map/MapScene";
+import { LotteryPanel } from "./LotteryPanel";
 import Container = FYGE.Container;
 import Sprite = FYGE.Sprite;
 import Tween = FYGE.Tween;
 import Ease = FYGE.Ease;
 import MouseEvent = FYGE.MouseEvent;
 import Button = FYGE.Button;
-import { LotteryPanel } from "./LotteryPanel";
 
 export class SuccessNoPrizePanel extends Panel {
     get groupNames() {
@@ -83,7 +83,7 @@ export class SuccessNoPrizePanel extends Panel {
 
     public goPrize() {
         // 去抽奖
-        showPanel(LotteryPanel);
+        showPanel(LotteryPanel, { callFun: () => changeScene(MapScene) });
         super.hidePanel();
     }
 

src/scene/map/MapUI.ts

@@ -61,7 +61,7 @@ export default class MapUI extends Container {
                 break;
 
             case this.clearanceBtn:
-                showPanel(LotteryPanel)
+                showPanel(LotteryPanel, { callFun: () => 0 })
                 break;
         }
     }