11

src/pages/GamePage/Level/Level1.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { errorWaitTime, rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level1 extends LevelBase {
 
@@ -49,14 +50,13 @@ export class Level1 extends LevelBase {
     const isRight = item === this.C;
     this.setTouchEnable(false);
     const dp = -10;
-    const wait = 2000;
 
     if (isRight) {
       this.setPauseCd(true);
       this.right.visible = true;
       this.right.position.set(item.x + dp, item.y + dp);
-      Tween.get(this.error)
-        .wait(wait)
+      Tween.get(this.right)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });
@@ -65,7 +65,7 @@ export class Level1 extends LevelBase {
       this.error.position.set(item.x + dp, item.y + dp);
       Tween.removeTweens(this.error);
       Tween.get(this.error)
-        .wait(wait)
+        .wait(errorWaitTime)
         .call(() => {
           this.error.visible = false;
           this.setTouchEnable(true);
@@ -76,6 +76,7 @@ export class Level1 extends LevelBase {
 
   onDestroy() {
     super.onDestroy();
+    Tween.removeTweens(this.right);
     Tween.removeTweens(this.error);
   }
 

src/pages/GamePage/Level/Level10.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level10 extends LevelBase {
 
@@ -76,7 +77,7 @@ export class Level10 extends LevelBase {
         .call(() => {
           Tween.get(this.right)
             .to({ alpha: 1 }, 444, Ease.quadInOut)
-            .wait(2000)
+            .wait(rightWaitTime)
             .call(() => {
               globalEvent.emit(GameEvent.NextLevel);
             });

src/pages/GamePage/Level/Level11.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level11 extends LevelBase {
 
@@ -122,7 +123,7 @@ export class Level11 extends LevelBase {
 
     Tween.get(this.right)
       .to({ alpha: 1 }, 444, Ease.quadInOut)
-      .wait(2000)
+      .wait(rightWaitTime)
       .call(() => {
         globalEvent.emit(GameEvent.NextLevel);
       });

src/pages/GamePage/Level/Level12.ts

@@ -3,6 +3,7 @@ import { Assets, Sprite, Graphics } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
 import { getApp } from "../GamePage";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level12 extends LevelBase {
 
@@ -208,7 +209,7 @@ export class Level12 extends LevelBase {
     // 显示right图标并完成通关
     Tween.get(this.right)
       .to({ alpha: 1 }, 444, Ease.quadInOut)
-      .wait(2000)
+      .wait(rightWaitTime)
       .call(() => {
         globalEvent.emit(GameEvent.NextLevel);
       });

src/pages/GamePage/Level/Level13.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Circle, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level13 extends LevelBase {
 
@@ -77,7 +78,7 @@ export class Level13 extends LevelBase {
       this.setTouchEnable(false);
       Tween.get(this.right)
         .to({ alpha: 1 }, 444, Ease.quadInOut)
-        .wait(2000)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });

src/pages/GamePage/Level/Level14.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { errorWaitTime, rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level14 extends LevelBase {
 
@@ -61,7 +62,7 @@ export class Level14 extends LevelBase {
     this.error.visible = true;
     Tween.removeTweens(this.error);
     Tween.get(this.error)
-      .wait(2000)
+      .wait(errorWaitTime)
       .call(() => {
         this.error.visible = false;
         this.setTouchEnable(true);
@@ -102,7 +103,7 @@ export class Level14 extends LevelBase {
         .call(() => {
           Tween.get(this.right)
             .to({ alpha: 1 }, 444, Ease.quadInOut)
-            .wait(2000)
+            .wait(rightWaitTime)
             .call(() => {
               globalEvent.emit(GameEvent.NextLevel);
             });

src/pages/GamePage/Level/Level15.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Rectangle, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level15 extends LevelBase {
 
@@ -142,7 +143,7 @@ export class Level15 extends LevelBase {
       Tween.get(this.right)
         .wait(999)
         .to({ alpha: 1 }, 666, Ease.quadInOut)
-        .wait(2000)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });

src/pages/GamePage/Level/Level16.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level16 extends LevelBase {
 
@@ -70,7 +71,7 @@ export class Level16 extends LevelBase {
         .call(() => {
           Tween.get(this.right)
             .to({ alpha: 1 }, 444, Ease.quadInOut)
-            .wait(2000)
+            .wait(rightWaitTime)
             .call(() => {
               globalEvent.emit(GameEvent.NextLevel);
             });

src/pages/GamePage/Level/Level18.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level18 extends LevelBase {
 
@@ -90,7 +91,7 @@ export class Level18 extends LevelBase {
       Tween.get(this.right)
         .wait(666)
         .to({ alpha: 1 }, 666, Ease.quadInOut)
-        .wait(2000)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });

src/pages/GamePage/Level/Level19.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level19 extends LevelBase {
 
@@ -122,7 +123,7 @@ export class Level19 extends LevelBase {
 
     Tween.get(this.right)
       .to({ alpha: 1 }, 444, Ease.quadInOut)
-      .wait(2000)
+      .wait(rightWaitTime)
       .call(() => {
         globalEvent.emit(GameEvent.NextLevel);
       });

src/pages/GamePage/Level/Level2.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { errorWaitTime, rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level2 extends LevelBase {
 
@@ -58,8 +59,8 @@ export class Level2 extends LevelBase {
       this.setPauseCd(true);
       this.right.visible = true;
       this.right.position.set(item.x + dp, item.y + dp);
-      Tween.get(this.error)
-        .wait(wait)
+      Tween.get(this.right)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });
@@ -68,7 +69,7 @@ export class Level2 extends LevelBase {
       this.error.position.set(item.x + dp, item.y + dp);
       Tween.removeTweens(this.error);
       Tween.get(this.error)
-        .wait(wait)
+        .wait(errorWaitTime)
         .call(() => {
           this.error.visible = false;
           this.setTouchEnable(true);
@@ -79,6 +80,7 @@ export class Level2 extends LevelBase {
 
   onDestroy() {
     super.onDestroy();
+    Tween.removeTweens(this.right);
     Tween.removeTweens(this.error);
   }
 

src/pages/GamePage/Level/Level20.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Rectangle, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level20 extends LevelBase {
 
@@ -110,7 +111,7 @@ export class Level20 extends LevelBase {
         this.setPauseCd(true);
         Tween.get(this.right)
           .to({ alpha: 1 }, 666, Ease.quadInOut)
-          .wait(2000)
+          .wait(rightWaitTime)
           .call(() => {
             globalEvent.emit(GameEvent.NextLevel);
           });

src/pages/GamePage/Level/Level21.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Rectangle, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level21 extends LevelBase {
 
@@ -77,7 +78,7 @@ export class Level21 extends LevelBase {
       Tween.get(this.B).to({ alpha: 0 }, 666, Ease.quadInOut);
       Tween.get(this.right)
         .to({ alpha: 1 }, 666, Ease.quadInOut)
-        .wait(2000)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });

src/pages/GamePage/Level/Level22.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level22 extends LevelBase {
 
@@ -82,7 +83,7 @@ export class Level22 extends LevelBase {
       this.setTouchEnable(false);
       Tween.get(this.right)
         .to({ alpha: 1 }, 666, Ease.quadInOut)
-        .wait(2000)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });

src/pages/GamePage/Level/Level23.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { errorWaitTime, rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level23 extends LevelBase {
 
@@ -51,8 +52,8 @@ export class Level23 extends LevelBase {
       this.setPauseCd(true);
       this.right.visible = true;
       this.right.position.set(item.x + dp, item.y + dp);
-      Tween.get(this.error)
-        .wait(wait)
+      Tween.get(this.right)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });
@@ -61,7 +62,7 @@ export class Level23 extends LevelBase {
       this.error.position.set(item.x + dp, item.y + dp);
       Tween.removeTweens(this.error);
       Tween.get(this.error)
-        .wait(wait)
+        .wait(errorWaitTime)
         .call(() => {
           this.error.visible = false;
           this.setTouchEnable(true);
@@ -72,6 +73,7 @@ export class Level23 extends LevelBase {
 
   onDestroy() {
     super.onDestroy();
+    Tween.removeTweens(this.right);
     Tween.removeTweens(this.error);
   }
 

src/pages/GamePage/Level/Level24.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level24 extends LevelBase {
 
@@ -214,7 +215,7 @@ export class Level24 extends LevelBase {
         // 显示right图标并完成通关
         Tween.get(this.right)
           .to({ alpha: 1 }, 444, Ease.quadInOut)
-          .wait(2000)
+          .wait(rightWaitTime)
           .call(() => {
             globalEvent.emit(GameEvent.NextLevel);
           });

src/pages/GamePage/Level/Level25.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level25 extends LevelBase {
 
@@ -83,7 +84,7 @@ export class Level25 extends LevelBase {
       this.setPauseCd(true);
       Tween.get(this.right)
       .to({ alpha: 1 }, 444, Ease.quadInOut)
-      .wait(2000)
+      .wait(rightWaitTime)
       .call(() => {
         globalEvent.emit(GameEvent.NextLevel);
       });

src/pages/GamePage/Level/Level3.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { errorWaitTime, rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level3 extends LevelBase {
 
@@ -55,8 +56,8 @@ export class Level3 extends LevelBase {
       this.setPauseCd(true);
       this.right.visible = true;
       this.right.position.set(item.x + dp, item.y + dp);
-      Tween.get(this.error)
-        .wait(wait)
+      Tween.get(this.right)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });
@@ -65,7 +66,7 @@ export class Level3 extends LevelBase {
       this.error.position.set(item.x + dp, item.y + dp);
       Tween.removeTweens(this.error);
       Tween.get(this.error)
-        .wait(wait)
+        .wait(errorWaitTime)
         .call(() => {
           this.error.visible = false;
           this.setTouchEnable(true);
@@ -76,6 +77,7 @@ export class Level3 extends LevelBase {
 
   onDestroy() {
     super.onDestroy();
+    Tween.removeTweens(this.right);
     Tween.removeTweens(this.error);
   }
 

src/pages/GamePage/Level/Level4.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { errorWaitTime, rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level4 extends LevelBase {
 
@@ -55,8 +56,8 @@ export class Level4 extends LevelBase {
     if (isRight) {
       this.setPauseCd(true);
       this.right.visible = true;
-      Tween.get(this.error)
-        .wait(wait)
+      Tween.get(this.right)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });
@@ -65,7 +66,7 @@ export class Level4 extends LevelBase {
       this.error.position.set(item.x + dp, item.y + dp);
       Tween.removeTweens(this.error);
       Tween.get(this.error)
-        .wait(wait)
+        .wait(errorWaitTime)
         .call(() => {
           this.error.visible = false;
           this.setTouchEnable(true);
@@ -76,6 +77,7 @@ export class Level4 extends LevelBase {
 
   onDestroy() {
     super.onDestroy();
+    Tween.removeTweens(this.right);
     Tween.removeTweens(this.error);
   }
 

src/pages/GamePage/Level/Level5.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level5 extends LevelBase {
 
@@ -106,7 +107,7 @@ export class Level5 extends LevelBase {
         .call(() => {
           Tween.get(this.right)
             .to({ alpha: 1 }, 444, Ease.quadInOut)
-            .wait(2000)
+            .wait(rightWaitTime)
             .call(() => {
               globalEvent.emit(GameEvent.NextLevel);
             });

src/pages/GamePage/Level/Level6.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level6 extends LevelBase {
 
@@ -82,7 +83,7 @@ export class Level6 extends LevelBase {
       Tween.get(this.right)
         .wait(666)
         .to({ alpha: 1 }, 666, Ease.quadInOut)
-        .wait(2000)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });

src/pages/GamePage/Level/Level7.ts

@@ -3,6 +3,7 @@ import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
 import { getApp } from "@/pages/GamePage/GamePage.tsx";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level7 extends LevelBase {
 
@@ -43,7 +44,7 @@ export class Level7 extends LevelBase {
       .call(() => {
         Tween.get(this.coin)
           .to({ y: -300, }, 666, Ease.quadInOut)
-          .wait(2000)
+          .wait(rightWaitTime)
           .call(() => {
             globalEvent.emit(GameEvent.NextLevel);
           });

src/pages/GamePage/Level/Level8.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { errorWaitTime, rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level8 extends LevelBase {
 
@@ -55,8 +56,8 @@ export class Level8 extends LevelBase {
     if (isRight) {
       this.setPauseCd(true);
       this.right.visible = true;
-      Tween.get(this.error)
-        .wait(wait)
+      Tween.get(this.right)
+        .wait(rightWaitTime)
         .call(() => {
           globalEvent.emit(GameEvent.NextLevel);
         });
@@ -65,7 +66,7 @@ export class Level8 extends LevelBase {
       this.error.position.set(item.x + dp, item.y + dp);
       Tween.removeTweens(this.error);
       Tween.get(this.error)
-        .wait(wait)
+        .wait(errorWaitTime)
         .call(() => {
           this.error.visible = false;
           this.setTouchEnable(true);
@@ -76,6 +77,7 @@ export class Level8 extends LevelBase {
 
   onDestroy() {
     super.onDestroy();
+    Tween.removeTweens(this.right);
     Tween.removeTweens(this.error);
   }
 

src/pages/GamePage/Level/Level9.ts

@@ -2,6 +2,7 @@ import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
 import { Assets, Sprite } from "pixi.js";
 import { Ease, Tween } from "@/core/tween";
 import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+import { rightWaitTime } from "@/pages/GamePage/Level/LevelConfig.ts";
 
 export class Level9 extends LevelBase {
 
@@ -66,7 +67,7 @@ export class Level9 extends LevelBase {
         .call(() => {
           Tween.get(this.right)
             .to({ alpha: 1 }, 444, Ease.quadInOut)
-            .wait(2000)
+            .wait(rightWaitTime)
             .call(() => {
               globalEvent.emit(GameEvent.NextLevel);
             });

src/pages/GamePage/Level/LevelConfig.ts

@@ -25,6 +25,9 @@ import { Level24 } from "@/pages/GamePage/Level/Level24.ts";
 import { Level25 } from "./Level25";
 
 
+export const errorWaitTime = 1000;
+export const rightWaitTime = 2000;
+
 export const LevelArr = [
   { cls: Level1, tip: `5=1` },
   { cls: Level2, tip: `图中一共有9个金币` },