- Added blinds to round 1 window.
- Round 1 window shatter effect now plays at more random pitches. - Added a proper camera switcher for the Chase intro, and adjusted timing. - Added the basic ability for a camera to follow multiple players.
This commit is contained in:
@@ -44,7 +44,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 7
|
||||
Data: 10
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
@@ -481,6 +481,162 @@ MonoBehaviour:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _FollowedPlayerNames
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _FollowedPlayerNames
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 32|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: System.String[], mscorlib
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 32
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
- Name:
|
||||
Entry: 6
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <IsSerialized>k__BackingField
|
||||
Entry: 5
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 0
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _FollowedPlayerNames_Cache
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _FollowedPlayerNames_Cache
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 32
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 32
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
- Name:
|
||||
Entry: 6
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <IsSerialized>k__BackingField
|
||||
Entry: 5
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 0
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _FollowedPlayers
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _FollowedPlayers
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 37|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: VRC.SDKBase.VRCPlayerApi[], VRCSDKBase
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 37
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
- Name:
|
||||
Entry: 6
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <IsSerialized>k__BackingField
|
||||
Entry: 5
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 0
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
|
||||
using CameraSystem;
|
||||
using MMMaellon.LightSync;
|
||||
using UdonSharp;
|
||||
using UnityEditor.Overlays;
|
||||
using UnityEngine;
|
||||
using CameraSystem;
|
||||
using VRC.SDKBase;
|
||||
using VRC.Udon.Common;
|
||||
|
||||
|
||||
@@ -21,6 +23,9 @@ public class CameraAnchor : UdonSharpBehaviour
|
||||
[UdonSynced] private int _AttachedCameraIndex = -1;
|
||||
|
||||
private Camera _AttachedCamera = null;
|
||||
private string[] _FollowedPlayerNames = new string[0];
|
||||
private string[] _FollowedPlayerNames_Cache = new string[0];
|
||||
private VRCPlayerApi[] _FollowedPlayers = new VRCPlayerApi[0];
|
||||
|
||||
|
||||
void LateUpdate()
|
||||
@@ -36,11 +41,35 @@ public class CameraAnchor : UdonSharpBehaviour
|
||||
_AttachedCamera.fieldOfView = FOV * CameraRoot.transform.localScale.z;
|
||||
}
|
||||
}
|
||||
|
||||
if (_FollowedPlayers.Length > 0)
|
||||
{
|
||||
Vector3 CentroidSum = Vector3.zero;
|
||||
for (int i = 0; i < _FollowedPlayers.Length; i++)
|
||||
{
|
||||
Vector3 LeftEyePosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.LeftEye);
|
||||
Vector3 RightEyePosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.RightEye);
|
||||
Vector3 LeftFootPosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.LeftFoot);
|
||||
Vector3 RightFootPosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.RightFoot);
|
||||
|
||||
CentroidSum += new Vector3(
|
||||
(LeftEyePosition.x + RightEyePosition.x + LeftFootPosition.x + RightFootPosition.x) / 4.0f,
|
||||
(LeftEyePosition.y + RightEyePosition.y + LeftFootPosition.y + RightFootPosition.y) / 4.0f,
|
||||
(LeftEyePosition.z + RightEyePosition.z + LeftFootPosition.z + RightFootPosition.z) / 4.0f);
|
||||
}
|
||||
|
||||
CameraRoot.LookAt(CentroidSum / _FollowedPlayers.Length, Vector3.up);
|
||||
}
|
||||
else
|
||||
{
|
||||
CameraRoot.transform.localRotation = Quaternion.identity;
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnDeserialization(DeserializationResult Result)
|
||||
{
|
||||
_AttachCamera_Synced();
|
||||
_FollowPlayers_Synced();
|
||||
|
||||
base.OnDeserialization(Result);
|
||||
}
|
||||
@@ -67,16 +96,80 @@ public class CameraAnchor : UdonSharpBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public void FollowPlayers(string[] Players)
|
||||
{
|
||||
_FollowedPlayerNames = Players;
|
||||
_FollowPlayers_Synced();
|
||||
RequestSerialization();
|
||||
}
|
||||
|
||||
public void StopFollowingPlayers()
|
||||
{
|
||||
_FollowedPlayerNames = new string[0];
|
||||
_FollowPlayers_Synced();
|
||||
RequestSerialization();
|
||||
}
|
||||
|
||||
|
||||
private void _AttachCamera_Synced()
|
||||
{
|
||||
_AttachedCamera = CameraSystemManager.camerasObjects[_AttachedCameraIndex];
|
||||
_AttachedCamera.gameObject.SetActive(true);
|
||||
_AttachedCamera.transform.parent = CameraRoot;
|
||||
_AttachedCamera.fieldOfView = FOV;
|
||||
_AttachedCamera.nearClipPlane = NearClippingPlane;
|
||||
_AttachedCamera.farClipPlane = FarClippingPlane;
|
||||
_AttachedCamera.GetComponent<LightSync>().TeleportToLocalSpace(Vector3.zero, Quaternion.identity, true);
|
||||
Camera NewCamera = CameraSystemManager.camerasObjects[_AttachedCameraIndex];
|
||||
if (NewCamera != _AttachedCamera)
|
||||
{
|
||||
_AttachedCamera = NewCamera;
|
||||
_AttachedCamera.gameObject.SetActive(true);
|
||||
_AttachedCamera.transform.parent = CameraRoot;
|
||||
_AttachedCamera.fieldOfView = FOV;
|
||||
_AttachedCamera.nearClipPlane = NearClippingPlane;
|
||||
_AttachedCamera.farClipPlane = FarClippingPlane;
|
||||
_AttachedCamera.GetComponent<LightSync>().TeleportToLocalSpace(Vector3.zero, Quaternion.identity, true);
|
||||
}
|
||||
}
|
||||
|
||||
private void _FollowPlayers_Synced()
|
||||
{
|
||||
if (_IsPlayerListDifferent())
|
||||
{
|
||||
_FollowedPlayers = new VRCPlayerApi[_FollowedPlayerNames.Length];
|
||||
VRCPlayerApi[] AllPlayers = new VRCPlayerApi[VRCPlayerApi.GetPlayerCount()];
|
||||
VRCPlayerApi.GetPlayers(AllPlayers);
|
||||
|
||||
int i = 0;
|
||||
foreach (string PlayerName in _FollowedPlayerNames)
|
||||
{
|
||||
foreach (VRCPlayerApi Player in AllPlayers)
|
||||
{
|
||||
if (Player.displayName == PlayerName)
|
||||
{
|
||||
_FollowedPlayers[i] = Player;
|
||||
i++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Debug.Log("[CameraAnchor] Anchor " + gameObject.name + " is now following " + _FollowedPlayerNames);
|
||||
|
||||
_FollowedPlayerNames_Cache = _FollowedPlayerNames;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private bool _IsPlayerListDifferent()
|
||||
{
|
||||
if (_FollowedPlayerNames.Length != _FollowedPlayerNames_Cache.Length)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
for (int i = 0; i < _FollowedPlayerNames.Length; i++)
|
||||
{
|
||||
if (_FollowedPlayerNames[i] != _FollowedPlayerNames_Cache[i])
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 34
|
||||
Data: 35
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
@@ -917,13 +917,13 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: CorrectToHostAndAllPlayersTimerToggle
|
||||
Data: TheChaseStartToHostAndAllPlayersTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: CorrectToHostAndAllPlayersTimerToggle
|
||||
Data: TheChaseStartToHostAndAllPlayersTimerToggle
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 12
|
||||
@@ -971,13 +971,13 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: IncorrectToHostAndAllPlayersTimerToggle
|
||||
Data: CorrectToHostAndAllPlayersTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: IncorrectToHostAndAllPlayersTimerToggle
|
||||
Data: CorrectToHostAndAllPlayersTimerToggle
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 12
|
||||
@@ -1025,13 +1025,13 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: ThinkAboutItTimerToggle
|
||||
Data: IncorrectToHostAndAllPlayersTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: ThinkAboutItTimerToggle
|
||||
Data: IncorrectToHostAndAllPlayersTimerToggle
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 12
|
||||
@@ -1079,13 +1079,13 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: BuzzedInPlayerTimerToggle
|
||||
Data: ThinkAboutItTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: BuzzedInPlayerTimerToggle
|
||||
Data: ThinkAboutItTimerToggle
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 12
|
||||
@@ -1133,25 +1133,19 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _CameraAnimator
|
||||
Data: BuzzedInPlayerTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CameraAnimator
|
||||
Data: BuzzedInPlayerTimerToggle
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 68|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Animator, UnityEngine.AnimationModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
Entry: 9
|
||||
Data: 12
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 68
|
||||
Data: 4
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1166,13 +1160,73 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _CameraAnimator
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CameraAnimator
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 71|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Animator, UnityEngine.AnimationModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 71
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
- Name:
|
||||
Entry: 6
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <IsSerialized>k__BackingField
|
||||
Entry: 5
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 70|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 73|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
@@ -1181,7 +1235,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1205,13 +1259,13 @@ MonoBehaviour:
|
||||
Data: Player1CameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player1CameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 73|System.RuntimeType, mscorlib
|
||||
Data: 76|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraAnchor, Assembly-CSharp
|
||||
@@ -1235,73 +1289,19 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 75|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 76|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: Player2CameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player2CameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
- Name:
|
||||
Entry: 6
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <IsSerialized>k__BackingField
|
||||
Entry: 5
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
@@ -1325,16 +1325,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: Player3CameraAnchor
|
||||
Data: Player2CameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player3CameraAnchor
|
||||
Data: Player2CameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1379,16 +1379,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: HostCameraAnchor
|
||||
Data: Player3CameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: HostCameraAnchor
|
||||
Data: Player3CameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1433,16 +1433,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: DefaultWideShotCameraAnchor
|
||||
Data: HostCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: DefaultWideShotCameraAnchor
|
||||
Data: HostCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1487,16 +1487,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: VideoPlayerCameraAnchor
|
||||
Data: DefaultWideShotCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: VideoPlayerCameraAnchor
|
||||
Data: DefaultWideShotCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1541,16 +1541,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: OpeningCameraAnchor
|
||||
Data: VideoPlayerCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: OpeningCameraAnchor
|
||||
Data: VideoPlayerCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1571,19 +1571,10 @@ MonoBehaviour:
|
||||
Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 94|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 95|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1604,16 +1595,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: AllPlayersViewCameraAnchor
|
||||
Data: OpeningCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: AllPlayersViewCameraAnchor
|
||||
Data: OpeningCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1631,10 +1622,19 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 97|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 98|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
@@ -1658,16 +1658,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: VideoMusicClueCameraAnchor
|
||||
Data: AllPlayersViewCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: VideoMusicClueCameraAnchor
|
||||
Data: AllPlayersViewCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1713,16 +1713,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: ACMECrimenetComputerCameraAnchor
|
||||
Data: VideoMusicClueCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: ACMECrimenetComputerCameraAnchor
|
||||
Data: VideoMusicClueCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1768,16 +1768,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: FilingCabinetCameraAnchor
|
||||
Data: ACMECrimenetComputerCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: FilingCabinetCameraAnchor
|
||||
Data: ACMECrimenetComputerCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1823,16 +1823,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: ModemCameraAnchor
|
||||
Data: FilingCabinetCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: ModemCameraAnchor
|
||||
Data: FilingCabinetCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 73
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1878,16 +1878,71 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _PlayOpening
|
||||
Data: ModemCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: ModemCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
- Name:
|
||||
Entry: 6
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <IsSerialized>k__BackingField
|
||||
Entry: 5
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 113|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _PlayOpening
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _PlayOpening
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 112|System.RuntimeType, mscorlib
|
||||
Data: 115|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: System.Boolean, mscorlib
|
||||
@@ -1896,7 +1951,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 112
|
||||
Data: 115
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1911,20 +1966,20 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
Data: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 114|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 117|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 115|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 118|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1948,16 +2003,16 @@ MonoBehaviour:
|
||||
Data: _PlayOpeningDoorway
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _PlayOpeningDoorway
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 112
|
||||
Data: 115
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 112
|
||||
Data: 115
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1972,20 +2027,20 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 118|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 121|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 119|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 122|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
using UdonSharp;
|
||||
using UnityEngine;
|
||||
using VRC.SDKBase;
|
||||
using VRC.Udon;
|
||||
|
||||
|
||||
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
|
||||
@@ -24,6 +23,7 @@ public class CameraControllerRound1 : CameraControllerBase
|
||||
[SerializeField] public CameraTimedSwitcher AllPlayersAssignStarterPointsTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher MapToHostAndAllPlayersTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher LightningStartToHostAndAllPlayersTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher TheChaseStartToHostAndAllPlayersTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher CorrectToHostAndAllPlayersTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher IncorrectToHostAndAllPlayersTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher ThinkAboutItTimerToggle;
|
||||
@@ -83,8 +83,10 @@ public class CameraControllerRound1 : CameraControllerBase
|
||||
|
||||
Networking.SetOwner(Player, HostAndAllPlayersTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, HostAndIndividualPlayersTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, AllPlayersAssignStarterPointsTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, MapToHostAndAllPlayersTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, LightningStartToHostAndAllPlayersTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, TheChaseStartToHostAndAllPlayersTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, CorrectToHostAndAllPlayersTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, IncorrectToHostAndAllPlayersTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, ThinkAboutItTimerToggle.gameObject);
|
||||
@@ -234,6 +236,12 @@ public class CameraControllerRound1 : CameraControllerBase
|
||||
ActivateCameraSwitcher(LightningStartToHostAndAllPlayersTimerToggle);
|
||||
}
|
||||
|
||||
public void ActivateTheChaseStartToHostAllPlayersCameraSwitcher()
|
||||
{
|
||||
ActivateWideShotCamera();
|
||||
ActivateCameraSwitcher(TheChaseStartToHostAndAllPlayersTimerToggle);
|
||||
}
|
||||
|
||||
public void ActivateCorrectAnswerToHostAllPlayersCameraSwitcher()
|
||||
{
|
||||
ActivateCameraSwitcher(CorrectToHostAndAllPlayersTimerToggle);
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
using UdonSharp;
|
||||
using UnityEngine;
|
||||
using VRC.SDKBase;
|
||||
using VRC.Udon;
|
||||
|
||||
|
||||
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
|
||||
using UdonSharp;
|
||||
using UnityEngine;
|
||||
using VRC.SDK3.UdonNetworkCalling;
|
||||
using VRC.SDKBase;
|
||||
using VRC.Udon;
|
||||
|
||||
|
||||
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
|
||||
@@ -119,6 +117,25 @@ public class CameraControllerRound3 : CameraControllerBase
|
||||
}
|
||||
|
||||
|
||||
public void OverheadCamera_FollowPlayers(string[] Players)
|
||||
{
|
||||
OverheadCameraAnchor.FollowPlayers(Players);
|
||||
}
|
||||
public void OverheadCamera_StopFollowingPlayers()
|
||||
{
|
||||
OverheadCameraAnchor.StopFollowingPlayers();
|
||||
}
|
||||
|
||||
public void FrontCamera_FollowPlayers(string[] Players)
|
||||
{
|
||||
FrontCameraAnchor.FollowPlayers(Players);
|
||||
}
|
||||
public void FrontCamera_StopFollowingPlayers()
|
||||
{
|
||||
FrontCameraAnchor.StopFollowingPlayers();
|
||||
}
|
||||
|
||||
|
||||
private void _OnPlayfieldSwitchTriggerGroupChanged()
|
||||
{
|
||||
PlayfieldSwitchTriggerGroup.SetActive(ActivatePlayfieldSwitchTriggerGroup);
|
||||
|
||||
Reference in New Issue
Block a user