diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index b429297..35b717d 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -1,7 +1,14 @@ - + + + + + + + + - { - "keyToString": { - "Discover.Launch.Via.Unity": "true", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "vue.rearranger.settings.migration": "true" + +}]]> - - diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs index fd9bd11..300d08b 100644 --- a/FlufflParty/Assets/Scripts/Client.cs +++ b/FlufflParty/Assets/Scripts/Client.cs @@ -11,6 +11,7 @@ using UnityEngine.SceneManagement; public class Client : MonoBehaviour { + [SerializeField] private TMP_Text textLeftMoves; private TcpClient client; private Stream stream; [SerializeField] private GameObject playerPrefab; @@ -191,6 +192,7 @@ public class Client : MonoBehaviour players[job.data[1]].textCoinsInfo = playerInfoElements[job.data[1]].textCoinInfo; players[job.data[1]].textStarsInfo = playerInfoElements[job.data[1]].textStarsInfo; players[job.data[1]].uiHandler = uiHandler; + players[job.data[1]].textLeftMoves = textLeftMoves; players[job.data[1]].Init(); playerNameTexts[job.data[1]].text = Encoding.ASCII.GetString(name).Replace(" ", ""); diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs index e077ead..84add7e 100644 --- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs @@ -54,6 +54,7 @@ public class PlayablePlayer : Player { wurfelt = true; wurfelZahl = Random.Range(1, 7); + textLeftMoves.text = wurfelZahl + ""; client.SendWurfeln(wurfelZahl); @@ -91,6 +92,7 @@ public class PlayablePlayer : Player else if (wurfelZahl > 0) { wurfelZahl--; + textLeftMoves.text = wurfelZahl + ""; //the next field is the current field XD currentField = nextField; diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs index 2f6ee8d..3805114 100644 --- a/FlufflParty/Assets/Scripts/Players/Player.cs +++ b/FlufflParty/Assets/Scripts/Players/Player.cs @@ -17,7 +17,7 @@ public abstract class Player : MonoBehaviour public int index; public int coins = 0; public int stars = 0; - public TMP_Text textCoinsInfo, textStarsInfo; + public TMP_Text textCoinsInfo, textStarsInfo, textLeftMoves; protected bool eventstop = false; public UIHandler uiHandler; 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/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset index 299540d..bac6747 100644 --- a/FlufflParty/UserSettings/EditorUserSettings.asset +++ b/FlufflParty/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069 flags: 0 RecentlyUsedSceneGuid-2: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b flags: 0 RecentlyUsedSceneGuid-3: - value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 UnityRemoteDevice: value: 225f4d46245b0d4902070862342649191512