Commit 825947b5 authored by haiyoucuv's avatar haiyoucuv

1

parent 6d81d39c
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<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" /> <change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanelPrize.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanelPrize.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" />
...@@ -115,7 +116,7 @@ ...@@ -115,7 +116,7 @@
<workItem from="1595382049907" duration="765000" /> <workItem from="1595382049907" duration="765000" />
<workItem from="1595382857407" duration="11007000" /> <workItem from="1595382857407" duration="11007000" />
<workItem from="1595468598356" duration="15042000" /> <workItem from="1595468598356" duration="15042000" />
<workItem from="1595555429502" duration="6169000" /> <workItem from="1595555429502" duration="9548000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -364,26 +365,26 @@ ...@@ -364,26 +365,26 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595388353114" /> <state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595388353114" />
<state width="887" height="321" key="GridCell.Tab.0.bottom" timestamp="1595574499814"> <state width="1085" height="321" key="GridCell.Tab.0.bottom" timestamp="1595574626482">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" /> <state width="866" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" />
<state width="887" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595574499814" /> <state width="1085" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595574626482" />
<state width="887" height="321" key="GridCell.Tab.0.center" timestamp="1595574499814"> <state width="1085" height="321" key="GridCell.Tab.0.center" timestamp="1595574626481">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373238" /> <state width="866" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373238" />
<state width="887" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595574499814" /> <state width="1085" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595574626481" />
<state width="887" height="321" key="GridCell.Tab.0.left" timestamp="1595574499813"> <state width="1085" height="321" key="GridCell.Tab.0.left" timestamp="1595574626481">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373237" /> <state width="866" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373237" />
<state width="887" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595574499813" /> <state width="1085" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595574626481" />
<state width="887" height="321" key="GridCell.Tab.0.right" timestamp="1595574499814"> <state width="1085" height="321" key="GridCell.Tab.0.right" timestamp="1595574626482">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="866" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" /> <state width="866" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595348373239" />
<state width="887" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595574499814" /> <state width="1085" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595574626482" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326"> <state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -424,9 +425,9 @@ ...@@ -424,9 +425,9 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<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="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595574469300"> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595579540134">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595574469300" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595579540134" />
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -45,12 +45,14 @@ export class StartPanel extends Panel { ...@@ -45,12 +45,14 @@ export class StartPanel extends Panel {
this.checkTex.x = 0; this.checkTex.x = 0;
this.checkTex.text = `第\t${this.data.level}\t关`; this.checkTex.text = `第\t${this.data.level}\t关`;
this.startBtn.visible = (this.data.stars < 3); this.startBtn.visible = !this.data.isPlayed;
this.startBtn2.visible = (this.data.stars >= 3); this.startBtn2.visible = this.data.isPlayed;
this.tipsTex.visible = (this.data.stars < 3); this.tipsTex.visible = !this.data.isPlayed;
this.addChild(new StartTarget(this.data.level)) this.addChild(new StartTarget(this.data.level))
.position.set(0, 682); .position.set(0, 682);
// console.log(this.data);
} }
start(data) { start(data) {
...@@ -58,7 +60,7 @@ export class StartPanel extends Panel { ...@@ -58,7 +60,7 @@ export class StartPanel extends Panel {
} }
private startGame() { private startGame() {
if (this.data.stars < 3 && Tools.gameData.power <= 0) {// 体力不足 if (!this.data.isPlayed && Tools.gameData.power <= 0) {// 体力不足
showPanel(NoEnergyPanel); showPanel(NoEnergyPanel);
return; return;
} }
......
...@@ -46,8 +46,8 @@ export class StartPanelPrize extends Panel { ...@@ -46,8 +46,8 @@ export class StartPanelPrize extends Panel {
this.checkTex.x = 0; this.checkTex.x = 0;
this.checkTex.text = `第\t${this.data.level}\t关`; this.checkTex.text = `第\t${this.data.level}\t关`;
this.startBtn.visible = (this.data.stars < 3); this.startBtn.visible = !this.data.isPlayed;
this.startBtn2.visible = (this.data.stars >= 3); this.startBtn2.visible = this.data.isPlayed;
this.addChild(new StartTarget(this.data.level)) this.addChild(new StartTarget(this.data.level))
.position.set(0, 682); .position.set(0, 682);
...@@ -62,7 +62,7 @@ export class StartPanelPrize extends Panel { ...@@ -62,7 +62,7 @@ export class StartPanelPrize extends Panel {
} }
private startGame() { private startGame() {
if (this.data.stars < 3 && Tools.gameData.power <= 0) {// 体力不足 if (!this.data.isPlayed && Tools.gameData.power <= 0) {// 体力不足
showPanel(NoEnergyPanel); showPanel(NoEnergyPanel);
return; return;
} }
......
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