Skip to content

B
babycare_xiaoxiao
Commit 54fa908e authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

lihe

parent d267957a
Hide whitespace changes
Inline Side-by-side
Showing with 288 additions and 58 deletions
.idea/workspace.xml
View file @ 54fa908e
...@@ -3,7 +3,180 @@ ...@@ -3,7 +3,180 @@
<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$/scripts/handleLotS.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/handleLotS.js" 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/JoinPanel/joinBg.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/JoinPanel/joinBtn.png" beforeDir="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/hor_ele0_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele0_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele1_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele2_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele3_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/hor_ele4_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele0_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele1_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele2_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele3_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/fiveVerHorDis/ver_ele4_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.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/something/class/FestivalEle.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/class/FestivalEle.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" />
...@@ -71,7 +244,7 @@ ...@@ -71,7 +244,7 @@
<recent name="$PROJECT_DIR$/resource/SuccessPrizePanel" /> <recent name="$PROJECT_DIR$/resource/SuccessPrizePanel" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.flushRes"> <component name="RunManager" selected="npm.dev">
<configuration name="aaaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/src/aaaa.html" useBuiltInWebServerPort="true"> <configuration name="aaaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/src/aaaa.html" useBuiltInWebServerPort="true">
<method v="2" /> <method v="2" />
</configuration> </configuration>
...@@ -148,14 +321,8 @@ ...@@ -148,14 +321,8 @@
<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="48486000" /> <workItem from="1601257315718" duration="48496000" />
</task> <workItem from="1601429998970" duration="6350000" />
<task id="LOCAL-00014" summary="effect">
<created>1594712422242</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1594712422242</updated>
</task> </task>
<task id="LOCAL-00015" summary="effect"> <task id="LOCAL-00015" summary="effect">
<created>1594712833008</created> <created>1594712833008</created>
...@@ -493,7 +660,14 @@ ...@@ -493,7 +660,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1601373015026</updated> <updated>1601373015026</updated>
</task> </task>
<option name="localTasksCounter" value="63" /> <task id="LOCAL-00063" summary="四连特效替换">
<created>1601389897299</created>
<option name="number" value="00063" />
<option name="presentableId" value="LOCAL-00063" />
<option name="project" value="LOCAL" />
<updated>1601389897299</updated>
</task>
<option name="localTasksCounter" value="64" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -541,49 +715,50 @@ ...@@ -541,49 +715,50 @@
<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="1601373014677"> <state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2" timestamp="1601389896862">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1410" height="877" />
</state> </state>
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601373014677" /> <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601373014677" />
<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="896" height="321" key="GridCell.Tab.0.bottom" timestamp="1601372694964"> <state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601430931423">
<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="896" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<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="896" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601372694964" /> <state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601430931423" />
<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="896" height="321" key="GridCell.Tab.0.center" timestamp="1601372694963"> <state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601430931421">
<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="896" height="406" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<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="896" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601372694963" /> <state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601430931421" />
<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="896" height="321" key="GridCell.Tab.0.left" timestamp="1601372694963"> <state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601430931421">
<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="896" height="406" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<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="896" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601372694963" /> <state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601430931421" />
<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="896" height="321" key="GridCell.Tab.0.right" timestamp="1601372694964"> <state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601430931422">
<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="896" height="406" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1601389901237" />
<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="896" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601372694964" /> <state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601430931422" />
<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">
...@@ -600,9 +775,10 @@ ...@@ -600,9 +775,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="1601373016182"> <state x="76" y="267" key="Vcs.Push.Dialog.v2" timestamp="1601389898667">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1410" height="877" />
</state> </state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601373016182" /> <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601373016182" />
<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">
...@@ -632,11 +808,11 @@ ...@@ -632,11 +808,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="1601367054409"> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601432268714">
<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="1601367054409" /> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601432268714" />
<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">
......
mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
View file @ 54fa908e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"message": "nisei amet sunt Lorem", "message": "nisei amet sunt Lorem",
"data": { "data": {
"rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试", "rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试",
"currentLevel": 120, "currentLevel": 96,
"power": 101, "power": 101,
"tools": { "tools": {
"steps": 100, "steps": 100,
......
resource/festival/fesRedBombSta1.png
View replaced file @ d267957a View file @ 54fa908e
resource/festival/fesRedBombSta1.png

43 KB | W: | H:

resource/festival/fesRedBombSta1.png

19.4 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/playScene/bubleEle0.png
View replaced file @ d267957a View file @ 54fa908e
resource/playScene/bubleEle0.png

13.2 KB | W: | H:

resource/playScene/bubleEle0.png

13.8 KB | W: | H:

resource/playScene/bubleEle0.png
resource/playScene/bubleEle0.png
resource/playScene/bubleEle0.png
resource/playScene/bubleEle0.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/bubleEle1.png
View replaced file @ d267957a View file @ 54fa908e
resource/playScene/bubleEle1.png

12.6 KB | W: | H:

resource/playScene/bubleEle1.png

12.3 KB | W: | H:

resource/playScene/bubleEle1.png
resource/playScene/bubleEle1.png
resource/playScene/bubleEle1.png
resource/playScene/bubleEle1.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/bubleEle2.png
View replaced file @ d267957a View file @ 54fa908e
resource/playScene/bubleEle2.png

12.8 KB | W: | H:

resource/playScene/bubleEle2.png

12.7 KB | W: | H:

resource/playScene/bubleEle2.png
resource/playScene/bubleEle2.png
resource/playScene/bubleEle2.png
resource/playScene/bubleEle2.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/bubleEle3.png
View replaced file @ d267957a View file @ 54fa908e
resource/playScene/bubleEle3.png

12.6 KB | W: | H:

resource/playScene/bubleEle3.png

13.2 KB | W: | H:

resource/playScene/bubleEle3.png
resource/playScene/bubleEle3.png
resource/playScene/bubleEle3.png
resource/playScene/bubleEle3.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/bubleEle4.png
View replaced file @ d267957a View file @ 54fa908e
resource/playScene/bubleEle4.png

13.5 KB | W: | H:

resource/playScene/bubleEle4.png

13.8 KB | W: | H:

resource/playScene/bubleEle4.png
resource/playScene/bubleEle4.png
resource/playScene/bubleEle4.png
resource/playScene/bubleEle4.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 54fa908e
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
"keys": "圆圈.png", "keys": "圆圈.png",
"name": "FreePowerPanel" "name": "FreePowerPanel"
}, },
{
"keys": "joinBg.png,joinBtn.png",
"name": "JoinPanel"
},
{ {
"keys": "体力不足Bg.png,体力不足按钮.png", "keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel" "name": "NoEnergyPanel"
...@@ -57,7 +53,7 @@ ...@@ -57,7 +53,7 @@
"name": "festival" "name": "festival"
}, },
{ {
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_5.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png", "keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_5.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png",
"name": "fiveVerHorDis" "name": "fiveVerHorDis"
}, },
{ {
......
src/ResJson.ts
View file @ 54fa908e
...@@ -12,10 +12,6 @@ export const ResJson = { ...@@ -12,10 +12,6 @@ export const ResJson = {
"keys": "圆圈.png", "keys": "圆圈.png",
"name": "FreePowerPanel" "name": "FreePowerPanel"
}, },
{
"keys": "joinBg.png,joinBtn.png",
"name": "JoinPanel"
},
{ {
"keys": "体力不足Bg.png,体力不足按钮.png", "keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel" "name": "NoEnergyPanel"
...@@ -57,7 +53,7 @@ export const ResJson = { ...@@ -57,7 +53,7 @@ export const ResJson = {
"name": "festival" "name": "festival"
}, },
{ {
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_5.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png", "keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_5.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png",
"name": "fiveVerHorDis" "name": "fiveVerHorDis"
}, },
{ {
......
src/scene/PlayScene.ts
View file @ 54fa908e
...@@ -765,7 +765,7 @@ export class PlayScene extends Scene { ...@@ -765,7 +765,7 @@ export class PlayScene extends Scene {
this.festivalTarget.x = 580; this.festivalTarget.x = 580;
this.festivalTarget.y = 115; this.festivalTarget.y = 115;
this.addChildAt(this.festivalTarget, 1); this.addChildAt(this.festivalTarget, 1);
this.festivalTarget.visible = false; this.festivalTarget.visible = false; /// TODO 关了这个功能先
if (this.lattices[festivalIndex].element) { if (this.lattices[festivalIndex].element) {
this.lattices[festivalIndex].element.reset(ElementType.FESTIVALELE_BIG) this.lattices[festivalIndex].element.reset(ElementType.FESTIVALELE_BIG)
} else { } else {
......
src/something/anisCall/FesRedBombShowAni.ts
View file @ 54fa908e
...@@ -7,12 +7,17 @@ export class FesRedBombShowAni extends FYGE.Container { ...@@ -7,12 +7,17 @@ export class FesRedBombShowAni extends FYGE.Container {
constructor() { constructor() {
super() super()
var textureDown: FYGE.Texture = RES.getRes("fesRedBombSta1.png")
var down = new FYGE.Sprite(textureDown); const down = new FYGE.Sprite(RES.getRes("fesRedDown.png"));
down.x = -textureDown.width / 2; down.anchorTexture.set(0.5, 0.5);
down.y = -textureDown.height / 2;
this.addChild(down); this.addChild(down);
const textureDown: FYGE.Texture = RES.getRes("fesRedBombSta1.png")
const up = new FYGE.Sprite(textureDown);
up.anchorTexture.set(0.5, 0.5);
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;
...@@ -20,9 +25,9 @@ export class FesRedBombShowAni extends FYGE.Container { ...@@ -20,9 +25,9 @@ export class FesRedBombShowAni extends FYGE.Container {
this.y = position[1]; this.y = position[1];
FYGE.Tween.get(this) FYGE.Tween.get(this)
.wait(200) .wait(200)
.to({ scaleX: 1, scaleY: 1 }, 500, FYGE.Ease.backOut) .to({scaleX: 1, scaleY: 1}, 500, FYGE.Ease.backOut)
.wait(500) .wait(500)
.to({ scaleX: 0.29, scaleY: 0.29 }, 500, FYGE.Ease.backInOut) .to({scaleX: 0.29, scaleY: 0.29}, 500, FYGE.Ease.backInOut)
.call(() => { .call(() => {
if (this.parent) this.parent.removeChild(this); if (this.parent) this.parent.removeChild(this);
Pool.recover(RecoverName.FESREDBOMBSHOW_ANI, this); Pool.recover(RecoverName.FESREDBOMBSHOW_ANI, this);
......
src/something/class/FestivalEle.ts
View file @ 54fa908e
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import { Tools } from "../../Tools";
import Tween = FYGE.Tween; import Tween = FYGE.Tween;
import Ease = FYGE.Ease; import Ease = FYGE.Ease;
import Texture = FYGE.Texture; import Texture = FYGE.Texture;
import FrameAni = FYGE.FrameAni; import FrameAni = FYGE.FrameAni;
import Sprite = FYGE.Sprite;
/** /**
* 节日元素 * 节日元素
...@@ -76,18 +76,49 @@ export class FestivalEle extends FYGE.Container { ...@@ -76,18 +76,49 @@ export class FestivalEle extends FYGE.Container {
//第一种状态 //第一种状态
class Status1 extends FYGE.Container { class Status1 extends FYGE.Container {
up: Sprite;
defaultX: number;
defaultY: number;
constructor() { constructor() {
super(); super();
const textureDown: FYGE.Texture = RES.getRes("fesRedBombSta1.png")
const down = new FYGE.Sprite(textureDown); const down = new FYGE.Sprite(RES.getRes("fesRedDown.png"));
down.x = -textureDown.width / 2; down.anchorTexture.set(0.5, 0.5);
down.y = -textureDown.height / 2;
this.addChild(down); this.addChild(down);
const textureUp: FYGE.Texture = RES.getRes("fesRedBombSta1.png")
this.up = this.addChild(new Sprite(textureUp));
this.defaultX = this.up.x = -textureUp.width / 2;
this.defaultY = this.up.y = -textureUp.height / 2;
this.up.anchor.set(0.5 * textureUp.width, 0.866 * textureUp.height);
this.scaleX = this.scaleY = 0.31; this.scaleX = this.scaleY = 0.31;
} }
reset() { shake() {
Tween.removeTweens(this.up);
const cX = this.defaultX, cY = this.defaultY,
ty = cY - 6 * 3, dx = 4 * 3, dr = 8, duration = 130, ease = Ease.quadInOut;
Tween.get(this.up)
.wait(1500)
.call(() => {
Tween.get(this.up, {loop: true})
.set({x: cX, y: cY})
.wait(1650)
.to({x: cX - dx, y: ty, rotation: -dr}, duration, ease)
.to({x: cX, y: cY, rotation: 0}, duration, ease)
.to({x: cX + dx, y: ty, rotation: dr}, duration, ease)
.to({x: cX, y: cY, rotation: 0}, duration, ease);
});
}
reset() {
this.shake();
} }
play(callback: Function) { play(callback: Function) {
...@@ -104,23 +135,49 @@ class Status2 extends FYGE.Container { ...@@ -104,23 +135,49 @@ class Status2 extends FYGE.Container {
light: FYGE.Sprite; light: FYGE.Sprite;
fesRedCap: FYGE.Sprite fesRedCap: FYGE.Sprite
up: Sprite;
defaultX: number;
defaultY: number;
constructor() { constructor() {
super(); super();
const down = new FYGE.Sprite(RES.getRes("fesRedDown.png")); const down = new Sprite(RES.getRes("fesRedDown.png"));
down.anchorTexture.set(0.5, 0.5); down.anchorTexture.set(0.5, 0.5);
down.scale.set(0.31, 0.31); down.scale.set(0.31, 0.31);
this.addChild(down); this.addChild(down);
const up = this.addChild(Tools.getSprite('fesRedBombSta2.png')); const textureUp: Texture = RES.getRes("fesRedBombSta2.png")
up.anchorTexture.set(0.5, 0.5); this.up = this.addChild(new Sprite(textureUp));
up.scale.set(0.92, 0.92); this.defaultX = this.up.x = -textureUp.width / 2;
this.defaultY = this.up.y = -textureUp.height / 2;
this.up.anchor.set(0.5 * textureUp.width, 0.866 * textureUp.height);
this.up.scale.set(0.92, 0.92);
this.scale.set(0, 0); this.scale.set(0, 0);
} }
shake() {
Tween.removeTweens(this.up);
const cX = this.defaultX, cY = this.defaultY,
ty = cY - 6, dx = 4, dr = 8, duration = 130, ease = Ease.quadInOut;
Tween.get(this.up, {loop: true})
.set({x: cX, y: cY})
.wait(1650)
.to({x: cX - dx, y: ty, rotation: -dr}, duration, ease)
.to({x: cX, y: cY, rotation: 0}, duration, ease)
.to({x: cX + dx, y: ty, rotation: dr}, duration, ease)
.to({x: cX, y: cY, rotation: 0}, duration, ease);
}
reset() { reset() {
Tween.removeTweens(this);
this.shake();
Tween.get(this) Tween.get(this)
.set({scaleX: 0, scaleY: 0}) .set({scaleX: 0, scaleY: 0})
.to({scaleX: 1, scaleY: 1}, 270, Ease.backOut); .to({scaleX: 1, scaleY: 1}, 270, Ease.backOut);
...@@ -162,7 +219,7 @@ class Status3 extends FYGE.Container { ...@@ -162,7 +219,7 @@ class Status3 extends FYGE.Container {
this.ani1.play(1, () => { this.ani1.play(1, () => {
this.playCall(); this.playCall();
}); });
}, 1200); }, 1500);
} }
reset() { reset() {
......
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