Commit 278e6682 authored by wjf's avatar wjf

l

parents 4ff39d29 52a437f6
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<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$/resource/res.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="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/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" />
...@@ -130,7 +128,7 @@ ...@@ -130,7 +128,7 @@
<workItem from="1596079283722" duration="2448000" /> <workItem from="1596079283722" duration="2448000" />
<workItem from="1596185145914" duration="75000" /> <workItem from="1596185145914" duration="75000" />
<workItem from="1596187812585" duration="636000" /> <workItem from="1596187812585" duration="636000" />
<workItem from="1596418925126" duration="9113000" /> <workItem from="1596418925126" duration="10710000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -518,10 +516,10 @@ ...@@ -518,10 +516,10 @@
</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="1596434723742"> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1596442931070">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596434723742" /> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596442931070" />
<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>
</project> </project>
\ No newline at end of file
...@@ -318,7 +318,7 @@ class PrizeBox extends Button { ...@@ -318,7 +318,7 @@ class PrizeBox extends Button {
const index = getTbData(TbNetName.getIndex).data const index = getTbData(TbNetName.getIndex).data
this.checkTip.text = index.topAward.openPrizeStatus this.checkTip.text = index.topAward.openPrizeStatus
? '已开奖' : '8月31日10点'; ? '已开奖' : '8月31日9点开奖';
this.checkTip.size = 18; this.checkTip.size = 18;
// ? '已开奖' : '等待开奖'; // ? '已开奖' : '等待开奖';
// this.tip.text = `8月31日10点`; // this.tip.text = `8月31日10点`;
...@@ -329,7 +329,7 @@ class PrizeBox extends Button { ...@@ -329,7 +329,7 @@ class PrizeBox extends Button {
//有需要,到时再改 //有需要,到时再改
Tools.btnDelay(this); Tools.btnDelay(this);
showToast(index.topAward.openPrizeStatus showToast(index.topAward.openPrizeStatus
? '已开奖' :/* this.tip.text*/'8月31日10点开奖') ? '已开奖' : '8月31日9点开奖')
}, this) }, this)
} else { } else {
let lowerLevel = 120; let lowerLevel = 120;
......
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