glass layer occlusion, previous event occlusion changes, locomotaion steps change, ui hovers (for some reason currently play when a new location is set)
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using _PROJECT.NewHandPresence;
|
||||
using FishNet.Object;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.XR.CoreUtils;
|
||||
@@ -14,7 +15,7 @@ public enum ElevatorState
|
||||
}
|
||||
|
||||
|
||||
public class ElevatorBox : MonoBehaviour
|
||||
public class ElevatorBox : NetworkBehaviour
|
||||
{
|
||||
public List<ElevatorOuter> callers = new List<ElevatorOuter>();
|
||||
|
||||
@@ -129,8 +130,10 @@ public class ElevatorBox : MonoBehaviour
|
||||
}
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
|
||||
XROrigin enteredPlayerVR = other.GetComponent<XROrigin>();
|
||||
KbmController enteredPlayerKbm = other.GetComponent<KbmController>();
|
||||
XRPlayerMirror networkPlayerDisplay = other.GetComponentInParent<XRPlayerMirror>();
|
||||
|
||||
Debug.Log("Player Entered box");
|
||||
if (enteredPlayerVR != null)
|
||||
@@ -141,11 +144,19 @@ public class ElevatorBox : MonoBehaviour
|
||||
{
|
||||
enteredPlayerKbm.transform.SetParent(this.transform);
|
||||
}
|
||||
else
|
||||
else if (networkPlayerDisplay != null)
|
||||
{
|
||||
//don't do any parenting but don't halt the function
|
||||
}
|
||||
else {
|
||||
|
||||
Debug.Log(other + " Cannot ride in lifts.");
|
||||
return;
|
||||
}
|
||||
|
||||
Debug.Log("Calling Lift transfer sequence");
|
||||
|
||||
switch (targetFloor)
|
||||
switch (targetFloor)
|
||||
{
|
||||
case int f when f == floors[0].floorNumber:
|
||||
targetFloor = floors[1].floorNumber;
|
||||
@@ -158,7 +169,7 @@ public class ElevatorBox : MonoBehaviour
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
StartCoroutine(LiftTransferSequence());
|
||||
}
|
||||
|
||||
@@ -169,6 +180,8 @@ public class ElevatorBox : MonoBehaviour
|
||||
// Was it a player, that exited?
|
||||
XROrigin exitedPlayerVR = other.GetComponent<XROrigin>();
|
||||
KbmController exitedPlayerKbm = other.GetComponent<KbmController>();
|
||||
XRPlayerMirror networkPlayerDisplay = other.GetComponentInParent<XRPlayerMirror>();
|
||||
|
||||
if (exitedPlayerVR != null)
|
||||
{
|
||||
removeChild(exitedPlayerVR);
|
||||
@@ -177,6 +190,10 @@ public class ElevatorBox : MonoBehaviour
|
||||
{
|
||||
exitedPlayerKbm.transform.SetParent(null);
|
||||
}
|
||||
else if (networkPlayerDisplay != null)
|
||||
{
|
||||
//don't do any parenting but don't halt the function
|
||||
}
|
||||
else
|
||||
return;
|
||||
|
||||
@@ -263,6 +280,7 @@ public class ElevatorBox : MonoBehaviour
|
||||
|
||||
private IEnumerator LiftTransferSequence()
|
||||
{
|
||||
Debug.Log("Started Lidt transfer sequence");
|
||||
yield return StartCoroutine(CloseDoors());
|
||||
yield return StartCoroutine(MoveToFloor(targetFloor));
|
||||
}
|
||||
@@ -295,7 +313,7 @@ public class ElevatorBox : MonoBehaviour
|
||||
private IEnumerator CloseDoors()
|
||||
{
|
||||
//if (state == ElevatorState.AwaitingPassengers) {
|
||||
//Debug.Log("Closing doors");
|
||||
Debug.Log("Closing doors");
|
||||
|
||||
if (Vector3.Distance(leftDoor.transform.position, leftDoorClosedPos.position) < 0.01f)
|
||||
yield break;
|
||||
|
||||
Reference in New Issue
Block a user