diff --git a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Move.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Move.prefab index 65702d49..be7bbb8b 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Move.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Move.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: 300, y: 97} + m_SizeDelta: {x: 300, y: 102} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6255244719177744486 CanvasRenderer: @@ -584,7 +584,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -62 + value: -67 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Processor.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Processor.prefab index a473d775..2056a3d0 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Processor.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Processor.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: 300, y: 97} + m_SizeDelta: {x: 300, y: 102} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6255244719177744486 CanvasRenderer: @@ -566,7 +566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -62 + value: -67 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Resource.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Resource.prefab index 703af5e7..9156f712 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Resource.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Resource.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 @@ -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: 300, y: 270} + m_SizeDelta: {x: 300, y: 188} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6255244719177744486 CanvasRenderer: @@ -319,7 +319,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 @@ -536,7 +536,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 @@ -572,7 +572,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -160 + value: -121 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -753,7 +753,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 @@ -789,7 +789,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -200 + value: -148 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -970,7 +970,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 @@ -1006,7 +1006,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -80 + value: -67 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1187,7 +1187,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 @@ -1223,7 +1223,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -120 + value: -94 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Sink.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Sink.prefab index 66746e91..5cdb68e6 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Sink.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Sink.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 @@ -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: @@ -243,11 +243,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 95.53 + value: 75.53 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,7 +259,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 @@ -271,7 +271,7 @@ 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_enableAutoSizing @@ -307,7 +307,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 @@ -367,11 +367,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_Source.prefab b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Source.prefab index af21971d..e9a96405 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Source.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Source.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: 102} 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: 95.53 + value: 75.53 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 @@ -273,7 +273,7 @@ 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_enableAutoSizing @@ -309,7 +309,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 +369,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 +458,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 95.53 + value: 75.53 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 +474,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 @@ -486,7 +486,7 @@ 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_enableAutoSizing @@ -522,7 +522,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 +558,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -80 + value: -67 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -582,11 +582,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 7e426d89..fda66ec4 100644 --- a/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Store.prefab +++ b/Assets/Resources/BubbleUI_Detail/BubbleUIDetail_Store.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: 270, y: 170} + m_SizeDelta: {x: 300, y: 102} 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: 95.53 + value: 75.53 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 @@ -273,7 +273,7 @@ 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_enableAutoSizing @@ -309,7 +309,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 +369,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 +458,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 323325025986078807, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_SizeDelta.x - value: 95.53 + value: 75.53 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 +474,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 @@ -486,7 +486,7 @@ 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_enableAutoSizing @@ -522,7 +522,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 +558,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_AnchoredPosition.y - value: -80 + value: -67 objectReference: {fileID: 0} - target: {fileID: 7486354299078957915, guid: e463003bb95fb8f4bb005a91cb43f513, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -582,11 +582,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/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json deleted file mode 100644 index ab21f4d6..00000000 --- a/Assets/Resources/PerformanceTestRunInfo.json +++ /dev/null @@ -1 +0,0 @@ -{"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 deleted file mode 100644 index 17caafc9..00000000 --- a/Assets/Resources/PerformanceTestRunInfo.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7c908504fd66f2c498d8dbc6477596d0 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json deleted file mode 100644 index 49438ae1..00000000 --- a/Assets/Resources/PerformanceTestRunSettings.json +++ /dev/null @@ -1 +0,0 @@ -{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta deleted file mode 100644 index 11f9e2e2..00000000 --- a/Assets/Resources/PerformanceTestRunSettings.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2807bb91610f2334cb382385015e3b23 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/SimulationModels/SimulationModelResource.cs b/Assets/Scripts/SimulationModels/SimulationModelResource.cs index 39a69580..f18e4953 100644 --- a/Assets/Scripts/SimulationModels/SimulationModelResource.cs +++ b/Assets/Scripts/SimulationModels/SimulationModelResource.cs @@ -50,7 +50,7 @@ public class SimulationModelResource : SimulationModel SetBubble($"{data.claimers}/{data.original_capacity}"); if (currentBubble) { - currentBubble.SetDetail(data, logicType.resource, FindAnyObjectByType().itemMap[nodeID].Label); + currentBubble.SetDetail(data, logicType.resource, LogicUIManager.instance.GetItemLabelByID(nodeID)); } } @@ -86,6 +86,7 @@ public class SimulationModelResource : SimulationModel currentBubble = Instantiate(bubbleUIPrefab, FindAnyObjectByType().transform); currentBubble.target = DataBubbleSocket; currentBubble.worldOffset = new Vector3(0, 2.0f, 0); // ʿ信 + currentBubble.GetComponent().SetAsFirstSibling(); } // ؽƮ currentBubble.SetMessage(msg); diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 3ae841ff..33c274fc 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 2193962684539469939 - - rid: 2193962684539469940 + - rid: 2193962706157699139 + - rid: 2193962706157699140 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 2193962684539469941 - - rid: 2193962684539469942 + - rid: 2193962706157699141 + - rid: 2193962706157699142 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 2193962684539469943 - - rid: 2193962684539469944 - - rid: 2193962684539469945 - - rid: 2193962684539469946 - - rid: 2193962684539469947 - - rid: 2193962684539469948 + - rid: 2193962706157699143 + - rid: 2193962706157699144 + - rid: 2193962706157699145 + - rid: 2193962706157699146 + - rid: 2193962706157699147 + - rid: 2193962706157699148 - rid: 6852985685364965392 - - rid: 2193962684539469949 + - rid: 2193962706157699149 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 5092397466944798720 - - rid: 2193962684539469950 + - rid: 2193962706157699150 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -97,14 +97,14 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 2193962684539469939 + - rid: 2193962706157699139 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: 2193962684539469940 + - rid: 2193962706157699140 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: 2193962684539469941 + - rid: 2193962706157699141 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: 2193962684539469942 + - rid: 2193962706157699142 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: 2193962684539469943 + - rid: 2193962706157699143 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: 2193962684539469944 + - rid: 2193962706157699144 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: 2193962684539469945 + - rid: 2193962706157699145 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: 2193962684539469946 + - rid: 2193962706157699146 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 2193962684539469947 + - rid: 2193962706157699147 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: 2193962684539469948 + - rid: 2193962706157699148 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 2193962684539469949 + - rid: 2193962706157699149 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: 2193962684539469950 + - rid: 2193962706157699150 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/LogicData/BubbleUI.cs b/Assets/WorkSpace/LH/LogicData/BubbleUI.cs index 5c84f99d..0873d5ca 100644 --- a/Assets/WorkSpace/LH/LogicData/BubbleUI.cs +++ b/Assets/WorkSpace/LH/LogicData/BubbleUI.cs @@ -95,7 +95,7 @@ public class BubbleUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler sourcedata.total_defects.ToString() }; detailObject.Set(title,datas); - detailObject.GetComponent().position = rt.position + new Vector3(150f, 100f); + detailObject.GetComponent().position = rt.position + new Vector3(150f, 75f); break; case logicType.move: var movedata = data as List; @@ -106,7 +106,7 @@ public class BubbleUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler } datas = movedata; detailObject.Set(title, datas); - detailObject.GetComponent().position = rt.position + new Vector3(150f, 100f); + detailObject.GetComponent().position = rt.position + new Vector3(150f, 75f); break; case logicType.conveyor: var conveyordata = data as string; @@ -120,7 +120,7 @@ public class BubbleUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler conveyordata, }; detailObject.Set(title, datas); - detailObject.GetComponent().position = rt.position + new Vector3(150f, 100f); + detailObject.GetComponent().position = rt.position + new Vector3(150f, 75f); break; case logicType.processor: var processordata = data as StatisticsProcess; @@ -135,7 +135,7 @@ public class BubbleUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler processordata.total_processed.ToString() }; detailObject.Set(title, datas); - detailObject.GetComponent().position = rt.position + new Vector3(150f, 100f); + detailObject.GetComponent().position = rt.position + new Vector3(150f, 75f); break; case logicType.queue: var queuedata = data as QueueStatusUpdateDatastatistics; @@ -150,7 +150,7 @@ public class BubbleUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler queuedata.capacity.ToString() }; detailObject.Set(title, datas); - detailObject.GetComponent().position = rt.position + new Vector3(150f, 100f); + detailObject.GetComponent().position = rt.position + new Vector3(150f, 75f); break; case logicType.store: var storedata = data as StoreStatusUpdateDatastatistics; @@ -165,7 +165,7 @@ public class BubbleUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler storedata.capacity.ToString() }; detailObject.Set(title, datas); - detailObject.GetComponent().position = rt.position + new Vector3(150f, 100f); + detailObject.GetComponent().position = rt.position + new Vector3(150f, 75f); break; case logicType.resource: var resourcedata = data as ResourceStatus; @@ -197,7 +197,7 @@ public class BubbleUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler sinkdata }; detailObject.Set(title, datas); - detailObject.GetComponent().position = rt.position + new Vector3(150f, 100f); + detailObject.GetComponent().position = rt.position + new Vector3(150f, 75f); break; } } diff --git a/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs b/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs index b699f87a..835293b8 100644 --- a/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs +++ b/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs @@ -27,9 +27,11 @@ namespace Octopus.Simulator public event Action onLogicItemDeSelected; private Dictionary idMap = new Dictionary(); public Dictionary itemMap = new Dictionary(); + public static LogicUIManager instance; // Start is called once before the first execution of Update after the MonoBehaviour is created private void Awake() { + instance = this; logicWindow = this.gameObject; LogicPrefab = Resources.Load