Skip to content

B
babycare_xiaoxiao
Commit 8d902fec authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parent b73d38cd
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 13 deletions
.idea/workspace.xml
View file @ 8d902fec
...@@ -3,7 +3,6 @@ ...@@ -3,7 +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$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" 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/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" />
...@@ -129,7 +128,7 @@ ...@@ -129,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="3146000" /> <workItem from="1596418925126" duration="3328000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -448,28 +447,28 @@ ...@@ -448,28 +447,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="1596427210744"> <state width="888" height="321" key="GridCell.Tab.0.bottom" timestamp="1596432717906">
<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="1596427210744" /> <state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596432717906" />
<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="1596427210741"> <state width="888" height="321" key="GridCell.Tab.0.center" timestamp="1596432717905">
<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="1596427210741" /> <state width="888" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596432717905" />
<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="1596427210740"> <state width="888" height="321" key="GridCell.Tab.0.left" timestamp="1596432717905">
<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="1596427210740" /> <state width="888" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596432717905" />
<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="1596427210743"> <state width="888" height="321" key="GridCell.Tab.0.right" timestamp="1596432717905">
<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="1596427210743" /> <state width="888" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596432717905" />
<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">
......
src/scene/map/MapUI.ts
View file @ 8d902fec
...@@ -232,7 +232,7 @@ class PrizeBox extends Button { ...@@ -232,7 +232,7 @@ class PrizeBox extends Button {
this.tip = this.addChild(Tools.getText( this.tip = this.addChild(Tools.getText(
'参与红包抽奖\n赢XXX优惠券', 17, '参与红包抽奖\n赢XXX优惠券', 17,
'#ec5a5a', TEXT_ALIGN.CENTER, '#ec5a5a', TEXT_ALIGN.CENTER,
158, 0, 115 158, 0, 116
)); ));
this.tip.lineSpacing = 0; this.tip.lineSpacing = 0;
...@@ -268,8 +268,8 @@ class PrizeBox extends Button { ...@@ -268,8 +268,8 @@ class PrizeBox extends Button {
// this.checkTip.text = `等待开奖`; // this.checkTip.text = `等待开奖`;
this.checkTip.text = Tools.gameData.topAward.openPrizeStatus this.checkTip.text = Tools.gameData.topAward.openPrizeStatus
? '已开奖' : '等待开奖'; ? '已开奖' : '等待开奖';
this.tip.text = `8月28日10点\n开启大奖`; this.tip.text = `8月28日10点`;
this.prizeImg.y += 12; this.prizeImg.y += 4;
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, () => {
//有需要，到时再改 //有需要，到时再改
......
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