Show current Item

This commit is contained in:
brausjonas
2023-03-31 20:58:20 +02:00
parent 0b1be485d5
commit 5cbb59e60c
9 changed files with 1522 additions and 175 deletions
+36 -1
View File
@@ -28,13 +28,16 @@ public class Client : MonoBehaviour
[SerializeField] private GameObject[] playerInfo;
private PlayerInfoElements[] playerInfoElements = new PlayerInfoElements[4];
[SerializeField] private GameObject layout2;
[SerializeField] private Item[] items;
[SerializeField] public Item[] items;
[SerializeField] private Button[] itemButtons;
[SerializeField] private TMP_Text fpsText;
private int playerAmount = 0;
[SerializeField] private Image imageCurrentItem;
[SerializeField] private Image[] playerItemInfoImages;
private static Client thisClient;
public static Client GetCurrentInstance()
@@ -153,6 +156,22 @@ public class Client : MonoBehaviour
script.nextField = nextField;
script.dice = dice;
script.camera = cam;
script.imageCurrentItem = imageCurrentItem;
//ITEM INFO IMAGES
Image[] temp = new Image[3];
int itemInfoImagesStartIndex = job.data[5] * 3;
int idx = 0;
for (int i = itemInfoImagesStartIndex; i < itemInfoImagesStartIndex + 3; i++)
{
temp[idx] = playerItemInfoImages[i];
temp[idx].color = new Color(0, 0, 0, 0);
idx++;
}
script.itemInfoImages = temp;
//END
itemButtons[job.data[5]].interactable = true;
}
@@ -168,7 +187,23 @@ public class Client : MonoBehaviour
script.nextField = nextField;
script.dice = dice;
script.camera = cam;
script.imageCurrentItem = imageCurrentItem;
//ITEM INFO IMAGES
Image[] temp = new Image[3];
int itemInfoImagesStartIndex = job.data[5] * 3;
int idx = 0;
for (int i = itemInfoImagesStartIndex; i < itemInfoImagesStartIndex + 3; i++)
{
temp[idx] = playerItemInfoImages[i];
temp[idx].color = new Color(0, 0, 0, 0);
idx++;
}
script.itemInfoImages = temp;
//END
itemButtons[job.data[5]].interactable = false;
}
@@ -289,6 +289,7 @@ public class PlayablePlayer : Player
private void Finish()
{
imageCurrentItem.color = new Color(0, 0, 0, 0);
client.SendFinished();
}
@@ -352,7 +353,10 @@ public class PlayablePlayer : Player
public void ActivateItem(int index)
{
activeItem = items[index].type;
imageCurrentItem.sprite = items[index].sprite;
imageCurrentItem.color = new Color(1, 1, 1, 1);
items[index] = null;
itemInfoImages[index].color = new Color(0, 0, 0, 0);
client.SendActiveItem((byte)index);
}
}
@@ -24,6 +24,8 @@ public abstract class Player : MonoBehaviour
public Item[] items = new Item[3];
public Item.Type activeItem = Item.Type.None;
protected float rotationDamping = 10;
public Image imageCurrentItem;
public Image[] itemInfoImages;
protected Animator animator;
@@ -39,6 +41,7 @@ public abstract class Player : MonoBehaviour
//Aktiviert den Player
public void Activate()
{
imageCurrentItem.color = new Color(0, 0, 0, 0);
activated = true;
wurfelt = false;
}
@@ -87,6 +90,8 @@ public abstract class Player : MonoBehaviour
if (items[i] == null)
{
items[i] = item;
itemInfoImages[i].sprite = item.sprite;
itemInfoImages[i].color = new Color(1, 1, 1, 1);
break;
}
}
@@ -97,7 +102,11 @@ public abstract class Player : MonoBehaviour
public void ActivateItem(int index)
{
activeItem = items[index].type;
imageCurrentItem.sprite = items[index].sprite;
imageCurrentItem.color = new Color(1, 1, 1, 1);
itemInfoImages[index].color = new Color(0, 0, 0, 0);
items[index] = null;
}
public void OnTriggerEnter(Collider c)