Skip to content

B
babycare_xiaoxiao
Commit 178aa111 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

节日红包

parent a7e896df
Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 364 deletions
.idea/workspace.xml
View file @ 178aa111
...@@ -3,112 +3,16 @@ ...@@ -3,112 +3,16 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" 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/popmartXXL2c.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/festival/fesRedBombSta1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/festival/fesRedBombSta1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_0.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/festival/fesRedDown.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/festival/fesRedDown.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_1.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/festival/xingxingbi.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_10.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_11.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele0_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele1_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele2_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele3_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/fiveVerHorDis/dis_ele4_9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom10.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom10.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom11.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom11.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom12.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom12.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom13.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom13.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom14.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom14.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom15.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom15.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom16.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom16.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom17.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom17.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom18.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom18.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom19.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom19.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom20.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom20.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/boom9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/boom9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/greenCircleDown.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/greenCircleDown.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/greenCircleUp.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/greenCircleUp.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/jellyArrow.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/jellyArrow.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/magicLionBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/magicLionBg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/FesRedPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FesRedPrizePanel.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/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/something/anisCall/FesRedBombShowAni.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/anisCall/FesRedBombShowAni.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/anisCall/FesRedShootAni.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/anisCall/FesRedShootAni.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/class/FestivalEle.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/class/FestivalEle.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/logic/AiControl.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/logic/AiControl.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -253,14 +157,7 @@ ...@@ -253,14 +157,7 @@
<workItem from="1600912046696" duration="16271000" /> <workItem from="1600912046696" duration="16271000" />
<workItem from="1600998191749" duration="23862000" /> <workItem from="1600998191749" duration="23862000" />
<workItem from="1601170975973" duration="20963000" /> <workItem from="1601170975973" duration="20963000" />
<workItem from="1601257315718" duration="32630000" /> <workItem from="1601257315718" duration="38835000" />
</task>
<task id="LOCAL-00009" summary="map effect">
<created>1594696152026</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1594696152026</updated>
</task> </task>
<task id="LOCAL-00010" summary="map effect"> <task id="LOCAL-00010" summary="map effect">
<created>1594697145788</created> <created>1594697145788</created>
...@@ -598,7 +495,14 @@ ...@@ -598,7 +495,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1601291372788</updated> <updated>1601291372788</updated>
</task> </task>
<option name="localTasksCounter" value="58" /> <task id="LOCAL-00058" summary="afdjk,asfhksjkdulfh klasoi;dfbhjkgv kl;">
<created>1601351573277</created>
<option name="number" value="00058" />
<option name="presentableId" value="LOCAL-00058" />
<option name="project" value="LOCAL" />
<updated>1601351573277</updated>
</task>
<option name="localTasksCounter" value="59" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -626,7 +530,8 @@ ...@@ -626,7 +530,8 @@
<MESSAGE value="换了点皮" /> <MESSAGE value="换了点皮" />
<MESSAGE value="换了点皮,换了下接口" /> <MESSAGE value="换了点皮,换了下接口" />
<MESSAGE value="主页" /> <MESSAGE value="主页" />
<option name="LAST_COMMIT_MESSAGE" value="主页" /> <MESSAGE value="afdjk,asfhksjkdulfh klasoi;dfbhjkgv kl;" />
<option name="LAST_COMMIT_MESSAGE" value="afdjk,asfhksjkdulfh klasoi;dfbhjkgv kl;" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530"> <state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
...@@ -641,49 +546,49 @@ ...@@ -641,49 +546,49 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" /> <state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1601291372532"> <state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1601351572471">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601291372532" /> <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601351572471" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" /> <state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169"> <state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" /> <state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" />
<state width="889" height="321" key="GridCell.Tab.0.bottom" timestamp="1601288680787"> <state width="896" height="406" key="GridCell.Tab.0.bottom" timestamp="1601360990411">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="869" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" /> <state width="869" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" />
<state width="885" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1600962876448" /> <state width="885" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1600962876448" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" /> <state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="889" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601288680787" /> <state width="896" height="406" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601360990411" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" /> <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="889" height="321" key="GridCell.Tab.0.center" timestamp="1601288680786"> <state width="896" height="406" key="GridCell.Tab.0.center" timestamp="1601360990409">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="869" height="321" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" /> <state width="869" height="321" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" />
<state width="885" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" /> <state width="885" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" /> <state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="889" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601288680786" /> <state width="896" height="406" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601360990409" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" /> <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="889" height="321" key="GridCell.Tab.0.left" timestamp="1601288680786"> <state width="896" height="406" key="GridCell.Tab.0.left" timestamp="1601360990408">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="869" height="321" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" /> <state width="869" height="321" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" />
<state width="885" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" /> <state width="885" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" /> <state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="889" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601288680786" /> <state width="896" height="406" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601360990408" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" /> <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" /> <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="889" height="321" key="GridCell.Tab.0.right" timestamp="1601288680786"> <state width="896" height="406" key="GridCell.Tab.0.right" timestamp="1601360990410">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="869" height="321" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" /> <state width="869" height="321" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" />
<state width="885" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" /> <state width="885" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" /> <state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="889" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601288680786" /> <state width="896" height="406" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601360990410" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" /> <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326"> <state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
...@@ -700,10 +605,10 @@ ...@@ -700,10 +605,10 @@
</state> </state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" /> <state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" /> <state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601291374031"> <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601351574473">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601291374031" /> <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601351574473" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" /> <state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397"> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
...@@ -732,11 +637,11 @@ ...@@ -732,11 +637,11 @@
</state> </state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" /> <state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" /> <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601347943149"> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601361835081">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" /> <state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601347943149" /> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601361835081" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
......
resource/festival/fesRedBombSta1.png
View replaced file @ a7e896df View file @ 178aa111
resource/festival/fesRedBombSta1.png

