From f36dd36d214691e5135bdee94fc91053edf5983f Mon Sep 17 00:00:00 2001 From: AlexE030 Date: Tue, 7 Feb 2023 20:55:29 +0100 Subject: [PATCH] Item Shop Stop --- .../.idea.FlufflParty/.idea/workspace.xml | 47 ++++++++++++------- FlufflParty/Assets/Prefabs/Player.prefab | 17 +++++++ FlufflParty/Assets/Scenes/WesternMap.unity | 45 ++++++++++++++++++ FlufflParty/Assets/Scripts/Client.cs | 8 ++++ .../Scripts/Players/NoPlayablePlayer.cs | 16 +++++-- .../Assets/Scripts/Players/PlayablePlayer.cs | 39 +++++++++------ FlufflParty/Assets/Scripts/Players/Player.cs | 6 +++ Server/.idea/workspace.xml | 11 ++++- Server/src/Room.java | 10 ++++ 9 files changed, 163 insertions(+), 36 deletions(-) diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 6e2be6d..ecb6db9 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -1,15 +1,24 @@ - + + + + + + + + + + + - - + @@ -18,8 +27,9 @@ - - + + + @@ -31,22 +41,22 @@