From ed98029a88cd89702980ac7c40b711afddc5aeb2 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 十一月 2025 14:44:59 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs b/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs
index e905e4f..e64ab7a 100644
--- a/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs
+++ b/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs
@@ -37,33 +37,37 @@
if (!firstLaunch)
{
- LoadInitalConfig().Forget();
+ //LoadInitalConfig().Forget();
+ done = true;
}
}
- protected async UniTask LoadInitalConfig()
- {
- await ConfigManager.Instance.LoadConfigByType(typeof(InitialFunctionConfig));
+ //搴旇鏄笅杞芥渶鏂扮殑琛ㄦ牸鍚庡啀娆″姞杞� 闈炴嫹璐�
+ //protected async UniTask LoadInitalConfig()
+ //{
+ // await ConfigManager.Instance.LoadConfigByType(typeof(InitialFunctionConfig));
- done = true;
- }
+ // done = true;
+ //}
public override void End()
{
- if (!AssetSource.builtInFromEditor)
- {
+ if (AssetSource.isUseAssetBundle)
+ {
AssetBundleUtility.Instance.InitBuiltInAsset();
+
+ LaunchInHot.Instance.InitSystemMgr();
+
+ // 杩欓噷杩樻病寮�濮嬪姞杞介厤缃� 浣嗘槸鎻愬墠鍔犺浇浜嗕緵LaunchWin浣跨敤
+ PriorLanguageConfig.LazyInit();
+ InitialFunctionConfig.LazyInit();
+
+ UIManager.Instance.OpenWindow<LaunchWin>();
}
+
// ConfigInitiator.SyncInit();
UIManager.Instance.CloseWindow<DownLoadWin>();
UIManager.Instance.CloseWindow<VersionUpdateWin>();
- UIManager.Instance.CloseWindow<LaunchWin>();
-
- if (!AssetSource.uiFromEditor)
- {
- AssetBundleUtility.Instance.UnloadAssetBundle("builtin/prefabs", true, false);
- }
- UIManager.Instance.OpenWindow<LaunchWin>();
Language.InitDefaultLanguage();
}
@@ -253,11 +257,11 @@
private void EditorCopyAsset()
{
- if (!AssetSource.allFromEditor)
- {
- // FileExtersion.DirectoryCopy(ResourcesPath.CONFIG_FODLER, ResourcesPath.Instance.StreamingAssetPath + "config");
- // FileExtersion.DirectoryCopy(ResourcesPath.ResourcesOutPath + "BuiltIn", ResourcesPath.Instance.StreamingAssetPath + "builtin");
- }
+ // if (AssetSource.isUseAssetBundle)
+ // {
+ // FileExtersion.DirectoryCopy(ResourcesPath.CONFIG_FODLER, ResourcesPath.Instance.StreamingAssetPath + "config");
+ // FileExtersion.DirectoryCopy(ResourcesPath.ResourcesOutPath + "BuiltIn", ResourcesPath.Instance.StreamingAssetPath + "builtin");
+ // }
}
}
\ No newline at end of file
--
Gitblit v1.8.0