首页引导

.idea/workspace.xml

@@ -2,46 +2,19 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuideBoard.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_1.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_5.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_5_1.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_8.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_8_1.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropBoom.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropCow.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropHammer.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropHand.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropMsgPanel.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropShoe.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/playSceneGuide/propGuideBoard.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/0250abc4-fabc-4bf3-970a-46ceeb12d416.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/03756d82-4e5c-4bdc-8247-7f704ed92ba7.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/0b1a21c5-2e2f-43bc-81f7-ee1c4474d07f.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/0f025d15-5a0b-4e5d-81e9-4a822c469467.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/445121aa-3bae-4b89-a8e9-fd41e2779276.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/54e427a5-b930-4506-a07d-8f1d7eb83ff5.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/560f6473-1e86-433f-a2fb-8e6d0c06d32f.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/8d000f4d-318a-47a1-9fa4-53c7b203a8fd.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/9ed4a149-8df3-45d4-b531-63b82833255a.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/b0c2b486-8dab-4c34-bec4-02e4b4ef835b.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/cd544214-fe15-402a-99a0-a57072952722.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lotties/关卡提示/e305be55-fdfd-453b-9e6d-41edfe68c0f1.png" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/playScene/gameGuideBoard.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/playScene/guidePropBoom.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/playScene/guidePropCow.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/playScene/guidePropHammer.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/playScene/guidePropHand.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/playScene/guidePropMsgPanel.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/playScene/guidePropShoe.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/guide_fox.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/guide_fox.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/guide_hand.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/guide_hand.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/guide_light.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/guide_light.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/guide_tip.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/guide_tip.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/map/remindIcon.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/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.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/something/uis/FirstPropGift.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/FirstPropGift.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/GameGuide.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/uis/PropGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/PropGuide.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -144,7 +117,7 @@
       <option name="presentableId" value="Default" />
       <updated>1612576978320</updated>
       <workItem from="1612576979459" duration="13000" />
-      <workItem from="1612577003915" duration="10579000" />
+      <workItem from="1612577003915" duration="13978000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -153,7 +126,14 @@
       <option name="project" value="LOCAL" />
       <updated>1612581213298</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="gameGuide">
+      <created>1612593007211</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1612593007212</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -164,6 +144,7 @@
     <option name="CHECK_NEW_TODO" value="false" />
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <MESSAGE value="斐乐消消乐" />
-    <option name="LAST_COMMIT_MESSAGE" value="斐乐消消乐" />
+    <MESSAGE value="gameGuide" />
+    <option name="LAST_COMMIT_MESSAGE" value="gameGuide" />
   </component>
 </project>
\ No newline at end of file

