update

apps/client/assets/Scripts/Entity/Bullet/BulletManager.ts

@@ -1,79 +1,83 @@
-import { Tween, tween, Vec3, _decorator } from 'cc'
-import { EntityManager } from '../../Base/EntityManager'
-import { EntityTypeEnum, IBullet, IVec2 } from '../../Common'
-import { EntityStateEnum, EventEnum } from '../../Enum'
-import DataManager from '../../Global/DataManager'
-import EventManager from '../../Global/EventManager'
-import ObjectPoolManager from '../../Global/ObjectPoolManager'
-import { rad2Angle } from '../../Utils'
-import { ExplosionManager } from '../Explosion/ExplosionManager'
-import { BulletStateMachine } from './BulletStateMachine'
-const { ccclass } = _decorator
+import { Tween, tween, Vec3, _decorator } from "cc";
+import { EntityManager } from "../../Base/EntityManager";
+import { EntityTypeEnum, IBullet, IVec2 } from "../../Common";
+import { EntityStateEnum, EventEnum } from "../../Enum";
+import DataManager from "../../Global/DataManager";
+import EventManager from "../../Global/EventManager";
+import ObjectPoolManager from "../../Global/ObjectPoolManager";
+import { rad2Angle } from "../../Utils";
+import { ExplosionManager } from "../Explosion/ExplosionManager";
+import { BulletStateMachine } from "./BulletStateMachine";
+const { ccclass } = _decorator;
 
-@ccclass('BulletManager')
+@ccclass("BulletManager")
 export class BulletManager extends EntityManager implements IBullet {
   //静态数据
-  id: number
-  owner: number
-  type: EntityTypeEnum
+  id: number;
+  owner: number;
+  type: EntityTypeEnum;
 
   //动态数据
-  position: IVec2
-  direction: IVec2
+  position: IVec2;
+  direction: IVec2;
 
-  private angle: number
-  private tw: Tween<any>
-  private targetPos: Vec3
+  private angle: number;
+  private tw: Tween<any>;
+  private targetPos: Vec3;
 
   init({ id, owner, type }: IBullet) {
-    this.id = id
-    this.owner = owner
-    this.type = type
+    this.id = id;
+    this.owner = owner;
+    this.type = type;
 
-    this.fsm = this.addComponent(BulletStateMachine)
-    this.fsm.init(type)
-    this.state = EntityStateEnum.Idle
-    this.node.active = false
-    this.targetPos = undefined
+    this.fsm = this.addComponent(BulletStateMachine);
+    this.fsm.init(type);
+    this.state = EntityStateEnum.Idle;
 
-    EventManager.Instance.on(EventEnum.ExplosionBorn, this.handleExplosion, this)
+    this.node.active = false;
+    this.targetPos = undefined;
+    this.angle = undefined;
+
+    EventManager.Instance.on(EventEnum.ExplosionBorn, this.handleExplosion, this);
   }
 
   handleExplosion(id: number, { x, y }: IVec2) {
     if (this.id !== id) {
-      return
+      return;
     }
 
-    const explosion = ObjectPoolManager.Instance.get(EntityTypeEnum.Explosion)
-    const explosionManager = explosion.getComponent(ExplosionManager) || explosion.addComponent(ExplosionManager)
+    const explosion = ObjectPoolManager.Instance.get(EntityTypeEnum.Explosion);
+    const explosionManager = explosion.getComponent(ExplosionManager) || explosion.addComponent(ExplosionManager);
     explosionManager.init(EntityTypeEnum.Explosion, {
-      x, y,
-    })
+      x,
+      y,
+    });
 
