Small Stuff:)
This commit is contained in:
+1
-1
@@ -166,7 +166,7 @@
|
|||||||
<workItem from="1680813239896" duration="4155000" />
|
<workItem from="1680813239896" duration="4155000" />
|
||||||
<workItem from="1681056387914" duration="882000" />
|
<workItem from="1681056387914" duration="882000" />
|
||||||
<workItem from="1681415672515" duration="5000" />
|
<workItem from="1681415672515" duration="5000" />
|
||||||
<workItem from="1681479671396" duration="13940000" />
|
<workItem from="1681479671396" duration="14760000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -2608,7 +2608,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: 'Public match
|
m_text: 'Public Room
|
||||||
|
|
||||||
'
|
'
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
@@ -3068,7 +3068,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
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_SizeDelta: {x: 0, y: 10.746399}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1440669665
|
--- !u!114 &1440669665
|
||||||
|
|||||||
@@ -173,7 +173,6 @@ public class Client : MonoBehaviour
|
|||||||
script.dice = dice;
|
script.dice = dice;
|
||||||
script.camera = cam;
|
script.camera = cam;
|
||||||
script.imageCurrentItem = imageCurrentItem;
|
script.imageCurrentItem = imageCurrentItem;
|
||||||
script.textName = playerNameTexts[job.data[5]];
|
|
||||||
|
|
||||||
//ITEM INFO IMAGES
|
//ITEM INFO IMAGES
|
||||||
Image[] temp = new Image[3];
|
Image[] temp = new Image[3];
|
||||||
@@ -207,7 +206,6 @@ public class Client : MonoBehaviour
|
|||||||
script.dice = dice;
|
script.dice = dice;
|
||||||
script.camera = cam;
|
script.camera = cam;
|
||||||
script.imageCurrentItem = imageCurrentItem;
|
script.imageCurrentItem = imageCurrentItem;
|
||||||
script.textName = playerNameTexts[job.data[5]];
|
|
||||||
|
|
||||||
//ITEM INFO IMAGES
|
//ITEM INFO IMAGES
|
||||||
Image[] temp = new Image[3];
|
Image[] temp = new Image[3];
|
||||||
@@ -231,6 +229,7 @@ public class Client : MonoBehaviour
|
|||||||
//---------------------------------------------------------
|
//---------------------------------------------------------
|
||||||
//-----Activate a Player
|
//-----Activate a Player
|
||||||
case 2:
|
case 2:
|
||||||
|
players[job.data[1]].nameSign.SetActive(false);
|
||||||
diceScript.SetMaterial(0);
|
diceScript.SetMaterial(0);
|
||||||
Activate(job.data[1]);
|
Activate(job.data[1]);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -25,8 +25,6 @@ public class NoPlayablePlayer : Player
|
|||||||
|
|
||||||
private bool checkDoubleDice = false;
|
private bool checkDoubleDice = false;
|
||||||
|
|
||||||
public TMP_Text textName;
|
|
||||||
|
|
||||||
//Animation:
|
//Animation:
|
||||||
private Vector3 lastPosAnim = Vector3.zero;
|
private Vector3 lastPosAnim = Vector3.zero;
|
||||||
private bool jumpRequest = false;
|
private bool jumpRequest = false;
|
||||||
@@ -40,6 +38,8 @@ public class NoPlayablePlayer : Player
|
|||||||
|
|
||||||
activated = false;
|
activated = false;
|
||||||
diceScript = dice.GetComponent<Dice>();
|
diceScript = dice.GetComponent<Dice>();
|
||||||
|
|
||||||
|
nameSign = playerTexts[1].gameObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
@@ -99,7 +99,6 @@ public class NoPlayablePlayer : Player
|
|||||||
|
|
||||||
public void Wurfeln(int wurfelZahl)
|
public void Wurfeln(int wurfelZahl)
|
||||||
{
|
{
|
||||||
textName.gameObject.SetActive(true);
|
|
||||||
diceScript.SetMaterial(0);
|
diceScript.SetMaterial(0);
|
||||||
|
|
||||||
jumpRequest = true;
|
jumpRequest = true;
|
||||||
@@ -159,6 +158,7 @@ public class NoPlayablePlayer : Player
|
|||||||
//delay
|
//delay
|
||||||
if (Time.time - timeSinceWurfeln > 2)
|
if (Time.time - timeSinceWurfeln > 2)
|
||||||
{
|
{
|
||||||
|
nameSign.SetActive(true);
|
||||||
dice.SetActive(false);
|
dice.SetActive(false);
|
||||||
InterPolerate();
|
InterPolerate();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ public class PlayablePlayer : Player
|
|||||||
|
|
||||||
private static PlayablePlayer instance;
|
private static PlayablePlayer instance;
|
||||||
|
|
||||||
public TMP_Text textName;
|
|
||||||
|
|
||||||
//Animation:
|
//Animation:
|
||||||
private Vector3 lastPosAnim = Vector3.zero;
|
private Vector3 lastPosAnim = Vector3.zero;
|
||||||
@@ -53,6 +52,8 @@ public class PlayablePlayer : Player
|
|||||||
diceScript = dice.GetComponent<Dice>();
|
diceScript = dice.GetComponent<Dice>();
|
||||||
|
|
||||||
instance = this;
|
instance = this;
|
||||||
|
|
||||||
|
nameSign = playerTexts[1].gameObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PlayablePlayer GetCurrentInstance()
|
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))
|
if (!Physics.Raycast(new Vector3(Input.mousePosition.x, Input.mousePosition.y, -200), Vector3.forward))
|
||||||
{
|
{
|
||||||
textName.gameObject.SetActive(true);
|
|
||||||
DiceRollRoutine();
|
DiceRollRoutine();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,7 +115,7 @@ public class PlayablePlayer : Player
|
|||||||
jumpRequest = true;
|
jumpRequest = true;
|
||||||
|
|
||||||
wurfelt = true;
|
wurfelt = true;
|
||||||
wurfelZahl = Random.Range(4, 5);
|
wurfelZahl = Random.Range(1, 7);
|
||||||
|
|
||||||
switch (activeItem)
|
switch (activeItem)
|
||||||
{
|
{
|
||||||
@@ -160,6 +160,7 @@ public class PlayablePlayer : Player
|
|||||||
//delay
|
//delay
|
||||||
if (Time.time - timeSinceWurfeln > 2)
|
if (Time.time - timeSinceWurfeln > 2)
|
||||||
{
|
{
|
||||||
|
nameSign.SetActive(true);
|
||||||
dice.SetActive(false);
|
dice.SetActive(false);
|
||||||
InterPolerate();
|
InterPolerate();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,8 @@ public abstract class Player : MonoBehaviour
|
|||||||
|
|
||||||
protected Animator animator;
|
protected Animator animator;
|
||||||
|
|
||||||
|
public GameObject nameSign;
|
||||||
|
|
||||||
//for coin animation
|
//for coin animation
|
||||||
private AnimationHandler animationHandler;
|
private AnimationHandler animationHandler;
|
||||||
|
|
||||||
|
|||||||
@@ -137,9 +137,7 @@ PlayerSettings:
|
|||||||
16:9: 1
|
16:9: 1
|
||||||
Others: 1
|
Others: 1
|
||||||
bundleVersion: 0.16
|
bundleVersion: 0.16
|
||||||
preloadedAssets:
|
preloadedAssets: []
|
||||||
- {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
|
|
||||||
- {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
|
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
wsaTransparentSwapchain: 0
|
wsaTransparentSwapchain: 0
|
||||||
m_HolographicPauseOnTrackingLoss: 1
|
m_HolographicPauseOnTrackingLoss: 1
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ EditorUserSettings:
|
|||||||
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
|
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-2:
|
RecentlyUsedSceneGuid-2:
|
||||||
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
|
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-3:
|
RecentlyUsedSceneGuid-3:
|
||||||
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
|
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
|
||||||
flags: 0
|
flags: 0
|
||||||
UnityRemoteDevice:
|
UnityRemoteDevice:
|
||||||
value: 225f4d46245b0d4902070862342649191512
|
value: 225f4d46245b0d4902070862342649191512
|
||||||
|
|||||||
Generated
+1
-1
@@ -101,7 +101,7 @@
|
|||||||
<workItem from="1681130452664" duration="6192000" />
|
<workItem from="1681130452664" duration="6192000" />
|
||||||
<workItem from="1681217780586" duration="94000" />
|
<workItem from="1681217780586" duration="94000" />
|
||||||
<workItem from="1681218296017" duration="162000" />
|
<workItem from="1681218296017" duration="162000" />
|
||||||
<workItem from="1681481242206" duration="5555000" />
|
<workItem from="1681481242206" duration="5995000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
Reference in New Issue
Block a user