Skip to content

B
babycare_xiaoxiao
Commit 4d9b4813 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

task

parent ec48955f
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 24 deletions
.idea/workspace.xml
View file @ 4d9b4813
...@@ -2,14 +2,7 @@ ...@@ -2,14 +2,7 @@
<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$/aaa.html" 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.receiveTaskRewards.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.receiveTaskRewards.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/TaskPanel/待领取.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/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.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" />
...@@ -180,14 +173,7 @@ ...@@ -180,14 +173,7 @@
<workItem from="1601429998970" duration="22651000" /> <workItem from="1601429998970" duration="22651000" />
<workItem from="1601689013718" duration="20266000" /> <workItem from="1601689013718" duration="20266000" />
<workItem from="1601775213402" duration="17131000" /> <workItem from="1601775213402" duration="17131000" />
<workItem from="1601867080494" duration="4466000" /> <workItem from="1601867080494" duration="4720000" />
</task>
<task id="LOCAL-00024" summary="Success Panel Effect!">
<created>1595216703734</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1595216703734</updated>
</task> </task>
<task id="LOCAL-00025" summary="Success Panel Effect!"> <task id="LOCAL-00025" summary="Success Panel Effect!">
<created>1595241101211</created> <created>1595241101211</created>
...@@ -525,7 +511,14 @@ ...@@ -525,7 +511,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1601720621979</updated> <updated>1601720621979</updated>
</task> </task>
<option name="localTasksCounter" value="73" /> <task id="LOCAL-00073" summary="task">
<created>1601879500569</created>
<option name="number" value="00073" />
<option name="presentableId" value="LOCAL-00073" />
<option name="project" value="LOCAL" />
<updated>1601879500569</updated>
</task>
<option name="localTasksCounter" value="74" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -562,7 +555,8 @@ ...@@ -562,7 +555,8 @@
<MESSAGE value="lowt" /> <MESSAGE value="lowt" />
<MESSAGE value="首页动画" /> <MESSAGE value="首页动画" />
<MESSAGE value="guide" /> <MESSAGE value="guide" />
<option name="LAST_COMMIT_MESSAGE" value="guide" /> <MESSAGE value="task" />
<option name="LAST_COMMIT_MESSAGE" value="task" />
</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">
...@@ -582,12 +576,12 @@ ...@@ -582,12 +576,12 @@
</state> </state>
<state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" /> <state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" />
<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="783" height="664" key="CommitChangelistDialog2" timestamp="1601720621798"> <state x="557" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1601879500226">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" /> <state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" />
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" /> <state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601720621798" /> <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601879500226" />
<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" />
...@@ -643,12 +637,12 @@ ...@@ -643,12 +637,12 @@
</state> </state>
<state x="98" y="219" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1601791580605" /> <state x="98" y="219" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1601791580605" />
<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="1601720623350"> <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601879503011">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" /> <state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" />
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" /> <state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601720623350" /> <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601879503011" />
<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" />
......
src/panels/TaskPanel.ts
View file @ 4d9b4813
...@@ -254,10 +254,10 @@ class TaskItem extends Item { ...@@ -254,10 +254,10 @@ class TaskItem extends Item {
break; break;
case TaskType.follow: case TaskType.follow:
sendTbNet(TbNetName.favorShop, {}, sendTbNet(TbNetName.favorShop, {},
(success, res) => { (fs, fr) => {
if (!success) return; if (!fs) return;
sendTbNet(TbNetName.completeTask, {taskType: this.data.taskType}, sendTbNet(TbNetName.completeTask, {taskType: this.data.taskType},
(success1, res1) => GDispatcher.dispatchEvent(G_EVENT.UPDATE_TASK) (cs, cr) => GDispatcher.dispatchEvent(G_EVENT.UPDATE_TASK)
); );
} }
); );
......
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