Pasha/Fruitomation
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Added basic pricing

Browse Source
This commit is contained in:
Pasha Bibko
2026-04-28 16:36:59 +01:00
parent 0ccf979869
commit 9990e7f8cf
5 changed files with 213 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Scenes/GameScene.unity
View File

@@ -2524,6 +2524,7 @@ GameObject:
- component: {fileID: 2048015618}
- component: {fileID: 2048015620}
- component: {fileID: 2048015619}
- component: {fileID: 2048015621}
m_Layer: 5
m_Name: MoneyDisplay
m_TagString: Untagged
@@ -2592,6 +2593,19 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2048015617}
m_CullTransparentMesh: 1
--- !u!114 &2048015621
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2048015617}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9fd2536a960fe894bb7d658ecb4e5cff, type: 3}
m_Name:
m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicMoneyDisplay
MoneyText: {fileID: 2048015619}
--- !u!1 &2106145556
GameObject:
m_ObjectHideFlags: 0
@@ -2817,7 +2831,6 @@ MonoBehaviour:
BuildButton: {fileID: 873667507}
PauseButton: {fileID: 1347333878}
EditButton: {fileID: 1951065947}
MoneyText: {fileID: 2048015619}
--- !u!1 &2142689106
GameObject:
m_ObjectHideFlags: 0

196
Assets/Scenes/UpgradesScene.unity
View File

@@ -686,6 +686,82 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 600}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &135926299
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 135926300}
- component: {fileID: 135926302}
- component: {fileID: 135926301}
m_Layer: 5
m_Name: MoneyDisplay
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &135926300
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135926299}
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: 1075882283}
m_Father: {fileID: 1601651585}
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: 1500, y: -1100}
m_SizeDelta: {x: 1000, y: 1000}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &135926301
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135926299}
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: 21300000, guid: e76da6b4d6427e84097b6d764b9a91bf, type: 3}
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: 0.1
--- !u!222 &135926302
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135926299}
m_CullTransparentMesh: 1
--- !u!1 &153563567
GameObject:
m_ObjectHideFlags: 0
@@ -979,7 +1055,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton
Upgrade: 8
DrawDefaultLines: 1
Cost: 0
Cost: 250000
BigText: 0
RequiredUpgrades:
- {fileID: 306312747}
@@ -2021,7 +2097,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton
Upgrade: 7
DrawDefaultLines: 1
Cost: 0
Cost: 5000
BigText: 0
RequiredUpgrades:
- {fileID: 946556767}
@@ -2455,7 +2531,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton
Upgrade: 12
DrawDefaultLines: 1
Cost: 0
Cost: 400000
BigText: 0
RequiredUpgrades:
- {fileID: 1077588040}
@@ -3580,7 +3656,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BuildingUnlockButton
Building: 6
Cost: 0
Cost: 10000000
AttachedButton: {fileID: 553044638}
AttachedText: {fileID: 1891974735}
--- !u!1 &556201452
@@ -4443,7 +4519,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton
Upgrade: 10
DrawDefaultLines: 0
Cost: 0
Cost: 200000
BigText: 0
RequiredUpgrades:
- {fileID: 1077588040}
@@ -5416,7 +5492,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BuildingUnlockButton
Building: 4
Cost: 0
Cost: 10000
AttachedButton: {fileID: 819595001}
AttachedText: {fileID: 644778638}
--- !u!1 &837873368
@@ -6214,7 +6290,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BuildingUnlockButton
Building: 2
Cost: 0
Cost: 2500
AttachedButton: {fileID: 937482392}
AttachedText: {fileID: 837873370}
--- !u!1 &946556762
@@ -7046,6 +7122,99 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 150}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1075882282
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1075882283}
- component: {fileID: 1075882285}
- component: {fileID: 1075882284}
- component: {fileID: 1075882286}
m_Layer: 5
m_Name: Money
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1075882283
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075882282}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 135926300}
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: -109, y: 327.7}
m_SizeDelta: {x: 3500, y: 750}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1075882284
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075882282}
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: 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_FontData:
m_Font: {fileID: 12800000, guid: 25598a8975ed29243bb850b56f191920, type: 3}
m_FontSize: 250
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 250
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Current Money: {MoneyController.Current:F1}'
--- !u!222 &1075882285
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075882282}
m_CullTransparentMesh: 1
--- !u!114 &1075882286
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075882282}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9fd2536a960fe894bb7d658ecb4e5cff, type: 3}
m_Name:
m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicMoneyDisplay
MoneyText: {fileID: 1075882284}
--- !u!1 &1077588035
GameObject:
m_ObjectHideFlags: 0
@@ -8409,7 +8578,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton
Upgrade: 11
DrawDefaultLines: 1
Cost: 0
Cost: 250000
BigText: 0
RequiredUpgrades:
- {fileID: 683605715}
@@ -9679,11 +9848,12 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 120641731}
- {fileID: 17860578}
- {fileID: 135926300}
- {fileID: 2119665806}
- {fileID: 1512838242}
- {fileID: 1377362335}
- {fileID: 120641731}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -10447,7 +10617,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton
Upgrade: 13
DrawDefaultLines: 0
Cost: 0
Cost: 1000000000
BigText: 0
RequiredUpgrades:
- {fileID: 406517119}
@@ -11274,7 +11444,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton
Upgrade: 15
DrawDefaultLines: 1
Cost: 0
Cost: 250000000
BigText: 0
RequiredUpgrades:
- {fileID: 1836886870}
@@ -11437,7 +11607,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Fruitomation::Fruitomation.UI.BasicUpgradeButton
Upgrade: 14
DrawDefaultLines: 0
Cost: 0
Cost: 50000000
BigText: 0
RequiredUpgrades:
- {fileID: 1486581294}
@@ -11908,7 +12078,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.BasicUpgradeButton
Upgrade: 9
DrawDefaultLines: 0
Cost: 0
Cost: 1000
BigText: 0
RequiredUpgrades:
- {fileID: 946556767}

14
Assets/Scripts/UI/BasicMoneyDisplay.cs Normal file
View File

@@ -0,0 +1,14 @@
using Fruitomation.Global;
using UnityEngine.UI;
using UnityEngine;
namespace Fruitomation.UI
{
public class BasicMoneyDisplay : MonoBehaviour
{
[SerializeField] private Text MoneyText;
private void Update() =>
MoneyText.text = $"Current Money: {MoneyController.Current:F1}";
}
}

2
Assets/Scripts/UI/BasicMoneyDisplay.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 9fd2536a960fe894bb7d658ecb4e5cff

6
Assets/Scripts/UI/FruitBowlController.cs
View File

@@ -13,7 +13,6 @@ namespace Fruitomation.UI
[SerializeField] private Button BuildButton;
[SerializeField] private Button PauseButton;
[SerializeField] private Button EditButton;
[SerializeField] private Text MoneyText;
private void Awake()
{
@@ -53,10 +52,5 @@ namespace Fruitomation.UI
GameStateController.State = GameState.Editing;
});
}
private void Update()
{
MoneyText.text = $"Current Money: {MoneyController.Current:F1}";
}
}
}