41.4 KB | W: | H:

resource/festival/fesRedBombSta1.png

43 KB | W: | H:

resource/festival/fesRedBombSta1.png
resource/festival/fesRedBombSta1.png
resource/festival/fesRedBombSta1.png
resource/festival/fesRedBombSta1.png
  • 2-up
  • Swipe
  • Onion skin
resource/festival/fesRedDown.png
View replaced file @ a7e896df View file @ 178aa111
resource/festival/fesRedDown.png

1.54 KB | W: | H:

resource/festival/fesRedDown.png

54.2 KB | W: | H:

resource/festival/fesRedDown.png
resource/festival/fesRedDown.png
resource/festival/fesRedDown.png
resource/festival/fesRedDown.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 178aa111
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"name": "common" "name": "common"
}, },
{ {
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png", "keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedBombSta2.png,fesRedBombSta3_0.png,fesRedBombSta3_1.png,fesRedBombSta3_10.png,fesRedBombSta3_11.png,fesRedBombSta3_12.png,fesRedBombSta3_13.png,fesRedBombSta3_2.png,fesRedBombSta3_3.png,fesRedBombSta3_4.png,fesRedBombSta3_5.png,fesRedBombSta3_6.png,fesRedBombSta3_7.png,fesRedBombSta3_8.png,fesRedBombSta3_9.png,fesRedBombSta4_0.png,fesRedBombSta4_1.png,fesRedBombSta4_10.png,fesRedBombSta4_11.png,fesRedBombSta4_12.png,fesRedBombSta4_13.png,fesRedBombSta4_14.png,fesRedBombSta4_15.png,fesRedBombSta4_16.png,fesRedBombSta4_17.png,fesRedBombSta4_2.png,fesRedBombSta4_3.png,fesRedBombSta4_4.png,fesRedBombSta4_5.png,fesRedBombSta4_6.png,fesRedBombSta4_7.png,fesRedBombSta4_8.png,fesRedBombSta4_9.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi1.png",
"name": "festival" "name": "festival"
}, },
{ {
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
"name": "map" "name": "map"
}, },
{ {
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.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,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,fesRedBombSta1.png,fesRedBombSta2.png,fesRedCap.png,fesRedDown.png,fesRedUp.png,festivalTargetBg.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,xingxingbi.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.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,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,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,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
}, },
{ {
......
src/ResJson.ts
View file @ 178aa111
...@@ -53,7 +53,7 @@ export const ResJson = { ...@@ -53,7 +53,7 @@ export const ResJson = {
"name": "common" "name": "common"
}, },
{ {
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png", "keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedBombSta2.png,fesRedBombSta3_0.png,fesRedBombSta3_1.png,fesRedBombSta3_10.png,fesRedBombSta3_11.png,fesRedBombSta3_12.png,fesRedBombSta3_13.png,fesRedBombSta3_2.png,fesRedBombSta3_3.png,fesRedBombSta3_4.png,fesRedBombSta3_5.png,fesRedBombSta3_6.png,fesRedBombSta3_7.png,fesRedBombSta3_8.png,fesRedBombSta3_9.png,fesRedBombSta4_0.png,fesRedBombSta4_1.png,fesRedBombSta4_10.png,fesRedBombSta4_11.png,fesRedBombSta4_12.png,fesRedBombSta4_13.png,fesRedBombSta4_14.png,fesRedBombSta4_15.png,fesRedBombSta4_16.png,fesRedBombSta4_17.png,fesRedBombSta4_2.png,fesRedBombSta4_3.png,fesRedBombSta4_4.png,fesRedBombSta4_5.png,fesRedBombSta4_6.png,fesRedBombSta4_7.png,fesRedBombSta4_8.png,fesRedBombSta4_9.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi1.png",
"name": "festival" "name": "festival"
}, },
{ {
...@@ -73,7 +73,7 @@ export const ResJson = { ...@@ -73,7 +73,7 @@ export const ResJson = {
"name": "map" "name": "map"
}, },
{ {
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.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,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,fesRedBombSta1.png,fesRedBombSta2.png,fesRedCap.png,fesRedDown.png,fesRedUp.png,festivalTargetBg.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,xingxingbi.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.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,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,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,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
}, },
{ {
......
src/scene/PlayScene.ts
View file @ 178aa111
...@@ -66,6 +66,9 @@ import { G_EVENT } from '../common/G_EVENT'; ...@@ -66,6 +66,9 @@ import { G_EVENT } from '../common/G_EVENT';
import Tween = FYGE.Tween; import Tween = FYGE.Tween;
import { BitmapRecycle } from "../something/class/BitmapRecycle"; import { BitmapRecycle } from "../something/class/BitmapRecycle";
import { FesRedPrizePanel } from "../panels/FesRedPrizePanel"; import { FesRedPrizePanel } from "../panels/FesRedPrizePanel";
import FrameAni = FYGE.FrameAni;
import Texture = FYGE.Texture;
import Container = FYGE.Container;
const aniClass = { const aniClass = {
"BoomAni": BoomAni, "BoomAni": BoomAni,
...@@ -123,7 +126,7 @@ const festivalIndex: number = 40 ...@@ -123,7 +126,7 @@ const festivalIndex: number = 40
export class PlayScene extends Scene { export class PlayScene extends Scene {
get groupNames() { get groupNames() {
return ["playScene", "fiveVerHorDis"] return ["playScene", "fiveVerHorDis", 'festival']
} }
//关卡数据 //关卡数据
...@@ -1961,7 +1964,6 @@ export class PlayScene extends Scene { ...@@ -1961,7 +1964,6 @@ export class PlayScene extends Scene {
this.addChild(this.gameGuide) this.addChild(this.gameGuide)
this.gameGuide.show() this.gameGuide.show()
} }
;
//允许移动 //允许移动
this.enableMouseEvt(true); this.enableMouseEvt(true);
//检查是否有红包炸弹弹框；有就弹出；然后置空 //检查是否有红包炸弹弹框；有就弹出；然后置空
...@@ -2903,23 +2905,31 @@ export class PlayScene extends Scene { ...@@ -2903,23 +2905,31 @@ export class PlayScene extends Scene {
//红包炸弹动效 //红包炸弹动效
redBombLightAni(index: number, callback: Function) { redBombLightAni(index: number, callback: Function) {
//如果有
// if (movieClips["redBombLight"]) { const node = new Container();
// var p = Tool.getPositionByIndex(index); const down = new FYGE.Sprite(RES.getRes("fesRedDown.png"));
// movieClips["redBombLight"].x = p[0] - 358; down.anchorTexture.set(0.5, 0.5);
// movieClips["redBombLight"].y = p[1] - 137; down.scale.set(0.31, 0.31);
// this.addChild(movieClips["redBombLight"]) node.addChild(down);
// movieClips["redBombLight"].gotoAndPlay(1, true);
// setTimeout(() => { const ani2Texture: Texture[] = [];
// if (movieClips["redBombLight"].parent) { for (let i = 0; i < 18; i++) {
// movieClips["redBombLight"].parent.removeChild(movieClips["redBombLight"]) ani2Texture.push(RES.getRes(`fesRedBombSta4_${i}.png`));
// } }
// }, 56 / 60 * 1000)
// } const ani2 = node.addChild(new FrameAni(ani2Texture));
//时间再调 const p = Tool.getPositionByIndex(index);
// setTimeout(() => {
callback(); this.addChild(node);
// }, 80)
node.x = p[0];
node.y = p[1];
ani2.play(1, () => {
setTimeout(() => {
callback(node);
}, 80)
});
} }
} }
......
src/something/anisCall/FesRedBombShowAni.ts
View file @ 178aa111
...@@ -12,11 +12,6 @@ export class FesRedBombShowAni extends FYGE.Container { ...@@ -12,11 +12,6 @@ export class FesRedBombShowAni extends FYGE.Container {
down.x = -textureDown.width / 2; down.x = -textureDown.width / 2;
down.y = -textureDown.height / 2; down.y = -textureDown.height / 2;
this.addChild(down); this.addChild(down);
var textureUp: FYGE.Texture = RES.getRes("xingxingbi.png");
var up = new FYGE.Sprite(textureUp);
up.x = -textureUp.width / 2; //-89
up.y = -100;
this.addChild(up);
} }
play(position: number[], callback: Function) { play(position: number[], callback: Function) {
this.scaleX = this.scaleY = 0.29; this.scaleX = this.scaleY = 0.29;
......
src/something/anisCall/FesRedShootAni.ts
View file @ 178aa111
import { Pool } from "../Pool"; import { Pool } from "../Pool";
import { RecoverName } from "../enum/RecoverName"; import { RecoverName } from "../enum/RecoverName";
...@@ -7,6 +6,7 @@ import { Tool } from "../Tool"; ...@@ -7,6 +6,7 @@ import { Tool } from "../Tool";
import { ElementType } from "../enum/ElementType"; import { ElementType } from "../enum/ElementType";
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import Texture = FYGE.Texture; import Texture = FYGE.Texture;
import FrameAni = FYGE.FrameAni;
/** /**
* 需要回调的 * 需要回调的
...@@ -16,8 +16,10 @@ export class FesRedShootAni extends FYGE.Container { ...@@ -16,8 +16,10 @@ export class FesRedShootAni extends FYGE.Container {
light: LightingAni; light: LightingAni;
imageAni: FYGE.FrameAni; imageAni: FYGE.FrameAni;
imageAniCon: FYGE.Container imageAniCon: FYGE.Container
constructor() { constructor() {
super() super();
this.light = new LightingAni(); this.light = new LightingAni();
this.addChild(this.light); this.addChild(this.light);
var arr = [] var arr = []
...@@ -28,8 +30,10 @@ export class FesRedShootAni extends FYGE.Container { ...@@ -28,8 +30,10 @@ export class FesRedShootAni extends FYGE.Container {
this.imageAni = new FYGE.FrameAni(arr); this.imageAni = new FYGE.FrameAni(arr);
this.imageAniCon.addChild(this.imageAni); this.imageAniCon.addChild(this.imageAni);
this.addChild(this.imageAniCon); this.addChild(this.imageAniCon);
this.imageAni.visible = false this.imageAni.visible = false;
} }
reset() { reset() {
this.light.visible = true; this.light.visible = true;
this.imageAni.visible = false; this.imageAni.visible = false;
...@@ -38,6 +42,8 @@ export class FesRedShootAni extends FYGE.Container { ...@@ -38,6 +42,8 @@ export class FesRedShootAni extends FYGE.Container {
play(startP: number[], ele: Element, callback: Function) { play(startP: number[], ele: Element, callback: Function) {
this.reset() this.reset()
this.light.visible = true;
//算角度 //算角度
var r = Tool.getForwardRotation(startP, [ele.x, ele.y]) var r = Tool.getForwardRotation(startP, [ele.x, ele.y])
this.light.rotation = r * 180 / Math.PI; this.light.rotation = r * 180 / Math.PI;
...@@ -52,12 +58,12 @@ export class FesRedShootAni extends FYGE.Container { ...@@ -52,12 +58,12 @@ export class FesRedShootAni extends FYGE.Container {
) )
var scaleX = dis / 247; var scaleX = dis / 247;
FYGE.Tween.get(this.light) FYGE.Tween.get(this.light)
.to({ scaleX: scaleX, }, 400) .to({scaleX: scaleX,}, 400)
.call(() => { .call(() => {
ele.reset(ElementType.FESTIVALELE_SMALL); ele.reset(ElementType.FESTIVALELE_SMALL);
ele.scaleX = ele.scaleY = 0.1 ele.scaleX = ele.scaleY = 0.1
FYGE.Tween.get(ele) FYGE.Tween.get(ele)
.to({ scaleX: 1, scaleY: 1 }, 500, FYGE.Ease.backOut) .to({scaleX: 1, scaleY: 1}, 500, FYGE.Ease.backOut)
//回调 //回调
callback(); callback();
...@@ -66,19 +72,19 @@ export class FesRedShootAni extends FYGE.Container { ...@@ -66,19 +72,19 @@ export class FesRedShootAni extends FYGE.Container {
this.imageAni.play(1, () => { this.imageAni.play(1, () => {
if (this.parent) { if (this.parent) {
this.parent.removeChild(this) this.parent.removeChild(this)
}; }
;
Pool.recover(RecoverName.FESREDSHOOT_ANI, this) Pool.recover(RecoverName.FESREDSHOOT_ANI, this)
}) })
setTimeout(() => { setTimeout(() => {
this.light.visible = false; this.light.visible = false;
}, 200) }, 200)
}) });
} }
} }
class LightingAni extends FYGE.Sprite { class LightingAni extends FYGE.Sprite {
sourceAll: Texture[]; sourceAll: Texture[];
currentFrame: number; currentFrame: number;
...@@ -90,6 +96,7 @@ class LightingAni extends FYGE.Sprite { ...@@ -90,6 +96,7 @@ class LightingAni extends FYGE.Sprite {
* 所有时间，帧数按每秒30 * 所有时间，帧数按每秒30
*/ */
allTime: number allTime: number
/** /**
* 播放完的回调 * 播放完的回调
*/ */
...@@ -112,6 +119,7 @@ class LightingAni extends FYGE.Sprite { ...@@ -112,6 +119,7 @@ class LightingAni extends FYGE.Sprite {
this.allTime = this.sourceAll.length / 30 * 1000; this.allTime = this.sourceAll.length / 30 * 1000;
} }
onEnterFrame() { onEnterFrame() {
if (!this.stage) return if (!this.stage) return
var dataNow = Date.now(); var dataNow = Date.now();
......
src/something/class/FestivalEle.ts
View file @ 178aa111
import { ElementType } from "../enum/ElementType"; import { ElementType } from "../enum/ElementType";
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import { Tools } from "../../Tools";
import Tween = FYGE.Tween;
import Ease = FYGE.Ease;
import Texture = FYGE.Texture;
import FrameAni = FYGE.FrameAni;
import { Tool } from "../Tool";
/** /**
* 节日元素 * 节日元素
...@@ -18,6 +24,7 @@ export class FestivalEle extends FYGE.Container { ...@@ -18,6 +24,7 @@ export class FestivalEle extends FYGE.Container {
get statusNum() { get statusNum() {
return this._statusNum return this._statusNum
} }
set statusNum(value: number) { set statusNum(value: number) {
if (value >= 0) { if (value >= 0) {
//播放原来的动画 //播放原来的动画
...@@ -30,6 +37,9 @@ export class FestivalEle extends FYGE.Container { ...@@ -30,6 +37,9 @@ export class FestivalEle extends FYGE.Container {
} else { } else {
//不用动画 //不用动画
this._statusNum = 0; this._statusNum = 0;
let child = this.children[this._statusNum];
child["play"](() => {
})
this.isActive = true; this.isActive = true;
} }
} }
...@@ -49,8 +59,6 @@ export class FestivalEle extends FYGE.Container { ...@@ -49,8 +59,6 @@ export class FestivalEle extends FYGE.Container {
} }
reset(n: number = 2) { reset(n: number = 2) {
this.toggleStatus(n); this.toggleStatus(n);
this.isActive = false; this.isActive = false;
...@@ -73,223 +81,104 @@ export class FestivalEle extends FYGE.Container { ...@@ -73,223 +81,104 @@ export class FestivalEle extends FYGE.Container {
//第一种状态 //第一种状态
class Status1 extends FYGE.Container { class Status1 extends FYGE.Container {
upImage: FYGE.Sprite;
constructor() { constructor() {
super(); super();
var textureDown: FYGE.Texture = RES.getRes("fesRedBombSta1.png") const textureDown: FYGE.Texture = RES.getRes("fesRedBombSta1.png")
var down = new FYGE.Sprite(textureDown); const down = new FYGE.Sprite(textureDown);
down.x = -textureDown.width / 2; down.x = -textureDown.width / 2;
down.y = -textureDown.height / 2; down.y = -textureDown.height / 2;
this.addChild(down); this.addChild(down);
var textureUp: FYGE.Texture = RES.getRes("xingxingbi.png"); this.scaleX = this.scaleY = 0.31;
var up = new FYGE.Sprite(textureUp);
up.anchorTexture.set(0.5, 0.5);
// up.anchorOffsetX = textureUp.textureWidth / 2;
// up.anchorOffsetY = textureUp.textureHeight / 2;
up.y = textureUp.height / 2 - 100;
this.addChild(up);
this.upImage = up;
this.scaleX = this.scaleY = 0.29;
} }
reset() { reset() {
this.upImage.scaleX = this.upImage.scaleY = 1;
} }
play(callback: Function) { play(callback: Function) {
FYGE.Tween.get(this.upImage) FYGE.Tween.get(this)
.to({ scaleX: 1.8, scaleY: 1.8 }, 240) .to({scaleX: 0, scaleY: 0}, 240)
.call(() => { .call(() => {
callback(); callback();
}) });
} }
} }
const status2Cfg = [
{
"name": "fesRedCap",
"x": -7,
"y": -6,
"width": 251,
"height": 104
},
{
"name": "fesRedSmallLight",
"x": -7,
"y": -14,
"width": 249,
"height": 159
},
{
"name": "fesRedUp",
"x": -2,
"y": 52,
"width": 237,
"height": 185
},
{
"name": "fesRedDown",
"x": -2,
"y": 0,
"width": 237,
"height": 237
}
]
//第二种状态 //第二种状态
class Status2 extends FYGE.Container { class Status2 extends FYGE.Container {
light: FYGE.Sprite; light: FYGE.Sprite;
fesRedCap: FYGE.Sprite fesRedCap: FYGE.Sprite
constructor() { constructor() {
super(); super();
this.scaleX = this.scaleY = 0.29
for (var i = status2Cfg.length - 1; i >= 0; i--) { const down = new FYGE.Sprite(RES.getRes("fesRedDown.png"));
var bitmap = new FYGE.Sprite(RES.getRes(status2Cfg[i].name + ".png")); down.anchorTexture.set(0.5, 0.5);
bitmap.x = status2Cfg[i].x - 237 / 2; down.scale.set(0.31, 0.31);
bitmap.y = status2Cfg[i].y - 237 / 2; this.addChild(down);
this.addChild(bitmap);
if (status2Cfg[i].name == "fesRedSmallLight") { const up = this.addChild(Tools.getSprite('fesRedBombSta2.png'));
this.light = bitmap up.anchorTexture.set(0.5, 0.5);
} else if (status2Cfg[i].name == "fesRedCap") { up.scale.set(0.92, 0.92);
this.fesRedCap = bitmap;
} this.scale.set(0, 0);
}
} }
reset() {
this.fesRedCap.scaleY = 1;
this.light.alpha = 1;
FYGE.Tween.get(this.light, { loop: true })
.to({ alpha: 0 }, 450)
.to({ alpha: 1 }, 450)
reset() {
Tween.get(this)
.set({scaleX: 0, scaleY: 0})
.to({scaleX: 1, scaleY: 1}, 270, Ease.backOut);
} }
play(callback: Function) { play(callback: Function) {
this.light.alpha = 0; Tween.get(this)
FYGE.Tween.removeTweens(this.light); .to({scaleX: 0, scaleY: 0}, 270, Ease.backOut)
this.fesRedCap.scaleY = 1;
FYGE.Tween.get(this.fesRedCap)
.to({ scaleY: 0.1 }, 180)
.call(() => { .call(() => {
callback(); callback();
}) });
} }
} }
const status3Cfg = [
{
"name": "fesRedUp",
"x": 0,
"y": 52,
"width": 237,
"height": 185
},
{
"name": "tinyRedMid",
"x": 86,
"y": 60,
"width": 74,
"height": 90
},
{
"name": "tinyRedLeft",
"x": 22,
"y": 5,
"width": 116,
"height": 132
},
{
"name": "tinyRedRight",
"x": 123,
"y": 14,
"width": 89,
"height": 106
},
{
"name": "fesRedDown",
"x": 0,
"y": 0,
"width": 237,
"height": 237
}
]
class Status3 extends FYGE.Container { class Status3 extends FYGE.Container {
midRed: FYGE.Sprite;
leftRed: FYGE.Sprite; private ani1: FrameAni;
rightRed: FYGE.Sprite; private timeOut = null;
constructor() { constructor() {
super(); super();
this.scaleX = this.scaleY = 0.29
for (var i = status3Cfg.length - 1; i >= 0; i--) {
var config = status3Cfg[i];
var bitmap = new FYGE.Sprite(RES.getRes(config.name + ".png"));
bitmap.x = config.x - 237 / 2;
bitmap.y = config.y - 237 / 2;
this.addChild(bitmap);
if (config.name == "tinyRedMid") {
this.midRed = bitmap;
} else if (config.name == "tinyRedLeft") {
this.leftRed = bitmap;
} else if (config.name == "tinyRedRight") {
this.rightRed = bitmap;
}
}
const down = new FYGE.Sprite(RES.getRes("fesRedDown.png"));
down.anchorTexture.set(0.5, 0.5);
down.scale.set(0.31, 0.31);
this.addChild(down);
const ani1Texture: Texture[] = [];
for (let i = 0; i < 14; i++) {
ani1Texture.push(RES.getRes(`fesRedBombSta3_${i}.png`));
} }
reset() { this.ani1 = this.addChild(new FrameAni(ani1Texture));
FYGE.Tween.removeTweens(this.leftRed);
FYGE.Tween.removeTweens(this.rightRed);
FYGE.Tween.removeTweens(this.midRed);
var offset = 237 / 2 this.scale.set(0, 0);
//动画出来，然后循环 }
this.leftRed.x = 22 + 40 - offset;
this.leftRed.y = 5 + 100 - offset;
FYGE.Tween.get(this.leftRed)
.to({ x: 22 - 3 - offset, y: 5 - 8 - offset }, 150)
.to({ x: 22 - offset, y: 5 - offset }, 50)
this.rightRed.x = 123 - 7 - offset; playCall() {
this.rightRed.y = 14 + 100 - offset; this.timeOut = setTimeout(() => {
FYGE.Tween.get(this.rightRed) this.ani1.play(1, () => {
.to({ x: 123 + 3 - offset, y: 14 - 8 - offset }, 150) this.playCall();
.to({ x: 123 - offset, y: 14 - offset }, 50) });
}, 1200);
}
this.midRed.x = 86 - 7 - offset; reset() {
this.midRed.y = 60 + 80 - offset; Tween.get(this)
FYGE.Tween.get(this.midRed) .set({scaleX: 0, scaleY: 0})
.to({ x: 86 + 3 - offset, y: 60 - 8 - offset }, 150) .to({scaleX: 1, scaleY: 1}, 270, Ease.backOut)
.to({ x: 86 - offset, y: 60 - offset }, 50)
.call(() => { .call(() => {
//循环动画 this.playCall();
this.leftRed.x = 22 - offset; });
this.leftRed.y = 5 - offset;
FYGE.Tween.get(this.leftRed, { loop: true })
.to({ x: 22 + 2 - offset, y: 5 + 5 - offset }, 150)
.to({ x: 22 - 6 - offset, y: 5 - 14 - offset }, 150)
.to({ x: 22 - offset, y: 5 - offset }, 100)
.wait(500);
this.rightRed.x = 123 - offset;
this.rightRed.y = 14 - offset;
FYGE.Tween.get(this.rightRed, { loop: true })
.to({ x: 123 - 2 - offset, y: 14 + 5 - offset }, 150)
.to({ x: 123 + 6 - offset, y: 14 - 14 - offset }, 150)
.to({ x: 123 - offset, y: 14 - offset }, 100)
.wait(500);
this.midRed.x = 86 - offset;
this.midRed.y = 60 - offset;
FYGE.Tween.get(this.midRed, { loop: true })
.to({ x: 86 - 2 - offset, y: 60 + 5 - offset }, 150)
.to({ x: 86 + 6 - offset, y: 60 - 14 - offset }, 150)
.to({ x: 86 - offset, y: 60 - offset }, 100)
.wait(500);
})
} }
play(callback: Function) {
play(callback: Function) {
} }
} }
src/something/logic/AiControl.ts
View file @ 178aa111
...@@ -247,7 +247,7 @@ export class AiControl { ...@@ -247,7 +247,7 @@ export class AiControl {
//还原为索引 //还原为索引
for (var i = 0; i < six.length; i++) six[i] = six[i].index; for (var i = 0; i < six.length; i++) six[i] = six[i].index;
//动画 //动画
thisObj.redBombLightAni(index, () => { thisObj.redBombLightAni(index, (node) => {
let count = 0; let count = 0;
let countAll = six.length; let countAll = six.length;
for (let a = 0; a < six.length; a++) { for (let a = 0; a < six.length; a++) {
...@@ -266,6 +266,7 @@ export class AiControl { ...@@ -266,6 +266,7 @@ export class AiControl {
thisObj.fall(() => { thisObj.fall(() => {
thisObj.fallCallback(); thisObj.fallCallback();
}); });
thisObj.removeChild(node);
// callback(); // callback();
} }
}) })
......
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