Skip to content

B
babycare_xiaoxiao
Commit 7380de16 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parent bb4d54c9
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 23 deletions
.idea/workspace.xml
View file @ 7380de16
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/ToolsOutPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/ToolsOutPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/UseToolPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/UseToolPanel.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" />
...@@ -106,7 +104,8 @@ ...@@ -106,7 +104,8 @@
<workItem from="1594260676967" duration="30060000" /> <workItem from="1594260676967" duration="30060000" />
<workItem from="1594604662575" duration="27200000" /> <workItem from="1594604662575" duration="27200000" />
<workItem from="1594691193000" duration="14409000" /> <workItem from="1594691193000" duration="14409000" />
<workItem from="1594712553750" duration="2843000" /> <workItem from="1594712553750" duration="3451000" />
<workItem from="1594777357248" duration="509000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -213,7 +212,14 @@ ...@@ -213,7 +212,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1594712833008</updated> <updated>1594712833008</updated>
</task> </task>
<option name="localTasksCounter" value="16" /> <task id="LOCAL-00016" summary="effect">
<created>1594726952711</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1594726952711</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -238,26 +244,26 @@ ...@@ -238,26 +244,26 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" /> <state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="754" y="183" key="CommitChangelistDialog2" timestamp="1594712832775"> <state x="754" y="183" key="CommitChangelistDialog2" timestamp="1594726952439">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594712832775" /> <state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594726952439" />
<state width="882" height="329" key="GridCell.Tab.0.bottom" timestamp="1594713083865"> <state width="882" height="329" key="GridCell.Tab.0.bottom" timestamp="1594777502620">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="882" height="329" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594713083865" /> <state width="882" height="329" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594777502620" />
<state width="882" height="329" key="GridCell.Tab.0.center" timestamp="1594713083863"> <state width="882" height="329" key="GridCell.Tab.0.center" timestamp="1594777502617">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="882" height="329" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594713083863" /> <state width="882" height="329" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594777502617" />
<state width="882" height="329" key="GridCell.Tab.0.left" timestamp="1594713083862"> <state width="882" height="329" key="GridCell.Tab.0.left" timestamp="1594777502616">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="882" height="329" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594713083862" /> <state width="882" height="329" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594777502616" />
<state width="882" height="329" key="GridCell.Tab.0.right" timestamp="1594713083864"> <state width="882" height="329" key="GridCell.Tab.0.right" timestamp="1594777502619">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="882" height="329" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594713083864" /> <state width="882" height="329" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594777502619" />
<state x="210" y="320" key="RollbackChangesDialog" timestamp="1594173186663"> <state x="210" y="320" key="RollbackChangesDialog" timestamp="1594173186663">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -266,10 +272,10 @@ ...@@ -266,10 +272,10 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="31" y="250" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594195630991" /> <state x="31" y="250" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594195630991" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1594712834821"> <state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1594726954085">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1594712834821" /> <state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1594726954085" />
<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" />
</state> </state>
......
mock/miniTb/babycare.getIndex.json
View file @ 7380de16
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"message": "OK", "message": "OK",
"data": { "data": {
"power": 100, "power": 100,
"currentLevel": 1, "currentLevel": 120,
"tools": { "tools": {
"STEPS": 1, "STEPS": 1,
"BOOMS": 2, "BOOMS": 2,
......
src/scene/map/MapScene.ts
View file @ 7380de16
...@@ -142,10 +142,6 @@ export class MapScene extends Scene { ...@@ -142,10 +142,6 @@ export class MapScene extends Scene {
this.scrollPage.scrollTo(checkY, time); this.scrollPage.scrollTo(checkY, time);
} }
public update() {
super.update();
}
public start(data?: any) { public start(data?: any) {
super.start(data); super.start(data);
} }
......
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