From c06d1610060f469b13665b117d46d3227705b99a Mon Sep 17 00:00:00 2001 From: s-prechtl Date: Thu, 9 Jun 2022 09:29:56 +0200 Subject: [PATCH] Klammer beim merge verlorn --- Assets/Scripts/Tiles/FarmlandTile.cs | 36 +++++++++++++--------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/Assets/Scripts/Tiles/FarmlandTile.cs b/Assets/Scripts/Tiles/FarmlandTile.cs index 19c22e5..4028eb9 100644 --- a/Assets/Scripts/Tiles/FarmlandTile.cs +++ b/Assets/Scripts/Tiles/FarmlandTile.cs @@ -1,35 +1,31 @@ using UnityEngine; -namespace Tiles -{ - public class FarmlandTile : BaseTile - { +namespace Tiles { + public class FarmlandTile : BaseTile { private Crop _crop; - - public FarmlandTile(GameObject gameObject) : base("Assets/Farming Asset Pack/Split Assets/farming_tileset_008.png", gameObject) - { - _crop = new Crop(gameObject.transform.GetChild(1).GetComponent(), - gameObject.transform.GetChild(0).GetComponent()); - } - public override void DayLightStep() - { + public FarmlandTile(GameObject gameObject) : base("Assets/Farming Asset Pack/Split Assets/farming_tileset_008.png", + gameObject) { + _crop = new Crop(gameObject.transform.GetChild(1).GetComponent(), + gameObject.transform.GetChild(0).GetComponent()); + } + + public override void DayLightStep() { _crop.DayLightStep(); } - public override BaseTile Clicked(UsableItem usable) - { + public override BaseTile Clicked(UsableItem usable) { BaseTile rv = null; - if (usable != null) - { + if (usable != null) { base.Clicked(usable); _crop.Clicked(usable); - if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.ID) - { - rv = new GrassTile(_gameObject); + if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.ID) { + rv = new GrassTile(_gameObject); + } + + } - return rv; } }