jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TestPush

Browse Source
This commit is contained in:
brausjonas
2023-04-11 14:34:32 +02:00
parent 7f577bb14a
commit 8ac19a6503
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+3
View File
@@ -5,6 +5,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment=""> <list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Client.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Client.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
FlufflParty/Assets/Scripts/Client.cs
+1
View File
@@ -196,6 +196,7 @@ public class Client : MonoBehaviour
NoPlayablePlayer script = player.AddComponent<NoPlayablePlayer>(); NoPlayablePlayer script = player.AddComponent<NoPlayablePlayer>();
players[job.data[5]] = script; players[job.data[5]] = script;
script.client = this;
script.nextField = nextField; script.nextField = nextField;
script.dice = dice; script.dice = dice;
script.camera = cam; script.camera = cam;
FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+2
View File
@@ -14,6 +14,7 @@ public class NoPlayablePlayer : Player
private float speed = 5; private float speed = 5;
private float interPol = 0; private float interPol = 0;
private int wurfelZahl = 0; private int wurfelZahl = 0;
public Client client;
private bool wait = false; private bool wait = false;
private bool lastActivated = false; private bool lastActivated = false;
@@ -38,6 +39,7 @@ public class NoPlayablePlayer : Player
activated = false; activated = false;
diceScript = dice.GetComponent<Dice>(); diceScript = dice.GetComponent<Dice>();
AddItem(client.items[1]);
} }
private void Start() private void Start()
FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+2
View File
@@ -49,6 +49,8 @@ public class PlayablePlayer : Player
diceScript = dice.GetComponent<Dice>(); diceScript = dice.GetComponent<Dice>();
instance = this; instance = this;
AddItem(client.items[1]);
} }
public static PlayablePlayer GetCurrentInstance() public static PlayablePlayer GetCurrentInstance()