update

2024-05-01 19:13:01 +08:00
parent cf008327aa
commit 80a32d9b1b
150 changed files with 8561 additions and 5045 deletions
--- a/assets/FishSingle/script/game/scene/FishGameScene.ts
+++ b/assets/FishSingle/script/game/scene/FishGameScene.ts
@@ -1,37 +1,63 @@
-import { _decorator, instantiate, Node, Prefab, Sprite, Tween, Vec3 } from 'cc'
-import SceneBase from './SceneBase'
-import TextureMgr from '../../engine/uicomponent/TextureMgr'
-import RandomUtil from '../../engine/utils/RandomUtil'
+import {
+  Component,
+  Game,
+  Node,
+  Prefab,
+  Sprite,
+  Tween,
+  Vec3,
+  _decorator,
+  director,
+  game,
+  instantiate,
+} from 'cc'
+
 import FishMover from '../../../fish/script/FishMover'
-import { FishPathInfo } from '../config/FishPathInfo'
-import { FishPathConfig } from '../config/FishPathConfig'
-import { Logger } from '../../engine/utils/Logger'
 import FishWiki from '../../../fish/script/FishWiki'
+import TextureMgr from '../../engine/uicomponent/TextureMgr'
+import { Logger } from '../../engine/utils/Logger'
+import RandomUtil from '../../engine/utils/RandomUtil'
+import { FishPathConfig } from '../config/FishPathConfig'
+import { FishPathInfo } from '../config/FishPathInfo'
+import WsManager from '../manager/WsManager'
 import GameMusicHelper from '../utils/GameMusicHelper'
+import CommonTips from '../../engine/uicomponent/CommonTips'

 const { ccclass, property } = _decorator

