Skip to content

B
babycare_xiaoxiao
Commit 606d8e98 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parent 97570c41
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 15 deletions
.idea/workspace.xml
View file @ 606d8e98
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,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="986000" /> <workItem from="1596418925126" duration="3146000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -448,28 +448,28 @@ ...@@ -448,28 +448,28 @@
<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="888" height="321" key="GridCell.Tab.0.bottom" timestamp="1596185225515"> <state width="888" height="321" key="GridCell.Tab.0.bottom" timestamp="1596427210744">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596185225515" /> <state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596427210744" />
<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="888" height="321" key="GridCell.Tab.0.center" timestamp="1596185225515"> <state width="888" height="321" key="GridCell.Tab.0.center" timestamp="1596427210741">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596185225515" /> <state width="888" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596427210741" />
<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="888" height="321" key="GridCell.Tab.0.left" timestamp="1596185225514"> <state width="888" height="321" key="GridCell.Tab.0.left" timestamp="1596427210740">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596185225514" /> <state width="888" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596427210740" />
<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="888" height="321" key="GridCell.Tab.0.right" timestamp="1596185225515"> <state width="888" height="321" key="GridCell.Tab.0.right" timestamp="1596427210743">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596185225515" /> <state width="888" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596427210743" />
<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">
...@@ -512,9 +512,10 @@ ...@@ -512,9 +512,10 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="222" y="390" key="refactoring.ChangeSignatureDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594631868193" /> <state x="222" y="390" key="refactoring.ChangeSignatureDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594631868193" />
<state x="157" y="286" key="run.anything.popup" timestamp="1595475548860"> <state x="156" y="286" key="run.anything.popup" timestamp="1596432664001">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </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="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="1596419278423"> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1596419278423">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
......
mock/miniTb/babycare.getIndex.json
View file @ 606d8e98
...@@ -12,14 +12,18 @@ ...@@ -12,14 +12,18 @@
"HAMMERS": 3 "HAMMERS": 3
}, },
"prizes": [ "prizes": [
{
"receiveTime": "",
"level": 120,
"isReceive": false
}
], ],
"visitors": [ "visitors": [
{ {
"level": 120, "level": 120,
"scores": 44444, "scores": 44444,
"stars": 2, "stars": 2,
"isPrizeLevel": false, "isPrizeLevel": true,
"isVisitSuccess": true, "isVisitSuccess": true,
"sendAwardType": "prize" "sendAwardType": "prize"
} }
......
src/scene/map/MapUI.ts
View file @ 606d8e98
...@@ -265,12 +265,16 @@ class PrizeBox extends Button { ...@@ -265,12 +265,16 @@ class PrizeBox extends Button {
showToast(this.checkTip.text + "才可以抽奖哦") showToast(this.checkTip.text + "才可以抽奖哦")
}, this) }, this)
} else if (prizes.length == 1 && +prizes[0].level == 120) { } else if (prizes.length == 1 && +prizes[0].level == 120) {
this.checkTip.text = `等待开奖`; // this.checkTip.text = `等待开奖`;
this.checkTip.text = Tools.gameData.topAward.openPrizeStatus
? '已开奖' : '等待开奖';
this.tip.text = `8月28日10点\n开启大奖`; this.tip.text = `8月28日10点\n开启大奖`;
this.prizeImg.y += 12;
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize['level_120']); this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize['level_120']);
this.addEventListener(FYGE.MouseEvent.CLICK, () => { this.addEventListener(FYGE.MouseEvent.CLICK, () => {
//有需要，到时再改 //有需要，到时再改
showToast(this.tip.text) showToast(Tools.gameData.topAward.openPrizeStatus
? '已开奖' : this.tip.text)
}, 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