diff --git a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Conveyor.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Conveyor.prefab index 921a14ca..12c0efe6 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Conveyor.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Conveyor.prefab @@ -34,8 +34,8 @@ RectTransform: 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: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: -15} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4826423036724112109 CanvasRenderer: @@ -100,7 +100,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -174,7 +174,7 @@ RectTransform: 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: 250, y: 120} + m_SizeDelta: {x: 300, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6255244719177744486 CanvasRenderer: @@ -271,7 +271,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 22 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Move.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Move.prefab index 8526b572..65702d49 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Move.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Move.prefab @@ -34,8 +34,8 @@ RectTransform: 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: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: -15} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4826423036724112109 CanvasRenderer: @@ -92,15 +92,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -175,7 +175,7 @@ RectTransform: 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: 250, y: 170} + m_SizeDelta: {x: 300, y: 97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6255244719177744486 CanvasRenderer: @@ -245,11 +245,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 95.53 + value: 67.14 + objectReference: {fileID: 0} + - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_SizeDelta.y + value: 22 objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_Name @@ -259,9 +263,21 @@ PrefabInstance: propertyPath: m_text value: 9 objectReference: {fileID: 0} + - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_fontSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.z - value: 13.04 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_fontSizeBase + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_text @@ -269,11 +285,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_fontSize - value: 18 + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.x - value: 20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_fontSizeBase + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_enableAutoSizing @@ -309,7 +333,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 22 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalPosition.x @@ -369,11 +393,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 23.5 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_SizeDelta.y + value: 22 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -15 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y @@ -386,9 +414,6 @@ PrefabInstance: - 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: @@ -409,25 +434,6 @@ MonoBehaviour: 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!114 &7058392673031063272 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8577614709782231219, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} @@ -458,11 +464,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 95.53 + value: 67.14 + objectReference: {fileID: 0} + - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_SizeDelta.y + value: 22 objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_Name @@ -472,9 +482,17 @@ PrefabInstance: propertyPath: m_text value: 9 objectReference: {fileID: 0} + - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_fontSize + value: 16 + objectReference: {fileID: 0} - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.z - value: 13.04 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_fontSizeBase + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_text @@ -482,11 +500,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_fontSize - value: 18 + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.x - value: 20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_fontSizeBase + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_enableAutoSizing @@ -522,7 +548,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 22 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalPosition.x @@ -558,7 +584,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: -62 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -582,11 +608,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 23.5 + value: 10.46 + objectReference: {fileID: 0} + - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_SizeDelta.y + value: 22 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -15 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Processor.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Processor.prefab index c36361a5..a473d775 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Processor.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Processor.prefab @@ -34,8 +34,8 @@ RectTransform: 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: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: -15} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4826423036724112109 CanvasRenderer: @@ -92,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -175,7 +175,7 @@ RectTransform: 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: 250, y: 170} + m_SizeDelta: {x: 300, y: 97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6255244719177744486 CanvasRenderer: @@ -245,11 +245,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 115.11 + value: 84.54 objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_Name @@ -261,7 +261,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.z - value: 13.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_text @@ -269,11 +269,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_fontSize - value: 18 + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.x - value: 20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_fontSizeBase + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_enableAutoSizing @@ -309,7 +313,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 22 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalPosition.x @@ -369,11 +373,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 23.5 + value: 10.46 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -15 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y @@ -458,11 +462,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 95.53 + value: 67.14 objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_Name @@ -474,7 +478,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.z - value: 13.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_text @@ -482,11 +486,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_fontSize - value: 18 + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.x - value: 20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_fontSizeBase + value: 16 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_enableAutoSizing @@ -522,7 +530,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 22 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalPosition.x @@ -558,7 +566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -80 + value: -62 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -582,11 +590,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 23.5 + value: 10.46 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -15 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Resource.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Resource.prefab index b6a26a8b..703af5e7 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Resource.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Resource.prefab @@ -178,7 +178,7 @@ RectTransform: 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: 250, y: 270} + m_SizeDelta: {x: 300, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6255244719177744486 CanvasRenderer: @@ -251,11 +251,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 146.22 + value: 126.22 objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_Name @@ -267,7 +267,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.z - value: 13.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_text @@ -279,7 +279,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.x - value: 20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.z + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_enableAutoSizing @@ -375,11 +379,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 23.5 + value: 10.46 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -15 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y @@ -464,11 +468,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 146.22 + value: 126.22 objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_Name @@ -480,7 +484,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.z - value: 13.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_text @@ -492,7 +496,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.x - value: 20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.z + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_enableAutoSizing @@ -588,11 +596,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 23.5 + value: 10.46 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -15 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y @@ -677,11 +685,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 75.95 + value: 55.95 objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_Name @@ -693,7 +701,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.z - value: 13.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_text @@ -705,7 +713,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.x - value: 20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.z + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_enableAutoSizing @@ -801,11 +813,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 23.5 + value: 10.46 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -15 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y @@ -890,11 +902,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 146.22 + value: 126.22 objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_Name @@ -906,7 +918,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.z - value: 13.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_text @@ -918,7 +930,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.x - value: 20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.z + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_enableAutoSizing @@ -1014,11 +1030,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 23.5 + value: 10.46 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -15 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y @@ -1103,11 +1119,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 181.36 + value: 161.36 objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3702540463548101108, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_Name @@ -1119,7 +1135,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5065443045742254289, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.z - value: 13.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_text @@ -1131,7 +1147,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_margin.x - value: 20 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} + propertyPath: m_margin.z + value: 0 objectReference: {fileID: 0} - target: {fileID: 5199759866575956011, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_enableAutoSizing @@ -1227,11 +1247,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 23.5 + value: 10.46 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -15 objectReference: {fileID: 0} - target: {fileID: 7739689784394121632, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Store.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Store.prefab index f4e0bf6a..7e426d89 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Store.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Store.prefab @@ -175,7 +175,7 @@ RectTransform: 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: 250, y: 170} + m_SizeDelta: {x: 270, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6255244719177744486 CanvasRenderer: diff --git a/Assets/Resources/BubbleUI_Detail/DetailItem.prefab b/Assets/Resources/BubbleUI_Detail/DetailItem.prefab index 9599dda3..bc9039b5 100644 --- a/Assets/Resources/BubbleUI_Detail/DetailItem.prefab +++ b/Assets/Resources/BubbleUI_Detail/DetailItem.prefab @@ -87,8 +87,8 @@ RectTransform: 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 15, y: 0} + m_SizeDelta: {x: 0, y: 22} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3885563001508498547 CanvasRenderer: @@ -183,7 +183,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 20, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -238,8 +238,8 @@ RectTransform: 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: -15, y: 0} + m_SizeDelta: {x: 0, y: 22} m_Pivot: {x: 1, y: 0.5} --- !u!222 &6750052942724277891 CanvasRenderer: @@ -304,7 +304,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 4 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -334,7 +334,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 13.04, w: 0} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json new file mode 100644 index 00000000..ab21f4d6 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json @@ -0,0 +1 @@ +{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"WebGL","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.0.34f1","Branch":"6000.0/staging","Changeset":"5ab2d9ed9190","Date":1736176501},"Dependencies":["com.unity.2d.sprite@1.0.0","com.unity.ide.visualstudio@2.0.22","com.unity.inputsystem@1.11.2","com.unity.nuget.newtonsoft-json@3.2.1","com.unity.render-pipelines.universal@17.0.3","com.unity.timeline@1.8.7","com.unity.ugui@2.0.0","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.tivadar.best.http@3.0.15","com.tivadar.best.mqtt@3.0.4","com.tivadar.best.stomp@1.0.2","com.tivadar.best.websockets@3.0.7","com.unity.burst@1.8.19","com.unity.profiling.core@1.0.2","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.render-pipelines.core@17.0.3","com.unity.shadergraph@17.0.3","com.unity.render-pipelines.universal-config@17.0.3","com.unity.test-framework@1.4.5","com.unity.mathematics@1.3.2","com.unity.searcher@4.9.2","com.unity.collections@2.5.1","com.unity.rendering.light-transport@1.0.1","com.unity.ext.nunit@2.0.5","com.unity.nuget.mono-cecil@1.11.4","com.unity.test-framework.performance@3.0.3"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta new file mode 100644 index 00000000..17caafc9 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7c908504fd66f2c498d8dbc6477596d0 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json new file mode 100644 index 00000000..49438ae1 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json @@ -0,0 +1 @@ +{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta new file mode 100644 index 00000000..11f9e2e2 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2807bb91610f2334cb382385015e3b23 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorkSpace/LH/LogicData/BubbleUI.cs b/Assets/WorkSpace/LH/LogicData/BubbleUI.cs index c6d838c6..5c84f99d 100644 --- a/Assets/WorkSpace/LH/LogicData/BubbleUI.cs +++ b/Assets/WorkSpace/LH/LogicData/BubbleUI.cs @@ -207,6 +207,7 @@ public class BubbleUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler if (detailObject) { detailObject.gameObject.SetActive(true); + gameObject.GetComponent().SetAsLastSibling(); } }