换了点皮

.idea/workspace.xml

@@ -2,37 +2,22 @@
 <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/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/SuccessPanel/star_dis.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/star_dis.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/star_en.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/star_en.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/sucAgain.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucAgain.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/sucContinueL.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucContinueL.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/sucContinueS.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucContinueS.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/sucContinueSR.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucContinueSR.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/sucGet.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/sucGet.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/sucPrizeTip.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/sucPropTip.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/successBgL.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/successBgL.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/SuccessPanel/successBgS.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/successBgS.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/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.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" />
@@ -227,14 +212,7 @@
       <workItem from="1617871191619" duration="121000" />
       <workItem from="1617890665920" duration="181000" />
       <workItem from="1617960804439" duration="639000" />
-      <workItem from="1618193237335" duration="7520000" />
-    </task>
-    <task id="LOCAL-00034" summary="m">
-      <created>1613810371864</created>
-      <option name="number" value="00034" />
-      <option name="presentableId" value="LOCAL-00034" />
-      <option name="project" value="LOCAL" />
-      <updated>1613810371864</updated>
+      <workItem from="1618193237335" duration="9255000" />
     </task>
     <task id="LOCAL-00035" summary="m">
       <created>1613812844199</created>
@@ -572,7 +550,14 @@
       <option name="project" value="LOCAL" />
       <updated>1618197931386</updated>
     </task>
-    <option name="localTasksCounter" value="83" />
+    <task id="LOCAL-00083" summary="换了点皮">
+      <created>1618205545381</created>
+      <option name="number" value="00083" />
+      <option name="presentableId" value="LOCAL-00083" />
+      <option name="project" value="LOCAL" />
+      <updated>1618205545382</updated>
+    </task>
+    <option name="localTasksCounter" value="84" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

resource/res.json

