From 2b01217df01948c711a76b120651b5d438689891 Mon Sep 17 00:00:00 2001 From: kaki <2578264036@qq.com> Date: Mon, 14 Sep 2026 19:16:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=A9=E4=BD=99UI+=E5=AE=A4=E5=86=85?= =?UTF-8?q?=E5=AE=B6=E5=85=B7=E6=8F=8F=E8=BF=B0+=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=AE=A4=E5=A4=96=E7=94=9F=E9=95=BF=E5=91=A8=E6=9C=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Art/Sprites/Phone/player_bubble.png.meta | 4 +- .../Art/UI/ApartmentOnboarding/garden.png | 3 + .../UI/ApartmentOnboarding/garden.png.meta | 114 +++ .../Art/WorldMap/UI/garden_week/clock.png | 3 + .../WorldMap/UI/garden_week/clock.png.meta | 114 +++ .../_Project/Art/WorldMap/UI/growth/bud.png | 4 +- ...244\251\344\275\277\345\272\212_01.prefab" | 4 + .../_Project/Prefabs/UI/Bubble_Angel.prefab | 4 +- .../_Project/Prefabs/UI/Bubble_Devil.prefab | 16 +- Assets/_Project/Prefabs/UI/Bubble_User.prefab | 89 +- .../Scenes/Apartment/Apartment_Main.unity | 699 ++++++++++++- Assets/_Project/Scenes/Intro/Prologue.unity | 16 +- .../Scenes/WorldMap/WorldMap_Main.unity | 934 +++++++++++++++++- .../EmotionGardenGrowthTiming.cs | 16 + .../EmotionGardenGrowthTiming.cs.meta | 11 + .../EmotionGarden/EmotionGardenService.cs | 32 +- .../Panels/FurnitureDescriptionObserver.cs | 291 ++++++ .../FurnitureDescriptionObserver.cs.meta | 11 + .../HubUI/Panels/FurnitureInfoPopup.cs | 105 ++ .../HubUI/Panels/FurnitureInfoPopup.cs.meta | 11 + .../HubUI/Panels/FurnitureInspectable.cs | 74 ++ .../HubUI/Panels/FurnitureInspectable.cs.meta | 11 + .../HubUI/Panels/WeeklyGardenPanelStub.cs | 193 ++++ .../_Project/Scripts/Modules/HubUI/clock.meta | 8 + .../Modules/HubUI/clock/GrowthClockUI.cs | 227 +++++ .../Modules/HubUI/clock/GrowthClockUI.cs.meta | 11 + 26 files changed, 2878 insertions(+), 127 deletions(-) create mode 100644 Assets/_Project/Art/UI/ApartmentOnboarding/garden.png create mode 100644 Assets/_Project/Art/UI/ApartmentOnboarding/garden.png.meta create mode 100644 Assets/_Project/Art/WorldMap/UI/garden_week/clock.png create mode 100644 Assets/_Project/Art/WorldMap/UI/garden_week/clock.png.meta create mode 100644 Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs create mode 100644 Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs.meta create mode 100644 Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureDescriptionObserver.cs create mode 100644 Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureDescriptionObserver.cs.meta create mode 100644 Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInfoPopup.cs create mode 100644 Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInfoPopup.cs.meta create mode 100644 Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInspectable.cs create mode 100644 Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInspectable.cs.meta create mode 100644 Assets/_Project/Scripts/Modules/HubUI/clock.meta create mode 100644 Assets/_Project/Scripts/Modules/HubUI/clock/GrowthClockUI.cs create mode 100644 Assets/_Project/Scripts/Modules/HubUI/clock/GrowthClockUI.cs.meta diff --git a/Assets/_Project/Art/Sprites/Phone/player_bubble.png.meta b/Assets/_Project/Art/Sprites/Phone/player_bubble.png.meta index 0aeefbb8..3bf8326f 100644 --- a/Assets/_Project/Art/Sprites/Phone/player_bubble.png.meta +++ b/Assets/_Project/Art/Sprites/Phone/player_bubble.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 25, y: 15, z: 35, w: 15} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -100,7 +100,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/_Project/Art/UI/ApartmentOnboarding/garden.png b/Assets/_Project/Art/UI/ApartmentOnboarding/garden.png new file mode 100644 index 00000000..bd457104 --- /dev/null +++ b/Assets/_Project/Art/UI/ApartmentOnboarding/garden.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47a6c270da1247a79d136b51962c002e42d8ae67cb5ee8499cafb826522a8e86 +size 2112808 diff --git a/Assets/_Project/Art/UI/ApartmentOnboarding/garden.png.meta b/Assets/_Project/Art/UI/ApartmentOnboarding/garden.png.meta new file mode 100644 index 00000000..37d19912 --- /dev/null +++ b/Assets/_Project/Art/UI/ApartmentOnboarding/garden.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 2cf3d238db105b745b410c9e484aa97c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Art/WorldMap/UI/garden_week/clock.png b/Assets/_Project/Art/WorldMap/UI/garden_week/clock.png new file mode 100644 index 00000000..68deb383 --- /dev/null +++ b/Assets/_Project/Art/WorldMap/UI/garden_week/clock.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe7452186b933264c6c6c88ab0f41263034724520d430b437fecaa4635c93def +size 1561997 diff --git a/Assets/_Project/Art/WorldMap/UI/garden_week/clock.png.meta b/Assets/_Project/Art/WorldMap/UI/garden_week/clock.png.meta new file mode 100644 index 00000000..b526c673 --- /dev/null +++ b/Assets/_Project/Art/WorldMap/UI/garden_week/clock.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 94fbdef8721d6f54fbe8267b0bcc7f24 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Art/WorldMap/UI/growth/bud.png b/Assets/_Project/Art/WorldMap/UI/growth/bud.png index 17f40fcc..7c4beba5 100644 --- a/Assets/_Project/Art/WorldMap/UI/growth/bud.png +++ b/Assets/_Project/Art/WorldMap/UI/growth/bud.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcd2007c87700e0989c601a71f19a8127f5ddf9a1e4abdc34ffc32b6c8c67fc5 -size 24411 +oid sha256:26223657fcc717bdfb872d2eb0a06abf6b7ecb07ce246e9203d9752595b46d27 +size 160118 diff --git "a/Assets/_Project/Prefabs/Furniture/Bed/\345\256\266\345\205\267_\345\272\212_\345\244\251\344\275\277\345\272\212_01.prefab" "b/Assets/_Project/Prefabs/Furniture/Bed/\345\256\266\345\205\267_\345\272\212_\345\244\251\344\275\277\345\272\212_01.prefab" index 640869a2..23cae0e5 100644 --- "a/Assets/_Project/Prefabs/Furniture/Bed/\345\256\266\345\205\267_\345\272\212_\345\244\251\344\275\277\345\272\212_01.prefab" +++ "b/Assets/_Project/Prefabs/Furniture/Bed/\345\256\266\345\205\267_\345\272\212_\345\244\251\344\275\277\345\272\212_01.prefab" @@ -104,6 +104,10 @@ MonoBehaviour: _instanceId: d06badb4d8954c1cbd8217c55ffb27a2 _definition: {fileID: 11400000, guid: 63e96c1732df4e74daa06a8bcce873f4, type: 2} _anchor: {fileID: 948868639261107561} + _isSceneFurniture: 0 + _sortingAnchor: {fileID: 0} + _sortingOrderOffset: 0 + _useDynamicSortingRule: 0 --- !u!114 &948868639261107561 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_Project/Prefabs/UI/Bubble_Angel.prefab b/Assets/_Project/Prefabs/UI/Bubble_Angel.prefab index 7b7b27d3..b3881b30 100644 --- a/Assets/_Project/Prefabs/UI/Bubble_Angel.prefab +++ b/Assets/_Project/Prefabs/UI/Bubble_Angel.prefab @@ -265,7 +265,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "今天也请保持好心情哦~我一直都在呢,有什么想聊的?🌸" + m_text: "\u4ECA\u5929\u4E5F\u8BF7\u4FDD\u6301\u597D\u5FC3\u60C5\u54E6\uFF5E\u6211\u4E00\u76F4\u90FD\u5728\u5462\uFF0C\u6709\u4EC0\u4E48\u60F3\u804A\u7684\uFF1F\U0001F338" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -292,7 +292,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 + m_fontSize: 19.75 m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 1 diff --git a/Assets/_Project/Prefabs/UI/Bubble_Devil.prefab b/Assets/_Project/Prefabs/UI/Bubble_Devil.prefab index c1fedf42..70810e85 100644 --- a/Assets/_Project/Prefabs/UI/Bubble_Devil.prefab +++ b/Assets/_Project/Prefabs/UI/Bubble_Devil.prefab @@ -107,10 +107,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1799701954867629120} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -22.2061, y: 0} - m_SizeDelta: {x: -44.4122, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7212316972579228894 CanvasRenderer: @@ -140,7 +140,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "啧,又来找我了?行吧,今天就勉为其难陪你聊聊。直接说吧,别拐弯抹角的。" + m_text: "\u5567\uFF0C\u53C8\u6765\u627E\u6211\u4E86\uFF1F\u884C\u5427\uFF0C\u4ECA\u5929\u5C31\u52C9\u4E3A\u5176\u96BE\u966A\u4F60\u804A\u804A\u3002\u76F4\u63A5\u8BF4\u5427\uFF0C\u522B\u62D0\u5F2F\u62B9\u89D2\u7684\u3002" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -170,7 +170,7 @@ MonoBehaviour: m_fontSize: 20 m_fontSizeBase: 20 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 16 m_fontSizeMax: 28 m_fontStyle: 0 @@ -350,8 +350,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 66.87421, y: -0} - m_SizeDelta: {x: 394.9737, y: 0} + m_AnchoredPosition: {x: 66.87421, y: -69} + m_SizeDelta: {x: 400, y: 0} m_Pivot: {x: 0, y: 0} --- !u!222 &1382900177920987703 CanvasRenderer: diff --git a/Assets/_Project/Prefabs/UI/Bubble_User.prefab b/Assets/_Project/Prefabs/UI/Bubble_User.prefab index 108538cb..d55b739a 100644 --- a/Assets/_Project/Prefabs/UI/Bubble_User.prefab +++ b/Assets/_Project/Prefabs/UI/Bubble_User.prefab @@ -97,10 +97,10 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 4 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 @@ -115,6 +115,7 @@ GameObject: - component: {fileID: 8250274289152516761} - component: {fileID: 3192700798133323311} - component: {fileID: 6254251251899129226} + - component: {fileID: 6321236535636201313} m_Layer: 0 m_Name: AvatarIcon m_TagString: Untagged @@ -139,7 +140,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 62, y: 62} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3192700798133323311 CanvasRenderer: @@ -179,6 +180,26 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6321236535636201313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717397340866137127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 60 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &3018591528122429441 GameObject: m_ObjectHideFlags: 0 @@ -213,7 +234,7 @@ RectTransform: m_Father: {fileID: 4671469773288043484} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -245,7 +266,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "你好,今天怎么样?我想问一下关于工作的事情。" + m_text: "\u4F60\u597D\uFF0C\u4ECA\u5929\u600E\u4E48\u6837\uFF1F\u6211\u60F3\u95EE\u4E00\u4E0B\u5173\u4E8E\u5DE5\u4F5C\u7684\u4E8B\u60C5\u3002" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -275,7 +296,7 @@ MonoBehaviour: m_fontSize: 20 m_fontSizeBase: 20 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 16 m_fontSizeMax: 28 m_fontStyle: 0 @@ -337,8 +358,8 @@ GameObject: - component: {fileID: 4671469773288043484} - component: {fileID: 5071989080452155312} - component: {fileID: 1109864391727906424} - - component: {fileID: 3225459840814211462} - component: {fileID: 6674091562823328875} + - component: {fileID: 468229622742551712} m_Layer: 0 m_Name: Bubble m_TagString: Untagged @@ -361,10 +382,10 @@ RectTransform: - {fileID: 2497576264267917550} m_Father: {fileID: 2481912695436574758} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 66, y: -77} - m_SizeDelta: {x: 392.5461, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!222 &5071989080452155312 CanvasRenderer: @@ -395,7 +416,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 7918c8c978a8bda4ea72b29514bb30af, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -404,7 +425,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3225459840814211462 +--- !u!114 &6674091562823328875 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -413,12 +434,18 @@ MonoBehaviour: m_GameObject: {fileID: 3754648817367611078} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &6674091562823328875 + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 40 + m_PreferredWidth: 381.70297 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &468229622742551712 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -427,14 +454,20 @@ MonoBehaviour: m_GameObject: {fileID: 3754648817367611078} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 40 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 + m_Padding: + m_Left: 15 + m_Right: 20 + m_Top: 8 + m_Bottom: 8 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 diff --git a/Assets/_Project/Scenes/Apartment/Apartment_Main.unity b/Assets/_Project/Scenes/Apartment/Apartment_Main.unity index bf10b264..dec59aab 100644 --- a/Assets/_Project/Scenes/Apartment/Apartment_Main.unity +++ b/Assets/_Project/Scenes/Apartment/Apartment_Main.unity @@ -603,7 +603,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: c7a9a7cd560939b4faf921b6fca7c7f3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -2224,7 +2224,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 232777944ca791d448cf4840262643c4, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -2534,6 +2534,19 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 7639976158562333081, guid: a04193cc48f141c2a31ba9fd698e9386, type: 3} m_PrefabInstance: {fileID: 1604334595} m_PrefabAsset: {fileID: 0} +--- !u!114 &77329449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 77329430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: "\u8EBA\u8FDB\u88AB\u7A9D\uFF0C\u8FDE\u68A6\u90FD\u80FD\u71AC\u6210\u751C\u7684" --- !u!1 &80631348 GameObject: m_ObjectHideFlags: 0 @@ -3543,7 +3556,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4151511748350817576, guid: 572c6fb6285fef947ac3e31cc0d2a4d0, type: 3} insertIndex: -1 addedObject: {fileID: 106776893} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 9216784495953775322, guid: 572c6fb6285fef947ac3e31cc0d2a4d0, type: 3} + insertIndex: -1 + addedObject: {fileID: 1270384037} m_SourcePrefab: {fileID: 100100000, guid: 572c6fb6285fef947ac3e31cc0d2a4d0, type: 3} --- !u!4 &118566507 stripped Transform: @@ -5796,7 +5812,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 8930f36f3efe98e468f3522ae96fa1b3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -6876,7 +6892,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &227488407 RectTransform: m_ObjectHideFlags: 0 @@ -7408,7 +7424,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 4e070b2a29c2f8b4d832e4d5c174f8b0, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 0.98742133, g: 0.98742133, b: 0.98742133, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -10843,7 +10859,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 2884890322682436312, guid: e932275b731ffb248aa448a396a81b29, type: 3} insertIndex: -1 addedObject: {fileID: 1266248707} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 9171775605070950278, guid: e932275b731ffb248aa448a396a81b29, type: 3} + insertIndex: -1 + addedObject: {fileID: 1641460250} m_SourcePrefab: {fileID: 100100000, guid: e932275b731ffb248aa448a396a81b29, type: 3} --- !u!4 &344768575 stripped Transform: @@ -11674,7 +11693,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 485, y: 608} + m_AnchoredPosition: {x: 387.6, y: 600.9} m_SizeDelta: {x: 295, y: 91} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &360400675 @@ -15619,7 +15638,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 4e070b2a29c2f8b4d832e4d5c174f8b0, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -15787,6 +15806,82 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.35, y: 1.35} m_EdgeRadius: 0 +--- !u!1 &474007707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 474007708} + - component: {fileID: 474007711} + - component: {fileID: 474007710} + m_Layer: 0 + m_Name: FurnitureInfoPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &474007708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474007707} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 505982862} + m_Father: {fileID: 1149253003} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &474007710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474007707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &474007711 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 474007707} + m_CullTransparentMesh: 1 --- !u!1 &474430348 GameObject: m_ObjectHideFlags: 0 @@ -16761,7 +16856,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7476504624074917700, guid: 71b2bb3285d3ffc438af0d82cf969c15, type: 3} insertIndex: -1 addedObject: {fileID: 1371273513} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8588760489724163994, guid: 71b2bb3285d3ffc438af0d82cf969c15, type: 3} + insertIndex: -1 + addedObject: {fileID: 501692768} m_SourcePrefab: {fileID: 100100000, guid: 71b2bb3285d3ffc438af0d82cf969c15, type: 3} --- !u!4 &501692761 stripped Transform: @@ -16773,6 +16871,19 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8588760489724163994, guid: 71b2bb3285d3ffc438af0d82cf969c15, type: 3} m_PrefabInstance: {fileID: 501692760} m_PrefabAsset: {fileID: 0} +--- !u!114 &501692768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501692762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: "\u7A97\u6237\u53EA\u9700\u63A8\u5F00\u4E00\u6761\u7F1D\u5C31\u80FD\u542C\u89C1\u98CE\u7A83\u7A83\u3001\u82B1\u79C1\u8BED" --- !u!1 &505839011 GameObject: m_ObjectHideFlags: 0 @@ -16910,6 +17021,140 @@ MonoBehaviour: volume: 0.5 playOnUIClick: 1 playOnWorldSpriteClick: 0 +--- !u!1 &505982861 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 505982862} + - component: {fileID: 505982864} + - component: {fileID: 505982863} + m_Layer: 0 + m_Name: DescriptionText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &505982862 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505982861} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 474007708} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &505982863 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505982861} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &505982864 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505982861} + m_CullTransparentMesh: 1 --- !u!1 &508111938 GameObject: m_ObjectHideFlags: 0 @@ -18245,7 +18490,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 535971880771871720, guid: 26c54fc58117fd7478383274f61041c2, type: 3} insertIndex: -1 addedObject: {fileID: 1170646494} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6169017340252643413, guid: 26c54fc58117fd7478383274f61041c2, type: 3} + insertIndex: -1 + addedObject: {fileID: 1918788062} m_SourcePrefab: {fileID: 100100000, guid: 26c54fc58117fd7478383274f61041c2, type: 3} --- !u!1 &536390115 stripped GameObject: @@ -19260,13 +19508,24 @@ PrefabInstance: propertyPath: m_Offset.y value: -0.05687362 objectReference: {fileID: 0} + - target: {fileID: 4123437396856728165, guid: 03746366fc83b9640bac0d3e53171a32, type: 3} + propertyPath: _hitArea + value: + objectReference: {fileID: 0} + - target: {fileID: 4123437396856728165, guid: 03746366fc83b9640bac0d3e53171a32, type: 3} + propertyPath: _description + value: "\u6BCF\u665A\u8EBA\u4E0B\uFF0C\u5C31\u50CF\u7761\u8FDB\u4E00\u7247\u67D4\u8F6F\u7684\u6708\u5149\u91CC" + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 1316398620023918647, guid: 03746366fc83b9640bac0d3e53171a32, type: 3} insertIndex: -1 addedObject: {fileID: 1893861974} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 721271515406768042, guid: 03746366fc83b9640bac0d3e53171a32, type: 3} + insertIndex: -1 + addedObject: {fileID: 785315725} m_SourcePrefab: {fileID: 100100000, guid: 03746366fc83b9640bac0d3e53171a32, type: 3} --- !u!4 &575772543 stripped Transform: @@ -19397,7 +19656,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 582, y: 442} + m_AnchoredPosition: {x: 623, y: 471} m_SizeDelta: {x: 295, y: 91} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &588370501 @@ -19512,7 +19771,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: c7a9a7cd560939b4faf921b6fca7c7f3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -20780,7 +21039,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: c7a9a7cd560939b4faf921b6fca7c7f3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 0.98742133, g: 0.98742133, b: 0.98742133, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -24635,7 +24894,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 232777944ca791d448cf4840262643c4, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 0.98742133, g: 0.98742133, b: 0.98742133, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -25104,7 +25363,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 8930f36f3efe98e468f3522ae96fa1b3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 0.98742133, g: 0.98742133, b: 0.98742133, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -25795,7 +26054,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 8930f36f3efe98e468f3522ae96fa1b3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -26038,7 +26297,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 4e070b2a29c2f8b4d832e4d5c174f8b0, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -26153,7 +26412,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -26586,7 +26845,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 2264757832649092751, guid: 53d50b7203be4de4f996337ff6a6b150, type: 3} insertIndex: -1 addedObject: {fileID: 641484068} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6468877054703694706, guid: 53d50b7203be4de4f996337ff6a6b150, type: 3} + insertIndex: -1 + addedObject: {fileID: 861896247} m_SourcePrefab: {fileID: 100100000, guid: 53d50b7203be4de4f996337ff6a6b150, type: 3} --- !u!1 &780270975 GameObject: @@ -26842,6 +27104,19 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 1767757421844513406, guid: 03746366fc83b9640bac0d3e53171a32, type: 3} m_PrefabInstance: {fileID: 575772542} m_PrefabAsset: {fileID: 0} +--- !u!114 &785315725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 575772544} + 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 &788116943 GameObject: m_ObjectHideFlags: 0 @@ -27799,7 +28074,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -28869,6 +29144,19 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 896548501279837827, guid: 53d50b7203be4de4f996337ff6a6b150, type: 3} m_PrefabInstance: {fileID: 780094984} m_PrefabAsset: {fileID: 0} +--- !u!114 &861896247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861896228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: "\u843D\u7B14\u7684\u65F6\u5019\uFF0C\u753B\u91CC\u7684\u82B1\u771F\u7684\u4F1A\u76DB\u5F00\u8BF6" --- !u!1 &864404436 GameObject: m_ObjectHideFlags: 0 @@ -29671,7 +29959,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 8930f36f3efe98e468f3522ae96fa1b3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -29830,7 +30118,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: c7a9a7cd560939b4faf921b6fca7c7f3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -33707,7 +33995,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4265170751644720689, guid: ae4b88ca78d65b64da3d0e3b13c10dc0, type: 3} insertIndex: -1 addedObject: {fileID: 1724212629} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8407350588471988416, guid: ae4b88ca78d65b64da3d0e3b13c10dc0, type: 3} + insertIndex: -1 + addedObject: {fileID: 992098664} m_SourcePrefab: {fileID: 100100000, guid: ae4b88ca78d65b64da3d0e3b13c10dc0, type: 3} --- !u!4 &992098657 stripped Transform: @@ -33719,6 +34010,19 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8407350588471988416, guid: ae4b88ca78d65b64da3d0e3b13c10dc0, type: 3} m_PrefabInstance: {fileID: 992098656} m_PrefabAsset: {fileID: 0} +--- !u!114 &992098664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 992098658} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: "\u9B54\u955C\u9B54\u955C\uFF0C\u6211\u662F\u4E0D\u662F\u6BD4\u5929\u4F7F\u66F4\u6F02\u4EAE\uFF1F" --- !u!1 &992613578 GameObject: m_ObjectHideFlags: 0 @@ -34007,7 +34311,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4039993139082603031, guid: 11fc0bdc44de5174d84b9862592606c4, type: 3} insertIndex: -1 addedObject: {fileID: 2124340760} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5965818254855554330, guid: 11fc0bdc44de5174d84b9862592606c4, type: 3} + insertIndex: -1 + addedObject: {fileID: 997289668} m_SourcePrefab: {fileID: 100100000, guid: 11fc0bdc44de5174d84b9862592606c4, type: 3} --- !u!4 &997289661 stripped Transform: @@ -34019,6 +34326,19 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5965818254855554330, guid: 11fc0bdc44de5174d84b9862592606c4, type: 3} m_PrefabInstance: {fileID: 997289660} m_PrefabAsset: {fileID: 0} +--- !u!114 &997289668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997289662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: "\u6BCF\u7FFB\u5F00\u4E00\u672C\u4E66\uFF0C\u5C31\u50CF\u6709\u4E00\u53EA\u8774\u8776\u7FE9\u7FE9\u98DE\u51FA" --- !u!1 &1004439067 GameObject: m_ObjectHideFlags: 0 @@ -37244,7 +37564,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -38210,6 +38530,109 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1149253002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1149253003} + - component: {fileID: 1149253007} + - component: {fileID: 1149253006} + - component: {fileID: 1149253005} + m_Layer: 0 + m_Name: FurniturePopupCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1149253003 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149253002} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1802423710} + - {fileID: 474007708} + m_Father: {fileID: 1544442451} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1149253005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149253002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1149253006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149253002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1149253007 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149253002} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &1151213433 GameObject: m_ObjectHideFlags: 0 @@ -38419,7 +38842,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.35, g: 0.35, b: 0.35, a: 0.75} + m_Color: {r: 0.509434, g: 0.4789961, b: 0.4789961, a: 0.75} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -41322,7 +41745,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 22} + m_AnchoredPosition: {x: 0, y: -30} m_SizeDelta: {x: 1120, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1250099278 @@ -41354,8 +41777,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281016622 - m_fontColor: {r: 0.18, g: 0.13, b: 0.17, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -41918,6 +42341,19 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 4240491320751975480, guid: 572c6fb6285fef947ac3e31cc0d2a4d0, type: 3} m_PrefabInstance: {fileID: 118566506} m_PrefabAsset: {fileID: 0} +--- !u!114 &1270384037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 118566508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: "\u7434\u5F26\u62E8\u52A8\u7684\u65F6\u5019\uFF0C\u6709\u661F\u661F\u4ECE\u7F1D\u9699\u91CC\u6389\u51FA\u6765" --- !u!1 &1273302434 GameObject: m_ObjectHideFlags: 0 @@ -43205,7 +43641,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: c7a9a7cd560939b4faf921b6fca7c7f3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -45603,7 +46039,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 232777944ca791d448cf4840262643c4, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -46135,6 +46571,54 @@ Transform: - {fileID: 1336465396} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1411007254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1411007256} + - component: {fileID: 1411007255} + m_Layer: 0 + m_Name: FurnitureDescriptionObserver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1411007255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1411007254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2cc3b71db8f6fc41a809647033d2d48, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1411007256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1411007254} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 960, y: 540} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1411310974 PrefabInstance: m_ObjectHideFlags: 0 @@ -46824,7 +47308,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 232777944ca791d448cf4840262643c4, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -48928,7 +49412,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -51657,6 +52141,7 @@ RectTransform: - {fileID: 1601173424} - {fileID: 10745718} - {fileID: 86618848} + - {fileID: 1149253003} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -51914,7 +52399,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 232777944ca791d448cf4840262643c4, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -54276,7 +54761,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4039993139082603031, guid: a04193cc48f141c2a31ba9fd698e9386, type: 3} insertIndex: -1 addedObject: {fileID: 775715055} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5965818254855554330, guid: a04193cc48f141c2a31ba9fd698e9386, type: 3} + insertIndex: -1 + addedObject: {fileID: 77329449} m_SourcePrefab: {fileID: 100100000, guid: a04193cc48f141c2a31ba9fd698e9386, type: 3} --- !u!1 &1606732550 GameObject: @@ -55719,7 +56207,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 0.98742133, g: 0.98742133, b: 0.98742133, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -56025,6 +56513,19 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 687423323465473462, guid: e932275b731ffb248aa448a396a81b29, type: 3} m_PrefabInstance: {fileID: 344768574} m_PrefabAsset: {fileID: 0} +--- !u!114 &1641460250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 344768576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: "\u5B83\u628A\u9633\u5149\u5377\u8FDB\u53F6\u5B50\uFF0C\u50CF\u515C\u7740\u4E00\u7BEE\u788E\u91D1" --- !u!1 &1645460781 GameObject: m_ObjectHideFlags: 0 @@ -60094,7 +60595,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3434974395793768441, guid: b1b300fc390a25b4c8e434a78b903765, type: 3} insertIndex: -1 addedObject: {fileID: 778471371} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7373680571930046446, guid: b1b300fc390a25b4c8e434a78b903765, type: 3} + insertIndex: -1 + addedObject: {fileID: 1736034752} m_SourcePrefab: {fileID: 100100000, guid: b1b300fc390a25b4c8e434a78b903765, type: 3} --- !u!4 &1736034745 stripped Transform: @@ -60106,6 +60610,19 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7373680571930046446, guid: b1b300fc390a25b4c8e434a78b903765, type: 3} m_PrefabInstance: {fileID: 1736034744} m_PrefabAsset: {fileID: 0} +--- !u!114 &1736034752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1736034746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: "\u97F3\u4E50\u54CD\u8D77\u7684\u65F6\u5019\u8FDE\u7A97\u5916\u8DEF\u8FC7\u7684\u8424\u706B\u866B\u90FD\u8DDF\u7740\u8D77\u821E" --- !u!1 &1741336019 GameObject: m_ObjectHideFlags: 0 @@ -61768,14 +62285,14 @@ RectTransform: m_GameObject: {fileID: 1772579788} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1044771794} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -20, y: -20} + m_AnchoredPosition: {x: -71, y: -20.7} m_SizeDelta: {x: 48, y: 48} m_Pivot: {x: 1, y: 1} --- !u!114 &1772579790 @@ -61854,7 +62371,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 2cf3d238db105b745b410c9e484aa97c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -62441,6 +62958,58 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797126495} m_CullTransparentMesh: 1 +--- !u!1 &1802423709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1802423710} + - component: {fileID: 1802423711} + m_Layer: 0 + m_Name: FurniturePopupController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1802423710 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802423709} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1149253003} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1802423711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802423709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a551ad9c8d6c6b04cbb6ac8669c2c190, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 1149253007} + panel: {fileID: 474007708} + descriptionText: {fileID: 505982863} + screenOffset: {x: 0, y: 0} --- !u!1 &1803313162 GameObject: m_ObjectHideFlags: 0 @@ -66578,7 +67147,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 4e070b2a29c2f8b4d832e4d5c174f8b0, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -66668,6 +67237,19 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 5200131922554399862, guid: 26c54fc58117fd7478383274f61041c2, type: 3} m_PrefabInstance: {fileID: 536390114} m_PrefabAsset: {fileID: 0} +--- !u!114 &1918788062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536390115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc516cf6c3ec4d347897937b77927df5, type: 3} + m_Name: + m_EditorClassIdentifier: + _description: "\u5B83\u603B\u8BF4\u81EA\u5DF1\u7B97\u662F\u4E2A\u8FF7\u4F60\u7CD6\u679C\u5C4B" --- !u!1 &1919639472 GameObject: m_ObjectHideFlags: 0 @@ -67528,7 +68110,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 8930f36f3efe98e468f3522ae96fa1b3, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -70046,7 +70628,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 200 m_Sprite: {fileID: 21300000, guid: 4e070b2a29c2f8b4d832e4d5c174f8b0, type: 3} - m_Color: {r: 0.55, g: 0.8, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -70222,10 +70804,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 662754465} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 6.91, y: 327.2922} - m_SizeDelta: {x: 450, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 6.9100037, y: 0.00015258789} + m_SizeDelta: {x: -24, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2002482451 MonoBehaviour: @@ -70262,8 +70844,8 @@ MonoBehaviour: m_Spacing: 4 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 @@ -75838,6 +76420,7 @@ GameObject: - component: {fileID: 2199001005} - component: {fileID: 2199001004} - component: {fileID: 2199001003} + - component: {fileID: 2199001006} m_Layer: 5 m_Name: ApartmentViewportHost m_TagString: Untagged @@ -75928,6 +76511,19 @@ 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 @@ -76485,6 +77081,7 @@ SceneRoots: - {fileID: 1455815464} - {fileID: 1343199450} - {fileID: 1544442451} + - {fileID: 1411007256} - {fileID: 2102000011} - {fileID: 4458821839781952407} - {fileID: 8305841657574615814} diff --git a/Assets/_Project/Scenes/Intro/Prologue.unity b/Assets/_Project/Scenes/Intro/Prologue.unity index 3e529816..16cdc891 100644 --- a/Assets/_Project/Scenes/Intro/Prologue.unity +++ b/Assets/_Project/Scenes/Intro/Prologue.unity @@ -499,8 +499,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_AspectMode: 3 m_AspectRatio: 1.7777778 --- !u!1 &704261845 @@ -660,7 +660,7 @@ MonoBehaviour: textAlignment: 513 textColor: {r: 0.09803922, g: 0.050980393, b: 0.02745098, a: 1} - video: {fileID: 32900000, guid: 8978bee36817fd047a0a2d104b9dae8b, type: 3} - text: "\t\u4E00\u53EA\u8774\u8776\u505C\u5728\u751F\u547D\u6811\u7684\u6811\u679D\u4E0A\u6B47\u811A\u3002\u5B83\u7684\u7FC5\u8180\u662F\u91D1\u84DD\u8272\u7684\u2014\u2014\u592A\u9633\u5E95\u4E0B\u50CF\u788E\u5F00\u7684\u5B9D\u77F3\u3002\r\n\r\n\t\u5B83\u672C\u6765\u53EA\u662F\u6B47\u7740\uFF0C\u4F46\u4F4E\u5934\u7684\u65F6\u8FB0\uFF0C\u770B\u89C1\u4E00\u9897\u719F\u900F\u7684\u871C\u679C\u5782\u5728\u679D\u5934\uFF0C\u679C\u76AE\u88C2\u5F00\u4E00\u9053\u7EC6\u7EB9\uFF0C\u4E00\u6EF4\u91D1\u8272\u7684\u871C\u6B63\u4ECE\u88C2\u7F1D\u91CC\u6162\u6162\u6E17\u51FA\u3002" + text: "\t\u4E00\u53EA\u7FBD\u7FFC\u91D1\u84DD\u7684\u8774\u8776\u6816\u606F\u4E8E\u751F\u547D\u6811\u7684\u6811\u679D\uFF0C\u5B9B\u5982\u5149\u4E0B\u788E\u73E0\uFF0C\r\n\t\u5B83\u5782\u9996\u77A5\u89C1\u719F\u900F\u7684\u871C\u679C\u60AC\u4E8E\u679D\u5934\uFF0C\u7206\u6D46\u7684\u871C\u9732\u5982\u91D1\u8272\u7684\u743C\u6DB2\u7F13\u7F13\u6E17\u51FA" illustration: {fileID: 0} textOffset: {x: 456, y: -351} textBoxSize: {x: 700, y: 200} @@ -674,7 +674,7 @@ MonoBehaviour: textAlignment: 513 textColor: {r: 0.09803922, g: 0.050980393, b: 0.02745098, a: 1} - video: {fileID: 32900000, guid: 643de1b25bae92f499d348bf8d5f1a35, type: 3} - text: "\t\u540C\u4E00\u5929\u591C\u91CC\uFF0C\u6708\u5149\u50CF\u8584\u7EB1\u4E00\u6837\u94FA\u5728\u8349\u5730\u4E0A\u3002\u4E00\u53EA\u6DE1\u7EA2\u8272\u7684\u8424\u706B\u866B\u5728\u667A\u6167\u6811\u7684\u53F6\u5B50\u4E0B\u9762\u98DE\u3002\u5B83\u7684\u5C3E\u5DF4\u4E0A\u6709\u4E00\u70B9\u7EC6\u7EC6\u7684\u5149\uFF0C\u50CF\u4E00\u9897\u4F1A\u547C\u5438\u7684\u661F\u3002\r\n\r\n\t\u5B83\u843D\u5728\u4E00\u7247\u5BBD\u5927\u7684\u53F6\u5B50\u4E0A\uFF0C\u53F6\u9762\u6709\u4E00\u6EF4\u9732\u6C34\u2014\u2014\u4F46\u90A3\u4E0D\u662F\u9732\u6C34\uFF0C\u662F\u679C\u5B9E\u6E17\u51FA\u7684\u6C41\u6C34\uFF0C\u50CF\u6781\u6DE1\u7684\u7425\u73C0\u8272\uFF0C\u51DD\u5728\u53F6\u8109\u4E4B\u95F4\u3002\r" + text: "\t\u540C\u65E5\u591C\u95F4\uFF0C\u6708\u82E5\u6D41\u94F6\uFF0C\u4E00\u53EA\u8424\u706B\u866B\u7A7F\u68AD\u4E8E\u667A\u6167\u6811\u7684\u679D\u53F6\uFF0C\r\n\u5C3E\u5C16\u6DE1\u7EA2\u8272\u7684\u5149\u70B9\u547C\u5438\u822C\u660E\u706D\r\n\t\u5B83\u6B47\u4E8E\u4E00\u7247\u53F6\uFF0C\u53F6\u4E0A\u6709\u4E00\u6EF4\u7425\u73C0\u8272\u7684\u679C\u6D46\uFF0C\u4E4D\u770B\u50CF\u4E00\u6EF4\u666E\u901A\u7684\u9732" illustration: {fileID: 0} textOffset: {x: 490, y: -332} textBoxSize: {x: 700, y: 200} @@ -723,7 +723,7 @@ MonoBehaviour: textAlignment: 513 textColor: {r: 0.09803922, g: 0.050980393, b: 0.02745098, a: 1} - video: {fileID: 32900000, guid: 88ab7a17e53456a4798070b4aaa0268e, type: 3} - text: "\t\u540E\u6765\uFF0C\u6211\u8D70\u8FDB\u4E86\u90A3\u4E2A\u56ED\u5B50\u3002\r\n\r\n\t\u6211\u8D70\u8FC7\u82B1\u4E1B\uFF0C\u8D70\u8FC7\u6EAA\u6C34\u3002\u5728\u751F\u547D\u6811\u7684\u6839\u65C1\uFF0C\u6211\u770B\u89C1\u4E00\u7C92\u84DD\u91D1\u8272\u7684\u5149\u8EBA\u5728\u843D\u53F6\u4E4B\u95F4\u3002\u5B83\u5F88\u5B89\u9759\uFF0C\u50CF\u5728\u7B49\u4EC0\u4E48\u3002\u6211\u5F2F\u8170\u770B\u4E86\u770B\uFF0C\u6CA1\u6709\u78B0\u5B83\u3002\r" + text: "\t\u540E\u6765\u6211\u8D70\u8FDB\u90A3\u4E2A\u56ED\u5B50\u3002\u6B65\u82B1\u4E1B\uFF0C\u8E0F\u6E05\u6EAA\r\n\u5728\u751F\u547D\u6811\u7684\u6811\u6839\u65C1\u770B\u89C1\u4E00\u7C92\u91D1\u84DD\u8272\u7684\u5149\u63A9\u6620\u4E8E\u843D\u53F6\r\n\t\u6211\u5F2F\u8170\uFF0C\u5374\u6CA1\u6709\u89E6\u78B0\u3002" illustration: {fileID: 0} textOffset: {x: -569, y: 234} textBoxSize: {x: 700, y: 200} @@ -737,7 +737,7 @@ MonoBehaviour: textAlignment: 513 textColor: {r: 0.09803922, g: 0.050980393, b: 0.02745098, a: 1} - video: {fileID: 32900000, guid: cb3d3f1515b1cd14190d8bd0e3684ce4, type: 3} - text: "\t\u6211\u4E0D\u77E5\u9053\u5B83\u4EEC\u662F\u4EC0\u4E48\u3002\u6211\u53EA\u77E5\u9053\u5B83\u4EEC\u6216\u8BB8\u4E0D\u8BE5\u88AB\u7559\u5728\u90A3\u91CC\u3002\r\n\r\n\t\u4E8E\u662F\u6211\u627E\u4E86\u4E24\u53EA\u900F\u660E\u7684\u73BB\u7483\u74F6\uFF0C\u5C06\u5B83\u4EEC\u8F7B\u8F7B\u6536\u4E86\u8FDB\u53BB\u3002\u6696\u767D\u7684\u653E\u8FDB\u5DE6\u8FB9\u7684\u74F6\u5B50\uFF0C\u6697\u7EA2\u7684\u653E\u8FDB\u53F3\u8FB9\u7684\u74F6\u5B50\u3002\u74F6\u53E3\u6CA1\u6709\u5C01\u4F4F\uFF0C\u6211\u53EA\u662F\u628A\u5B83\u4EEC\u653E\u5728\u684C\u4E0A\u3002\u7A97\u5F00\u7740\u3002\u98CE\u80FD\u5439\u8FDB\u6765\u3002\r\n\r\n\t\u5B83\u4EEC\u6CA1\u6709\u9192\uFF0C\u4E5F\u6CA1\u6709\u706D\u3002\u53EA\u662F\u5728\u74F6\u5B50\u91CC\u5B89\u5B89\u9759\u9759\u5730\u5F85\u7740\u3002\r" + text: "\t\u6211\u4E0D\u77E5\u5B83\u4EEC\u662F\u4F55\u7269\uFF0C\u53EA\u83AB\u51A5\u89C9\u5F97\u4E0D\u8BE5\u7559\u4E8E\u90A3\u91CC\u4E8E\u662F\u6211\u627E\u4E86\u4E24\u53EA\u73BB\u7483\u74F6\u5C06\u5B83\u4EEC\u8F7B\u8F7B\u6536\u5165\uFF0C\u74F6\u53E3\u672A\u5C01\u4E00\u6211\u5411\u5B83\u4EEC\u4E5F\u9700\u8981\u7A97\u5916\u7684\u82B1\u9999\u548C\u98CE\u541F\u3002\n\t\u5B83\u4EEC\u5C31\u8FD9\u6837\u9759\u9759\u5730\uFF0C\u4E0D\u706D\uFF0C\u4E5F\u4E0D\u9192\u3002" illustration: {fileID: 0} textOffset: {x: -457, y: 73} textBoxSize: {x: 700, y: 200} @@ -945,8 +945,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 0 diff --git a/Assets/_Project/Scenes/WorldMap/WorldMap_Main.unity b/Assets/_Project/Scenes/WorldMap/WorldMap_Main.unity index a650e305..eb38fa0e 100644 --- a/Assets/_Project/Scenes/WorldMap/WorldMap_Main.unity +++ b/Assets/_Project/Scenes/WorldMap/WorldMap_Main.unity @@ -708,6 +708,81 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &11172406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 11172407} + - component: {fileID: 11172409} + - component: {fileID: 11172408} + m_Layer: 5 + m_Name: SproutImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &11172407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11172406} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 224985368} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -21, y: 48} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &11172408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11172406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db93472285d0f6343a3fb161ccb542b6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &11172409 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11172406} + m_CullTransparentMesh: 1 --- !u!1 &11305798 GameObject: m_ObjectHideFlags: 0 @@ -26285,6 +26360,7 @@ RectTransform: - {fileID: 426572185} - {fileID: 1241356569} - {fileID: 652087966} + - {fileID: 11172407} - {fileID: 1660082173} m_Father: {fileID: 1074336849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -52480,7 +52556,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &426572185 RectTransform: m_ObjectHideFlags: 0 @@ -56044,14 +56120,14 @@ RectTransform: m_GameObject: {fileID: 464163632} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 874617066} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 589, y: 401} + m_AnchoredPosition: {x: 660.7, y: 391} m_SizeDelta: {x: 58, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &464163634 @@ -75608,6 +75684,156 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &632622327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 632622328} + - component: {fileID: 632622330} + - component: {fileID: 632622329} + m_Layer: 5 + m_Name: Variant_17 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &632622328 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632622327} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 650429237} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &632622329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632622327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3e8f11fdca42f2347bf91cfbbb8fb425, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &632622330 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632622327} + m_CullTransparentMesh: 1 +--- !u!1 &633545461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 633545462} + - component: {fileID: 633545464} + - component: {fileID: 633545463} + m_Layer: 5 + m_Name: SproutImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &633545462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633545461} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1201588035} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -9, y: 5.4} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &633545463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633545461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db93472285d0f6343a3fb161ccb542b6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &633545464 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633545461} + m_CullTransparentMesh: 1 --- !u!1 &634035925 GameObject: m_ObjectHideFlags: 0 @@ -77175,6 +77401,7 @@ RectTransform: - {fileID: 1747581960} - {fileID: 294088562} - {fileID: 790219696} + - {fileID: 632622328} m_Father: {fileID: 1378882903} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -77268,6 +77495,8 @@ MonoBehaviour: Target: {fileID: 294088561} - Key: "\u5B64\u72EC|angel|1" Target: {fileID: 790219695} + - Key: "\u5B64\u72EC|demon|1" + Target: {fileID: 632622327} --- !u!1 &651073716 GameObject: m_ObjectHideFlags: 0 @@ -77520,7 +77749,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 652087965} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -90857,6 +91086,7 @@ RectTransform: - {fileID: 1225075912} - {fileID: 234695128} - {fileID: 1572601170} + - {fileID: 1304837814} - {fileID: 818439118} m_Father: {fileID: 1074336849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -105110,6 +105340,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 864721634} m_CullTransparentMesh: 1 +--- !u!1 &865655957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 865655958} + - component: {fileID: 865655960} + - component: {fileID: 865655959} + m_Layer: 5 + m_Name: ClockBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &865655958 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865655957} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 903997283} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &865655959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865655957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 94fbdef8721d6f54fbe8267b0bcc7f24, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &865655960 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865655957} + m_CullTransparentMesh: 1 --- !u!1 &866167619 GameObject: m_ObjectHideFlags: 0 @@ -109587,6 +109892,61 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!1 &903997282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 903997283} + - component: {fileID: 903997285} + m_Layer: 5 + m_Name: GrowthClockRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &903997283 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 903997282} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 865655958} + - {fileID: 1448682682} + - {fileID: 957614962} + m_Father: {fileID: 922973551} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 738, y: -258} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &903997285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 903997282} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8dec7d9f6f9f0084f895e0e50884da8e, type: 3} + m_Name: + m_EditorClassIdentifier: + _sproutZone: {fileID: 1448682683} + _clockHand: {fileID: 957614962} + _hideWhenFinished: 0 + _handStartAngle: 0 --- !u!1 &904290538 GameObject: m_ObjectHideFlags: 0 @@ -112092,6 +112452,7 @@ RectTransform: - {fileID: 1397504676} - {fileID: 2042938560} - {fileID: 1074336849} + - {fileID: 903997283} - {fileID: 684703943} - {fileID: 206307233} - {fileID: 1495910939} @@ -115486,6 +115847,7 @@ RectTransform: - {fileID: 1272191008} - {fileID: 1257112737} - {fileID: 171491784} + - {fileID: 2044560366} - {fileID: 609588481} m_Father: {fileID: 1074336849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -116083,6 +116445,81 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &957614961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 957614962} + - component: {fileID: 957614964} + - component: {fileID: 957614963} + m_Layer: 5 + m_Name: ClockHand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &957614962 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 957614961} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 903997283} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -17.49997} + m_SizeDelta: {x: 5, y: 35} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &957614963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 957614961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &957614964 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 957614961} + m_CullTransparentMesh: 1 --- !u!1 &957720436 GameObject: m_ObjectHideFlags: 0 @@ -120592,7 +121029,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1002749158 RectTransform: m_ObjectHideFlags: 0 @@ -122093,7 +122530,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1016778174 RectTransform: m_ObjectHideFlags: 0 @@ -139459,7 +139896,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1185397125 RectTransform: m_ObjectHideFlags: 0 @@ -140468,6 +140905,7 @@ RectTransform: - {fileID: 1002749158} - {fileID: 643819383} - {fileID: 1908681808} + - {fileID: 633545462} - {fileID: 726609731} m_Father: {fileID: 1074336849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -140529,6 +140967,7 @@ RectTransform: - {fileID: 1016778174} - {fileID: 1952794446} - {fileID: 297875929} + - {fileID: 1709215106} - {fileID: 951917890} m_Father: {fileID: 1074336849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -143436,7 +143875,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1225075912 RectTransform: m_ObjectHideFlags: 0 @@ -149371,7 +149810,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1272191008 RectTransform: m_ObjectHideFlags: 0 @@ -153059,6 +153498,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _fontKey: default +--- !u!1 &1304837813 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1304837814} + - component: {fileID: 1304837816} + - component: {fileID: 1304837815} + m_Layer: 5 + m_Name: SproutImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1304837814 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304837813} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 759631749} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -9, y: -54} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1304837815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304837813} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db93472285d0f6343a3fb161ccb542b6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1304837816 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304837813} + m_CullTransparentMesh: 1 --- !u!1 &1304920222 GameObject: m_ObjectHideFlags: 0 @@ -162754,6 +163268,7 @@ RectTransform: - {fileID: 1185397125} - {fileID: 310444584} - {fileID: 1333561494} + - {fileID: 1586783626} - {fileID: 650429237} m_Father: {fileID: 1074336849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -163992,7 +164507,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1390445748 RectTransform: m_ObjectHideFlags: 0 @@ -171168,6 +171683,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1446752623} m_CullTransparentMesh: 1 +--- !u!1 &1448682681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1448682682} + - component: {fileID: 1448682684} + - component: {fileID: 1448682683} + m_Layer: 5 + m_Name: SproutZone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1448682682 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448682681} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 903997283} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -16} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1448682683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448682681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6008464, g: 0.8805031, b: 0.64926016, a: 0.5411765} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1448682684 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448682681} + m_CullTransparentMesh: 1 --- !u!1 &1448734122 GameObject: m_ObjectHideFlags: 0 @@ -174609,7 +175199,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1479303920 RectTransform: m_ObjectHideFlags: 0 @@ -186280,6 +186870,81 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1586783625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1586783626} + - component: {fileID: 1586783628} + - component: {fileID: 1586783627} + m_Layer: 5 + m_Name: SproutImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1586783626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586783625} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1378882903} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -2, y: 51.8} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1586783627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586783625} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db93472285d0f6343a3fb161ccb542b6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1586783628 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586783625} + m_CullTransparentMesh: 1 --- !u!1 &1587539533 GameObject: m_ObjectHideFlags: 0 @@ -189549,7 +190214,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1613531296 RectTransform: m_ObjectHideFlags: 0 @@ -195998,6 +196663,81 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1664320820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1664320821} + - component: {fileID: 1664320823} + - component: {fileID: 1664320822} + m_Layer: 5 + m_Name: SproutImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1664320821 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664320820} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1790331990} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 66} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1664320822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664320820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db93472285d0f6343a3fb161ccb542b6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1664320823 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664320820} + m_CullTransparentMesh: 1 --- !u!1 &1665508831 GameObject: m_ObjectHideFlags: 0 @@ -201077,6 +201817,81 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1709215105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1709215106} + - component: {fileID: 1709215108} + - component: {fileID: 1709215107} + m_Layer: 5 + m_Name: SproutImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1709215106 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1709215105} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1202196132} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1, y: -40.8} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1709215107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1709215105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db93472285d0f6343a3fb161ccb542b6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1709215108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1709215105} + m_CullTransparentMesh: 1 --- !u!114 &1710206677 MonoBehaviour: m_ObjectHideFlags: 0 @@ -204823,6 +205638,9 @@ MonoBehaviour: _content: {fileID: 922973550} _closeButton: {fileID: 1397504677} _balanceText: {fileID: 232603342} + _sproutDelaySeconds: 10 + _growthVisualRefreshSeconds: 1 + _growthClockUI: {fileID: 903997285} _cellPrefab: {fileID: 1587605071} _gridRoot: {fileID: 1074336849} _weekTitleText: {fileID: 976674472} @@ -210488,6 +211306,7 @@ RectTransform: - {fileID: 1613531296} - {fileID: 63258425} - {fileID: 231546612} + - {fileID: 1664320821} - {fileID: 1647273462} m_Father: {fileID: 1074336849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -223317,7 +224136,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1908681807} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -239384,7 +240203,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2042938560 RectTransform: m_ObjectHideFlags: 0 @@ -239518,6 +240337,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2043429793} m_CullTransparentMesh: 1 +--- !u!1 &2044560365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2044560366} + - component: {fileID: 2044560368} + - component: {fileID: 2044560367} + m_Layer: 5 + m_Name: 'SproutImage ' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2044560366 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2044560365} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 954961332} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 10.2, y: 8.1} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2044560367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2044560365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: db93472285d0f6343a3fb161ccb542b6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2044560368 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2044560365} + m_CullTransparentMesh: 1 --- !u!1 &2045210719 GameObject: m_ObjectHideFlags: 0 @@ -241773,8 +242667,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -24, y: -24} - m_SizeDelta: {x: 40, y: 40} + m_AnchoredPosition: {x: -436, y: -249} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 1, y: 1} --- !u!114 &2066524037 MonoBehaviour: @@ -241833,7 +242727,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.15} + m_Color: {r: 0.3584906, g: 0.3584906, b: 0.3584906, a: 0.8666667} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -248618,8 +249512,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -253756,7 +254650,7 @@ Transform: m_GameObject: {fileID: 5165812190261858087} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3, y: -1.75, z: 0} + m_LocalPosition: {x: 5.81, y: -1.75, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs b/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs new file mode 100644 index 00000000..28e12f6a --- /dev/null +++ b/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs @@ -0,0 +1,16 @@ +using System; + +namespace GeminiLab.Modules.EmotionGarden +{ + public static class EmotionGardenGrowthTiming + { + // 10分钟发芽 + public const float SproutSeconds = 10f*60f; + + // 60分钟成熟 + public const float BloomSeconds = 60f*60f; + + public static TimeSpan BloomDuration => + TimeSpan.FromSeconds(BloomSeconds); + } +} diff --git a/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs.meta b/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs.meta new file mode 100644 index 00000000..01794677 --- /dev/null +++ b/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenGrowthTiming.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 59babac8e4e01d9449cb642c8f9fd332 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenService.cs b/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenService.cs index a1a1d256..29de0a13 100644 --- a/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenService.cs +++ b/Assets/_Project/Scripts/Modules/EmotionGarden/EmotionGardenService.cs @@ -23,6 +23,9 @@ public sealed class EmotionGardenService : MonoBehaviour, IEmotionGardenService, private const int PlacementInventorySaveVersion = 3; private const int PlacedFlowersSaveVersion = 4; + + + private IGameClock? _clock; private EventBus? _eventBus; @@ -449,23 +452,40 @@ public bool TryPlaceFlower( public void RefreshBlooming() { - if (_clock == null) return; - var today = _clock.TodayIso; + if (_clock == null) + return; for (int i = 0; i < _flowers.Count; i++) { var f = _flowers[i]; - if (f.State != GrowthState.Growing) continue; - if (f.IsCollected) continue; - // 跨天自动开花:花的日期早于今天 - if (string.Compare(f.DateIso, today, StringComparison.Ordinal) < 0) + if (f.State != GrowthState.Growing) + continue; + + if (f.IsCollected) + continue; + + if (f.CreatedAtUtcTicks <= 0) + continue; + + long elapsedTicks = + _clock.UtcNow.Ticks - + f.CreatedAtUtcTicks; + + if (elapsedTicks < 0) + elapsedTicks = 0; + + if (elapsedTicks >= + EmotionGardenGrowthTiming + .BloomDuration + .Ticks) { BloomAt(i); } } } + public void ClearAllData() { _flowers.Clear(); diff --git a/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureDescriptionObserver.cs b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureDescriptionObserver.cs new file mode 100644 index 00000000..df3c3847 --- /dev/null +++ b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureDescriptionObserver.cs @@ -0,0 +1,291 @@ +#nullable enable + +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +#if ENABLE_INPUT_SYSTEM +using UnityEngine.InputSystem; +#endif + +namespace GeminiLab.Modules.HubUI +{ + public sealed class FurnitureDescriptionObserver : MonoBehaviour + { + private ApartmentViewportInputBridge? _viewportBridge; + + private EventSystem? _eventSystem; + private PointerEventData? _pointerEvent; + + private readonly List _uiHits = new(); + + private void Awake() + { + FindViewportBridge(); + } + + private void FindViewportBridge() + { + _viewportBridge = + Object.FindFirstObjectByType(); + + if (_viewportBridge == null) + { + Debug.LogWarning( + "[FurnitureDescription] " + + "暂时找不到 ApartmentViewportInputBridge" + ); + } + else + { + Debug.Log( + "[FurnitureDescription] 找到 ViewportBridge:" + + _viewportBridge.gameObject.name + ); + } + } + + private void Update() + { + if (!TryGetLeftClick(out Vector2 screenPosition)) + return; + + Debug.Log( + "[FurnitureDescription] 收到点击 screen=" + + screenPosition + ); + + // ========================================= + // Bridge 如果因为初始化顺序没找到,重新找 + // ========================================= + if (_viewportBridge == null) + { + FindViewportBridge(); + + if (_viewportBridge == null) + { + Debug.LogWarning( + "[FurnitureDescription] " + + "点击失败:ViewportBridge 仍然为空" + ); + + FurnitureInfoPopup.Instance?.Hide(); + return; + } + } + + // ========================================= + // 确认点击是在 Apartment Viewport + // ========================================= + if (!TryGetViewportEventCamera( + screenPosition, + out Camera? eventCamera)) + { + Debug.LogWarning( + "[FurnitureDescription] " + + "点击没有通过 Viewport UI 检查" + ); + + FurnitureInfoPopup.Instance?.Hide(); + return; + } + + // ========================================= + // 屏幕坐标 -> 公寓世界坐标 + // ========================================= + if (!_viewportBridge.TryScreenPointToWorldPoint( + screenPosition, + eventCamera, + out Vector2 worldPoint, + out _)) + { + Debug.LogWarning( + "[FurnitureDescription] " + + "Screen → World 转换失败" + ); + + FurnitureInfoPopup.Instance?.Hide(); + return; + } + + Debug.Log( + "[FurnitureDescription] worldPoint=" + + worldPoint + ); + + // ========================================= + // 找所有可以显示描述的家具 + // ========================================= + FurnitureInspectable[] inspectables = + Object.FindObjectsByType( + FindObjectsInactive.Exclude, + FindObjectsSortMode.None + ); + + Debug.Log( + "[FurnitureDescription] 当前 FurnitureInspectable 数量=" + + inspectables.Length + ); + + FurnitureInspectable? best = null; + int bestOrder = int.MinValue; + + foreach (FurnitureInspectable inspectable in inspectables) + { + if (inspectable == null) + continue; + + if (!inspectable.TryHit( + worldPoint, + out int sortingOrder)) + { + continue; + } + + Debug.Log( + "[FurnitureDescription] 命中:" + + inspectable.gameObject.name + + " sorting=" + + sortingOrder + ); + + if (best == null || + sortingOrder > bestOrder) + { + best = inspectable; + bestOrder = sortingOrder; + } + } + + // ========================================= + // 最终结果 + // ========================================= + if (best != null) + { + Debug.Log( + "[FurnitureDescription] 最终选择:" + + best.gameObject.name + ); + + best.ShowDescription(screenPosition); + } + else + { + Debug.Log( + "[FurnitureDescription] 没有命中可描述家具" + ); + + FurnitureInfoPopup.Instance?.Hide(); + } + } + + private bool TryGetViewportEventCamera( + Vector2 screenPosition, + out Camera? eventCamera) + { + eventCamera = null; + + if (EventSystem.current == null) + { + Debug.LogWarning( + "[FurnitureDescription] EventSystem.current == null" + ); + + return false; + } + + if (_viewportBridge == null) + return false; + + if (_eventSystem != EventSystem.current) + { + _eventSystem = EventSystem.current; + + _pointerEvent = + new PointerEventData(_eventSystem); + } + + _pointerEvent!.Reset(); + _pointerEvent.position = screenPosition; + + _uiHits.Clear(); + + _eventSystem.RaycastAll( + _pointerEvent, + _uiHits + ); + + if (_uiHits.Count == 0) + { + Debug.LogWarning( + "[FurnitureDescription] UI Raycast 0 个结果" + ); + + return false; + } + + RaycastResult topHit = + _uiHits[0]; + + Debug.Log( + "[FurnitureDescription] UI TopHit=" + + topHit.gameObject.name + ); + + ApartmentViewportInputBridge? hitBridge = + topHit.gameObject + .GetComponentInParent< + ApartmentViewportInputBridge>(); + + if (hitBridge != _viewportBridge) + { + Debug.LogWarning( + "[FurnitureDescription] " + + "TopHit 不是 ApartmentViewportInputBridge," + + "当前挡住点击的是:" + + topHit.gameObject.name + ); + + return false; + } + + eventCamera = + topHit.module.eventCamera; + + return true; + } + + private static bool TryGetLeftClick( + out Vector2 screenPosition) + { + screenPosition = default; + +#if ENABLE_INPUT_SYSTEM + + if (Mouse.current != null && + Mouse.current.leftButton.wasPressedThisFrame) + { + screenPosition = + Mouse.current.position.ReadValue(); + + return true; + } + +#endif + +#if ENABLE_LEGACY_INPUT_MANAGER + + if (Input.GetMouseButtonDown(0)) + { + screenPosition = + Input.mousePosition; + + return true; + } + +#endif + + return false; + } + } +} diff --git a/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureDescriptionObserver.cs.meta b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureDescriptionObserver.cs.meta new file mode 100644 index 00000000..cc16fa6f --- /dev/null +++ b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureDescriptionObserver.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f2cc3b71db8f6fc41a809647033d2d48 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInfoPopup.cs b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInfoPopup.cs new file mode 100644 index 00000000..53dd8e2a --- /dev/null +++ b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInfoPopup.cs @@ -0,0 +1,105 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class FurnitureInfoPopup : MonoBehaviour +{ + public static FurnitureInfoPopup Instance { get; private set; } + + [Header("UI")] + [SerializeField] private Canvas canvas; + [SerializeField] private RectTransform panel; + [SerializeField] private TMP_Text descriptionText; + + [Header("距离点击位置的偏移")] + [SerializeField] private Vector2 screenOffset = new Vector2(30f, 30f); + + private void Awake() + { + Instance = this; + + // 只隐藏白框,不要关闭 Canvas / Controller + panel.gameObject.SetActive(false); + } + + public void ShowAtScreenPosition( + string description, + Vector2 screenPosition) + { + panel.gameObject.SetActive(true); + panel.SetAsLastSibling(); + + descriptionText.text = description; + + Canvas.ForceUpdateCanvases(); + LayoutRebuilder.ForceRebuildLayoutImmediate(panel); + + RectTransform canvasRect = + canvas.transform as RectTransform; + + if (canvasRect == null) + return; + + Camera uiCamera = + canvas.renderMode == RenderMode.ScreenSpaceOverlay + ? null + : canvas.worldCamera; + + // 屏幕坐标 -> FurniturePopupCanvas 本地坐标 + if (!RectTransformUtility.ScreenPointToLocalPointInRectangle( + canvasRect, + screenPosition, + uiCamera, + out Vector2 localPosition)) + { + Debug.LogError("Popup 坐标转换失败"); + return; + } + + Debug.Log( + $"Popup BEFORE CLAMP " + + $"screen={screenPosition}, " + + $"local={localPosition}, " + + $"canvasRect={canvasRect.rect}" + ); + + localPosition += screenOffset; + + // 防止跑出 Canvas + Rect bounds = canvasRect.rect; + + float minX = + bounds.xMin + + panel.rect.width * panel.pivot.x; + + float maxX = + bounds.xMax - + panel.rect.width * (1f - panel.pivot.x); + + float minY = + bounds.yMin + + panel.rect.height * panel.pivot.y; + + float maxY = + bounds.yMax - + panel.rect.height * (1f - panel.pivot.y); + + localPosition.x = + Mathf.Clamp(localPosition.x, minX, maxX); + + localPosition.y = + Mathf.Clamp(localPosition.y, minY, maxY); + + panel.anchoredPosition = localPosition; + + Debug.Log( + $"Popup FINAL = {panel.anchoredPosition}" + ); + } + + + public void Hide() + { + panel.gameObject.SetActive(false); + } +} diff --git a/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInfoPopup.cs.meta b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInfoPopup.cs.meta new file mode 100644 index 00000000..0c1bbfe5 --- /dev/null +++ b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInfoPopup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a551ad9c8d6c6b04cbb6ac8669c2c190 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInspectable.cs b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInspectable.cs new file mode 100644 index 00000000..d30b2f5c --- /dev/null +++ b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInspectable.cs @@ -0,0 +1,74 @@ +#nullable enable + +using UnityEngine; +using UnityEngine.Rendering; + +namespace GeminiLab.Modules.HubUI +{ + [DisallowMultipleComponent] + public sealed class FurnitureInspectable : MonoBehaviour + { + [TextArea(2, 6)] + [SerializeField] + private string _description = ""; + + private Collider2D? _hitArea; + + private void Awake() + { + _hitArea = GetComponent(); + + if (_hitArea == null) + _hitArea = GetComponentInChildren(); + } + + public bool TryHit( + Vector2 worldPoint, + out int sortingOrder) + { + sortingOrder = 0; + + if (!isActiveAndEnabled || + _hitArea == null || + !_hitArea.enabled || + !_hitArea.OverlapPoint(worldPoint)) + { + return false; + } + + SortingGroup? group = + GetComponentInParent(); + + if (group != null) + { + sortingOrder = group.sortingOrder; + return true; + } + + SpriteRenderer? renderer = + GetComponentInChildren(); + + if (renderer != null) + sortingOrder = renderer.sortingOrder; + + return true; + } + + public void ShowDescription(Vector2 screenPosition) + { + Debug.Log("[FurnitureDescription] " + gameObject.name); + + if (FurnitureInfoPopup.Instance == null) + { + Debug.LogError("FurnitureInfoPopup.Instance == null"); + return; + } + + FurnitureInfoPopup.Instance.ShowAtScreenPosition( + _description, + screenPosition + ); + } + + } +} diff --git a/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInspectable.cs.meta b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInspectable.cs.meta new file mode 100644 index 00000000..f7c3363f --- /dev/null +++ b/Assets/_Project/Scripts/Modules/HubUI/Panels/FurnitureInspectable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cc516cf6c3ec4d347897937b77927df5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Scripts/Modules/HubUI/Panels/WeeklyGardenPanelStub.cs b/Assets/_Project/Scripts/Modules/HubUI/Panels/WeeklyGardenPanelStub.cs index a8a75e54..180f2e1b 100644 --- a/Assets/_Project/Scripts/Modules/HubUI/Panels/WeeklyGardenPanelStub.cs +++ b/Assets/_Project/Scripts/Modules/HubUI/Panels/WeeklyGardenPanelStub.cs @@ -20,6 +20,18 @@ namespace GeminiLab.Modules.HubUI.Panels /// public sealed class WeeklyGardenPanelStub : StubPanelBase { + [Header("生长阶段")] + [SerializeField] private float _sproutDelaySeconds = 10f; + + [SerializeField] private float _growthVisualRefreshSeconds = 1f; + + [Header("生长时钟")] + [SerializeField] + private GrowthClockUI _growthClockUI; + + + private float _growthVisualTimer; + public override PanelId Id => PanelId.WeeklyGardenView; private static readonly string[] DayLabels = { "周一", "周二", "周三", "周四", "周五", "周六", "周日" }; @@ -139,6 +151,10 @@ public void SelectDay(int dayIndex) _selectedDayIndex = dayIndex; ApplySelectionVisuals(); RefreshDetailBar(_service.GetWeekFlowers(_viewedWeekId)); + + //新增 + RefreshGrowthClockForDay(dayIndex); + } /// 点击面板空白区域后恢复默认日期信息。 @@ -202,6 +218,18 @@ private void Refresh() bottleView?.ShowPreview(); bool isGrowing = flower.HasValue && flower.Value.State == GrowthState.Growing; + + // ★ 发芽阶段 + GameObject? sproutImage = + cell.transform.Find("SproutImage")?.gameObject; + + if (sproutImage != null) + { + sproutImage.SetActive( + ShouldShowSprout(flower) + ); + } + string? flowerVariantKey = flower.HasValue && flower.Value.State == GrowthState.Bloomed && _flowerArtCatalog?.Resolve(flower.Value.EmotionType, flower.Value.Owner, GrowthState.Bloomed) != null ? SceneAuthoredImageVariantView.BuildFlowerKey( @@ -209,6 +237,8 @@ private void Refresh() flower.Value.Owner, GrowthState.Bloomed) : null; + + var flowerView = cell.transform.Find("FlowerImage")?.GetComponent(); if (flowerView != null) @@ -378,5 +408,168 @@ private void HideCellTemplate() template.gameObject.SetActive(false); } } + + private bool ShouldShowSprout(EmotionFlowerData? flower) + { + if (!flower.HasValue) + return false; + + EmotionFlowerData data = flower.Value; + + // 已经成熟了,就不显示嫩芽 + if (data.State != GrowthState.Growing) + return false; + + if (data.CreatedAtUtcTicks <= 0) + return false; + + if (!ServiceLocator.TryResolve( + out IGameClock? clock) || + clock == null) + { + return false; + } + + long elapsedTicks = + clock.UtcNow.Ticks - data.CreatedAtUtcTicks; + + if (elapsedTicks < 0) + return false; + + double elapsedSeconds = + TimeSpan.FromTicks(elapsedTicks).TotalSeconds; + + return elapsedSeconds >= EmotionGardenGrowthTiming.SproutSeconds; + } + + + private void Update() + { + if (_service == null) + return; + + _growthVisualTimer += Time.unscaledDeltaTime; + + if (_growthVisualTimer < + _growthVisualRefreshSeconds) + { + return; + } + + _growthVisualTimer = 0f; + + RefreshSproutVisuals(); + } + + private void RefreshSproutVisuals() + { + if (_service == null) + return; + + EmotionFlowerData?[] flowers = + _service.GetWeekFlowers(_viewedWeekId); + + for (int i = 0; i < _cells.Length; i++) + { + GameObject? cell = _cells[i]; + + if (cell == null) + continue; + + Transform? sproutTransform = + cell.transform.Find("SproutImage"); + + if (sproutTransform == null) + { + if (flowers[i].HasValue) + { + Debug.LogWarning( + $"[Sprout] Day{i} 有花,但是找不到 SproutImage" + ); + } + + continue; + } + + bool shouldShow = + ShouldShowSprout(flowers[i]); + + if (flowers[i].HasValue) + { + Debug.Log( + $"[Sprout] Day{i} " + + $"state={flowers[i]!.Value.State}, " + + $"show={shouldShow}" + ); + } + + sproutTransform.gameObject.SetActive(shouldShow); + } + } + + private void RefreshGrowthClockForDay( + int index) + { + if (_growthClockUI == null) + return; + + if (_service == null) + { + _growthClockUI.Hide(); + return; + } + + EmotionFlowerData?[] flowers = + _service.GetWeekFlowers( + _viewedWeekId + ); + + if (index < 0 || + index >= flowers.Length) + { + _growthClockUI.Hide(); + return; + } + + EmotionFlowerData? flower = + flowers[index]; + + // 这一天没有花 + if (!flower.HasValue) + { + _growthClockUI.Hide(); + return; + } + + EmotionFlowerData data = + flower.Value; + + // 已经成熟,不需要显示成长时钟 + if (data.State != GrowthState.Growing) + { + _growthClockUI.Hide(); + return; + } + + if (data.CreatedAtUtcTicks <= 0) + { + _growthClockUI.Hide(); + return; + } + + // 告诉 GrowthClockUI: + // 这朵花是什么时候种下的 + _growthClockUI.Show( + data.CreatedAtUtcTicks + ); + } + + + + + + + + } } diff --git a/Assets/_Project/Scripts/Modules/HubUI/clock.meta b/Assets/_Project/Scripts/Modules/HubUI/clock.meta new file mode 100644 index 00000000..aeae10ff --- /dev/null +++ b/Assets/_Project/Scripts/Modules/HubUI/clock.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c591a40d539170409e487e2001d6dce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Scripts/Modules/HubUI/clock/GrowthClockUI.cs b/Assets/_Project/Scripts/Modules/HubUI/clock/GrowthClockUI.cs new file mode 100644 index 00000000..1d0870ba --- /dev/null +++ b/Assets/_Project/Scripts/Modules/HubUI/clock/GrowthClockUI.cs @@ -0,0 +1,227 @@ +using System; +using GeminiLab.Core; +using GeminiLab.Core.Time; +using GeminiLab.Modules.EmotionGarden; +using UnityEngine; +using UnityEngine.UI; + + +public sealed class GrowthClockUI : MonoBehaviour +{ + [Header("UI References")] + + [SerializeField] + private Image _sproutZone; + + [SerializeField] + private RectTransform _clockHand; + + + [Header("Display")] + + [Tooltip("成熟后是否隐藏整个闹钟")] + [SerializeField] + private bool _hideWhenFinished = true; + + [Tooltip("如果你的指针 Rotation Z = 0 时不是朝12点,可在这里补角度")] + [SerializeField] + private float _handStartAngle = 0f; + + + // 当前正在显示哪一朵花的创建时间 + private long _createdAtUtcTicks; + + // 当前是否有花需要显示 + private bool _hasTarget; + + // 游戏自己的时钟 + private IGameClock _clock; + + + private void Awake() + { + ApplySproutZone(); + TryResolveClock(); + + _hasTarget = false; + + if (_clockHand != null) + { + _clockHand.localEulerAngles = + new Vector3( + 0f, + 0f, + _handStartAngle + ); + } + } + + + + /// + /// 显示某一朵正在生长的花。 + /// + public void Show(long createdAtUtcTicks) + { + if (createdAtUtcTicks <= 0) + { + Hide(); + return; + } + + _createdAtUtcTicks = createdAtUtcTicks; + _hasTarget = true; + + gameObject.SetActive(true); + + ApplySproutZone(); + + RefreshImmediately(); + } + + + /// + /// 隐藏生长时钟。 + /// + public void Hide() + { + _hasTarget = false; + + // 不关闭整个闹钟 + // 只把指针恢复到起点 + if (_clockHand != null) + { + _clockHand.localEulerAngles = + new Vector3( + 0f, + 0f, + _handStartAngle + ); + } + + // 保证闹钟仍然显示 + gameObject.SetActive(true); + } + + + + private void Update() + { + if (!_hasTarget) + return; + + RefreshImmediately(); + } + + + /// + /// 根据发芽时间 / 成熟时间, + /// 自动设置绿色 Zone 的大小。 + /// + private void ApplySproutZone() + { + if (_sproutZone == null) + return; + + float bloomSeconds = + Mathf.Max( + 0.01f, + EmotionGardenGrowthTiming.BloomSeconds + ); + + float sproutRatio = + EmotionGardenGrowthTiming.SproutSeconds + / bloomSeconds; + + _sproutZone.fillAmount = + Mathf.Clamp01(sproutRatio); + } + + + /// + /// 刷新指针。 + /// + private void RefreshImmediately() + { + if (_clockHand == null) + return; + + if (!TryResolveClock()) + return; + + long elapsedTicks = + _clock.UtcNow.Ticks - + _createdAtUtcTicks; + + if (elapsedTicks < 0) + elapsedTicks = 0; + + double elapsedSeconds = + TimeSpan + .FromTicks(elapsedTicks) + .TotalSeconds; + + float bloomSeconds = + Mathf.Max( + 0.01f, + EmotionGardenGrowthTiming.BloomSeconds + ); + + float progress = + Mathf.Clamp01( + (float)( + elapsedSeconds / + bloomSeconds + ) + ); + + // ========================================== + // 0% = 12点 + // 25% = 3点 + // 50% = 6点 + // 75% = 9点 + // 100% = 回到12点 + // + // Unity Z 负角度 = 顺时针 + // ========================================== + + float angle = + _handStartAngle - + progress * 360f; + + _clockHand.localEulerAngles = + new Vector3( + 0f, + 0f, + angle + ); + + + // // 完全成熟 + // if (progress >= 1f && + // _hideWhenFinished) + // { + // Hide(); + // } + } + + + /// + /// 找项目当前使用的 IGameClock。 + /// + private bool TryResolveClock() + { + if (_clock != null) + return true; + + if (ServiceLocator.TryResolve( + out IGameClock clock) && + clock != null) + { + _clock = clock; + return true; + } + + return false; + } +} diff --git a/Assets/_Project/Scripts/Modules/HubUI/clock/GrowthClockUI.cs.meta b/Assets/_Project/Scripts/Modules/HubUI/clock/GrowthClockUI.cs.meta new file mode 100644 index 00000000..93da6789 --- /dev/null +++ b/Assets/_Project/Scripts/Modules/HubUI/clock/GrowthClockUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8dec7d9f6f9f0084f895e0e50884da8e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: