Merge branch 'master' of https://github.com/esengine/egret-framework
# Conflicts: # demo/libs/framework/framework.min.js
This commit is contained in:
@@ -55,7 +55,7 @@ module es {
|
||||
}
|
||||
|
||||
public hasOpened(): boolean {
|
||||
return this._numClosed > 0;
|
||||
return this._numOpened > 0;
|
||||
}
|
||||
|
||||
public removeOpened(node: AStarNode){
|
||||
|
||||
@@ -36,7 +36,11 @@ module es {
|
||||
this.dontCare = dontcare;
|
||||
}
|
||||
|
||||
public set(conditionId: number, value: boolean): boolean {
|
||||
public set(conditionId: number | string, value: boolean): boolean {
|
||||
if (typeof conditionId == "string"){
|
||||
return this.set(this.planner.findConditionNameIndex(conditionId), value);
|
||||
}
|
||||
|
||||
this.values = value ? (this.values | (1 << conditionId)) : (this.values & ~(1 << conditionId));
|
||||
this.dontCare ^= (1 << conditionId);
|
||||
return true;
|
||||
|
||||
@@ -232,7 +232,7 @@ module es {
|
||||
}
|
||||
|
||||
protected async update() {
|
||||
this.startDebugUpdate();
|
||||
// this.startDebugUpdate();
|
||||
|
||||
// 更新我们所有的系统管理器
|
||||
Time.update(egret.getTimer());
|
||||
@@ -266,7 +266,7 @@ module es {
|
||||
}
|
||||
}
|
||||
|
||||
this.endDebugUpdate();
|
||||
// this.endDebugUpdate();
|
||||
|
||||
await this.draw();
|
||||
}
|
||||
|
||||
@@ -75,6 +75,7 @@ module es {
|
||||
for (let i = 0; i < this._components.length; i++) {
|
||||
let component = this._components.buffer[i];
|
||||
|
||||
if (!component) continue;
|
||||
// 处理渲染层列表
|
||||
if (component instanceof RenderableComponent) {
|
||||
if (component.displayObject.parent)
|
||||
@@ -161,6 +162,7 @@ module es {
|
||||
}
|
||||
|
||||
public handleRemove(component: Component) {
|
||||
if (!component) return;
|
||||
// 处理渲染层列表
|
||||
if (component instanceof RenderableComponent) {
|
||||
if (component.displayObject.parent)
|
||||
|
||||
@@ -3,7 +3,7 @@ module es {
|
||||
* 用于池任何对象
|
||||
*/
|
||||
export class Pool<T> {
|
||||
private static _objectQueue = new Array(10);
|
||||
private static _objectQueue = [];
|
||||
|
||||
/**
|
||||
* 预热缓存,使用最大的cacheCount对象填充缓存
|
||||
|
||||
Reference in New Issue
Block a user