@@ -41,7 +41,7 @@
 			"name": "StartPanel"
 		},
 		{
-			"keys": "star_dis.png,star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
+			"keys": "star_dis.png,star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,successBgL.png,successBgS.png",
 			"name": "SuccessPanel"
 		},
 		{

src/ResJson.ts

@@ -41,7 +41,7 @@ export const ResJson = {
 			"name": "StartPanel"
 		},
 		{
-			"keys": "star_dis.png,star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
+			"keys": "star_dis.png,star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,successBgL.png,successBgS.png",
 			"name": "SuccessPanel"
 		},
 		{

src/panels/SuccessNoPrizePanel.ts

@@ -31,41 +31,41 @@ export class SuccessNoPrizePanel extends Panel {
     initUi() {
         const { level, isVisitSuccess, score, stars } = this.data;
 
-        this.addChild(Tools.getSprite("successBgS.png")).position.set(79, 345);
+        this.addChild(Tools.getSprite("successBgS.png")).position.set(80, 259);
 
         const starGroup = this.addChild(new SuccessStarGroup());
-        starGroup.position.set(375, 600);
+        starGroup.position.set(375, 620);
         starGroup.play(stars);
 
         const tipLabel = this.addChild(Tools.getText(
-            "闯关成功！", 36, "#744f1d",
-            FYGE.TEXT_ALIGN.CENTER, 750, 0, 713
+            "闯关成功！", 36, "#ffffff",
+            FYGE.TEXT_ALIGN.CENTER, 750, 23, 745
         ));
 
         if (level == Tools.maxLevel && !Tools.gameData.isDrawTopLevelPrize) {  // 99关 且没有抽奖
             tipLabel.text = '成功通关！\n获得一次抽奖机会！';
             this.addChild(new Button(RES.getRes("sucGoPrize.png")))
                 .addEventListener(MouseEvent.CLICK, this.goPrize, this)
-                .position.set(190, 828);
+                .position.set(185, 934);
         } else {
             if (stars >= 3) {// 满星
                 this.addChild(new Button(RES.getRes("sucContinueL.png")))
                     .addEventListener(MouseEvent.CLICK, this.continue, this)
-                    .position.set(190, 824);
+                    .position.set(190, 860);
             } else { // 不满
                 tipLabel.text = '闯关成功！';
                 this.addChild(new Button(RES.getRes("sucAgain.png")))
                     .addEventListener(MouseEvent.CLICK, this.again, this)
-                    .position.set(100, 869);
+                    .position.set(102, 915);
                 this.addChild(new Button(RES.getRes("sucContinueSR.png")))
                     .addEventListener(MouseEvent.CLICK, this.continue, this)
-                    .position.set(385, 869);
+                    .position.set(383, 915);
             }
         }
 
         this.addChild(new Button(RES.getRes('关闭按钮.png')))
             .addEventListener(MouseEvent.CLICK, this.hidePanel, this)
-            .position.set(638, 458);
+            .position.set(629, 469);
     }
 
     start(data) {
@@ -127,8 +127,8 @@ export class SuccessStarGroup extends Container {
         this.midStarDis.anchorTexture.set(0.5, 0.5);
         this.rightStarDis.anchorTexture.set(0.5, 0.5);
 
-        this.leftStarDis.position.set(-140, 10);
-        this.rightStarDis.position.set(140, 10);
+        this.leftStarDis.position.set(-140, 19);
+        this.rightStarDis.position.set(140, 19);
 
         this.leftStarEn = this.addChild(Tools.getSprite('star_en.png'));
         this.midStarEn = this.addChild(Tools.getSprite('star_en.png'));
@@ -138,8 +138,8 @@ export class SuccessStarGroup extends Container {
         this.midStarEn.anchorTexture.set(0.5, 0.5);
         this.rightStarEn.anchorTexture.set(0.5, 0.5);
 
-        this.leftStarEn.position.set(-140, 10);
-        this.rightStarEn.position.set(140, 10);
+        this.leftStarEn.position.set(-140, 19);
+        this.rightStarEn.position.set(140, 19);
 
         this.leftStarEn.scale.set(0, 0);
         this.midStarEn.scale.set(0, 0);

src/panels/SuccessPrizePanel.ts

@@ -34,14 +34,14 @@ export class SuccessPrizePanel extends Panel {
         const { prize, level, isVisitSuccess, score, stars } = this.data;
         const { name, _id, image, type, toolType } = prize;
 
-        this.addChild(Tools.getSprite("successBgL.png")).position.set(79, 345);
+        this.addChild(Tools.getSprite("successBgL.png")).position.set(80, 259);
 
         const starGroup = this.addChild(new SuccessStarGroup());
         starGroup.position.set(375, 600);
         starGroup.play(stars);
 
         this.addChild(Tools.getText(
-            "闯关成功！获得奖励", 36, "#744f1d",
+            "闯关成功！获得奖励", 36, "#ffffff",
             FYGE.TEXT_ALIGN.CENTER, 750, 0, 713
         ));
 
@@ -70,7 +70,10 @@ export class SuccessPrizePanel extends Panel {
                     .addEventListener(MouseEvent.CLICK, this.continue, this)
                     .position.set(190, 1050);
             } else {    // 不是三星
-                this.addChild(Tools.getSprite("sucPropTip.png")).position.set(142, 1010);
+                this.addChild(Tools.getText(
+                    "满星通关可抽取更大奖励哦", 26, "#ffffff",
+                    FYGE.TEXT_ALIGN.CENTER, 750, 0, 1020
+                ));
                 this.addChild(new Button(RES.getRes("sucAgain.png")))
                     .addEventListener(MouseEvent.CLICK, this.again, this)
                     .position.set(100, 1089);
@@ -80,7 +83,10 @@ export class SuccessPrizePanel extends Panel {
             }
         } else {    // 不是道具
             prizeImg.texture = Texture.fromUrl(image);
-            this.addChild(Tools.getSprite("sucPrizeTip.png")).position.set(142, 1010);
+            this.addChild(Tools.getText(
+                "奖品可在“我的奖品”页面查看", 26, "#ffffff",
+                FYGE.TEXT_ALIGN.CENTER, 750, 0, 1020
+            ));
             this.addChild(new Button(RES.getRes("sucContinueS.png")))
                 .addEventListener(MouseEvent.CLICK, this.continue, this)
                 .position.set(100, 1089);

src/scene/map/MapScene.ts

@@ -211,13 +211,19 @@ export class MapScene extends Scene {
 
     public start(data?: any) {
         super.start(data);
-        // Tools.gameOver({
-        //     "isVisitSuccess": true,
-        //     "prize": undefined,
-        //     "level": 99,
-        //     "score": 58940,
-        //     "stars": 3
-        // });
+        Tools.gameOver({
+            isVisitSuccess: true,
+            prize: {
+                type: 6,
+                toolType: "steps",
+                name: "aaaaa",
+                _id: "_id",
+                image: "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png"
+            },
+            level: 98,
+            score: 58940,
+            stars: 2
+        });
 
     }