优化若干代码

2024-04-17 20:15:52 +08:00
parent 54580cc1b2
commit 58cc2e3b82
66 changed files with 5821 additions and 4019 deletions
--- a/assets/FishSingle/script/game/scene/LoadingScene.ts
+++ b/assets/FishSingle/script/game/scene/LoadingScene.ts
@@ -1,13 +1,4 @@
-import {
-	_decorator,
-	Node,
-	sys,
-	profiler,
-	DynamicAtlasManager,
-	PhysicsSystem2D,
-} from 'cc'
-const { ccclass, property } = _decorator
-
+import { _decorator, DynamicAtlasManager, Node, PhysicsSystem2D, profiler, sys } from 'cc'
 import MusicConfig from '../../engine/config/MusicConfig'
 import CommonTips from '../../engine/uicomponent/CommonTips'
 import Progress from '../../engine/uicomponent/Progress'
@@ -19,138 +10,141 @@ import ResourcePreload from '../utils/ResourcePreload'
 import SceneBase from './SceneBase'
 import SceneManager from './SceneManager'

+const { ccclass, property } = _decorator
+
@ccclass('LoadingScene')
 export default class LoadingScene extends SceneBase {
-	public static scriptName: string = 'LoadingScene'
-	@property({ type: Node })
-	private progressNode: Node | null = null
-	onLoadMe() {
-		this.baseInit()
-		EventManager.instance.addListener(
-			HotUpdate.Event_On_NeedUpdate,
-			this.onNeedUpdate,
-			this
-		)
-		EventManager.instance.addListener(
-			HotUpdate.Event_On_Progress,
-			this.onUpdateProgress,
-			this
-		)
-		EventManager.instance.addListener(
-			HotUpdate.Event_On_Fail_Update,
-			this.onUpdateFail,
-			this
-		)
-		EventManager.instance.addListener(
-			HotUpdate.Event_Finish_Update,
-			this.onUpdateFinish,
-			this
-		)
-		EventManager.instance.addListener(
-			HotUpdate.Event_On_ALREADY_UP_TO_DATE,
-			this.onUpdateFinish,
-			this
-		)
-		if (sys.isNative && VersionManager.instance.isOpenHotUpdate) {
-			this.checkUpdate()
-		} else {
-			this.preLoadRes()
-		}
-	}
+  public static scriptName: string = 'LoadingScene'
+  @property({ type: Node })
+  private progressNode: Node | null = null

-	private baseInit() {
-		profiler.hideStats() //showStats
-		//let collisionManager:cc.CollisionManager = director.getCollisionManager();
-		PhysicsSystem2D.instance.enable = true
+  async onLoadMe() {
+    this.baseInit()
+    EventManager.instance.addListener(
+      HotUpdate.Event_On_NeedUpdate,
+      this.onNeedUpdate,
+      this
+    )
+    EventManager.instance.addListener(
+      HotUpdate.Event_On_Progress,
+      this.onUpdateProgress,
+      this
+    )
+    EventManager.instance.addListener(
+      HotUpdate.Event_On_Fail_Update,
+      this.onUpdateFail,
+      this
+    )
+    EventManager.instance.addListener(
+      HotUpdate.Event_Finish_Update,
+      this.onUpdateFinish,
+      this
+    )
+    EventManager.instance.addListener(
+      HotUpdate.Event_On_ALREADY_UP_TO_DATE,
+      this.onUpdateFinish,
+      this
+    )
+    if (sys.isNative && VersionManager.instance.isOpenHotUpdate) {
+      this.checkUpdate()
+    } else {
+      await this.preLoadRes()
+    }
+  }

-		// PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb |
-		//     EPhysics2DDrawFlags.Pair |
-		//     EPhysics2DDrawFlags.CenterOfMass |
-		//     EPhysics2DDrawFlags.Joint |
-		//     EPhysics2DDrawFlags.Shape;
+  private baseInit() {
+    profiler.hideStats() //showStats
+    //let collisionManager:cc.CollisionManager = director.getCollisionManager();
+    PhysicsSystem2D.instance.enable = true

-		//if(collisionManager){
-		//collisionManager.enabled = true;
-		// collisionManager.enabledDebugDraw = true;
-		// collisionManager.enabledDrawBoundingBox = true;
-		//}
+    // PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb |
+    //     EPhysics2DDrawFlags.Pair |
+    //     EPhysics2DDrawFlags.CenterOfMass |
+    //     EPhysics2DDrawFlags.Joint |
+    //     EPhysics2DDrawFlags.Shape;

-		if (DynamicAtlasManager.instance) {
-			DynamicAtlasManager.instance.enabled = false
-		}
-		MusicConfig.init()
-		// cc.director.getCollisionManager().enabled=true;//这是一个全局属性，开启后就代表碰撞检测组件可以进行检测了
-		// cc.director.getCollisionManager().enabledDebugDraw = true; //绘制碰撞区域
-	}
+    //if(collisionManager){
+    //collisionManager.enabled = true;
+    // collisionManager.enabledDebugDraw = true;
+    // collisionManager.enabledDrawBoundingBox = true;
+    //}

-	private checkUpdate() {
-		Logger.log(this, 'checkUpdate====')
-		VersionManager.instance.checkUpdate(0)
-	}
+    if (DynamicAtlasManager.instance) {
+      DynamicAtlasManager.instance.enabled = false
+    }
+    MusicConfig.init()
+    // cc.director.getCollisionManager().enabled=true;//这是一个全局属性，开启后就代表碰撞检测组件可以进行检测了
+    // cc.director.getCollisionManager().enabledDebugDraw = true; //绘制碰撞区域
+  }

-	private onNeedUpdate(event: HaoEvent, key: string) {
-		Logger.log(this, 'onNeedUpdate=====', key, VersionManager.Config_Key)
-		if (key == VersionManager.Config_Key[0]) {
-			VersionManager.instance.startUpdate(0)
-		}
-	}
+  private checkUpdate() {
+    Logger.log(this, 'checkUpdate====')
+    VersionManager.instance.checkUpdate(0)
+  }

-	private onUpdateProgress(event, loadedFiles, totalFiles, key) {
-		if (key == VersionManager.Config_Key[0]) {
-			let msg: string =
-				Math.min(100, (loadedFiles / totalFiles) * 100).toFixed(2) + '%'
-			this.progressNode
-				.getComponent(Progress)
-				.updateProgress(loadedFiles, totalFiles, msg)
-		}
-	}
+  private onNeedUpdate(event: HaoEvent, key: string) {
+    Logger.log(this, 'onNeedUpdate=====', key, VersionManager.Config_Key)
+    if (key == VersionManager.Config_Key[0]) {
+      VersionManager.instance.startUpdate(0)
+    }
+  }

-	private onUpdateFail(event, key: string) {
-		if (key == VersionManager.Config_Key[0]) {
-			Logger.warn(this, '热更新失败========')
-			CommonTips.showMsg('热更新失败')
-			ResourcePreload.instance.restartGame()
-		}
-	}
+  private onUpdateProgress(event: Function, loadedFiles: number, totalFiles: number, key: string) {
+    if (key == VersionManager.Config_Key[0]) {
+      let msg: string =
+        Math.min(100, (loadedFiles / totalFiles) * 100).toFixed(2) + '%'
+      this.progressNode
+        .getComponent(Progress)
+        .updateProgress(loadedFiles, totalFiles, msg)
+    }
+  }

-	private onUpdateFinish(event, key: string, needRestart: boolean) {
-		Logger.log(this, 'onUpdateFinish========')
-		if (key == VersionManager.Config_Key[0] && !needRestart) {
-			this.preLoadRes()
-		}
-	}
+  private onUpdateFail(event, key: string) {
+    if (key == VersionManager.Config_Key[0]) {
+      Logger.warn(this, '热更新失败========')
+      CommonTips.showMsg('热更新失败')
+      ResourcePreload.instance.restartGame()
+    }
+  }

-	private async preLoadRes() {
-		ResourcePreload.instance.preLoad(() => {
-			this.startGame()
-		}, this.progressNode.getComponent(Progress))
-	}
+  private onUpdateFinish(event, key: string, needRestart: boolean) {
+    Logger.log(this, 'onUpdateFinish========')
+    if (key == VersionManager.Config_Key[0] && !needRestart) {
+      this.preLoadRes()
+    }
+  }

-	private startGame() {
-		Logger.info(this, 'startGame')
-		SceneManager.instance.sceneSwitch('FishGameScene', true)
-	}
+  private async preLoadRes() {
+    ResourcePreload.instance.preLoad(() => {
+      this.startGame()
+    }, this.progressNode.getComponent(Progress))
+  }

-	onDestroyMe() {
-		EventManager.instance.removeListener(
-			HotUpdate.Event_On_NeedUpdate,
-			this.onNeedUpdate
-		)
-		EventManager.instance.removeListener(
-			HotUpdate.Event_On_Progress,
-			this.onUpdateProgress
-		)
-		EventManager.instance.removeListener(
-			HotUpdate.Event_On_Fail_Update,
-			this.onUpdateFail
-		)
-		EventManager.instance.removeListener(
-			HotUpdate.Event_Finish_Update,
-			this.onUpdateFinish
-		)
-		EventManager.instance.removeListener(
-			HotUpdate.Event_On_ALREADY_UP_TO_DATE,
-			this.onUpdateFinish
-		)
-	}
+  private startGame() {
+    Logger.info(this, 'startGame')
+    SceneManager.instance.sceneSwitch('FishGameScene', true)
+  }
+
+  onDestroyMe() {
+    EventManager.instance.removeListener(
+      HotUpdate.Event_On_NeedUpdate,
+      this.onNeedUpdate
+    )
+    EventManager.instance.removeListener(
+      HotUpdate.Event_On_Progress,
+      this.onUpdateProgress
+    )
+    EventManager.instance.removeListener(
+      HotUpdate.Event_On_Fail_Update,
+      this.onUpdateFail
+    )
+    EventManager.instance.removeListener(
+      HotUpdate.Event_Finish_Update,
+      this.onUpdateFinish
+    )
+    EventManager.instance.removeListener(
+      HotUpdate.Event_On_ALREADY_UP_TO_DATE,
+      this.onUpdateFinish
+    )
+  }
 }