Test_Project_Cocos/Slash-The-Hordes
1
0
Fork 0
mirror of https://github.com/MartinKral/Slash-The-Hordes synced 2025-10-09 08:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
Martin
2022-11-16 12:26:20 +01:00
parent 3dd10f13ef
commit 0eb9cc907f
23 changed files with 1312 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/Scripts/Services/EventSystem/Signal.ts
View File

@@ -17,8 +17,12 @@ export class Signal<T> implements ISignal<T> {
}
public trigger(data: T): void {
for (let i = 0; i < this.handlers.length; i++) {
this.handlers[i].call(this.thisArgs[i], data);
// protect from trigger >> off
const handlers: ((data: T) => void)[] = [...this.handlers];
const thisArgs: any[] = [...this.thisArgs];
for (let i = 0; i < handlers.length; i++) {
handlers[i].call(thisArgs[i], data);
}
}
}

14
assets/Scripts/Services/ObjectPool.ts
View File

@@ -4,12 +4,12 @@ export class ObjectPool<T extends Component> {
private prefab: Prefab;
private parent: Node;
private pooledObjects: PooledObject<T>[] = [];
private componentType: { new (): T };
private componentName: string;
public constructor(prefab: Prefab, parent: Node, defaultPoolCount: number, componentType: { new (): T }) {
public constructor(prefab: Prefab, parent: Node, defaultPoolCount: number, componentName: string) {
this.prefab = prefab;
this.parent = parent;
this.componentType = componentType;
this.componentName = componentName;
for (let i = 0; i < defaultPoolCount; i++) {
this.pooledObjects.push(this.createNew());
@@ -35,7 +35,7 @@ export class ObjectPool<T extends Component> {
}
private createNew(): PooledObject<T> {
const newPooledObject: PooledObject<T> = new PooledObject(this.prefab, this.parent, this.componentType);
const newPooledObject: PooledObject<T> = new PooledObject(this.prefab, this.parent, this.componentName);
this.pooledObjects.push(newPooledObject);
return newPooledObject;
@@ -48,13 +48,13 @@ class PooledObject<T extends Component> {
private instancedNode: Node;
private instancedComponent: T;
public constructor(prefab: Prefab, defaultParent: Node, componentType: { new (): T }) {
public constructor(prefab: Prefab, defaultParent: Node, componentName: string) {
this.defaultParent = defaultParent;
this.instancedNode = instantiate(prefab);
this.instancedComponent = <T>this.instancedNode.getComponent(componentType.name);
this.instancedComponent = <T>this.instancedNode.getComponent(componentName);
if (this.instancedComponent == null) {
throw new Error("Object " + prefab.name + " does not have component " + componentType.name);
console.log("Object " + prefab.name + " does not have component " + componentName);
}
this.clear();