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

Server Sync

Browse Source 
Player move on sync
This commit is contained in:
AliIbnAbiTalib
2023-02-20 21:51:15 +01:00
parent 12c8843fed
commit 311f141feb
14 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+9 -1
View File
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<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/ItemShop.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/ItemShop.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/Player.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
FlufflParty/Assets/Scripts/Client.cs
+1 -1
View File
@@ -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);
FlufflParty/Assets/Scripts/ItemShop.cs
+9 -6
View File
@@ -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);
}
}
FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
-5
View File
@@ -152,9 +152,4 @@ public class NoPlayablePlayer : Player
}
}
public void EventStopFinished()
{
eventstop = false;
}
}
FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+3 -2
View File
@@ -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
FlufflParty/Assets/Scripts/Players/Player.cs
+5
View File
@@ -70,4 +70,9 @@ public abstract class Player : MonoBehaviour
eventstop = true;
Layout2.SetActive(true);
}
public void EventStopFinished()
{
eventstop = false;
}
}
FlufflParty/Packages/packages-lock.json
+3 -3
View File
@@ -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": {