Skip to content

B
babycare_xiaoxiao
Commit 6cbefe4f authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

主页

parent e47216cc
Show whitespace changes
Inline Side-by-side
Showing with 356 additions and 227 deletions
.idea/workspace.xml
View file @ 6cbefe4f
...@@ -2,8 +2,135 @@ ...@@ -2,8 +2,135 @@
<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.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_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/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/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/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" />
...@@ -43,7 +170,7 @@ ...@@ -43,7 +170,7 @@
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/resource/TaskPanel" />
<property name="node.js.detected.package.tslint" value="true" /> <property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.tslint" value="project" /> <property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.tslint" value="(autodetect)" /> <property name="node.js.selected.package.tslint" value="(autodetect)" />
...@@ -56,22 +183,22 @@ ...@@ -56,22 +183,22 @@
<property name="vue.rearranger.settings.migration" value="true" /> <property name="vue.rearranger.settings.migration" value="true" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" /> <recent name="$PROJECT_DIR$" />
<recent name="$PROJECT_DIR$/resource/PrizePanel" />
<recent name="$PROJECT_DIR$/resource/common" /> <recent name="$PROJECT_DIR$/resource/common" />
<recent name="$PROJECT_DIR$/resource/map" />
<recent name="$PROJECT_DIR$/resource/SuccessPanel" /> <recent name="$PROJECT_DIR$/resource/SuccessPanel" />
<recent name="$PROJECT_DIR$/resource/starLight" /> <recent name="$PROJECT_DIR$/resource/SuccessPrizePanel" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resource/TaskPanel" />
<recent name="$PROJECT_DIR$" /> <recent name="$PROJECT_DIR$" />
<recent name="$PROJECT_DIR$/resource/PrizePanel" />
<recent name="$PROJECT_DIR$/resource/common" /> <recent name="$PROJECT_DIR$/resource/common" />
<recent name="$PROJECT_DIR$/resource/map" />
<recent name="$PROJECT_DIR$/resource/SuccessPanel" /> <recent name="$PROJECT_DIR$/resource/SuccessPanel" />
<recent name="$PROJECT_DIR$/resource/SuccessPrizePanel" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.dev"> <component name="RunManager" selected="npm.flushRes">
<configuration name="aaaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/src/aaaa.html" useBuiltInWebServerPort="true"> <configuration name="aaaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/src/aaaa.html" useBuiltInWebServerPort="true">
<method v="2" /> <method v="2" />
</configuration> </configuration>
...@@ -98,8 +225,8 @@ ...@@ -98,8 +225,8 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="JavaScript Debug.aaaa.html" /> <item itemvalue="JavaScript Debug.aaaa.html" />
</list> </list>
</recent_temporary> </recent_temporary>
...@@ -147,14 +274,7 @@ ...@@ -147,14 +274,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="2745000" /> <workItem from="1601170975973" duration="17166000" />
</task>
<task id="LOCAL-00003" summary="111">
<created>1594279815824</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1594279815824</updated>
</task> </task>
<task id="LOCAL-00004" summary="111"> <task id="LOCAL-00004" summary="111">
<created>1594287699522</created> <created>1594287699522</created>
...@@ -492,7 +612,14 @@ ...@@ -492,7 +612,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1601029720702</updated> <updated>1601029720702</updated>
</task> </task>
<option name="localTasksCounter" value="52" /> <task id="LOCAL-00052" summary="换了点皮,换了下接口">
<created>1601174516740</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1601174516740</updated>
</task>
<option name="localTasksCounter" value="53" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -534,49 +661,49 @@ ...@@ -534,49 +661,49 @@
<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="1601029720525"> <state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1601174516560">
<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="1601029720525" /> <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601174516560" />
<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" />
</state> </state>
<state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" /> <state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" />
<state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601171171054"> <state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601193311330">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="869" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" /> <state width="869" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" />
<state width="885" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1600962876448" /> <state width="885" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1600962876448" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" /> <state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601171171054" /> <state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601193311330" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" /> <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601171171053"> <state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601193311329">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="869" height="321" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" /> <state width="869" height="321" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" />
<state width="885" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" /> <state width="885" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" /> <state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601171171053" /> <state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601193311329" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" /> <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601171171053"> <state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601193311329">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="869" height="321" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" /> <state width="869" height="321" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" />
<state width="885" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" /> <state width="885" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" /> <state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601171171053" /> <state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601193311329" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" /> <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" /> <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601171171054"> <state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601193311329">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="869" height="321" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" /> <state width="869" height="321" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" />
<state width="885" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" /> <state width="885" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" /> <state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601171171054" /> <state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601193311329" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" /> <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326"> <state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
...@@ -625,11 +752,23 @@ ...@@ -625,11 +752,23 @@
</state> </state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" /> <state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" /> <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601171725159"> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601193948233">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" /> <state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601171725159" /> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601193948233" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
</component> </component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="javascript">
<url>file://$PROJECT_DIR$/src/scene/map/CheckBtn.ts</url>
<line>55</line>
<properties lambdaOrdinal="-1" />
<option name="timeStamp" value="5" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project> </project>
\ No newline at end of file
mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
View file @ 6cbefe4f
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"data": { "data": {
"rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试", "rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试",
"currentLevel": 120, "currentLevel": 120,
"power": 0, "power": 101,
"tools": { "tools": {
"steps": 100, "steps": 100,
"booms": 100, "booms": 100,
......
mock/miniTb/popmartXXL2c.getTaskList.json
View file @ 6cbefe4f
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"data": { "data": {
"taskList": [ "taskList": [
{ {
"taskType": "browseGoods", "taskType": "browserGoods",
"beMemberUrl": "https://www.baidu.com", "beMemberUrl": "https://www.baidu.com",
"rewards": 10, "rewards": 10,
"todayCompleteTimes": 2, "todayCompleteTimes": 2,
......
resource/map/map_bg1.jpg
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_bg1.jpg

598 KB | W: | H:

resource/map/map_bg1.jpg

189 KB | W: | H:

resource/map/map_bg1.jpg
resource/map/map_bg1.jpg
resource/map/map_bg1.jpg
resource/map/map_bg1.jpg
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_bg2.jpg
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_bg2.jpg

747 KB | W: | H:

resource/map/map_bg2.jpg

697 KB | W: | H:

resource/map/map_bg2.jpg
resource/map/map_bg2.jpg
resource/map/map_bg2.jpg
resource/map/map_bg2.jpg
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_bg3.jpg
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_bg3.jpg

191 KB | W: | H:

resource/map/map_bg3.jpg

392 KB | W: | H:

resource/map/map_bg3.jpg
resource/map/map_bg3.jpg
resource/map/map_bg3.jpg
resource/map/map_bg3.jpg
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_check_disable.png
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_check_disable.png

14.1 KB | W: | H:

resource/map/map_check_disable.png

14.1 KB | W: | H:

resource/map/map_check_disable.png
resource/map/map_check_disable.png
resource/map/map_check_disable.png
resource/map/map_check_disable.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_check_enable.png
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_check_enable.png

8.37 KB | W: | H:

resource/map/map_check_enable.png

9.12 KB | W: | H:

resource/map/map_check_enable.png
resource/map/map_check_enable.png
resource/map/map_check_enable.png
resource/map/map_check_enable.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_check_enable_cur.png
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_check_enable_cur.png

11.3 KB | W: | H:

resource/map/map_check_enable_cur.png

11.5 KB | W: | H:

resource/map/map_check_enable_cur.png
resource/map/map_check_enable_cur.png
resource/map/map_check_enable_cur.png
resource/map/map_check_enable_cur.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_energyBg.png
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_energyBg.png

11.8 KB | W: | H:

resource/map/map_energyBg.png

4.21 KB | W: | H:

resource/map/map_energyBg.png
resource/map/map_energyBg.png
resource/map/map_energyBg.png
resource/map/map_energyBg.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_prizeBtn.png
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_prizeBtn.png

9.03 KB | W: | H:

resource/map/map_prizeBtn.png

7 KB | W: | H:

resource/map/map_prizeBtn.png
resource/map/map_prizeBtn.png
resource/map/map_prizeBtn.png
resource/map/map_prizeBtn.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_ruleBtn.png
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_ruleBtn.png

9.01 KB | W: | H:

resource/map/map_ruleBtn.png

7.09 KB | W: | H:

resource/map/map_ruleBtn.png
resource/map/map_ruleBtn.png
resource/map/map_ruleBtn.png
resource/map/map_ruleBtn.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_star_disable.png
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_star_disable.png

1.07 KB | W: | H:

resource/map/map_star_disable.png

2.35 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 @ e47216cc View file @ 6cbefe4f
resource/map/map_star_enable.png

1.48 KB | W: | H:

resource/map/map_star_enable.png

2.66 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
resource/map/map_taskBtn.png
View replaced file @ e47216cc View file @ 6cbefe4f
resource/map/map_taskBtn.png

20.2 KB | W: | H:

resource/map/map_taskBtn.png

20.8 KB | W: | H:

resource/map/map_taskBtn.png
resource/map/map_taskBtn.png
resource/map/map_taskBtn.png
resource/map/map_taskBtn.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 6cbefe4f
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"name": "SuccessPanel" "name": "SuccessPanel"
}, },
{ {
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png", "keys": "browserGoods_btn_dis.png,browserGoods_btn_en.png,browserGoods_icon.png,follow_btn_dis.png,follow_btn_en.png,follow_icon.png,invites_btn_dis.png,invites_btn_en.png,invites_icon.png,member_btn_dis.png,member_btn_en.png,member_icon.png,orderGoods_btn_dis.png,orderGoods_btn_en.png,orderGoods_icon.png,task_get_btn.png,task_item_bg.png,任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel" "name": "TaskPanel"
}, },
{ {
...@@ -65,25 +65,9 @@ ...@@ -65,25 +65,9 @@
"name": "lotteryScene" "name": "lotteryScene"
}, },
{ {
"keys": "appointCountBg.png,cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,loopMsgBg.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png,remindIcon.png,water1.png,water2.png", "keys": "cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,lightImg.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_enable.png,map_check_enable_cur.png,map_energyAdd.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_taskBtn_tip.png",
"name": "map" "name": "map"
}, },
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{ {
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
......
src/ResJson.ts
View file @ 6cbefe4f
...@@ -33,7 +33,7 @@ export const ResJson = { ...@@ -33,7 +33,7 @@ export const ResJson = {
"name": "SuccessPanel" "name": "SuccessPanel"
}, },
{ {
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png", "keys": "browserGoods_btn_dis.png,browserGoods_btn_en.png,browserGoods_icon.png,follow_btn_dis.png,follow_btn_en.png,follow_icon.png,invites_btn_dis.png,invites_btn_en.png,invites_icon.png,member_btn_dis.png,member_btn_en.png,member_icon.png,orderGoods_btn_dis.png,orderGoods_btn_en.png,orderGoods_icon.png,task_get_btn.png,task_item_bg.png,任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel" "name": "TaskPanel"
}, },
{ {
...@@ -65,25 +65,9 @@ export const ResJson = { ...@@ -65,25 +65,9 @@ export const ResJson = {
"name": "lotteryScene" "name": "lotteryScene"
}, },
{ {
"keys": "appointCountBg.png,cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,loopMsgBg.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png,remindIcon.png,water1.png,water2.png", "keys": "cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,lightImg.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_enable.png,map_check_enable_cur.png,map_energyAdd.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_taskBtn_tip.png",
"name": "map" "name": "map"
}, },
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{ {
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,prop_count_bg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
......
src/panels/TaskPanel.ts
View file @ 6cbefe4f
...@@ -4,19 +4,24 @@ import { sendTbNet, TbNetName } from "../TaoBaoNet"; ...@@ -4,19 +4,24 @@ import { sendTbNet, TbNetName } from "../TaoBaoNet";
import Tween = FYGE.Tween; import Tween = FYGE.Tween;
import Ease = FYGE.Ease; import Ease = FYGE.Ease;
import Button = FYGE.Button; import Button = FYGE.Button;
import MouseEvent = FYGE.MouseEvent;
import { Tools } from "../Tools";
import { GDispatcher } from "../Main"; import { GDispatcher } from "../Main";
import { G_EVENT } from "../common/G_EVENT"; import { G_EVENT } from "../common/G_EVENT";
import { showWaiting, hideWaiting } from "../../module/ctrls";
import Container = FYGE.Container;
import { Item } from "../../module/views/Item";
import { Tools } from "../Tools";
import ScrollList = FYGE.ScrollList;
import Sprite = FYGE.Sprite;
import TextField = FYGE.TextField;
import { RES } from "../../module/RES"; import { RES } from "../../module/RES";
import { showWaiting, hideWaiting, showToast, getCurrentScene } from "../../module/ctrls";
//任务类型(member/invites/browseGoods/follow) // 任务类型（invites 、member、follow、browserGoods、orderGoods）
export enum TaskType { export enum TaskType {
member = "member", member = "member",
follow = "follow",
invites = "invites", invites = "invites",
browseGoods = "browseGoods", orderGoods = "orderGoods",
follow = "follow" browserGoods = "browserGoods",
} }
interface TaskData { interface TaskData {
...@@ -46,6 +51,33 @@ interface TaskData { ...@@ -46,6 +51,33 @@ interface TaskData {
waitReceive: number waitReceive: number
} }
const taskItemData = {
[TaskType.member]: {
key: TaskType.member,
title: '加入会员',
desc: '加入会员得${rewards}体力'
},
[TaskType.follow]: {
key: TaskType.follow,
title: '关注店铺',
desc: '关注店铺得${rewards}体力'
},
[TaskType.invites]: {
key: TaskType.invites,
title: '邀请好友',
desc: '每邀请一个好友，均可以获得${rewards}体力'
},
[TaskType.orderGoods]: {
key: TaskType.orderGoods,
title: '完成下单',
desc: '按成下单即可获得${rewards}体力'
},
[TaskType.browserGoods]: {
key: TaskType.browserGoods,
title: '每日浏览商品(${done}/${total})',
desc: '浏览指定商品即可获得${rewards}体力'
},
}
export class TaskPanel extends Panel { export class TaskPanel extends Panel {
get groupNames() { get groupNames() {
...@@ -56,6 +88,8 @@ export class TaskPanel extends Panel { ...@@ -56,6 +88,8 @@ export class TaskPanel extends Panel {
return "TaskPanel" return "TaskPanel"
} }
private scroll: ScrollList;
public showAni() { public showAni() {
if (this.isShowing) return; if (this.isShowing) return;
this.isShowing = true; this.isShowing = true;
...@@ -70,7 +104,11 @@ export class TaskPanel extends Panel { ...@@ -70,7 +104,11 @@ export class TaskPanel extends Panel {
closeBtn: Button; closeBtn: Button;
initUi() { initUi() {
this.scroll = this.addChild(new ScrollList(
TaskItem, 700, 180,
700, 900
));
this.scroll.position.set(25, 670);
} }
start(data) { start(data) {
...@@ -85,6 +123,9 @@ export class TaskPanel extends Panel { ...@@ -85,6 +123,9 @@ export class TaskPanel extends Panel {
hideWaiting(); hideWaiting();
if (!success) return; if (!success) return;
console.log(res); console.log(res);
this.scroll.updateData(res.data.taskList, true);
} }
); );
} }
...@@ -99,3 +140,44 @@ export class TaskPanel extends Panel { ...@@ -99,3 +140,44 @@ export class TaskPanel extends Panel {
GDispatcher.removeEventListener(G_EVENT.UPDATE_TASK, this.updateTask, this); GDispatcher.removeEventListener(G_EVENT.UPDATE_TASK, this.updateTask, this);
} }
} }
class TaskItem extends Item {
private icon: Sprite;
private title: TextField;
private desc: TextField;
constructor() {
super();
}
public initUi(data?) {
this.addChild(Tools.getSprite('task_item_bg.png'));
this.icon = this.addChild(new Sprite());
this.icon.position.set(25, 30);
this.title = this.addChild(Tools.getText(
'关注店铺', 30, '#df5942'
));
this.title.bold = true;
this.title.position.set(146, 46);
this.desc = this.addChild(Tools.getText(
'加入会员得x体力', 24, '#666666'
));
this.desc.bold = true;
this.desc.position.set(145, 92);
}
public initData(id: number, data: any) {
if (id < 0 || !data) return;
this.icon.texture = RES.getRes(`${data.taskType}_icon.png`);
this.title.text = taskItemData[data.taskType].title
.replace('${done}', data.todayCompleteTimes)
.replace('${total}', data.totalTimes);
this.desc.text = taskItemData[data.taskType].desc
.replace('${rewards}', data.rewards);
}
}
src/scene/map/CheckBtn.ts
View file @ 6cbefe4f
...@@ -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(16.5, 83); star1.position.set(15, -5.5);
const star2 = this.addChild(new CheckStar()); const star2 = this.addChild(new CheckStar());
star2.position.set(42.5, 90); star2.position.set(40, -12.5);
const star3 = this.addChild(new CheckStar()); const star3 = this.addChild(new CheckStar());
star3.position.set(67.5, 83); star3.position.set(65, -5.5);
this.star = [star1, star2, star3]; this.star = [star1, star2, star3];
// 关卡文字 // 关卡文字
...@@ -157,7 +157,7 @@ export default class CheckBtn extends Container { ...@@ -157,7 +157,7 @@ export default class CheckBtn extends Container {
TEXT_ALIGN.CENTER, 90, 8, 33 TEXT_ALIGN.CENTER, 90, 8, 33
)); ));
this.checkLabel.stroke = 2; this.checkLabel.stroke = 2;
this.checkLabel.strokeColor = '#316ec6'; this.checkLabel.strokeColor = '#c64f00';
// 当前关卡动画 // 当前关卡动画
this.checkCurEffect = this.addChild(new CheckCurEffect()); this.checkCurEffect = this.addChild(new CheckCurEffect());
...@@ -172,7 +172,7 @@ export default class CheckBtn extends Container { ...@@ -172,7 +172,7 @@ export default class CheckBtn extends Container {
public clickStart() { public clickStart() {
console.log(`关卡:${this.checkNum}`); console.log(`关卡:${this.checkNum}`);
showPanel(StartPanelPrize, this.checkData) showPanel(StartPanelPrize, this.checkData);
} }
} }
......
src/scene/map/MapBottom.ts
View file @ 6cbefe4f
import MapPart from "./MapPart"; import MapPart from "./MapPart";
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import Point = FYGE.Point; import Point = FYGE.Point;
import FrameAni = FYGE.FrameAni;
import Texture = FYGE.Texture;
export default class MapBottom extends MapPart { export default class MapBottom extends MapPart {
public static HEIGHT = 1092; public static HEIGHT = 623;
protected totalCount = 8; public static totalCount = 6;
private crabAni: FrameAni = null;
protected btnPos = [ protected btnPos = [
[370, 930], [358, 420],
[437, 761], [241, 367],
[313, 669], [256, 262],
[408, 522], [337, 172],
[455, 375], [307, 68],
[364, 216], [207, 4],
[326, 62],
[491, 3],
]; ];
constructor(data) { constructor(data) {
...@@ -29,19 +23,6 @@ export default class MapBottom extends MapPart { ...@@ -29,19 +23,6 @@ export default class MapBottom extends MapPart {
this.bg.texture = RES.getRes('map_bg1.jpg'); this.bg.texture = RES.getRes('map_bg1.jpg');
this.initIcon(); this.initIcon();
this.initEffect();
}
private initEffect() {
// 螃蟹
const crabTextures: Texture[] = new Array(31);
for (let i = 0; i < 16; i++) {
crabTextures[31 - i] = crabTextures[i] = RES.getRes(`map_crab_${i}.png`);
}
this.crabAni = this.addChild(new FrameAni(crabTextures));
this.crabAni.position.set(220, 50);
this.crabAni.play(-1);
} }
public update() { public update() {
......
src/scene/map/MapMid.ts
View file @ 6cbefe4f
import MapPart from "./MapPart"; import MapPart from "./MapPart";
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import Point = FYGE.Point; import Point = FYGE.Point;
import Sprite = FYGE.Sprite;
import { Tools } from "../../Tools";
import Tween = FYGE.Tween;
import Texture = FYGE.Texture;
import FrameAni = FYGE.FrameAni;
export default class MapMid extends MapPart { export default class MapMid extends MapPart {
public static HEIGHT = 1635; public static HEIGHT = 2222;
protected totalCount = 10; public static totalCount = 18;
private balloon: Sprite = null;
private water: Sprite = null;
private water1: Texture = null;
private water2: Texture = null;
private whaleAni: FrameAni = null;
private owlAni: FrameAni = null;
protected btnPos = [ protected btnPos = [
[267, 1519], [120, 2085],
[211, 1325], [56, 1969],
[338, 1154], [223, 1872],
[237, 911], [316, 1741],
[145, 755], [293, 1590],
[225, 591], [289, 1423],
[349, 480], [395, 1322],
[214, 342], [437, 1193],
[193, 188], [367, 1056],
[392, 8], [307, 883],
[218, 773],
[340, 696],
[429, 602],
[412, 478],
[306, 395],
[238, 277],
[296, 159],
[283, 33],
]; ];
constructor(data) { constructor(data) {
...@@ -39,50 +35,9 @@ export default class MapMid extends MapPart { ...@@ -39,50 +35,9 @@ export default class MapMid extends MapPart {
this.bg.texture = RES.getRes('map_bg2.jpg'); this.bg.texture = RES.getRes('map_bg2.jpg');
// 流水
this.water1 = RES.getRes('water1.png');
this.water2 = RES.getRes('water2.png');
this.initIcon(); this.initIcon();
this.initEffect();
}
private initEffect() {
// 热气球
this.balloon = this.addChild(Tools.getSprite('map_狐狸气球.png', -216, 750));
Tween.get(this.balloon, {loop: true})
.set({x: -216, y: 1170})
.to({x: 750 + 100, y: 765}, 20006);
this.balloon.mouseEnable = this.balloon.mouseChildren = false;
// 流水
this.water = this.addChild(new Sprite(this.water1));
this.water.position.set(544, 687);
// 鲸鱼
const whaleTextures: Texture[] = new Array(25);
for (let i = 0; i < 13; i++) {
whaleTextures[25 - i] = whaleTextures[i] = RES.getRes(`map_whale_${i}.png`);
}
this.whaleAni = this.addChild(new FrameAni(whaleTextures));
this.whaleAni.position.set(645, 575);
this.whaleAni.play(-1);
// 猫头鹰
const owlTextures: Texture[] = new Array(31);
for (let i = 0; i < 16; i++) {
owlTextures[31 - i] = owlTextures[i] = RES.getRes(`map_owl_${i}.png`);
} }
this.owlAni = this.addChild(new FrameAni(owlTextures));
this.owlAni.position.set(538, 1548);
this.owlAni.play(-1);
}
private waterIndex1: boolean = true;
private waterIndex: number = 0;
public update() { public update() {
super.update(); super.update();
let up = this.localToGlobal(new Point(0, -10), new Point()); let up = this.localToGlobal(new Point(0, -10), new Point());
...@@ -93,14 +48,6 @@ export default class MapMid extends MapPart { ...@@ -93,14 +48,6 @@ export default class MapMid extends MapPart {
|| this.stage.viewRect.isPointIn(bp) || this.stage.viewRect.isPointIn(bp)
|| this.stage.viewRect.isPointIn(ucp) || this.stage.viewRect.isPointIn(ucp)
|| this.stage.viewRect.isPointIn(bcp); || this.stage.viewRect.isPointIn(bcp);
// 流水动画
if (this.waterIndex++ > 6) {
this.waterIndex1 = !this.waterIndex1;
this.water.texture = this.waterIndex1 ? this.water1 : this.water2;
this.waterIndex = 0;
}
} }
......
src/scene/map/MapPart.ts
View file @ 6cbefe4f
...@@ -7,7 +7,7 @@ export default class MapPart extends Container { ...@@ -7,7 +7,7 @@ export default class MapPart extends Container {
protected data: any = null; protected data: any = null;
protected totalCount: number = 0; public static totalCount: number = 0;
protected btnPos: number[][] = []; protected btnPos: number[][] = [];
...@@ -25,7 +25,7 @@ export default class MapPart extends Container { ...@@ -25,7 +25,7 @@ export default class MapPart extends Container {
const value = this.data[i]; const value = this.data[i];
const nBtn = this.addChild(new CheckBtn(value)); const nBtn = this.addChild(new CheckBtn(value));
nBtn.position.set(this.btnPos[i][0], this.btnPos[i][1]); nBtn.position.set(this.btnPos[i][0] + 5, this.btnPos[i][1] - 10);
MapScene.checkArr[value.check] = nBtn; MapScene.checkArr[value.check] = nBtn;
} }
// this.data.forEach((value, index) => { // this.data.forEach((value, index) => {
......
src/scene/map/MapScene.ts
View file @ 6cbefe4f
...@@ -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 [
...@@ -82,15 +82,16 @@ export class MapScene extends Scene { ...@@ -82,15 +82,16 @@ export class MapScene extends Scene {
// Tools.gameData.isFristLogin = false; // Tools.gameData.isFristLogin = false;
const guide = this.addChild(new Container()); const guide = this.addChild(new Container());
guide.y = -layers.stageOffsetY + 3;
const g = guide.addChild(new Graphics()); const g = guide.addChild(new Graphics());
g.beginFill(0, 0.6); g.beginFill(0, 0.6);
g.drawRect(0, 0, layers.stageWidth, layers.stageHeight); g.drawRect(0, 0, 750, 1624);
g.endFill(); g.endFill();
const guide_check = guide.addChild(new CheckBtn({ check: 1 })); const guide_check = guide.addChild(new CheckBtn({check: 1}));
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, layers.stageHeight - 162); 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);
...@@ -113,15 +114,15 @@ export class MapScene extends Scene { ...@@ -113,15 +114,15 @@ export class MapScene extends Scene {
guide.alpha = 0; guide.alpha = 0;
Tween.get(guide) Tween.get(guide)
.to({ alpha: 1 }, 600, Ease.quadInOut); .to({alpha: 1}, 600, Ease.quadInOut);
Tween.get(guide_fox) Tween.get(guide_fox)
.wait(300) .wait(300)
.to({ y: guide_check.y - 345, alpha: 1 }, 300, Ease.quadInOut) .to({y: guide_check.y - 345, alpha: 1}, 300, Ease.quadInOut)
.wait(100) .wait(100)
.call(() => { .call(() => {
Tween.get(guide_tip) Tween.get(guide_tip)
.to({ scaleX: 1, scaleY: 1 }, 300, Ease.quadInOut); .to({scaleX: 1, scaleY: 1}, 300, Ease.quadInOut);
}); });
} }
...@@ -141,9 +142,9 @@ export class MapScene extends Scene { ...@@ -141,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);
} }
// 未通关的 // 未通关的
...@@ -169,21 +170,19 @@ export class MapScene extends Scene { ...@@ -169,21 +170,19 @@ export class MapScene extends Scene {
const arr = new Array(120); const arr = new Array(120);
for (let i = 0; i < 120; i++) { for (let i = 0; i < 120; i++) {
arr[i] = { arr[i] = {check: i + 1};
check: i + 1
};
} }
arr.reverse();
const topData = arr.splice(120 - MapTop.totalCount, MapTop.totalCount); // 得到顶部的数据
const topData = arr.splice(118, 2); // 得到顶部的数据 const bottomData = arr.splice(0, MapBottom.totalCount); // 得到尾部的数据
const bottomData = arr.splice(0, 8); // 得到尾部的数据
const midData = arr; // 剩下的是中间的数据 const midData = arr; // 剩下的是中间的数据
let maxHeight = MapTop.HEIGHT; let maxHeight = MapTop.HEIGHT;
this.mapContainer.addChild(new MapTop(topData)); // 最后加，因为有个层级问题 this.mapContainer.addChild(new MapTop(topData)); // 最后加，因为有个层级问题
for (let i = midData.length / 10 - 1; i >= 0; i--) { for (let i = midData.length / MapMid.totalCount - 1; i >= 0; i--) {
const data = midData.splice(i * 10, 10); const data = midData.splice(i * MapMid.totalCount, MapMid.totalCount);
const nMid = new MapMid(data); const nMid = new MapMid(data);
this.mapContainer.addChild(nMid); this.mapContainer.addChild(nMid);
nMid.y = maxHeight; nMid.y = maxHeight;
......
src/scene/map/MapTop.ts
View file @ 6cbefe4f
...@@ -4,13 +4,17 @@ import Point = FYGE.Point; ...@@ -4,13 +4,17 @@ import Point = FYGE.Point;
export default class MapTop extends MapPart { export default class MapTop extends MapPart {
public static HEIGHT = 521; public static HEIGHT = 1218;
protected totalCount = 2; public static totalCount = 6;
public btnPos = [ public btnPos = [
[207, 407], [379, 1133],
[149, 282], [260, 1083],
[201, 974],
[317, 919],
[397, 827],
[497, 760],
]; ];
constructor(data) { constructor(data) {
......
src/scene/map/MapUI.ts
View file @ 6cbefe4f
import Container = FYGE.Container; import Container = FYGE.Container;
import Button = FYGE.Button; import Button = FYGE.Button;
import TextField = FYGE.TextField; import TextField = FYGE.TextField;
import MouseEvent = FYGE.MouseEvent;
import VERTICAL_ALIGN = FYGE.VERTICAL_ALIGN;
import Sprite = FYGE.Sprite;
import TEXT_ALIGN = FYGE.TEXT_ALIGN; import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import { Tools } from "../../Tools"; import { Tools } from "../../Tools";
import MouseEvent = FYGE.MouseEvent;
import { showPanel } from "../../../module/ctrls"; import { showPanel } from "../../../module/ctrls";
import { RulePanel } from "../../panels/RulePanel"; import { RulePanel } from "../../panels/RulePanel";
import { TaskPanel } from "../../panels/TaskPanel"; import { TaskPanel } from "../../panels/TaskPanel";
...@@ -40,7 +42,6 @@ export default class MapUI extends Container { ...@@ -40,7 +42,6 @@ export default class MapUI extends Container {
private clickBtn(e) { private clickBtn(e) {
switch (e.target) { switch (e.target) {
case this.ruleBtn: case this.ruleBtn:
console.log('规则');
showPanel(RulePanel); showPanel(RulePanel);
break; break;
case this.myPrizeBtn: case this.myPrizeBtn:
...@@ -55,7 +56,6 @@ export default class MapUI extends Container { ...@@ -55,7 +56,6 @@ export default class MapUI extends Container {
break; break;
case this.taskBtn: case this.taskBtn:
console.log('任务');
showPanel(TaskPanel); showPanel(TaskPanel);
break; break;
} }
...@@ -69,17 +69,16 @@ export default class MapUI extends Container { ...@@ -69,17 +69,16 @@ export default class MapUI extends Container {
private initUi() { private initUi() {
// 我的奖品 // 我的奖品
this.myPrizeBtn = this.addChild(new Button(RES.getRes('map_prizeBtn.png'))); this.myPrizeBtn = this.addChild(new Button(RES.getRes('map_prizeBtn.png')));
this.myPrizeBtn.position.set(0, 185); this.myPrizeBtn.position.set(16, 135);
this.myPrizeBtn.anchorX = 0;
// 规则按钮 // 规则按钮
this.ruleBtn = this.addChild(new Button(RES.getRes('map_ruleBtn.png'))); this.ruleBtn = this.addChild(new Button(RES.getRes('map_ruleBtn.png')));
this.ruleBtn.position.set(0, 104); this.ruleBtn.position.set(16, 57);
this.ruleBtn.anchorX = 0;
// 任务按钮 // 任务按钮
this.taskBtn = this.addChild(new Button(RES.getRes('map_taskBtn.png'))); this.taskBtn = this.addChild(new Button(RES.getRes('map_taskBtn.png')));
this.taskBtn.position.set(19, 280); this.taskBtn.position.set(605, 145);
this.taskBtn.addChild(Tools.getSprite('map_taskBtn_tip.png', -131, 8));
this.energyBox = this.addChild(new EnergyBox({})); this.energyBox = this.addChild(new EnergyBox({}));
} }
...@@ -94,13 +93,14 @@ export default class MapUI extends Container { ...@@ -94,13 +93,14 @@ export default class MapUI extends Container {
*/ */
class EnergyBox extends Container { class EnergyBox extends Container {
private addBtn: Button = null;
private countLabel: TextField = null; private countLabel: TextField = null;
private lightImg: Sprite = null;
private _count = 0; private _count = 0;
public set count(count: number) { public set count(count: number) {
this._count = count; this._count = count;
this.countLabel.text = '' + count; this.countLabel.text = '' + count;
this.doAlign();
} }
constructor(data) { constructor(data) {
...@@ -108,29 +108,38 @@ class EnergyBox extends Container { ...@@ -108,29 +108,38 @@ class EnergyBox extends Container {
this.initUi(data); this.initUi(data);
this.addBtn.addEventListener(MouseEvent.CLICK, this.clickAdd, this);
}
private clickAdd() {
console.log('增加按钮');
} }
private initUi(data) { private initUi(data) {
this.position.set(544, 105); this.position.set(549, 59);
this.addChild(Tools.getSprite('map_energyBg.png')); this.addChild(Tools.getSprite('map_energyBg.png'));
this.addBtn = this.addChild(new Button(RES.getRes('map_energyAdd.png')));
this.addBtn.position.set(135, 14);
this.countLabel = this.addChild(Tools.getText( this.countLabel = this.addChild(new TextField());
'0', 20, '#ffffff', this.countLabel.size = 30;
TEXT_ALIGN.CENTER, 80, 54, 21 this.countLabel.fillColor = '#ffffff';
)); this.countLabel.textAlign = TEXT_ALIGN.CENTER;
this.countLabel.y = 1;
this.countLabel.textHeight = this.height;
this.countLabel.verticalAlign = VERTICAL_ALIGN.MIDDLE;
this.countLabel.strokeColor = '#1c7ab8';
this.countLabel.bold = true;
this.countLabel.stroke = 3;
this.lightImg = this.addChild(Tools.getSprite('lightImg.png'));
this.lightImg.y = 16;
this.doAlign();
}
private doAlign() {
const tW = this.countLabel.textWidth;
const iW = this.lightImg.width;
this.lightImg.x = (this.width - (tW + iW + 6)) / 2 + 2;
this.countLabel.x = this.lightImg.x + this.lightImg.width + 6;
} }
public destroy() { public destroy() {
super.destroy(); super.destroy();
this.addBtn.removeEventListener(MouseEvent.CLICK, this.clickAdd, this);
} }
} }
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