diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 1257015..54eb0aa 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -166,7 +166,7 @@
-
+
diff --git a/FlufflParty/Assets/BlenderFiles/PlayerField.blend b/FlufflParty/Assets/BlenderFiles/PlayerField.blend
index 5c37dcf..5ca834e 100644
Binary files a/FlufflParty/Assets/BlenderFiles/PlayerField.blend and b/FlufflParty/Assets/BlenderFiles/PlayerField.blend differ
diff --git a/FlufflParty/Assets/BlenderFiles/PlayerField.blend1 b/FlufflParty/Assets/BlenderFiles/PlayerField.blend1
index 49c4c35..5c37dcf 100644
Binary files a/FlufflParty/Assets/BlenderFiles/PlayerField.blend1 and b/FlufflParty/Assets/BlenderFiles/PlayerField.blend1 differ
diff --git a/FlufflParty/Assets/Scenes/Start.unity b/FlufflParty/Assets/Scenes/Start.unity
index 589019f..cb5d5b1 100644
--- a/FlufflParty/Assets/Scenes/Start.unity
+++ b/FlufflParty/Assets/Scenes/Start.unity
@@ -2608,7 +2608,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: 'Public match
+ m_text: 'Public Room
'
m_isRightToLeft: 0
@@ -3068,7 +3068,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -0.37069702}
+ m_AnchoredPosition: {x: 0, y: -0.37072754}
m_SizeDelta: {x: 0, y: 10.746399}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1440669665
diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs
index f764072..087b395 100644
--- a/FlufflParty/Assets/Scripts/Client.cs
+++ b/FlufflParty/Assets/Scripts/Client.cs
@@ -173,7 +173,6 @@ public class Client : MonoBehaviour
script.dice = dice;
script.camera = cam;
script.imageCurrentItem = imageCurrentItem;
- script.textName = playerNameTexts[job.data[5]];
//ITEM INFO IMAGES
Image[] temp = new Image[3];
@@ -207,7 +206,6 @@ public class Client : MonoBehaviour
script.dice = dice;
script.camera = cam;
script.imageCurrentItem = imageCurrentItem;
- script.textName = playerNameTexts[job.data[5]];
//ITEM INFO IMAGES
Image[] temp = new Image[3];
@@ -231,6 +229,7 @@ public class Client : MonoBehaviour
//---------------------------------------------------------
//-----Activate a Player
case 2:
+ players[job.data[1]].nameSign.SetActive(false);
diceScript.SetMaterial(0);
Activate(job.data[1]);
break;
diff --git a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
index 60d061f..6de26f4 100644
--- a/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
@@ -25,8 +25,6 @@ public class NoPlayablePlayer : Player
private bool checkDoubleDice = false;
- public TMP_Text textName;
-
//Animation:
private Vector3 lastPosAnim = Vector3.zero;
private bool jumpRequest = false;
@@ -40,6 +38,8 @@ public class NoPlayablePlayer : Player
activated = false;
diceScript = dice.GetComponent();
+
+ nameSign = playerTexts[1].gameObject;
}
private void Start()
@@ -99,7 +99,6 @@ public class NoPlayablePlayer : Player
public void Wurfeln(int wurfelZahl)
{
- textName.gameObject.SetActive(true);
diceScript.SetMaterial(0);
jumpRequest = true;
@@ -159,6 +158,7 @@ public class NoPlayablePlayer : Player
//delay
if (Time.time - timeSinceWurfeln > 2)
{
+ nameSign.SetActive(true);
dice.SetActive(false);
InterPolerate();
}
diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
index 249590a..3e222c7 100644
--- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
@@ -34,7 +34,6 @@ public class PlayablePlayer : Player
private static PlayablePlayer instance;
- public TMP_Text textName;
//Animation:
private Vector3 lastPosAnim = Vector3.zero;
@@ -53,6 +52,8 @@ public class PlayablePlayer : Player
diceScript = dice.GetComponent();
instance = this;
+
+ nameSign = playerTexts[1].gameObject;
}
public static PlayablePlayer GetCurrentInstance()
@@ -99,7 +100,6 @@ public class PlayablePlayer : Player
{
if (!Physics.Raycast(new Vector3(Input.mousePosition.x, Input.mousePosition.y, -200), Vector3.forward))
{
- textName.gameObject.SetActive(true);
DiceRollRoutine();
}
}
@@ -115,7 +115,7 @@ public class PlayablePlayer : Player
jumpRequest = true;
wurfelt = true;
- wurfelZahl = Random.Range(4, 5);
+ wurfelZahl = Random.Range(1, 7);
switch (activeItem)
{
@@ -160,6 +160,7 @@ public class PlayablePlayer : Player
//delay
if (Time.time - timeSinceWurfeln > 2)
{
+ nameSign.SetActive(true);
dice.SetActive(false);
InterPolerate();
}
diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs
index bf8c81e..a92ec69 100644
--- a/FlufflParty/Assets/Scripts/Players/Player.cs
+++ b/FlufflParty/Assets/Scripts/Players/Player.cs
@@ -30,6 +30,8 @@ public abstract class Player : MonoBehaviour
public Image[] itemInfoImages;
protected Animator animator;
+
+ public GameObject nameSign;
//for coin animation
private AnimationHandler animationHandler;
diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset
index 8c27b84..bc5a504 100644
--- a/FlufflParty/ProjectSettings/ProjectSettings.asset
+++ b/FlufflParty/ProjectSettings/ProjectSettings.asset
@@ -137,9 +137,7 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 0.16
- preloadedAssets:
- - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
- - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
+ preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset
index bac6747..299540d 100644
--- a/FlufflParty/UserSettings/EditorUserSettings.asset
+++ b/FlufflParty/UserSettings/EditorUserSettings.asset
@@ -12,10 +12,10 @@ EditorUserSettings:
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
flags: 0
RecentlyUsedSceneGuid-2:
- value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
+ value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedSceneGuid-3:
- value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+ value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512
diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml
index 4695e73..10db441 100644
--- a/Server/.idea/workspace.xml
+++ b/Server/.idea/workspace.xml
@@ -101,7 +101,7 @@
-
+