diff --git a/Definitions.txt b/Definitions.txt new file mode 100644 index 0000000..d3b4686 --- /dev/null +++ b/Definitions.txt @@ -0,0 +1,59 @@ +Field Definitions: + 0: Get Coins Field + 1: Loose Coins Field + 2: LuckyField + 3: ItemFIeld + 4: UnluckyField + 5: VSField + 6: EventField + +Inital Game Definitions (Server): + Get Room Code: + Client -> Server + Server -> Client + [2, ...] + Join Room Code: + Client -> Server + First Message: + [1, ...] + Second Message: + [Room Code in Ascii] + Third Message: + [Name] + +Game Run Definitions (Room Server): + TimeoutCheck: + [126, ...] (10 minute timeout checked every 10 seconds) Room and Clients + + Rolled: + Client -> Server: + [3, number, ...] + Server -> Client: + [3, playerID, number, ...] + + PathSelection: + Client -> Server: + [4, directionID, ...] + Server -> Client: + [4, playerID, directionID, ...] + + FinishMovingEvent: + Client -> Server + [5, ...] + Server -> Client + [2, nextPlayerID, ...] (Player Activation event) + + DeleteRoomCall: + [0, ...] + + LocalPlayerCreateEvent: + Server -> Client + [1, playable/dummy, startPosition.3.] 1 = playable !1 = dummy + + TransferNameDistrubutor: + Server -> Client + [5, playerID, name.8.] + + + + \ No newline at end of file diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 2e38e04..d03b41c 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -111,6 +111,7 @@ + diff --git a/FlufflParty/Assets/Scripts/Camera.meta b/FlufflParty/Assets/Scripts/Camera.meta deleted file mode 100644 index 2e18b28..0000000 --- a/FlufflParty/Assets/Scripts/Camera.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eb6f7c9a6e6cd424c853338442fa92fc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs index 393c072..9959b7a 100644 --- a/FlufflParty/Assets/Scripts/Client.cs +++ b/FlufflParty/Assets/Scripts/Client.cs @@ -106,8 +106,9 @@ public class Client : MonoBehaviour } players[job.data[1]].name = Encoding.ASCII.GetString(name).Replace(" ", ""); + players[job.data[1]].index = job.data[1]; players[job.data[1]].Init(); - + playerNameTexts[job.data[1]].text = Encoding.ASCII.GetString(name).Replace(" ", ""); uiHandler.ActivateLayout1(); diff --git a/FlufflParty/Assets/Scripts/Fields/EventField.cs b/FlufflParty/Assets/Scripts/Fields/EventField.cs index 7da237a..c853feb 100644 --- a/FlufflParty/Assets/Scripts/Fields/EventField.cs +++ b/FlufflParty/Assets/Scripts/Fields/EventField.cs @@ -4,8 +4,8 @@ using UnityEngine; public class EventField : Field { - public override void Action() + public override int Action(int playerIndex) { - + return 6; } } diff --git a/FlufflParty/Assets/Scripts/Fields/Field.cs b/FlufflParty/Assets/Scripts/Fields/Field.cs index 681ad3c..5be168a 100644 --- a/FlufflParty/Assets/Scripts/Fields/Field.cs +++ b/FlufflParty/Assets/Scripts/Fields/Field.cs @@ -8,6 +8,10 @@ public abstract class Field : MonoBehaviour [SerializeField] private Field[] target; [SerializeField] private Arrow[] directionalArrows; + /* + * Field Definition: + */ + public Field[] Target { get @@ -25,5 +29,5 @@ public abstract class Field : MonoBehaviour } //Feld aktion (Münzen etc..) - public abstract void Action(); + public abstract int Action(int playerIndex); } diff --git a/FlufflParty/Assets/Scripts/Fields/GetCoinsField.cs b/FlufflParty/Assets/Scripts/Fields/GetCoinsField.cs index 9f98773..159e20f 100644 --- a/FlufflParty/Assets/Scripts/Fields/GetCoinsField.cs +++ b/FlufflParty/Assets/Scripts/Fields/GetCoinsField.cs @@ -4,8 +4,8 @@ using UnityEngine; public class GetCoinsField : Field { - public override void Action() + public override int Action(int playerIndex) { - + return 0; } } diff --git a/FlufflParty/Assets/Scripts/Fields/ItemField.cs b/FlufflParty/Assets/Scripts/Fields/ItemField.cs index a5ee3ba..1e57b16 100644 --- a/FlufflParty/Assets/Scripts/Fields/ItemField.cs +++ b/FlufflParty/Assets/Scripts/Fields/ItemField.cs @@ -4,8 +4,8 @@ using UnityEngine; public class ItemField : Field { - public override void Action() + public override int Action(int playerIndex) { - + return 3; } } diff --git a/FlufflParty/Assets/Scripts/Fields/LooseCoinsField.cs b/FlufflParty/Assets/Scripts/Fields/LooseCoinsField.cs index 73bc26b..596e9cd 100644 --- a/FlufflParty/Assets/Scripts/Fields/LooseCoinsField.cs +++ b/FlufflParty/Assets/Scripts/Fields/LooseCoinsField.cs @@ -4,8 +4,8 @@ using UnityEngine; public class LooseCoinsField : Field { - public override void Action() + public override int Action(int playerIndex) { - + return 1; } } diff --git a/FlufflParty/Assets/Scripts/Fields/LuckField.cs b/FlufflParty/Assets/Scripts/Fields/LuckField.cs index 3b39d03..94e0deb 100644 --- a/FlufflParty/Assets/Scripts/Fields/LuckField.cs +++ b/FlufflParty/Assets/Scripts/Fields/LuckField.cs @@ -4,8 +4,8 @@ using UnityEngine; public class LuckField : Field { - public override void Action() + public override int Action(int playerIndex) { - + return 2; } } diff --git a/FlufflParty/Assets/Scripts/Fields/UnluckyField.cs b/FlufflParty/Assets/Scripts/Fields/UnluckyField.cs index 1d88686..6e97cf9 100644 --- a/FlufflParty/Assets/Scripts/Fields/UnluckyField.cs +++ b/FlufflParty/Assets/Scripts/Fields/UnluckyField.cs @@ -4,8 +4,8 @@ using UnityEngine; public class UnluckyField : Field { - public override void Action() + public override int Action(int playerIndex) { - + return 4; } } diff --git a/FlufflParty/Assets/Scripts/Fields/VSField.cs b/FlufflParty/Assets/Scripts/Fields/VSField.cs index 4e283e6..3eed1f4 100644 --- a/FlufflParty/Assets/Scripts/Fields/VSField.cs +++ b/FlufflParty/Assets/Scripts/Fields/VSField.cs @@ -4,8 +4,8 @@ using UnityEngine; public class VSField : Field { - public override void Action() + public override int Action(int playerIndex) { - + return 5; } } diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs index 9e152be..fdde47a 100644 --- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs @@ -81,6 +81,9 @@ public class PlayablePlayer : Player { wurfelZahl--; + //the next field is the current field XD + currentField = nextField; + //Visiere das nächste Feld an falls noch ein Zug übrig ist (Player steht gerade auf einem Feld oder läuft darüber) if (wurfelZahl > 0) { @@ -93,6 +96,7 @@ public class PlayablePlayer : Player //TODO: temp spieler finsihed erst, wenn field action ausgeführt wurde if (wurfelt) { + currentField.Action(index); Invoke("Finish", 2); activated = false; } @@ -146,7 +150,6 @@ public class PlayablePlayer : Player { interPol = 0; lastPos = transform.position; - currentField = nextField; if (nextField.Target.Length == 1) { nextField = nextField.Target[0]; diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs index 047db24..782c438 100644 --- a/FlufflParty/Assets/Scripts/Players/Player.cs +++ b/FlufflParty/Assets/Scripts/Players/Player.cs @@ -12,6 +12,8 @@ public abstract class Player : MonoBehaviour protected Vector3 velocity = Vector3.zero; protected Vector3 cameraOffset = new Vector3(-2.81f, 8.13f, 5.6f); + public int index; + public int coins = 0; //Aktiviert den Player public void Activate() diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index b951ee8..b3f0a9f 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -78,6 +78,7 @@ +