afdjk,asfhksjkdulfh klasoi;dfbhjkgv kl;

.idea/workspace.xml

@@ -2,15 +2,113 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/panels/FesRedPrizePanel.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/FreePowerPanel/圆圈.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/FreePowerPanel/圆圈.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/FreePowerPanel/开心收下.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$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_10.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_11.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_12.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_13.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_14.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_10.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_11.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_12.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_13.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_14.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_10.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_11.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_12.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_13.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_14.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_10.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_11.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_12.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_13.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_14.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_10.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_11.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_12.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_13.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_14.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom10.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom11.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom12.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom13.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom14.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom15.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom15.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom16.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom16.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom17.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom17.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom18.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom18.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom19.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom19.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom20.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom20.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/boom9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/greenCircleDown.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/greenCircleDown.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/greenCircleUp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/greenCircleUp.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/jellyArrow.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/jellyArrow.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/magicLionBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/magicLionBg.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/panels/FesRedPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FesRedPrizePanel.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$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/something/class/FestivalEle.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/class/FestivalEle.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -22,8 +120,8 @@
       <list>
         <option value="TypeScript File" />
         <option value="JavaScript File" />
-        <option value="JsonFile" />
         <option value="HTML File" />
+        <option value="JsonFile" />
       </list>
     </option>
   </component>
@@ -155,14 +253,7 @@
       <workItem from="1600912046696" duration="16271000" />
       <workItem from="1600998191749" duration="23862000" />
       <workItem from="1601170975973" duration="20963000" />
-      <workItem from="1601257315718" duration="21958000" />
-    </task>
-    <task id="LOCAL-00008" summary="map effect">
-      <created>1594695870103</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1594695870103</updated>
+      <workItem from="1601257315718" duration="32630000" />
     </task>
     <task id="LOCAL-00009" summary="map effect">
       <created>1594696152026</created>
@@ -500,7 +591,14 @@
       <option name="project" value="LOCAL" />
       <updated>1601285454148</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="主页">
+      <created>1601291372788</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1601291372788</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -543,10 +641,10 @@
       <screen x="31" y="23" width="1889" height="1177" />
     </state>
     <state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
-    <state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1601285453329">
+    <state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1601291372532">
       <screen x="30" y="23" width="1890" height="1177" />
     </state>
-    <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601285453329" />
+    <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601291372532" />
     <state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
     <state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
       <screen x="30" y="23" width="1890" height="1177" />
@@ -602,10 +700,10 @@
     </state>
     <state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
     <state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
-    <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601285455207">
+    <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601291374031">
       <screen x="30" y="23" width="1890" height="1177" />
     </state>
-    <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601285455207" />
+    <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601291374031" />
     <state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
     <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
       <screen x="31" y="23" width="1889" height="1177" />
@@ -634,11 +732,11 @@
     </state>
     <state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
     <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
-    <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601291343735">
+    <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601347943149">
       <screen x="30" y="23" width="1890" height="1177" />
     </state>
     <state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
-    <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601291343735" />
+    <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601347943149" />
     <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
   </component>
   <component name="XDebuggerManager">

mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json

