From 4eeeeb28ff4259083ab53e14864019dc226cab6f Mon Sep 17 00:00:00 2001 From: dgflash Date: Fri, 15 Jul 2022 17:30:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9F=B3=E6=95=88=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E5=87=BA=E9=94=99=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=9F=B3=E6=95=88=E6=A8=A1=E5=9D=97=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- assets/demo.meta | 2 +- assets/demo/loader/Main.ts | 2 +- assets/script/Main.ts | 4 ++-- assets/script/demo.meta | 12 ------------ assets/script/game/common/config/GameUIConfig.ts | 2 +- .../assets/core/common/audio/AudioManager.ts | 4 ++-- 7 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 assets/script/demo.meta diff --git a/README.md b/README.md index 6315238..d08d741 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ oops-framework 基于 Cocos Creato 3.x 开发的一款游戏框架 4. 框架提供游戏常用插件工具 注: -1. [源库链接更新效率更高](https://gitee.com/dgflash/oops-framework)(好用记得给作者一个Star) +1. [源库链接更新效率更高](https://gitee.com/dgflash/oops-framework),好用记得给作者一个Star,你们的支持就是我持续维护的动力。 2. Cocos Creato 3.x 不同版的框架在源库分支中下载,master分支为最新引擎版本 3. 学习交流 QQ 群:798575969 diff --git a/assets/demo.meta b/assets/demo.meta index ce16d17..3943da1 100644 --- a/assets/demo.meta +++ b/assets/demo.meta @@ -2,7 +2,7 @@ "ver": "1.1.0", "importer": "directory", "imported": true, - "uuid": "dee17c04-d12f-43b3-a76a-5af805417001", + "uuid": "10b470dc-2622-4241-84ef-cf2163fa0e0d", "files": [], "subMetas": {}, "userData": { diff --git a/assets/demo/loader/Main.ts b/assets/demo/loader/Main.ts index 95f53cd..4c60eea 100644 --- a/assets/demo/loader/Main.ts +++ b/assets/demo/loader/Main.ts @@ -2,7 +2,7 @@ * @Author: dgflash * @Date: 2022-07-14 10:57:43 * @LastEditors: dgflash - * @LastEditTime: 2022-07-14 16:28:43 + * @LastEditTime: 2022-07-15 14:23:16 */ import { _decorator } from 'cc'; import { Root } from '../../../extensions/oops-framework/assets/core/Root'; diff --git a/assets/script/Main.ts b/assets/script/Main.ts index 643eefa..e9ee6fa 100644 --- a/assets/script/Main.ts +++ b/assets/script/Main.ts @@ -2,7 +2,7 @@ * @Author: dgflash * @Date: 2021-07-03 16:13:17 * @LastEditors: dgflash - * @LastEditTime: 2022-07-13 14:55:08 + * @LastEditTime: 2022-07-15 17:02:40 */ import { dynamicAtlasManager, macro, profiler, _decorator } from 'cc'; import { DEBUG, JSB } from 'cc/env'; @@ -25,7 +25,7 @@ export class Main extends CommonEnter { } protected async run() { - smc.initialize = ecs.getEntity(Initialize); + smc.initialize = ecs.getEntity(Initialize); if (JSB) { oops.gui.toast("热更新后新程序的提示"); diff --git a/assets/script/demo.meta b/assets/script/demo.meta deleted file mode 100644 index 6ec85c3..0000000 --- a/assets/script/demo.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.1.0", - "importer": "directory", - "imported": true, - "uuid": "15826589-066c-4a3b-b863-c408675f0692", - "files": [], - "subMetas": {}, - "userData": { - "compressionType": {}, - "isRemoteBundle": {} - } -} diff --git a/assets/script/game/common/config/GameUIConfig.ts b/assets/script/game/common/config/GameUIConfig.ts index 558a361..3c4dbbc 100644 --- a/assets/script/game/common/config/GameUIConfig.ts +++ b/assets/script/game/common/config/GameUIConfig.ts @@ -1,7 +1,7 @@ /* * @Date: 2021-08-12 09:33:37 * @LastEditors: dgflash - * @LastEditTime: 2022-06-14 18:42:43 + * @LastEditTime: 2022-07-15 17:18:53 */ import { LayerType, UIConfig } from "../../../../../extensions/oops-framework/assets/core/gui/layer/LayerManager"; diff --git a/extensions/oops-framework/assets/core/common/audio/AudioManager.ts b/extensions/oops-framework/assets/core/common/audio/AudioManager.ts index bdc82af..9036f32 100644 --- a/extensions/oops-framework/assets/core/common/audio/AudioManager.ts +++ b/extensions/oops-framework/assets/core/common/audio/AudioManager.ts @@ -157,8 +157,8 @@ export class AudioManager extends Component { this._switch_effect = true; } - this.music.volume = this._volume_music; - this.effect.volume = this._volume_effect; + if (this.music) this.music.volume = this._volume_music; + if (this.effect) this.effect.volume = this._volume_effect; } } } \ No newline at end of file