diff --git a/README.md b/README.md index fb83b7a..6776e34 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + #### 介绍 oops-plugin-framework 是基于 Cocos Creator 3.x 以插件形式使用的游戏框架，此版本框架代码与游戏具体业务逻辑代码分离，方便在项目开发过程随时更新框架最新版本代码。 @@ -31,14 +37,16 @@ git pull ``` core - 框加核心技术库 common - 游戏公共模块 - game - 游戏世界类(三维) - gui - 游戏界面类(二维) - badge - 红点提示组件 - button - 按钮组件 - label - 标签组件 - language - 多语言组件 + audio - 音频模块 + event - 全局事件 + loader - 加载模块 + log - 日志模块 + manager - 时间管理、随机管理 + storage - 本地存储 + game - 游戏世界类 + gui - 游戏界面类 layer - 多层界面、窗口管理 - prompt - 公共提示窗口组件 + prompt - 公共提示窗口 utils - 游戏各类工具库 Oops.ts - 框架功能访问接口 Root.ts - 框架视图层根节点管理组件 @@ -50,6 +58,11 @@ libs - 框架中可选技术库 camera - 三维摄像机控制组件 collection - 数据集合处理 ecs - ECS框架 + gui - 界面组件 + badge - 红点提示组件 + button - 按钮组件 + label - 标签组件 + language - 多语言组件 model-view - MVVM框架 network - 网络模块 render-texture - 渲染纹理组件 diff --git a/assets/core/Oops.ts b/assets/core/Oops.ts index 42ad107..ee98c11 100644 --- a/assets/core/Oops.ts +++ b/assets/core/Oops.ts @@ -2,9 +2,10 @@ * @Author: dgflash * @Date: 2022-02-11 09:32:47 * @LastEditors: dgflash - * @LastEditTime: 2022-07-25 17:08:16 + * @LastEditTime: 2022-08-03 15:48:31 */ import { ECSRootSystem } from "../libs/ecs/ECSSystem"; +import { LanguageManager } from "../libs/gui/language/Language"; import { HttpRequest } from "../libs/network/HttpRequest"; import { AudioManager } from "./common/audio/AudioManager"; import { Message } from "./common/event/MessageManager"; @@ -12,13 +13,13 @@ import { Logger } from "./common/log/Logger"; import { TimerManager } from "./common/manager/TimerManager"; import { storage } from "./common/storage/StorageManager"; import { GameManager } from "./game/GameManager"; -import { LanguageManager } from "./gui/language/Language"; import { LayerManager } from "./gui/layer/LayerManager"; /** 框架版本 */ export var version: string = "1.0.8"; export class oops { + /** ----------核心模块---------- */ /** 日志管理 */ static log = Logger; /** 全局消息 */ @@ -33,9 +34,11 @@ export class oops { static gui: LayerManager; /** 三维游戏世界管理 */ static game: GameManager; + + /** ----------可选模块---------- */ + /** 多语言模块 */ static language: LanguageManager; - /** HTTP */ static http: HttpRequest; /** ECS */ diff --git a/assets/core/Root.ts b/assets/core/Root.ts index 06e396d..5732dde 100644 --- a/assets/core/Root.ts +++ b/assets/core/Root.ts @@ -11,7 +11,7 @@ import { Message } from "./common/event/MessageManager"; import { TimerManager } from "./common/manager/TimerManager"; import { GameManager } from "./game/GameManager"; import { GUI } from "./gui/GUI"; -import { LanguageManager } from "./gui/language/Language"; +import { LanguageManager } from "../libs/gui/language/Language"; import { LayerManager } from "./gui/layer/LayerManager"; import { HttpRequest } from "../libs/network/HttpRequest"; import { oops, version } from "./Oops"; diff --git a/assets/core/gui/prompt/CommonPrompt.ts b/assets/core/gui/prompt/CommonPrompt.ts index b6bff25..6e90c59 100644 --- a/assets/core/gui/prompt/CommonPrompt.ts +++ b/assets/core/gui/prompt/CommonPrompt.ts @@ -1,6 +1,6 @@ import { Component, EventTouch, _decorator } from "cc"; import { oops } from "../../Oops"; -import { LanguageLabel } from "../language/LanguageLabel"; +import { LanguageLabel } from "../../../libs/gui/language/LanguageLabel"; const { ccclass, property, menu } = _decorator; diff --git a/assets/core/gui/prompt/Notify.ts b/assets/core/gui/prompt/Notify.ts index 4d12dec..0100e97 100644 --- a/assets/core/gui/prompt/Notify.ts +++ b/assets/core/gui/prompt/Notify.ts @@ -5,7 +5,7 @@ * @LastEditTime: 2022-06-16 10:05:54 */ import { Animation, Component, Label, _decorator } from "cc"; -import { LanguageLabel } from "../language/LanguageLabel"; +import { LanguageLabel } from "../../../libs/gui/language/LanguageLabel"; const { ccclass, property } = _decorator; diff --git a/assets/libs/gui.meta b/assets/libs/gui.meta new file mode 100644 index 0000000..6fa22b0 --- /dev/null +++ b/assets/libs/gui.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.0", + "importer": "directory", + "imported": true, + "uuid": "dcfddb63-9e21-45f1-bfdd-80a34b817bf5", + "files": [], + "subMetas": {}, + "userData": { + "compressionType": {}, + "isRemoteBundle": {} + } +} diff --git a/assets/core/gui/badge.meta b/assets/libs/gui/badge.meta similarity index 100% rename from assets/core/gui/badge.meta rename to assets/libs/gui/badge.meta diff --git a/assets/core/gui/badge/Badge.ts b/assets/libs/gui/badge/Badge.ts similarity index 100% rename from assets/core/gui/badge/Badge.ts rename to assets/libs/gui/badge/Badge.ts diff --git a/assets/core/gui/badge/Badge.ts.meta b/assets/libs/gui/badge/Badge.ts.meta similarity index 100% rename from assets/core/gui/badge/Badge.ts.meta rename to assets/libs/gui/badge/Badge.ts.meta diff --git a/assets/core/gui/badge/RoundRectMask.ts b/assets/libs/gui/badge/RoundRectMask.ts similarity index 100% rename from assets/core/gui/badge/RoundRectMask.ts rename to assets/libs/gui/badge/RoundRectMask.ts diff --git a/assets/core/gui/badge/RoundRectMask.ts.meta b/assets/libs/gui/badge/RoundRectMask.ts.meta similarity index 100% rename from assets/core/gui/badge/RoundRectMask.ts.meta rename to assets/libs/gui/badge/RoundRectMask.ts.meta diff --git a/assets/core/gui/button.meta b/assets/libs/gui/button.meta similarity index 100% rename from assets/core/gui/button.meta rename to assets/libs/gui/button.meta diff --git a/assets/core/gui/button/ButtonEffect.ts b/assets/libs/gui/button/ButtonEffect.ts similarity index 91% rename from assets/core/gui/button/ButtonEffect.ts rename to assets/libs/gui/button/ButtonEffect.ts index 3c6dcef..a45943d 100644 --- a/assets/core/gui/button/ButtonEffect.ts +++ b/assets/libs/gui/button/ButtonEffect.ts @@ -1,5 +1,5 @@ import { Animation, AnimationClip, EventTouch, _decorator } from "cc"; -import { resLoader } from "../../common/loader/ResLoader"; +import { resLoader } from "../../../core/common/loader/ResLoader"; import ButtonSimple from "./ButtonSimple"; const { ccclass, property, menu } = _decorator; diff --git a/assets/core/gui/button/ButtonEffect.ts.meta b/assets/libs/gui/button/ButtonEffect.ts.meta similarity index 100% rename from assets/core/gui/button/ButtonEffect.ts.meta rename to assets/libs/gui/button/ButtonEffect.ts.meta diff --git a/assets/core/gui/button/ButtonSimple.ts b/assets/libs/gui/button/ButtonSimple.ts similarity index 100% rename from assets/core/gui/button/ButtonSimple.ts rename to assets/libs/gui/button/ButtonSimple.ts diff --git a/assets/core/gui/button/ButtonSimple.ts.meta b/assets/libs/gui/button/ButtonSimple.ts.meta similarity index 100% rename from assets/core/gui/button/ButtonSimple.ts.meta rename to assets/libs/gui/button/ButtonSimple.ts.meta diff --git a/assets/core/gui/button/ButtonTouchLong.ts b/assets/libs/gui/button/ButtonTouchLong.ts similarity index 100% rename from assets/core/gui/button/ButtonTouchLong.ts rename to assets/libs/gui/button/ButtonTouchLong.ts diff --git a/assets/core/gui/button/ButtonTouchLong.ts.meta b/assets/libs/gui/button/ButtonTouchLong.ts.meta similarity index 100% rename from assets/core/gui/button/ButtonTouchLong.ts.meta rename to assets/libs/gui/button/ButtonTouchLong.ts.meta diff --git a/assets/core/gui/label.meta b/assets/libs/gui/label.meta similarity index 100% rename from assets/core/gui/label.meta rename to assets/libs/gui/label.meta diff --git a/assets/core/gui/label/LabelChange.ts b/assets/libs/gui/label/LabelChange.ts similarity index 100% rename from assets/core/gui/label/LabelChange.ts rename to assets/libs/gui/label/LabelChange.ts diff --git a/assets/core/gui/label/LabelChange.ts.meta b/assets/libs/gui/label/LabelChange.ts.meta similarity index 100% rename from assets/core/gui/label/LabelChange.ts.meta rename to assets/libs/gui/label/LabelChange.ts.meta diff --git a/assets/core/gui/label/LabelNumber.ts b/assets/libs/gui/label/LabelNumber.ts similarity index 100% rename from assets/core/gui/label/LabelNumber.ts rename to assets/libs/gui/label/LabelNumber.ts diff --git a/assets/core/gui/label/LabelNumber.ts.meta b/assets/libs/gui/label/LabelNumber.ts.meta similarity index 100% rename from assets/core/gui/label/LabelNumber.ts.meta rename to assets/libs/gui/label/LabelNumber.ts.meta diff --git a/assets/core/gui/label/LabelTime.ts b/assets/libs/gui/label/LabelTime.ts similarity index 95% rename from assets/core/gui/label/LabelTime.ts rename to assets/libs/gui/label/LabelTime.ts index 17dee3c..b543216 100644 --- a/assets/core/gui/label/LabelTime.ts +++ b/assets/libs/gui/label/LabelTime.ts @@ -1,6 +1,6 @@ import { Label, _decorator } from "cc"; import { EDITOR } from "cc/env"; -import { oops } from "../../Oops"; +import { oops } from "../../../core/Oops"; const { ccclass, property, menu } = _decorator; diff --git a/assets/core/gui/label/LabelTime.ts.meta b/assets/libs/gui/label/LabelTime.ts.meta similarity index 100% rename from assets/core/gui/label/LabelTime.ts.meta rename to assets/libs/gui/label/LabelTime.ts.meta diff --git a/assets/core/gui/language.meta b/assets/libs/gui/language.meta similarity index 100% rename from assets/core/gui/language.meta rename to assets/libs/gui/language.meta diff --git a/assets/core/gui/language/Language.ts b/assets/libs/gui/language/Language.ts similarity index 93% rename from assets/core/gui/language/Language.ts rename to assets/libs/gui/language/Language.ts index a804e5d..b8e1383 100644 --- a/assets/core/gui/language/Language.ts +++ b/assets/libs/gui/language/Language.ts @@ -1,6 +1,6 @@ import { error, warn } from "cc"; -import { EventDispatcher } from "../../common/event/EventDispatcher"; -import { Logger } from "../../common/log/Logger"; +import { EventDispatcher } from "../../../core/common/event/EventDispatcher"; +import { Logger } from "../../../core/common/log/Logger"; import { LanguageData } from "./LanguageData"; import { LanguagePack } from "./LanguagePack"; diff --git a/assets/core/gui/language/Language.ts.meta b/assets/libs/gui/language/Language.ts.meta similarity index 100% rename from assets/core/gui/language/Language.ts.meta rename to assets/libs/gui/language/Language.ts.meta diff --git a/assets/core/gui/language/LanguageData.ts b/assets/libs/gui/language/LanguageData.ts similarity index 100% rename from assets/core/gui/language/LanguageData.ts rename to assets/libs/gui/language/LanguageData.ts diff --git a/assets/core/gui/language/LanguageData.ts.meta b/assets/libs/gui/language/LanguageData.ts.meta similarity index 100% rename from assets/core/gui/language/LanguageData.ts.meta rename to assets/libs/gui/language/LanguageData.ts.meta diff --git a/assets/core/gui/language/LanguageLabel.ts b/assets/libs/gui/language/LanguageLabel.ts similarity index 100% rename from assets/core/gui/language/LanguageLabel.ts rename to assets/libs/gui/language/LanguageLabel.ts diff --git a/assets/core/gui/language/LanguageLabel.ts.meta b/assets/libs/gui/language/LanguageLabel.ts.meta similarity index 100% rename from assets/core/gui/language/LanguageLabel.ts.meta rename to assets/libs/gui/language/LanguageLabel.ts.meta diff --git a/assets/core/gui/language/LanguagePack.ts b/assets/libs/gui/language/LanguagePack.ts similarity index 93% rename from assets/core/gui/language/LanguagePack.ts rename to assets/libs/gui/language/LanguagePack.ts index 06ed7b0..eff9b35 100644 --- a/assets/core/gui/language/LanguagePack.ts +++ b/assets/libs/gui/language/LanguagePack.ts @@ -5,8 +5,8 @@ * @LastEditTime: 2022-07-21 16:08:59 */ import { director, error, JsonAsset, warn } from "cc"; -import { resLoader } from "../../common/loader/ResLoader"; -import { Logger } from "../../common/log/Logger"; +import { resLoader } from "../../../core/common/loader/ResLoader"; +import { Logger } from "../../../core/common/log/Logger"; import { LanguageData } from "./LanguageData"; import { LanguageLabel } from "./LanguageLabel"; import { LanguageSprite } from "./LanguageSprite"; diff --git a/assets/core/gui/language/LanguagePack.ts.meta b/assets/libs/gui/language/LanguagePack.ts.meta similarity index 100% rename from assets/core/gui/language/LanguagePack.ts.meta rename to assets/libs/gui/language/LanguagePack.ts.meta diff --git a/assets/core/gui/language/LanguagePointLabel.ts.meta b/assets/libs/gui/language/LanguagePointLabel.ts.meta similarity index 100% rename from assets/core/gui/language/LanguagePointLabel.ts.meta rename to assets/libs/gui/language/LanguagePointLabel.ts.meta diff --git a/assets/core/gui/language/LanguageSprite.ts b/assets/libs/gui/language/LanguageSprite.ts similarity index 91% rename from assets/core/gui/language/LanguageSprite.ts rename to assets/libs/gui/language/LanguageSprite.ts index 6c9bafa..24eec47 100644 --- a/assets/core/gui/language/LanguageSprite.ts +++ b/assets/libs/gui/language/LanguageSprite.ts @@ -2,11 +2,11 @@ * @Author: dgflash * @Date: 2021-11-24 15:51:01 * @LastEditors: dgflash - * @LastEditTime: 2022-07-21 16:08:10 + * @LastEditTime: 2022-08-03 15:24:51 */ import { CCString, Component, Size, Sprite, SpriteFrame, UITransform, _decorator } from "cc"; import { EDITOR } from "cc/env"; -import { resLoader } from "../../common/loader/ResLoader"; +import { resLoader } from "../../../core/common/loader/ResLoader"; import { LanguageData } from "./LanguageData"; const { ccclass, property, menu } = _decorator; diff --git a/assets/core/gui/language/LanguageSprite.ts.meta b/assets/libs/gui/language/LanguageSprite.ts.meta similarity index 100% rename from assets/core/gui/language/LanguageSprite.ts.meta rename to assets/libs/gui/language/LanguageSprite.ts.meta