Skip to content

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

1

parent 1fb9b274
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 27 deletions
.idea/workspace.xml
View file @ 31db33f5
......@@ -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$/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" />
</list>
<option name="SHOW_DIALOG" value="false" />
......@@ -86,8 +88,8 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" />
</list>
</recent_temporary>
</component>
......@@ -128,7 +130,7 @@
<workItem from="1596079283722" duration="2448000" />
<workItem from="1596185145914" duration="75000" />
<workItem from="1596187812585" duration="636000" />
<workItem from="1596418925126" duration="7132000" />
<workItem from="1596418925126" duration="9113000" />
</task>
<task id="LOCAL-00001" summary="111">
<created>1594122339119</created>
......@@ -447,38 +449,38 @@
<screen x="30" y="23" width="1890" height="1177" />
</state>
<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="1596434405974">
<state width="888" height="321" key="GridCell.Tab.0.bottom" timestamp="1596439054570">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596434405974" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596439054570" />
<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="888" height="321" key="GridCell.Tab.0.center" timestamp="1596434405973">
<state width="888" height="321" key="GridCell.Tab.0.center" timestamp="1596439054567">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596434405973" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596439054567" />
<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="888" height="321" key="GridCell.Tab.0.left" timestamp="1596434405972">
<state width="888" height="321" key="GridCell.Tab.0.left" timestamp="1596439054566">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596434405972" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596439054566" />
<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="888" height="321" key="GridCell.Tab.0.right" timestamp="1596434405973">
<state width="888" height="321" key="GridCell.Tab.0.right" timestamp="1596439054569">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596434405973" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596439054569" />
<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">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="82" y="353" key="IDE.errors.dialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594777965326" />
<state x="209" y="320" key="RollbackChangesDialog" timestamp="1596435067937">
<state x="209" y="320" key="RollbackChangesDialog" timestamp="1596437158375">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="209" y="320" key="RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596435067937" />
<state x="209" y="320" key="RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596437158375" />
<state x="210" y="320" key="RollbackChangesDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594173186663" />
<state x="289" y="314" key="SettingsEditor" timestamp="1596079390860">
<screen x="30" y="23" width="1890" height="1177" />
......
src/scene/map/MapUI.ts
View file @ 31db33f5
......@@ -272,9 +272,9 @@ class PrizeBox extends Button {
this.scale.set(1.2, 1.2);
this.checkTip = this.addChild(Tools.getText(
'再闯XXX关', 22,
'再闯XXX关', 18,
'#ffffff', TEXT_ALIGN.CENTER,
158, 0, 64
158, 0, 68
));
this.tip = this.addChild(Tools.getText(
......@@ -286,12 +286,10 @@ class PrizeBox extends Button {
this.prizeImg = this.addChild(Tools.getSprite('map_star_enable.png', 39, 150));
// 490*180
this.prizeImg.width = 125;
this.prizeImg.height = 46;
this.prizeImg.scale.set(1.2, 1.2);
this.prizeImg.x = (this.width - 98) / 2 - 28;
// this.prizeImg.anchorTexture.x = 0.5;
this.prizeImg.y -= 12;
this.prizeImg.y -= 40;
this.prizeImg.width = 204;
this.prizeImg.height = 80;
this.prizeImg.x = (this.width - 98) / 2 - 70;
const prizes = Tools.gameData.prizes;
if (prizes.length <= 0) {
......@@ -306,8 +304,9 @@ class PrizeBox extends Button {
}
});
console.log(upLevel, dLevel);
this.checkTip.text = `再闯${dLevel}关`;
this.tip.text = '有机会获得';
this.checkTip.text = `再闯${dLevel}关可抽`;
// this.tip.text = '有机会获得';
this.tip.text = '';
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize[`level_${upLevel}`]);
this.addEventListener(FYGE.MouseEvent.CLICK, () => {
//有需要，到时再改
......@@ -324,10 +323,6 @@ class PrizeBox extends Button {
// ? '已开奖' : '等待开奖';
// this.tip.text = `8月31日10点`;
this.tip.text = ``;
this.prizeImg.y -= 28;
this.prizeImg.width = 204;
this.prizeImg.height = 80;
this.prizeImg.x = (this.width - 98) / 2 - 70;
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize['level_120']);
this.addEventListener(FYGE.MouseEvent.CLICK, () => {
......@@ -344,7 +339,8 @@ class PrizeBox extends Button {
}
});
this.checkTip.text = `点击抽奖`;
this.tip.text = `抽取${lowerLevel}关奖励`;
// this.tip.text = `抽取${lowerLevel}关奖励`;
this.tip.text = ``;
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize[`level_${lowerLevel}`]);
this.addEventListener(FYGE.MouseEvent.CLICK, () => {
Tools.btnDelay(this);
......
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