Skip to content

B
babycare_xiaoxiao
Commit 7c725e17 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parent 3333e8fd
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 24 deletions
.idea/workspace.xml
View file @ 7c725e17
......@@ -3,6 +3,8 @@
<component name="ChangeListManager">
<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$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.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/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
......@@ -195,14 +197,7 @@
<workItem from="1602310896602" duration="5137000" />
<workItem from="1602322734643" duration="2339000" />
<workItem from="1602380089772" duration="7488000" />
<workItem from="1602467369737" duration="12422000" />
</task>
<task id="LOCAL-00035" summary="Success Panel Effect!">
<created>1595906807870</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1595906807870</updated>
<workItem from="1602467369737" duration="13113000" />
</task>
<task id="LOCAL-00036" summary="aaa">
<created>1595916428550</created>
......@@ -540,7 +535,14 @@
<option name="project" value="LOCAL" />
<updated>1602503086117</updated>
</task>
<option name="localTasksCounter" value="84" />
<task id="LOCAL-00084" summary="按钮放反了">
<created>1602505033248</created>
<option name="number" value="00084" />
<option name="presentableId" value="LOCAL-00084" />
<option name="project" value="LOCAL" />
<updated>1602505033249</updated>
</task>
<option name="localTasksCounter" value="85" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -607,51 +609,51 @@
</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="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="1602503085477">
<state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602505033064">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<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="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602503085477" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602505033064" />
<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">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602321352721" />
<state width="902" height="321" key="GridCell.Tab.0.bottom" timestamp="1602502840524">
<state width="902" height="321" key="GridCell.Tab.0.bottom" timestamp="1602505028873">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="935" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1602426830829" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="902" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602502840524" />
<state width="902" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602505028873" />
<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="902" height="321" key="GridCell.Tab.0.center" timestamp="1602502840523">
<state width="902" height="321" key="GridCell.Tab.0.center" timestamp="1602505028871">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="935" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1602426830828" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="902" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602502840523" />
<state width="902" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602505028871" />
<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="902" height="321" key="GridCell.Tab.0.left" timestamp="1602502840523">
<state width="902" height="321" key="GridCell.Tab.0.left" timestamp="1602505028870">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" />
<state width="935" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1602426830828" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="902" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602502840523" />
<state width="902" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602505028870" />
<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="902" height="321" key="GridCell.Tab.0.right" timestamp="1602502840524">
<state width="902" height="321" key="GridCell.Tab.0.right" timestamp="1602505028872">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="935" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1602426830829" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="902" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602502840524" />
<state width="902" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602505028872" />
<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 x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
......@@ -668,12 +670,12 @@
</state>
<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="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602503088538">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602505034195">
<screen x="30" y="23" width="1890" height="1177" />
</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@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="1602503088538" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602505034195" />
<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">
<screen x="31" y="23" width="1889" height="1177" />
......@@ -706,11 +708,11 @@
</state>
<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="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602505008848">
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602505607475">
<screen x="30" y="23" width="1890" height="1177" />
</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="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602505008848" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602505607475" />
<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">
<screen x="30" y="23" width="1890" height="1177" />
......
output.js
View file @ 7c725e17
......@@ -13565,6 +13565,11 @@ var Tools = (function () {
Tools.propInfo.hammers = data.tools.hammers || 0;
}
Tools.propInfo.power = data.power || 0;
my.getServerTime({
success: function (t) {
Tools.actEnd = (+res.data.endTime <= +t.time);
}
});
}
r(s);
});
......@@ -13758,6 +13763,7 @@ var Tools = (function () {
booms: 0,
power: 0,
};
Tools.actEnd = false;
return Tools;
}());
exports.Tools = Tools;
......@@ -24031,6 +24037,10 @@ var CheckBtn = (function (_super) {
this.btn.addEventListener(MouseEvent.CLICK, this.clickStart, this);
};
CheckBtn.prototype.clickStart = function () {
if (Tools_1.Tools.actEnd) {
ctrls_1.showToast('活动已结束');
return;
}
Tools_1.Tools.btnDelay(this, 200);
console.log("\u5173\u5361:" + this.checkNum);
ctrls_1.showPanel(StartPanelPrize_1.StartPanelPrize, this.checkData);
......@@ -24790,6 +24800,10 @@ var MapUI = (function (_super) {
}, true);
break;
case this.taskBtn:
if (Tools_1.Tools.actEnd) {
ctrls_1.showToast('活动已结束');
return;
}
ctrls_1.showPanel(TaskPanel_1.TaskPanel);
break;
}
output.js.map
View file @ 7c725e17
This source diff could not be displayed because it is too large. You can view the blob instead.
src/Tools.ts
View file @ 7c725e17
......@@ -61,6 +61,7 @@ export class Tools {
// }
public static actEnd: boolean = false;
public static actStart: boolean = true;
public static baseInfo: {
inviteFriends: any,
......@@ -100,6 +101,7 @@ export class Tools {
my.getServerTime({
success: (t) => {
Tools.actEnd = (+res.data.endTime <= +t.time);
Tools.actStart = (+t.time >= +res.data.startTime);
}
});
}
......
src/scene/map/CheckBtn.ts
View file @ 7c725e17
......@@ -171,6 +171,10 @@ export default class CheckBtn extends Container {
}
public clickStart() {
if(!Tools.actStart){
showToast('活动未开始');
return;
}
if (Tools.actEnd) {
showToast('活动已结束');
return;
......
src/scene/map/MapUI.ts
View file @ 7c725e17
......@@ -56,6 +56,10 @@ export default class MapUI extends Container {
break;
case this.taskBtn:
if(!Tools.actStart){
showToast('活动未开始');
return;
}
if (Tools.actEnd) {
showToast('活动已结束');
return;
......
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