From 93768fb4d9b1e14390724d4d9ae3457fec34eef9 Mon Sep 17 00:00:00 2001 From: yhh <359807859@qq.com> Date: Thu, 21 Jan 2021 10:18:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 --- demo/egret_demo | 2 +- demo/laya_demo | 2 +- engine_support/egret | 1 - extensions/behaviourTree-ai | 2 +- source/bin/framework.d.ts | 4 ++-- source/bin/framework.js | 4 ++-- source/src/Utils/Extensions/RandomUtils.ts | 4 ++-- 8 files changed, 9 insertions(+), 13 deletions(-) delete mode 160000 engine_support/egret diff --git a/.gitmodules b/.gitmodules index 1e19f1ef..dade3a79 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "extensions/behaviourTree-ai"] path = extensions/behaviourTree-ai url = https://github.com/esengine/BehaviourTree-ai -[submodule "engine_support/egret"] - path = engine_support/egret - url = https://github.com/esengine/egret-ecs-ext.git [submodule "extensions/ecs-tween"] path = extensions/ecs-tween url = https://github.com/esengine/ecs-tween diff --git a/demo/egret_demo b/demo/egret_demo index dc0b808b..7fd94600 160000 --- a/demo/egret_demo +++ b/demo/egret_demo @@ -1 +1 @@ -Subproject commit dc0b808b401b255707ce0f4d3bac687b36264b6b +Subproject commit 7fd94600535df71004fd24193f51fc9b38616673 diff --git a/demo/laya_demo b/demo/laya_demo index daa14bd5..e4273ff0 160000 --- a/demo/laya_demo +++ b/demo/laya_demo @@ -1 +1 @@ -Subproject commit daa14bd5575c0c5194a2ecbeb40b5598aa75488f +Subproject commit e4273ff0f50601ebba1fa6345161a358ed074d00 diff --git a/engine_support/egret b/engine_support/egret deleted file mode 160000 index 05ab4bfb..00000000 --- a/engine_support/egret +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 05ab4bfb0d3d3f0ff7a3d9e5c507c184da03873f diff --git a/extensions/behaviourTree-ai b/extensions/behaviourTree-ai index 607f6c71..fb1f4e29 160000 --- a/extensions/behaviourTree-ai +++ b/extensions/behaviourTree-ai @@ -1 +1 @@ -Subproject commit 607f6c71310d4e68000804912f23076137c40cf8 +Subproject commit fb1f4e2903e96287c1bcc3d8b8c1d79ab571e982 diff --git a/source/bin/framework.d.ts b/source/bin/framework.d.ts index b5766ce9..bd70e6f5 100644 --- a/source/bin/framework.d.ts +++ b/source/bin/framework.d.ts @@ -3925,10 +3925,10 @@ declare class RandomUtils { */ static randrange(start: number, stop: number, step?: number): number; /** - * 返回a 到 b直间的随机整数,包括 a 和 b + * 返回a 到 b之间的随机整数,包括 a 和 b * @param a * @param b - * @return [a, b] 直接的随机整数 + * @return [a, b] 之间的随机整数 * */ static randint(a: number, b: number): number; diff --git a/source/bin/framework.js b/source/bin/framework.js index 81f3d67b..f4bd6517 100644 --- a/source/bin/framework.js +++ b/source/bin/framework.js @@ -10180,10 +10180,10 @@ var RandomUtils = /** @class */ (function () { return Math.floor(this.random() * n) * step + Math.min(start, stop); }; /** - * 返回a 到 b直间的随机整数,包括 a 和 b + * 返回a 到 b之间的随机整数,包括 a 和 b * @param a * @param b - * @return [a, b] 直接的随机整数 + * @return [a, b] 之间的随机整数 * */ RandomUtils.randint = function (a, b) { diff --git a/source/src/Utils/Extensions/RandomUtils.ts b/source/src/Utils/Extensions/RandomUtils.ts index 39d4116d..c6a9ffc2 100644 --- a/source/src/Utils/Extensions/RandomUtils.ts +++ b/source/src/Utils/Extensions/RandomUtils.ts @@ -26,10 +26,10 @@ class RandomUtils { } /** - * 返回a 到 b直间的随机整数,包括 a 和 b + * 返回a 到 b之间的随机整数,包括 a 和 b * @param a * @param b - * @return [a, b] 直接的随机整数 + * @return [a, b] 之间的随机整数 * */ public static randint(a: number, b: number): number {