-    EventManager.Instance.off(EventEnum.ExplosionBorn, this.handleExplosion, this)
-    ObjectPoolManager.Instance.ret(this.node)
-    DataManager.Instance.bulletMap.delete(this.id)
-    this.angle = undefined
+    EventManager.Instance.off(EventEnum.ExplosionBorn, this.handleExplosion, this);
+    ObjectPoolManager.Instance.ret(this.node);
+    DataManager.Instance.bulletMap.delete(this.id);
   }
 
   render(data: IBullet) {
-    this.renderPosition(data)
-    this.renderDirection(data)
+    this.renderPosition(data);
+    this.renderDirection(data);
   }
 
   renderPosition(data: IBullet) {
-    const newPos = new Vec3(data.position.x, data.position.y)
+    const newPos = new Vec3(data.position.x, data.position.y);
     if (!this.targetPos) {
-      this.node.active = true
-      this.node.setPosition(newPos)
-      this.targetPos = new Vec3(newPos)
+      this.node.active = true;
+      this.node.setPosition(newPos);
+      this.targetPos = new Vec3(newPos);
     } else if (!this.targetPos.equals(newPos)) {
-      this.tw?.stop()
-      this.node.setPosition(this.targetPos)
-      this.targetPos.set(newPos)
-      this.tw = tween(this.node).to(0.1, {
-        position: this.targetPos
-      }).start()
+      this.tw?.stop();
+      this.node.setPosition(this.targetPos);
+      this.targetPos.set(newPos);
+      this.tw = tween(this.node)
+        .to(0.1, {
+          position: this.targetPos,
+        })
+        .start();
     }
 
     // this.node.setPosition(data.position.x, data.position.y)
@@ -81,12 +85,12 @@ export class BulletManager extends EntityManager implements IBullet {
 
   renderDirection(data: IBullet) {
     if (this.angle === undefined) {
-      const { x, y } = data.direction
-      const side = Math.sqrt(x * x + y * y)
-      this.angle = x > 0 ? rad2Angle(Math.asin(y / side)) : rad2Angle(Math.asin(- y / side)) + 180
+      const { x, y } = data.direction;
+      const side = Math.sqrt(x * x + y * y);
+      this.angle = x > 0 ? rad2Angle(Math.asin(y / side)) : rad2Angle(Math.asin(-y / side)) + 180;
     }
 
-    this.node.setRotationFromEuler(0, 0, this.angle)
+    this.node.setRotationFromEuler(0, 0, this.angle);
 
     // let angle: number, sign: number
     // if (x !== 0) {

apps/client/assets/Scripts/Entity/Bullet/BulletStateMachine.ts

@@ -1,45 +1,43 @@
-import { _decorator, Animation } from 'cc'
-import State from '../../Base/State'
-import StateMachine, { getInitParamsTrigger } from '../../Base/StateMachine'
-import { EntityTypeEnum } from '../../Common'
-import { EntityStateEnum, ParamsNameEnum } from '../../Enum'
-const { ccclass } = _decorator
+import { _decorator, Animation } from "cc";
+import State from "../../Base/State";
+import StateMachine, { getInitParamsTrigger } from "../../Base/StateMachine";
+import { EntityTypeEnum } from "../../Common";
+import { EntityStateEnum, ParamsNameEnum } from "../../Enum";
+const { ccclass } = _decorator;
 
-@ccclass('BulletStateMachine')
+@ccclass("BulletStateMachine")
 export class BulletStateMachine extends StateMachine {
   init(type: EntityTypeEnum) {
-    this.type = type
-    this.animationComponent = this.node.addComponent(Animation)
+    this.type = type;
+    this.animationComponent = this.node.addComponent(Animation);
 
-    this.initParams()
-    this.initStateMachines()
-    this.initAnimationEvent()
+    this.initParams();
+    this.initStateMachines();
+    this.initAnimationEvent();
   }
 
   initParams() {
-    this.params.set(ParamsNameEnum.Idle, getInitParamsTrigger())
+    this.params.set(ParamsNameEnum.Idle, getInitParamsTrigger());
   }
 
   initStateMachines() {
-    this.stateMachines.set(ParamsNameEnum.Idle, new State(this, `${this.type}${EntityStateEnum.Idle}`))
+    this.stateMachines.set(ParamsNameEnum.Idle, new State(this, `${this.type}${EntityStateEnum.Idle}`));
   }
 
-  initAnimationEvent() {
-
-  }
+  initAnimationEvent() {}
 
   run() {
     switch (this.currentState) {
       case this.stateMachines.get(ParamsNameEnum.Idle):
         if (this.params.get(ParamsNameEnum.Idle).value) {
-          this.currentState = this.stateMachines.get(ParamsNameEnum.Idle)
+          this.currentState = this.stateMachines.get(ParamsNameEnum.Idle);
         } else {
-          this.currentState = this.currentState
+          this.currentState = this.currentState;
         }
-        break
+        break;
       default:
-        this.currentState = this.stateMachines.get(ParamsNameEnum.Idle)
-        break
+        this.currentState = this.stateMachines.get(ParamsNameEnum.Idle);
+        break;
     }
   }
 }