diff --git a/Client/Assets/Bundles/Animation.meta b/Client/Assets/Bundles/Animation.meta deleted file mode 100644 index 78475de..0000000 --- a/Client/Assets/Bundles/Animation.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9181b472a17593b4297ca64ab22ee580 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Bundles/Map.meta b/Client/Assets/Bundles/Map.meta deleted file mode 100644 index e8b99b5..0000000 --- a/Client/Assets/Bundles/Map.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 01020433c7cce224cb00676deb461233 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Scripts/Startup/LauncherUIHandler.cs b/Client/Assets/Scripts/Startup/LauncherUIHandler.cs index afae31c..dc08729 100644 --- a/Client/Assets/Scripts/Startup/LauncherUIHandler.cs +++ b/Client/Assets/Scripts/Startup/LauncherUIHandler.cs @@ -5,6 +5,7 @@ using AlicizaX.Resource.Runtime; using AlicizaX.Localization.Runtime; using AlicizaX; using Cysharp.Threading.Tasks; +using Game.UI; using UnityEngine; @@ -17,6 +18,7 @@ namespace Unity.Startup.Procedure public static void Start() { eventRuntimeHandle = EventPublisher.Subscribe(SetProgressUpdate); + GameApp.UI.ShowUI(); } public static void Dispose() diff --git a/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureInitPackageState.cs b/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureInitPackageState.cs index d670e51..b5ff5ff 100644 --- a/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureInitPackageState.cs +++ b/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureInitPackageState.cs @@ -20,7 +20,6 @@ namespace Unity.Startup.Procedure { hostUrl = HttpHelper.CDNUrl; } - Log.Info(hostUrl); await GameApp.Resource.InitPackageAsync(string.Empty, hostUrl, hostUrl); await UniTask.DelayFrame(); UpdateStaticVersion().Forget(); diff --git a/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs b/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs index 60c204c..c74da92 100644 --- a/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs +++ b/Client/Assets/Scripts/Startup/UI/Generate/ui_UIGameLaunchWindow.cs @@ -7,7 +7,7 @@ namespace Game.UI [UIRes(ui_UIGameLaunchWindow.ResTag, EUIResLoadType.Resources)] public class ui_UIGameLaunchWindow : UIHolderObjectBase { - public const string ResTag = "Window/UIGameLaunchWindow"; + public const string ResTag = "UI/Window/UIGameLaunchWindow"; #region Generated by Script Tool [SerializeField] diff --git a/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs b/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs new file mode 100644 index 0000000..a325f8e --- /dev/null +++ b/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs @@ -0,0 +1,11 @@ +using AlicizaX.UI.Runtime; +using Game.UI; + +namespace Unity.Startup +{ + [Window(UILayer.UI,false,-1)] + public class UIGameLaunchWindow:UIWindow + { + + } +} diff --git a/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs.meta b/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs.meta new file mode 100644 index 0000000..89d02c7 --- /dev/null +++ b/Client/Assets/Scripts/Startup/UI/UIGameLaunchWindow.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7e32727ffd2c469eaef3e9bc260678be +timeCreated: 1763098344 \ No newline at end of file diff --git a/Client/Assets/YooAsset/AssetBundleCollectorSetting.asset b/Client/Assets/YooAsset/AssetBundleCollectorSetting.asset index 4eca50a..e057089 100644 --- a/Client/Assets/YooAsset/AssetBundleCollectorSetting.asset +++ b/Client/Assets/YooAsset/AssetBundleCollectorSetting.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 185f6993d5150494d98da50e26cb1c25, type: 3} m_Name: AssetBundleCollectorSetting - m_EditorClassIdentifier: + m_EditorClassIdentifier: ShowPackageView: 0 ShowEditorAlias: 0 UniqueBundleName: 0 @@ -19,6 +19,7 @@ MonoBehaviour: - PackageName: DefaultPackage PackageDesc: "\u9ED8\u8BA4\u8D44\u6E90\u5305" EnableAddressable: 1 + SupportExtensionless: 1 LocationToLower: 0 IncludeAssetGUID: 0 AutoCollectShaders: 1 @@ -35,8 +36,8 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: - UserData: + AssetTags: + UserData: - GroupName: UIRaw GroupDesc: "\u56FE\u7247\u8D44\u6E90" AssetTags: UIRaw @@ -48,16 +49,16 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: - UserData: + AssetTags: + UserData: - CollectPath: Assets/Bundles/UIRaw/Raw CollectorGUID: 6bc134b912ac6bb4399ea1bec4c11636 CollectorType: 0 AddressRuleName: AddressByFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: - UserData: + AssetTags: + UserData: - GroupName: Audios GroupDesc: "\u97F3\u9891" AssetTags: Audios @@ -69,8 +70,8 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: - UserData: + AssetTags: + UserData: - GroupName: Configs GroupDesc: "\u914D\u7F6E\u8868" AssetTags: Configs @@ -83,7 +84,7 @@ MonoBehaviour: PackRuleName: PackDirectory FilterRuleName: CollectAll AssetTags: WEBGL_PRELOAD - UserData: + UserData: - GroupName: DLL GroupDesc: "\u4EE3\u7801" AssetTags: DLL @@ -95,8 +96,8 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: - UserData: + AssetTags: + UserData: - GroupName: Effects GroupDesc: "\u7279\u6548" AssetTags: Effects @@ -108,8 +109,8 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: - UserData: + AssetTags: + UserData: - GroupName: Materials GroupDesc: "\u6750\u8D28\u7403" AssetTags: Materials @@ -121,8 +122,8 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: - UserData: + AssetTags: + UserData: - GroupName: Scenes GroupDesc: "\u573A\u666F" AssetTags: Scenes @@ -134,8 +135,8 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackSeparately FilterRuleName: CollectAll - AssetTags: - UserData: + AssetTags: + UserData: - GroupName: Shaders GroupDesc: "\u7740\u8272\u5668" AssetTags: Shaders @@ -147,8 +148,8 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackShader FilterRuleName: CollectShader - AssetTags: - UserData: + AssetTags: + UserData: - GroupName: UI GroupDesc: "UI\u9762\u677F" AssetTags: UI @@ -160,34 +161,8 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackSeparately FilterRuleName: CollectAll - AssetTags: - UserData: - - GroupName: Animation - GroupDesc: "\u52A8\u753B" - AssetTags: Animation - ActiveRuleName: EnableGroup - Collectors: - - CollectPath: Assets/Bundles/Animation - CollectorGUID: 9181b472a17593b4297ca64ab22ee580 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackDirectory - FilterRuleName: CollectAll - AssetTags: - UserData: - - GroupName: Map - GroupDesc: "\u5730\u56FE" - AssetTags: Map - ActiveRuleName: EnableGroup - Collectors: - - CollectPath: Assets/Bundles/Map - CollectorGUID: 01020433c7cce224cb00676deb461233 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackDirectory - FilterRuleName: CollectAll - AssetTags: - UserData: + AssetTags: + UserData: - GroupName: ShaderVariants GroupDesc: ShaderVariants AssetTags: ShaderVariants @@ -199,5 +174,5 @@ MonoBehaviour: AddressRuleName: AddressByFileName PackRuleName: PackShaderVariants FilterRuleName: CollectShaderVariants - AssetTags: - UserData: + AssetTags: + UserData: diff --git a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes index 4ce1d45..6f6257f 100644 Binary files a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes and b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes differ diff --git a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash index 29a507a..be0a41e 100644 --- a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash +++ b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash @@ -1 +1 @@ -54c8e4fa \ No newline at end of file +76620a96 \ No newline at end of file diff --git a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json index 92f915a..db3fad4 100644 --- a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json +++ b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json @@ -10,7 +10,7 @@ "BuildPipeline": "EditorSimulateBuildPipeline", "PackageName": "DefaultPackage", "PackageVersion": "Simulate", - "PackageNote": "2025/11/13 17:20:00", + "PackageNote": "2025/11/14 13:33:09", "AssetList": [ { "Address": "A1", diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index a1af4b9..bb268b3 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit a1af4b9165529d445f3dbc932c7920fad8094815 +Subproject commit bb268b32a39187f69ed5ce9c106fc59338334676 diff --git a/Client/ProjectSettings/UIGenerateConfiguration.asset b/Client/ProjectSettings/UIGenerateConfiguration.asset index 04cbca3..ad6af01 100644 --- a/Client/ProjectSettings/UIGenerateConfiguration.asset +++ b/Client/ProjectSettings/UIGenerateConfiguration.asset @@ -64,7 +64,7 @@ MonoBehaviour: - ProjectName: MainProject NameSpace: Game.UI GenerateHolderCodePath: Assets/Scripts/Startup/UI/Generate - UIPrefabRootPath: Assets/Resources/UI/ + UIPrefabRootPath: Assets/Resources/ LoadType: 0 - ProjectName: Hotfix NameSpace: Game.UI