diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab index 1c355df7b9..14b5f7d0bb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab @@ -2273,7 +2273,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: d324a3015a6b6314caa7fc80519bcc37, type: 3} + m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index ca57472535..4ed1985fdd 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -8272,8 +8272,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 34.1, y: -13} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 47.05001, y: -13} + m_SizeDelta: {x: 205.9, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1842701775875376456 CanvasRenderer: @@ -8305,7 +8305,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -8818,8 +8818,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 34.2, y: -12.2} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 47.100025, y: -12.2} + m_SizeDelta: {x: 205.8, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2011600873467811454 CanvasRenderer: @@ -8851,7 +8851,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -9089,8 +9089,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 42, y: -10} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 51, y: -10} + m_SizeDelta: {x: 198, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8723966969178913910 CanvasRenderer: @@ -9122,7 +9122,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -9368,8 +9368,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 33.7, y: -10.1} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 46.849995, y: -10.1} + m_SizeDelta: {x: 206.3, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3859927645981631331 CanvasRenderer: @@ -9401,7 +9401,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -15962,8 +15962,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 40.3, y: -10} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 50.150005, y: -10} + m_SizeDelta: {x: 199.7, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6326406441220435593 CanvasRenderer: @@ -15995,7 +15995,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -24813,8 +24813,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 34, y: -10.5} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 47, y: -10.5} + m_SizeDelta: {x: 206, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8814415700857881006 CanvasRenderer: @@ -24846,7 +24846,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -35491,8 +35491,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 33, y: -12.2} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 46.5, y: -12.2} + m_SizeDelta: {x: 207, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5798366888369609125 CanvasRenderer: @@ -35524,7 +35524,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -52904,8 +52904,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 46.9, y: -13} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 53.44999, y: -13} + m_SizeDelta: {x: 193.1, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6656074704414808788 CanvasRenderer: @@ -52937,7 +52937,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -58982,8 +58982,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 42, y: -11} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 51, y: -11} + m_SizeDelta: {x: 198, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &478839670799549824 CanvasRenderer: @@ -59015,7 +59015,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -70555,8 +70555,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 34.3, y: -11} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 47.150005, y: -11} + m_SizeDelta: {x: 205.7, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &377582146742255520 CanvasRenderer: @@ -70588,7 +70588,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -70726,8 +70726,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 45.6, y: -12.3} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 52.80001, y: -12.3} + m_SizeDelta: {x: 194.4, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3429807639091622898 CanvasRenderer: @@ -70759,7 +70759,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -71037,8 +71037,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 32.4, y: -12.6} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 46.20002, y: -12.6} + m_SizeDelta: {x: 207.6, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8228481055377524517 CanvasRenderer: @@ -71070,7 +71070,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -71281,8 +71281,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 33.1, y: -12.3} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 46.55001, y: -12.3} + m_SizeDelta: {x: 206.9, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &174882412009063878 CanvasRenderer: @@ -71314,7 +71314,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -73706,8 +73706,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 33, y: -11.7} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 46.5, y: -11.7} + m_SizeDelta: {x: 207, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5792934229358099400 CanvasRenderer: @@ -73739,7 +73739,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -74202,8 +74202,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 44.2, y: -13} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 52.099964, y: -13} + m_SizeDelta: {x: 195.8, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4409277268617309811 CanvasRenderer: @@ -74235,7 +74235,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -82919,8 +82919,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 39.7, y: -10} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 49.849995, y: -10} + m_SizeDelta: {x: 200.3, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8520820373169482529 CanvasRenderer: @@ -82952,7 +82952,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -85478,8 +85478,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 34.2, y: -11} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 47.100025, y: -11} + m_SizeDelta: {x: 205.8, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6680066994809800995 CanvasRenderer: @@ -85511,7 +85511,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -91908,8 +91908,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 46.9, y: -11.4} - m_SizeDelta: {x: 180, y: 46.78} + m_AnchoredPosition: {x: 53.44999, y: -11.4} + m_SizeDelta: {x: 193.1, y: 46.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &303296056544243684 CanvasRenderer: @@ -91941,7 +91941,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -98674,11 +98674,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive @@ -98689,6 +98684,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} --- !u!4 &5193385769038219363 stripped @@ -98914,11 +98914,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive @@ -98929,6 +98924,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} --- !u!4 &8990599829511114571 stripped @@ -99009,11 +99009,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive @@ -99024,6 +99019,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} --- !u!4 &8203008183752308637 stripped @@ -99099,11 +99099,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive @@ -99114,6 +99109,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} --- !u!4 &318771728336289081 stripped @@ -99189,11 +99189,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6951213042224787071, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive @@ -99204,6 +99199,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} --- !u!4 &327077116440716071 stripped