@@ -4,7 +4,7 @@
     "message": "nisi amet sunt Lorem",
     "data": {
         "rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试",
-        "currentLevel": 25,
+        "currentLevel": 5,
         "power": 101,
         "tools": {
             "steps": 100,

src/TaoBaoNet.ts

@@ -13,6 +13,7 @@ export enum TbNetName {
     // 领取权益奖励
     receiveEnamePrize = "popmartXXL2c.receiveEnamePrize",
 
+    drawLotteryPrize = 'popmartXXL2c.drawLotteryPrize',
 
     /**
      * 活动基本信息
@@ -186,7 +187,7 @@ export function sendTbNet(
         }
 
 
-        let fun = function (e: { type: string, data: dataOut }) {
+        let fun = function(e: { type: string, data: dataOut }) {
             //清除超时记录
             // clearWait(waitObj)
             //移除事件
@@ -231,7 +232,7 @@ export function sendTbNet(
         // }, 10000)
 
         //用事件方式吧，派发事件发接口,,,,注意很多独有的事件名别重了，onHide,onShow,onMessage等  放到最后，因为有同步的情况
-        GDispatcher.dispatchEvent({ type: "onMessage" }, { netName, parameter })
+        GDispatcher.dispatchEvent({type: "onMessage"}, {netName, parameter})
     })
     //@ts-ignore
     // if (!fc) fc = getApp().cloud.function;

src/panels/FesRedPrizePanel.ts

@@ -66,6 +66,11 @@ export class FesRedPrizePanel extends Panel {
         super.start();
     }
 
+    public hidePanel() {
+        super.hidePanel();
+        this.data.callback && this.data.callback();
+    }
+
     initEvents() {
         super.initEvents();
     }

src/scene/PlayScene.ts

@@ -24,7 +24,6 @@ import { MagicRotateData } from '../something/interface/MagicRotateData';
 import { drawBg, drawShape, generateMapBg } from '../something/logic/aaa';
 import { Pool } from '../something/Pool';
 import { Tool } from '../something/Tool';
-import { BonusTime } from '../something/uis/BonusTime';
 import { ElementTargets } from '../something/uis/ElementTargets';
 import { PropGuide } from '../something/uis/PropGuide';
 import { ScoreProgress } from '../something/uis/ScoreProgress';
@@ -64,7 +63,9 @@ import { FirstPropGift } from '../something/uis/FirstPropGift';
 import { bonus_lottie } from '../lotties/bonus_lottie';
 import { GDispatcher } from '../Main';
 import { G_EVENT } from '../common/G_EVENT';
-import { FestivalEle } from "../something/class/FestivalEle";
+import Tween = FYGE.Tween;
+import { BitmapRecycle } from "../something/class/BitmapRecycle";
+import { FesRedPrizePanel } from "../panels/FesRedPrizePanel";
 
 const aniClass = {
     "BoomAni": BoomAni,
@@ -113,7 +114,7 @@ const movieClips = {
 }
 
 //红包炸弹弹框名字
-const redBombPanelName = "RedBombAlert";
+const redBombPanelName = "redBombPanelName";
 //所有可能被添加节日红包的关卡；如果没有就不放
 // const fesChapterData: number[] = []
 const fesChapterData: number[] = new Array(...new Array(117)).map((a, i) => i + 4);
@@ -464,7 +465,6 @@ export class PlayScene extends Scene {
             //如果没有就取最下层的，用地图数据格子初始化
             if (!recycles || !recycles.length) {
                 var endRowNumHash = {}, endRowNum: number = 0;
-                ;
                 for (var i = 0; i < this.chapterData.map.lattices.length; i++) {
                     var d = this.chapterData.map.lattices[i];
                     if (!d) continue;
@@ -2626,6 +2626,11 @@ export class PlayScene extends Scene {
      * @param suc 默认true表示成功提交
      */
     submit(suc: boolean = true) {
+
+        if (this.openRedBombPanel(() => {
+            this.submit(suc);
+        })) return;
+
         var params = {
             level: this.data.chapter,
             score: this.score,
@@ -2658,16 +2663,18 @@ export class PlayScene extends Scene {
     /**
      * 打开红包炸弹弹框
      */
-    openRedBombPanel() {
+    openRedBombPanel(callback: Function = null) {
         if (this.redBombPanelMark) {
-            // PanelCtrl.instance.show(redBombPanelName);
+            showPanel(FesRedPrizePanel, {callback: callback});
             this.redBombPanelMark = false;
+            return true;
         }
+        return false;
     }
 
     /**
      * 为了能加入红包炸弹的弹框  如果需要添加直接弹出就是了，或者修改下弹出顺序，红包的后弹，到时残酷tuia的逻辑
-     * @param panel
+     * @param panelName
      * @param data
      */
     returnPanels(panelName, data) {
@@ -2686,6 +2693,7 @@ export class PlayScene extends Scene {
     /**
      * 播放动画
      * @param name
+     * @param p
      */
     playAni(name: RecoverName, p: number[]) {
         let ani = Pool.takeOut(name);
@@ -2833,28 +2841,37 @@ export class PlayScene extends Scene {
             // this.festivalTarget.count--;
 
             //@ts-ignore
-            var p = this.festivalTarget.localToGlobal({x: 40 * 0.8, y: 40 * 0.8})
-            this.addChild(FlyTargetAni(ElementType.FESTIVALELE_SMALL, [ele.x, ele.y], [p.x, p.y], () => {
-                this.festivalTarget.count--;
-            }))
-
-            // this.addChild(
-            //     EleMaskAni(
-            //         ele,
-            //         [ele.x, ele.y],
-            //         0,
-            //         this,
-            //         false,
-            //         1000,
-            //         () => {
+            // var p = this.festivalTarget.localToGlobal({x: 40 * 0.8, y: 40 * 0.8})
+            // this.addChild(FlyTargetAni(ElementType.FESTIVALELE_SMALL, [ele.x, ele.y], [p.x, p.y], () => {
             //     this.festivalTarget.count--;
             // }))
+
+            var texture: FYGE.Texture = RES.getRes("ele" + ElementType.FESTIVALELE_SMALL + ".png");
+            //弄一个替代的
+            let eleC: BitmapRecycle = Pool.takeOut(RecoverName.BITMAPRECYCLE);
+            if (!eleC) {
+                eleC = new BitmapRecycle(texture);
+            } else {
+                eleC.reset(texture);
+            }
+            eleC.position.set(ele.x, ele.y);
+
+            this.addChild(eleC);
+            Tween.get(eleC)
+                .to({alpha: 0}, 1000)
+                .call(() => {
+                    ele.alpha = 1;
+                    this.removeChild(eleC);
+                    this.festivalTarget.count--;
+                });
+
             //完成了，发接口，到时需要修改，对于接口没成功的不设置
-            if (!this.festivalTargetNum) {
-                console.log('红包全都消除完了');
-                // NetManager.ins.hc_redBombAward((success) => {
-                //     if (success) this.redBombPanelMark = true;
-                // });
+            if (this.festivalTargetNum <= 0) {
+                sendTbNet(TbNetName.drawLotteryPrize, {level: this.chapter},
+                    (success, res) => {
+                        if (success) this.redBombPanelMark = true;
+                    }
+                );
             }
         }
     }

src/scene/map/CheckBtn.ts

@@ -142,11 +142,11 @@ export default class CheckBtn extends Container {
 
         // 三个星星
         const star1 = this.addChild(new CheckStar());
-        star1.position.set(16.5, 83.5);
+        star1.position.set(16, 84);
         const star2 = this.addChild(new CheckStar());
-        star2.position.set(42.5, 90.5);
+        star2.position.set(42, 91);
         const star3 = this.addChild(new CheckStar());
-        star3.position.set(67.5, 83.5);
+        star3.position.set(67, 84);
         this.star = [star1, star2, star3];
 
         // 关卡文字

src/scene/map/MapScene.ts

@@ -58,7 +58,7 @@ export class MapScene extends Scene {
             Tools.baseInfo.loginAddPower = false;
         }
 
-        showPanel(FesRedPrizePanel);
+        // showPanel(FesRedPrizePanel);
 
     }