From aac0bf064a4d30d7ec0bfa9fd506e3c2c80c7c61 Mon Sep 17 00:00:00 2001 From: dgflash Date: Sat, 5 Nov 2022 12:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/core/Oops.ts | 4 +-- assets/core/Root.ts | 18 +++++++++-- assets/core/common/loader/ResLoader.ts | 8 +---- .../2d/SpineFinishedRelease.ts | 4 +-- assets/libs/gui/button/ButtonEffect.ts | 6 ++-- assets/module/config/Config.ts | 32 +------------------ 6 files changed, 25 insertions(+), 47 deletions(-) diff --git a/assets/core/Oops.ts b/assets/core/Oops.ts index cc0e2c3..3daed27 100644 --- a/assets/core/Oops.ts +++ b/assets/core/Oops.ts @@ -8,7 +8,7 @@ import { ecs } from "../libs/ecs/ECS"; import { ECSRootSystem } from "../libs/ecs/ECSSystem"; import { LanguageManager } from "../libs/gui/language/Language"; import { HttpRequest } from "../libs/network/HttpRequest"; -import { config } from "../module/config/Config"; +import { Config } from "../module/config/Config"; import { AudioManager } from "./common/audio/AudioManager"; import { MessageManager } from "./common/event/MessageManager"; import { ResLoader } from "./common/loader/ResLoader"; @@ -25,7 +25,7 @@ export var version: string = "1.1.3"; export class oops { /** ----------核心模块---------- */ /** 游戏配置 */ - static config = config; + static config = new Config(); /** 日志管理 */ static log = Logger; /** 全局消息 */ diff --git a/assets/core/Root.ts b/assets/core/Root.ts index 983b219..327440e 100644 --- a/assets/core/Root.ts +++ b/assets/core/Root.ts @@ -4,8 +4,11 @@ * @LastEditors: dgflash * @LastEditTime: 2022-11-01 15:44:57 */ -import { Component, director, game, Game, log, Node, sys, view, _decorator } from "cc"; +import { Component, director, game, Game, JsonAsset, log, Node, sys, view, _decorator } from "cc"; import { LanguageManager } from "../libs/gui/language/Language"; +import { BuildTimeConstants } from "../module/config/BuildTimeConstants"; +import { GameConfig } from "../module/config/GameConfig"; +import { GameQueryConfig } from "../module/config/GameQueryConfig"; import { AudioManager } from "./common/audio/AudioManager"; import { EventMessage } from "./common/event/EventMessage"; import { TimerManager } from "./common/manager/TimerManager"; @@ -35,7 +38,18 @@ export class Root extends Component { onLoad() { console.log(`Oops Framework v${version}`); this.enabled = false; - oops.config.init(() => { + + let config_name = "config/config"; + oops.res.load(config_name, JsonAsset, () => { + var config = oops.res.get(config_name); + oops.config.btc = new BuildTimeConstants(); + oops.config.query = new GameQueryConfig(); + oops.config.game = new GameConfig(config); + oops.http.server = oops.config.game.httpServer; // Http 服务器地址 + oops.http.timeout = oops.config.game.httpTimeout; // Http 请求超时时间 + oops.storage.init(oops.config.game.localDataKey, oops.config.game.localDataIv); // 初始化本地存储加密 + game.frameRate = oops.config.game.frameRate; // 初始化每秒传输帧数 + this.enabled = true; this.init(); this.run(); diff --git a/assets/core/common/loader/ResLoader.ts b/assets/core/common/loader/ResLoader.ts index 09f8306..e9d9a8a 100644 --- a/assets/core/common/loader/ResLoader.ts +++ b/assets/core/common/loader/ResLoader.ts @@ -284,10 +284,4 @@ oops.res.loadDir("game", onProgressCallback, onCompleteCallback); }); } } -} - -/** - * 资源管理模块 - * @deprecated 下个版本废弃，请使用 oops.res - */ -export var resLoader = new ResLoader(); \ No newline at end of file +} \ No newline at end of file diff --git a/assets/libs/animator-effect/2d/SpineFinishedRelease.ts b/assets/libs/animator-effect/2d/SpineFinishedRelease.ts index 1340cfd..5f71a21 100644 --- a/assets/libs/animator-effect/2d/SpineFinishedRelease.ts +++ b/assets/libs/animator-effect/2d/SpineFinishedRelease.ts @@ -6,7 +6,7 @@ */ import { Component, sp, _decorator } from 'cc'; -import { resLoader } from '../../../core/common/loader/ResLoader'; +import { oops } from '../../../core/Oops'; const { ccclass, property } = _decorator; /** 动画播放完隐藏特效 */ @@ -28,7 +28,7 @@ export class SpineFinishedRelease extends Component { this.spine.setCompleteListener(this.onSpineComplete.bind(this)); if (this.resPath) { - resLoader.load(this.resPath, sp.SkeletonData, (err: Error | null, sd: sp.SkeletonData) => { + oops.res.load(this.resPath, sp.SkeletonData, (err: Error | null, sd: sp.SkeletonData) => { if (err) { console.error(`加载【${this.resPath}】的 SPINE 资源不存在`); return; diff --git a/assets/libs/gui/button/ButtonEffect.ts b/assets/libs/gui/button/ButtonEffect.ts index a45943d..162c895 100644 --- a/assets/libs/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 "../../../core/common/loader/ResLoader"; +import { oops } from "../../../core/Oops"; import ButtonSimple from "./ButtonSimple"; const { ccclass, property, menu } = _decorator; @@ -17,8 +17,8 @@ export default class ButtonEffect extends ButtonSimple { onLoad() { this.anim = this.node.addComponent(Animation); - var ac_start = resLoader.get("common/anim/button_scale_start", AnimationClip)!; - var ac_end = resLoader.get("common/anim/button_scale_end", AnimationClip)!; + var ac_start = oops.res.get("common/anim/button_scale_start", AnimationClip)!; + var ac_end = oops.res.get("common/anim/button_scale_end", AnimationClip)!; this.anim.defaultClip = ac_start; this.anim.createState(ac_start, ac_start?.name); this.anim.createState(ac_end, ac_end?.name); diff --git a/assets/module/config/Config.ts b/assets/module/config/Config.ts index bab94d6..366d962 100644 --- a/assets/module/config/Config.ts +++ b/assets/module/config/Config.ts @@ -5,8 +5,6 @@ * @LastEditTime: 2022-11-01 15:47:16 */ -import { game, JsonAsset } from "cc"; -import { oops } from "../../core/Oops"; import { BuildTimeConstants } from "./BuildTimeConstants"; import { GameConfig } from "./GameConfig"; import { GameQueryConfig } from "./GameQueryConfig"; @@ -21,32 +19,4 @@ export class Config { /** 浏览器查询参数 */ public query!: GameQueryConfig; - - /** 初始化游戏配置 */ - public init(callback: Function) { - let config_name = "config/config"; - oops.res.load(config_name, JsonAsset, () => { - var config = oops.res.get(config_name); - this.btc = new BuildTimeConstants(); - this.query = new GameQueryConfig(); - this.game = new GameConfig(config); - - // 初始化每秒传输帧数 - game.frameRate = this.game.frameRate; - // Http 服务器地址 - oops.http.server = this.game.httpServer; - // Http 请求超时时间 - oops.http.timeout = this.game.httpTimeout; - // 初始化本地存储加密 - oops.storage.init(this.game.localDataKey, this.game.localDataIv); - - callback(); - }); - } -} - -/** - * 游戏配置静态访问类 - * @deprecated 下个版本废弃，请使用 oops.config - */ -export const config = new Config() \ No newline at end of file +} \ No newline at end of file