Skip to content

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

1

parent 17d564fc
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 42 deletions
.idea/workspace.xml
View file @ b1c2455b
......@@ -3,9 +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$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" 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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -129,7 +128,8 @@
<workItem from="1596079246036" duration="1000" />
<workItem from="1596079283722" duration="2448000" />
<workItem from="1596185145914" duration="75000" />
<workItem from="1596187812585" duration="161000" />
<workItem from="1596187812585" duration="636000" />
<workItem from="1596418925126" duration="986000" />
</task>
<task id="LOCAL-00001" summary="111">
<created>1594122339119</created>
......@@ -404,7 +404,14 @@
<option name="project" value="LOCAL" />
<updated>1596081056302</updated>
</task>
<option name="localTasksCounter" value="40" />
<task id="LOCAL-00040" summary="1111">
<created>1596188029611</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1596188029611</updated>
</task>
<option name="localTasksCounter" value="41" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -432,10 +439,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<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="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1596081056013">
<state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1596188029369">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1596081056013" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1596188029369" />
<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="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" />
......@@ -479,10 +486,10 @@
</state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
<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="1596081058419">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1596188030852">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1596081058419" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1596188030852" />
<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" />
......@@ -509,10 +516,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<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="1596187836960">
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1596419278423">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596187836960" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596419278423" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
</component>
</project>
\ No newline at end of file
mock/miniTb/babycare.getIndex.json
View file @ b1c2455b
......@@ -12,31 +12,7 @@
"HAMMERS": 3
},
"prizes": [
{
"receiveTime": "",
"level": 120,
"isReceive": false
},
{
"receiveTime": "",
"level": 90,
"isReceive": false
},
{
"receiveTime": "",
"level": 60,
"isReceive": false
},
{
"receiveTime": "",
"level": 30,
"isReceive": false
},
{
"receiveTime": "",
"level": 10,
"isReceive": false
}
],
"visitors": [
{
......
src/scene/map/MapUI.ts
View file @ b1c2455b
......@@ -232,13 +232,17 @@ class PrizeBox extends Button {
this.tip = this.addChild(Tools.getText(
'参与红包抽奖\n赢XXX优惠券', 17,
'#ec5a5a', TEXT_ALIGN.CENTER,
158, 0, 112
158, 0, 115
));
this.tip.lineSpacing = 0;
this.prizeImg = this.addChild(Tools.getSprite('map_star_enable.png', 39, 150));
this.prizeImg.width = 80;
this.prizeImg.height = 33;
// 490*180
this.prizeImg.width = 98;
this.prizeImg.height = 36;
this.prizeImg.x = this.width / 2;
this.prizeImg.anchorTexture.x = 0.5;
this.prizeImg.y -= 11;
const prizes = Tools.gameData.prizes;
if (prizes.length <= 0) {
......@@ -254,9 +258,8 @@ class PrizeBox extends Button {
});
console.log(upLevel, dLevel);
this.checkTip.text = `再闯${dLevel}关`;
this.tip.text = '';
this.tip.text = '有机会获得';
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize[`level_${upLevel}`]);
this.prizeImg.y -= 20;
this.addEventListener(FYGE.MouseEvent.CLICK, () => {
//有需要，到时再改
showToast(this.checkTip.text + "才可以抽奖哦")
......@@ -278,7 +281,6 @@ class PrizeBox extends Button {
});
this.checkTip.text = `点击抽奖`;
this.tip.text = `抽取${lowerLevel}关奖励`;
this.tip.y += 10;
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize[`level_${lowerLevel}`]);
this.addEventListener(FYGE.MouseEvent.CLICK, () => {
changeScene(LotteryScene, {level: lowerLevel})
......
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