@ccclass('FishGameScene')
-export default class FishGameScene extends SceneBase {
+export default class FishGameScene extends Component {
  @property(Sprite)
  private bg: Sprite | null = null
+
  @property({ type: [Prefab] })
  private fishPrefabList: Array<Prefab> | null = []
+
  private showNode: Node | null = null

+  onLoad() {
+    this.onLoadMe()
+  }
+
+  onDestroy() {
+    this.onDestroyMe()
+  }
+
  onLoadMe() {
+    WsManager.instance.init()
    GameMusicHelper.playBg()
-    FishPathConfig.init()
-    this.initBg()
+    WsManager.instance.on(400, this.showMsg, this)
+    // FishPathConfig.init()
+    // this.initBg()
    // this.testPathPlay()
+    game.on(Game.EVENT_HIDE, this.onHide, this)
+    game.on(Game.EVENT_SHOW, this.onAppShow, this)
  }

  private initBg() {
-    let textureMgr: TextureMgr = this.bg.getComponent(TextureMgr)
+    const textureMgr: TextureMgr = this.bg.getComponent(TextureMgr)
    this.bg.spriteFrame =
-      textureMgr.Spriteset[
-        RandomUtil.nextInt(0, textureMgr.Spriteset.length - 1)
-        ]
+      textureMgr.Spriteset[RandomUtil.nextInt(0, textureMgr.Spriteset.length - 1)]
  }

  private initShowNode() {
@@ -39,10 +65,9 @@ export default class FishGameScene extends SceneBase {
      this.showNode.destroy()
      this.showNode = null
    }
-    let fishType: number = 29
-    if (fishType < 1 || fishType > 29) {
-      return
-    }
+    const fishType: number = 29
+    if (fishType < 1 || fishType > 29) return
+
    this.showNode = instantiate(this.fishPrefabList[fishType - 1])
    this.showNode.getComponent(FishMover).speed = 2
    this.showNode.getComponent(FishMover).node.setScale(new Vec3(2, 2, 1))
@@ -51,10 +76,10 @@ export default class FishGameScene extends SceneBase {

  private testPathPlay() {
    this.initShowNode()
-    let pathInfo: FishPathInfo = FishPathConfig.getPathInfo(3)
+    const pathInfo: FishPathInfo = FishPathConfig.getPathInfo(3)
    Logger.log('testPathPlay=pathInfo=', pathInfo)
-    let params = pathInfo.path
-    let param0 = params[0]
+    const params = pathInfo.path
+    const param0 = params[0]
    Logger.log('testPathPlay=11=', param0)
    this.showNode.setPosition(new Vec3(param0.x, param0.y, 0))
    this.showNode.getComponent(FishMover).bezierPList = params
@@ -65,9 +90,22 @@ export default class FishGameScene extends SceneBase {
    FishWiki.show()
  }

+  private showMsg(res: any) {
+    Logger.log('showMsg=res=', res)
+    CommonTips.showMsg(res.msg)
+  }
+
  onDestroyMe() {
    this.unscheduleAllCallbacks()
-    //this.node.stopAllActions();
+    // this.node.stopAllActions();
    Tween.stopAllByTarget(this.node)
  }
+
+  onHide() {
+    director.pause()
+  }
+
+  onAppShow() {
+    director.resume()
+  }
 }
--- a/assets/FishSingle/script/game/scene/LoadingScene.ts
+++ b/assets/FishSingle/script/game/scene/LoadingScene.ts
@@ -1,4 +1,14 @@
-import { _decorator, DynamicAtlasManager, Node, PhysicsSystem2D, profiler, sys } from 'cc'
+import {
+  _decorator,
+  Node,
+  sys,
+  profiler,
+  DynamicAtlasManager,
+  PhysicsSystem2D,
+  Component,
+} from 'cc'
+const { ccclass, property } = _decorator
+
 import MusicConfig from '../../engine/config/MusicConfig'
 import CommonTips from '../../engine/uicomponent/CommonTips'
 import Progress from '../../engine/uicomponent/Progress'
@@ -7,74 +17,69 @@ import HotUpdate from '../../engine/utils/HotUpdate'
 import { Logger } from '../../engine/utils/Logger'
 import VersionManager from '../../engine/utils/VersionManager'
 import ResourcePreload from '../utils/ResourcePreload'
-import SceneBase from './SceneBase'
 import SceneManager from './SceneManager'
-
-const { ccclass, property } = _decorator
+import { FishConfig } from '../config/FishConfig'

@ccclass('LoadingScene')
-export default class LoadingScene extends SceneBase {
+export default class LoadingScene extends Component {
  public static scriptName: string = 'LoadingScene'
  @property({ type: Node })
  private progressNode: Node | null = null

-  async onLoadMe() {
+  protected onLoad(): void {
+    this.onLoadMe()
+  }
+
+  protected onDestroy(): void {
+    this.onDestroyMe()
+  }
+
+  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_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
+      this,
    )
    if (sys.isNative && VersionManager.instance.isOpenHotUpdate) {
      this.checkUpdate()
    } else {
-      await this.preLoadRes()
+      this.preLoadRes()
    }
  }

-  private baseInit() {
-    profiler.hideStats() //showStats
-    //let collisionManager:cc.CollisionManager = director.getCollisionManager();
-    PhysicsSystem2D.instance.enable = true
+  private async baseInit() {
+    try {
+      await FishConfig.init()
+      profiler.hideStats() //showStats
+      //let collisionManager:cc.CollisionManager = director.getCollisionManager();
+      PhysicsSystem2D.instance.enable = true

-    // PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb |
-    //     EPhysics2DDrawFlags.Pair |
-    //     EPhysics2DDrawFlags.CenterOfMass |
-    //     EPhysics2DDrawFlags.Joint |
-    //     EPhysics2DDrawFlags.Shape;
+      // PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb |
+      //     EPhysics2DDrawFlags.Pair |
+      //     EPhysics2DDrawFlags.CenterOfMass |
+      //     EPhysics2DDrawFlags.Joint |
+      //     EPhysics2DDrawFlags.Shape;

-    //if(collisionManager){
-    //collisionManager.enabled = true;
-    // collisionManager.enabledDebugDraw = true;
-    // collisionManager.enabledDrawBoundingBox = true;
-    //}
+      //if(collisionManager){
+      //collisionManager.enabled = true;
+      // collisionManager.enabledDebugDraw = true;
+      // collisionManager.enabledDrawBoundingBox = true;
+      //}

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

  private checkUpdate() {
@@ -89,13 +94,10 @@ export default class LoadingScene extends SceneBase {
    }
  }

-  private onUpdateProgress(event: Function, loadedFiles: number, totalFiles: number, key: string) {
+  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)
+      let msg: string = Math.min(100, (loadedFiles / totalFiles) * 100).toFixed(2) + '%'
+      this.progressNode.getComponent(Progress).updateProgress(loadedFiles, totalFiles, msg)
    }
  }

@@ -126,25 +128,10 @@ export default class LoadingScene extends SceneBase {
  }

  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
-    )
+    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)
  }
 }
--- a/assets/FishSingle/script/game/scene/SceneBase.ts
+++ b/assets/FishSingle/script/game/scene/SceneBase.ts
@@ -1,31 +0,0 @@
-import { _decorator, Component } from 'cc'
-import AdapterHelper from '../../engine/utils/AdapterHelper'
-
-const { ccclass, property } = _decorator
-
-@ccclass('SceneBase')
-export default class SceneBase extends Component {
-  public static scriptName: string = 'SceneBase'
-
-  onLoad() {
-    AdapterHelper.fixApdater()
-    this.onLoadMe()
-  }
-
-  onLoadMe() {
-  }
-
-  start() {
-    this.onStartMe()
-  }
-
-  onStartMe() {
-  }
-
-  onDestroy() {
-    this.onDestroyMe()
-  }
-
-  onDestroyMe() {
-  }
-}
--- a/assets/FishSingle/script/game/scene/SceneBase.ts.meta
+++ b/assets/FishSingle/script/game/scene/SceneBase.ts.meta
@@ -1,11 +0,0 @@
-{
-  "ver": "4.0.23",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "544253ea-8aa0-4349-9d6c-efb97841d976",
-  "files": [],
-  "subMetas": {},
-  "userData": {
-    "simulateGlobals": []
-  }
-}
--- a/assets/FishSingle/script/game/scene/SceneManager.ts
+++ b/assets/FishSingle/script/game/scene/SceneManager.ts
@@ -1,9 +1,10 @@
-import { director, SceneAsset, sys } from 'cc'
-import { Logger } from '../../engine/utils/Logger'
-import LoadingScenePrefab from '../../engine/uicomponent/LoadingScenePrefab'
-import CommonTips from '../../engine/uicomponent/CommonTips'
-import EventManager from '../../engine/utils/EventManager'
+import { SceneAsset, director, sys } from 'cc'
+
 import CommonEvent from '../../engine/config/CommonEvent'
+import CommonTips from '../../engine/uicomponent/CommonTips'
+import LoadingScenePrefab from '../../engine/uicomponent/LoadingScenePrefab'
+import EventManager from '../../engine/utils/EventManager'
+import { Logger } from '../../engine/utils/Logger'

 export default class SceneManager {
  public static instance: SceneManager = new SceneManager()
@@ -23,7 +24,7 @@ export default class SceneManager {
  }

  public async sceneSwitch(name: string, showProgress: boolean = false) {
-    if (this.loadingSceneName == name) return
+    if (this.loadingSceneName === name) return
    Logger.log(this, 'sceneSwitch==', name)
    if (sys.isBrowser) {
      // showProgress = true;
@@ -42,13 +43,13 @@ export default class SceneManager {
            Logger.warn(this, 'preloadScene=error', error.message)
            CommonTips.showMsg('加载场景失败')
          } else {
-            //director.getScene().destroy();//director.getScene().cleanup();
+            // director.getScene().destroy();//director.getScene().cleanup();
            director.loadScene(name, this.loadSceneOK.bind(this))
          }
-        }
+        },
      )
    } else {
-      //director.getScene().destroy();//director.getScene().cleanup();
+      // director.getScene().destroy();//director.getScene().cleanup();
      director.loadScene(name, this.loadSceneOK.bind(this))
    }
  }
