From f0b4387b77324fb58213f5a83d668786cb71f4fe Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 9 Jan 2023 11:09:06 +0100 Subject: [PATCH] Moving projectile launcher --- assets/Scripts/Game/Audio/GameAudioAdapter.ts | 4 ++-- assets/Scripts/Game/Game.ts | 8 ++++---- .../ProjectileLauncher.meta | 2 +- .../ProjectileLauncher/HaloProjectileLauncher.ts | 14 +++++++------- .../HaloProjectileLauncher.ts.meta | 0 .../ProjectileLauncher/ProjectileData.ts | 0 .../ProjectileLauncher/ProjectileData.ts.meta | 0 .../ProjectileLauncher/ProjectileLauncher.ts | 16 ++++++++-------- .../ProjectileLauncher.ts.meta | 0 .../ProjectileLauncher/WaveProjectileLauncher.ts | 14 +++++++------- .../WaveProjectileLauncher.ts.meta | 0 .../EnemyProjectileLauncher.ts | 2 +- assets/Scripts/Game/Upgrades/Upgrader.ts | 4 ++-- 13 files changed, 32 insertions(+), 32 deletions(-) rename assets/Scripts/Game/{Unit/Player => Projectile}/ProjectileLauncher.meta (77%) rename assets/Scripts/Game/{Unit/Player => Projectile}/ProjectileLauncher/HaloProjectileLauncher.ts (81%) rename assets/Scripts/Game/{Unit/Player => Projectile}/ProjectileLauncher/HaloProjectileLauncher.ts.meta (100%) rename assets/Scripts/Game/{Unit/Player => Projectile}/ProjectileLauncher/ProjectileData.ts (100%) rename assets/Scripts/Game/{Unit/Player => Projectile}/ProjectileLauncher/ProjectileData.ts.meta (100%) rename assets/Scripts/Game/{Unit/Player => Projectile}/ProjectileLauncher/ProjectileLauncher.ts (87%) rename assets/Scripts/Game/{Unit/Player => Projectile}/ProjectileLauncher/ProjectileLauncher.ts.meta (100%) rename assets/Scripts/Game/{Unit/Player => Projectile}/ProjectileLauncher/WaveProjectileLauncher.ts (79%) rename assets/Scripts/Game/{Unit/Player => Projectile}/ProjectileLauncher/WaveProjectileLauncher.ts.meta (100%) diff --git a/assets/Scripts/Game/Audio/GameAudioAdapter.ts b/assets/Scripts/Game/Audio/GameAudioAdapter.ts index 673ee4e..561839a 100644 --- a/assets/Scripts/Game/Audio/GameAudioAdapter.ts +++ b/assets/Scripts/Game/Audio/GameAudioAdapter.ts @@ -6,8 +6,8 @@ import { ItemType } from "../Items/ItemType"; import { Enemy } from "../Unit/Enemy/Enemy"; import { EnemyManager } from "../Unit/Enemy/EnemyManager"; import { Player } from "../Unit/Player/Player"; -import { HaloProjectileLauncher } from "../Unit/Player/ProjectileLauncher/HaloProjectileLauncher"; -import { WaveProjectileLauncher } from "../Unit/Player/ProjectileLauncher/WaveProjectileLauncher"; +import { HaloProjectileLauncher } from "../Projectile/ProjectileLauncher/HaloProjectileLauncher"; +import { WaveProjectileLauncher } from "../Projectile/ProjectileLauncher/WaveProjectileLauncher"; const { ccclass, property } = _decorator; @ccclass("GameAudioAdapter") diff --git a/assets/Scripts/Game/Game.ts b/assets/Scripts/Game/Game.ts index f1c309c..2efdc9a 100644 --- a/assets/Scripts/Game/Game.ts +++ b/assets/Scripts/Game/Game.ts @@ -25,10 +25,10 @@ import { EnemyManager } from "./Unit/Enemy/EnemyManager"; import { EnemyProjectileLauncher } from "./Unit/Enemy/ProjectileLauncher.cs/EnemyProjectileLauncher"; import { MetaUpgrades } from "./Unit/MetaUpgrades/MetaUpgrades"; import { Player, PlayerData } from "./Unit/Player/Player"; -import { HaloProjectileLauncher } from "./Unit/Player/ProjectileLauncher/HaloProjectileLauncher"; -import { ProjectileData } from "./Unit/Player/ProjectileLauncher/ProjectileData"; -import { ProjectileLauncher } from "./Unit/Player/ProjectileLauncher/ProjectileLauncher"; -import { WaveProjectileLauncher } from "./Unit/Player/ProjectileLauncher/WaveProjectileLauncher"; +import { HaloProjectileLauncher } from "./Projectile/ProjectileLauncher/HaloProjectileLauncher"; +import { ProjectileData } from "./Projectile/ProjectileLauncher/ProjectileData"; +import { ProjectileLauncher } from "./Projectile/ProjectileLauncher/ProjectileLauncher"; +import { WaveProjectileLauncher } from "./Projectile/ProjectileLauncher/WaveProjectileLauncher"; import { Upgrader } from "./Upgrades/Upgrader"; import { MetaUpgradeType } from "./Upgrades/UpgradeType"; diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher.meta b/assets/Scripts/Game/Projectile/ProjectileLauncher.meta similarity index 77% rename from assets/Scripts/Game/Unit/Player/ProjectileLauncher.meta rename to assets/Scripts/Game/Projectile/ProjectileLauncher.meta index bc4e0e0..ebf7fe7 100644 --- a/assets/Scripts/Game/Unit/Player/ProjectileLauncher.meta +++ b/assets/Scripts/Game/Projectile/ProjectileLauncher.meta @@ -2,7 +2,7 @@ "ver": "1.1.0", "importer": "directory", "imported": true, - "uuid": "f996de47-37ab-489b-820f-fe7a38c09c64", + "uuid": "026e618b-14c5-44eb-943c-bd0fa9d59cf2", "files": [], "subMetas": {}, "userData": { diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/HaloProjectileLauncher.ts b/assets/Scripts/Game/Projectile/ProjectileLauncher/HaloProjectileLauncher.ts similarity index 81% rename from assets/Scripts/Game/Unit/Player/ProjectileLauncher/HaloProjectileLauncher.ts rename to assets/Scripts/Game/Projectile/ProjectileLauncher/HaloProjectileLauncher.ts index 0c8dab7..a4e646a 100644 --- a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/HaloProjectileLauncher.ts +++ b/assets/Scripts/Game/Projectile/ProjectileLauncher/HaloProjectileLauncher.ts @@ -1,11 +1,11 @@ import { Node, Vec2 } from "cc"; -import { ISignal } from "../../../../Services/EventSystem/ISignal"; -import { Signal } from "../../../../Services/EventSystem/Signal"; -import { GameTimer } from "../../../../Services/GameTimer"; -import { roundToOneDecimal } from "../../../../Services/Utils/MathUtils"; -import { HaloLauncherSettings } from "../../../Data/GameSettings"; -import { IProjectileLauncherSignaler } from "../../../Projectile/IProjectileLauncherSignaler"; -import { ProjectileCollision } from "../../../Projectile/ProjectileCollision"; +import { ISignal } from "../../../Services/EventSystem/ISignal"; +import { Signal } from "../../../Services/EventSystem/Signal"; +import { GameTimer } from "../../../Services/GameTimer"; +import { roundToOneDecimal } from "../../../Services/Utils/MathUtils"; +import { HaloLauncherSettings } from "../../Data/GameSettings"; +import { IProjectileLauncherSignaler } from "../IProjectileLauncherSignaler"; +import { ProjectileCollision } from "../ProjectileCollision"; import { ProjectileData } from "./ProjectileData"; import { ProjectileLauncher } from "./ProjectileLauncher"; diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/HaloProjectileLauncher.ts.meta b/assets/Scripts/Game/Projectile/ProjectileLauncher/HaloProjectileLauncher.ts.meta similarity index 100% rename from assets/Scripts/Game/Unit/Player/ProjectileLauncher/HaloProjectileLauncher.ts.meta rename to assets/Scripts/Game/Projectile/ProjectileLauncher/HaloProjectileLauncher.ts.meta diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileData.ts b/assets/Scripts/Game/Projectile/ProjectileLauncher/ProjectileData.ts similarity index 100% rename from assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileData.ts rename to assets/Scripts/Game/Projectile/ProjectileLauncher/ProjectileData.ts diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileData.ts.meta b/assets/Scripts/Game/Projectile/ProjectileLauncher/ProjectileData.ts.meta similarity index 100% rename from assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileData.ts.meta rename to assets/Scripts/Game/Projectile/ProjectileLauncher/ProjectileData.ts.meta diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileLauncher.ts b/assets/Scripts/Game/Projectile/ProjectileLauncher/ProjectileLauncher.ts similarity index 87% rename from assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileLauncher.ts rename to assets/Scripts/Game/Projectile/ProjectileLauncher/ProjectileLauncher.ts index 460b4de..6812833 100644 --- a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileLauncher.ts +++ b/assets/Scripts/Game/Projectile/ProjectileLauncher/ProjectileLauncher.ts @@ -1,12 +1,12 @@ import { _decorator, Component, Prefab, Vec2, Vec3 } from "cc"; -import { Empty } from "../../../../Menu/ModalWindows/Upgrades/UpgradesModalWindow"; -import { ISignal } from "../../../../Services/EventSystem/ISignal"; -import { Signal } from "../../../../Services/EventSystem/Signal"; -import { ObjectPool } from "../../../../Services/ObjectPool"; -import { getDegreeAngleFromDirection } from "../../../../Services/Utils/MathUtils"; -import { IProjectileLauncherSignaler } from "../../../Projectile/IProjectileLauncherSignaler"; -import { Projectile } from "../../../Projectile/Projectile"; -import { ProjectileCollision } from "../../../Projectile/ProjectileCollision"; +import { Empty } from "../../../Menu/ModalWindows/Upgrades/UpgradesModalWindow"; +import { ISignal } from "../../../Services/EventSystem/ISignal"; +import { Signal } from "../../../Services/EventSystem/Signal"; +import { ObjectPool } from "../../../Services/ObjectPool"; +import { getDegreeAngleFromDirection } from "../../../Services/Utils/MathUtils"; +import { IProjectileLauncherSignaler } from "../IProjectileLauncherSignaler"; +import { Projectile } from "../Projectile"; +import { ProjectileCollision } from "../ProjectileCollision"; const { ccclass, property } = _decorator; @ccclass("ProjectileLauncher") diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileLauncher.ts.meta b/assets/Scripts/Game/Projectile/ProjectileLauncher/ProjectileLauncher.ts.meta similarity index 100% rename from assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileLauncher.ts.meta rename to assets/Scripts/Game/Projectile/ProjectileLauncher/ProjectileLauncher.ts.meta diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/WaveProjectileLauncher.ts b/assets/Scripts/Game/Projectile/ProjectileLauncher/WaveProjectileLauncher.ts similarity index 79% rename from assets/Scripts/Game/Unit/Player/ProjectileLauncher/WaveProjectileLauncher.ts rename to assets/Scripts/Game/Projectile/ProjectileLauncher/WaveProjectileLauncher.ts index dd9199e..47dcc9b 100644 --- a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/WaveProjectileLauncher.ts +++ b/assets/Scripts/Game/Projectile/ProjectileLauncher/WaveProjectileLauncher.ts @@ -1,11 +1,11 @@ import { Node, Vec2 } from "cc"; -import { Empty } from "../../../../Menu/ModalWindows/Upgrades/UpgradesModalWindow"; -import { ISignal } from "../../../../Services/EventSystem/ISignal"; -import { GameTimer } from "../../../../Services/GameTimer"; -import { delay } from "../../../../Services/Utils/AsyncUtils"; -import { WaveLauncherSettings } from "../../../Data/GameSettings"; -import { IProjectileLauncherSignaler } from "../../../Projectile/IProjectileLauncherSignaler"; -import { ProjectileCollision } from "../../../Projectile/ProjectileCollision"; +import { Empty } from "../../../Menu/ModalWindows/Upgrades/UpgradesModalWindow"; +import { ISignal } from "../../../Services/EventSystem/ISignal"; +import { GameTimer } from "../../../Services/GameTimer"; +import { delay } from "../../../Services/Utils/AsyncUtils"; +import { WaveLauncherSettings } from "../../Data/GameSettings"; +import { IProjectileLauncherSignaler } from "../IProjectileLauncherSignaler"; +import { ProjectileCollision } from "../ProjectileCollision"; import { ProjectileData } from "./ProjectileData"; import { ProjectileLauncher } from "./ProjectileLauncher"; diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/WaveProjectileLauncher.ts.meta b/assets/Scripts/Game/Projectile/ProjectileLauncher/WaveProjectileLauncher.ts.meta similarity index 100% rename from assets/Scripts/Game/Unit/Player/ProjectileLauncher/WaveProjectileLauncher.ts.meta rename to assets/Scripts/Game/Projectile/ProjectileLauncher/WaveProjectileLauncher.ts.meta diff --git a/assets/Scripts/Game/Unit/Enemy/ProjectileLauncher.cs/EnemyProjectileLauncher.ts b/assets/Scripts/Game/Unit/Enemy/ProjectileLauncher.cs/EnemyProjectileLauncher.ts index df179c7..3a35f92 100644 --- a/assets/Scripts/Game/Unit/Enemy/ProjectileLauncher.cs/EnemyProjectileLauncher.ts +++ b/assets/Scripts/Game/Unit/Enemy/ProjectileLauncher.cs/EnemyProjectileLauncher.ts @@ -1,7 +1,7 @@ import { Vec3, Node, Vec2 } from "cc"; import { GameTimer } from "../../../../Services/GameTimer"; import { EnemyLauncherSettings } from "../../../Data/GameSettings"; -import { ProjectileLauncher } from "../../Player/ProjectileLauncher/ProjectileLauncher"; +import { ProjectileLauncher } from "../../../Projectile/ProjectileLauncher/ProjectileLauncher"; import { Enemy } from "../Enemy"; import { EnemyManager } from "../EnemyManager"; diff --git a/assets/Scripts/Game/Upgrades/Upgrader.ts b/assets/Scripts/Game/Upgrades/Upgrader.ts index 3e46f2e..ef6bfb9 100644 --- a/assets/Scripts/Game/Upgrades/Upgrader.ts +++ b/assets/Scripts/Game/Upgrades/Upgrader.ts @@ -1,7 +1,7 @@ import { UpgradeSettings } from "../Data/GameSettings"; import { Player } from "../Unit/Player/Player"; -import { HaloProjectileLauncher } from "../Unit/Player/ProjectileLauncher/HaloProjectileLauncher"; -import { WaveProjectileLauncher } from "../Unit/Player/ProjectileLauncher/WaveProjectileLauncher"; +import { HaloProjectileLauncher } from "../Projectile/ProjectileLauncher/HaloProjectileLauncher"; +import { WaveProjectileLauncher } from "../Projectile/ProjectileLauncher/WaveProjectileLauncher"; import { UpgradeType } from "./UpgradeType"; export class Upgrader {