换了点皮

.idea/workspace.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
+    <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="Loading">
+      <change afterPath="$PROJECT_DIR$/resource/playScene/闪闪.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum当.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/loadingScene/loadingBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/loadingScene/loadingBg.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/loadingScene/loadingPro.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/loadingScene/loadingPro.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/boomBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/boomBtn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/ele0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/ele1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/ele2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/ele3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/ele4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/ele5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/ele7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/ele8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/ele9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/hammerBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/hammerBtn.png" 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/common/tarNum0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/tarNum1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/tarNum2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/tarNum3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/tarNum4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/tarNum5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/tarNum6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/tarNum7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/tarNum8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/tarNum9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/tarNum9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/clearanceBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/clearanceBtn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_energyBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_energyBg.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_prizeBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_prizeBtn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_ruleBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_ruleBtn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_taskBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_taskBtn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/eggStatus0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/eggStatus0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/eggStatus1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/eggStatus1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/eggStatus2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/eggStatus2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele0Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele0Exp.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele0Hor.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele0Hor.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele1Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele1Exp.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele1Hor.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele1Hor.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele2Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele2Exp.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele2Hor.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele2Hor.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele3Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele3Exp.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele3Hor.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele3Hor.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele4Exp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele4Exp.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ele4Hor.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ele4Hor.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/lightedStar.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/lightedStar.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/lockVine.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/lockVine.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/magicLion.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/magicLion.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/main_mapbottom.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/main_mapbottom.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/musicOff.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/musicOff.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/musicOn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/musicOn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/playBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/playBg.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/propNumBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/propNumBg.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/rectLat.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rectLat.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/scoreNum当.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/starProgress.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/starProgress.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/topBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/topBg.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/unlightedStar.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/unlightedStar.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum关.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum关.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/chapterNum第.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/chapterNum第.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/propNum9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/propNum9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/scoreNum9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/scoreNum9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playSceneNum/stepNum9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playSceneNum/stepNum9.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/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.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/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/something/logic/aaa.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/logic/aaa.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/something/uis/PropBtnCon.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/PropBtnCon.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/something/uis/ScoreProgress.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/ScoreProgress.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -180,14 +286,8 @@
       <workItem from="1617177876956" duration="680000" />
       <workItem from="1617345199322" duration="4000" />
       <workItem from="1617346486921" duration="1232000" />
-      <workItem from="1617348724978" duration="956000" />
-    </task>
-    <task id="LOCAL-00013" summary="m">
-      <created>1612756277485</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1612756277485</updated>
+      <workItem from="1617348724978" duration="4857000" />
+      <workItem from="1617673451602" duration="10201000" />
     </task>
     <task id="LOCAL-00014" summary="m">
       <created>1612771986437</created>
@@ -525,7 +625,14 @@
       <option name="project" value="LOCAL" />
       <updated>1614567602219</updated>
     </task>
-    <option name="localTasksCounter" value="62" />
+    <task id="LOCAL-00062" summary="Loading">
+      <created>1617349709205</created>
+      <option name="number" value="00062" />
+      <option name="presentableId" value="LOCAL-00062" />
+      <option name="project" value="LOCAL" />
+      <updated>1617349709206</updated>
+    </task>
+    <option name="localTasksCounter" value="63" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -544,6 +651,7 @@
     <MESSAGE value="Failed" />
     <MESSAGE value="20210206" />
     <MESSAGE value="m" />
-    <option name="LAST_COMMIT_MESSAGE" value="m" />
+    <MESSAGE value="Loading" />
+    <option name="LAST_COMMIT_MESSAGE" value="Loading" />
   </component>
 </project>
\ No newline at end of file

resource/res.json

@@ -81,7 +81,7 @@
 			"name": "mapCheckPrizeEffect"
 		},
 		{
-			"keys": "amazing.png,blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.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,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,good.png,great.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,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,perfect.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
+			"keys": "amazing.png,blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.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,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,good.png,great.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,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,perfect.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png,闪闪.png",
 			"name": "playScene"
 		},
 		{
@@ -93,7 +93,7 @@
 			"name": "playSceneGuide"
 		},
 		{
-			"keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png",
+			"keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum当.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png",
 			"name": "playSceneNum"
 		}
 	],

src/ResJson.ts

@@ -81,7 +81,7 @@ export const ResJson = {
 			"name": "mapCheckPrizeEffect"
 		},
 		{
-			"keys": "amazing.png,blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.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,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,good.png,great.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,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,perfect.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
+			"keys": "amazing.png,blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.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,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,good.png,great.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,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,perfect.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png,闪闪.png",
 			"name": "playScene"
 		},
 		{
@@ -93,7 +93,7 @@ export const ResJson = {
 			"name": "playSceneGuide"
 		},
 		{
-			"keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png",
+			"keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum当.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png",
 			"name": "playSceneNum"
 		}
 	],

