|
|
|
@ -43,7 +43,8 @@ export class EventManager {
|
|
|
|
|
let result = null; |
|
|
|
|
for (let i = 0; i < EventManager.s_allEventContainer.length; i++) { |
|
|
|
|
|
|
|
|
|
if (EventManager.s_allEventContainer[i].key == c.name) { |
|
|
|
|
let obj = new c(); |
|
|
|
|
if (EventManager.s_allEventContainer[i].key == obj.getTypeKey()) { |
|
|
|
|
result = (EventManager.s_allEventContainer[i]); |
|
|
|
|
// console.log("找到已有的event" + (c.name));
|
|
|
|
|
return result; |
|
|
|
@ -73,7 +74,7 @@ export class EventManager {
|
|
|
|
|
|
|
|
|
|
let instance = EventManager.getEvent<T>(c); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
console.log("添加监听", instance.key); |
|
|
|
|
return instance.observable.add(callback, mask, insertFirst, scope, unregisterOnFirstCall); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -117,6 +118,7 @@ export class EventManager {
|
|
|
|
|
if (instance == null) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
// console.log("派发事件", instance.key);
|
|
|
|
|
instance.observable.notifyObservers(eventData); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -130,9 +132,11 @@ class EventContainer<T extends Event_Base> {
|
|
|
|
|
key: string; |
|
|
|
|
observable: Observable<T>; |
|
|
|
|
constructor(c: { new(): T }) { |
|
|
|
|
let obj = new c(); |
|
|
|
|
|
|
|
|
|
this.key = c.name; |
|
|
|
|
// console.log("EventContainer===" + this.key);
|
|
|
|
|
//this.key = c.name;
|
|
|
|
|
this.key = obj.getTypeKey(); |
|
|
|
|
console.log("EventContainer===" + this.key); |
|
|
|
|
this.observable = new Observable<T>(); |
|
|
|
|
} |
|
|
|
|
} |