Commit 251f49c5 authored by haiyoucuv's avatar haiyoucuv

Success Panel Effect!

parent c3be0e95
......@@ -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$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.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$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -112,7 +111,7 @@
<workItem from="1594864188027" duration="20343000" />
<workItem from="1594950738970" duration="22032000" />
<workItem from="1595209499266" duration="21574000" />
<workItem from="1595296313180" duration="8665000" />
<workItem from="1595296313180" duration="9406000" />
</task>
<task id="LOCAL-00001" summary="111">
<created>1594122339119</created>
......@@ -289,7 +288,14 @@
<option name="project" value="LOCAL" />
<updated>1595241101211</updated>
</task>
<option name="localTasksCounter" value="26" />
<task id="LOCAL-00026" summary="Success Panel Effect!">
<created>1595314404681</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1595314404681</updated>
</task>
<option name="localTasksCounter" value="27" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -315,10 +321,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="754" y="183" key="CommitChangelistDialog2" timestamp="1595241100540">
<state x="754" y="183" key="CommitChangelistDialog2" timestamp="1595314404349">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595241100540" />
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595314404349" />
<state width="866" height="321" key="GridCell.Tab.0.bottom" timestamp="1595296522573">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -351,10 +357,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1595241102296">
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1595314406084">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595241102296" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595314406084" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -379,9 +385,9 @@
<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="1594712635697" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595303325151">
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595315059105">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595303325151" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595315059105" />
</component>
</project>
\ No newline at end of file
......@@ -125,7 +125,7 @@ export class Tools {
public static gameOver(data) {
if (!data.isVisitSuccess) { // 闯关失败
showPanel(FailedPanel, data);
} else if (data.prize || data.tool) { // 闯关成功,奖励关卡
} else if (data.prize.image || data.tool.type) { // 闯关成功,奖励关卡
showPanel(SuccessPrizePanel, data);
} else { // 闯关成功,不是奖励关卡
showPanel(SuccessNoPrizePanel, data);
......
......@@ -68,7 +68,7 @@ export class SuccessPrizePanel extends Panel {
const propImg: Sprite = this.prop.getChildByName('img');
const propLabel: TextField = this.prop.getChildByName('label');
if (this.data.tool) {
if (this.data.tool && this.data.tool.type) {
this.againBtn.visible = false;
this.goPrizeBtn.visible = false;
this.prizeImg.visible = false;
......@@ -92,7 +92,7 @@ export class SuccessPrizePanel extends Panel {
break;
}
} else if (this.data.prize) {
} else if (this.data.prize && this.data.prize.image) {
this.noPrizeAgainBtn.visible = false;
this.prop.visible = false;
this.prizeImg.texture = Texture.fromUrl(this.data.prize.image);
......
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