src/scene/LoadingScene.ts

@@ -9,6 +9,7 @@ import TEXT_ALIGN = FYGE.TEXT_ALIGN;
 import TextField = FYGE.TextField;
 import Tween = FYGE.Tween;
 import { MapScene } from "./map/MapScene";
+import { PlayScene } from "./PlayScene";
 
 export class LoadingScene extends Scene {
     get groupNames() {
@@ -88,10 +89,8 @@ export class LoadingScene extends Scene {
                 if (pro >= 1) {
                     this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
                     changeScene(MapScene, {from: "loading"});
+                    // changeScene(PlayScene, { chapter: 20 });
                     sendTbNet(TbNetName.openMusic, { isOn: true });
-                    // showPanel(LotteryPanel);
-                    // changeScene(PlayScene, { chapter: 1 });
-                    // changeScene(LotteryScene,{level:1});
                 }
             });
         // this.lastP=p

src/scene/PlayScene.ts

@@ -228,7 +228,7 @@ export class PlayScene extends Scene {
         this._score = value;
         FYGE.Tween.removeTweens(this.scoreProgress);
         FYGE.Tween.get(this.scoreProgress, {}, null, true)
-            .to({ score: value }, 300)
+            .to({ score: value }, 300);
     }
 
     //所有道具容器
@@ -260,7 +260,7 @@ export class PlayScene extends Scene {
         this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers.stageOffsetY);
         //排版
         //底部背景
-        this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, -120);
+        this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, 10);
 
         const commonTextArr = {};
         for (let i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("scoreNum" + i + ".png");
@@ -270,7 +270,9 @@ export class PlayScene extends Scene {
         this.targetScoreTxt.position.set(118, 283);
         //设置
         this.musicBtn = this.addChild(new MusicBtn());
-        this.musicBtn.position.set(616, 116);
+        this.musicBtn.position.set(616, 120);
+
+        this.addChild(FYGE.Sprite.fromFrame("闪闪.png")).position.set(288, -layers.stageOffsetY + 252);
     }
     data: { chapter: number }
     start(data: { chapter: number }) {
@@ -348,7 +350,7 @@ export class PlayScene extends Scene {
      * 加载所有用到的svga
      * 重写，变成其他动画
      */
-    async  initSvgas() {
+    async initSvgas() {
         //这里加载资源吧
         var bonusTime = new Lottie(bonus_lottie)
         bonusTime.position.set(
@@ -374,12 +376,12 @@ export class PlayScene extends Scene {
         chapterTxt.position.set(620, 229);
         //步数
         this.stepNumber = this.addChild(new FYGE.BitmapText(Tools.getNumTextures("stepNum")));
-        this.stepNumber.position.set(127, 212);
+        this.stepNumber.position.set(104, 214);
         //步数初始化
         this.steps = this.chapterData.stepCount;
         //分数进度条，托管
         this.scoreProgress = this.addChild(new ScoreProgress(this.chapterData.starScores));
-        this.scoreProgress.position.set(94, 271);
+        this.scoreProgress.position.set(86, 275);
         //分数置0
         this.score = 0;
         //地图生成

src/scene/map/MapUI.ts

@@ -91,9 +91,9 @@ export default class MapUI extends Container {
 
         // 任务按钮
         this.taskBtn = this.addChild(new Button(RES.getRes('map_taskBtn.png')));
-        this.taskBtn.position.set(613, _y + 65);
+        this.taskBtn.position.set(623, _y + 65);
 
-        this.energyBox = this.addChild(new EnergyBox({}));
+        this.energyBox = this.addChild(new EnergyBox());
         this.energyBox.position.set(8, _y + 65);
 
         this.clearanceBtn = this.addChild(new Button(RES.getRes('clearanceBtn.png')));
@@ -121,20 +121,20 @@ class EnergyBox extends Container {
         this.countLabel.text = '' + count;
     }
 
-    constructor(data) {
+    constructor() {
         super();
 
-        this.initUi(data);
+        this.initUi();
 
     }
 
-    private initUi(data) {
+    private initUi() {
 
         this.addChild(Tools.getSprite('map_energyBg.png'));
 
         this.countLabel = this.addChild(Tools.getText(
-            '0', 33, '#000000',
-            TEXT_ALIGN.CENTER, 80, 110, 33
+            '0', 33, '#ffffff',
+            TEXT_ALIGN.CENTER, 80, 110, 40
         ));
 
     }

src/something/logic/aaa.ts

@@ -48,7 +48,7 @@ export function drawBg(paths: PathData[], lattices?: number[]) {
 }
 export function drawShape(paths: PathData[]): FYGE.Shape {
     var shape = new FYGE.Shape();
-    shape.beginFill(0x409195, 1);//指令中有beginPath,会中断之前绘制得路径，会导致clip只有最后一段poly有效
+    shape.beginFill(0x111937, 1);//指令中有beginPath,会中断之前绘制得路径，会导致clip只有最后一段poly有效
     for (var i = 0; i < paths.length; i++) {
         var path = paths[i];
         drawPoly(shape, path)

src/something/uis/PropBtnCon.ts

@@ -42,19 +42,19 @@ export class PropBtnCon extends FYGE.Container {
         super();
         // this.addChild(FYGE.Sprite.fromFrame("table.png"));
         this.stepBtn = new FYGE.Button(RES.getRes("stepBtn.png"));
-        this.stepBtn.x = 106;
+        this.stepBtn.x = 117;
         this.addChild(this.stepBtn);
         this.boomBtn = new FYGE.Button(RES.getRes("boomBtn.png"));
-        this.boomBtn.x = 297;
+        this.boomBtn.x = 298;
         this.addChild(this.boomBtn);
         this.hammerBtn = new FYGE.Button(RES.getRes("hammerBtn.png"));
-        this.hammerBtn.x = 470;
+        this.hammerBtn.x = 479;
         this.addChild(this.hammerBtn);
         this.stepBtn.y = this.boomBtn.y = this.hammerBtn.y = -20;
 
-        this.addChild(new Sprite(RES.getRes('propNumBg.png'))).position.set(207, 70);
-        this.addChild(new Sprite(RES.getRes('propNumBg.png'))).position.set(393, 70);
-        this.addChild(new Sprite(RES.getRes('propNumBg.png'))).position.set(578, 70);
+        this.addChild(new Sprite(RES.getRes('propNumBg.png'))).position.set(219, 70);
+        this.addChild(new Sprite(RES.getRes('propNumBg.png'))).position.set(400, 70);
+        this.addChild(new Sprite(RES.getRes('propNumBg.png'))).position.set(581, 70);
 
 
         const arr = {};
@@ -66,9 +66,9 @@ export class PropBtnCon extends FYGE.Container {
         this.stepNum.y = this.boomNum.y = this.hammerNum.y = 100;
         this.stepNum.text = this.boomNum.text = this.hammerNum.text = "0";
         this.stepNum.textAlign = this.boomNum.textAlign = this.hammerNum.textAlign = FYGE.TEXT_ALIGN.CENTER;
-        this.stepNum.x = 239
-        this.boomNum.x = 239 + 186
-        this.hammerNum.x = 239 + 186 * 2;
+        this.stepNum.x = 249
+        this.boomNum.x = 249 + 182
+        this.hammerNum.x = 249 + 182 * 2;
         // console.log(this.stepNum, this.boomNum,this.hammerNum)
     }
 }

src/something/uis/ScoreProgress.ts

@@ -25,7 +25,7 @@ export class ScoreProgress extends FYGE.Container {
         287.5,
         407.5,
         526.5,
-        600.5
+        563
     ]
 
     private _score: number;
@@ -83,12 +83,11 @@ export class ScoreProgress extends FYGE.Container {
         //星星
         //进度条遮罩
         const mask = this.starProgress.mask;
-        mask.clear()
+        mask.clear();
         mask.beginFill(0xff0000, 1);
-        mask.drawRoundedRect(0, 0, w, 50, 50)
+        mask.drawRoundedRect(0, 0, w, 43, 43);
         mask.endFill();
 
-
     }
 
     /**
@@ -101,7 +100,7 @@ export class ScoreProgress extends FYGE.Container {
         const scoreNum = Tools.getNumTextures("scoreNum");
         scoreNum['当'] = RES.getRes("scoreNum当.png");
         this.scoreTxt = this.addChild(new FYGE.BitmapText(scoreNum));
-        this.scoreTxt.position.set(24, 25);
+        this.scoreTxt.position.set(23, 21.5);
         this.scoreTxt.textAlign = TEXT_ALIGN.LEFT;
         this.starScores = starScores;
         this.allScore = this.diss[3] / this.diss[2] * this.starScores[2];
@@ -109,10 +108,11 @@ export class ScoreProgress extends FYGE.Container {
         //加遮罩，加到starProgress的父级中
         const mask = new FYGE.Shape();
         mask.beginFill(0xff0000, 1);
-        mask.drawRoundedRect(0, 0, 0, 50, 50);
+        mask.drawRoundedRect(0, 0, 0, 43, 43);
         mask.endFill();
         this.starProgress.mask = mask;
         this.addChild(mask);
+
         //星星1   lightedStar.png
         const textureStar: FYGE.Texture = RES.getRes("unlightedStar.png");
         this.star1 = this.addChild(new FYGE.Sprite(textureStar));