Merge branch 'master' of gitlab2.dui88.com:MrKwon/babycare_xiaoxiao

.idea/workspace.xml

@@ -3,10 +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/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/panels/BuyPowerPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/BuyPowerPanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.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" />
@@ -118,7 +116,7 @@
       <workItem from="1595382049907" duration="765000" />
       <workItem from="1595382857407" duration="11007000" />
       <workItem from="1595468598356" duration="15042000" />
-      <workItem from="1595555429502" duration="11023000" />
+      <workItem from="1595555429502" duration="12586000" />
     </task>
     <task id="LOCAL-00001" summary="111">
       <created>1594122339119</created>
@@ -427,9 +425,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="1595475548860" />
-    <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595582195073">
+    <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595584259535">
       <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="1595582195073" />
+    <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

src/panels/SuccessNoPrizePanel.ts

@@ -133,7 +133,11 @@ export class SuccessNoPrizePanel extends Panel {
      * 继续闯关
      */
     private continue() {
-        changeScene(MapScene, {level: this.data.level + 1});
+        if (this.data.level == 120) {
+            changeScene(MapScene);
+        } else {
+            changeScene(MapScene, {level: this.data.level + 1});
+        }
         super.hidePanel();
     }
 

src/panels/SuccessPrizePanel.ts

@@ -125,8 +125,11 @@ export class SuccessPrizePanel extends Panel {
      * 继续闯关
      */
     private continue() {
-        console.log(1);
-        changeScene(MapScene, {level: this.data.level + 1});
+        if (this.data.level == 120) {
+            changeScene(MapScene);
+        } else {
+            changeScene(MapScene, {level: this.data.level + 1});
+        }
         super.hidePanel();
     }