换了点皮

.idea/workspace.xml

@@ -2,8 +2,36 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮">
+      <change afterPath="$PROJECT_DIR$/resource/map/mcd0.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/resource/map/mcd1.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/resource/map/mcd2.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/resource/map/mce0.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/resource/map/mce1.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/resource/map/mce2.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/resource/map/checkTip1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/checkTip1.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_disable.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_check_disable_prize.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_check_enable.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_check_enable_cur.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_star_disable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_disable.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/map_star_enable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_enable.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ice2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ice3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ice4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ice5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/ice6.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/rock2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rock2.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/rock3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rock3.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/rock4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rock4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/rock5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rock5.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/playScene/rock6.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -157,8 +185,8 @@
     <recent_temporary>
       <list>
         <item itemvalue="npm.dev" />
-        <item itemvalue="npm.handleLotS" />
         <item itemvalue="npm.flushRes" />
+        <item itemvalue="npm.handleLotS" />
         <item itemvalue="npm.buildTS" />
         <item itemvalue="npm.build" />
       </list>
@@ -195,13 +223,9 @@
       <workItem from="1617702978246" duration="12255000" />
       <workItem from="1617847690167" duration="9973000" />
       <workItem from="1617871191619" duration="121000" />
-    </task>
-    <task id="LOCAL-00025" summary="m">
-      <created>1613730899385</created>
-      <option name="number" value="00025" />
-      <option name="presentableId" value="LOCAL-00025" />
-      <option name="project" value="LOCAL" />
-      <updated>1613730899385</updated>
+      <workItem from="1617890665920" duration="181000" />
+      <workItem from="1617960804439" duration="639000" />
+      <workItem from="1618193237335" duration="2617000" />
     </task>
     <task id="LOCAL-00026" summary="m">
       <created>1613787371878</created>
@@ -539,7 +563,14 @@
       <option name="project" value="LOCAL" />
       <updated>1617854352155</updated>
     </task>
-    <option name="localTasksCounter" value="74" />
+    <task id="LOCAL-00074" summary="换了点皮">
+      <created>1617890842829</created>
+      <option name="number" value="00074" />
+      <option name="presentableId" value="LOCAL-00074" />
+      <option name="project" value="LOCAL" />
+      <updated>1617890842829</updated>
+    </task>
+    <option name="localTasksCounter" value="75" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

resource/res.json

