From bef0d4379272d5efa12a376799b16fdaaed6b62f Mon Sep 17 00:00:00 2001 From: m0_75251201 Date: Tue, 18 Nov 2025 19:12:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=A7=92=E8=89=B2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E8=A3=85=E5=A4=87=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CharacterPreview/ModBehaviour.cs | 14 ++++++++------ .../Release/CharacterPreview.AssemblyInfo.cs | 2 +- .../CharacterPreview.AssemblyInfoInputs.cache | 2 +- .../obj/Release/CharacterPreview.dll | Bin 29184 -> 29184 bytes DuckovMods.sln.DotSettings.user | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) 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 45881e518e211d299cb4d3d86b7d2ddc527a4cda..f586aaca63997074da4624389e398fcd709a037d 100644 GIT binary patch delta 590 zcmXX@U279T6uq;}mu*^;5J{745>138n8qxdW_PI{Q7f$|G+IN+i@KX_Laj701}OxZ z78InDJ-!#YvK}X`wOI*HBR8b3cn5jI8OmE+^9)LfxGEq zCH&+Gvy$=0^VZ?t;sAUAZmyLEu=LuL=M=R0Mw0k77+_EFZ!qt>OdfCFLX-@x0kb)& zrK*_c53&8&<};RS6v8$BYUIfv)Dr=K-p^GAkf1wlPKP%!MM`RCBZ+510{7mJ*F(|B zcmV3PH+0Zw5=#sM?Camr+9Y9Utnna#FGEQd#qXg4Hy^~K;e*_lATEVRy!6x&o*I>% zutCGU#?A0y<%1g_wg8a#0G!=Le6rb?nX6tgop<8^I;CR8N%(yXz(rbYtaxISRtFxB zoMb~rCvxAxx`vc^WwYv>2WE`z^j^-02$r<5a{gJ5>%#iG)fds96DvO+6}QyKqeio= z*b}+3CM%kn6%~29EJ~`Zs)8u!f|M)gDp^e))^)8SY8m`^alL=^|M!?Pox^*xK~})E z+0(eYK5q`-K delta 605 zcmXYuUr19?9LIm>sPj+%HiLBAz5Dy%Qd{>r=kCo?%fdoo{y{2ig?HB}8aOT_#$uZh z(QJt0*He&BnfMSzw}&1A-%7|53c`qjK*9&1=q(ZKH|Tfx{rH~G`Tov1oRi&T*-bWo zuXH8F*9&=p{VXhBWDk(By0YmUfPh}!h?iL%+r}A|v9A&<#(7E(Ww3P;V7>={;mkzD z?B%moX5iOq7cJJt6Z4OWaVB@JEKxvglU8F`!O{)igI2~*mcby%jW8}dBp^d8? z_ldzn>Ku8DXSI+F7ywoHMwsF!?ARs>>?IC~GLJcMPV~7yIUqUtjvU4wsX#42!-2}w zdjiM04B3h6;!*Y#|BAi5M8Iy>DLx_KtgF>_TA=+Y$|+yb*(>Hq6ezTZ?Hu?&oG$=0Tp#A=84^ z`q8u|_5X=|i(VSKGvxv77_0Z~-?LoFL<2WA79QXKm@{sB$1|hO{++AOM~X8pv75zS zGjZ*1i47LozfY^;TIW*3!zbx8FM7;fO)U>7iMXc6!!6C~h@`2Zgf455h%8BRA{>hA znx@G5a8o>@U~GJ)`t|?cqD#Z)qV^QLN7yQ!o9HtSUiXzm6-YoFG|;Jrp#_>jg%Oa5 vs1Twx9c0oG8ZuFdYJz+ra_hu3P>AR-3{6BL^mLiY9N$t+Tk;nxNagForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded