diff --git a/Assets/Materials/UI-BrownMat.mat b/Assets/Materials/UI-BrownMat.mat index 7200ff8..2ad55a3 100644 --- a/Assets/Materials/UI-BrownMat.mat +++ b/Assets/Materials/UI-BrownMat.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: UI-BrownMat - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -88,6 +88,7 @@ Material: - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -106,6 +107,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _SampleGI: 0 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 @@ -116,8 +118,8 @@ Material: - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.30980393, g: 0.19607843, b: 0.10980392, a: 1} - - _Color: {r: 0.3098039, g: 0.19607839, b: 0.10980389, a: 1} + - _BaseColor: {r: 0.509434, g: 0.29217535, b: 0.1273585, a: 0.3137255} + - _Color: {r: 0.509434, g: 0.29217532, b: 0.12735847, a: 0.3137255} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/UpgradesScene.unity b/Assets/Scenes/UpgradesScene.unity index 174f2de..7ced42c 100644 --- a/Assets/Scenes/UpgradesScene.unity +++ b/Assets/Scenes/UpgradesScene.unity @@ -119,6 +119,76 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &68882331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 68882332} + m_Layer: 5 + m_Name: LineMidpoint3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &68882332 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 68882331} + 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: 1449025483} + 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: 160} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &70784383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 70784384} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &70784384 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70784383} + 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: 1215656302} + 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: 600} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &104174696 GameObject: m_ObjectHideFlags: 0 @@ -237,6 +307,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &135326814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 135326815} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &135326815 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135326814} + 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: 471231060} + 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: 600} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &153563567 GameObject: m_ObjectHideFlags: 0 @@ -424,6 +529,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1454648454} + - {fileID: 1236547065} m_Father: {fileID: 2119665806} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -527,9 +633,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 8 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 306312747} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &218329187 GameObject: m_ObjectHideFlags: 0 @@ -666,8 +774,45 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 3 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] +--- !u!1 &224788900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224788901} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224788901 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 224788900} + 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: 1729499771} + 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: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &239945577 GameObject: m_ObjectHideFlags: 0 @@ -804,9 +949,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 23 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 1215656306} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &242722018 GameObject: m_ObjectHideFlags: 0 @@ -886,6 +1033,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242722018} m_CullTransparentMesh: 1 +--- !u!1 &262706393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 262706394} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &262706394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262706393} + 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: 683605711} + 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: 100} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &263965906 GameObject: m_ObjectHideFlags: 0 @@ -919,11 +1101,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 893630488} + - {fileID: 868347509} 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: 1700, y: 500} + m_AnchoredPosition: {x: 1700, y: 200} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &263965908 @@ -1022,9 +1205,15 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 32 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 531797809} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 531797805} + - {fileID: 868347509} + - {fileID: 263965907} --- !u!1 &282988157 GameObject: m_ObjectHideFlags: 0 @@ -1062,7 +1251,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: 588, y: 600} + m_AnchoredPosition: {x: 500, y: 600} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &282988159 @@ -1161,9 +1350,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 28 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 766041999} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &291432704 GameObject: m_ObjectHideFlags: 0 @@ -1379,9 +1570,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 7 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 946556767} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &321845189 GameObject: m_ObjectHideFlags: 0 @@ -1461,6 +1654,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 321845189} m_CullTransparentMesh: 1 +--- !u!1 &394172750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 394172751} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &394172751 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394172750} + 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: 1533141409} + 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: 250} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &405474751 GameObject: m_ObjectHideFlags: 0 @@ -1676,9 +1904,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 12 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 1077588040} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &406796504 GameObject: m_ObjectHideFlags: 0 @@ -1837,6 +2067,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 416945043} m_CullTransparentMesh: 1 +--- !u!1 &441839762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 441839763} + m_Layer: 5 + m_Name: LineMidpoint3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &441839763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 441839762} + 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: 471231060} + 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: 150} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &471231059 GameObject: m_ObjectHideFlags: 0 @@ -1870,11 +2135,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1456267451} + - {fileID: 135326815} + - {fileID: 1270293026} + - {fileID: 441839763} 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: 700, y: 400} + m_AnchoredPosition: {x: 700, y: 0} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &471231061 @@ -1973,9 +2241,18 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 27 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 766041999} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 766041995} + - {fileID: 135326815} + - {fileID: 1270293026} + - LinePoints: + - {fileID: 441839763} + - {fileID: 471231060} --- !u!1 &475841621 GameObject: m_ObjectHideFlags: 0 @@ -2249,9 +2526,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 33 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 531797809} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &531797804 GameObject: m_ObjectHideFlags: 0 @@ -2388,9 +2667,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 31 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 1805700036} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &556201452 GameObject: m_ObjectHideFlags: 0 @@ -2582,11 +2863,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 591563447} + - {fileID: 1697924385} + - {fileID: 1155474408} 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: 0, y: 600} + m_AnchoredPosition: {x: -100, y: 498} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &566818524 @@ -2685,9 +2968,15 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 22 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 1342376329} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 1342376325} + - {fileID: 1697924385} + - {fileID: 566818523} --- !u!1 &571790755 GameObject: m_ObjectHideFlags: 0 @@ -3037,6 +3326,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1686089426} + - {fileID: 262706394} m_Father: {fileID: 2119665806} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3140,9 +3430,50 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 10 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 1077588040} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 683605711} + - {fileID: 262706394} + - {fileID: 1077588036} +--- !u!1 &696222551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 696222552} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &696222552 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696222551} + 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: 1836886866} + 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: 100} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &697576762 GameObject: m_ObjectHideFlags: 0 @@ -3279,12 +3610,98 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 29 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 1552666745} - {fileID: 282988162} - {fileID: 1721077925} - {fileID: 566818527} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 566818523} + - {fileID: 1155474408} + - {fileID: 697576763} + - LinePoints: + - {fileID: 282988158} + - {fileID: 697576763} + - LinePoints: + - {fileID: 1721077921} + - {fileID: 701240656} + - {fileID: 697576763} + - LinePoints: + - {fileID: 1552666741} + - {fileID: 697576763} +--- !u!1 &701240655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 701240656} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &701240656 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701240655} + 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: 1721077921} + 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: -200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &750918486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 750918487} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &750918487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750918486} + 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: 1992771922} + 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: 600} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &765138794 GameObject: m_ObjectHideFlags: 0 @@ -3500,8 +3917,10 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 4 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &772192184 GameObject: m_ObjectHideFlags: 0 @@ -3535,11 +3954,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1313601003} + - {fileID: 1213257781} 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: 700, y: -200} + m_AnchoredPosition: {x: 700, y: -400} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &772192186 @@ -3638,10 +4058,54 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 26 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 239945582} - {fileID: 471231064} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 239945578} + - {fileID: 1213257781} + - {fileID: 772192185} + - LinePoints: + - {fileID: 471231060} + - {fileID: 772192185} +--- !u!1 &775814145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 775814146} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &775814146 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 775814145} + 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: 1835457754} + 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: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &853095383 GameObject: m_ObjectHideFlags: 0 @@ -3800,6 +4264,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 858043208} m_CullTransparentMesh: 1 +--- !u!1 &868347508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 868347509} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &868347509 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868347508} + 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: 263965907} + 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: -300, y: 300} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &879339944 GameObject: m_ObjectHideFlags: 0 @@ -4323,8 +4822,10 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 0 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &949599745 GameObject: m_ObjectHideFlags: 0 @@ -4516,11 +5017,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 104174697} + - {fileID: 1865160004} + - {fileID: 1595272091} 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: 1200, y: -200} + m_AnchoredPosition: {x: 1200, y: -400} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1015076959 @@ -4619,10 +5122,20 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 34 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 528476489} - {fileID: 471231064} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 471231060} + - {fileID: 1865160004} + - {fileID: 1015076958} + - LinePoints: + - {fileID: 528476485} + - {fileID: 1595272091} + - {fileID: 1015076958} --- !u!1 &1021226829 GameObject: m_ObjectHideFlags: 0 @@ -4660,7 +5173,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: -400, y: 300} + m_AnchoredPosition: {x: -300, y: 200} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1021226831 @@ -4759,9 +5272,46 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 20 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 1812298575} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] +--- !u!1 &1053146742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1053146743} + m_Layer: 5 + m_Name: LineMidpoint2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1053146743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1053146742} + 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: 1533141409} + 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: 150} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1077588035 GameObject: m_ObjectHideFlags: 0 @@ -4898,8 +5448,80 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 0 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] +--- !u!1 &1155474407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1155474408} + m_Layer: 5 + m_Name: LineMidpoint2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1155474408 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155474407} + 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: 566818523} + 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: 300, y: -300} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1213257780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1213257781} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1213257781 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1213257780} + 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: 772192185} + 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: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1215656301 GameObject: m_ObjectHideFlags: 0 @@ -4933,6 +5555,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 321845190} + - {fileID: 70784384} m_Father: {fileID: 2119665806} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -5036,9 +5659,15 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 17 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 1486581294} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 1486581290} + - {fileID: 70784384} + - {fileID: 1215656302} --- !u!1 &1228767730 GameObject: m_ObjectHideFlags: 0 @@ -5120,6 +5749,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1228767730} m_CullTransparentMesh: 1 +--- !u!1 &1236547064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1236547065} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1236547065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236547064} + 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: 216535972} + 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: -200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1256535096 GameObject: m_ObjectHideFlags: 0 @@ -5278,6 +5942,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1262976365} m_CullTransparentMesh: 1 +--- !u!1 &1270293025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1270293026} + m_Layer: 5 + m_Name: LineMidpoint2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1270293026 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1270293025} + 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: 471231060} + 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: 250} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1300138666 GameObject: m_ObjectHideFlags: 0 @@ -5730,8 +6429,10 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 2 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &1394817801 GameObject: m_ObjectHideFlags: 0 @@ -5868,9 +6569,46 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 11 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 683605715} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] +--- !u!1 &1405685185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1405685186} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1405685186 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405685185} + 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: 1449025483} + 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: 500} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1449025482 GameObject: m_ObjectHideFlags: 0 @@ -5904,11 +6642,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1300138667} + - {fileID: 1405685186} + - {fileID: 2069879633} + - {fileID: 68882332} 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: 84} + m_AnchoredPosition: {x: 100, y: 100} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1449025484 @@ -6007,9 +6748,18 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 24 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 218329192} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 218329188} + - {fileID: 1405685186} + - {fileID: 2069879633} + - LinePoints: + - {fileID: 68882332} + - {fileID: 1449025483} --- !u!1 &1454648453 GameObject: m_ObjectHideFlags: 0 @@ -6304,8 +7054,10 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 1 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &1512838241 GameObject: m_ObjectHideFlags: 0 @@ -6473,11 +7225,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1596265123} + - {fileID: 394172751} + - {fileID: 1053146743} 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: -645} + m_AnchoredPosition: {x: 100, y: -400} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1533141410 @@ -6576,10 +7330,22 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 21 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 1992771926} - {fileID: 1449025487} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 1992771922} + - {fileID: 1644737552} + - {fileID: 1533141409} + - LinePoints: + - {fileID: 1449025483} + - {fileID: 394172751} + - LinePoints: + - {fileID: 1053146743} + - {fileID: 1533141409} --- !u!1 &1552666740 GameObject: m_ObjectHideFlags: 0 @@ -6613,6 +7379,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 949599746} + - {fileID: 1931088262} m_Father: {fileID: 2119665806} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -6716,9 +7483,50 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 25 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 218329192} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 218329188} + - {fileID: 1931088262} + - {fileID: 1552666741} +--- !u!1 &1595272090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1595272091} + m_Layer: 5 + m_Name: LineMidpoint2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1595272091 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595272090} + 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: 1015076958} + 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: 300} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1596265122 GameObject: m_ObjectHideFlags: 0 @@ -7049,6 +7857,41 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1644737551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1644737552} + m_Layer: 5 + m_Name: LineMidpoint2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1644737552 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644737551} + 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: 1992771922} + 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: 400, y: -400} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1686089425 GameObject: m_ObjectHideFlags: 0 @@ -7128,6 +7971,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1686089425} m_CullTransparentMesh: 1 +--- !u!1 &1697924384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1697924385} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1697924385 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1697924384} + 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: 566818523} + 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: 100} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1721077920 GameObject: m_ObjectHideFlags: 0 @@ -7161,11 +8039,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 924391374} + - {fileID: 701240656} 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: 931, y: 252} + m_AnchoredPosition: {x: 1000, y: 400} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1721077922 @@ -7264,9 +8143,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 30 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 2128693475} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &1729499770 GameObject: m_ObjectHideFlags: 0 @@ -7300,11 +8181,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 561679580} + - {fileID: 224788901} 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: -1100, y: 0} + m_AnchoredPosition: {x: -900, y: 0} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1729499772 @@ -7403,11 +8285,24 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 13 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 406517119} - {fileID: 216535976} - {fileID: 1835680349} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 1729499771} + - {fileID: 406517115} + - LinePoints: + - {fileID: 1729499771} + - {fileID: 1236547065} + - {fileID: 216535972} + - LinePoints: + - {fileID: 1729499771} + - {fileID: 224788901} + - {fileID: 1835680345} --- !u!1 &1778644664 GameObject: m_ObjectHideFlags: 0 @@ -7544,9 +8439,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 16 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 1215656306} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &1805700031 GameObject: m_ObjectHideFlags: 0 @@ -7683,8 +8580,10 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 6 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &1812298570 GameObject: m_ObjectHideFlags: 0 @@ -7821,9 +8720,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 18 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 1342376329} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &1835457753 GameObject: m_ObjectHideFlags: 0 @@ -7857,11 +8758,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 201229659} + - {fileID: 775814146} 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: 400} + m_AnchoredPosition: {x: -100, y: 300} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1835457755 @@ -7960,9 +8862,15 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 19 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 1812298575} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 1812298571} + - {fileID: 775814146} + - {fileID: 1835457754} --- !u!1 &1835680344 GameObject: m_ObjectHideFlags: 0 @@ -8099,9 +9007,11 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 15 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: - {fileID: 1836886870} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &1836886865 GameObject: m_ObjectHideFlags: 0 @@ -8135,6 +9045,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 406796505} + - {fileID: 696222552} m_Father: {fileID: 2119665806} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -8238,9 +9149,85 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 14 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 1486581294} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 1486581290} + - {fileID: 696222552} + - {fileID: 1836886866} +--- !u!1 &1865160003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1865160004} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1865160004 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1865160003} + 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: 1015076958} + 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: 100} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1931088261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1931088262} + m_Layer: 5 + m_Name: LineMidpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1931088262 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1931088261} + 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: 1552666741} + 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: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1966181549 GameObject: m_ObjectHideFlags: 0 @@ -8349,6 +9336,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 958003758} + - {fileID: 750918487} + - {fileID: 1644737552} m_Father: {fileID: 2119665806} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -8452,9 +9441,50 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton Upgrade: 9 UpgradeCost: 0 + DrawDefaultLines: 0 RequiredUpgrades: - {fileID: 946556767} LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: + - LinePoints: + - {fileID: 946556763} + - {fileID: 750918487} + - {fileID: 1992771922} +--- !u!1 &2069879632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2069879633} + m_Layer: 5 + m_Name: LineMidpoint2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2069879633 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2069879632} + 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: 1449025483} + 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: 240} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2097716080 GameObject: m_ObjectHideFlags: 0 @@ -8778,8 +9808,10 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton Upgrade: 5 UpgradeCost: 0 + DrawDefaultLines: 1 RequiredUpgrades: [] LineMaterial: {fileID: 2100000, guid: eb8c84c9b7bce8f4ab2641ccf50d239c, type: 2} + Lines: [] --- !u!1 &2129197832 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/BasicUpgradeButton.cs b/Assets/Scripts/UI/BasicUpgradeButton.cs index 447cb0b..85f775d 100644 --- a/Assets/Scripts/UI/BasicUpgradeButton.cs +++ b/Assets/Scripts/UI/BasicUpgradeButton.cs @@ -9,6 +9,11 @@ namespace Fruitomation.UI { public class BasicUpgradeButton : MonoBehaviour { + [Serializable] private class LineInfo + { + public RectTransform[] LinePoints; + } + private enum UpgradeState { Unlocked, @@ -20,44 +25,65 @@ namespace Fruitomation.UI [Header("Settings")] [SerializeField] private BasicUpgrade Upgrade; [SerializeField] private int UpgradeCost; + [SerializeField] private bool DrawDefaultLines; [Header("References")] [SerializeField] private BasicUpgradeButton[] RequiredUpgrades; [SerializeField] private Material LineMaterial; - private (LineRenderer, BasicUpgradeButton)[] UpgradeLines; + [Header("Lines")] + [SerializeField] private LineInfo[] Lines; + + private (LineRenderer, BasicUpgradeButton, LineInfo)[] UpgradeLines; private UpgradeState State = UpgradeState.Hidden; private Button AttachedButton; private Text AttachedText; - + private void Awake() { AttachedText = gameObject.GetComponentInChildren(); AttachedButton = GetComponent