sprechtl/Foerming
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dhain' into develop

Browse source 
# Conflicts:
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/PlayerController.cs
This commit is contained in:
dhain 2022-05-19 16:07:18 +02:00
commit 7a04d79aba
118 changed files with 14104 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Assets/Scripts/PlayerController.cs
View file

@ -4,42 +4,40 @@ using System.Collections.Generic;
using UnityEngine;
public class PlayerController : MonoBehaviour {
private Dictionary<Item, int> inventory;
private int money;
private UsableItem selectedItem;
#region Singleton
public UsableItem SelectedItem => selectedItem;
public static PlayerController instance;
private static PlayerController instance;
public int startMoney = 100;
private void Awake() {
if(instance != null) {
Debug.LogWarning("More than one instance of PlayerController found");
}
public static PlayerController getInstance() {
return instance;
}
// Start is called before the first frame update
void Start()
{
inventory ??= new Dictionary<Item, int>();
money = startMoney;
instance = this;
}
// Update is called once per frame
void Update()
{
#endregion
public Inventory inventory;
private int money;
private UsableItem selectedItem;
public int startMoney = 100;
// Start is called before the first frame update
void Start() {
money = startMoney;
}
public void setSelectedItem(UsableItem item) {
if (inventory.ContainsKey(item)) {
// Update is called once per frame
void Update() { }
public void SetSelectedItem(UsableItem item) {
if(inventory.items.ContainsKey(item)) {
selectedItem = item;
Cursor.SetCursor(item.defaultSprite.texture, Vector2.zero, CursorMode.Auto);
Cursor.SetCursor(item.defaultSprite.texture, Vector2.zero, CursorMode.Auto);
} else {
Debug.Log("An item requested to select isn't in the inventory" + item);
Debug.Log("An item requested to select isn't in the inventory" + item);
}
}
}