Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Correction des commentaires de PR

Browse Source 
Déplacé énum RessourceChoice vers ResourceMaker

Retiré code commenté dans ResourceTile

Remplacé Awake pour Start dans ResourceMaker
This commit is contained in:
Ader Alisma 01 2023-06-12 20:55:29 -04:00
parent 4b756a5321
commit 475ebbaac6
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Assets/Scripts/Resource/ResourceMaker.cs
View File

@ -8,10 +8,17 @@ public class ResourceMaker : MonoBehaviour
[SerializeField] [SerializeField]
private int _resourceMakingAmount; private int _resourceMakingAmount;
[SerializeField] [SerializeField]
private ResourceManager.ResourceChoice _resourceChoice; private ResourceChoice _resourceChoice;
private ResourceManager _resourceManagerInstance; private ResourceManager _resourceManagerInstance;
private void Awake() public enum ResourceChoice
{
Rock,
Wood,
Food
};
private void Start()
{ {
_resourceManagerInstance = ResourceManager.Instance; _resourceManagerInstance = ResourceManager.Instance;
} }
@ -23,13 +30,13 @@ public class ResourceMaker : MonoBehaviour
{ {
switch (_resourceChoice) switch (_resourceChoice)
{ {
case ResourceManager.ResourceChoice.Rock: case ResourceChoice.Rock:
_resourceManagerInstance.RockAmount = _resourceMakingAmount; _resourceManagerInstance.RockAmount = _resourceMakingAmount;
break; break;
case ResourceManager.ResourceChoice.Wood: case ResourceChoice.Wood:
_resourceManagerInstance.WoodAmount = _resourceMakingAmount; _resourceManagerInstance.WoodAmount = _resourceMakingAmount;
break; break;
case ResourceManager.ResourceChoice.Food: case ResourceChoice.Food:
_resourceManagerInstance.FoodAmount = _resourceMakingAmount; _resourceManagerInstance.FoodAmount = _resourceMakingAmount;
break; break;
} }

13
Assets/Scripts/Resource/ResourceManager.cs
View File

@ -10,19 +10,6 @@ public class ResourceManager : MonoBehaviour
private int _woodAmount = 20; private int _woodAmount = 20;
private int _foodAmount = 20; private int _foodAmount = 20;
public enum ResourceChoice
{
Rock,
Wood,
Food
};
public enum AddOrRemove
{
Add,
Remove
};
private const int MAX = 100; private const int MAX = 100;
private const int MIN = 0; private const int MIN = 0;

3
Assets/Scripts/Tiles/ResourceTile.cs
View File

@ -21,9 +21,6 @@ public class ResourceTile : LevelTile
public override void LevelUpdate() public override void LevelUpdate()
{ {
//if (!Occupied) return; Uncomment once tile occupation exists
_yieldCounter += Time.deltaTime * _yieldSpeed; _yieldCounter += Time.deltaTime * _yieldSpeed;
if (_yieldCounter < 1) return; if (_yieldCounter < 1) return;