Skip to content

B
babycare_xiaoxiao
Commit 7975580d authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

主页

parent 6cbefe4f
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 151 deletions
.idea/workspace.xml
View file @ 7975580d
...@@ -2,135 +2,13 @@ ...@@ -2,135 +2,13 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/browserGoods_btn_dis.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/browserGoods_btn_en.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/browserGoods_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/follow_btn_dis.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/follow_btn_en.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/follow_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/invites_btn_dis.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/invites_btn_en.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/invites_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/member_btn_dis.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/member_btn_en.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/member_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/orderGoods_btn_dis.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/orderGoods_btn_en.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/orderGoods_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/task_get_btn.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/TaskPanel/task_item_bg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getTaskList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getTaskList.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/appointCountBg.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/loopMsgBg.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_bg1.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg1.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_bg2.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg2.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_bg3.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg3.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_disable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_disable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_disable_prize.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_enable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_enable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_enable_cur.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_enable_cur.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_creditsBg.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_energyBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_energyBg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_prizeBox.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_prizeBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_prizeBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_ruleBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_ruleBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_star_disable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_disable.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/map/map_star_disable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_disable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_star_enable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_enable.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/map/map_star_enable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_enable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_taskBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_taskBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_推车.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_狐狸气球.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/remindIcon.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/water1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/water2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_16.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCheckPrizeEffect/prize_check_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_16.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_17.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_18.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_19.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_20.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_21.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_22.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_23.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_24.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_25.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_26.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_27.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_28.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_29.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_30.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapCrabEffect/map_crab_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapOwlEffect/map_owl_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_0.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/mapWhaleEffect/map_whale_9.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/panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/TaskPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapBottom.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapBottom.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapMid.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapMid.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapPart.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapPart.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/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapTop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapTop.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scene/map/MapTop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapTop.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.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" />
...@@ -274,14 +152,7 @@ ...@@ -274,14 +152,7 @@
<workItem from="1596609620649" duration="537000" /> <workItem from="1596609620649" duration="537000" />
<workItem from="1600912046696" duration="16271000" /> <workItem from="1600912046696" duration="16271000" />
<workItem from="1600998191749" duration="23862000" /> <workItem from="1600998191749" duration="23862000" />
<workItem from="1601170975973" duration="17166000" /> <workItem from="1601170975973" duration="19151000" />
</task>
<task id="LOCAL-00004" summary="111">
<created>1594287699522</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1594287699523</updated>
</task> </task>
<task id="LOCAL-00005" summary="111"> <task id="LOCAL-00005" summary="111">
<created>1594303577256</created> <created>1594303577256</created>
...@@ -619,7 +490,14 @@ ...@@ -619,7 +490,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1601174516740</updated> <updated>1601174516740</updated>
</task> </task>
<option name="localTasksCounter" value="53" /> <task id="LOCAL-00053" summary="主页">
<created>1601195840611</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1601195840611</updated>
</task>
<option name="localTasksCounter" value="54" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -646,7 +524,8 @@ ...@@ -646,7 +524,8 @@
<MESSAGE value="toast" /> <MESSAGE value="toast" />
<MESSAGE value="换了点皮" /> <MESSAGE value="换了点皮" />
<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="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530"> <state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
...@@ -661,10 +540,10 @@ ...@@ -661,10 +540,10 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" /> <state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1601174516560"> <state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1601195839815">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601174516560" /> <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601195839815" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" /> <state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169"> <state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
...@@ -720,10 +599,10 @@ ...@@ -720,10 +599,10 @@
</state> </state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" /> <state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" /> <state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601029722015"> <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601195842034">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601029722015" /> <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601195842034" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" /> <state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397"> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
......
mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
View file @ 7975580d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"message": "nisi amet sunt Lorem", "message": "nisi amet sunt Lorem",
"data": { "data": {
"rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试", "rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试",
"currentLevel": 120, "currentLevel": 7,
"power": 101, "power": 101,
"tools": { "tools": {
"steps": 100, "steps": 100,
......
resource/map/map_star_disable.png
View replaced file @ 6cbefe4f View file @ 7975580d
resource/map/map_star_disable.png

2.35 KB | W: | H:

resource/map/map_star_disable.png

1.07 KB | W: | H:

resource/map/map_star_disable.png
resource/map/map_star_disable.png
resource/map/map_star_disable.png
resource/map/map_star_disable.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_star_enable.png
View replaced file @ 6cbefe4f View file @ 7975580d
resource/map/map_star_enable.png

2.66 KB | W: | H:

resource/map/map_star_enable.png

1.48 KB | W: | H:

resource/map/map_star_enable.png
resource/map/map_star_enable.png
resource/map/map_star_enable.png
resource/map/map_star_enable.png
  • 2-up
  • Swipe
  • Onion skin
src/scene/map/CheckBtn.ts
View file @ 7975580d
...@@ -142,11 +142,11 @@ export default class CheckBtn extends Container { ...@@ -142,11 +142,11 @@ export default class CheckBtn extends Container {
// 三个星星 // 三个星星
const star1 = this.addChild(new CheckStar()); const star1 = this.addChild(new CheckStar());
star1.position.set(15, -5.5); star1.position.set(16.5, 83.5);
const star2 = this.addChild(new CheckStar()); const star2 = this.addChild(new CheckStar());
star2.position.set(40, -12.5); star2.position.set(42.5, 90.5);
const star3 = this.addChild(new CheckStar()); const star3 = this.addChild(new CheckStar());
star3.position.set(65, -5.5); star3.position.set(67.5, 83.5);
this.star = [star1, star2, star3]; this.star = [star1, star2, star3];
// 关卡文字 // 关卡文字
......
src/scene/map/MapScene.ts
View file @ 7975580d
...@@ -29,7 +29,7 @@ export class MapScene extends Scene { ...@@ -29,7 +29,7 @@ export class MapScene extends Scene {
private uiLayer: MapUI = null; private uiLayer: MapUI = null;
// private mapAvatar: MapAvatar = null; private mapAvatar: MapAvatar = null;
public get groupNames(): string[] { public get groupNames(): string[] {
return [ return [
...@@ -91,7 +91,7 @@ export class MapScene extends Scene { ...@@ -91,7 +91,7 @@ export class MapScene extends Scene {
guide_check.enabled = true; guide_check.enabled = true;
guide_check.type = CHECK_TYPE.CUR; guide_check.type = CHECK_TYPE.CUR;
guide_check.position.set(MapScene.checkArr[1].x, MapScene.checkArr[1].y); guide_check.position.set(MapScene.checkArr[1].x, MapScene.checkArr[1].y);
// guide_check.addChild(new MapAvatar()); guide_check.addChild(new MapAvatar());
const guide_hand = guide.addChild(Tools.getSprite('guide_hand.png')); const guide_hand = guide.addChild(Tools.getSprite('guide_hand.png'));
guide_hand.position.set(guide_check.x + 90, guide_check.y + 40); guide_hand.position.set(guide_check.x + 90, guide_check.y + 40);
...@@ -142,9 +142,9 @@ export class MapScene extends Scene { ...@@ -142,9 +142,9 @@ export class MapScene extends Scene {
if (currentLevel < 121 && currentLevel > 0) { if (currentLevel < 121 && currentLevel > 0) {
MapScene.checkArr[currentLevel].type = CHECK_TYPE.CUR; MapScene.checkArr[currentLevel].type = CHECK_TYPE.CUR;
MapScene.checkArr[currentLevel].enabled = true; MapScene.checkArr[currentLevel].enabled = true;
// !this.mapAvatar && (this.mapAvatar = this.addChild(new MapAvatar())); !this.mapAvatar && (this.mapAvatar = this.addChild(new MapAvatar()));
// this.mapAvatar.parent && this.mapAvatar.parent.removeChild(this.mapAvatar); this.mapAvatar.parent && this.mapAvatar.parent.removeChild(this.mapAvatar);
// MapScene.checkArr[currentLevel].addChild(this.mapAvatar); MapScene.checkArr[currentLevel].addChild(this.mapAvatar);
} }
// 未通关的 // 未通关的
......
src/scene/map/MapTop.ts
View file @ 7975580d
...@@ -9,12 +9,12 @@ export default class MapTop extends MapPart { ...@@ -9,12 +9,12 @@ export default class MapTop extends MapPart {
public static totalCount = 6; public static totalCount = 6;
public btnPos = [ public btnPos = [
[379, 1133], [374, 1114],
[260, 1083], [255, 1066],
[201, 974], [196, 960],
[317, 919], [312, 905],
[397, 827], [392, 814],
[497, 760], [492, 747],
]; ];
constructor(data) { constructor(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