From 2ca0328459053e50d7a2e53c7de54ae00b35a2d2 Mon Sep 17 00:00:00 2001 From: Pasha Bibko <156938226+PashaBibko@users.noreply.github.com> Date: Thu, 16 Apr 2026 15:53:26 +0100 Subject: [PATCH] Moved the buttons --- Assets/Scenes/UpgradesScene.unity | 436 ++++++++---------------- Assets/Scripts/UI/BasicUpgradeButton.cs | 6 +- 2 files changed, 149 insertions(+), 293 deletions(-) diff --git a/Assets/Scenes/UpgradesScene.unity b/Assets/Scenes/UpgradesScene.unity index 729bb98..aad3a1b 100644 --- a/Assets/Scenes/UpgradesScene.unity +++ b/Assets/Scenes/UpgradesScene.unity @@ -119,143 +119,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &1077660 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1077661} - - component: {fileID: 1077665} - - component: {fileID: 1077664} - - component: {fileID: 1077663} - - component: {fileID: 1077662} - m_Layer: 5 - m_Name: Grapes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1077661 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077660} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 129767514} - m_Father: {fileID: 2119665806} - 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: 200, y: 800} - m_SizeDelta: {x: 250, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1077662 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077660} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1077663} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1077663 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077660} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1077664 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077660} - m_CullTransparentMesh: 1 ---- !u!114 &1077665 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077660} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f9c5dbc6e19942c19f4dc93fc3777677, type: 3} - m_Name: - m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton - Upgrade: 0 - UpgradeCost: 0 - RequiredUpgrades: [] --- !u!1 &104174696 GameObject: m_ObjectHideFlags: 0 @@ -374,85 +237,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &129767513 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 129767514} - - component: {fileID: 129767516} - - component: {fileID: 129767515} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &129767514 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 129767513} - 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: 1077661} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &129767515 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 129767513} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Text - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 35 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 75 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: Button ---- !u!222 &129767516 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 129767513} - m_CullTransparentMesh: 1 --- !u!1 &153563567 GameObject: m_ObjectHideFlags: 0 @@ -771,7 +555,7 @@ 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: -600, y: 800} + m_AnchoredPosition: {x: -1300, y: 200} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &216535973 @@ -870,7 +654,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 8 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 306312747} --- !u!1 &218329187 GameObject: m_ObjectHideFlags: 0 @@ -908,7 +693,7 @@ 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: -1400, y: 800} + m_AnchoredPosition: {x: 200, y: 800} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &218329189 @@ -1005,7 +790,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9c5dbc6e19942c19f4dc93fc3777677, type: 3} m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton - Upgrade: 0 + Upgrade: 3 UpgradeCost: 0 RequiredUpgrades: [] --- !u!1 &239945577 @@ -1045,7 +830,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: -300, y: -200} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &239945579 @@ -1144,7 +929,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 23 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1215656306} --- !u!1 &242722018 GameObject: m_ObjectHideFlags: 0 @@ -1261,7 +1047,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 1700, y: 500} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &263965908 @@ -1360,7 +1146,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 32 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 531797809} --- !u!1 &282988157 GameObject: m_ObjectHideFlags: 0 @@ -1398,7 +1185,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 588, y: 600} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &282988159 @@ -1497,7 +1284,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 28 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 766041999} --- !u!1 &291432704 GameObject: m_ObjectHideFlags: 0 @@ -1614,7 +1402,7 @@ 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: -1000, y: 800} + m_AnchoredPosition: {x: -1300, y: 600} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &306312744 @@ -1713,7 +1501,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 7 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 946556767} --- !u!1 &321845189 GameObject: m_ObjectHideFlags: 0 @@ -1909,7 +1698,7 @@ 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: 1400, y: 800} + m_AnchoredPosition: {x: -900, y: 600} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &406517116 @@ -2008,7 +1797,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 12 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1077588040} --- !u!1 &406796504 GameObject: m_ObjectHideFlags: 0 @@ -2204,7 +1994,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 700, y: 400} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &471231061 @@ -2303,7 +2093,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 27 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 766041999} --- !u!1 &475841621 GameObject: m_ObjectHideFlags: 0 @@ -2478,7 +2269,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 1400, y: 100} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &528476486 @@ -2577,7 +2368,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 33 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 531797809} --- !u!1 &531797804 GameObject: m_ObjectHideFlags: 0 @@ -2615,7 +2407,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 1400, y: 600} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &531797806 @@ -2714,7 +2506,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 31 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1805700036} --- !u!1 &556201452 GameObject: m_ObjectHideFlags: 0 @@ -2910,7 +2703,7 @@ 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: -615, y: 631} + m_AnchoredPosition: {x: 0, y: 600} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &566818524 @@ -3009,7 +2802,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 22 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1342376329} --- !u!1 &571790755 GameObject: m_ObjectHideFlags: 0 @@ -3363,7 +3157,7 @@ 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: 600, y: 800} + m_AnchoredPosition: {x: -1100, y: 500} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &683605712 @@ -3462,7 +3256,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 10 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1077588040} --- !u!1 &697576762 GameObject: m_ObjectHideFlags: 0 @@ -3500,7 +3295,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 500, y: 200} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &697576764 @@ -3599,7 +3394,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 29 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1552666745} + - {fileID: 282988162} + - {fileID: 1721077925} + - {fileID: 566818527} --- !u!1 &765138794 GameObject: m_ObjectHideFlags: 0 @@ -3716,7 +3515,7 @@ 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: -1400, y: 800} + m_AnchoredPosition: {x: 600, y: 800} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &766041996 @@ -3813,7 +3612,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9c5dbc6e19942c19f4dc93fc3777677, type: 3} m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton - Upgrade: 0 + Upgrade: 4 UpgradeCost: 0 RequiredUpgrades: [] --- !u!1 &772192184 @@ -3853,7 +3652,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 700, y: -200} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &772192186 @@ -3952,7 +3751,9 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 26 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 239945582} + - {fileID: 471231064} --- !u!1 &853095383 GameObject: m_ObjectHideFlags: 0 @@ -4830,7 +4631,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 1200, y: -200} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1015076959 @@ -4929,7 +4730,9 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 34 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 528476489} + - {fileID: 471231064} --- !u!1 &1021226829 GameObject: m_ObjectHideFlags: 0 @@ -4967,7 +4770,7 @@ 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: -929, y: 0} + m_AnchoredPosition: {x: -400, y: 300} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1021226831 @@ -5066,7 +4869,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 20 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1812298575} --- !u!1 &1077588035 GameObject: m_ObjectHideFlags: 0 @@ -5104,7 +4908,7 @@ 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: -1400, y: 800} + m_AnchoredPosition: {x: -1000, y: 800} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1077588037 @@ -5241,7 +5045,7 @@ 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: -1113, y: 652} + m_AnchoredPosition: {x: -500, y: 0} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1215656303 @@ -5340,7 +5144,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 17 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1486581294} --- !u!1 &1228767730 GameObject: m_ObjectHideFlags: 0 @@ -5933,7 +5738,7 @@ 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: -1400, y: 800} + m_AnchoredPosition: {x: -200, y: 800} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1342376326 @@ -6030,7 +5835,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9c5dbc6e19942c19f4dc93fc3777677, type: 3} m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton - Upgrade: 0 + Upgrade: 2 UpgradeCost: 0 RequiredUpgrades: [] --- !u!1 &1394817801 @@ -6070,7 +5875,7 @@ 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: 1000, y: 800} + m_AnchoredPosition: {x: -1100, y: 303} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1394817803 @@ -6169,7 +5974,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 11 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 683605715} --- !u!1 &1449025482 GameObject: m_ObjectHideFlags: 0 @@ -6207,7 +6013,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 200, y: 84} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1449025484 @@ -6306,7 +6112,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 24 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 218329192} --- !u!1 &1454648453 GameObject: m_ObjectHideFlags: 0 @@ -6502,7 +6309,7 @@ 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: -1400, y: 800} + m_AnchoredPosition: {x: -600, y: 800} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1486581291 @@ -6599,7 +6406,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9c5dbc6e19942c19f4dc93fc3777677, type: 3} m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton - Upgrade: 0 + Upgrade: 1 UpgradeCost: 0 RequiredUpgrades: [] --- !u!1 &1512838241 @@ -6773,7 +6580,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 200, y: -645} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1533141410 @@ -6872,7 +6679,9 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 21 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1992771926} + - {fileID: 1449025487} --- !u!1 &1552666740 GameObject: m_ObjectHideFlags: 0 @@ -6910,7 +6719,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 300, y: 400} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1552666742 @@ -7009,7 +6818,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 25 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 218329192} --- !u!1 &1596265122 GameObject: m_ObjectHideFlags: 0 @@ -7159,7 +6969,7 @@ Canvas: serializedVersion: 3 m_RenderMode: 1 m_Camera: {fileID: 475841623} - m_PlaneDistance: 10 + m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -7456,7 +7266,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 931, y: 252} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1721077922 @@ -7555,7 +7365,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 30 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 2128693475} --- !u!1 &1729499770 GameObject: m_ObjectHideFlags: 0 @@ -7593,7 +7404,7 @@ 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: -1744, y: 652} + m_AnchoredPosition: {x: -1100, y: 0} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1729499772 @@ -7692,7 +7503,10 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 13 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 406517119} + - {fileID: 216535976} + - {fileID: 1835680349} --- !u!1 &1778644664 GameObject: m_ObjectHideFlags: 0 @@ -7730,7 +7544,7 @@ 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: -1413, y: 305} + m_AnchoredPosition: {x: -700, y: -200} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1778644666 @@ -7829,7 +7643,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 16 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1215656306} --- !u!1 &1805700031 GameObject: m_ObjectHideFlags: 0 @@ -7867,7 +7682,7 @@ 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: -1400, y: 800} + m_AnchoredPosition: {x: 1400, y: 800} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1805700033 @@ -7964,7 +7779,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9c5dbc6e19942c19f4dc93fc3777677, type: 3} m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton - Upgrade: 0 + Upgrade: 6 UpgradeCost: 0 RequiredUpgrades: [] --- !u!1 &1812298570 @@ -8004,7 +7819,7 @@ 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: -1135, y: 461} + m_AnchoredPosition: {x: -300, y: 600} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1812298572 @@ -8103,7 +7918,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 18 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1342376329} --- !u!1 &1835457753 GameObject: m_ObjectHideFlags: 0 @@ -8141,7 +7957,7 @@ 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: -923, y: 317} + m_AnchoredPosition: {x: -200, y: 400} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1835457755 @@ -8240,7 +8056,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 19 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1812298575} --- !u!1 &1835680344 GameObject: m_ObjectHideFlags: 0 @@ -8278,7 +8095,7 @@ 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: -1748, y: 503} + m_AnchoredPosition: {x: -700, y: 300} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1835680346 @@ -8377,7 +8194,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 15 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1836886870} --- !u!1 &1836886865 GameObject: m_ObjectHideFlags: 0 @@ -8415,7 +8233,7 @@ 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: -614, y: 322} + m_AnchoredPosition: {x: -700, y: 500} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1836886867 @@ -8514,7 +8332,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 14 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 1486581294} --- !u!1 &1966181549 GameObject: m_ObjectHideFlags: 0 @@ -8627,7 +8446,7 @@ 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: -200, y: 800} + m_AnchoredPosition: {x: -1500, y: 0} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1992771923 @@ -8726,7 +8545,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 9 UpgradeCost: 0 - RequiredUpgrades: [] + RequiredUpgrades: + - {fileID: 946556767} --- !u!1 &2097716080 GameObject: m_ObjectHideFlags: 0 @@ -8815,6 +8635,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2119665806} + - component: {fileID: 2119665808} + - component: {fileID: 2119665807} m_Layer: 5 m_Name: Upgrades m_TagString: Untagged @@ -8836,16 +8658,15 @@ RectTransform: m_Children: - {fileID: 946556763} - {fileID: 1077588036} - - {fileID: 218329188} - - {fileID: 2128693471} - - {fileID: 1805700032} - {fileID: 1486581290} - {fileID: 1342376325} + - {fileID: 218329188} - {fileID: 766041995} + - {fileID: 2128693471} + - {fileID: 1805700032} - {fileID: 306312743} - {fileID: 216535972} - {fileID: 1992771922} - - {fileID: 1077661} - {fileID: 683605711} - {fileID: 1394817802} - {fileID: 406517115} @@ -8878,6 +8699,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2119665807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2119665805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RawImage + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &2119665808 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2119665805} + m_CullTransparentMesh: 1 --- !u!1 &2128693470 GameObject: m_ObjectHideFlags: 0 @@ -8915,7 +8771,7 @@ 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: -1400, y: 800} + m_AnchoredPosition: {x: 1000, y: 800} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2128693472 @@ -9012,7 +8868,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9c5dbc6e19942c19f4dc93fc3777677, type: 3} m_Name: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton - Upgrade: 0 + Upgrade: 5 UpgradeCost: 0 RequiredUpgrades: [] --- !u!1 &2129197832 diff --git a/Assets/Scripts/UI/BasicUpgradeButton.cs b/Assets/Scripts/UI/BasicUpgradeButton.cs index 982c314..9f5da69 100644 --- a/Assets/Scripts/UI/BasicUpgradeButton.cs +++ b/Assets/Scripts/UI/BasicUpgradeButton.cs @@ -100,9 +100,9 @@ namespace Fruitomation.UI // - AttachedText.text = //State == UpgradeState.Hidden - //? "???" - $"{Upgrade.ToString()} [{UpgradeCost}]"; + AttachedText.text = State == UpgradeState.Hidden + ? "???" + : $"{Upgrade.ToString()} [{UpgradeCost}]"; } private bool IsUnlocked => State == UpgradeState.Unlocked;