Progress

assets/Scripts/Game/Enemy/Enemy.ts

@@ -1,4 +1,4 @@
-import { BoxCollider2D, Component, Vec2, Vec3, _decorator } from "cc";
+import { BoxCollider2D, Component, randomRange, Vec3, _decorator } from "cc";
 import { ISignal } from "../../Services/EventSystem/ISignal";
 import { Signal } from "../../Services/EventSystem/Signal";
 import { UnitHealth } from "../Player/UnitHealth";
@@ -10,10 +10,13 @@ export class Enemy extends Component implements IDamageDealing {
 
     private health: UnitHealth = new UnitHealth(1);
     private deathEvent: Signal<Enemy> = new Signal<Enemy>();
+    private speed: number;
 
-    public setup(): void {
-        this.node.active = true;
+    public setup(position: Vec3): void {
         this.health = new UnitHealth(1);
+        this.speed = randomRange(0.5, 1);
+        this.node.setWorldPosition(position);
+        this.node.active = true;
     }
 
     public get Collider(): BoxCollider2D {
@@ -41,8 +44,8 @@ export class Enemy extends Component implements IDamageDealing {
 
     public moveBy(move: Vec3): void {
         const newPosition: Vec3 = this.node.worldPosition;
-        newPosition.x += move.x;
-        newPosition.y += move.y;
+        newPosition.x += move.x * this.speed;
+        newPosition.y += move.y * this.speed;
 
         this.node.setWorldPosition(newPosition);
     }

assets/Scripts/Game/Enemy/EnemyManager.ts

@@ -0,0 +1,41 @@
+import { Component, Node, _decorator } from "cc";
+import { XPSpawner } from "../XP/XPSpawner";
+import { Enemy } from "./Enemy";
+import { EnemyMover } from "./EnemyMover";
+import { EnemySpawner } from "./EnemySpawner";
+const { ccclass, property } = _decorator;
+
+@ccclass("EnemyManager")
+export class EnemyManager extends Component {
+    @property(EnemySpawner) private enemySpawner: EnemySpawner;
+    @property(XPSpawner) private xpSpawner: XPSpawner;
+
+    private enemyMover: EnemyMover;
+
+    public init(targetNode: Node): void {
+        this.enemyMover = new EnemyMover(targetNode);
+
+        this.enemySpawner.init();
+        this.enemySpawner.EnemyAddedEvent.on(this.onEnemyAdded, this);
+
+        this.xpSpawner.init();
+    }
+
+    public gameTick(deltaTime: number): void {
+        this.enemySpawner.gameTick(deltaTime);
+        this.enemyMover.gameTick(deltaTime);
+    }
+
+    private onEnemyAdded(enemy: Enemy): void {
+        enemy.DeathEvent.on(this.onEnemyDied, this);
+
+        this.enemyMover.addEnemy(enemy);
+    }
+
+    private onEnemyDied(enemy: Enemy): void {
+        enemy.DeathEvent.off(this.onEnemyDied);
+
+        this.xpSpawner.spawnXp(enemy.node.worldPosition, 1);
+        this.enemyMover.removeEnemy(enemy);
+    }
+}

assets/Scripts/Game/Enemy/EnemyManager.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "c5416aed-64b1-426e-959b-bc7d5c745e76",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/Scripts/Game/Enemy/EnemyMover.ts

@@ -21,7 +21,7 @@ export class EnemyMover {
     public gameTick(deltaTime: number): void {
         this.enemies.forEach((enemy) => {
             let direction: Vec3 = new Vec3();
-            direction = Vec3.subtract(direction, this.targetNode.position, enemy.node.position);
+            direction = Vec3.subtract(direction, this.targetNode.worldPosition, enemy.node.worldPosition);
             enemy.moveBy(direction.multiplyScalar(deltaTime).normalize());
         });
     }

assets/Scripts/Game/Enemy/EnemySpawner.ts

@@ -1,22 +1,23 @@
 import { Component, Prefab, randomRange, Vec3, _decorator } from "cc";
+import { ISignal } from "../../Services/EventSystem/ISignal";
+import { Signal } from "../../Services/EventSystem/Signal";
 import { GameTimer } from "../../Services/GameTimer";
 import { ObjectPool } from "../../Services/ObjectPool";
 import { Enemy } from "./Enemy";
-import { EnemyMover } from "./EnemyMover";
 const { ccclass, property } = _decorator;
 
 @ccclass("EnemySpawner")
 export class EnemySpawner extends Component {
     @property(Prefab) private enemies: Prefab[] = [];
 
+    public enemyAddedEvent: Signal<Enemy> = new Signal<Enemy>();
+
     private enemyPool: ObjectPool<Enemy>;
     private spawnTimer: GameTimer;
-    private enemyMover: EnemyMover;
 
-    public init(enemyMover: EnemyMover): void {
-        this.enemyPool = new ObjectPool(this.enemies[0], this.node, 5, Enemy);
+    public init(): void {
+        this.enemyPool = new ObjectPool(this.enemies[0], this.node, 5, "Enemy");
         this.spawnTimer = new GameTimer(1);
-        this.enemyMover = enemyMover;
     }
 
     public gameTick(deltaTime: number): void {
@@ -24,26 +25,23 @@ export class EnemySpawner extends Component {
         if (this.spawnTimer.tryFinishPeriod()) {
             this.spawnNewEnemy();
         }
+    }
 
-        this.enemyMover.gameTick(deltaTime);
+    public get EnemyAddedEvent(): ISignal<Enemy> {
+        return this.enemyAddedEvent;
     }
 
     private spawnNewEnemy(): void {
         const enemy = this.enemyPool.borrow();
-        enemy.node.active = true;
-        enemy.node.setPosition(new Vec3(randomRange(-300, 300), randomRange(-300, 300)));
-
-        enemy.setup();
+        enemy.setup(new Vec3(randomRange(0, 300), randomRange(0, 800)));
 
         enemy.DeathEvent.on(this.returnEnemyToPool, this);
 
-        this.enemyMover.addEnemy(enemy);
+        this.enemyAddedEvent.trigger(enemy);
     }
 
     private returnEnemyToPool(enemy: Enemy): void {
         enemy.DeathEvent.off(this.returnEnemyToPool);
         this.enemyPool.return(enemy);
-
-        this.enemyMover.removeEnemy(enemy);
     }
 }