@@ -65,7 +66,7 @@ export default class SceneManager {
  public preloadScene(
    sceneName: string,
    onProgressCallback: any = null,
-    onLoadedCallback: any = null
+    onLoadedCallback: any = null,
  ) {
    director.preloadScene(sceneName, onProgressCallback, onLoadedCallback)
  }
--- a/assets/FishSingle/script/game/scene/StartScene.ts
+++ b/assets/FishSingle/script/game/scene/StartScene.ts
@@ -1,18 +0,0 @@
-import { _decorator } from 'cc'
-import SceneBase from './SceneBase'
-
-const { ccclass, property } = _decorator
-
-@ccclass('StartScene')
-export default class StartScene extends SceneBase {
-  public static scriptName: string = 'StartScene'
-
-  onLoadMe() {
-  }
-
-  update() {
-  }
-
-  onDestroyMe() {
-  }
-}
--- a/assets/FishSingle/script/game/scene/StartScene.ts.meta
+++ b/assets/FishSingle/script/game/scene/StartScene.ts.meta
@@ -1,11 +0,0 @@
-{
-  "ver": "4.0.23",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "65ad3e01-f8b1-4160-a391-c55d6c8f366f",
-  "files": [],
-  "subMetas": {},
-  "userData": {
-    "simulateGlobals": []
-  }
-}