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

# Conflicts: # source/bin/framework.min.js
2022-03-05 10:24:33 +08:00
parent ccc603b59f 8135f99616
commit 85f7bbbf1a
5 changed files with 9 additions and 4 deletions
--- a/source/bin/framework.d.ts
+++ b/source/bin/framework.d.ts
@@ -1355,7 +1355,7 @@ declare module es {
         */
        protected _isColliderRegistered: any;
        /**
-         * 镖师碰撞器的绝对位置
+         * 表示碰撞器的绝对位置
         */
        readonly absolutePosition: Vector2;
        /**