diff --git a/CharacterPreview/ModBehaviour.cs b/CharacterPreview/ModBehaviour.cs index 2f96ae0..f2147c7 100644 --- a/CharacterPreview/ModBehaviour.cs +++ b/CharacterPreview/ModBehaviour.cs @@ -59,13 +59,13 @@ namespace CharacterPreview var canvasObj = GameObject.Find("Canvas"); if (canvasObj == null) { - Debug.Log("Canvas not found"); + Debug.LogWarning("Canvas not found"); return; } var mainMenu=GameObjectUtils.FindObjectByPath(canvasObj, "MainMenuContainer"); if (!mainMenu) { - Debug.Log("MainMenuContainer not found"); + Debug.LogWarning("MainMenuContainer not found"); return; } @@ -101,11 +101,13 @@ namespace CharacterPreview return; } - Item item = await ItemSavesUtilities.LoadItem(characterItemSaveKey); + Item? item = null; + if (config.data.showEquipment) + { + item = await ItemSavesUtilities.LoadItem(characterItemSaveKey); + } if (item == null) { - Debug.Log($"[CreateCharacterModel] 未找到已保存的 {characterItemSaveKey},将使用默认角色模板创建新角色。"); - var defaultTypeID = GameplayDataSettings.ItemAssets.DefaultCharacterItemTypeID; item = await ItemAssetsCollection.InstantiateAsync(defaultTypeID); if (item == null) @@ -281,7 +283,7 @@ namespace CharacterPreview } public static CharacterMainControl CreateCharacter( - Item itemInstance, + Item? itemInstance, CharacterModel modelPrefab, Vector3 pos, Quaternion rotation) diff --git a/CharacterPreview/obj/Release/CharacterPreview.AssemblyInfo.cs b/CharacterPreview/obj/Release/CharacterPreview.AssemblyInfo.cs index 8f10837..307b5e3 100644 --- a/CharacterPreview/obj/Release/CharacterPreview.AssemblyInfo.cs +++ b/CharacterPreview/obj/Release/CharacterPreview.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("CharacterPreview")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8fcbdc5649e0b93fd1b771001f53cdbb81da2c78")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6cb89ba4398ec37a8aa131d176c6f4b85ddbf3b0")] [assembly: System.Reflection.AssemblyProductAttribute("CharacterPreview")] [assembly: System.Reflection.AssemblyTitleAttribute("CharacterPreview")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/CharacterPreview/obj/Release/CharacterPreview.AssemblyInfoInputs.cache b/CharacterPreview/obj/Release/CharacterPreview.AssemblyInfoInputs.cache index cded480..4d303ea 100644 --- a/CharacterPreview/obj/Release/CharacterPreview.AssemblyInfoInputs.cache +++ b/CharacterPreview/obj/Release/CharacterPreview.AssemblyInfoInputs.cache @@ -1 +1 @@ -2dcee58ea3d10e33f69ccfa06e1fe3a4fe22d6ce0e9a2c07a40e5dff5a0c39dd +cbee91e822d9ef04e2d67aa8b9bb2a276fe0b999202eacd0c7845f2ebd98f435 diff --git a/CharacterPreview/obj/Release/CharacterPreview.dll b/CharacterPreview/obj/Release/CharacterPreview.dll index 45881e5..f586aac 100644 Binary files a/CharacterPreview/obj/Release/CharacterPreview.dll and b/CharacterPreview/obj/Release/CharacterPreview.dll differ diff --git a/DuckovMods.sln.DotSettings.user b/DuckovMods.sln.DotSettings.user index 599e33a..5263ed5 100644 --- a/DuckovMods.sln.DotSettings.user +++ b/DuckovMods.sln.DotSettings.user @@ -77,6 +77,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded