From ed525d9ed2083eecb188e75b523f3b9756f964b3 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Thu, 25 Sep 2025 15:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF=E7=A0=81?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Scripts/Main/Common/GameRootUI.ts | 2 ++ assets/Scripts/Main/Manager/ResManager.ts | 4 ++-- assets/Scripts/Sub/MainScene.ts | 16 ------------- assets/Scripts/Sub/UI/PreloadUI.ts | 18 ++++++++++++-- assets/Scripts/chat18x/core/MainController.ts | 24 +++++++++++-------- 5 files changed, 34 insertions(+), 30 deletions(-) diff --git a/assets/Scripts/Main/Common/GameRootUI.ts b/assets/Scripts/Main/Common/GameRootUI.ts index ee9c033f..5dacf0d7 100644 --- a/assets/Scripts/Main/Common/GameRootUI.ts +++ b/assets/Scripts/Main/Common/GameRootUI.ts @@ -132,7 +132,9 @@ export default class GameRootUI extends Component { this.LayerNodeGroups[key] = newNode; } } + } + showDefault() { //默认打开的界面 if (this.DefaultUI.length > 0) { ResManager.I.loadSubpackagePrefab(this.DefaultUI, (res) => { diff --git a/assets/Scripts/Main/Manager/ResManager.ts b/assets/Scripts/Main/Manager/ResManager.ts index 5a2107db..7fbbeece 100644 --- a/assets/Scripts/Main/Manager/ResManager.ts +++ b/assets/Scripts/Main/Manager/ResManager.ts @@ -86,7 +86,7 @@ export default class ResManager { }); } else { assetManager.loadBundle( - "PB", + "Chat18x", (err: Error, _bundle: AssetManager.Bundle) => { if (err) { logger.log(err); @@ -137,7 +137,7 @@ export default class ResManager { }); } else { assetManager.loadBundle( - "PB", + "Chat18x", (err: Error, _bundle: AssetManager.Bundle) => { if (err) { logger.log(err); diff --git a/assets/Scripts/Sub/MainScene.ts b/assets/Scripts/Sub/MainScene.ts index b66a1d56..d447806a 100644 --- a/assets/Scripts/Sub/MainScene.ts +++ b/assets/Scripts/Sub/MainScene.ts @@ -25,21 +25,5 @@ export class MainScene extends Component { gameRootUI.InitByCreate(this.UIRoot, this.UILayerMod, "NavigationPanel"); } GameRootUI.MainCamera = this.MainCamera; - - // 初始化MainController并预加载数据 - this.initMainController(); - } - - /** - * 初始化MainController并预加载数据 - */ - private async initMainController(): Promise { - try { - logger.log("[MainScene] 开始初始化MainController"); - await MainController.I.init(); - logger.log("[MainScene] MainController初始化完成"); - } catch (error) { - logger.error("[MainScene] MainController初始化失败:", error); - } } } diff --git a/assets/Scripts/Sub/UI/PreloadUI.ts b/assets/Scripts/Sub/UI/PreloadUI.ts index 332d6e26..4e60fccd 100644 --- a/assets/Scripts/Sub/UI/PreloadUI.ts +++ b/assets/Scripts/Sub/UI/PreloadUI.ts @@ -48,6 +48,9 @@ import { prodConfig } from "../../chat18x/config/env/prod"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; import AudioManager from "../../Main/Manager/AudioManager"; import { Config18x } from "../../Main/Config/Config18x"; +import { MainController } from "../../chat18x/core/MainController"; +import GameRootUI from "../../Main/Common/GameRootUI"; +import { TipsPanel } from "../../chat18x/ui/panels/TipsPanel"; const { ccclass, property } = _decorator; @@ -115,6 +118,8 @@ export class PreloadUI extends Component { SDKManager.init(); this.preloadFiles(); + + this.mainScene.init(); } protected onDestroy(): void {} @@ -225,6 +230,8 @@ export class PreloadUI extends Component { this.reqMyInfo(); this.reqGlobalData(); this.reqAiCharacterData(); + } else { + TipsPanel.show(LanguageUtils.getText("error_code_" + res.code)); } } @@ -238,6 +245,8 @@ export class PreloadUI extends Component { const walletData = DataManager.I.getDataById(DataId.Wallet); walletData.balance = Number(resData.balance); walletData.vipExpire = Number(resData.vipExpire); + } else { + TipsPanel.show(LanguageUtils.getText("error_code_" + res.code)); } } @@ -251,6 +260,8 @@ export class PreloadUI extends Component { // 保存数据 const globalData = DataManager.I.getDataById(DataId.Global); globalData.globals = res.data; + } else { + TipsPanel.show(LanguageUtils.getText("error_code_" + res.code)); } } @@ -266,12 +277,15 @@ export class PreloadUI extends Component { DataId.AiCharacter ); aiCharacterData.aiCharacter = res.data; + } else { + TipsPanel.show(LanguageUtils.getText("error_code_" + res.code)); } } - private enterGame() { - this.mainScene.init(); + private async enterGame() { + await MainController.I.init(); this.node.destroy(); + GameRootUI.I.showDefault(); //ResManager.I.goMainScene(); } } diff --git a/assets/Scripts/chat18x/core/MainController.ts b/assets/Scripts/chat18x/core/MainController.ts index d00a762f..5898f5c1 100644 --- a/assets/Scripts/chat18x/core/MainController.ts +++ b/assets/Scripts/chat18x/core/MainController.ts @@ -33,14 +33,14 @@ export class MainController { */ async init(): Promise { logger.log("[MainController] 开始初始化并预加载数据"); - + // 并行预加载所有数据 await Promise.all([ this.preloadThemeData(), this.preloadDailyRecommend(), - this.preloadShopList() + this.preloadShopList(), ]); - + logger.log("[MainController] 数据预加载完成"); } @@ -57,7 +57,7 @@ export class MainController { logger.log("[MainController] 开始预加载主题数据"); const reqData = {}; const res = await ThemeService.I.reqHallTheme(reqData); - + if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { // 保存数据到DataManager const themeData = DataManager.I.getDataById(DataId.Theme); @@ -88,7 +88,7 @@ export class MainController { logger.log("[MainController] 开始预加载每日推荐数据"); const reqData = {}; const res = await GirlService.I.reqDailyRecommend(reqData); - + if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { // 保存数据到DataManager const girlData = DataManager.I.getDataById(DataId.Girl); @@ -119,7 +119,7 @@ export class MainController { logger.log("[MainController] 开始预加载商品列表数据"); const reqData = {}; const res = await ShopService.I.reqShopList(reqData); - + if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { // 保存数据到DataManager const shopData = DataManager.I.getDataById(DataId.Shop); @@ -141,7 +141,11 @@ export class MainController { * 检查数据是否已预加载 */ isDataPreloaded(): boolean { - return this.isThemeDataPreloaded && this.isDailyRecommendPreloaded && this.isShopListPreloaded; + return ( + this.isThemeDataPreloaded && + this.isDailyRecommendPreloaded && + this.isShopListPreloaded + ); } /** @@ -152,7 +156,7 @@ export class MainController { themeData: this.isThemeDataPreloaded, dailyRecommend: this.isDailyRecommendPreloaded, shopList: this.isShopListPreloaded, - allComplete: this.isDataPreloaded() + allComplete: this.isDataPreloaded(), }; } @@ -174,7 +178,7 @@ export class MainController { try { const reqData = {}; const res = await ThemeService.I.reqHallTheme(reqData); - + if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { // 保存数据到DataManager const themeData = DataManager.I.getDataById(DataId.Theme); @@ -200,7 +204,7 @@ export class MainController { try { const reqData = {}; const res = await GirlService.I.reqDailyRecommend(reqData); - + if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { // 保存数据到DataManager const girlData = DataManager.I.getDataById(DataId.Girl);