主页

5fd9d915 · haiyoucuv · 5c17f07d · 5fd9d915 · 5fd9d915 · 5fd9d915
Commit 5fd9d915 authored Sep 28, 2020 by haiyoucuv
17 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ChangeListManager">
-    <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="" />
+    <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" 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/common/stepBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/stepBtn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_avatar_bg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_avatar_bg.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_bg1.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg1.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_bg2.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg2.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_bg3.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg3.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_check_enable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_enable.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/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.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/anisCall/FesRedShootAni.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/anisCall/FesRedShootAni.ts" afterDir="false" />
+    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -68,7 +86,7 @@
      <recent name="$PROJECT_DIR$/resource/SuccessPanel" />
    </key>
  </component>
-  <component name="RunManager" selected="npm.flushRes">
+  <component name="RunManager" selected="npm.dev">
    <configuration name="aaaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/src/aaaa.html" useBuiltInWebServerPort="true">
      <method v="2" />
    </configuration>
@@ -144,14 +162,8 @@
      <workItem from="1596609620649" duration="537000" />
      <workItem from="1600912046696" duration="16271000" />
      <workItem from="1600998191749" duration="23862000" />
-      <workItem from="1601170975973" duration="19760000" />
+      <workItem from="1601170975973" duration="20963000" />
-    </task>
+      <workItem from="1601257315718" duration="16130000" />
-    <task id="LOCAL-00006" summary="111">
-      <created>1594645946117</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1594645946117</updated>
    </task>
    <task id="LOCAL-00007" summary="map effect">
      <created>1594693383764</created>
@@ -489,7 +501,14 @@
      <option name="project" value="LOCAL" />
      <updated>1601200002854</updated>
    </task>
-    <option name="localTasksCounter" value="55" />
+    <task id="LOCAL-00055" summary="主页">
+      <created>1601200612188</created>
+      <option name="number" value="00055" />
+      <option name="presentableId" value="LOCAL-00055" />
+      <option name="project" value="LOCAL" />
+      <updated>1601200612189</updated>
+    </task>
+    <option name="localTasksCounter" value="56" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -532,49 +551,49 @@
      <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="1601200002561">
+    <state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1601200612036">
      <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="1601200002561" />
+    <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601200612036" />
    <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" />
    </state>
    <state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" />
-    <state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601193311330">
+    <state width="889" height="321" key="GridCell.Tab.0.bottom" timestamp="1601277205222">
      <screen x="30" y="23" width="1890" height="1177" />
    </state>
    <state width="869" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" />
    <state width="885" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1600962876448" />
    <state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
-    <state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601193311330" />
+    <state width="889" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601277205222" />
    <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
    <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
-    <state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601193311329">
+    <state width="889" height="321" key="GridCell.Tab.0.center" timestamp="1601277205222">
      <screen x="30" y="23" width="1890" height="1177" />
    </state>
    <state width="869" height="321" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" />
    <state width="885" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
    <state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
-    <state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601193311329" />
+    <state width="889" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601277205222" />
    <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
    <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
-    <state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601193311329">
+    <state width="889" height="321" key="GridCell.Tab.0.left" timestamp="1601277205222">
      <screen x="30" y="23" width="1890" height="1177" />
    </state>
    <state width="869" height="321" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" />
    <state width="885" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
    <state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
-    <state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601193311329" />
+    <state width="889" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601277205222" />
    <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
    <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
-    <state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601193311329">
+    <state width="889" height="321" key="GridCell.Tab.0.right" timestamp="1601277205222">
      <screen x="30" y="23" width="1890" height="1177" />
    </state>
    <state width="869" height="321" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" />
    <state width="885" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
    <state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
-    <state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601193311329" />
+    <state width="889" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601277205222" />
    <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
    <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
    <state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
@@ -591,10 +610,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="1601200003935">
+    <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601200613213">
      <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="1601200003935" />
+    <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601200613213" />
    <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" />
@@ -623,11 +642,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="1601193948233">
+    <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601285319159">
      <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="1601193948233" />
+    <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601285319159" />
    <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">
@@ -636,7 +655,6 @@
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/src/scene/map/CheckBtn.ts</url>
          <line>55</line>
-          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="5" />
        </line-breakpoint>
      </breakpoints>