@@ -73,7 +73,7 @@
 			"name": "lotteryScene"
 		},
 		{
-			"keys": "checkTip1.png,clearanceBtn.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check1_0.png,map_check1_1.png,map_check1_2.png,map_check1_3.png,map_check1_4.png,map_check1_5.png,map_check1_6.png,map_check1_7.png,map_check1_8.png,map_check1_9.png,map_check2_0.png,map_check2_1.png,map_check2_2.png,map_check2_3.png,map_check2_4.png,map_check2_5.png,map_check2_6.png,map_check2_7.png,map_check2_8.png,map_check2_9.png,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png",
+			"keys": "checkTip1.png,clearanceBtn.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check1_0.png,map_check1_1.png,map_check1_2.png,map_check1_3.png,map_check1_4.png,map_check1_5.png,map_check1_6.png,map_check1_7.png,map_check1_8.png,map_check1_9.png,map_check2_0.png,map_check2_1.png,map_check2_2.png,map_check2_3.png,map_check2_4.png,map_check2_5.png,map_check2_6.png,map_check2_7.png,map_check2_8.png,map_check2_9.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,mcd0.png,mcd1.png,mcd2.png,mce0.png,mce1.png,mce2.png",
 			"name": "map"
 		},
 		{
@@ -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,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png,闪闪.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,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,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png,闪闪.png",
 			"name": "playScene"
 		},
 		{

src/ResJson.ts

@@ -73,7 +73,7 @@ export const ResJson = {
 			"name": "lotteryScene"
 		},
 		{
-			"keys": "checkTip1.png,clearanceBtn.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check1_0.png,map_check1_1.png,map_check1_2.png,map_check1_3.png,map_check1_4.png,map_check1_5.png,map_check1_6.png,map_check1_7.png,map_check1_8.png,map_check1_9.png,map_check2_0.png,map_check2_1.png,map_check2_2.png,map_check2_3.png,map_check2_4.png,map_check2_5.png,map_check2_6.png,map_check2_7.png,map_check2_8.png,map_check2_9.png,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png",
+			"keys": "checkTip1.png,clearanceBtn.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check1_0.png,map_check1_1.png,map_check1_2.png,map_check1_3.png,map_check1_4.png,map_check1_5.png,map_check1_6.png,map_check1_7.png,map_check1_8.png,map_check1_9.png,map_check2_0.png,map_check2_1.png,map_check2_2.png,map_check2_3.png,map_check2_4.png,map_check2_5.png,map_check2_6.png,map_check2_7.png,map_check2_8.png,map_check2_9.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,mcd0.png,mcd1.png,mcd2.png,mce0.png,mce1.png,mce2.png",
 			"name": "map"
 		},
 		{
@@ -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,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png,闪闪.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,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,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png,闪闪.png",
 			"name": "playScene"
 		},
 		{

src/scene/map/CheckBtn.ts

+import BitmapText = FYGE.BitmapText;
 import Button = FYGE.Button;
 import Container = FYGE.Container;
-import Sprite = FYGE.Sprite;
-import Texture = FYGE.Texture;
 import MouseEvent = FYGE.MouseEvent;
 import Point = FYGE.Point;
-import BitmapText = FYGE.BitmapText;
-import { RES } from "../../../module/RES";
-import { Tools } from "../../Tools";
+import Sprite = FYGE.Sprite;
+import TEXT_ALIGN = FYGE.TEXT_ALIGN;
+import Texture = FYGE.Texture;
 import { showPanel } from "../../../module/ctrls";
+import { RES } from "../../../module/RES";
 import { StartPanel } from "../../panels/StartPanel";
+import { Tools } from "../../Tools";
+import TextField = FYGE.TextField;
 
 export enum CHECK_TYPE {
     COM,   // 普通
@@ -34,8 +36,7 @@ export default class CheckBtn extends Container {
     };
 
     private btn: Button = null;
-    private checkTxt: BitmapText = null;
-    private checkTxt1: BitmapText = null;
+    private checkTxt: TextField = null;
 
     private star: CheckStar[] = null;
 
@@ -79,8 +80,6 @@ export default class CheckBtn extends Container {
 
         this.btn.enabled = enabled;
         this.star.forEach(v => v.visible = enabled);
-        this.checkTxt.visible = enabled;
-        this.checkTxt1.visible = !enabled;
     }
 
     // 按钮类型
@@ -91,17 +90,17 @@ export default class CheckBtn extends Container {
 
         switch (type) {
             case CHECK_TYPE.COM:
-                this.btn.changeTexture(
-                    RES.getRes('map_check_enable.png'),
-                    RES.getRes('map_check_enable.png'),
-                    RES.getRes('map_check_disable.png'));
+                // this.btn.changeTexture(
+                //     RES.getRes(`mce${this.checkNum % 3 + 1}.png`),
+                //     RES.getRes(`mce${this.checkNum % 3 + 1}.png`),
+                //     RES.getRes(`mcd${this.checkNum % 3 + 1}.png`));
                 break;
 
             case CHECK_TYPE.CUR:
-                this.btn.changeTexture(
-                    RES.getRes('map_check_enable_cur.png'),
-                    RES.getRes('map_check_enable_cur.png'),
-                    RES.getRes('map_check_disable.png'));
+                // this.btn.changeTexture(
+                //     RES.getRes(`mce${this.checkNum % 3 + 1}.png`),
+                //     RES.getRes(`mce${this.checkNum % 3 + 1}.png`),
+                //     RES.getRes(`mcd${this.checkNum % 3 + 1}.png`));
                 // const curAni = this.addChildAt(new Lottie(CheckTip), -1);
                 // curAni.position.set(-72, -60);
                 // curAni.play(-1);
@@ -123,19 +122,19 @@ export default class CheckBtn extends Container {
 
     protected initUi(data) {
         this.btn = this.addChild(new Button(
-            RES.getRes('map_check_enable.png'),
-            RES.getRes('map_check_enable.png'),
-            RES.getRes('map_check_disable.png')
+            RES.getRes(`mce${data.check % 3}.png`),
+            RES.getRes(`mce${data.check % 3}.png`),
+            RES.getRes(`mcd${data.check % 3}.png`)
         ));
 
         // 三个星星
         const star1 = this.addChild(new CheckStar());
-        star1.position.set(7, 115);
+        star1.position.set(7, 125);
         star1.rotation = 10;
         const star2 = this.addChild(new CheckStar());
-        star2.position.set(54, 120);
+        star2.position.set(54, 130);
         const star3 = this.addChild(new CheckStar());
-        star3.position.set(99, 115);
+        star3.position.set(99, 125);
         star3.rotation = -10;
         this.star = [star1, star2, star3];
 
@@ -143,13 +142,11 @@ export default class CheckBtn extends Container {
         this.checkNum = data.check;
         this.checkData.level = data.check;
 
-        this.checkTxt = this.btn.addChild(new BitmapText(Tools.getNumTextures('map_check2_')));
-        this.checkTxt.position.set(78, 38);
-        this.checkTxt.text = data.check + '';
-
-        this.checkTxt1 = this.btn.addChild(new BitmapText(Tools.getNumTextures('map_check1_')));
-        this.checkTxt1.position.set(78, 38);
-        this.checkTxt1.text = data.check + '';
+        this.checkTxt = this.btn.addChild(Tools.getText(
+            data.check + '',  45, "#f9f9f5",
+            TEXT_ALIGN.CENTER, 164, 0, 18
+        ));
+        this.checkTxt.bold = true;
 
         this.enabled = false;   // 先设置成关闭