new upgrades, restrucutre

assets/Scripts/Game/Player/PlayerUI.meta

@@ -2,7 +2,7 @@
   "ver": "1.1.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "82d14029-0ea6-4de6-b796-05339d2d19b1",
+  "uuid": "7eadb488-192c-4370-9e59-20f27929fba1",
   "files": [],
   "subMetas": {},
   "userData": {

assets/Scripts/Game/Player/PlayerUI/PlayerHealthUI.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-  "uuid": "84a1c057-2ef8-4ead-8903-5753f36ac735",
+  "uuid": "def45aaf-cc88-4ec6-97ff-4d5b0beb015b",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/Scripts/Game/Player/PlayerUI/PlayerUI.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-  "uuid": "634f676f-c335-42a2-85e8-f214e9ce5eb7",
+  "uuid": "6247f0de-45c1-4e74-89aa-388c217ce3a3",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/Scripts/Game/Player/UnitHealth.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-  "uuid": "8118806a-dc7c-4e94-84c2-b0a95be43209",
+  "uuid": "14972f1d-8009-4d39-8a6f-553ae1b3a011",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/Scripts/Game/Player/UnitLevel.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-  "uuid": "5eeabc4f-21b1-4983-b935-e44c12051766",
+  "uuid": "61e76d1e-15a8-42cc-990d-b9c7848ddab3",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/Scripts/Game/Player/Weapon.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "b232195c-46e2-4508-9f71-5efb42ab490f",
+  "files": [],
+  "subMetas": {},
+  "userData": {
+    "compressionType": {},
+    "isRemoteBundle": {}
+  }
+}

assets/Scripts/Game/Player/Weapon/UpgradableCollider.ts

@@ -0,0 +1,43 @@
+import { BoxCollider2D, Collider2D, Component, Contact2DType, _decorator } from "cc";
+import { ISignal } from "../../../Services/EventSystem/ISignal";
+import { Signal } from "../../../Services/EventSystem/Signal";
+
+const { ccclass, property } = _decorator;
+
+@ccclass("UpgradableCollider")
+export class UpgradableCollider extends Component {
+    @property(BoxCollider2D) private colliders: BoxCollider2D[] = [];
+    private contactBeginEvent: Signal<Collider2D> = new Signal<Collider2D>();
+    private currentUpgradeLevel = 0;
+
+    public init(): void {
+        this.setUpgradeLevel();
+
+        for (const collider of this.colliders) {
+            collider.on(Contact2DType.BEGIN_CONTACT, this.onColliderContactBegin, this);
+        }
+    }
+
+    public get ContactBeginEvent(): ISignal<Collider2D> {
+        return this.contactBeginEvent;
+    }
+
+    public upgrade(): void {
+        if (this.currentUpgradeLevel == this.colliders.length - 1) throw new Error("Already at max upgrade! " + this.currentUpgradeLevel);
+
+        this.currentUpgradeLevel++;
+        this.setUpgradeLevel();
+    }
+
+    private setUpgradeLevel(): void {
+        for (const collider of this.colliders) {
+            collider.node.active = false;
+        }
+
+        this.colliders[this.currentUpgradeLevel].node.active = true;
+    }
+
+    private onColliderContactBegin(thisCollider: Collider2D, otherCollider: Collider2D): void {
+        this.contactBeginEvent.trigger(otherCollider);
+    }
+}

assets/Scripts/Game/Player/Weapon/UpgradableCollider.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "bba49b00-3fe5-4042-85f3-7d1f017d75d3",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/Scripts/Game/Player/Weapon/Weapon.ts

@@ -0,0 +1,59 @@
+import { Animation, AnimationState, Component, _decorator } from "cc";
+import { GameTimer } from "../../../Services/GameTimer";
+import { WeaponSettings } from "../../Data/GameSettings";
+
+import { UpgradableCollider } from "./UpgradableCollider";
+const { ccclass, property } = _decorator;
+
+@ccclass("Weapon")
+export class Weapon extends Component {
+    @property(Animation) private weaponAnimation: Animation;
+    @property(UpgradableCollider) private upgradableCollider: UpgradableCollider;
+
+    private strikeTimer: GameTimer;
+    private strikeState: AnimationState;
+    private damage: number;
+
+    public init(settings: WeaponSettings): void {
+        this.strikeTimer = new GameTimer(settings.strikeDelay);
+        this.damage = settings.damage;
+        this.node.active = false;
+
+        this.weaponAnimation.on(Animation.EventType.FINISHED, this.endStrike, this);
+        this.strikeState = this.weaponAnimation.getState(this.weaponAnimation.clips[0].name);
+        this.strikeState.speed = 1;
+
+        this.upgradableCollider.init();
+    }
+
+    public gameTick(deltaTime: number): void {
+        this.strikeTimer.gameTick(deltaTime);
+        if (this.strikeTimer.tryFinishPeriod()) {
+            this.strike();
+        }
+    }
+
+    public get Collider(): UpgradableCollider {
+        return this.upgradableCollider;
+    }
+
+    public get Damage(): number {
+        return this.damage;
+    }
+
+    public upgradeWeaponDamage(): void {
+        this.damage++;
+    }
+    public upgradeWeaponLength(): void {
+        this.upgradableCollider.upgrade();
+    }
+
+    private strike(): void {
+        this.node.active = true;
+        this.weaponAnimation.play(this.strikeState.name);
+    }
+
+    private endStrike(): void {
+        this.node.active = false;
+    }
+}

assets/Scripts/Game/Player/Weapon/Weapon.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "2391b8b7-f9fa-42a8-b046-55ff57b07d02",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}