--- a/mock/miniTb/mine.getAppData.json
+++ b/mock/miniTb/mine.getAppData.json
 {
    "success": true,
    "data": {
-        "avatar": "https://source.unsplash.com/user/erondu/76x76",
+        "avatar": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png",
        "nickName": "我啊是大请问",
        "activityId": "string",
        "openId": "string",

--- a/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
+++ b/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
@@ -4,7 +4,7 @@
    "message": "nisi amet sunt Lorem",
    "data": {
        "rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试",
-        "currentLevel": 7,
+        "currentLevel": 25,
        "power": 101,
        "tools": {
            "steps": 100,

--- a/resource/common/stepBtn.png
+++ b/resource/common/stepBtn.png
--- a/resource/map/map_avatar_bg.png
+++ b/resource/map/map_avatar_bg.png
--- a/resource/map/map_bg1.jpg
+++ b/resource/map/map_bg1.jpg
--- a/resource/map/map_bg2.jpg
+++ b/resource/map/map_bg2.jpg
--- a/resource/map/map_bg3.jpg
+++ b/resource/map/map_bg3.jpg
--- a/resource/map/map_check_enable.png
+++ b/resource/map/map_check_enable.png
--- a/resource/playScene/jellyArrow.png
+++ b/resource/playScene/jellyArrow.png
--- a/resource/res.json
+++ b/resource/res.json
@@ -69,7 +69,7 @@
 			"name": "map"
 		},
 		{
-			"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
+			"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,fesRedBombSta1.png,fesRedBombSta2.png,fesRedCap.png,fesRedDown.png,fesRedUp.png,festivalTargetBg.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,xingxingbi.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
 			"name": "playScene"
 		},
 		{

--- a/src/Main.ts
+++ b/src/Main.ts
@@ -9,6 +9,7 @@ import { destroyNetData } from "./TaoBaoNet";
 import { SkinJson } from "./SkinJson";
 import { G_EVENT } from "./common/G_EVENT";
 import { LoadingScene } from "./scene/LoadingScene";
+import { PlayScene } from "./scene/PlayScene";
 /**
@@ -84,6 +85,8 @@ export class Main {
        // if (document.getElementById("__loading__")) document.getElementById("__loading__").style.display = "none";
        //打开开始场景
        changeScene(LoadingScene);
+        // changeScene(PlayScene, {chapter: 120});
    }
    //在小程序显示时调用onShow

--- a/src/ResJson.ts
+++ b/src/ResJson.ts
@@ -69,7 +69,7 @@ export const ResJson = {
 			"name": "map"
 		},
 		{
-			"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
+			"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,fesRedBombSta1.png,fesRedBombSta2.png,fesRedCap.png,fesRedDown.png,fesRedUp.png,festivalTargetBg.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,xingxingbi.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
 			"name": "playScene"
 		},
 		{

--- a/src/scene/PlayScene.ts
+++ b/src/scene/PlayScene.ts
@@ -114,7 +114,8 @@ const movieClips = {
 //红包炸弹弹框名字
 const redBombPanelName = "RedBombAlert";
 //所有可能被添加节日红包的关卡；如果没有就不放
-const fesChapterData: number[] = []
+// const fesChapterData: number[] = []
+const fesChapterData: number[] = new Array(...new Array(117)).map((a, i) => i + 4);
 //节日大红包格子索引 及索引,默认索引值都是40
 const festivalIndex: number = 40
@@ -748,7 +749,7 @@ export class PlayScene extends Scene {
        //添加节日元素，条件可能会变
        if (fesChapterData.indexOf(this.chapter >> 0) > -1 &&
            // getRedBombTimes() &&
-            Math.random() > 0.5 &&
+            // Math.random() > 0.5 &&
            this.lattices[festivalIndex] &&   //格子必须有
            (Tool.judgeSetFesEle(this.lattices[festivalIndex]) || !this.lattices[festivalIndex].element)  //没有元素也行
        ) {

--- a/src/scene/map/CheckBtn.ts
+++ b/src/scene/map/CheckBtn.ts
@@ -157,7 +157,7 @@ export default class CheckBtn extends Container {
            TEXT_ALIGN.CENTER, 90, 8, 33
        ));
        this.checkLabel.stroke = 2;
-        this.checkLabel.strokeColor = '#c64f00';
+        this.checkLabel.strokeColor = '#d69422';
        // 当前关卡动画
        this.checkCurEffect = this.addChild(new CheckCurEffect());

--- a/src/scene/map/MapScene.ts
+++ b/src/scene/map/MapScene.ts
@@ -57,7 +57,6 @@ export class MapScene extends Scene {
            Tools.baseInfo.loginAddPower = false;
        }
-        // showPanel(FailedPanel);
    }
    private updateMapCheck() {
@@ -257,17 +256,17 @@ export class MapAvatar extends Container {
        this.addChild(Tools.getSprite('map_avatar_bg.png'))
             .anchorTexture.set(0.5, 1);
-        this.position.set(54, 28);
+        this.position.set(54, 32);
        this.mouseChildren = this.mouseEnable = false;
        const mask = this.addChild(new Graphics());
-        mask.drawCircle(0, -58, 38);
+        mask.drawCircle(1, -52, 35);
        this.avatarImg = this.addChild(new Sprite(Texture.fromUrl(
            Tools.globalData.avatar
        )));
-        this.avatarImg.width = this.avatarImg.height = 76;
+        this.avatarImg.width = this.avatarImg.height = 72;
-        this.avatarImg.position.set(-38, -96);
+        this.avatarImg.position.set(-36, -87.5);
        this.avatarImg.mask = mask;
    }
 }
--- a/src/something/anisCall/FesRedShootAni.ts
+++ b/src/something/anisCall/FesRedShootAni.ts
@@ -6,6 +6,7 @@ import { Element } from "../class/Element";
 import { Tool } from "../Tool";
 import { ElementType } from "../enum/ElementType";
 import { RES } from "../../../module/RES";
+import Texture = FYGE.Texture;
 /**
 * 需要回调的
@@ -79,7 +80,7 @@ export class FesRedShootAni extends FYGE.Container {
 class LightingAni extends FYGE.Sprite {
-    sourceAll: string[];
+    sourceAll: Texture[];
    currentFrame: number;
    totalFrames: number;
    isPlay: boolean;
@@ -102,7 +103,7 @@ class LightingAni extends FYGE.Sprite {
        // this.anchorOffsetX = 23;
        // this.anchorOffsetY = 27;
        this.sourceAll = arr;
-        this.texture = RES.getRes(this.sourceAll[0])
+        this.texture = this.sourceAll[0];
        this.currentFrame = 0;
        this.totalFrames = arr.length;
        this.addEventListener(FYGE.Event.ENTER_FRAME, this.onEnterFrame, this)
@@ -122,7 +123,7 @@ class LightingAni extends FYGE.Sprite {
        } else {
            this.currentFrame = (scale * this.sourceAll.length) >> 0;
        }
-        this.texture = RES.getRes(this.sourceAll[this.currentFrame])
+        this.texture = this.sourceAll[this.currentFrame];
    }
 }