- Improved camera switcher enable/disable code.
- Added new round 1 switchers, and fixed overlap issues with the existing ones. - Improved camera switch buttons on the host panel. - Potato Mode button on the camera host panel now toggles properly. - Potato Mode button renamed to the more appropriate Performance button. - Glass shatter window effect now works from both directions. - Round 1 window looks much prettier. - Added the ability to scroll through overflowing text on the host card. - Improved scrolling on the credits panel.
This commit is contained in:
@@ -71,6 +71,8 @@ public class CameraTimedSwitcher : UdonSharpBehaviour
|
||||
{
|
||||
if (_Active != value)
|
||||
{
|
||||
Debug.Log("[CameraTimedSwitcher] " + gameObject.name + " is now " + (_Active ? "active" : "inactive"));
|
||||
|
||||
_Active = value;
|
||||
_NextCameraIndex = 0;
|
||||
_LoopedOnce = false;
|
||||
|
||||
@@ -44,7 +44,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
Data: 3
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
@@ -116,25 +116,25 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _SwitchToCameraTimer
|
||||
Data: _EnterSwitchFunction
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _SwitchToCameraTimer
|
||||
Data: _EnterSwitchFunction
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 8|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraTimedSwitcher, Assembly-CSharp
|
||||
Data: System.String, mscorlib
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
Data: 8
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -171,6 +171,60 @@ MonoBehaviour:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _ExitSwitchFunction
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ExitSwitchFunction
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 8
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 8
|
||||
- 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 13|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: 13
|
||||
Data:
|
||||
|
||||
@@ -8,14 +8,18 @@ using VRC.SDKBase;
|
||||
public class CameraTimerSwitchTrigger : UdonSharpBehaviour
|
||||
{
|
||||
[SerializeField] private CameraControllerBase _CameraController;
|
||||
[SerializeField] private CameraTimedSwitcher _SwitchToCameraTimer;
|
||||
[SerializeField] private string _EnterSwitchFunction = "";
|
||||
[SerializeField] private string _ExitSwitchFunction = "";
|
||||
|
||||
|
||||
public override void OnPlayerTriggerEnter(VRCPlayerApi Player)
|
||||
{
|
||||
if (Networking.GetOwner(_CameraController.gameObject) == Networking.LocalPlayer)
|
||||
{
|
||||
_SwitchToCameraTimer.Activate = true;
|
||||
if (_EnterSwitchFunction != "")
|
||||
{
|
||||
_CameraController.SendCustomEvent(_EnterSwitchFunction);
|
||||
}
|
||||
}
|
||||
|
||||
base.OnPlayerTriggerEnter(Player);
|
||||
@@ -25,7 +29,10 @@ public class CameraTimerSwitchTrigger : UdonSharpBehaviour
|
||||
{
|
||||
if (Networking.GetOwner(_CameraController.gameObject) == Networking.LocalPlayer)
|
||||
{
|
||||
_SwitchToCameraTimer.Activate = false;
|
||||
if (_ExitSwitchFunction != "")
|
||||
{
|
||||
_CameraController.SendCustomEvent(_ExitSwitchFunction);
|
||||
}
|
||||
}
|
||||
|
||||
base.OnPlayerTriggerExit(Player);
|
||||
|
||||
Reference in New Issue
Block a user