m

.idea/workspace.xml

@@ -3,10 +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.drawTopLevelPrize.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.drawTopLevelPrize.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/panels/LotteryPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/LotteryPanel.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" />
@@ -133,7 +133,7 @@
       <workItem from="1612577003915" duration="21094000" />
       <workItem from="1612662929222" duration="40609000" />
       <workItem from="1613698993022" duration="22309000" />
-      <workItem from="1613785579125" duration="11959000" />
+      <workItem from="1613785579125" duration="12271000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -359,7 +359,14 @@
       <option name="project" value="LOCAL" />
       <updated>1613793806573</updated>
     </task>
-    <option name="localTasksCounter" value="33" />
+    <task id="LOCAL-00033" summary="m">
+      <created>1613810042956</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1613810042956</updated>
+    </task>
+    <option name="localTasksCounter" value="34" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

output.js

@@ -11327,6 +11327,13 @@ var LotteryPanel = (function (_super) {
                             return e.type != 5;
                         });
                         p = [91, 731];
+                        list.push({
+                            activityId: "602f33eb086e65bb22759048",
+                            image: "https://yun.duiba.com.cn/aurora/assets/20a5c02da9d2eb507af7f5dda581083798e8aa84.png",
+                            name: "谢谢参与",
+                            type: 5,
+                            _id: "thanks",
+                        });
                         this.lotScroll = this.addChild(new LotteryScroll(list));
                         this.lotScroll.position.set(p[0], p[1]);
                         console.log(this.lotScroll.position);
@@ -11344,8 +11351,12 @@ var LotteryPanel = (function (_super) {
             if (!res.success)
                 return;
             var id;
-            if (res.data && res.data.prizeId)
+            if (res.data && res.data.type == 5) {
+                id = 'thanks';
+            }
+            else if (res.data && res.data.prizeId) {
                 id = res.data.prizeId;
+            }
             _this.enableMouseEvt(false);
             console.log(id);
             _this.prizeData = res.data;

src/panels/LotteryPanel.ts

@@ -4,6 +4,7 @@ import { sendTbNet, TbNetName } from "../TaoBaoNet";
 import { GTool } from "../../module/tools/GTool";
 // import { MapScene } from "./map/MapScene";
 import { Panel } from "../../module/views/Panel";
+import { Tools } from "../Tools";
 
 /**
  * 摇奖机弹框
@@ -129,6 +130,7 @@ export class LotteryPanel extends Panel {
                 hideWaiting();
                 //如果是失败
                 if (!res.success) return;
+                Tools.gameData.isDrawTopLevelPrize = true;
                 let id;//待考虑，谢谢参与要进哪？是否进列表，下面id不存在时当作无奖励，（如果谢谢参与不进列表）
                 if (res.data && res.data.type == 5) {
                     id = 'thanks';

src/scene/map/MapUI.ts

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