Merge branch 'master' of https://github.com/esengine/egret-framework

# Conflicts: # demo/libs/framework/framework.min.js
2020-11-03 10:10:03 +08:00
parent 7268ebab4a 8191359953
commit 8b423310a6
16 changed files with 148 additions and 49 deletions
--- a/source/bin/framework.d.ts
+++ b/source/bin/framework.d.ts
@@ -280,7 +280,7 @@ declare module es {
        planner: ActionPlanner;
        static create(planner: ActionPlanner): WorldState;
        constructor(planner: ActionPlanner, values: number, dontcare: number);
-        set(conditionId: number, value: boolean): boolean;
+        set(conditionId: number | string, value: boolean): boolean;
        equals(other: WorldState): boolean;
        describe(planner: ActionPlanner): string;
    }