From b7fa22f11a418d9f491076c085819a67686b7ba5 Mon Sep 17 00:00:00 2001 From: UVCLimHun Date: Mon, 21 Jul 2025 17:18:32 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=91=EA=B0=80=EA=B3=A0=EC=8B=B6=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prefabs/Canvas.prefab | 138 +++++- Assets/Resources/BubbleUI.prefab | 42 -- Assets/Resources/BubbleUIDetail.prefab | 430 ++++++++++++++++++ Assets/Resources/BubbleUIDetail.prefab.meta | 7 + Assets/Resources/DetailItem.prefab | 326 +++++++++++++ Assets/Resources/DetailItem.prefab.meta | 7 + Assets/Scenes/Simulation_0.0.1.unity | 145 ++---- ...niversalRenderPipelineGlobalSettings.asset | 48 +- Assets/WorkSpace/LH/BubbleUI_Detail.cs | 16 + Assets/WorkSpace/LH/BubbleUI_Detail.cs.meta | 2 + Assets/WorkSpace/LH/BubbleUI_DetailItem.cs | 21 + .../WorkSpace/LH/BubbleUI_DetailItem.cs.meta | 2 + Assets/WorkSpace/LH/LogicData/BubbleUI.cs | 11 +- Assets/WorkSpace/LH/Panel_SimulationUI.cs | 6 +- 14 files changed, 1025 insertions(+), 176 deletions(-) create mode 100644 Assets/Resources/BubbleUIDetail.prefab create mode 100644 Assets/Resources/BubbleUIDetail.prefab.meta create mode 100644 Assets/Resources/DetailItem.prefab create mode 100644 Assets/Resources/DetailItem.prefab.meta create mode 100644 Assets/WorkSpace/LH/BubbleUI_Detail.cs create mode 100644 Assets/WorkSpace/LH/BubbleUI_Detail.cs.meta create mode 100644 Assets/WorkSpace/LH/BubbleUI_DetailItem.cs create mode 100644 Assets/WorkSpace/LH/BubbleUI_DetailItem.cs.meta diff --git a/Assets/Prefabs/Canvas.prefab b/Assets/Prefabs/Canvas.prefab index 5b4ad2e9..b8621ffd 100644 --- a/Assets/Prefabs/Canvas.prefab +++ b/Assets/Prefabs/Canvas.prefab @@ -1328,7 +1328,7 @@ MonoBehaviour: m_HandleRect: {fileID: 6083826082979005142} m_Direction: 2 m_Value: 0 - m_Size: 0.45619336 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1594,6 +1594,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4684418095818081730} m_Modifications: + - target: {fileID: 906947426112521073, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4984763691913443583, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1704,6 +1708,10 @@ PrefabInstance: propertyPath: m_Name value: SimulatorLoadingPopup objectReference: {fileID: 0} + - target: {fileID: 3392909442404011018, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6415216557765667080, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1784,7 +1792,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2673881409132951651, guid: b6aadbff5c2ff504d86b4ba2b2253710, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -2096,6 +2105,108 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1976696721085814737, guid: a947fac65858b5246ac0544ea7bcdad0, type: 3} m_PrefabInstance: {fileID: 4630499734015177307} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7525449721906725723 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 235861616779698476} + m_Modifications: + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4412819505785982708, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + propertyPath: m_Name + value: SimulatorLoadinFailPopup + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} +--- !u!224 &8266991712237357093 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + m_PrefabInstance: {fileID: 7525449721906725723} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8418555879936963010 PrefabInstance: m_ObjectHideFlags: 0 @@ -2110,11 +2221,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 588411198089990919, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Size - value: 0.5335 + value: 0.398625 objectReference: {fileID: 0} - target: {fileID: 588411198089990919, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Value - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1073750513953127727, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Type @@ -2250,19 +2361,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_SizeDelta.x - value: 2000 + value: 4000 objectReference: {fileID: 0} - target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_SizeDelta.y - value: 1000 + value: 4000 objectReference: {fileID: 0} - target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_AnchoredPosition.x - value: -1202.75 + value: -797.25 objectReference: {fileID: 0} - target: {fileID: 4141025361698125247, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_AnchoredPosition.y - value: 651.5 + value: 175.5 objectReference: {fileID: 0} - target: {fileID: 4980370143534209375, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Color.a @@ -2314,11 +2425,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6940169657633229565, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Size - value: 0.351 + value: 0.08775 objectReference: {fileID: 0} - target: {fileID: 6940169657633229565, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Value - value: 0.26656395 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7672464725508683099, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} propertyPath: m_Colors.m_SelectedColor.b @@ -2560,7 +2671,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6276590003127642402, guid: d8c9eb2a0c47b494a936ab4f05ac9623, type: 3} propertyPath: m_Size - value: 0.39727804 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6505607372932287687, guid: d8c9eb2a0c47b494a936ab4f05ac9623, type: 3} propertyPath: m_AnchorMax.y @@ -2580,7 +2691,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6648348508146835120, guid: d8c9eb2a0c47b494a936ab4f05ac9623, type: 3} propertyPath: m_Size - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6648348508146835120, guid: d8c9eb2a0c47b494a936ab4f05ac9623, type: 3} propertyPath: m_Value @@ -2803,6 +2914,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 8654335745100445832, guid: ad46ffcb255049c42ac429bc5cf7308f, type: 3} insertIndex: -1 addedObject: {fileID: 7175238061759637248} + - targetCorrespondingSourceObject: {fileID: 8654335745100445832, guid: ad46ffcb255049c42ac429bc5cf7308f, type: 3} + insertIndex: -1 + addedObject: {fileID: 8266991712237357093} - targetCorrespondingSourceObject: {fileID: 8199486109719142436, guid: ad46ffcb255049c42ac429bc5cf7308f, type: 3} insertIndex: -1 addedObject: {fileID: 7295755851252447351} diff --git a/Assets/Resources/BubbleUI.prefab b/Assets/Resources/BubbleUI.prefab index c20ed42e..53c2c418 100644 --- a/Assets/Resources/BubbleUI.prefab +++ b/Assets/Resources/BubbleUI.prefab @@ -164,8 +164,6 @@ GameObject: - component: {fileID: 3649460406689858812} - component: {fileID: -539001808304557592} - component: {fileID: -7738697818567212645} - - component: {fileID: 1178372138501356644} - - component: {fileID: 1584444764057631100} m_Layer: 5 m_Name: BubbleUI m_TagString: Untagged @@ -258,43 +256,3 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &1178372138501356644 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7932083815135180818} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 10 - m_Right: 10 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &1584444764057631100 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7932083815135180818} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 diff --git a/Assets/Resources/BubbleUIDetail.prefab b/Assets/Resources/BubbleUIDetail.prefab new file mode 100644 index 00000000..02b570f9 --- /dev/null +++ b/Assets/Resources/BubbleUIDetail.prefab @@ -0,0 +1,430 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4351355435276947500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2077404998366970623} + - component: {fileID: 4826423036724112109} + - component: {fileID: 1206543661005928131} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2077404998366970623 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4351355435276947500} + 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: 2721511650172640248} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4826423036724112109 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4351355435276947500} + m_CullTransparentMesh: 1 +--- !u!114 &1206543661005928131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4351355435276947500} + 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: "\uC790\uC6D0" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5b1f2180d035a504c806ed5af4d2fc76, type: 2} + m_sharedMaterial: {fileID: -46050840830891302, guid: 5b1f2180d035a504c806ed5af4d2fc76, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294945884 + m_fontColor: {r: 0.36078432, g: 0.6745098, b: 1, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &4635834080285836034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2721511650172640248} + - component: {fileID: 6255244719177744486} + - component: {fileID: 3350161438503930744} + - component: {fileID: 6496368759846632614} + m_Layer: 5 + m_Name: BubbleUIDetail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2721511650172640248 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4635834080285836034} + 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: 2077404998366970623} + - {fileID: 8149652816442516736} + 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: 0, y: 0} + m_SizeDelta: {x: 300, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6255244719177744486 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4635834080285836034} + m_CullTransparentMesh: 1 +--- !u!114 &3350161438503930744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4635834080285836034} + 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: 988abeb65ef8b4f8faaa60d5391a9025, type: 3} + 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!114 &6496368759846632614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4635834080285836034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8c8fac0702f2ce4d829105abe460e5b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1656688719370960475 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2721511650172640248} + m_Modifications: + - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_Name + value: DetailItem + objectReference: {fileID: 0} + - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_text + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.z + value: 13.04 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_text + value: "\uB9AC\uC18C\uC2A4 \uC0AC\uC6A9 \uAC00\uB2A5 \uC218\uB7C9 :" + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_fontSize + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_AnchoredPosition.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4159787920407458188, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + insertIndex: -1 + addedObject: {fileID: 1163166587620052749} + - targetCorrespondingSourceObject: {fileID: 5760526155941088782, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + insertIndex: -1 + addedObject: {fileID: 3785110464682105310} + m_SourcePrefab: {fileID: 100100000, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} +--- !u!1 &3406749428245614551 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4159787920407458188, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + m_PrefabInstance: {fileID: 1656688719370960475} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1163166587620052749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3406749428245614551} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &6416571294048301141 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5760526155941088782, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + m_PrefabInstance: {fileID: 1656688719370960475} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3785110464682105310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6416571294048301141} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!224 &8149652816442516736 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + m_PrefabInstance: {fileID: 1656688719370960475} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/BubbleUIDetail.prefab.meta b/Assets/Resources/BubbleUIDetail.prefab.meta new file mode 100644 index 00000000..d6296b1b --- /dev/null +++ b/Assets/Resources/BubbleUIDetail.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1a9b71c09dca404ebae49b3fb0cc217 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/DetailItem.prefab b/Assets/Resources/DetailItem.prefab new file mode 100644 index 00000000..a5c7adad --- /dev/null +++ b/Assets/Resources/DetailItem.prefab @@ -0,0 +1,326 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3702540463548101108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7486354299078957915} + - component: {fileID: 8577614709782231219} + m_Layer: 5 + m_Name: DetailItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7486354299078957915 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3702540463548101108} + 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: 323325025986078807} + - {fileID: 7739689784394121632} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8577614709782231219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3702540463548101108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d873a21c61d48c4a98d84e7a3569958, type: 3} + m_Name: + m_EditorClassIdentifier: + Label: {fileID: 5199759866575956011} + Value: {fileID: 5065443045742254289} +--- !u!1 &4159787920407458188 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 323325025986078807} + - component: {fileID: 3885563001508498547} + - component: {fileID: 5199759866575956011} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &323325025986078807 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4159787920407458188} + 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: 7486354299078957915} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 120, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3885563001508498547 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4159787920407458188} + m_CullTransparentMesh: 1 +--- !u!114 &5199759866575956011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4159787920407458188} + 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: "\uB9AC\uC18C\uC2A4 \uC0AC\uC6A9 \uAC00\uB2A5 \uC218\uB7C9 :" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4283124555 + m_fontColor: {r: 0.29411766, g: 0.29411766, b: 0.29411766, 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: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &5760526155941088782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7739689784394121632} + - component: {fileID: 6750052942724277891} + - component: {fileID: 5065443045742254289} + m_Layer: 5 + m_Name: Value + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7739689784394121632 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5760526155941088782} + 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: 7486354299078957915} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -70, y: 0} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6750052942724277891 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5760526155941088782} + m_CullTransparentMesh: 1 +--- !u!114 &5065443045742254289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5760526155941088782} + 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: 9 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, 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: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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} diff --git a/Assets/Resources/DetailItem.prefab.meta b/Assets/Resources/DetailItem.prefab.meta new file mode 100644 index 00000000..486fc3fd --- /dev/null +++ b/Assets/Resources/DetailItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e463003bb95fb8f4bb005a91cb43f513 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Simulation_0.0.1.unity b/Assets/Scenes/Simulation_0.0.1.unity index 91ed16ac..62555edd 100644 --- a/Assets/Scenes/Simulation_0.0.1.unity +++ b/Assets/Scenes/Simulation_0.0.1.unity @@ -4163,6 +4163,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &1182918332 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7289980099251118275, guid: 3cc977598920510408290e6c59f79050, type: 3} + m_PrefabInstance: {fileID: 5191713448394799192} + m_PrefabAsset: {fileID: 0} --- !u!1 &1251266449 GameObject: m_ObjectHideFlags: 0 @@ -4528,11 +4533,6 @@ MonoBehaviour: m_EditorClassIdentifier: _isEnabled: 1 _actionLimit: 50 ---- !u!224 &1996478018 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 235861616779698476, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - m_PrefabInstance: {fileID: 6151527187213857147} - m_PrefabAsset: {fileID: 0} --- !u!114 &2104988513 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4109850805522733397, guid: 1cebdf9f041a0384bbb02ecc4e1238f1, type: 3} @@ -4744,103 +4744,108 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1cebdf9f041a0384bbb02ecc4e1238f1, type: 3} ---- !u!1001 &2886186103272401856 +--- !u!1001 &2547327551178112523 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1996478018} + m_TransformParent: {fileID: 1182918332} m_Modifications: - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 400 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 200 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4412819505785982708, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + - target: {fileID: 4635834080285836034, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} propertyPath: m_Name - value: SimulatorLoadinFailPopup + value: BubbleUIDetail objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} +--- !u!224 &2547327551178112524 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2721511650172640248, guid: d1a9b71c09dca404ebae49b3fb0cc217, type: 3} + m_PrefabInstance: {fileID: 2547327551178112523} + m_PrefabAsset: {fileID: 0} --- !u!223 &3323266167456856314 Canvas: m_ObjectHideFlags: 0 @@ -4958,14 +4963,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7289980099251118275, guid: 3cc977598920510408290e6c59f79050, type: 3} + insertIndex: -1 + addedObject: {fileID: 2547327551178112524} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3cc977598920510408290e6c59f79050, type: 3} ---- !u!224 &5383657976915199625 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1933598468418407294, guid: 6f065fc77a179bd4db1aff9763d394be, type: 3} - m_PrefabInstance: {fileID: 2886186103272401856} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6151527187213857147 PrefabInstance: m_ObjectHideFlags: 0 @@ -4974,10 +4977,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 102392755800651075, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 374124932118457219, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -5034,14 +5033,6 @@ PrefabInstance: propertyPath: m_Size value: 1 objectReference: {fileID: 0} - - target: {fileID: 1478544554797267775, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_Value - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1550070951307592194, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1583162132624927149, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5066,10 +5057,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1879071227442176583, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2353695193010925265, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5086,10 +5073,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2783545212044606630, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_Size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3018469898925296895, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5118,10 +5101,6 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3312506907441204020, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_Size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3575434091452802806, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5174,10 +5153,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4605199618031975098, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_Interactable - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4648027893447213669, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5314,14 +5289,6 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5594411199481332861, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_SizeDelta.x - value: 4000 - objectReference: {fileID: 0} - - target: {fileID: 5594411199481332861, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_SizeDelta.y - value: 4000 - objectReference: {fileID: 0} - target: {fileID: 5594411199481332861, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchoredPosition.x value: -797.25 @@ -5438,10 +5405,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7916537217148321212, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_Size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7916537217148321212, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_Value value: 1 @@ -5522,10 +5485,6 @@ PrefabInstance: propertyPath: m_Size value: 1 objectReference: {fileID: 0} - - target: {fileID: 9006850872049607365, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - propertyPath: m_Value - value: 0 - objectReference: {fileID: 0} - target: {fileID: 9084698983386852018, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5534,13 +5493,9 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 2274164436698396267, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 235861616779698476, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} - insertIndex: -1 - addedObject: {fileID: 5383657976915199625} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8399fc044b9f80245be55f692ba44a15, type: 3} --- !u!114 &8119422912760981060 diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 86faa299..bcb4ceb1 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 2193962597229789311 - - rid: 2193962597229789312 + - rid: 2193962684539469927 + - rid: 2193962684539469928 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 2193962597229789313 - - rid: 2193962597229789314 + - rid: 2193962684539469929 + - rid: 2193962684539469930 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 2193962597229789315 - - rid: 2193962597229789316 - - rid: 2193962597229789317 - - rid: 2193962597229789318 - - rid: 2193962597229789319 - - rid: 2193962597229789320 + - rid: 2193962684539469931 + - rid: 2193962684539469932 + - rid: 2193962684539469933 + - rid: 2193962684539469934 + - rid: 2193962684539469935 + - rid: 2193962684539469936 - rid: 6852985685364965392 - - rid: 2193962597229789321 + - rid: 2193962684539469937 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 5092397466944798720 - - rid: 2193962597229789322 + - rid: 2193962684539469938 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -97,14 +97,14 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 2193962597229789311 + - rid: 2193962684539469927 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 2193962597229789312 + - rid: 2193962684539469928 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -116,7 +116,7 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 2193962597229789313 + - rid: 2193962684539469929 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -131,7 +131,7 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 2193962597229789314 + - rid: 2193962684539469930 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -140,7 +140,7 @@ MonoBehaviour: m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 2193962597229789315 + - rid: 2193962684539469931 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -153,13 +153,13 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 2193962597229789316 + - rid: 2193962684539469932 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 2193962597229789317 + - rid: 2193962684539469933 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -172,12 +172,12 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 2193962597229789318 + - rid: 2193962684539469934 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 2193962597229789319 + - rid: 2193962684539469935 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -187,21 +187,21 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 2193962597229789320 + - rid: 2193962684539469936 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 2193962597229789321 + - rid: 2193962684539469937 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 2193962597229789322 + - rid: 2193962684539469938 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} diff --git a/Assets/WorkSpace/LH/BubbleUI_Detail.cs b/Assets/WorkSpace/LH/BubbleUI_Detail.cs new file mode 100644 index 00000000..a3fe7f56 --- /dev/null +++ b/Assets/WorkSpace/LH/BubbleUI_Detail.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class BubbleUI_Detail : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/WorkSpace/LH/BubbleUI_Detail.cs.meta b/Assets/WorkSpace/LH/BubbleUI_Detail.cs.meta new file mode 100644 index 00000000..121973f8 --- /dev/null +++ b/Assets/WorkSpace/LH/BubbleUI_Detail.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f8c8fac0702f2ce4d829105abe460e5b \ No newline at end of file diff --git a/Assets/WorkSpace/LH/BubbleUI_DetailItem.cs b/Assets/WorkSpace/LH/BubbleUI_DetailItem.cs new file mode 100644 index 00000000..2d6c85eb --- /dev/null +++ b/Assets/WorkSpace/LH/BubbleUI_DetailItem.cs @@ -0,0 +1,21 @@ +using UnityEngine; +using TMPro; + +public class BubbleUI_DetailItem : MonoBehaviour +{ + [SerializeField] + TMP_Text Label; + [SerializeField] + TMP_Text Value; + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/WorkSpace/LH/BubbleUI_DetailItem.cs.meta b/Assets/WorkSpace/LH/BubbleUI_DetailItem.cs.meta new file mode 100644 index 00000000..a7abd299 --- /dev/null +++ b/Assets/WorkSpace/LH/BubbleUI_DetailItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6d873a21c61d48c4a98d84e7a3569958 \ No newline at end of file diff --git a/Assets/WorkSpace/LH/LogicData/BubbleUI.cs b/Assets/WorkSpace/LH/LogicData/BubbleUI.cs index 4ed2fb47..8d646441 100644 --- a/Assets/WorkSpace/LH/LogicData/BubbleUI.cs +++ b/Assets/WorkSpace/LH/LogicData/BubbleUI.cs @@ -1,7 +1,8 @@ using UnityEngine; using TMPro; +using UnityEngine.EventSystems; -public class BubbleUI : MonoBehaviour +public class BubbleUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler { public Transform target; // 따라갈 대상 public Vector3 worldOffset; // 말풍선이 떠 있을 높이(예: (0,2,0)) @@ -48,4 +49,12 @@ public class BubbleUI : MonoBehaviour rt.position = screenPos; rt.sizeDelta = new Vector2(messageText.preferredWidth + 20f, rt.sizeDelta.y); } + + public void OnPointerEnter(PointerEventData eventData) + { + } + + public void OnPointerExit(PointerEventData eventData) + { + } } \ No newline at end of file diff --git a/Assets/WorkSpace/LH/Panel_SimulationUI.cs b/Assets/WorkSpace/LH/Panel_SimulationUI.cs index ece929a5..d776e343 100644 --- a/Assets/WorkSpace/LH/Panel_SimulationUI.cs +++ b/Assets/WorkSpace/LH/Panel_SimulationUI.cs @@ -225,12 +225,14 @@ namespace Octopus.Simulator void ResumeCallBack() { FindAnyObjectByType(FindObjectsInactive.Include).gameObject.SetActive(false); - StopCoroutine(FailGetSimulationComplete()); + StopAllCoroutines(); + FindAnyObjectByType(FindObjectsInactive.Include).gameObject.SetActive(false); + isplaying = false; } IEnumerator FailGetSimulationComplete() { - yield return new WaitForSeconds(10f); + yield return new WaitForSeconds(20f); FindAnyObjectByType(FindObjectsInactive.Include).gameObject.SetActive(false); FindAnyObjectByType(FindObjectsInactive.Include).gameObject.SetActive(true); }