mock/miniTb/babycare.getIndex.json

 {
     "code": "000000",
     "data": {
-        "currentLevel": 66,
-        "isFristLogin": true,
+        "currentLevel": 1,
+        "isFristLogin": false,
         "visitors": [
             {
                 "activityId": "5f1a528e964f9796f92d3ccf",

resource/res.json

@@ -93,7 +93,7 @@
 			"name": "lotteryScene"
 		},
 		{
-			"keys": "guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_0.png,map_check_1.png,map_check_2.png,map_check_3.png,map_check_4.png,map_check_5.png,map_check_6.png,map_check_7.png,map_check_8.png,map_check_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,remindIcon.png",
+			"keys": "guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_0.png,map_check_1.png,map_check_2.png,map_check_3.png,map_check_4.png,map_check_5.png,map_check_6.png,map_check_7.png,map_check_8.png,map_check_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",
 			"name": "map"
 		},
 		{

src/ResJson.ts

@@ -93,7 +93,7 @@ export const ResJson = {
 			"name": "lotteryScene"
 		},
 		{
-			"keys": "guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_0.png,map_check_1.png,map_check_2.png,map_check_3.png,map_check_4.png,map_check_5.png,map_check_6.png,map_check_7.png,map_check_8.png,map_check_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,remindIcon.png",
+			"keys": "guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_0.png,map_check_1.png,map_check_2.png,map_check_3.png,map_check_4.png,map_check_5.png,map_check_6.png,map_check_7.png,map_check_8.png,map_check_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",
 			"name": "map"
 		},
 		{

src/panels/StartPanel.ts

@@ -125,7 +125,11 @@ export class StartTargetItem extends Container {
     constructor(data: ElementTargetData) {
         super();
 
-        const targetImg = this.addChild(Tools.getSprite(`ele${data.type}.png`));
+        let targetKey = 'ele';
+        if ([0, 1, 2, 3, 4].indexOf(+data.type) > -1) {
+            targetKey = 'target';
+        }
+        const targetImg = this.addChild(Tools.getSprite(`${targetKey}${data.type}.png`));
         targetImg.width = targetImg.height = 100;
 
         const targetTex = this.addChild(Tools.getText(

src/scene/LoadingScene.ts

@@ -6,6 +6,7 @@ import { getTbData, sendTbNet, TbNetName } from "../TaoBaoNet";
 import { layers } from "../../module/views/layers";
 import { changeScene } from "../../module/ctrls";
 import { PlayScene } from "./PlayScene";
+import { MapScene } from "./map/MapScene";
 
 export class LoadingScene extends Scene {
     get groupNames() {
@@ -92,9 +93,8 @@ export class LoadingScene extends Scene {
             .call(() => {
                 if (pro >= 1) {
                     this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
-                    // changeScene(MapScene, {from: "loading"})
-                    localStorage.clear();
-                    changeScene(PlayScene, { chapter: 61 });
+                    changeScene(MapScene, {from: "loading"})
+                    // changeScene(PlayScene, { chapter: 61 });
                     // changeScene(LotteryScene,{level:1});
                 }
             })

src/scene/map/MapScene.ts

@@ -6,17 +6,15 @@ import MapMid from "./MapMid";
 import CheckBtn, { CHECK_TYPE } from "./CheckBtn";
 import { layers } from "../../../module/views/layers";
 import { Tools } from "../../Tools";
+import { showPanel } from "../../../module/ctrls";
+import { FreePowerPanel } from "../../panels/FreePowerPanel";
+import { PrizePanel } from "../../panels/PrizePanel";
+import { GTool } from "../../../module/tools/GTool";
 import ScrollPage = FYGE.ScrollPage;
 import Container = FYGE.Container;
 import Graphics = FYGE.Graphics;
-import Sprite = FYGE.Sprite;
-import Texture = FYGE.Texture;
 import Tween = FYGE.Tween;
 import Ease = FYGE.Ease;
-import { showPanel, showToast } from "../../../module/ctrls";
-import { FreePowerPanel } from "../../panels/FreePowerPanel";
-import { PrizePanel } from "../../panels/PrizePanel";
-import { GTool } from "../../../module/tools/GTool";
 
 export class MapScene extends Scene {
     private mapContainer: Container = null;
@@ -87,6 +85,8 @@ export class MapScene extends Scene {
         //有bug再说
         // Tools.gameData.isFristLogin = false;
 
+        setTimeout(() => this.scrollToCheck(3));
+
         const guide = this.addChild(new Container());
         const g = guide.addChild(new Graphics());
         g.beginFill(0, 0.6);
@@ -95,24 +95,26 @@ export class MapScene extends Scene {
         const guide_check = guide.addChild(new CheckBtn({ check: 1 }));
         guide_check.enabled = true;
         guide_check.type = CHECK_TYPE.CUR;
-        guide_check.position.set(MapScene.checkArr[1].x, layers.stageHeight - 162);
 
-        const guide_hand = guide.addChild(Tools.getSprite('guide_hand.png'));
-        guide_hand.position.set(guide_check.x + 90, guide_check.y + 40);
-        guide_hand.mouseEnable = guide_hand.mouseChildren = false;
+        const checkY = MapScene.checkArr[3].y + 40 - layers.stageOffsetY;
+        guide_check.position.set(MapScene.checkArr[1].x, checkY);
 
         const guide_light = guide.addChild(Tools.getSprite('guide_light.png'));
         guide_light.anchorTexture.set(0.5, 0.5);
-        guide_light.position.set(guide_check.x + 95, guide_check.y + 45);
+        guide_light.position.set(guide_check.x + 130, guide_check.y + 82);
         guide_light.mouseEnable = guide_light.mouseChildren = false;
 
+        const guide_hand = guide.addChild(Tools.getSprite('guide_hand.png'));
+        guide_hand.position.set(guide_check.x + 110, guide_check.y + 60);
+        guide_hand.mouseEnable = guide_hand.mouseChildren = false;
+
         const guide_fox = guide.addChild(Tools.getSprite('guide_fox.png'));
-        guide_fox.position.set(45, guide_check.y - 200);
+        guide_fox.position.set(45, guide_check.y + 415);
         guide_fox.alpha = 0;
 
         const guide_tip = guide.addChild(Tools.getSprite('guide_tip.png'));
-        guide_tip.anchorTexture.set(0, 0.3);
-        guide_tip.position.set(guide_fox.x + 215, guide_fox.y - 70);
+        guide_tip.anchorTexture.set(0.2, 1);
+        guide_tip.position.set(guide_fox.x + 200, guide_fox.y + 20);
         guide_tip.scale.set(0, 0);
 
         guide.alpha = 0;
@@ -122,7 +124,7 @@ export class MapScene extends Scene {
 
         Tween.get(guide_fox)
             .wait(300)
-            .to({ y: guide_check.y - 345, alpha: 1 }, 300, Ease.quadInOut)
+            .to({ y: guide_check.y + 415, alpha: 1 }, 300, Ease.quadInOut)
             .wait(100)
             .call(() => {
                 Tween.get(guide_tip)

src/something/uis/PropGuide.ts

@@ -39,14 +39,14 @@ export class PropGuide extends FYGE.Container {
         text.text = "为本次增加额外5次步数";
         text.fillColor = "#ffffff";
         text.size = 20;
-        text.y = offsetY - 120;
+        text.y = offsetY - 88;
         text.textAlign = FYGE.TEXT_ALIGN.CENTER;
         text.textWidth = 750;
         this.addChild(text);
         this.msgTxt = text;
 
         const cancel = this.addChild(new Sprite(RES.getRes("propCancel.png")));
-        cancel.position.set(290,  offsetY - 70);
+        cancel.position.set(274,  offsetY - 60);
     }
     init(prop: PropType) {
         if (prop == PropType.BOOMS) {
@@ -55,7 +55,6 @@ export class PropGuide extends FYGE.Container {
             this.stepBtn.visible = false;
             this.setRect();
             this.msgTxt.text = "选择任意一个元素，它的横竖各一排消除";
-            // this.msgTxt.x = (750-500)/2;
         }
         else if (prop == PropType.HAMMERS) {
             this.boomBtn.visible = false;
@@ -63,7 +62,6 @@ export class PropGuide extends FYGE.Container {
             this.stepBtn.visible = false;
             this.setRect();
             this.msgTxt.text = "选择任意一个元素，直接消除掉它";
-            // this.msgTxt.x = (750-500)/2;
         }
         else {
             this.boomBtn.visible = false;
@@ -80,11 +78,10 @@ export class PropGuide extends FYGE.Container {
             this.bg.drawCircle(stepPosition[0], stepPosition[1], stepPosition[2], false)
             this.bg.endFill();
             this.msgTxt.text = "点击上方步数，可为闯关时增加额外5次步数";
-            // this.msgTxt.x = 320;
         }
 
         this.msgTxt.fillColor = "#f4f4df";
-        this.msgTxt.size = 33;
+        this.msgTxt.size = 18;
     }
 
     setRect() {