- Fixed line thicknesses for floor maps.
- Fixed a camera issue with reloading a round while round 1 is playing video. - Modem now uses a slightly rougher metal material. - Round 1 and 3 have better handling for switching cameras from video players. - Added a method for checking if a GameManager is initialised. - Added camera switch timers for round 3 ending video and game end. - Added CameraAnchor tracking for waist-down targeting. - Added a method to CameraTimedSwitcher to retrieve a defined switch time.
This commit is contained in:
@@ -74,6 +74,16 @@ public class CameraTimedSwitcher : UdonSharpBehaviour
|
||||
_Timer = 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
public float GetTimeBetweenCuts(int Index)
|
||||
{
|
||||
if (Index >= 0 && Index < _TimeBetweenCuts.Length)
|
||||
{
|
||||
return _TimeBetweenCuts[Index];
|
||||
}
|
||||
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
|
||||
public void SwitchToNextCamera()
|
||||
@@ -83,20 +93,17 @@ public class CameraTimedSwitcher : UdonSharpBehaviour
|
||||
if (_Active)
|
||||
{
|
||||
int CurrentCameraIndex = _NextCameraIndex;
|
||||
Debug.Log("[CameraTimedSwitcher] Current camera index: " + CurrentCameraIndex);
|
||||
|
||||
|
||||
if (CurrentCameraIndex == _LoopPoint && _LoopedOnce)
|
||||
{
|
||||
if (_FirstLoopCallbackObject != null)
|
||||
{
|
||||
Debug.Log("[CameraTimedSwitcher] We're on a new loop and a callback is set; running function " + _FirstLoopCallbackFunction + " on object " + _FirstLoopCallbackObject.gameObject.name + " and deactivating");
|
||||
_FirstLoopCallbackObject.SendCustomEvent(_FirstLoopCallbackFunction);
|
||||
Activate(false);
|
||||
return;
|
||||
}
|
||||
if (!_Loop)
|
||||
{
|
||||
Debug.Log("[CameraTimedSwitcher] On a second loop, but looping is disabled; deactivating");
|
||||
Activate(false);
|
||||
return;
|
||||
}
|
||||
@@ -106,7 +113,6 @@ public class CameraTimedSwitcher : UdonSharpBehaviour
|
||||
if (Function != "")
|
||||
{
|
||||
_CameraController.SendCustomEvent(Function);
|
||||
Debug.Log("[CameraTimedSwitcher] Executing function " + Function);
|
||||
}
|
||||
|
||||
_NextCameraIndex = (_NextCameraIndex + 1) % _SwitchFunctions.Length;
|
||||
@@ -115,12 +121,10 @@ public class CameraTimedSwitcher : UdonSharpBehaviour
|
||||
{
|
||||
_LoopedOnce = true;
|
||||
_NextCameraIndex = _LoopPoint;
|
||||
Debug.Log("[CameraTimedSwitcher] Setting next camera index to loop point " + _LoopPoint);
|
||||
}
|
||||
|
||||
_Timer = _TimeBetweenCuts[Mathf.Min(CurrentCameraIndex, _TimeBetweenCuts.Length - 1)];
|
||||
_AwaitingNextSwitch = true;
|
||||
Debug.Log("[CameraTimedSwitcher] Camera index " + _NextCameraIndex + " will be activated in " + _Timer + " seconds");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ public enum PossibleFollowMethods
|
||||
CloseUp,
|
||||
HeadAndShoulders,
|
||||
HipsUp,
|
||||
HipsDown,
|
||||
FullBody
|
||||
};
|
||||
|
||||
@@ -120,6 +121,15 @@ public class CameraAnchor : UdonSharpBehaviour
|
||||
BonesToTrack[3] = Player.GetBonePosition(HumanBodyBones.RightUpperLeg);
|
||||
return BonesToTrack;
|
||||
}
|
||||
case PossibleFollowMethods.HipsDown:
|
||||
{
|
||||
Vector3[] BonesToTrack = new Vector3[4];
|
||||
BonesToTrack[2] = Player.GetBonePosition(HumanBodyBones.LeftUpperLeg);
|
||||
BonesToTrack[3] = Player.GetBonePosition(HumanBodyBones.RightUpperLeg);
|
||||
BonesToTrack[0] = Player.GetBonePosition(HumanBodyBones.LeftFoot);
|
||||
BonesToTrack[1] = Player.GetBonePosition(HumanBodyBones.RightFoot);
|
||||
return BonesToTrack;
|
||||
}
|
||||
case PossibleFollowMethods.FullBody:
|
||||
{
|
||||
Vector3[] BonesToTrack = new Vector3[4];
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
using CameraSystem;
|
||||
using UdonSharp;
|
||||
using UnityEngine;
|
||||
using VRC.SDKBase;
|
||||
using VRC.Udon;
|
||||
using VRC.Udon.Common;
|
||||
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 24
|
||||
Data: 26
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
@@ -701,25 +701,19 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _CameraAnimator
|
||||
Data: MapToEndingTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CameraAnimator
|
||||
Data: MapToEndingTimerToggle
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 44|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: 44
|
||||
Data: 4
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -734,13 +728,127 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 45|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: FrontOverheadTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: FrontOverheadTimerToggle
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 12
|
||||
- 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: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 48|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: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CameraAnimator
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 50|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Animator, UnityEngine.AnimationModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 50
|
||||
- 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: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 46|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 52|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
@@ -749,7 +857,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -773,13 +881,13 @@ MonoBehaviour:
|
||||
Data: HostStartingCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: HostStartingCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 49|System.RuntimeType, mscorlib
|
||||
Data: 55|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraAnchor, Assembly-CSharp
|
||||
@@ -803,127 +911,19 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 51|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 57|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 52|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: PlayerStartingCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: PlayerStartingCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 49
|
||||
- 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: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 55|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: OverheadCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: OverheadCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 49
|
||||
- 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: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
@@ -947,16 +947,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: FrontCameraAnchor
|
||||
Data: PlayerStartingCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: FrontCameraAnchor
|
||||
Data: PlayerStartingCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 49
|
||||
Data: 55
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1001,16 +1001,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: NewspaperCameraAnchor
|
||||
Data: OverheadCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: NewspaperCameraAnchor
|
||||
Data: OverheadCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 49
|
||||
Data: 55
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1055,16 +1055,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: VideoPlayerCameraAnchor
|
||||
Data: FrontCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: VideoPlayerCameraAnchor
|
||||
Data: FrontCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 49
|
||||
Data: 55
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1109,31 +1109,19 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: HostCameraAnchorSequence
|
||||
Data: NewspaperCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: HostCameraAnchorSequence
|
||||
Data: NewspaperCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 69|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraAnchor[], Assembly-CSharp
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
Entry: 9
|
||||
Data: 55
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 70|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Component[], UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
Entry: 9
|
||||
Data: 4
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1148,19 +1136,64 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 72|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
Data: 70|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: VideoPlayerCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: VideoPlayerCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 55
|
||||
- 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: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
@@ -1184,19 +1217,31 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: PlayerCameraAnchorSequence
|
||||
Data: HostCameraAnchorSequence
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: PlayerCameraAnchorSequence
|
||||
Data: HostCameraAnchorSequence
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 69
|
||||
Entry: 7
|
||||
Data: 75|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraAnchor[], Assembly-CSharp
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 70
|
||||
Entry: 7
|
||||
Data: 76|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Component[], UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1211,13 +1256,76 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 75|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: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 79|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: PlayerCameraAnchorSequence
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: PlayerCameraAnchorSequence
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 75
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 76
|
||||
- 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: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 76|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1241,13 +1349,13 @@ MonoBehaviour:
|
||||
Data: _ActivatePlayfieldSwitchTriggerGroup
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ActivatePlayfieldSwitchTriggerGroup
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 78|System.RuntimeType, mscorlib
|
||||
Data: 84|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: System.Boolean, mscorlib
|
||||
@@ -1256,7 +1364,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 78
|
||||
Data: 84
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1271,19 +1379,19 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 81|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 87|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1307,7 +1415,7 @@ MonoBehaviour:
|
||||
Data: _MarkerCameraAnchorPosition
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _MarkerCameraAnchorPosition
|
||||
@@ -1331,19 +1439,19 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 85|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 91|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1367,16 +1475,16 @@ MonoBehaviour:
|
||||
Data: _PlayIFeelGood
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _PlayIFeelGood
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 78
|
||||
Data: 84
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 78
|
||||
Data: 84
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1391,19 +1499,19 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 88|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 94|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 89|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 95|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1427,16 +1535,16 @@ MonoBehaviour:
|
||||
Data: _PlayDoItRockapella
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _PlayDoItRockapella
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 78
|
||||
Data: 84
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 78
|
||||
Data: 84
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1451,19 +1559,19 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 92|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 98|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 93|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 99|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
|
||||
@@ -19,6 +19,8 @@ public class CameraControllerRound3 : CameraControllerBase
|
||||
[SerializeField] public GameObject PlayfieldSwitchTriggerGroup;
|
||||
[Space]
|
||||
[SerializeField] public CameraTimedSwitcher HostPlayerTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher MapToEndingTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher FrontOverheadTimerToggle;
|
||||
[Space]
|
||||
[SerializeField] public Animator _CameraAnimator;
|
||||
[Space]
|
||||
@@ -80,6 +82,8 @@ public class CameraControllerRound3 : CameraControllerBase
|
||||
Networking.SetOwner(Player, PlayfieldSwitchTriggerGroup);
|
||||
|
||||
Networking.SetOwner(Player, HostPlayerTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, MapToEndingTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, FrontOverheadTimerToggle.gameObject);
|
||||
|
||||
Networking.SetOwner(Player, _CameraAnimator.gameObject);
|
||||
|
||||
@@ -163,6 +167,16 @@ public class CameraControllerRound3 : CameraControllerBase
|
||||
ActivateCameraSwitcher(HostPlayerTimerToggle);
|
||||
}
|
||||
|
||||
public void ActivateMapToEndingCameraSwitcher()
|
||||
{
|
||||
ActivateCameraSwitcher(MapToEndingTimerToggle);
|
||||
}
|
||||
|
||||
public void ActivateFrontOverheadCameraSwitcher()
|
||||
{
|
||||
ActivateCameraSwitcher(FrontOverheadTimerToggle);
|
||||
}
|
||||
|
||||
|
||||
public void PlayIFeelGood(bool Play)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user