From 994168d2cbbc40e59eb8d97e607b23916b6456da Mon Sep 17 00:00:00 2001 From: kaki <2578264036@qq.com> Date: Tue, 15 Sep 2026 00:18:51 +0800 Subject: [PATCH] =?UTF-8?q?ui=E8=B0=83=E6=95=B4=EF=BC=88=E5=AE=A4=E5=A4=96?= =?UTF-8?q?=E8=AE=B8=E6=84=BF=E8=BE=93=E5=85=A5=E6=A1=86/=E6=89=AD?= =?UTF-8?q?=E8=9B=8B=E6=8C=89=E9=92=AE/=E5=A1=94=E7=BD=97=E6=96=87?= =?UTF-8?q?=E5=AD=97/hint=E6=8F=90=E7=A4=BA/=E5=88=86=E8=BE=A8=E7=8E=87?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection_system/_1_button.png | 4 +- .../collection_system/_5_button.png | 4 +- .../wish_input.png" | 4 +- .../Scenes/Apartment/Apartment_Main.unity | 46 +++++++------------ .../Scenes/WorldMap/WorldMap_Main.unity | 6 +-- .../DesktopOverlaySceneController.cs | 10 ++-- .../EmotionGardenGrowthTiming.cs | 4 +- .../Modules/HubUI/ApartmentDoorInteraction.cs | 2 +- Assets/packages-merged-link.meta | 8 ---- Assets/packages-merged-link/link.xml | 30 ------------ Assets/packages-merged-link/link.xml.meta | 7 --- ProjectSettings/ProjectSettings.asset | 4 +- 12 files changed, 35 insertions(+), 94 deletions(-) delete mode 100644 Assets/packages-merged-link.meta delete mode 100644 Assets/packages-merged-link/link.xml delete mode 100644 Assets/packages-merged-link/link.xml.meta diff --git a/Assets/_Project/Art/Sprites/Collection/collection_system/_1_button.png b/Assets/_Project/Art/Sprites/Collection/collection_system/_1_button.png index caa3e2e7..8f4467c5 100644 --- a/Assets/_Project/Art/Sprites/Collection/collection_system/_1_button.png +++ b/Assets/_Project/Art/Sprites/Collection/collection_system/_1_button.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:135f8608ec7c77ea382cb4220eb8e17334c1caee253f811a9e1b284b9a3d961c -size 63051 +oid sha256:e5709e0e90b6df8c850fb822814b9702cb34ec9511d023f26fbaf4c664ec1b4a +size 61687 diff --git a/Assets/_Project/Art/Sprites/Collection/collection_system/_5_button.png b/Assets/_Project/Art/Sprites/Collection/collection_system/_5_button.png index 92fead85..1bb158ca 100644 --- a/Assets/_Project/Art/Sprites/Collection/collection_system/_5_button.png +++ b/Assets/_Project/Art/Sprites/Collection/collection_system/_5_button.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75fbb85ffc619845f13d79a57afe909edb77dfab9685f9b09d57047f6460d6fa -size 64662 +oid sha256:d9d07720c6d53aac5be0245c63f5d28346013748b38b5a78cea50aa087aee355 +size 63083 diff --git "a/Assets/_Project/Art/WorldMap/UI\350\276\223\345\205\245\346\241\206\345\216\273\345\255\227/wish_input.png" "b/Assets/_Project/Art/WorldMap/UI\350\276\223\345\205\245\346\241\206\345\216\273\345\255\227/wish_input.png" index 1ef1ded3..3a0068c4 100644 --- "a/Assets/_Project/Art/WorldMap/UI\350\276\223\345\205\245\346\241\206\345\216\273\345\255\227/wish_input.png" +++ "b/Assets/_Project/Art/WorldMap/UI\350\276\223\345\205\245\346\241\206\345\216\273\345\255\227/wish_input.png" @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:175633820b3241082669d974eddeb47ca85303e94216db99ffc0bddf60b15a3c -size 83364 +oid sha256:ea89dff0cc0558dfc4445cc98c6835e4975ab5b0594ef9956c6886798793edbd +size 70799 diff --git a/Assets/_Project/Scenes/Apartment/Apartment_Main.unity b/Assets/_Project/Scenes/Apartment/Apartment_Main.unity index dec59aab..5c8186c3 100644 --- a/Assets/_Project/Scenes/Apartment/Apartment_Main.unity +++ b/Assets/_Project/Scenes/Apartment/Apartment_Main.unity @@ -11185,8 +11185,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281020725 - m_fontColor: {r: 0.20784314, g: 0.19215687, b: 0.16862746, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -15378,8 +15378,8 @@ MonoBehaviour: - {fileID: 0} m_fontColor32: serializedVersion: 2 - rgba: 4281020725 - m_fontColor: {r: 0.20754719, g: 0.19185984, b: 0.16904, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -22729,8 +22729,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281020725 - m_fontColor: {r: 0.20784314, g: 0.19215687, b: 0.16862746, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -23127,7 +23127,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 182.8, y: 125} + m_AnchoredPosition: {x: 182.8, y: 189} m_SizeDelta: {x: -485.60498, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &689000875 @@ -49799,7 +49799,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1475339755 RectTransform: m_ObjectHideFlags: 0 @@ -50088,7 +50088,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 182.8, y: 366} + m_AnchoredPosition: {x: 182.8, y: 417} m_SizeDelta: {x: -485.605, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1485019533 @@ -59922,7 +59922,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1707805764 RectTransform: m_ObjectHideFlags: 0 @@ -75735,8 +75735,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -76031,8 +76031,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -76327,8 +76327,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -76420,7 +76420,6 @@ GameObject: - component: {fileID: 2199001005} - component: {fileID: 2199001004} - component: {fileID: 2199001003} - - component: {fileID: 2199001006} m_Layer: 5 m_Name: ApartmentViewportHost m_TagString: Untagged @@ -76511,19 +76510,6 @@ MonoBehaviour: - {fileID: 1336465395} _furnitureHover: {fileID: 1741491749} _buildMode: {fileID: 0} ---- !u!114 &2199001006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2199001001} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} - m_Name: - m_EditorClassIdentifier: - _description: "\u6BCF\u665A\u8EBA\u4E0B\uFF0C\u5C31\u50CF\u7761\u8FDB\u4E00\u7247\u67D4\u8F6F\u7684\u6708\u5149\u91CC" --- !u!1 &2199001011 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Project/Scenes/WorldMap/WorldMap_Main.unity b/Assets/_Project/Scenes/WorldMap/WorldMap_Main.unity index eb38fa0e..2338766a 100644 --- a/Assets/_Project/Scenes/WorldMap/WorldMap_Main.unity +++ b/Assets/_Project/Scenes/WorldMap/WorldMap_Main.unity @@ -50438,7 +50438,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 13f0fae6998b9ee4fa2bc2ea69bf58e7, type: 3} + m_Sprite: {fileID: 21300000, guid: cf166e61cf0c1fd448e4af6d9e2934a6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -169255,7 +169255,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1425446057 MonoBehaviour: m_ObjectHideFlags: 0 @@ -175199,7 +175199,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1479303920 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/_Project/Scripts/Modules/DesktopOverlay/DesktopOverlaySceneController.cs b/Assets/_Project/Scripts/Modules/DesktopOverlay/DesktopOverlaySceneController.cs index 0b81b99a..8071b487 100644 --- a/Assets/_Project/Scripts/Modules/DesktopOverlay/DesktopOverlaySceneController.cs +++ b/Assets/_Project/Scripts/Modules/DesktopOverlay/DesktopOverlaySceneController.cs @@ -63,13 +63,13 @@ public static void ExitOverlay() int previousWidth = PlayerPrefs.GetInt( PreviousWidthKey, - 1280 + 1920 ); int previousHeight = PlayerPrefs.GetInt( PreviousHeightKey, - 720 + 1080 ); // Desktop_Overlay 还没被卸载时 @@ -109,7 +109,7 @@ private static void RestoreNormalWindow() // 把 UniWindowController 控制的原生窗口 // 明确缩回主程序尺寸 window.windowSize = - new Vector2(1280f, 720f); + new Vector2(1920f, 1080f); } #endif @@ -118,8 +118,8 @@ private static void RestoreNormalWindow() FullScreenMode.Windowed; Screen.SetResolution( - 1280, - 720, + 1920, + 1080, FullScreenMode.Windowed ); } diff --git a/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs b/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs index 28e12f6a..b7e2e5df 100644 --- a/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs +++ b/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs @@ -5,10 +5,10 @@ namespace GeminiLab.Modules.EmotionGarden public static class EmotionGardenGrowthTiming { // 10分钟发芽 - public const float SproutSeconds = 10f*60f; + public const float SproutSeconds = 10f; // 60分钟成熟 - public const float BloomSeconds = 60f*60f; + public const float BloomSeconds = 60f; public static TimeSpan BloomDuration => TimeSpan.FromSeconds(BloomSeconds); diff --git a/Assets/_Project/Scripts/Modules/HubUI/ApartmentDoorInteraction.cs b/Assets/_Project/Scripts/Modules/HubUI/ApartmentDoorInteraction.cs index d4385c72..f95e9b95 100644 --- a/Assets/_Project/Scripts/Modules/HubUI/ApartmentDoorInteraction.cs +++ b/Assets/_Project/Scripts/Modules/HubUI/ApartmentDoorInteraction.cs @@ -86,7 +86,7 @@ private void Update() if (Input.GetKeyDown(KeyCode.Escape)) DeclineConversation(); AdvanceDialogue(Time.unscaledTime); if (_hint == null) return; - _hint.text = _dialogueActive ? "Esc 结束交流" : _choiceVisible ? "" : _closeBlocked ? "门口有宠物,走开后再关门" : !_isOpen ? "点击小门开门" : _visitInitiator != null ? "F 再次显示交流选项" : "WASD 进入对方房间,可选择交流"; + _hint.text = _dialogueActive ? "点击区域外结束交流" : _choiceVisible ? "" : _closeBlocked ? "门口有宠物,走开后再关门" : !_isOpen ? "点击小门开门" : _visitInitiator != null ? "F 再次显示交流选项" : "WASD 进入对方房间,可选择交流"; } private bool CanOfferConversation() diff --git a/Assets/packages-merged-link.meta b/Assets/packages-merged-link.meta deleted file mode 100644 index 05fc3f29..00000000 --- a/Assets/packages-merged-link.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0935c2dd60f8e1f4eb49608db8ac3029 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/packages-merged-link/link.xml b/Assets/packages-merged-link/link.xml deleted file mode 100644 index 600e867c..00000000 --- a/Assets/packages-merged-link/link.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/packages-merged-link/link.xml.meta b/Assets/packages-merged-link/link.xml.meta deleted file mode 100644 index 785aaf3c..00000000 --- a/Assets/packages-merged-link/link.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 10c79869bf80c6846b37325f0ea03c62 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5a927525..7a6df628 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -42,8 +42,8 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1280 - defaultScreenHeight: 720 + defaultScreenWidth: 1920 + defaultScreenHeight: 1080 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0