换了点皮

.idea/workspace.xml

@@ -2,18 +2,38 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮">
+      <change afterPath="$PROJECT_DIR$/resource/NoStepPanel/noStepBg.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/resource/UseStep/useStepBg.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/FreePowerPanel/freePowerBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/FreePowerPanel/freePowerBg.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/FreePowerPanel/freePowerBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/FreePowerPanel/freePowerBtn.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/NoEnergyPanel/体力不足.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/NoEnergyPanel/体力不足.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/NoEnergyPanel/体力不足按钮.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/NoEnergyPanel/体力不足按钮.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/common/powerIcon.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/powerIcon.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/helpPanel/helpBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/helpPanel/helpBg.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/helpPanel/helpBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/helpPanel/helpBtn.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/panels/FreePowerPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FreePowerPanel.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/panels/NoEnergyPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/NoEnergyPanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/FailedPanel/failedBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/FailedPanel/failedBtn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/FailedPanel/failedTxt.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/FailedPanel/failedTxt.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/NoStepPanel/noStepCancel.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/NoStepPanel/noStepCancel.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/NoStepPanel/noStepOk.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/NoStepPanel/noStepOk.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startBg.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startBtn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum0.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum1.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum6.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum7.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum8.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum9.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum关.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum关.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum第.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum第.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/UseStep/useStepCancel.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/UseStep/useStepCancel.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/UseStep/useStepOk.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/UseStep/useStepOk.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/panels/FailedPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FailedPanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/panels/NoStepPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/NoStepPanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/panels/UseStep.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/UseStep.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -207,14 +227,7 @@
       <workItem from="1617871191619" duration="121000" />
       <workItem from="1617890665920" duration="181000" />
       <workItem from="1617960804439" duration="639000" />
-      <workItem from="1618193237335" duration="4677000" />
-    </task>
-    <task id="LOCAL-00033" summary="m">
-      <created>1613810042956</created>
-      <option name="number" value="00033" />
-      <option name="presentableId" value="LOCAL-00033" />
-      <option name="project" value="LOCAL" />
-      <updated>1613810042956</updated>
+      <workItem from="1618193237335" duration="7520000" />
     </task>
     <task id="LOCAL-00034" summary="m">
       <created>1613810371864</created>
@@ -552,7 +565,14 @@
       <option name="project" value="LOCAL" />
       <updated>1618197454321</updated>
     </task>
-    <option name="localTasksCounter" value="82" />
+    <task id="LOCAL-00082" summary="换了点皮">
+      <created>1618197931386</created>
+      <option name="number" value="00082" />
+      <option name="presentableId" value="LOCAL-00082" />
+      <option name="project" value="LOCAL" />
+      <updated>1618197931386</updated>
+    </task>
+    <option name="localTasksCounter" value="83" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

mock/miniTb/feile.getActivityBaseInfoById.json

 {
   "code": "000000",
   "data": {
-    "currentLevel": 1,
+    "currentLevel": 99,
     "topLevelVisitSuccess": true,
     "isDrawTopLevelPrize": false,
-    "power": 0,
+    "power": 10,
     "tools": {
       "steps": 10,
       "booms": 11,

mock/miniTb/mine.getAppData.json

@@ -6,7 +6,7 @@
         "activityId": "activityId",
         "openId": "openId",
         "isFirstLogin": true,
-        "loginAddPower": 1,
+        "loginAddPower": 0,
         "isNewUser": false,
         "inviteId": "",
         "isFollow": true

resource/res.json

@@ -25,7 +25,7 @@
 			"name": "NoPrizePanel"
 		},
 		{
-			"keys": "noStepCancel.png,noStepOk.png",
+			"keys": "noStepBg.png,noStepCancel.png,noStepOk.png",
 			"name": "NoStepPanel"
 		},
 		{
@@ -49,7 +49,7 @@
 			"name": "TaskPanel"
 		},
 		{
-			"keys": "useStepCancel.png,useStepOk.png",
+			"keys": "useStepBg.png,useStepCancel.png,useStepOk.png",
 			"name": "UseStep"
 		},
 		{

src/ResJson.ts

@@ -25,7 +25,7 @@ export const ResJson = {
 			"name": "NoPrizePanel"
 		},
 		{
-			"keys": "noStepCancel.png,noStepOk.png",
+			"keys": "noStepBg.png,noStepCancel.png,noStepOk.png",
 			"name": "NoStepPanel"
 		},
 		{
@@ -49,7 +49,7 @@ export const ResJson = {
 			"name": "TaskPanel"
 		},
 		{
-			"keys": "useStepCancel.png,useStepOk.png",
+			"keys": "useStepBg.png,useStepCancel.png,useStepOk.png",
 			"name": "UseStep"
 		},
 		{

src/panels/FailedPanel.ts

@@ -13,16 +13,15 @@ export class FailedPanel extends Panel {
 
     initUi() {
 
-        this.addChild(Tools.getSprite('panelBgS.png')).position.set(79, 513);
-        this.addChild(Tools.getSprite('failedTxt.png')).position.set(171, 582);
+        this.addChild(Tools.getSprite('failedTxt.png')).position.set(80, 274);
 
         this.addChild(new Button(RES.getRes("failedBtn.png")))
             .addEventListener(MouseEvent.CLICK, this.again, this)
-            .position.set(171, 830);
+            .position.set(185, 921);
 
         this.addChild(new Button(RES.getRes('关闭按钮.png')))
             .addEventListener(MouseEvent.CLICK, this.hidePanel, this)
-            .position.set(638, 488);
+            .position.set(629, 469);
     }
 
     start(data) {

src/panels/NoStepPanel.ts

@@ -20,25 +20,20 @@ export class NoStepPanel extends Panel {
 	}
 
 	initUi() {
-		this.addChild(Tools.getSprite('panelBgS.png')).position.set(79, 513);
+		this.addChild(Tools.getSprite('noStepBg.png')).position.set(80, 274);
 		this.okBtn = this.addChild(new Button(RES.getRes('noStepOk.png')));
-		this.okBtn.position.set(385, 857);
+		this.okBtn.position.set(383, 915);
 
 		this.cancelBtn = this.addChild(new Button(RES.getRes('noStepCancel.png')));
-		this.cancelBtn.position.set(100, 857);
+		this.cancelBtn.position.set(102, 915);
 
 		this.addChild(Tools.getText(
-			`是否使用步数道具\n增加${Tools.addSteps}次步数？`, 33, "#744f1d",
+			`是否使用步数道具\n增加${Tools.addSteps}次步数？`, 36, "#ffffff",
 			FYGE.TEXT_ALIGN.CENTER, 750, 0, 650
 		));
 
-		this.addChild(Tools.getText(
-			"步数耗尽", 40, "#744f1d",
-			FYGE.TEXT_ALIGN.CENTER, 750, 0, 543
-		)).bold = true;
-
 		this.closeBtn = this.addChild(new Button(RES.getRes('关闭按钮.png')));
-		this.closeBtn.position.set(638, 488);
+		this.closeBtn.position.set(629, 469);
 	}
 	initEvents() {
 		//结束

src/panels/StartPanel.ts

@@ -37,23 +37,23 @@ export class StartPanel extends Panel {
 
         const { level } = this.data;
 
-        this.addChild(Tools.getSprite('startBg.png')).position.set(79, 345);
+        this.addChild(Tools.getSprite('startBg.png')).position.set(80, 259);
 
         //第几关
         const chapterTex = Tools.getNumTextures("startNum");
         ["第", "关"].forEach(e => chapterTex[e] = RES.getRes(`startNum${e}.png`));
         const chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex));
         chapterTxt.text = "第" + (level >> 0) + "关";
-        chapterTxt.position.set(375, 463);
+        chapterTxt.position.set(376, 476);
 
-        this.addChild(new StartTarget(level)).position.set(0, 613);
+        this.addChild(new StartTarget(level)).position.set(0, 649);
 
         // this.addChild(Tools.getRect(595, 80)).position.set(79, 730);
 
         const tipTxt = level == Tools.maxLevel ? '通过此关即可获得抽取大奖的机会哦' : '通关即可抽取大奖\n分数越高几率越大哦';
-        const tip = this.addChild(Tools.getText(    /// TODO 道具加步数
-            tipTxt, 26, '#744f1d',
-            TEXT_ALIGN.CENTER, 595, 79, 730
+        const tip = this.addChild(Tools.getText(
+            tipTxt, 26, '#ffffff',
+            TEXT_ALIGN.CENTER, 595, 79, 762
         ));
         tip.textHeight = 80;
         tip.lineSpacing = 10;
@@ -70,16 +70,16 @@ export class StartPanel extends Panel {
         }
 
         const prizeImg = this.addChild(Sprite.fromUrl(levelPrize[`level${pLevel}`]));
-        prizeImg.position.set(375, 906);
+        prizeImg.position.set(375, 940);
         prizeImg.anchorTexture.set(0.5, 0.5);
 
         this.addChild(new Button(RES.getRes("startBtn.png")))
             .addEventListener(MouseEvent.CLICK, this.startGame, this)
-            .position.set(190, 1073);
+            .position.set(185, 1063);
 
         this.addChild(new Button(RES.getRes('关闭按钮.png')))
             .addEventListener(MouseEvent.CLICK, this.hidePanel, this)
-            .position.set(633, 456);
+            .position.set(629, 469);
     }
 
     start(data) {

src/panels/UseStep.ts

@@ -11,11 +11,11 @@ export class UseStep extends Panel {
     };
 
     initUi() {
-        this.addChild(Tools.getSprite('panelBgS.png')).position.set(86, 512);
+        this.addChild(Tools.getSprite('useStepBg.png')).position.set(80, 486);
 
         this.addChild(Tools.getText(    /// TODO 道具加步数
-            `确定要使用步数道具+${Tools.addSteps}步数吗？`, 33, '#744f1d',
-            TEXT_ALIGN.CENTER, 750, 0, 685
+            `确定要使用步数道具+${Tools.addSteps}步数吗？`, 36, '#ffffff',
+            TEXT_ALIGN.CENTER, 750, 0, 650
         ));
 
         this.addChild(new Button(RES.getRes('useStepOk.png')))
@@ -23,21 +23,21 @@ export class UseStep extends Panel {
                 this.hidePanel();
                 this.data.ok();
             }, this)
-            .position.set(392, 865);
+            .position.set(383, 835);
 
         this.addChild(new Button(RES.getRes('useStepCancel.png')))
             .addEventListener(MouseEvent.CLICK, () => {
                 this.hidePanel();
                 this.data.cancel();
             }, this)
-            .position.set(107, 865);
+            .position.set(102, 835);
 
         this.addChild(new Button(RES.getRes('关闭按钮.png')))
             .addEventListener(MouseEvent.CLICK, () => {
                 this.hidePanel();
                 this.data.cancel();
             }, this)
-            .position.set(640, 494);
+            .position.set(629, 463);
     }
 
 }

src/scene/map/MapScene.ts

@@ -211,7 +211,6 @@ export class MapScene extends Scene {
 
     public start(data?: any) {
         super.start(data);
-
         // Tools.gameOver({
         //     "isVisitSuccess": true,
         //     "prize": undefined,