Commit fec81c79 authored by haiyoucuv's avatar haiyoucuv

toast

parent 6642aaf4
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<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$/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" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -127,7 +128,7 @@ ...@@ -127,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="11470000" /> <workItem from="1596418925126" duration="12859000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -409,7 +410,14 @@ ...@@ -409,7 +410,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1596188029611</updated> <updated>1596188029611</updated>
</task> </task>
<option name="localTasksCounter" value="41" /> <task id="LOCAL-00041" summary="120未中奖不弹弹窗">
<created>1596446024298</created>
<option name="number" value="00041" />
<option name="presentableId" value="LOCAL-00041" />
<option name="project" value="LOCAL" />
<updated>1596446024298</updated>
</task>
<option name="localTasksCounter" value="42" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -422,7 +430,8 @@ ...@@ -422,7 +430,8 @@
<MESSAGE value="Success Panel Effect!" /> <MESSAGE value="Success Panel Effect!" />
<MESSAGE value="aaa" /> <MESSAGE value="aaa" />
<MESSAGE value="1111" /> <MESSAGE value="1111" />
<option name="LAST_COMMIT_MESSAGE" value="1111" /> <MESSAGE value="120未中奖不弹弹窗" />
<option name="LAST_COMMIT_MESSAGE" value="120未中奖不弹弹窗" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530"> <state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
...@@ -437,10 +446,10 @@ ...@@ -437,10 +446,10 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </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="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="1596188029369"> <state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1596446024082">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1596188029369" /> <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1596446024082" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" /> <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"> <state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
...@@ -484,10 +493,10 @@ ...@@ -484,10 +493,10 @@
</state> </state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" /> <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="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="1596188030852"> <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1596446025590">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1596188030852" /> <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1596446025590" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" /> <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"> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
...@@ -515,10 +524,10 @@ ...@@ -515,10 +524,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="1596445983396"> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1596447353653">
<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="1596445983396" /> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596447353653" />
<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
...@@ -58,7 +58,7 @@ export default class MapUI extends Container { ...@@ -58,7 +58,7 @@ export default class MapUI extends Container {
console.log('我的奖品'); console.log('我的奖品');
sendTbNet( sendTbNet(
TbNetName.navigateTo, TbNetName.navigateTo,
{ url: '/pages/myPrize/myPrize' }, {url: '/pages/myPrize/myPrize'},
() => { () => {
}, },
true true
...@@ -243,7 +243,7 @@ class PrizeBox extends Button { ...@@ -243,7 +243,7 @@ class PrizeBox extends Button {
this["frames"] = null this["frames"] = null
// s.scale.x = s.scale.y = 0.9 // s.scale.x = s.scale.y = 0.9
Tween.removeTweens(this); Tween.removeTweens(this);
Tween.get(this).to({ scaleX: 1, scaleY: 1 }, 50); Tween.get(this).to({scaleX: 1, scaleY: 1}, 50);
} }
} else { } else {
// @ts-ignore // @ts-ignore
...@@ -254,7 +254,7 @@ class PrizeBox extends Button { ...@@ -254,7 +254,7 @@ class PrizeBox extends Button {
this["frames"] = this["framesOri"] this["frames"] = this["framesOri"]
// s.scale.x = s.scale.y = 1 // s.scale.x = s.scale.y = 1
Tween.removeTweens(this); Tween.removeTweens(this);
Tween.get(this).to({ scaleX: 1.2, scaleY: 1.2 }, 50); Tween.get(this).to({scaleX: 1.2, scaleY: 1.2}, 50);
} }
} }
} }
...@@ -311,7 +311,7 @@ class PrizeBox extends Button { ...@@ -311,7 +311,7 @@ class PrizeBox extends Button {
this.addEventListener(FYGE.MouseEvent.CLICK, () => { this.addEventListener(FYGE.MouseEvent.CLICK, () => {
//有需要,到时再改 //有需要,到时再改
Tools.btnDelay(this); Tools.btnDelay(this);
showToast(this.checkTip.text + "才可以抽奖哦") showToast(`再闯${dLevel}关才可以抽奖哦`);
}, 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 = `等待开奖`;
...@@ -344,7 +344,7 @@ class PrizeBox extends Button { ...@@ -344,7 +344,7 @@ class PrizeBox extends Button {
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize[`level_${lowerLevel}`]); this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize[`level_${lowerLevel}`]);
this.addEventListener(FYGE.MouseEvent.CLICK, () => { this.addEventListener(FYGE.MouseEvent.CLICK, () => {
Tools.btnDelay(this); Tools.btnDelay(this);
changeScene(LotteryScene, { level: lowerLevel }) changeScene(LotteryScene, {level: lowerLevel})
}, this) }, 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