diff --git a/.idea/misc.xml b/.idea/misc.xml
index 639900d..93cd0af 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad3b8ac..263d08d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,16 @@
+
+
+
-
+
+
+
+
-
+
@@ -28,9 +34,28 @@
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
- "last_opened_file_path": "C:/flufflparty"
+ "last_opened_file_path": "C:/flufflparty/Server",
+ "project.structure.last.edited": "Project",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.0",
+ "settings.editor.selected.configurable": "preferences.lookFeel"
}
}]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -40,6 +65,7 @@
1676488026665
+
diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 9832234..e2af4a2 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -1,7 +1,15 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs
index 7fa74c9..b98c26b 100644
--- a/FlufflParty/Assets/Scripts/Client.cs
+++ b/FlufflParty/Assets/Scripts/Client.cs
@@ -130,7 +130,7 @@ public class Client : MonoBehaviour
((NoPlayablePlayer)players[job.data[1]]).CoinFieldAction(job.data[2]);
break;
case 7:
- ((NoPlayablePlayer)players[job.data[1]]).EventStopFinished();
+ (players[job.data[1]]).EventStopFinished();
break;
case 126:
stream.Write(new byte[]{126, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 10);
diff --git a/FlufflParty/Assets/Scripts/ItemShop.cs b/FlufflParty/Assets/Scripts/ItemShop.cs
index 9b315f6..b632217 100644
--- a/FlufflParty/Assets/Scripts/ItemShop.cs
+++ b/FlufflParty/Assets/Scripts/ItemShop.cs
@@ -4,15 +4,18 @@ using UnityEngine;
public class ItemShop : MonoBehaviour
{
- // Start is called before the first frame update
- void Start()
+ [SerializeField] private GameObject Layout2;
+ [SerializeField] private GameObject LayoutItemShop;
+ [SerializeField] private Client client;
+ public void buttonMoveOn()
{
-
+ Layout2.SetActive(false);
+ client.EventStopFinished();
}
- // Update is called once per frame
- void Update()
+ public void buttonEnter()
{
-
+ Layout2.SetActive(false);
+ LayoutItemShop.SetActive(true);
}
}
diff --git a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
index 180dae0..a344ccf 100644
--- a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
@@ -152,9 +152,4 @@ public class NoPlayablePlayer : Player
}
}
- public void EventStopFinished()
- {
- eventstop = false;
- }
-
}
diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
index da6e8c5..979c781 100644
--- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
@@ -37,12 +37,13 @@ public class PlayablePlayer : Player
private void Update()
{
- if (Input.GetMouseButtonDown(0))
+ /*
+ if (Input.GetMouseButtonDown(0))
{
eventstop = false;
client.EventStopFinished();
}
-
+ */
if (activated && !name.Equals(""))
{
//Generiere Würfelzahl von 1-6 wenn gerade gewürfelt werden darf
diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs
index 62abaeb..b88583a 100644
--- a/FlufflParty/Assets/Scripts/Players/Player.cs
+++ b/FlufflParty/Assets/Scripts/Players/Player.cs
@@ -70,4 +70,9 @@ public abstract class Player : MonoBehaviour
eventstop = true;
Layout2.SetActive(true);
}
+
+ public void EventStopFinished()
+ {
+ eventstop = false;
+ }
}
diff --git a/FlufflParty/Packages/packages-lock.json b/FlufflParty/Packages/packages-lock.json
index f612085..8aa26df 100644
--- a/FlufflParty/Packages/packages-lock.json
+++ b/FlufflParty/Packages/packages-lock.json
@@ -47,8 +47,8 @@
"depth": 0,
"source": "builtin",
"dependencies": {
- "com.unity.ide.visualstudio": "2.0.16",
- "com.unity.ide.rider": "3.0.16",
+ "com.unity.ide.visualstudio": "2.0.17",
+ "com.unity.ide.rider": "3.0.18",
"com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.1.1",
@@ -112,7 +112,7 @@
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
- "version": "1.6.0",
+ "version": "1.7.0",
"depth": 1,
"source": "registry",
"dependencies": {
diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar
index 3c3c92c..13b7c62 100644
Binary files a/Server/out/artifacts/Server_jar/Server.jar and b/Server/out/artifacts/Server_jar/Server.jar differ
diff --git a/Server/out/production/Server/Room$2.class b/Server/out/production/Server/Room$2.class
index 4569b95..183b34c 100644
Binary files a/Server/out/production/Server/Room$2.class and b/Server/out/production/Server/Room$2.class differ
diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class
index d708e49..147c981 100644
Binary files a/Server/out/production/Server/Room.class and b/Server/out/production/Server/Room.class differ
diff --git a/Server/src/Room.java b/Server/src/Room.java
index 2870362..881b813 100644
--- a/Server/src/Room.java
+++ b/Server/src/Room.java
@@ -171,10 +171,7 @@ public class Room
case 7:
for (int i = 0; i < players.length; i++)
{
- if (i != player)
- {
players[i].output.write(new byte[]{7, (byte)player, 0, 0, 0, 0, 0, 0, 0, 0});
- }
}
break;
case 126: