Skip to content

Q
qiaqia_qx
Commit 695c91bd authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1111

parent 254f14b8
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 61 deletions
.idea/workspace.xml
View file @ 695c91bd
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment=""> <list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment="1111">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" 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$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/mock/miniTb/qiaqia2.exchangeGoods.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.exchangeGoods.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/ShopPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/ShopPanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/mock/miniTb/qiaqiaHome.getGameInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqiaHome.getGameInfo.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/GuideLayer.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/GuideLayer.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/panels/ExSuccessPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/ExSuccessPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/TaskPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/ProgressBar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/ProgressBar.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/parts/Game/ProgressBar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/ProgressBar.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scenes/GameScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenes/GameScene.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" />
...@@ -66,9 +66,6 @@ ...@@ -66,9 +66,6 @@
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.buildTS"> <component name="RunManager" selected="npm.buildTS">
<configuration name="test.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/scripts/test.js" working-dir="$PROJECT_DIR$/scripts">
<method v="2" />
</configuration>
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
...@@ -110,7 +107,6 @@ ...@@ -110,7 +107,6 @@
<method v="2" /> <method v="2" />
</configuration> </configuration>
<list> <list>
<item itemvalue="Node.js.test.js" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
...@@ -120,7 +116,6 @@ ...@@ -120,7 +116,6 @@
<list> <list>
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" /> <item itemvalue="npm.dev" />
<item itemvalue="Node.js.test.js" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
</list> </list>
...@@ -157,7 +152,7 @@ ...@@ -157,7 +152,7 @@
<workItem from="1592202867636" duration="167000" /> <workItem from="1592202867636" duration="167000" />
<workItem from="1592203763793" duration="21589000" /> <workItem from="1592203763793" duration="21589000" />
<workItem from="1592273018019" duration="24906000" /> <workItem from="1592273018019" duration="24906000" />
<workItem from="1592358392926" duration="3590000" /> <workItem from="1592358392926" duration="8643000" />
</task> </task>
<task id="LOCAL-00001" summary="1"> <task id="LOCAL-00001" summary="1">
<created>1591003912929</created> <created>1591003912929</created>
...@@ -460,7 +455,14 @@ ...@@ -460,7 +455,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1592304551502</updated> <updated>1592304551502</updated>
</task> </task>
<option name="localTasksCounter" value="44" /> <task id="LOCAL-00044" summary="1111">
<created>1592362765796</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1592362765796</updated>
</task>
<option name="localTasksCounter" value="45" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -506,34 +508,35 @@ ...@@ -506,34 +508,35 @@
<option name="LAST_COMMIT_MESSAGE" value="1111" /> <option name="LAST_COMMIT_MESSAGE" value="1111" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="323" y="198" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1591790199346"> <state x="363" y="224" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1592372775896">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="35" y="23" width="1885" height="1177" />
</state> </state>
<state x="363" y="224" key="#com.intellij.execution.impl.EditConfigurationsDialog/35.23.1885.1177@35.23.1885.1177" timestamp="1592372775896" />
<state x="323" y="198" key="#com.intellij.execution.impl.EditConfigurationsDialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591790199346" /> <state x="323" y="198" key="#com.intellij.execution.impl.EditConfigurationsDialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591790199346" />
<state x="764" y="293" key="#com.intellij.ide.util.MemberChooser" timestamp="1591929411133"> <state x="764" y="293" key="#com.intellij.ide.util.MemberChooser" timestamp="1591929411133">
<screen x="37" y="23" width="1883" height="1177" /> <screen x="37" y="23" width="1883" height="1177" />
</state> </state>
<state x="671" y="259" key="#com.intellij.ide.util.MemberChooser/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591344864454" /> <state x="671" y="259" key="#com.intellij.ide.util.MemberChooser/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591344864454" />
<state x="764" y="293" key="#com.intellij.ide.util.MemberChooser/37.23.1883.1177@37.23.1883.1177" timestamp="1591929411133" /> <state x="764" y="293" key="#com.intellij.ide.util.MemberChooser/37.23.1883.1177@37.23.1883.1177" timestamp="1591929411133" />
<state x="540" y="230" key="CommitChangelistDialog2" timestamp="1592304550584"> <state x="540" y="230" key="CommitChangelistDialog2" timestamp="1592372759649">
<screen x="35" y="23" width="1885" height="1177" /> <screen x="35" y="23" width="1885" height="1177" />
</state> </state>
<state x="502" y="120" key="CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884607456" /> <state x="502" y="120" key="CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884607456" />
<state x="411" y="44" key="CommitChangelistDialog2/35.23.1405.877@35.23.1405.877" timestamp="1592293157840" /> <state x="411" y="44" key="CommitChangelistDialog2/35.23.1405.877@35.23.1405.877" timestamp="1592293157840" />
<state x="466" y="108" key="CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591003912498" /> <state x="466" y="108" key="CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591003912498" />
<state x="540" y="230" key="CommitChangelistDialog2/35.23.1885.1177@35.23.1885.1177" timestamp="1592304550584" /> <state x="540" y="230" key="CommitChangelistDialog2/35.23.1885.1177@35.23.1885.1177" timestamp="1592372759649" />
<state x="541" y="230" key="CommitChangelistDialog2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966185870" /> <state x="541" y="230" key="CommitChangelistDialog2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966185870" />
<state x="2182" y="-102" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189619717" /> <state x="2182" y="-102" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189619717" />
<state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591846770902" /> <state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591846770902" />
<state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027@37.23.1643.1027" timestamp="1591785684954" /> <state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027@37.23.1643.1027" timestamp="1591785684954" />
<state x="529" y="120" key="CommitChangelistDialog2/37.23.1883.1177@37.23.1883.1177" timestamp="1591931899805" /> <state x="529" y="120" key="CommitChangelistDialog2/37.23.1883.1177@37.23.1883.1177" timestamp="1591931899805" />
<state width="1843" height="191" key="GridCell.Tab.0.bottom" timestamp="1592362608492"> <state width="712" height="191" key="GridCell.Tab.0.bottom" timestamp="1592373505778">
<screen x="35" y="23" width="1885" height="1177" /> <screen x="35" y="23" width="1885" height="1177" />
</state> </state>
<state width="1601" height="346" key="GridCell.Tab.0.bottom/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" /> <state width="1601" height="346" key="GridCell.Tab.0.bottom/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="1363" height="191" key="GridCell.Tab.0.bottom/35.23.1405.877@35.23.1405.877" timestamp="1592296979551" /> <state width="1363" height="191" key="GridCell.Tab.0.bottom/35.23.1405.877@35.23.1405.877" timestamp="1592296979551" />
<state width="499" height="907" key="GridCell.Tab.0.bottom/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" /> <state width="499" height="907" key="GridCell.Tab.0.bottom/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
<state width="1843" height="191" key="GridCell.Tab.0.bottom/35.23.1885.1177@35.23.1885.1177" timestamp="1592362608492" /> <state width="712" height="191" key="GridCell.Tab.0.bottom/35.23.1885.1177@35.23.1885.1177" timestamp="1592373505778" />
<state width="1602" height="270" key="GridCell.Tab.0.bottom/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" /> <state width="1602" height="270" key="GridCell.Tab.0.bottom/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" />
<state width="1842" height="270" key="GridCell.Tab.0.bottom/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" /> <state width="1842" height="270" key="GridCell.Tab.0.bottom/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" />
<state width="252" height="1057" key="GridCell.Tab.0.bottom/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408198" /> <state width="252" height="1057" key="GridCell.Tab.0.bottom/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408198" />
...@@ -541,13 +544,13 @@ ...@@ -541,13 +544,13 @@
<state width="252" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525606" /> <state width="252" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525606" />
<state width="311" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871414" /> <state width="311" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871414" />
<state width="923" height="270" key="GridCell.Tab.0.bottom/37.23.1883.1177@37.23.1883.1177" timestamp="1591932785471" /> <state width="923" height="270" key="GridCell.Tab.0.bottom/37.23.1883.1177@37.23.1883.1177" timestamp="1591932785471" />
<state width="1843" height="191" key="GridCell.Tab.0.center" timestamp="1592362608492"> <state width="712" height="191" key="GridCell.Tab.0.center" timestamp="1592373505777">
<screen x="35" y="23" width="1885" height="1177" /> <screen x="35" y="23" width="1885" height="1177" />
</state> </state>
<state width="1601" height="346" key="GridCell.Tab.0.center/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" /> <state width="1601" height="346" key="GridCell.Tab.0.center/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="1363" height="191" key="GridCell.Tab.0.center/35.23.1405.877@35.23.1405.877" timestamp="1592296979547" /> <state width="1363" height="191" key="GridCell.Tab.0.center/35.23.1405.877@35.23.1405.877" timestamp="1592296979547" />
<state width="499" height="907" key="GridCell.Tab.0.center/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953116" /> <state width="499" height="907" key="GridCell.Tab.0.center/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953116" />
<state width="1843" height="191" key="GridCell.Tab.0.center/35.23.1885.1177@35.23.1885.1177" timestamp="1592362608492" /> <state width="712" height="191" key="GridCell.Tab.0.center/35.23.1885.1177@35.23.1885.1177" timestamp="1592373505777" />
<state width="1602" height="270" key="GridCell.Tab.0.center/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" /> <state width="1602" height="270" key="GridCell.Tab.0.center/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" />
<state width="1842" height="270" key="GridCell.Tab.0.center/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" /> <state width="1842" height="270" key="GridCell.Tab.0.center/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" />
<state width="252" height="1057" key="GridCell.Tab.0.center/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" /> <state width="252" height="1057" key="GridCell.Tab.0.center/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" />
...@@ -555,13 +558,13 @@ ...@@ -555,13 +558,13 @@
<state width="252" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525596" /> <state width="252" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525596" />
<state width="311" height="907" key="GridCell.Tab.0.center/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871413" /> <state width="311" height="907" key="GridCell.Tab.0.center/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871413" />
<state width="923" height="270" key="GridCell.Tab.0.center/37.23.1883.1177@37.23.1883.1177" timestamp="1591932785471" /> <state width="923" height="270" key="GridCell.Tab.0.center/37.23.1883.1177@37.23.1883.1177" timestamp="1591932785471" />
<state width="1843" height="191" key="GridCell.Tab.0.left" timestamp="1592362608491"> <state width="712" height="191" key="GridCell.Tab.0.left" timestamp="1592373505776">
<screen x="35" y="23" width="1885" height="1177" /> <screen x="35" y="23" width="1885" height="1177" />
</state> </state>
<state width="1601" height="346" key="GridCell.Tab.0.left/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614403" /> <state width="1601" height="346" key="GridCell.Tab.0.left/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614403" />
<state width="1363" height="191" key="GridCell.Tab.0.left/35.23.1405.877@35.23.1405.877" timestamp="1592296979544" /> <state width="1363" height="191" key="GridCell.Tab.0.left/35.23.1405.877@35.23.1405.877" timestamp="1592296979544" />
<state width="499" height="907" key="GridCell.Tab.0.left/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953114" /> <state width="499" height="907" key="GridCell.Tab.0.left/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953114" />
<state width="1843" height="191" key="GridCell.Tab.0.left/35.23.1885.1177@35.23.1885.1177" timestamp="1592362608491" /> <state width="712" height="191" key="GridCell.Tab.0.left/35.23.1885.1177@35.23.1885.1177" timestamp="1592373505776" />
<state width="1602" height="270" key="GridCell.Tab.0.left/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534758" /> <state width="1602" height="270" key="GridCell.Tab.0.left/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534758" />
<state width="1842" height="270" key="GridCell.Tab.0.left/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213326" /> <state width="1842" height="270" key="GridCell.Tab.0.left/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213326" />
<state width="252" height="1057" key="GridCell.Tab.0.left/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408195" /> <state width="252" height="1057" key="GridCell.Tab.0.left/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408195" />
...@@ -569,13 +572,13 @@ ...@@ -569,13 +572,13 @@
<state width="252" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525590" /> <state width="252" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525590" />
<state width="311" height="907" key="GridCell.Tab.0.left/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871412" /> <state width="311" height="907" key="GridCell.Tab.0.left/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871412" />
<state width="923" height="270" key="GridCell.Tab.0.left/37.23.1883.1177@37.23.1883.1177" timestamp="1591932785471" /> <state width="923" height="270" key="GridCell.Tab.0.left/37.23.1883.1177@37.23.1883.1177" timestamp="1591932785471" />
<state width="1843" height="191" key="GridCell.Tab.0.right" timestamp="1592362608492"> <state width="712" height="191" key="GridCell.Tab.0.right" timestamp="1592373505777">
<screen x="35" y="23" width="1885" height="1177" /> <screen x="35" y="23" width="1885" height="1177" />
</state> </state>
<state width="1601" height="346" key="GridCell.Tab.0.right/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" /> <state width="1601" height="346" key="GridCell.Tab.0.right/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="1363" height="191" key="GridCell.Tab.0.right/35.23.1405.877@35.23.1405.877" timestamp="1592296979549" /> <state width="1363" height="191" key="GridCell.Tab.0.right/35.23.1405.877@35.23.1405.877" timestamp="1592296979549" />
<state width="499" height="907" key="GridCell.Tab.0.right/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" /> <state width="499" height="907" key="GridCell.Tab.0.right/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
<state width="1843" height="191" key="GridCell.Tab.0.right/35.23.1885.1177@35.23.1885.1177" timestamp="1592362608492" /> <state width="712" height="191" key="GridCell.Tab.0.right/35.23.1885.1177@35.23.1885.1177" timestamp="1592373505777" />
<state width="1602" height="270" key="GridCell.Tab.0.right/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" /> <state width="1602" height="270" key="GridCell.Tab.0.right/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" />
<state width="1842" height="270" key="GridCell.Tab.0.right/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" /> <state width="1842" height="270" key="GridCell.Tab.0.right/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" />
<state width="252" height="1057" key="GridCell.Tab.0.right/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" /> <state width="252" height="1057" key="GridCell.Tab.0.right/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" />
...@@ -597,11 +600,11 @@ ...@@ -597,11 +600,11 @@
<screen x="35" y="23" width="1405" height="877" /> <screen x="35" y="23" width="1405" height="877" />
</state> </state>
<state width="500" height="445" key="SwitcherDM/35.23.1405.877@35.23.1405.877" timestamp="1592292721015" /> <state width="500" height="445" key="SwitcherDM/35.23.1405.877@35.23.1405.877" timestamp="1592292721015" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592304568190"> <state x="517" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592362767486">
<screen x="35" y="23" width="1885" height="1177" /> <screen x="35" y="23" width="1885" height="1177" />
</state> </state>
<state x="491" y="313" key="Vcs.Push.Dialog.v2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884609437" /> <state x="491" y="313" key="Vcs.Push.Dialog.v2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884609437" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2/35.23.1885.1177@35.23.1885.1177" timestamp="1592304568190" /> <state x="517" y="313" key="Vcs.Push.Dialog.v2/35.23.1885.1177@35.23.1885.1177" timestamp="1592362767486" />
<state x="518" y="313" key="Vcs.Push.Dialog.v2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966205725" /> <state x="518" y="313" key="Vcs.Push.Dialog.v2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966205725" />
<state x="2171" y="91" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189622538" /> <state x="2171" y="91" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189622538" />
<state x="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591846773289" /> <state x="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591846773289" />
...@@ -613,10 +616,10 @@ ...@@ -613,10 +616,10 @@
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state x="660" y="456" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591688329482" /> <state x="660" y="456" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591688329482" />
<state x="640" y="323" width="674" height="753" key="find.popup" timestamp="1592360649683"> <state x="640" y="323" width="674" height="753" key="find.popup" timestamp="1592373498288">
<screen x="35" y="23" width="1885" height="1177" /> <screen x="35" y="23" width="1885" height="1177" />
</state> </state>
<state x="640" y="323" width="674" height="753" key="find.popup/35.23.1885.1177@35.23.1885.1177" timestamp="1592360649683" /> <state x="640" y="323" width="674" height="753" key="find.popup/35.23.1885.1177@35.23.1885.1177" timestamp="1592373498288" />
<state x="564" y="285" width="587" height="502" key="find.popup/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591099201430" /> <state x="564" y="285" width="587" height="502" key="find.popup/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591099201430" />
<state x="586" y="314" key="refactoring.ChangeSignatureDialog" timestamp="1590980819551"> <state x="586" y="314" key="refactoring.ChangeSignatureDialog" timestamp="1590980819551">
<screen x="35" y="23" width="1645" height="1027" /> <screen x="35" y="23" width="1645" height="1027" />
...@@ -626,13 +629,13 @@ ...@@ -626,13 +629,13 @@
<screen x="0" y="23" width="1920" height="1177" /> <screen x="0" y="23" width="1920" height="1177" />
</state> </state>
<state x="85" y="286" key="run.anything.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591883929114" /> <state x="85" y="286" key="run.anything.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591883929114" />
<state x="592" y="283" width="903" height="778" key="search.everywhere.popup" timestamp="1592362550991"> <state x="592" y="283" width="903" height="778" key="search.everywhere.popup" timestamp="1592372874667">
<screen x="35" y="23" width="1885" height="1177" /> <screen x="35" y="23" width="1885" height="1177" />
</state> </state>
<state x="568" y="283" width="917" height="776" key="search.everywhere.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591884167098" /> <state x="568" y="283" width="917" height="776" key="search.everywhere.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591884167098" />
<state x="450" y="217" width="674" height="580" key="search.everywhere.popup/35.23.1405.877@35.23.1405.877" timestamp="1592296171796" /> <state x="450" y="217" width="674" height="580" key="search.everywhere.popup/35.23.1405.877@35.23.1405.877" timestamp="1592296171796" />
<state x="522" y="250" width="670" height="676" key="search.everywhere.popup/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591066027960" /> <state x="522" y="250" width="670" height="676" key="search.everywhere.popup/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591066027960" />
<state x="592" y="283" width="903" height="778" key="search.everywhere.popup/35.23.1885.1177@35.23.1885.1177" timestamp="1592362550991" /> <state x="592" y="283" width="903" height="778" key="search.everywhere.popup/35.23.1885.1177@35.23.1885.1177" timestamp="1592372874667" />
<state x="522" y="250" width="788" height="679" key="search.everywhere.popup/36.23.1644.1027@36.23.1644.1027" timestamp="1591942795629" /> <state x="522" y="250" width="788" height="679" key="search.everywhere.popup/36.23.1644.1027@36.23.1644.1027" timestamp="1591942795629" />
<state x="593" y="283" width="902" height="778" key="search.everywhere.popup/36.23.1884.1177@36.23.1884.1177" timestamp="1591965824178" /> <state x="593" y="283" width="902" height="778" key="search.everywhere.popup/36.23.1884.1177@36.23.1884.1177" timestamp="1591965824178" />
<state x="452" y="217" width="670" height="578" key="search.everywhere.popup/37.23.1403.877/1440.-199.1920.1177@37.23.1403.877" timestamp="1591854180825" /> <state x="452" y="217" width="670" height="578" key="search.everywhere.popup/37.23.1403.877/1440.-199.1920.1177@37.23.1403.877" timestamp="1591854180825" />
......
mock/miniTb/qiaqia2.exchangeGoods.json
View file @ 695c91bd
...@@ -5,16 +5,16 @@ ...@@ -5,16 +5,16 @@
"amount": "5", "amount": "5",
"drawStatus": 6, "drawStatus": 6,
"openId": "AAGquNyCAKrpWdzBzeceF5T-", "openId": "AAGquNyCAKrpWdzBzeceF5T-",
"remark": "今日领取达到上限，明日再来领取哦", "remark": "请至卡券包删除无用权益再领取",
"type": 1, "type": 1,
"prizeId": "5ee8809b8564b515371c5c11", "prizeId": "5ee8809b8564b515371c5c11",
"activityId": "5ee70c078564b5153717fbfd", "activityId": "5ee70c078564b5153717fbfd",
"ename": "ffdd8a992ad545d6b0ecb46d76f18982", "ename": "ffdd8a992ad545d6b0ecb46d76f18982",
"userNick": "lpf468169313", "userNick": "lpf468169313",
"name": "限制库存优惠券洽洽1", "name": "限制库存优惠券洽洽1",
"_id": "AAGquNyCAKrpWdzBzeceF5T-1592297851985", "_id": "AAGquNyCAKrpWdzBzeceF5T-1592373462304",
"exchangeDay": "2020/06/16" "exchangeDay": "2020/06/17"
}, },
"success": tr "success": true,
"message": "成功" "message": "成功"
} }
mock/miniTb/qiaqiaHome.getGameInfo.json
View file @ 695c91bd
...@@ -3,43 +3,39 @@ ...@@ -3,43 +3,39 @@
"data": { "data": {
"guideStep": 8, "guideStep": 8,
"guideIsEnd": true, "guideIsEnd": true,
"waterDrops": 94, "waterDrops": 0,
"plants": [ "plants": [
{ {
"level": 2, "level": "",
"waterRestCount": 1, "waterRestCount": "",
"totalTime": 3000, "plant": false,
"plant": true, "waterTime": "",
"waterTime": 1591954069560,
"index": 1, "index": 1,
"plantType": "CHESTNUT" "plantType": ""
}, },
{ {
"level": 3, "level": "",
"waterRestCount": 0, "waterRestCount": "",
"totalTime": 0,
"plant": false, "plant": false,
"waterTime": "", "waterTime": "",
"index": 2, "index": 2,
"plantType": "CHESTNUT" "plantType": ""
}, },
{ {
"level": 3, "level": "",
"waterRestCount": 0, "waterRestCount": "",
"totalTime": 0,
"plant": false, "plant": false,
"waterTime": "", "waterTime": "",
"index": 3, "index": 3,
"plantType": "CHESTNUT" "plantType": ""
}, },
{ {
"level": 3, "level": "",
"waterRestCount": 0, "waterRestCount": "",
"totalTime": 0,
"plant": false, "plant": false,
"waterTime": "", "waterTime": "",
"index": 4, "index": 4,
"plantType": "CHESTNUT" "plantType": ""
} }
] ]
}, },
......
src/panels/ExSuccessPanel.ts
View file @ 695c91bd
...@@ -57,11 +57,11 @@ export default class ExSuccessPanel extends Panel { ...@@ -57,11 +57,11 @@ export default class ExSuccessPanel extends Panel {
showToast('兑换成功'); showToast('兑换成功');
}).catch(() => { }).catch(() => {
this.hideAll(); this.hideAll();
showToast('奖品发放失败\n请前往我的奖品处进行处理'); // showToast('奖品发放失败\n请前往我的奖品处进行处理');
}) })
} else { } else {
this.hideAll(); this.hideAll();
// showToast('奖品发放失败\n请前往我的奖品处进行处理'); showToast('奖品发放失败\n请前往我的奖品处进行处理');
} }
} }
......
src/panels/TaskPanel.ts
View file @ 695c91bd
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import { Tool } from "../Tools"; import { Tool } from "../Tools";
import { layers } from "../../module/views/layers"; import { layers } from "../../module/views/layers";
import { RES } from "../../module/RES";
import { activityId, sellerId, sendTbNet, TbNetName } from "../TaoBaoNet"; import { activityId, sellerId, sendTbNet, TbNetName } from "../TaoBaoNet";
import { GDispatcher } from "../Main"; import { GDispatcher } from "../Main";
import { G_EVENT } from "../const/GEVENT"; import { G_EVENT } from "../const/GEVENT";
...@@ -147,7 +146,7 @@ const taskInfo = { ...@@ -147,7 +146,7 @@ const taskInfo = {
}, },
invites: { invites: {
name: '邀请好友', name: '邀请好友',
tips: '邀请3位好友可得大量水滴', tips: '邀请好友可得大量水滴',
btnLabel: '去邀请', btnLabel: '去邀请',
doneLabel: '明日再来' doneLabel: '明日再来'
}, },
......
src/parts/Game/ProgressBar.ts
View file @ 695c91bd
...@@ -28,10 +28,15 @@ export default class ProgressBar extends Container { ...@@ -28,10 +28,15 @@ export default class ProgressBar extends Container {
this.fill.position.set(56, 1); this.fill.position.set(56, 1);
// mask // mask
const mask = this.addChild(new Graphics()); const mask = this.addChild(new Graphics());
mask.drawRect(56, 1, 139, 29); mask.drawRect(0, 0, 195, 31);
this.fill.mask = mask; this.fill.mask = mask;
this.fill.x = -59; mask.mouseEnable = false;
mask.mouseChildren = false;
this.fill.x = 56.2;
mask.x = -138;
// nameLabel // nameLabel
this.nameLabel = this.addChild(new TextField()); this.nameLabel = this.addChild(new TextField());
...@@ -116,8 +121,11 @@ export default class ProgressBar extends Container { ...@@ -116,8 +121,11 @@ export default class ProgressBar extends Container {
this.timeLabel.text = `${hour}时${min}分后浇水`; this.timeLabel.text = `${hour}时${min}分后浇水`;
// this.timeLabel.position.set(56 + (136 - this.timeLabel.textWidth) / 2, 0); // this.timeLabel.position.set(56 + (136 - this.timeLabel.textWidth) / 2, 0);
// const progress = 1 - this.cutTime / this.fullTime;
// this.fill.x = 139 * progress - 139 + 53;
const progress = 1 - this.cutTime / this.fullTime; const progress = 1 - this.cutTime / this.fullTime;
this.fill.x = 139 * progress - 139 + 53; this.fill.mask.x = -138 + 138 * progress;
} }
/** /**
......
src/scenes/GameScene.ts
View file @ 695c91bd
...@@ -6,6 +6,7 @@ import { Land } from "../parts/Game/Land"; ...@@ -6,6 +6,7 @@ import { Land } from "../parts/Game/Land";
import MouseEvent = FYGE.MouseEvent; import MouseEvent = FYGE.MouseEvent;
import { gameResource } from "../const/staticData"; import { gameResource } from "../const/staticData";
import Sprite = FYGE.Sprite; import Sprite = FYGE.Sprite;
// import ProgressBar from "../parts/Game/ProgressBar";
export class GameScene extends Scene { export class GameScene extends Scene {
...@@ -44,6 +45,10 @@ export class GameScene extends Scene { ...@@ -44,6 +45,10 @@ export class GameScene extends Scene {
this.adBtn.name = '广告'; this.adBtn.name = '广告';
this.adBtn.visible = false; this.adBtn.visible = false;
// let a = this.addChild(new ProgressBar());
// a.position.set(400, 500);
// a.visible = true;
} }
start() { start() {
......
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