From 4c99bcd5e55a92a5c43f50accbd98bdded0af90b Mon Sep 17 00:00:00 2001 From: dgflash Date: Fri, 12 Aug 2022 17:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/core/Oops.ts | 3 ++- assets/core/Root.ts | 1 + assets/core/utils/ArrayUtil.ts | 7 +++---- assets/core/utils/CameraUtil.ts | 7 +++++++ assets/core/utils/MathUtil.ts | 1 + assets/core/utils/ObjectUtil.ts | 9 +++++++-- assets/core/utils/PlatformUtil.ts | 16 ++++++++++------ assets/core/utils/RegexUtil.ts | 11 ++++++++--- assets/core/utils/RotateUtil.ts | 7 +++++++ assets/core/utils/StringUtil.ts | 9 +-------- assets/core/utils/Vec3Util.ts | 1 + assets/core/utils/ViewUtil.ts | 3 ++- 12 files changed, 50 insertions(+), 25 deletions(-) diff --git a/assets/core/Oops.ts b/assets/core/Oops.ts index ee98c11..d30f306 100644 --- a/assets/core/Oops.ts +++ b/assets/core/Oops.ts @@ -2,7 +2,7 @@ * @Author: dgflash * @Date: 2022-02-11 09:32:47 * @LastEditors: dgflash - * @LastEditTime: 2022-08-03 15:48:31 + * @LastEditTime: 2022-08-12 16:52:00 */ import { ECSRootSystem } from "../libs/ecs/ECSSystem"; import { LanguageManager } from "../libs/gui/language/Language"; @@ -20,6 +20,7 @@ export var version: string = "1.0.8"; export class oops { /** ----------核心模块---------- */ + /** 日志管理 */ static log = Logger; /** 全局消息 */ diff --git a/assets/core/Root.ts b/assets/core/Root.ts index 3ffa2e8..4545e28 100644 --- a/assets/core/Root.ts +++ b/assets/core/Root.ts @@ -67,6 +67,7 @@ export class Root extends Component { oops.game = new GameManager(this.game!); oops.gui = new LayerManager(this.gui!); this.initGui(); + oops.ecs = new ecs.RootSystem(); this.initEcsSystem(); oops.ecs.init(); diff --git a/assets/core/utils/ArrayUtil.ts b/assets/core/utils/ArrayUtil.ts index 966c202..b813f19 100644 --- a/assets/core/utils/ArrayUtil.ts +++ b/assets/core/utils/ArrayUtil.ts @@ -2,11 +2,10 @@ * @Author: dgflash * @Date: 2021-08-11 16:41:12 * @LastEditors: dgflash - * @LastEditTime: 2022-01-24 15:00:52 - */ -/** - * 数组工具 + * @LastEditTime: 2022-08-12 16:51:46 */ + +/** 数组工具 */ export default class ArrayUtil { /** 去重 */ public static noRepeated(arr: any[]) { diff --git a/assets/core/utils/CameraUtil.ts b/assets/core/utils/CameraUtil.ts index c296457..5a70a90 100644 --- a/assets/core/utils/CameraUtil.ts +++ b/assets/core/utils/CameraUtil.ts @@ -1,5 +1,12 @@ +/* + * @Author: dgflash + * @Date: 2022-07-26 15:29:57 + * @LastEditors: dgflash + * @LastEditTime: 2022-08-12 16:51:38 + */ import { Camera, Vec3, view } from "cc"; +/** 摄像机工具 */ export class CameraUtil { /** * 当前世界坐标是否在摄像机显示范围内 diff --git a/assets/core/utils/MathUtil.ts b/assets/core/utils/MathUtil.ts index fa62e27..dfa7cb3 100644 --- a/assets/core/utils/MathUtil.ts +++ b/assets/core/utils/MathUtil.ts @@ -1,3 +1,4 @@ +/** 数学工具 */ export class MathUtil { /** * 角度转弧度 diff --git a/assets/core/utils/ObjectUtil.ts b/assets/core/utils/ObjectUtil.ts index 1e73704..8d7c143 100644 --- a/assets/core/utils/ObjectUtil.ts +++ b/assets/core/utils/ObjectUtil.ts @@ -1,6 +1,11 @@ -/** - * 对象工具 +/* + * @Author: dgflash + * @Date: 2022-07-26 15:29:57 + * @LastEditors: dgflash + * @LastEditTime: 2022-08-12 16:50:30 */ + +/** 对象工具 */ export default class ObjectUtil { /** * 判断指定的值是否为对象 diff --git a/assets/core/utils/PlatformUtil.ts b/assets/core/utils/PlatformUtil.ts index 0b7e59d..78d613b 100644 --- a/assets/core/utils/PlatformUtil.ts +++ b/assets/core/utils/PlatformUtil.ts @@ -1,27 +1,31 @@ /* * @Date: 2021-08-14 16:17:03 - * @LastEditors: H.Joeson - * @LastEditTime: 2021-11-25 15:52:12 + * @LastEditors: dgflash + * @LastEditTime: 2022-08-12 16:50:15 */ -import { sys } from "cc"; +import { native, sys } from "cc"; +/** 平台数据 */ export class PlatformUtil { + /** 是否为安卓系统 */ public static isNativeAndroid() { - if (typeof jsb == "undefined") + if (typeof native == "undefined") return false if (sys.isNative && sys.platform === sys.Platform.ANDROID) return true return false } + /** 是否为苹果系统 */ public static isNativeIOS() { - if (typeof jsb == "undefined") + if (typeof native == "undefined") return false if (sys.isNative && sys.os === sys.OS.IOS) return true return false } + /** 获取平台名 */ public static getPlateform() { if (this.isNativeAndroid()) return 'android' @@ -31,7 +35,7 @@ export class PlatformUtil { return 'h5' } - public static isIOSwebview = function () { + public static isIOSWebview() { //@ts-ignore if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.sdkLoginOut) return true diff --git a/assets/core/utils/RegexUtil.ts b/assets/core/utils/RegexUtil.ts index 0a863aa..7b3bbb4 100644 --- a/assets/core/utils/RegexUtil.ts +++ b/assets/core/utils/RegexUtil.ts @@ -1,12 +1,17 @@ -/** - * 正则工具 +/* + * @Author: dgflash + * @Date: 2022-07-26 15:29:57 + * @LastEditors: dgflash + * @LastEditTime: 2022-08-12 16:48:08 */ + +/** 正则工具 */ export default class RegexUtil { /** * 判断字符是否为双字节字符(如中文字符) * @param string 原字符串 */ - public static isDWORD(string: string): boolean { + public static isDoubleWord(string: string): boolean { return /[^\x00-\xff]/.test(string); } } diff --git a/assets/core/utils/RotateUtil.ts b/assets/core/utils/RotateUtil.ts index 0befb21..cc4caff 100644 --- a/assets/core/utils/RotateUtil.ts +++ b/assets/core/utils/RotateUtil.ts @@ -1,6 +1,13 @@ +/* + * @Author: dgflash + * @Date: 2022-07-26 15:29:57 + * @LastEditors: dgflash + * @LastEditTime: 2022-08-12 16:50:07 + */ import { Node, Quat, toRadian, Vec3 } from "cc"; import { Vec3Util } from "./Vec3Util"; +/** 旋转工具 */ export class RotateUtil { /** * 自由旋转 diff --git a/assets/core/utils/StringUtil.ts b/assets/core/utils/StringUtil.ts index 2e08085..98a3010 100644 --- a/assets/core/utils/StringUtil.ts +++ b/assets/core/utils/StringUtil.ts @@ -1,11 +1,4 @@ -import { Vec3 } from "cc"; - -/* - * @Author: dgflash - * @Date: 2021-08-11 16:41:12 - * @LastEditors: H.Joeson - * @LastEditTime: 2021-09-14 10:54:02 - */ +/** 字符串工具 */ export class StringUtil { /** 123456789 = 123,456,789 */ public static numberTotPermil(num: number): string { diff --git a/assets/core/utils/Vec3Util.ts b/assets/core/utils/Vec3Util.ts index 8d103b3..c89ef34 100644 --- a/assets/core/utils/Vec3Util.ts +++ b/assets/core/utils/Vec3Util.ts @@ -2,6 +2,7 @@ import { Mat4, Vec3 } from "cc"; import { MathUtil } from "./MathUtil"; +/** 向量工具 */ export class Vec3Util { /** * X轴 diff --git a/assets/core/utils/ViewUtil.ts b/assets/core/utils/ViewUtil.ts index a936ccc..526ed45 100644 --- a/assets/core/utils/ViewUtil.ts +++ b/assets/core/utils/ViewUtil.ts @@ -2,11 +2,12 @@ * @Author: dgflash * @Date: 2021-08-16 09:34:56 * @LastEditors: dgflash - * @LastEditTime: 2022-07-25 11:51:27 + * @LastEditTime: 2022-08-12 16:49:41 */ import { Animation, AnimationClip, EventTouch, instantiate, Node, Prefab, Size, UITransform, v3, Vec3 } from "cc"; import { resLoader } from "../common/loader/ResLoader"; +/** 显示对象工具 */ export class ViewUtil { /** * 把Node当前的节点树结构根据Node命名转成一个js对象,重名的组件会覆盖,