diff --git a/Assets/UI/Main Menu/Main Menu.prefab b/Assets/UI/Main Menu/Main Menu.prefab index 8461d44..73728bc 100644 --- a/Assets/UI/Main Menu/Main Menu.prefab +++ b/Assets/UI/Main Menu/Main Menu.prefab @@ -1,49 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &24699257826550407 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1054700789401094868} - - component: {fileID: 1261344583981067760} - m_Layer: 0 - m_Name: Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1054700789401094868 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 24699257826550407} - serializedVersion: 2 - 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: 217405779648672802} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1261344583981067760 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 24699257826550407} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 61f545a5ca2510144b9fcbe881d9453b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &530997965985443094 GameObject: m_ObjectHideFlags: 0 @@ -56,6 +12,7 @@ GameObject: - component: {fileID: 7523030894821216378} - component: {fileID: 6355926282508768263} - component: {fileID: 1068155268416536686} + - component: {fileID: 9188023929257094780} m_Layer: 5 m_Name: Main Menu m_TagString: Untagged @@ -78,7 +35,6 @@ RectTransform: - {fileID: 1990074708315972618} - {fileID: 7522722649766653940} - {fileID: 5575796858754370881} - - {fileID: 1054700789401094868} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -103,7 +59,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 + m_VertexColorAlwaysGammaSpace: 1 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -121,10 +77,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -149,6 +105,18 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!114 &9188023929257094780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530997965985443094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61f545a5ca2510144b9fcbe881d9453b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1033928146152797816 GameObject: m_ObjectHideFlags: 0 @@ -241,8 +209,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -320,7 +288,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 38.7} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6894169591649367069 CanvasRenderer: @@ -404,7 +372,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1261344583981067760} + - m_Target: {fileID: 9188023929257094780} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: Quit m_Mode: 1 @@ -576,8 +544,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -656,7 +624,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: 200, y: 100} + m_SizeDelta: {x: 300, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &7743152632409018209 Canvas: @@ -813,8 +781,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -892,7 +860,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 38.7} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1145712883549425975 CanvasRenderer: @@ -976,7 +944,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1261344583981067760} + - m_Target: {fileID: 9188023929257094780} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: Play m_Mode: 1 diff --git a/Assets/UI/Pause Menu/Pause Menu.prefab b/Assets/UI/Pause Menu/Pause Menu.prefab index dd382e5..f5ecf5f 100644 --- a/Assets/UI/Pause Menu/Pause Menu.prefab +++ b/Assets/UI/Pause Menu/Pause Menu.prefab @@ -674,7 +674,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 6433406069332646540} m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp m_MethodName: Quit m_Mode: 1 @@ -1643,7 +1643,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 6433406069332646540} m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp m_MethodName: Resume m_Mode: 1 diff --git a/Assets/UI/Start UI/Start UI.prefab b/Assets/UI/Start UI/Start UI.prefab index 93bc449..0ded946 100644 --- a/Assets/UI/Start UI/Start UI.prefab +++ b/Assets/UI/Start UI/Start UI.prefab @@ -190,8 +190,8 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 + m_VertexColorAlwaysGammaSpace: 1 + m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -208,10 +208,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/UI/Upgrade Screen/Upgrade Screen.prefab b/Assets/UI/Upgrade Screen/Upgrade Screen.prefab index 0afce38..ac15291 100644 --- a/Assets/UI/Upgrade Screen/Upgrade Screen.prefab +++ b/Assets/UI/Upgrade Screen/Upgrade Screen.prefab @@ -9,6 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4232304121047868955} + - component: {fileID: 3512793599825367866} + - component: {fileID: 77585824933696940} m_Layer: 5 m_Name: Upgrade Screen m_TagString: Untagged @@ -32,6 +34,37 @@ Transform: - {fileID: 5285216182436991885} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3512793599825367866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 113215708914507097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e0d6eae981931e49af7552730883326, type: 3} + m_Name: + m_EditorClassIdentifier: + buttons: + - {fileID: 84359638430006894} + - {fileID: 6549512925133430735} + - {fileID: 451137559467290092} +--- !u!114 &77585824933696940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 113215708914507097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 132f6eb0a04c6614d9ebb227a443e2a6, type: 3} + m_Name: + m_EditorClassIdentifier: + upgradesJSON: {fileID: 4900000, guid: aaa2ab8454f62084e836d4c194574793, type: 3} + upgrades: + upgrades: [] --- !u!1 &587910270085467340 GameObject: m_ObjectHideFlags: 0 @@ -69,7 +102,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8882675801031975132 CanvasRenderer: @@ -188,7 +221,6 @@ RectTransform: - {fileID: 7039561522452652452} - {fileID: 7548544309751964119} - {fileID: 8725848307537566236} - - {fileID: 8672692701950558422} m_Father: {fileID: 4232304121047868955} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -213,7 +245,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 + m_VertexColorAlwaysGammaSpace: 1 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -231,10 +263,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -296,7 +328,7 @@ RectTransform: 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_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2979746017816437413 CanvasRenderer: @@ -380,74 +412,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &2517445395317127959 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8672692701950558422} - - component: {fileID: 1012431501566170670} - - component: {fileID: 6458789639831064346} - m_Layer: 5 - m_Name: Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8672692701950558422 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2517445395317127959} - 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: 5285216182436991885} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1012431501566170670 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2517445395317127959} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9e0d6eae981931e49af7552730883326, type: 3} - m_Name: - m_EditorClassIdentifier: - buttons: - - {fileID: 84359638430006894} - - {fileID: 6549512925133430735} - - {fileID: 451137559467290092} ---- !u!114 &6458789639831064346 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2517445395317127959} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 132f6eb0a04c6614d9ebb227a443e2a6, type: 3} - m_Name: - m_EditorClassIdentifier: - upgradesJSON: {fileID: 4900000, guid: aaa2ab8454f62084e836d4c194574793, type: 3} - upgrades: - upgrades: [] --- !u!1 &2646238056831891011 GameObject: m_ObjectHideFlags: 0 @@ -680,8 +644,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -759,7 +723,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: 200} + m_SizeDelta: {x: 350, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6154377485362684299 CanvasRenderer: @@ -861,8 +825,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -995,8 +959,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1074,7 +1038,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2915909233515006909 CanvasRenderer: @@ -1250,8 +1214,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18