Skip to content

B
babycare_xiaoxiao
Commit 3333e8fd authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

按钮放反了

parent 485b3e90
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 25 deletions
.idea/workspace.xml
View file @ 3333e8fd
...@@ -3,12 +3,9 @@ ...@@ -3,12 +3,9 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" 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/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.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" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.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" />
...@@ -198,14 +195,7 @@ ...@@ -198,14 +195,7 @@
<workItem from="1602310896602" duration="5137000" /> <workItem from="1602310896602" duration="5137000" />
<workItem from="1602322734643" duration="2339000" /> <workItem from="1602322734643" duration="2339000" />
<workItem from="1602380089772" duration="7488000" /> <workItem from="1602380089772" duration="7488000" />
<workItem from="1602467369737" duration="11086000" /> <workItem from="1602467369737" duration="12422000" />
</task>
<task id="LOCAL-00034" summary="Success Panel Effect!">
<created>1595854773117</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1595854773117</updated>
</task> </task>
<task id="LOCAL-00035" summary="Success Panel Effect!"> <task id="LOCAL-00035" summary="Success Panel Effect!">
<created>1595906807870</created> <created>1595906807870</created>
...@@ -543,7 +533,14 @@ ...@@ -543,7 +533,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1602489218845</updated> <updated>1602489218845</updated>
</task> </task>
<option name="localTasksCounter" value="83" /> <task id="LOCAL-00083" summary="按钮放反了">
<created>1602503086117</created>
<option name="number" value="00083" />
<option name="presentableId" value="LOCAL-00083" />
<option name="project" value="LOCAL" />
<updated>1602503086117</updated>
</task>
<option name="localTasksCounter" value="84" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -610,12 +607,12 @@ ...@@ -610,12 +607,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="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602489218261"> <state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602503085477">
<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="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602489218261" /> <state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602503085477" />
<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="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721"> <state x="131" y="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
...@@ -671,12 +668,12 @@ ...@@ -671,12 +668,12 @@
</state> </state>
<state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" /> <state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" />
<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="1602489219936"> <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602503088538">
<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="1602489219936" /> <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602503088538" />
<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" />
...@@ -709,11 +706,11 @@ ...@@ -709,11 +706,11 @@
</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="670" height="429" key="search.everywhere.popup" timestamp="1602502615917"> <state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602505008848">
<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="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602502615917" /> <state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602505008848" />
<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" />
<state x="249" y="530" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1602310103215"> <state x="249" y="530" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1602310103215">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
......
src/Tools.ts
View file @ 3333e8fd
...@@ -60,6 +60,8 @@ export class Tools { ...@@ -60,6 +60,8 @@ export class Tools {
// }); // });
// } // }
public static actEnd: boolean = false;
public static baseInfo: { public static baseInfo: {
inviteFriends: any, inviteFriends: any,
rule: string, rule: string,
...@@ -93,6 +95,13 @@ export class Tools { ...@@ -93,6 +95,13 @@ export class Tools {
Tools.propInfo.hammers = data.tools.hammers || 0; Tools.propInfo.hammers = data.tools.hammers || 0;
} }
Tools.propInfo.power = data.power || 0; Tools.propInfo.power = data.power || 0;
// @ts-ignore
my.getServerTime({
success: (t) => {
Tools.actEnd = (+res.data.endTime <= +t.time);
}
});
} }
r(s); r(s);
}) })
...@@ -104,7 +113,7 @@ export class Tools { ...@@ -104,7 +113,7 @@ export class Tools {
*/ */
public static consumerTools(type: PropType): Promise<boolean> { public static consumerTools(type: PropType): Promise<boolean> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
sendTbNet(TbNetName.consumerTools, { type }, (s, res) => { sendTbNet(TbNetName.consumerTools, {type}, (s, res) => {
if (s) { if (s) {
//修改道具数量 //修改道具数量
this.propInfo[type] -= 1; this.propInfo[type] -= 1;
......
src/scene/map/CheckBtn.ts
View file @ 3333e8fd
...@@ -9,7 +9,7 @@ import TEXT_ALIGN = FYGE.TEXT_ALIGN; ...@@ -9,7 +9,7 @@ import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import MouseEvent = FYGE.MouseEvent; import MouseEvent = FYGE.MouseEvent;
import Point = FYGE.Point; import Point = FYGE.Point;
import Tween = FYGE.Tween; import Tween = FYGE.Tween;
import { showPanel } from "../../../module/ctrls"; import { showPanel, showToast } from "../../../module/ctrls";
import { StartPanelPrize } from "../../panels/StartPanelPrize"; import { StartPanelPrize } from "../../panels/StartPanelPrize";
export enum CHECK_TYPE { export enum CHECK_TYPE {
...@@ -171,6 +171,10 @@ export default class CheckBtn extends Container { ...@@ -171,6 +171,10 @@ export default class CheckBtn extends Container {
} }
public clickStart() { public clickStart() {
if (Tools.actEnd) {
showToast('活动已结束');
return;
}
Tools.btnDelay(this, 200); Tools.btnDelay(this, 200);
console.log(`关卡:${this.checkNum}`); console.log(`关卡:${this.checkNum}`);
showPanel(StartPanelPrize, this.checkData); showPanel(StartPanelPrize, this.checkData);
......
src/scene/map/MapUI.ts
View file @ 3333e8fd
...@@ -7,7 +7,7 @@ import Sprite = FYGE.Sprite; ...@@ -7,7 +7,7 @@ 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 { showPanel } from "../../../module/ctrls"; import { showPanel, showToast } from "../../../module/ctrls";
import { RulePanel } from "../../panels/RulePanel"; import { RulePanel } from "../../panels/RulePanel";
import { TaskPanel } from "../../panels/TaskPanel"; import { TaskPanel } from "../../panels/TaskPanel";
import { sendTbNet, TbNetName } from "../../TaoBaoNet"; import { sendTbNet, TbNetName } from "../../TaoBaoNet";
...@@ -48,7 +48,7 @@ export default class MapUI extends Container { ...@@ -48,7 +48,7 @@ export default class MapUI extends Container {
console.log('我的奖品'); console.log('我的奖品');
sendTbNet( sendTbNet(
TbNetName.navigateTo, TbNetName.navigateTo,
{ url: '/pages/myprize/myprize' }, {url: '/pages/myprize/myprize'},
() => { () => {
}, },
true true
...@@ -56,6 +56,10 @@ export default class MapUI extends Container { ...@@ -56,6 +56,10 @@ export default class MapUI extends Container {
break; break;
case this.taskBtn: case this.taskBtn:
if (Tools.actEnd) {
showToast('活动已结束');
return;
}
showPanel(TaskPanel); showPanel(TaskPanel);
break; break;
} }
......
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