Skip to content

B
babycare_xiaoxiao
Commit 4eb4b12b authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

按钮放反了

parent 9d5551c9
Hide whitespace changes
Inline Side-by-side
Showing with 10548 additions and 111 deletions
.idea/workspace.xml
View file @ 4eb4b12b
...@@ -2,18 +2,11 @@ ...@@ -2,18 +2,11 @@
<project version="4"> <project version="4">
<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 afterPath="$PROJECT_DIR$/resource/common/power.png" afterDir="false" />
<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.doJoin.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.doJoin.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.drawLotteryPrize.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.drawLotteryPrize.json" 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$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" /> <change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" 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/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.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/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.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" />
...@@ -81,7 +74,7 @@ ...@@ -81,7 +74,7 @@
<recent name="$PROJECT_DIR$/src/panels" /> <recent name="$PROJECT_DIR$/src/panels" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.dev"> <component name="RunManager" selected="npm.buildTS">
<configuration name="aaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/aaa.html" useBuiltInWebServerPort="true"> <configuration name="aaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/aaa.html" useBuiltInWebServerPort="true">
<method v="2" /> <method v="2" />
</configuration> </configuration>
...@@ -128,10 +121,10 @@ ...@@ -128,10 +121,10 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" />
<item itemvalue="JavaScript Debug.aaa.html" /> <item itemvalue="JavaScript Debug.aaa.html" />
</list> </list>
</recent_temporary> </recent_temporary>
...@@ -202,14 +195,7 @@ ...@@ -202,14 +195,7 @@
<workItem from="1602310800241" duration="30000" /> <workItem from="1602310800241" duration="30000" />
<workItem from="1602310896602" duration="5137000" /> <workItem from="1602310896602" duration="5137000" />
<workItem from="1602322734643" duration="2339000" /> <workItem from="1602322734643" duration="2339000" />
<workItem from="1602380089772" duration="5893000" /> <workItem from="1602380089772" duration="6828000" />
</task>
<task id="LOCAL-00030" summary="Success Panel Effect!">
<created>1595387386892</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1595387386892</updated>
</task> </task>
<task id="LOCAL-00031" summary="Success Panel Effect!"> <task id="LOCAL-00031" summary="Success Panel Effect!">
<created>1595388353249</created> <created>1595388353249</created>
...@@ -547,7 +533,14 @@ ...@@ -547,7 +533,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1602397093257</updated> <updated>1602397093257</updated>
</task> </task>
<option name="localTasksCounter" value="79" /> <task id="LOCAL-00079" summary="游戏结束中体力">
<created>1602403592989</created>
<option name="number" value="00079" />
<option name="presentableId" value="LOCAL-00079" />
<option name="project" value="LOCAL" />
<updated>1602403592989</updated>
</task>
<option name="localTasksCounter" value="80" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -587,7 +580,8 @@ ...@@ -587,7 +580,8 @@
<MESSAGE value="task" /> <MESSAGE value="task" />
<MESSAGE value="1" /> <MESSAGE value="1" />
<MESSAGE value="fk" /> <MESSAGE value="fk" />
<option name="LAST_COMMIT_MESSAGE" value="fk" /> <MESSAGE value="游戏结束中体力" />
<option name="LAST_COMMIT_MESSAGE" value="游戏结束中体力" />
</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">
...@@ -611,51 +605,51 @@ ...@@ -611,51 +605,51 @@
</state> </state>
<state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" /> <state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" />
<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="783" height="664" key="CommitChangelistDialog2" timestamp="1602397093085"> <state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602403592054">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" /> <state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" />
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" /> <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="1602397093085" /> <state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602403592054" />
<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="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721"> <state x="131" y="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602321352721" /> <state x="131" y="63" width="1683" height="1037" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602321352721" />
<state width="935" height="321" key="GridCell.Tab.0.bottom" timestamp="1602403250047"> <state width="935" height="321" key="GridCell.Tab.0.bottom" timestamp="1602408700100">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" /> <state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="935" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1602344179438" /> <state width="935" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1602344179438" />
<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="935" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602403250047" /> <state width="935" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602408700100" />
<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="935" height="321" key="GridCell.Tab.0.center" timestamp="1602403250045"> <state width="935" height="321" key="GridCell.Tab.0.center" timestamp="1602408700099">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" /> <state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="935" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1602344179437" /> <state width="935" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1602344179437" />
<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="935" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602403250045" /> <state width="935" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602408700099" />
<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="935" height="321" key="GridCell.Tab.0.left" timestamp="1602403250045"> <state width="935" height="321" key="GridCell.Tab.0.left" timestamp="1602408700098">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" /> <state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" />
<state width="935" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1602344179437" /> <state width="935" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1602344179437" />
<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="935" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602403250045" /> <state width="935" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602408700098" />
<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="935" height="321" key="GridCell.Tab.0.right" timestamp="1602403250046"> <state width="935" height="321" key="GridCell.Tab.0.right" timestamp="1602408700099">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" /> <state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="935" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1602344179438" /> <state width="935" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1602344179438" />
<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="935" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602403250046" /> <state width="935" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602408700099" />
<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">
...@@ -672,12 +666,12 @@ ...@@ -672,12 +666,12 @@
</state> </state>
<state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" /> <state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" />
<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="1602397094205"> <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602403594653">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" /> <state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" />
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" /> <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="1602397094205" /> <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602403594653" />
<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" />
...@@ -710,11 +704,11 @@ ...@@ -710,11 +704,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="670" height="429" key="search.everywhere.popup" timestamp="1602403358039"> <state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602408692905">
<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="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602403358039" /> <state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602408692905" />
<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" />
<state x="249" y="530" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1602310103215"> <state x="249" y="530" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1602310103215">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
......
output.js
View file @ 4eb4b12b
...@@ -3862,7 +3862,7 @@ exports.ResJson = { ...@@ -3862,7 +3862,7 @@ exports.ResJson = {
} }
}, },
{ {
"keys": "boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,开心收下.png,确定.png,继续闯关大.png,继续闯关小.png", "keys": "boomBtn.png,closeBtn2.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,liaojiele.png,power.png,powerImg.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,开心收下.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common", "name": "common",
"atlas": { "atlas": {
"boomBtn.png": { "boomBtn.png": {
...@@ -3877,7 +3877,7 @@ exports.ResJson = { ...@@ -3877,7 +3877,7 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"closeBtn2.png": { "closeBtn2.png": {
"x": 426, "x": 425,
"y": 1189, "y": 1189,
"w": 83, "w": 83,
"h": 83, "h": 83,
...@@ -3888,8 +3888,8 @@ exports.ResJson = { ...@@ -3888,8 +3888,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"comCloseBtn.png": { "comCloseBtn.png": {
"x": 422, "x": 462,
"y": 1549, "y": 1555,
"w": 48, "w": 48,
"h": 48, "h": 48,
"ox": 0, "ox": 0,
...@@ -3932,7 +3932,7 @@ exports.ResJson = { ...@@ -3932,7 +3932,7 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"ele10.png": { "ele10.png": {
"x": 426, "x": 425,
"y": 1274, "y": 1274,
"w": 72, "w": 72,
"h": 60, "h": 60,
...@@ -3998,15 +3998,15 @@ exports.ResJson = { ...@@ -3998,15 +3998,15 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"ele3.png": { "ele3.png": {
"x": 364, "x": 392,
"y": 1491, "y": 1555,
"w": 56, "w": 56,
"h": 68, "h": 68,
"ox": 12, "ox": 12,
"oy": 6, "oy": 6,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele4.png": { "ele4.png": {
"x": 443, "x": 443,
...@@ -4075,15 +4075,15 @@ exports.ResJson = { ...@@ -4075,15 +4075,15 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"hammerBtn.png": { "hammerBtn.png": {
"x": 271, "x": 164,
"y": 1491, "y": 1417,
"w": 91, "w": 91,
"h": 103, "h": 103,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 91, "sw": 91,
"sh": 103, "sh": 103,
"ro": false "ro": true
}, },
"liaojiele.png": { "liaojiele.png": {
"x": 2, "x": 2,
...@@ -4096,9 +4096,20 @@ exports.ResJson = { ...@@ -4096,9 +4096,20 @@ exports.ResJson = {
"sh": 119, "sh": 119,
"ro": false "ro": false
}, },
"power.png": {
"x": 392,
"y": 1336,
"w": 108,
"h": 108,
"ox": 0,
"oy": 0,
"sw": 108,
"sh": 108,
"ro": false
},
"powerImg.png": { "powerImg.png": {
"x": 353, "x": 271,
"y": 1337, "y": 1175,
"w": 152, "w": 152,
"h": 152, "h": 152,
"ox": 0, "ox": 0,
...@@ -4130,19 +4141,19 @@ exports.ResJson = { ...@@ -4130,19 +4141,19 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"waitingBg.png": { "waitingBg.png": {
"x": 244, "x": 2,
"y": 1175, "y": 1417,
"w": 160, "w": 160,
"h": 180, "h": 180,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 160, "sw": 160,
"sh": 180, "sh": 180,
"ro": true "ro": false
}, },
"waitingRot.png": { "waitingRot.png": {
"x": 422, "x": 164,
"y": 1491, "y": 1510,
"w": 56, "w": 56,
"h": 56, "h": 56,
"ox": 0, "ox": 0,
...@@ -4152,8 +4163,8 @@ exports.ResJson = { ...@@ -4152,8 +4163,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"关闭按钮.png": { "关闭按钮.png": {
"x": 244, "x": 392,
"y": 1337, "y": 1446,
"w": 107, "w": 107,
"h": 107, "h": 107,
"ox": 0, "ox": 0,
...@@ -4163,8 +4174,8 @@ exports.ResJson = { ...@@ -4163,8 +4174,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"再想想.png": { "再想想.png": {
"x": 123, "x": 271,
"y": 1189, "y": 1336,
"w": 267, "w": 267,
"h": 119, "h": 119,
"ox": 0, "ox": 0,
...@@ -4208,7 +4219,7 @@ exports.ResJson = { ...@@ -4208,7 +4219,7 @@ exports.ResJson = {
}, },
"确定.png": { "确定.png": {
"x": 2, "x": 2,
"y": 1458, "y": 1296,
"w": 267, "w": 267,
"h": 119, "h": 119,
"ox": 0, "ox": 0,
...@@ -4230,14 +4241,14 @@ exports.ResJson = { ...@@ -4230,14 +4241,14 @@ exports.ResJson = {
}, },
"继续闯关小.png": { "继续闯关小.png": {
"x": 2, "x": 2,
"y": 1189, "y": 1175,
"w": 267, "w": 267,
"h": 119, "h": 119,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 267, "sw": 267,
"sh": 119, "sh": 119,
"ro": true "ro": false
} }
} }
}, },
...@@ -12730,7 +12741,7 @@ exports.ResJson = { ...@@ -12730,7 +12741,7 @@ exports.ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602385443/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602403645/resource/"
}; };
...@@ -20189,9 +20200,7 @@ var __extends = (this && this.__extends) || (function () { ...@@ -20189,9 +20200,7 @@ var __extends = (this && this.__extends) || (function () {
}; };
})(); })();
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
var _a;
var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts"); var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
var PropType_1 = __webpack_require__(/*! ../something/enum/PropType */ "./src/something/enum/PropType.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts"); var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts"); var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts"); var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
...@@ -20200,11 +20209,6 @@ var Ease = FYGE.Ease; ...@@ -20200,11 +20209,6 @@ var Ease = FYGE.Ease;
var Sprite = FYGE.Sprite; var Sprite = FYGE.Sprite;
var MouseEvent = FYGE.MouseEvent; var MouseEvent = FYGE.MouseEvent;
var Button = FYGE.Button; var Button = FYGE.Button;
var propImg = (_a = {},
_a[PropType_1.PropType.BOOMS] = 'boomBtn.png',
_a[PropType_1.PropType.HAMMERS] = 'hammerBtn.png',
_a[PropType_1.PropType.STEPS] = 'stepBtn.png',
_a);
var FesRedPrizePanel = (function (_super) { var FesRedPrizePanel = (function (_super) {
__extends(FesRedPrizePanel, _super); __extends(FesRedPrizePanel, _super);
function FesRedPrizePanel() { function FesRedPrizePanel() {
...@@ -20965,6 +20969,7 @@ var propImg = (_a = {}, ...@@ -20965,6 +20969,7 @@ var propImg = (_a = {},
_a[PropType_1.PropType.BOOMS] = 'boomBtn.png', _a[PropType_1.PropType.BOOMS] = 'boomBtn.png',
_a[PropType_1.PropType.HAMMERS] = 'hammerBtn.png', _a[PropType_1.PropType.HAMMERS] = 'hammerBtn.png',
_a[PropType_1.PropType.STEPS] = 'stepBtn.png', _a[PropType_1.PropType.STEPS] = 'stepBtn.png',
_a[PropType_1.PropType.POWER] = 'power.png',
_a); _a);
var SuccessPrizePanel = (function (_super) { var SuccessPrizePanel = (function (_super) {
__extends(SuccessPrizePanel, _super); __extends(SuccessPrizePanel, _super);
...@@ -21039,10 +21044,10 @@ var SuccessPrizePanel = (function (_super) { ...@@ -21039,10 +21044,10 @@ var SuccessPrizePanel = (function (_super) {
this.tipsTex2.text = '奖品可以在“我的奖品”页面查看'; this.tipsTex2.text = '奖品可以在“我的奖品”页面查看';
this.addChild(new Button(RES_1.RES.getRes('继续闯关红.png'))) this.addChild(new Button(RES_1.RES.getRes('继续闯关红.png')))
.addEventListener(MouseEvent.CLICK, this.continue, this) .addEventListener(MouseEvent.CLICK, this.continue, this)
.position.set(388, 1145); .position.set(100, 1145);
this.addChild(new Button(RES_1.RES.getRes('查看奖品.png'))) this.addChild(new Button(RES_1.RES.getRes('查看奖品.png')))
.addEventListener(MouseEvent.CLICK, this.lookPrize, this) .addEventListener(MouseEvent.CLICK, this.lookPrize, this)
.position.set(100, 1145); .position.set(388, 1145);
} }
}; };
SuccessPrizePanel.prototype.start = function (data) { SuccessPrizePanel.prototype.start = function (data) {
...@@ -21382,7 +21387,6 @@ var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/view ...@@ -21382,7 +21387,6 @@ var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/view
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts"); var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var ProgressBarS_1 = __webpack_require__(/*! ../common/ProgressBarS */ "./src/common/ProgressBarS.ts"); var ProgressBarS_1 = __webpack_require__(/*! ../common/ProgressBarS */ "./src/common/ProgressBarS.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts"); var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts"); var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var MapScene_1 = __webpack_require__(/*! ./map/MapScene */ "./src/scene/map/MapScene.ts"); var MapScene_1 = __webpack_require__(/*! ./map/MapScene */ "./src/scene/map/MapScene.ts");
var layers_1 = __webpack_require__(/*! ../../module/views/layers */ "./module/views/layers.ts"); var layers_1 = __webpack_require__(/*! ../../module/views/layers */ "./module/views/layers.ts");
...@@ -21429,39 +21433,40 @@ var LoadingScene = (function (_super) { ...@@ -21429,39 +21433,40 @@ var LoadingScene = (function (_super) {
switch (_a.label) { switch (_a.label) {
case 0: case 0:
_super.prototype.start.call(this); _super.prototype.start.call(this);
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.reportAnalytics, { logkey: 'visit' });
this.addEventListener(FYGE.Event.PROGRESS, this.progressEvent, this); this.addEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
this.dispatchEvent(FYGE.Event.PROGRESS, 0.2); this.dispatchEvent(FYGE.Event.PROGRESS, 0.2);
Tools_1.Tools.getAppData(); return [4, Tools_1.Tools.getAppData()];
case 1:
_a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.3); this.dispatchEvent(FYGE.Event.PROGRESS, 0.3);
return [4, Tools_1.Tools.getBaseInfo()]; return [4, Tools_1.Tools.getBaseInfo()];
case 1: case 2:
_a.sent(); _a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.5); this.dispatchEvent(FYGE.Event.PROGRESS, 0.5);
return [4, RES_1.RES.loadGroup("map")]; return [4, RES_1.RES.loadGroup("map")];
case 2: case 3:
_a.sent(); _a.sent();
return [4, RES_1.RES.loadGroup("mapEffect")]; return [4, RES_1.RES.loadGroup("mapEffect")];
case 3: case 4:
_a.sent(); _a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.6); this.dispatchEvent(FYGE.Event.PROGRESS, 0.6);
return [4, RES_1.RES.loadGroup("mapTree")]; return [4, RES_1.RES.loadGroup("mapTree")];
case 4: case 5:
_a.sent(); _a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.7); this.dispatchEvent(FYGE.Event.PROGRESS, 0.7);
return [4, RES_1.RES.loadGroup("mapCat")]; return [4, RES_1.RES.loadGroup("mapCat")];
case 5: case 6:
_a.sent(); _a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.8); this.dispatchEvent(FYGE.Event.PROGRESS, 0.8);
return [4, RES_1.RES.loadGroup("mapAroma1")]; return [4, RES_1.RES.loadGroup("mapAroma1")];
case 6: case 7:
_a.sent(); _a.sent();
return [4, RES_1.RES.loadGroup("mapAroma2")]; return [4, RES_1.RES.loadGroup("mapAroma2")];
case 7: case 8:
_a.sent(); _a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 0.9); this.dispatchEvent(FYGE.Event.PROGRESS, 0.9);
return [4, RES_1.RES.loadGroup("mapTinyBalloon")]; return [4, RES_1.RES.loadGroup("mapTinyBalloon")];
case 8: case 9:
_a.sent(); _a.sent();
this.dispatchEvent(FYGE.Event.PROGRESS, 1); this.dispatchEvent(FYGE.Event.PROGRESS, 1);
return [2]; return [2];
output.js.map
View file @ 4eb4b12b
This source diff could not be displayed because it is too large. You can view the blob instead.
src/ResJson.ts
View file @ 4eb4b12b
This source diff could not be displayed because it is too large. You can view the blob instead.
src/panels/SuccessPrizePanel.ts
View file @ 4eb4b12b
...@@ -94,11 +94,11 @@ export class SuccessPrizePanel extends Panel { ...@@ -94,11 +94,11 @@ export class SuccessPrizePanel extends Panel {
this.addChild(new Button(RES.getRes('继续闯关红.png'))) this.addChild(new Button(RES.getRes('继续闯关红.png')))
.addEventListener(MouseEvent.CLICK, this.continue, this) .addEventListener(MouseEvent.CLICK, this.continue, this)
.position.set(388, 1145); .position.set(100, 1145);
this.addChild(new Button(RES.getRes('查看奖品.png'))) this.addChild(new Button(RES.getRes('查看奖品.png')))
.addEventListener(MouseEvent.CLICK, this.lookPrize, this) .addEventListener(MouseEvent.CLICK, this.lookPrize, this)
.position.set(100, 1145); .position.set(388, 1145);
} }
} }
......
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