Skip to content

B
babycare_xiaoxiao
Commit 086aa885 authored by 邱旭's avatar 邱旭
Browse files
Options

换了点皮

parent bb4092bc
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 33 deletions
.idea/workspace.xml
View file @ 086aa885
...@@ -3,19 +3,12 @@ ...@@ -3,19 +3,12 @@
<component name="ChangeListManager"> <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="换了点皮">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/aa.json" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/resource/map/guide_fox.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.completeTask.json" beforeDir="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$/mock/miniTb/babycare.exchange.json" beforeDir="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$/mock/miniTb/babycare.getAppointCount.json" beforeDir="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$/mock/miniTb/babycare.getGameInfo.json" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getPrizesByLevel.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getTaskList.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.luckyDraw.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.queryCredits.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.receiveTaskRewards.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/bb.json" beforeDir="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$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -169,8 +162,8 @@ ...@@ -169,8 +162,8 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.handleLotS" /> <item itemvalue="npm.handleLotS" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
...@@ -210,14 +203,7 @@ ...@@ -210,14 +203,7 @@
<workItem from="1617871191619" duration="121000" /> <workItem from="1617871191619" duration="121000" />
<workItem from="1617890665920" duration="181000" /> <workItem from="1617890665920" duration="181000" />
<workItem from="1617960804439" duration="639000" /> <workItem from="1617960804439" duration="639000" />
<workItem from="1618193237335" duration="3251000" /> <workItem from="1618193237335" duration="3486000" />
</task>
<task id="LOCAL-00027" summary="m">
<created>1613787841903</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1613787841903</updated>
</task> </task>
<task id="LOCAL-00028" summary="m"> <task id="LOCAL-00028" summary="m">
<created>1613787910985</created> <created>1613787910985</created>
...@@ -555,7 +541,14 @@ ...@@ -555,7 +541,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1618195868769</updated> <updated>1618195868769</updated>
</task> </task>
<option name="localTasksCounter" value="76" /> <task id="LOCAL-00076" summary="换了点皮">
<created>1618196519969</created>
<option name="number" value="00076" />
<option name="presentableId" value="LOCAL-00076" />
<option name="project" value="LOCAL" />
<updated>1618196519969</updated>
</task>
<option name="localTasksCounter" value="77" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
resource/map/guide_hand.png
View replaced file @ bb4092bc View file @ 086aa885
resource/map/guide_hand.png

10.5 KB | W: | H:

resource/map/guide_hand.png

4.42 KB | W: | H:

resource/map/guide_hand.png
resource/map/guide_hand.png
resource/map/guide_hand.png
resource/map/guide_hand.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/guide_light.png
View replaced file @ bb4092bc View file @ 086aa885
resource/map/guide_light.png

6.88 KB | W: | H:

resource/map/guide_light.png

1.27 KB | W: | H:

resource/map/guide_light.png
resource/map/guide_light.png
resource/map/guide_light.png
resource/map/guide_light.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/guide_tip.png
View replaced file @ bb4092bc View file @ 086aa885
resource/map/guide_tip.png

137 KB | W: | H:

resource/map/guide_tip.png

34.3 KB | W: | H:

resource/map/guide_tip.png
resource/map/guide_tip.png
resource/map/guide_tip.png
resource/map/guide_tip.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 086aa885
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
"name": "lotteryScene" "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_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", "keys": "checkTip1.png,clearanceBtn.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" "name": "map"
}, },
{ {
......
src/ResJson.ts
View file @ 086aa885
...@@ -73,7 +73,7 @@ export const ResJson = { ...@@ -73,7 +73,7 @@ export const ResJson = {
"name": "lotteryScene" "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_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", "keys": "checkTip1.png,clearanceBtn.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" "name": "map"
}, },
{ {
......
src/scene/map/MapScene.ts
View file @ 086aa885
...@@ -109,7 +109,7 @@ export class MapScene extends Scene { ...@@ -109,7 +109,7 @@ export class MapScene extends Scene {
const guide_tip = guide.addChild(Tools.getSprite('guide_tip.png')); const guide_tip = guide.addChild(Tools.getSprite('guide_tip.png'));
guide_tip.anchorTexture.set(0.2, 1); guide_tip.anchorTexture.set(0.2, 1);
guide_tip.position.set(guide_fox.x + 200, guide_fox.y + 20); guide_tip.position.set(200, guide_check.y + 480);
guide_tip.scale.set(0, 0); guide_tip.scale.set(0, 0);
guide.alpha = 0; guide.alpha = 0;
...@@ -117,14 +117,9 @@ export class MapScene extends Scene { ...@@ -117,14 +117,9 @@ export class MapScene extends Scene {
Tween.get(guide) Tween.get(guide)
.to({ alpha: 1 }, 600, Ease.quadInOut); .to({ alpha: 1 }, 600, Ease.quadInOut);
Tween.get(guide_fox) Tween.get(guide_tip)
.wait(300) .wait(300)
.to({ y: guide_check.y + 415, alpha: 1 }, 300, Ease.quadInOut) .to({ scaleX: 1, scaleY: 1 }, 300, Ease.quadInOut);
.wait(100)
.call(() => {
Tween.get(guide_tip)
.to({ scaleX: 1, scaleY: 1 }, 300, Ease.quadInOut);
});
} }
private initMapByData(data) { private initMapByData(data) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment