Skip to content

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

1

parent ac06d6d7
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 137 deletions
.idea/workspace.xml
View file @ a0ad980b
...@@ -3,91 +3,13 @@ ...@@ -3,91 +3,13 @@
<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="">
<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$/released/resource/Cashew_0/Cashew_0.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Cashew_0/Cashew_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Cashew_1/Cashew_1.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Cashew_1/Cashew_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Cashew_2/Cashew_2.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Cashew_2/Cashew_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Chestnut_0/Chestnut_0.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Chestnut_0/Chestnut_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Chestnut_1/Chestnut_1.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Chestnut_1/Chestnut_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Chestnut_2/Chestnut_2.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Chestnut_2/Chestnut_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Peanut_0/Peanut_0.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Peanut_0/Peanut_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Peanut_1/Peanut_1.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Peanut_1/Peanut_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Peanut_2/Peanut_2.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Peanut_2/Peanut_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pecan_0/Pecan_0.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pecan_0/Pecan_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pecan_1/Pecan_1.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pecan_1/Pecan_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pecan_2/Pecan_2.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pecan_2/Pecan_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pistachio_0/Pistachio_0.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pistachio_0/Pistachio_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pistachio_1/Pistachio_1.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pistachio_1/Pistachio_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pistachio_2/Pistachio_2.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Pistachio_2/Pistachio_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Sunflower_0/Sunflower_0.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Sunflower_0/Sunflower_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Sunflower_1/Sunflower_1.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Sunflower_1/Sunflower_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Sunflower_2/Sunflower_2.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/Sunflower_2/Sunflower_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/common/common.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/common/common.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/exRecordPanel/exRecordPanel.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/exRecordPanel/exRecordPanel.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/exSuccessPanel/exSuccessPanel.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/exSuccessPanel/exSuccessPanel.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/gameScene/gameScene.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/gameScene/gameScene.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/gameScene/game_bg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/released/resource/gameScene/game_bg.jpg" afterDir="false" /> <change beforePath="$PROJECT_DIR$/released/resource/gameScene/game_bg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/released/resource/gameScene/game_bg.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/loadingScene/loadingScene.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/loadingScene/loadingScene.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/loadingScene/loading_bg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/released/resource/loadingScene/loading_bg.jpg" afterDir="false" /> <change beforePath="$PROJECT_DIR$/released/resource/loadingScene/loading_bg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/released/resource/loadingScene/loading_bg.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/panel/panel.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/panel/panel.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/plants/plants.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/plants/plants.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/released/resource/res.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/released/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/released/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/rulePanel/rulePanel.json" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/parts/Game/GameLayer.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/GameLayer.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/rulePanel/rulePanel.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/shopPanel/shopPanel.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/shopPanel/shopPanel.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/taskPanel/taskPanel.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/taskPanel/taskPanel.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/wareHouse/wareHouse.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/wareHouse/wareHouse.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Cashew_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Cashew_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Cashew_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Chestnut_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Chestnut_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Chestnut_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Peanut_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Peanut_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Peanut_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Pecan_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Pecan_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Pecan_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Pistachio_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Pistachio_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Pistachio_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Sunflower_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Sunflower_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/plants/Sunflower_2.png" beforeDir="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/const/staticData.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/const/staticData.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/Effects/BirthEffect.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/Effects/BirthEffect.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/Land.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/Land.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/parts/Game/Land.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/Land.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/parts/UI/UILayer.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/UI/UILayer.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" />
...@@ -137,7 +59,7 @@ ...@@ -137,7 +59,7 @@
<recent name="$PROJECT_DIR$/resource/exRecord" /> <recent name="$PROJECT_DIR$/resource/exRecord" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.flushRes"> <component name="RunManager" selected="npm.handleRes">
<configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="dev" 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" />
...@@ -170,8 +92,8 @@ ...@@ -170,8 +92,8 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.handleRes" /> <item itemvalue="npm.handleRes" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" /> <item itemvalue="npm.dev" />
</list> </list>
</recent_temporary> </recent_temporary>
...@@ -197,7 +119,7 @@ ...@@ -197,7 +119,7 @@
<workItem from="1591321317628" duration="18063000" /> <workItem from="1591321317628" duration="18063000" />
<workItem from="1591438071338" duration="597000" /> <workItem from="1591438071338" duration="597000" />
<workItem from="1591581198126" duration="7855000" /> <workItem from="1591581198126" duration="7855000" />
<workItem from="1591594488054" duration="9648000" /> <workItem from="1591594488054" duration="11563000" />
</task> </task>
<task id="LOCAL-00001" summary="1"> <task id="LOCAL-00001" summary="1">
<created>1591003912929</created> <created>1591003912929</created>
...@@ -346,7 +268,14 @@ ...@@ -346,7 +268,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1591603743362</updated> <updated>1591603743362</updated>
</task> </task>
<option name="localTasksCounter" value="22" /> <task id="LOCAL-00022" summary="重构了出生动画，节省了一些资源">
<created>1591604179544</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1591604179544</updated>
</task>
<option name="localTasksCounter" value="23" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -375,43 +304,44 @@ ...@@ -375,43 +304,44 @@
<MESSAGE value="hideEffect" /> <MESSAGE value="hideEffect" />
<MESSAGE value="ExchangePanel" /> <MESSAGE value="ExchangePanel" />
<MESSAGE value="重构了种子动画，节省了一点资源" /> <MESSAGE value="重构了种子动画，节省了一点资源" />
<option name="LAST_COMMIT_MESSAGE" value="重构了种子动画，节省了一点资源" /> <MESSAGE value="重构了出生动画，节省了一些资源" />
<option name="LAST_COMMIT_MESSAGE" value="重构了出生动画，节省了一些资源" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="671" y="259" key="#com.intellij.ide.util.MemberChooser" timestamp="1591344864454"> <state x="671" y="259" key="#com.intellij.ide.util.MemberChooser" timestamp="1591344864454">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</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="467" y="108" key="CommitChangelistDialog2" timestamp="1591603742933"> <state x="467" y="108" key="CommitChangelistDialog2" timestamp="1591604178482">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<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="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="1591603742933" /> <state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591604178482" />
<state width="293" height="907" key="GridCell.Tab.0.bottom" timestamp="1591603878017"> <state width="293" height="907" key="GridCell.Tab.0.bottom" timestamp="1591604499037">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<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="257" height="1057" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189627828" /> <state width="257" height="1057" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189627828" />
<state width="293" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591603878017" /> <state width="293" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591604499037" />
<state width="293" height="907" key="GridCell.Tab.0.center" timestamp="1591603878014"> <state width="293" height="907" key="GridCell.Tab.0.center" timestamp="1591604499034">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<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="257" height="1057" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189627827" /> <state width="257" height="1057" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189627827" />
<state width="293" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591603878014" /> <state width="293" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591604499034" />
<state width="293" height="907" key="GridCell.Tab.0.left" timestamp="1591603878014"> <state width="293" height="907" key="GridCell.Tab.0.left" timestamp="1591604499033">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<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="257" height="1057" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189627825" /> <state width="257" height="1057" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189627825" />
<state width="293" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591603878014" /> <state width="293" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591604499033" />
<state width="293" height="907" key="GridCell.Tab.0.right" timestamp="1591603878016"> <state width="293" height="907" key="GridCell.Tab.0.right" timestamp="1591604499035">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<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="257" height="1057" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189627828" /> <state width="257" height="1057" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189627828" />
<state width="293" height="907" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591603878016" /> <state width="293" height="907" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591604499035" />
<state x="446" y="278" key="IDE.errors.dialog" timestamp="1591150813027"> <state x="446" y="278" key="IDE.errors.dialog" timestamp="1591150813027">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
...@@ -421,11 +351,11 @@ ...@@ -421,11 +351,11 @@
</state> </state>
<state x="614" y="245" key="RollbackChangesDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590993046653" /> <state x="614" y="245" key="RollbackChangesDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590993046653" />
<state x="615" y="245" key="RollbackChangesDialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591077661188" /> <state x="615" y="245" key="RollbackChangesDialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591077661188" />
<state x="457" y="276" key="Vcs.Push.Dialog.v2" timestamp="1591603745283"> <state x="457" y="276" key="Vcs.Push.Dialog.v2" timestamp="1591604181852">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<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="1591603745283" /> <state x="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591604181852" />
<state x="417" y="141" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1591269112575"> <state x="417" y="141" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1591269112575">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
...@@ -438,11 +368,11 @@ ...@@ -438,11 +368,11 @@
<screen x="35" y="23" width="1645" height="1027" /> <screen x="35" y="23" width="1645" height="1027" />
</state> </state>
<state x="586" y="314" key="refactoring.ChangeSignatureDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590980819551" /> <state x="586" y="314" key="refactoring.ChangeSignatureDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590980819551" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1591603887155"> <state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1591604566804">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<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="2248" y="61" width="783" height="775" key="search.everywhere.popup/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591582557074" /> <state x="2248" y="61" width="783" height="775" key="search.everywhere.popup/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591582557074" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591603887155" /> <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591604566804" />
</component> </component>
</project> </project>
\ No newline at end of file
released/resource/res.json
View file @ a0ad980b
...@@ -2,123 +2,148 @@ ...@@ -2,123 +2,148 @@
"groups": [ "groups": [
{ {
"keys": "Cashew_0_0.png,Cashew_0_1.png,Cashew_0_10.png,Cashew_0_11.png,Cashew_0_12.png,Cashew_0_13.png,Cashew_0_14.png,Cashew_0_15.png,Cashew_0_16.png,Cashew_0_17.png,Cashew_0_18.png,Cashew_0_19.png,Cashew_0_2.png,Cashew_0_20.png,Cashew_0_21.png,Cashew_0_22.png,Cashew_0_23.png,Cashew_0_24.png,Cashew_0_25.png,Cashew_0_26.png,Cashew_0_27.png,Cashew_0_28.png,Cashew_0_29.png,Cashew_0_3.png,Cashew_0_30.png,Cashew_0_4.png,Cashew_0_5.png,Cashew_0_6.png,Cashew_0_7.png,Cashew_0_8.png,Cashew_0_9.png", "keys": "Cashew_0_0.png,Cashew_0_1.png,Cashew_0_10.png,Cashew_0_11.png,Cashew_0_12.png,Cashew_0_13.png,Cashew_0_14.png,Cashew_0_15.png,Cashew_0_16.png,Cashew_0_17.png,Cashew_0_18.png,Cashew_0_19.png,Cashew_0_2.png,Cashew_0_20.png,Cashew_0_21.png,Cashew_0_22.png,Cashew_0_23.png,Cashew_0_24.png,Cashew_0_25.png,Cashew_0_26.png,Cashew_0_27.png,Cashew_0_28.png,Cashew_0_29.png,Cashew_0_3.png,Cashew_0_30.png,Cashew_0_4.png,Cashew_0_5.png,Cashew_0_6.png,Cashew_0_7.png,Cashew_0_8.png,Cashew_0_9.png",
"name": "Cashew_0" "name": "Cashew_0",
"atlas": "Cashew_0.json"
}, },
{ {
"keys": "Cashew_1_0.png,Cashew_1_1.png,Cashew_1_10.png,Cashew_1_11.png,Cashew_1_12.png,Cashew_1_13.png,Cashew_1_14.png,Cashew_1_15.png,Cashew_1_16.png,Cashew_1_17.png,Cashew_1_18.png,Cashew_1_19.png,Cashew_1_2.png,Cashew_1_20.png,Cashew_1_21.png,Cashew_1_22.png,Cashew_1_23.png,Cashew_1_24.png,Cashew_1_25.png,Cashew_1_26.png,Cashew_1_27.png,Cashew_1_28.png,Cashew_1_29.png,Cashew_1_3.png,Cashew_1_30.png,Cashew_1_4.png,Cashew_1_5.png,Cashew_1_6.png,Cashew_1_7.png,Cashew_1_8.png,Cashew_1_9.png", "keys": "Cashew_1_0.png,Cashew_1_1.png,Cashew_1_10.png,Cashew_1_11.png,Cashew_1_12.png,Cashew_1_13.png,Cashew_1_14.png,Cashew_1_15.png,Cashew_1_16.png,Cashew_1_17.png,Cashew_1_18.png,Cashew_1_19.png,Cashew_1_2.png,Cashew_1_20.png,Cashew_1_21.png,Cashew_1_22.png,Cashew_1_23.png,Cashew_1_24.png,Cashew_1_25.png,Cashew_1_26.png,Cashew_1_27.png,Cashew_1_28.png,Cashew_1_29.png,Cashew_1_3.png,Cashew_1_30.png,Cashew_1_4.png,Cashew_1_5.png,Cashew_1_6.png,Cashew_1_7.png,Cashew_1_8.png,Cashew_1_9.png",
"name": "Cashew_1" "name": "Cashew_1",
"atlas": "Cashew_1.json"
}, },
{ {
"keys": "Cashew_2_0.png,Cashew_2_1.png,Cashew_2_10.png,Cashew_2_11.png,Cashew_2_12.png,Cashew_2_13.png,Cashew_2_14.png,Cashew_2_15.png,Cashew_2_16.png,Cashew_2_17.png,Cashew_2_18.png,Cashew_2_19.png,Cashew_2_2.png,Cashew_2_20.png,Cashew_2_21.png,Cashew_2_22.png,Cashew_2_23.png,Cashew_2_24.png,Cashew_2_25.png,Cashew_2_26.png,Cashew_2_27.png,Cashew_2_28.png,Cashew_2_29.png,Cashew_2_3.png,Cashew_2_30.png,Cashew_2_4.png,Cashew_2_5.png,Cashew_2_6.png,Cashew_2_7.png,Cashew_2_8.png,Cashew_2_9.png", "keys": "Cashew_2_0.png,Cashew_2_1.png,Cashew_2_10.png,Cashew_2_11.png,Cashew_2_12.png,Cashew_2_13.png,Cashew_2_14.png,Cashew_2_15.png,Cashew_2_16.png,Cashew_2_17.png,Cashew_2_18.png,Cashew_2_19.png,Cashew_2_2.png,Cashew_2_20.png,Cashew_2_21.png,Cashew_2_22.png,Cashew_2_23.png,Cashew_2_24.png,Cashew_2_25.png,Cashew_2_26.png,Cashew_2_27.png,Cashew_2_28.png,Cashew_2_29.png,Cashew_2_3.png,Cashew_2_30.png,Cashew_2_4.png,Cashew_2_5.png,Cashew_2_6.png,Cashew_2_7.png,Cashew_2_8.png,Cashew_2_9.png",
"name": "Cashew_2" "name": "Cashew_2",
"atlas": "Cashew_2.json"
}, },
{ {
"keys": "Chestnut_0_0.png,Chestnut_0_1.png,Chestnut_0_10.png,Chestnut_0_11.png,Chestnut_0_12.png,Chestnut_0_13.png,Chestnut_0_14.png,Chestnut_0_15.png,Chestnut_0_16.png,Chestnut_0_17.png,Chestnut_0_18.png,Chestnut_0_19.png,Chestnut_0_2.png,Chestnut_0_20.png,Chestnut_0_21.png,Chestnut_0_22.png,Chestnut_0_23.png,Chestnut_0_24.png,Chestnut_0_25.png,Chestnut_0_26.png,Chestnut_0_27.png,Chestnut_0_28.png,Chestnut_0_29.png,Chestnut_0_3.png,Chestnut_0_30.png,Chestnut_0_4.png,Chestnut_0_5.png,Chestnut_0_6.png,Chestnut_0_7.png,Chestnut_0_8.png,Chestnut_0_9.png", "keys": "Chestnut_0_0.png,Chestnut_0_1.png,Chestnut_0_10.png,Chestnut_0_11.png,Chestnut_0_12.png,Chestnut_0_13.png,Chestnut_0_14.png,Chestnut_0_15.png,Chestnut_0_16.png,Chestnut_0_17.png,Chestnut_0_18.png,Chestnut_0_19.png,Chestnut_0_2.png,Chestnut_0_20.png,Chestnut_0_21.png,Chestnut_0_22.png,Chestnut_0_23.png,Chestnut_0_24.png,Chestnut_0_25.png,Chestnut_0_26.png,Chestnut_0_27.png,Chestnut_0_28.png,Chestnut_0_29.png,Chestnut_0_3.png,Chestnut_0_30.png,Chestnut_0_4.png,Chestnut_0_5.png,Chestnut_0_6.png,Chestnut_0_7.png,Chestnut_0_8.png,Chestnut_0_9.png",
"name": "Chestnut_0" "name": "Chestnut_0",
"atlas": "Chestnut_0.json"
}, },
{ {
"keys": "Chestnut_1_0.png,Chestnut_1_1.png,Chestnut_1_10.png,Chestnut_1_11.png,Chestnut_1_12.png,Chestnut_1_13.png,Chestnut_1_14.png,Chestnut_1_15.png,Chestnut_1_16.png,Chestnut_1_17.png,Chestnut_1_18.png,Chestnut_1_19.png,Chestnut_1_2.png,Chestnut_1_20.png,Chestnut_1_21.png,Chestnut_1_22.png,Chestnut_1_23.png,Chestnut_1_24.png,Chestnut_1_25.png,Chestnut_1_26.png,Chestnut_1_27.png,Chestnut_1_28.png,Chestnut_1_29.png,Chestnut_1_3.png,Chestnut_1_30.png,Chestnut_1_4.png,Chestnut_1_5.png,Chestnut_1_6.png,Chestnut_1_7.png,Chestnut_1_8.png,Chestnut_1_9.png", "keys": "Chestnut_1_0.png,Chestnut_1_1.png,Chestnut_1_10.png,Chestnut_1_11.png,Chestnut_1_12.png,Chestnut_1_13.png,Chestnut_1_14.png,Chestnut_1_15.png,Chestnut_1_16.png,Chestnut_1_17.png,Chestnut_1_18.png,Chestnut_1_19.png,Chestnut_1_2.png,Chestnut_1_20.png,Chestnut_1_21.png,Chestnut_1_22.png,Chestnut_1_23.png,Chestnut_1_24.png,Chestnut_1_25.png,Chestnut_1_26.png,Chestnut_1_27.png,Chestnut_1_28.png,Chestnut_1_29.png,Chestnut_1_3.png,Chestnut_1_30.png,Chestnut_1_4.png,Chestnut_1_5.png,Chestnut_1_6.png,Chestnut_1_7.png,Chestnut_1_8.png,Chestnut_1_9.png",
"name": "Chestnut_1" "name": "Chestnut_1",
"atlas": "Chestnut_1.json"
}, },
{ {
"keys": "Chestnut_2_0.png,Chestnut_2_1.png,Chestnut_2_10.png,Chestnut_2_11.png,Chestnut_2_12.png,Chestnut_2_13.png,Chestnut_2_14.png,Chestnut_2_15.png,Chestnut_2_16.png,Chestnut_2_17.png,Chestnut_2_18.png,Chestnut_2_19.png,Chestnut_2_2.png,Chestnut_2_20.png,Chestnut_2_21.png,Chestnut_2_22.png,Chestnut_2_23.png,Chestnut_2_24.png,Chestnut_2_25.png,Chestnut_2_26.png,Chestnut_2_27.png,Chestnut_2_28.png,Chestnut_2_29.png,Chestnut_2_3.png,Chestnut_2_30.png,Chestnut_2_4.png,Chestnut_2_5.png,Chestnut_2_6.png,Chestnut_2_7.png,Chestnut_2_8.png,Chestnut_2_9.png", "keys": "Chestnut_2_0.png,Chestnut_2_1.png,Chestnut_2_10.png,Chestnut_2_11.png,Chestnut_2_12.png,Chestnut_2_13.png,Chestnut_2_14.png,Chestnut_2_15.png,Chestnut_2_16.png,Chestnut_2_17.png,Chestnut_2_18.png,Chestnut_2_19.png,Chestnut_2_2.png,Chestnut_2_20.png,Chestnut_2_21.png,Chestnut_2_22.png,Chestnut_2_23.png,Chestnut_2_24.png,Chestnut_2_25.png,Chestnut_2_26.png,Chestnut_2_27.png,Chestnut_2_28.png,Chestnut_2_29.png,Chestnut_2_3.png,Chestnut_2_30.png,Chestnut_2_4.png,Chestnut_2_5.png,Chestnut_2_6.png,Chestnut_2_7.png,Chestnut_2_8.png,Chestnut_2_9.png",
"name": "Chestnut_2" "name": "Chestnut_2",
"atlas": "Chestnut_2.json"
}, },
{ {
"keys": "Peanut_0_0.png,Peanut_0_1.png,Peanut_0_10.png,Peanut_0_11.png,Peanut_0_12.png,Peanut_0_13.png,Peanut_0_14.png,Peanut_0_15.png,Peanut_0_16.png,Peanut_0_17.png,Peanut_0_18.png,Peanut_0_19.png,Peanut_0_2.png,Peanut_0_20.png,Peanut_0_21.png,Peanut_0_22.png,Peanut_0_23.png,Peanut_0_24.png,Peanut_0_25.png,Peanut_0_26.png,Peanut_0_27.png,Peanut_0_28.png,Peanut_0_29.png,Peanut_0_3.png,Peanut_0_30.png,Peanut_0_4.png,Peanut_0_5.png,Peanut_0_6.png,Peanut_0_7.png,Peanut_0_8.png,Peanut_0_9.png", "keys": "Peanut_0_0.png,Peanut_0_1.png,Peanut_0_10.png,Peanut_0_11.png,Peanut_0_12.png,Peanut_0_13.png,Peanut_0_14.png,Peanut_0_15.png,Peanut_0_16.png,Peanut_0_17.png,Peanut_0_18.png,Peanut_0_19.png,Peanut_0_2.png,Peanut_0_20.png,Peanut_0_21.png,Peanut_0_22.png,Peanut_0_23.png,Peanut_0_24.png,Peanut_0_25.png,Peanut_0_26.png,Peanut_0_27.png,Peanut_0_28.png,Peanut_0_29.png,Peanut_0_3.png,Peanut_0_30.png,Peanut_0_4.png,Peanut_0_5.png,Peanut_0_6.png,Peanut_0_7.png,Peanut_0_8.png,Peanut_0_9.png",
"name": "Peanut_0" "name": "Peanut_0",
"atlas": "Peanut_0.json"
}, },
{ {
"keys": "Peanut_1_0.png,Peanut_1_1.png,Peanut_1_10.png,Peanut_1_11.png,Peanut_1_12.png,Peanut_1_13.png,Peanut_1_14.png,Peanut_1_15.png,Peanut_1_16.png,Peanut_1_17.png,Peanut_1_18.png,Peanut_1_19.png,Peanut_1_2.png,Peanut_1_20.png,Peanut_1_21.png,Peanut_1_22.png,Peanut_1_23.png,Peanut_1_24.png,Peanut_1_25.png,Peanut_1_26.png,Peanut_1_27.png,Peanut_1_28.png,Peanut_1_29.png,Peanut_1_3.png,Peanut_1_30.png,Peanut_1_4.png,Peanut_1_5.png,Peanut_1_6.png,Peanut_1_7.png,Peanut_1_8.png,Peanut_1_9.png", "keys": "Peanut_1_0.png,Peanut_1_1.png,Peanut_1_10.png,Peanut_1_11.png,Peanut_1_12.png,Peanut_1_13.png,Peanut_1_14.png,Peanut_1_15.png,Peanut_1_16.png,Peanut_1_17.png,Peanut_1_18.png,Peanut_1_19.png,Peanut_1_2.png,Peanut_1_20.png,Peanut_1_21.png,Peanut_1_22.png,Peanut_1_23.png,Peanut_1_24.png,Peanut_1_25.png,Peanut_1_26.png,Peanut_1_27.png,Peanut_1_28.png,Peanut_1_29.png,Peanut_1_3.png,Peanut_1_30.png,Peanut_1_4.png,Peanut_1_5.png,Peanut_1_6.png,Peanut_1_7.png,Peanut_1_8.png,Peanut_1_9.png",
"name": "Peanut_1" "name": "Peanut_1",
"atlas": "Peanut_1.json"
}, },
{ {
"keys": "Peanut_2_0.png,Peanut_2_1.png,Peanut_2_10.png,Peanut_2_11.png,Peanut_2_12.png,Peanut_2_13.png,Peanut_2_14.png,Peanut_2_15.png,Peanut_2_16.png,Peanut_2_17.png,Peanut_2_18.png,Peanut_2_19.png,Peanut_2_2.png,Peanut_2_20.png,Peanut_2_21.png,Peanut_2_22.png,Peanut_2_23.png,Peanut_2_24.png,Peanut_2_25.png,Peanut_2_26.png,Peanut_2_27.png,Peanut_2_28.png,Peanut_2_29.png,Peanut_2_3.png,Peanut_2_30.png,Peanut_2_4.png,Peanut_2_5.png,Peanut_2_6.png,Peanut_2_7.png,Peanut_2_8.png,Peanut_2_9.png", "keys": "Peanut_2_0.png,Peanut_2_1.png,Peanut_2_10.png,Peanut_2_11.png,Peanut_2_12.png,Peanut_2_13.png,Peanut_2_14.png,Peanut_2_15.png,Peanut_2_16.png,Peanut_2_17.png,Peanut_2_18.png,Peanut_2_19.png,Peanut_2_2.png,Peanut_2_20.png,Peanut_2_21.png,Peanut_2_22.png,Peanut_2_23.png,Peanut_2_24.png,Peanut_2_25.png,Peanut_2_26.png,Peanut_2_27.png,Peanut_2_28.png,Peanut_2_29.png,Peanut_2_3.png,Peanut_2_30.png,Peanut_2_4.png,Peanut_2_5.png,Peanut_2_6.png,Peanut_2_7.png,Peanut_2_8.png,Peanut_2_9.png",
"name": "Peanut_2" "name": "Peanut_2",
"atlas": "Peanut_2.json"
}, },
{ {
"keys": "Pecan_0_0.png,Pecan_0_1.png,Pecan_0_10.png,Pecan_0_11.png,Pecan_0_12.png,Pecan_0_13.png,Pecan_0_14.png,Pecan_0_15.png,Pecan_0_16.png,Pecan_0_17.png,Pecan_0_18.png,Pecan_0_19.png,Pecan_0_2.png,Pecan_0_20.png,Pecan_0_21.png,Pecan_0_22.png,Pecan_0_23.png,Pecan_0_24.png,Pecan_0_25.png,Pecan_0_26.png,Pecan_0_27.png,Pecan_0_28.png,Pecan_0_29.png,Pecan_0_3.png,Pecan_0_30.png,Pecan_0_4.png,Pecan_0_5.png,Pecan_0_6.png,Pecan_0_7.png,Pecan_0_8.png,Pecan_0_9.png", "keys": "Pecan_0_0.png,Pecan_0_1.png,Pecan_0_10.png,Pecan_0_11.png,Pecan_0_12.png,Pecan_0_13.png,Pecan_0_14.png,Pecan_0_15.png,Pecan_0_16.png,Pecan_0_17.png,Pecan_0_18.png,Pecan_0_19.png,Pecan_0_2.png,Pecan_0_20.png,Pecan_0_21.png,Pecan_0_22.png,Pecan_0_23.png,Pecan_0_24.png,Pecan_0_25.png,Pecan_0_26.png,Pecan_0_27.png,Pecan_0_28.png,Pecan_0_29.png,Pecan_0_3.png,Pecan_0_30.png,Pecan_0_4.png,Pecan_0_5.png,Pecan_0_6.png,Pecan_0_7.png,Pecan_0_8.png,Pecan_0_9.png",
"name": "Pecan_0" "name": "Pecan_0",
"atlas": "Pecan_0.json"
}, },
{ {
"keys": "Pecan_1_0.png,Pecan_1_1.png,Pecan_1_10.png,Pecan_1_11.png,Pecan_1_12.png,Pecan_1_13.png,Pecan_1_14.png,Pecan_1_15.png,Pecan_1_16.png,Pecan_1_17.png,Pecan_1_18.png,Pecan_1_19.png,Pecan_1_2.png,Pecan_1_20.png,Pecan_1_21.png,Pecan_1_22.png,Pecan_1_23.png,Pecan_1_24.png,Pecan_1_25.png,Pecan_1_26.png,Pecan_1_27.png,Pecan_1_28.png,Pecan_1_29.png,Pecan_1_3.png,Pecan_1_30.png,Pecan_1_4.png,Pecan_1_5.png,Pecan_1_6.png,Pecan_1_7.png,Pecan_1_8.png,Pecan_1_9.png", "keys": "Pecan_1_0.png,Pecan_1_1.png,Pecan_1_10.png,Pecan_1_11.png,Pecan_1_12.png,Pecan_1_13.png,Pecan_1_14.png,Pecan_1_15.png,Pecan_1_16.png,Pecan_1_17.png,Pecan_1_18.png,Pecan_1_19.png,Pecan_1_2.png,Pecan_1_20.png,Pecan_1_21.png,Pecan_1_22.png,Pecan_1_23.png,Pecan_1_24.png,Pecan_1_25.png,Pecan_1_26.png,Pecan_1_27.png,Pecan_1_28.png,Pecan_1_29.png,Pecan_1_3.png,Pecan_1_30.png,Pecan_1_4.png,Pecan_1_5.png,Pecan_1_6.png,Pecan_1_7.png,Pecan_1_8.png,Pecan_1_9.png",
"name": "Pecan_1" "name": "Pecan_1",
"atlas": "Pecan_1.json"
}, },
{ {
"keys": "Pecan_2_0.png,Pecan_2_1.png,Pecan_2_10.png,Pecan_2_11.png,Pecan_2_12.png,Pecan_2_13.png,Pecan_2_14.png,Pecan_2_15.png,Pecan_2_16.png,Pecan_2_17.png,Pecan_2_18.png,Pecan_2_19.png,Pecan_2_2.png,Pecan_2_20.png,Pecan_2_21.png,Pecan_2_22.png,Pecan_2_23.png,Pecan_2_24.png,Pecan_2_25.png,Pecan_2_26.png,Pecan_2_27.png,Pecan_2_28.png,Pecan_2_29.png,Pecan_2_3.png,Pecan_2_30.png,Pecan_2_4.png,Pecan_2_5.png,Pecan_2_6.png,Pecan_2_7.png,Pecan_2_8.png,Pecan_2_9.png", "keys": "Pecan_2_0.png,Pecan_2_1.png,Pecan_2_10.png,Pecan_2_11.png,Pecan_2_12.png,Pecan_2_13.png,Pecan_2_14.png,Pecan_2_15.png,Pecan_2_16.png,Pecan_2_17.png,Pecan_2_18.png,Pecan_2_19.png,Pecan_2_2.png,Pecan_2_20.png,Pecan_2_21.png,Pecan_2_22.png,Pecan_2_23.png,Pecan_2_24.png,Pecan_2_25.png,Pecan_2_26.png,Pecan_2_27.png,Pecan_2_28.png,Pecan_2_29.png,Pecan_2_3.png,Pecan_2_30.png,Pecan_2_4.png,Pecan_2_5.png,Pecan_2_6.png,Pecan_2_7.png,Pecan_2_8.png,Pecan_2_9.png",
"name": "Pecan_2" "name": "Pecan_2",
"atlas": "Pecan_2.json"
}, },
{ {
"keys": "Pistachio_0_0.png,Pistachio_0_1.png,Pistachio_0_10.png,Pistachio_0_11.png,Pistachio_0_12.png,Pistachio_0_13.png,Pistachio_0_14.png,Pistachio_0_15.png,Pistachio_0_16.png,Pistachio_0_17.png,Pistachio_0_18.png,Pistachio_0_19.png,Pistachio_0_2.png,Pistachio_0_20.png,Pistachio_0_21.png,Pistachio_0_22.png,Pistachio_0_23.png,Pistachio_0_24.png,Pistachio_0_25.png,Pistachio_0_26.png,Pistachio_0_27.png,Pistachio_0_28.png,Pistachio_0_29.png,Pistachio_0_3.png,Pistachio_0_30.png,Pistachio_0_4.png,Pistachio_0_5.png,Pistachio_0_6.png,Pistachio_0_7.png,Pistachio_0_8.png,Pistachio_0_9.png", "keys": "Pistachio_0_0.png,Pistachio_0_1.png,Pistachio_0_10.png,Pistachio_0_11.png,Pistachio_0_12.png,Pistachio_0_13.png,Pistachio_0_14.png,Pistachio_0_15.png,Pistachio_0_16.png,Pistachio_0_17.png,Pistachio_0_18.png,Pistachio_0_19.png,Pistachio_0_2.png,Pistachio_0_20.png,Pistachio_0_21.png,Pistachio_0_22.png,Pistachio_0_23.png,Pistachio_0_24.png,Pistachio_0_25.png,Pistachio_0_26.png,Pistachio_0_27.png,Pistachio_0_28.png,Pistachio_0_29.png,Pistachio_0_3.png,Pistachio_0_30.png,Pistachio_0_4.png,Pistachio_0_5.png,Pistachio_0_6.png,Pistachio_0_7.png,Pistachio_0_8.png,Pistachio_0_9.png",
"name": "Pistachio_0" "name": "Pistachio_0",
"atlas": "Pistachio_0.json"
}, },
{ {
"keys": "Pistachio_1_0.png,Pistachio_1_1.png,Pistachio_1_10.png,Pistachio_1_11.png,Pistachio_1_12.png,Pistachio_1_13.png,Pistachio_1_14.png,Pistachio_1_15.png,Pistachio_1_16.png,Pistachio_1_17.png,Pistachio_1_18.png,Pistachio_1_19.png,Pistachio_1_2.png,Pistachio_1_20.png,Pistachio_1_21.png,Pistachio_1_22.png,Pistachio_1_23.png,Pistachio_1_24.png,Pistachio_1_25.png,Pistachio_1_26.png,Pistachio_1_27.png,Pistachio_1_28.png,Pistachio_1_29.png,Pistachio_1_3.png,Pistachio_1_30.png,Pistachio_1_4.png,Pistachio_1_5.png,Pistachio_1_6.png,Pistachio_1_7.png,Pistachio_1_8.png,Pistachio_1_9.png", "keys": "Pistachio_1_0.png,Pistachio_1_1.png,Pistachio_1_10.png,Pistachio_1_11.png,Pistachio_1_12.png,Pistachio_1_13.png,Pistachio_1_14.png,Pistachio_1_15.png,Pistachio_1_16.png,Pistachio_1_17.png,Pistachio_1_18.png,Pistachio_1_19.png,Pistachio_1_2.png,Pistachio_1_20.png,Pistachio_1_21.png,Pistachio_1_22.png,Pistachio_1_23.png,Pistachio_1_24.png,Pistachio_1_25.png,Pistachio_1_26.png,Pistachio_1_27.png,Pistachio_1_28.png,Pistachio_1_29.png,Pistachio_1_3.png,Pistachio_1_30.png,Pistachio_1_4.png,Pistachio_1_5.png,Pistachio_1_6.png,Pistachio_1_7.png,Pistachio_1_8.png,Pistachio_1_9.png",
"name": "Pistachio_1" "name": "Pistachio_1",
"atlas": "Pistachio_1.json"
}, },
{ {
"keys": "Pistachio_2_0.png,Pistachio_2_1.png,Pistachio_2_10.png,Pistachio_2_11.png,Pistachio_2_12.png,Pistachio_2_13.png,Pistachio_2_14.png,Pistachio_2_15.png,Pistachio_2_16.png,Pistachio_2_17.png,Pistachio_2_18.png,Pistachio_2_19.png,Pistachio_2_2.png,Pistachio_2_20.png,Pistachio_2_21.png,Pistachio_2_22.png,Pistachio_2_23.png,Pistachio_2_24.png,Pistachio_2_25.png,Pistachio_2_26.png,Pistachio_2_27.png,Pistachio_2_28.png,Pistachio_2_29.png,Pistachio_2_3.png,Pistachio_2_30.png,Pistachio_2_4.png,Pistachio_2_5.png,Pistachio_2_6.png,Pistachio_2_7.png,Pistachio_2_8.png,Pistachio_2_9.png", "keys": "Pistachio_2_0.png,Pistachio_2_1.png,Pistachio_2_10.png,Pistachio_2_11.png,Pistachio_2_12.png,Pistachio_2_13.png,Pistachio_2_14.png,Pistachio_2_15.png,Pistachio_2_16.png,Pistachio_2_17.png,Pistachio_2_18.png,Pistachio_2_19.png,Pistachio_2_2.png,Pistachio_2_20.png,Pistachio_2_21.png,Pistachio_2_22.png,Pistachio_2_23.png,Pistachio_2_24.png,Pistachio_2_25.png,Pistachio_2_26.png,Pistachio_2_27.png,Pistachio_2_28.png,Pistachio_2_29.png,Pistachio_2_3.png,Pistachio_2_30.png,Pistachio_2_4.png,Pistachio_2_5.png,Pistachio_2_6.png,Pistachio_2_7.png,Pistachio_2_8.png,Pistachio_2_9.png",
"name": "Pistachio_2" "name": "Pistachio_2",
"atlas": "Pistachio_2.json"
}, },
{ {
"keys": "Sunflower_0_0.png,Sunflower_0_1.png,Sunflower_0_10.png,Sunflower_0_11.png,Sunflower_0_12.png,Sunflower_0_13.png,Sunflower_0_14.png,Sunflower_0_15.png,Sunflower_0_16.png,Sunflower_0_17.png,Sunflower_0_18.png,Sunflower_0_19.png,Sunflower_0_2.png,Sunflower_0_20.png,Sunflower_0_21.png,Sunflower_0_22.png,Sunflower_0_23.png,Sunflower_0_24.png,Sunflower_0_25.png,Sunflower_0_26.png,Sunflower_0_27.png,Sunflower_0_28.png,Sunflower_0_29.png,Sunflower_0_3.png,Sunflower_0_30.png,Sunflower_0_4.png,Sunflower_0_5.png,Sunflower_0_6.png,Sunflower_0_7.png,Sunflower_0_8.png,Sunflower_0_9.png", "keys": "Sunflower_0_0.png,Sunflower_0_1.png,Sunflower_0_10.png,Sunflower_0_11.png,Sunflower_0_12.png,Sunflower_0_13.png,Sunflower_0_14.png,Sunflower_0_15.png,Sunflower_0_16.png,Sunflower_0_17.png,Sunflower_0_18.png,Sunflower_0_19.png,Sunflower_0_2.png,Sunflower_0_20.png,Sunflower_0_21.png,Sunflower_0_22.png,Sunflower_0_23.png,Sunflower_0_24.png,Sunflower_0_25.png,Sunflower_0_26.png,Sunflower_0_27.png,Sunflower_0_28.png,Sunflower_0_29.png,Sunflower_0_3.png,Sunflower_0_30.png,Sunflower_0_4.png,Sunflower_0_5.png,Sunflower_0_6.png,Sunflower_0_7.png,Sunflower_0_8.png,Sunflower_0_9.png",
"name": "Sunflower_0" "name": "Sunflower_0",
"atlas": "Sunflower_0.json"
}, },
{ {
"keys": "Sunflower_1_0.png,Sunflower_1_1.png,Sunflower_1_10.png,Sunflower_1_11.png,Sunflower_1_12.png,Sunflower_1_13.png,Sunflower_1_14.png,Sunflower_1_15.png,Sunflower_1_16.png,Sunflower_1_17.png,Sunflower_1_18.png,Sunflower_1_19.png,Sunflower_1_2.png,Sunflower_1_20.png,Sunflower_1_21.png,Sunflower_1_22.png,Sunflower_1_23.png,Sunflower_1_24.png,Sunflower_1_25.png,Sunflower_1_26.png,Sunflower_1_27.png,Sunflower_1_28.png,Sunflower_1_29.png,Sunflower_1_3.png,Sunflower_1_30.png,Sunflower_1_4.png,Sunflower_1_5.png,Sunflower_1_6.png,Sunflower_1_7.png,Sunflower_1_8.png,Sunflower_1_9.png", "keys": "Sunflower_1_0.png,Sunflower_1_1.png,Sunflower_1_10.png,Sunflower_1_11.png,Sunflower_1_12.png,Sunflower_1_13.png,Sunflower_1_14.png,Sunflower_1_15.png,Sunflower_1_16.png,Sunflower_1_17.png,Sunflower_1_18.png,Sunflower_1_19.png,Sunflower_1_2.png,Sunflower_1_20.png,Sunflower_1_21.png,Sunflower_1_22.png,Sunflower_1_23.png,Sunflower_1_24.png,Sunflower_1_25.png,Sunflower_1_26.png,Sunflower_1_27.png,Sunflower_1_28.png,Sunflower_1_29.png,Sunflower_1_3.png,Sunflower_1_30.png,Sunflower_1_4.png,Sunflower_1_5.png,Sunflower_1_6.png,Sunflower_1_7.png,Sunflower_1_8.png,Sunflower_1_9.png",
"name": "Sunflower_1" "name": "Sunflower_1",
"atlas": "Sunflower_1.json"
}, },
{ {
"keys": "Sunflower_2_0.png,Sunflower_2_1.png,Sunflower_2_10.png,Sunflower_2_11.png,Sunflower_2_12.png,Sunflower_2_13.png,Sunflower_2_14.png,Sunflower_2_15.png,Sunflower_2_16.png,Sunflower_2_17.png,Sunflower_2_18.png,Sunflower_2_19.png,Sunflower_2_2.png,Sunflower_2_20.png,Sunflower_2_21.png,Sunflower_2_22.png,Sunflower_2_23.png,Sunflower_2_24.png,Sunflower_2_25.png,Sunflower_2_26.png,Sunflower_2_27.png,Sunflower_2_28.png,Sunflower_2_29.png,Sunflower_2_3.png,Sunflower_2_30.png,Sunflower_2_4.png,Sunflower_2_5.png,Sunflower_2_6.png,Sunflower_2_7.png,Sunflower_2_8.png,Sunflower_2_9.png", "keys": "Sunflower_2_0.png,Sunflower_2_1.png,Sunflower_2_10.png,Sunflower_2_11.png,Sunflower_2_12.png,Sunflower_2_13.png,Sunflower_2_14.png,Sunflower_2_15.png,Sunflower_2_16.png,Sunflower_2_17.png,Sunflower_2_18.png,Sunflower_2_19.png,Sunflower_2_2.png,Sunflower_2_20.png,Sunflower_2_21.png,Sunflower_2_22.png,Sunflower_2_23.png,Sunflower_2_24.png,Sunflower_2_25.png,Sunflower_2_26.png,Sunflower_2_27.png,Sunflower_2_28.png,Sunflower_2_29.png,Sunflower_2_3.png,Sunflower_2_30.png,Sunflower_2_4.png,Sunflower_2_5.png,Sunflower_2_6.png,Sunflower_2_7.png,Sunflower_2_8.png,Sunflower_2_9.png",
"name": "Sunflower_2" "name": "Sunflower_2",
"atlas": "Sunflower_2.json"
}, },
{ {
"keys": "closeBtn.png,game_get.png,game_plant.png,game_water.png,toastBg.png,waitingBg.png,waitingRot.png", "keys": "closeBtn.png,game_get.png,game_plant.png,game_water.png,toastBg.png,waitingBg.png,waitingRot.png",
"name": "common" "name": "common",
"atlas": "common.json"
}, },
{ {
"keys": "record_icon.png,record_item_bg.png", "keys": "record_icon.png,record_item_bg.png",
"name": "exRecordPanel" "name": "exRecordPanel",
"atlas": "exRecordPanel.json"
}, },
{ {
"keys": "exSuccessPanel_bg.png,exSuccessPanel_btn.png", "keys": "exSuccessPanel_bg.png,exSuccessPanel_btn.png",
"name": "exSuccessPanel" "name": "exSuccessPanel",
"atlas": "exSuccessPanel.json"
}, },
{ {
"keys": "exchange_bg.png,exchange_btn_dis.png,exchange_btn_en.png", "keys": "exchange_bg.png,exchange_btn_dis.png,exchange_btn_en.png",
"name": "exchangePanel" "name": "exchangePanel",
"atlas": "exchangePanel.json"
}, },
{ {
"keys": "btn_仓库.png,btn_兑换记录.png,btn_商店.png,btn_规则.png,btn_领水滴.png,game_bg.jpg,广告.png,用户_bg.png,用户_头像.png,用户_水.png,田_初始.png,田_种植.png,田_选择.png,种植框_bg.png,种植框_left.png,种植框_right.png,种植框_time_bg.png,种植框_山核桃.png,种植框_开心果.png,种植框_板栗.png,种植框_瓜子.png,种植框_腰果.png,种植框_花生.png,袋子.png,进度_bg.png,进度_fill.png", "keys": "btn_仓库.png,btn_兑换记录.png,btn_商店.png,btn_规则.png,btn_领水滴.png,game_bg.jpg,广告.png,用户_bg.png,用户_头像.png,用户_水.png,田_初始.png,田_种植.png,田_选择.png,种植框_bg.png,种植框_left.png,种植框_right.png,种植框_time_bg.png,种植框_山核桃.png,种植框_开心果.png,种植框_板栗.png,种植框_瓜子.png,种植框_腰果.png,种植框_花生.png,袋子.png,进度_bg.png,进度_fill.png",
"name": "gameScene" "name": "gameScene",
"atlas": "gameScene.json"
}, },
{ {
"keys": "loading_bg.jpg,loading_per_bg.png,loading_per_fill.png,loading_title.png,loading_绳子.png", "keys": "loading_bg.jpg,loading_per_bg.png,loading_per_fill.png,loading_title.png,loading_绳子.png",
"name": "loadingScene" "name": "loadingScene",
"atlas": "loadingScene.json"
}, },
{ {
"keys": "comm_bg.png", "keys": "comm_bg.png",
"name": "panel" "name": "panel",
}, "atlas": "panel.json"
{
"keys": "Cashew_0.png,Cashew_1.png,Cashew_2.png,Chestnut_0.png,Chestnut_1.png,Chestnut_2.png,Peanut_0.png,Peanut_1.png,Peanut_2.png,Pecan_0.png,Pecan_1.png,Pecan_2.png,Pistachio_0.png,Pistachio_1.png,Pistachio_2.png,Sunflower_0.png,Sunflower_1.png,Sunflower_2.png",
"name": "plants"
}, },
{ {
"keys": "rule_bg.png", "keys": "rule_bg.png",
"name": "rulePanel" "name": "rulePanel",
"atlas": "rulePanel.json"
}, },
{ {
"keys": "shop_icon.png,shop_item_bg.png,shop_mask.png", "keys": "shop_icon.png,shop_item_bg.png,shop_mask.png",
"name": "shopPanel" "name": "shopPanel",
"atlas": "shopPanel.json"
}, },
{ {
"keys": "task_buy_icon.png,task_chat_icon.png,task_done.png,task_friend_icon.png,task_go.png,task_icon.png,task_item_bg.png,task_shop_icon.png,task_sign_icon.png,task_vip_icon.png", "keys": "task_buy_icon.png,task_chat_icon.png,task_done.png,task_friend_icon.png,task_go.png,task_icon.png,task_item_bg.png,task_shop_icon.png,task_sign_icon.png,task_vip_icon.png",
"name": "taskPanel" "name": "taskPanel",
"atlas": "taskPanel.json"
}, },
{ {
"keys": "wareHouse_icon.png,wareHouse_item_bg.png,wareHouse_山核桃.png,wareHouse_开心果.png,wareHouse_板栗.png,wareHouse_瓜子.png,wareHouse_腰果.png,wareHouse_花生.png", "keys": "wareHouse_icon.png,wareHouse_item_bg.png,wareHouse_山核桃.png,wareHouse_开心果.png,wareHouse_板栗.png,wareHouse_瓜子.png,wareHouse_腰果.png,wareHouse_花生.png",
"name": "wareHouse" "name": "wareHouse",
"atlas": "wareHouse.json"
} }
], ],
"path": "./resource/" "path": "./resource/"
......
src/parts/Game/GameLayer.ts
View file @ a0ad980b
import Container = FYGE.Container; import Container = FYGE.Container;
import { Land } from "./Land"; import { Land } from "./Land";
import PlantList from "./PlantList"; import PlantList from "./PlantList";
import { PLANT_STATE, PLANT_TYPE } from "../../const/staticData"; import { PLANT_STATE, PLANT_TYPE, s_PlantData } from "../../const/staticData";
import { Tool } from "../../Tools";
import { UILayer } from "../UI/UILayer";
import { layers } from "../../../module/views/layers";
/** /**
* GameLayer * GameLayer
...@@ -28,8 +31,6 @@ export default class GameLayer extends Container { ...@@ -28,8 +31,6 @@ export default class GameLayer extends Container {
private constructor() { private constructor() {
super(); super();
window['gameLayer'] = this;
this.initLand(); this.initLand();
// 种植列表 // 种植列表
...@@ -56,6 +57,8 @@ export default class GameLayer extends Container { ...@@ -56,6 +57,8 @@ export default class GameLayer extends Container {
]; ];
this.initPlant(initData); this.initPlant(initData);
this.getEffect(PLANT_TYPE.Cashew, 1);
} }
/** /**
...@@ -94,6 +97,13 @@ export default class GameLayer extends Container { ...@@ -94,6 +97,13 @@ export default class GameLayer extends Container {
}); });
} }
public getEffect(type: PLANT_TYPE, id: number) {
const getEffect = this.addChild(Tool.getSprite(`种植框_${s_PlantData[type].name}.png`));
getEffect.position.set(this.landList[id - 1].x + 185, this.landList[id - 1].y + 55);
let x = 375;
let y = layers.stageWidth - layers.stageOffsetY;
}
public initEvent() { public initEvent() {
} }
......
src/parts/Game/Land.ts
View file @ a0ad980b
...@@ -89,6 +89,12 @@ export class Land extends Container { ...@@ -89,6 +89,12 @@ export class Land extends Container {
public addPlant(type: PLANT_TYPE) { public addPlant(type: PLANT_TYPE) {
this.plant.plant(type); this.plant.plant(type);
this.changeState(LAND_STATE.PLANT); this.changeState(LAND_STATE.PLANT);
this.progressBar.setData({
type: type,
timestamp: Date.now(),
fullTime: 3,
});
this.progressBar.show();
} }
/** /**
...@@ -97,6 +103,12 @@ export class Land extends Container { ...@@ -97,6 +103,12 @@ export class Land extends Container {
*/ */
public updatePlant(state: PLANT_STATE) { public updatePlant(state: PLANT_STATE) {
this.plant.updatePlant(state); this.plant.updatePlant(state);
this.progressBar.setData({
type: this.plant.type,
timestamp: Date.now(),
fullTime: 3,
});
this.progressBar.show();
} }
/** /**
...@@ -115,6 +127,7 @@ export class Land extends Container { ...@@ -115,6 +127,7 @@ export class Land extends Container {
timestamp: Date.now(), timestamp: Date.now(),
fullTime: 3, fullTime: 3,
}); });
this.progressBar.show();
} }
/** /**
...@@ -123,6 +136,9 @@ export class Land extends Container { ...@@ -123,6 +136,9 @@ export class Land extends Container {
public clearPlant() { public clearPlant() {
this.plant.clearPlant(); this.plant.clearPlant();
this.changeState(LAND_STATE.DEFAULT); this.changeState(LAND_STATE.DEFAULT);
this.progressBar.setData({
type: PLANT_TYPE.NONE,
});
} }
/** /**
...@@ -163,6 +179,8 @@ export class Land extends Container { ...@@ -163,6 +179,8 @@ export class Land extends Container {
*/ */
public get(e: MouseEvent) { public get(e: MouseEvent) {
e.stopPropagation(); e.stopPropagation();
this.removeOption();
this.clearPlant();
console.log("收获"); console.log("收获");
} }
......
src/parts/Game/ProgressBar.ts
View file @ a0ad980b
...@@ -57,7 +57,11 @@ export default class ProgressBar extends Container { ...@@ -57,7 +57,11 @@ export default class ProgressBar extends Container {
* @param data * @param data
*/ */
public setData(data) { public setData(data) {
if (data.type == PLANT_TYPE.NONE) return; if (data.type == PLANT_TYPE.NONE) {
Tween.removeTweens(this);
this.visible = false;
return;
}
this.nameLabel.text = s_PlantData[data.type].name; this.nameLabel.text = s_PlantData[data.type].name;
this.nameLabel.position.set(80 + (56 - this.nameLabel.textWidth) / 2, 139); this.nameLabel.position.set(80 + (56 - this.nameLabel.textWidth) / 2, 139);
......
src/parts/UI/UILayer.ts
View file @ a0ad980b
...@@ -5,7 +5,6 @@ import { Tool } from "../../Tools"; ...@@ -5,7 +5,6 @@ import { Tool } from "../../Tools";
import { getAdjustBottomHeight, getAdjustTopHeight } from "../../const/myLab"; import { getAdjustBottomHeight, getAdjustTopHeight } from "../../const/myLab";
import MouseEvent = FYGE.MouseEvent; import MouseEvent = FYGE.MouseEvent;
import PanelCtrl from "../../../module/ctrls/panelCtrl"; import PanelCtrl from "../../../module/ctrls/panelCtrl";
import RulePanel from "../../panels/RulePanel";
import TaskPanel from "../../panels/TaskPanel"; import TaskPanel from "../../panels/TaskPanel";
import WareHousePanel from "../../panels/WareHousePanel"; import WareHousePanel from "../../panels/WareHousePanel";
import ShopPanel from "../../panels/ShopPanel"; import ShopPanel from "../../panels/ShopPanel";
......
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