Audio player

This commit is contained in:
Martin
2022-12-20 10:00:47 +01:00
parent 8512aa898d
commit 2105682fd9
14 changed files with 713 additions and 270 deletions

View File

@@ -0,0 +1,12 @@
{
"ver": "1.1.0",
"importer": "directory",
"imported": true,
"uuid": "263ab535-5757-4b2b-adc1-04823e77e433",
"files": [],
"subMetas": {},
"userData": {
"compressionType": {},
"isRemoteBundle": {}
}
}

View File

@@ -0,0 +1,32 @@
import { _decorator, Component, Node, AudioClip } from "cc";
import { AppRoot } from "../../AppRoot/AppRoot";
import { AudioPlayer } from "../../Services/AudioPlayer/AudioPlayer";
import { Enemy } from "../Unit/Enemy/Enemy";
import { EnemyManager } from "../Unit/Enemy/EnemyManager";
const { ccclass, property } = _decorator;
@ccclass("GameAudioAdapter")
export class GameAudioAdapter extends Component {
@property(AudioClip) private enemyHit: AudioClip;
private audioPlayer: AudioPlayer;
public init(enemyManager: EnemyManager): void {
this.audioPlayer = AppRoot.Instance.AudioPlayer;
enemyManager.EnemyAddedEvent.on(this.addEnemyListeners, this);
enemyManager.EnemyRemovedEvent.on(this.removeEnemyListeners, this);
}
private addEnemyListeners(enemy: Enemy): void {
enemy.Health.HealthPointsChangeEvent.on(this.playEnemyHitSound, this);
}
private removeEnemyListeners(enemy: Enemy): void {
enemy.Health.HealthPointsChangeEvent.off(this.playEnemyHitSound);
}
private playEnemyHitSound(): void {
this.audioPlayer.playSound(this.enemyHit);
}
}

View File

@@ -0,0 +1,9 @@
{
"ver": "4.0.23",
"importer": "typescript",
"imported": true,
"uuid": "eb84241d-4cc1-4e50-911d-c0c880ec024d",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@@ -2,6 +2,7 @@ import { Camera, Component, JsonAsset, KeyCode, Vec2, _decorator } from "cc";
import { runInThisContext } from "vm";
import { ModalWindowManager } from "../Services/ModalWindowSystem/ModalWindowManager";
import { delay } from "../Services/Utils/AsyncUtils";
import { GameAudioAdapter } from "./Audio/GameAudioAdapter";
import { Background } from "./Background/Background";
import { PlayerCollisionSystem } from "./Collision/PlayerCollisionSystem";
import { PlayerProjectileCollisionSystem } from "./Collision/PlayerProjectileCollisionSystem";
@@ -39,6 +40,7 @@ export class Game extends Component {
@property(GameUI) private gameUI: GameUI;
@property(Background) private background: Background;
@property(ModalWindowManager) private modalWindowManager: ModalWindowManager;
@property(GameAudioAdapter) private gameAudioAdapter: GameAudioAdapter;
private playerCollisionSystem: PlayerCollisionSystem;
private haloProjectileLauncher: HaloProjectileLauncher;
@@ -127,6 +129,7 @@ export class Game extends Component {
this.player.Level.addXp(testValues.startXP);
}
this.gameAudioAdapter.init(this.enemyManager);
this.gamePauser.resume();
while (this.player.Health.IsAlive) await delay(100);

View File

@@ -1,5 +1,5 @@
import { Component, Node, random, randomRange, Vec3, _decorator } from "cc";
import { ISignal } from "../../../Services/EventSystem/ISignal";
import { EnemyManagerSettings } from "../../Data/GameSettings";
import { GoldSpawner } from "../../Gold/GoldSpawner";
import { XPSpawner } from "../../XP/XPSpawner";
@@ -30,7 +30,7 @@ export class EnemyManager extends Component {
public init(targetNode: Node, settings: EnemyManagerSettings): void {
this.enemySpawner.init(targetNode, settings.enemies);
this.enemySpawner.EnemyAddedEvent.on(this.onEnemyAdded, this);
this.enemySpawner.enemyRemovedEvent.on(this.onRemoveEnemy, this);
this.enemySpawner.EnemyRemovedEvent.on(this.onEnemyRemoved, this);
for (const individualSpawnerSettings of settings.individualEnemySpawners) {
const individualSpawner = new IndividualEnemySpawner(this.enemySpawner, individualSpawnerSettings);
@@ -65,10 +65,25 @@ export class EnemyManager extends Component {
}
}
private onEnemyDied(enemy: Enemy): void {
enemy.DeathEvent.off(this.onEnemyDied);
enemy.LifetimeEndedEvent.off(this.onEnemyLifetimeEnded);
public get EnemyAddedEvent(): ISignal<Enemy> {
return this.enemySpawner.EnemyAddedEvent;
}
public get EnemyRemovedEvent(): ISignal<Enemy> {
return this.enemySpawner.EnemyRemovedEvent;
}
private onEnemyAdded(enemy: Enemy): void {
enemy.DeathEvent.on(this.onEnemyDied, this);
this.getEnemyMover(enemy).addEnemy(enemy);
}
private onEnemyRemoved(enemy: Enemy): void {
enemy.DeathEvent.off(this.onEnemyDied);
this.getEnemyMover(enemy).removeEnemy(enemy);
}
private onEnemyDied(enemy: Enemy): void {
for (let index = 0; index < enemy.XPReward; index++) {
const position: Vec3 = enemy.node.worldPosition;
position.x += randomRange(-10, 10);
@@ -92,22 +107,6 @@ export class EnemyManager extends Component {
}
}
private onEnemyLifetimeEnded(enemy: Enemy): void {
enemy.DeathEvent.off(this.onEnemyDied);
enemy.LifetimeEndedEvent.off(this.onEnemyLifetimeEnded);
}
private onEnemyAdded(enemy: Enemy): void {
enemy.DeathEvent.on(this.onEnemyDied, this);
enemy.LifetimeEndedEvent.on(this.onEnemyLifetimeEnded, this);
this.getEnemyMover(enemy).addEnemy(enemy);
}
private onRemoveEnemy(enemy: Enemy): void {
this.getEnemyMover(enemy).removeEnemy(enemy);
}
private getEnemyMover(enemy: Enemy): EnemyMover {
if (this.movementTypeToMover.has(enemy.MovementType)) {
return this.movementTypeToMover.get(enemy.MovementType);

View File

@@ -12,8 +12,8 @@ const { ccclass, property } = _decorator;
export class EnemySpawner extends Component {
@property(Prefab) private enemies: Prefab[] = [];
public enemyAddedEvent: Signal<Enemy> = new Signal<Enemy>();
public enemyRemovedEvent: Signal<Enemy> = new Signal<Enemy>();
private enemyAddedEvent: Signal<Enemy> = new Signal<Enemy>();
private enemyRemovedEvent: Signal<Enemy> = new Signal<Enemy>();
private enemyGraphicsTypeToPool = new Map<EnemyGraphicsType, ObjectPool<Enemy>>();
private targetNode: Node;