ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

- Host card now also uses VRCObjectSync.

Browse Source 
- Host card spawner now switches ownership on interact to prevent sync issues.
- Host card spawner now has an inset square collider to get in the way less.
- Adjusted collision box of location board to not block the host card spawner.
- Phone box cover now closes automatically when round 2 ends.
This commit is contained in:
Jamie Greunbaum 2026-05-15 13:56:37 -04:00
parent 2fa20670ac
commit 1b167390cb
17 changed files with 30461 additions and 29404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Assets/Animations/Jail Phone/Close.anim
View File

@ -19,22 +19,22 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: -90, y: 0, z: 160} value: {x: 0, y: 0, z: 160}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.6666667 time: 0.6666667
value: {x: -90, y: 0, z: 0} value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: -710.98816} inSlope: {x: 0, y: 0, z: -710.98816}
outSlope: {x: 0, y: 0, z: -710.98816} outSlope: {x: 0, y: 0, z: -710.98816}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.04467684} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.04467684}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
@ -81,27 +81,6 @@ AnimationClip:
m_HeightFromFeet: 0 m_HeightFromFeet: 0
m_Mirror: 0 m_Mirror: 0
m_EditorCurves: m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.6666667
value: -90
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2 - serializedVersion: 2
curve: curve:
serializedVersion: 2 serializedVersion: 2

35
Assets/Animations/Jail Phone/Open.anim
View File

@ -19,25 +19,25 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: -90, y: 0, z: 0} value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3 - serializedVersion: 3
time: 0.41666666 time: 0.41666666
value: {x: -90, y: 0, z: 180} value: {x: 0, y: 0, z: 180}
inSlope: {x: 0, y: 0, z: 1310.387} inSlope: {x: 0, y: 0, z: 1310.387}
outSlope: {x: 0, y: 0, z: -461.16153} outSlope: {x: 0, y: 0, z: -461.16153}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.083765104} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.083765104}
outWeight: {x: 0, y: 0.33333334, z: 0.0719978} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.0719978}
- serializedVersion: 3 - serializedVersion: 3
time: 1.1666666 time: 1.1666666
value: {x: -90, y: 0, z: 160} value: {x: 0, y: 0, z: 160}
inSlope: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0 tangentMode: 0
@ -90,27 +90,6 @@ AnimationClip:
m_HeightFromFeet: 0 m_HeightFromFeet: 0
m_Mirror: 0 m_Mirror: 0
m_EditorCurves: m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.41666666
value: -90
inSlope: 0
outSlope: 0
tangentMode: 1
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2 - serializedVersion: 2
curve: curve:
serializedVersion: 2 serializedVersion: 2

BIN
Assets/Models/SM_Phone.fbx
View File

Binary file not shown.

16
Assets/Prefabs/Host Card Spawner.prefab
View File

@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 583779592686493652} - component: {fileID: 583779592686493652}
- component: {fileID: 7553974903287998836} - component: {fileID: 202827725453665762}
- component: {fileID: 4067872519216286117} - component: {fileID: 4067872519216286117}
- component: {fileID: 3675447201977067804} - component: {fileID: 3675447201977067804}
m_Layer: 0 m_Layer: 0
@ -27,15 +27,15 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8172070431878381391} m_GameObject: {fileID: 8172070431878381391}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071068} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.6499994, y: 1.46305, z: -0.09999871} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &7553974903287998836 --- !u!65 &202827725453665762
SphereCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@ -53,8 +53,8 @@ SphereCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 0 m_Enabled: 0
serializedVersion: 3 serializedVersion: 3
m_Radius: 0.1 m_Size: {x: 0.2882356, y: 0.17041832, z: 0.0018917358}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0.0025}
--- !u!114 &4067872519216286117 --- !u!114 &4067872519216286117
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -78,7 +78,7 @@ MonoBehaviour:
SerializationNodes: [] SerializationNodes: []
_udonSharpBackingUdonBehaviour: {fileID: 3675447201977067804} _udonSharpBackingUdonBehaviour: {fileID: 3675447201977067804}
_HostCard: {fileID: 0} _HostCard: {fileID: 0}
_InteractiveCollider: {fileID: 7553974903287998836} _InteractiveCollider: {fileID: 202827725453665762}
--- !u!114 &3675447201977067804 --- !u!114 &3675447201977067804
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

28644
Assets/Prefabs/Host Card.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/Host Card.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f6465f2b41241f04a9645838d2b9d511
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/Prefabs/Phone.prefab
View File

@ -289,6 +289,7 @@ MonoBehaviour:
_GameManager: {fileID: 0} _GameManager: {fileID: 0}
_PhoneObjectSync: {fileID: 6810253013611224781} _PhoneObjectSync: {fileID: 6810253013611224781}
_PhonePickup: {fileID: 1223336681658523664} _PhonePickup: {fileID: 1223336681658523664}
_PhoneBoxCoverAnimator: {fileID: 46381774273635150}
--- !u!114 &485089789795895798 --- !u!114 &485089789795895798
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -471,10 +472,10 @@ CapsuleCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Radius: 0.040609214 m_Radius: 0.0004060921
m_Height: 0.29521763 m_Height: 0.002952176
m_Direction: 1 m_Direction: 2
m_Center: {x: 0, y: -0.062605865, z: 0.08088123} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &1223336681658523664 --- !u!114 &1223336681658523664
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -493,8 +494,8 @@ MonoBehaviour:
ExactGrip: {fileID: 0} ExactGrip: {fileID: 0}
allowManipulationWhenEquipped: 1 allowManipulationWhenEquipped: 1
orientation: 1 orientation: 1
AutoHold: 1 AutoHold: 2
InteractionText: InteractionText: Pick Up
UseText: Pick Up UseText: Pick Up
useEventBroadcastType: 0 useEventBroadcastType: 0
UseDownEventName: UseDownEventName:
@ -506,8 +507,8 @@ MonoBehaviour:
ThrowVelocityBoostScale: 1 ThrowVelocityBoostScale: 1
currentlyHeldBy: {fileID: 0} currentlyHeldBy: {fileID: 0}
pickupable: 0 pickupable: 0
proximity: 2 proximity: 1
version: 0 version: 1
--- !u!114 &6810253013611224781 --- !u!114 &6810253013611224781
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -546,6 +547,7 @@ MonoBehaviour:
_udonSharpBackingUdonBehaviour: {fileID: 6720682060280260394} _udonSharpBackingUdonBehaviour: {fileID: 6720682060280260394}
_CallbackObject: {fileID: 3398338131143117589} _CallbackObject: {fileID: 3398338131143117589}
_OnPickupCallbackFunction: JailPhonePickedUp _OnPickupCallbackFunction: JailPhonePickedUp
_OnDropCallbackFunction:
_UseDownCallbackFunction: _UseDownCallbackFunction:
_UseUpCallbackFunction: _UseUpCallbackFunction:
--- !u!114 &6720682060280260394 --- !u!114 &6720682060280260394

30260
Assets/Scenes/witwics.unity
View File

File diff suppressed because it is too large Load Diff

551
Assets/UdonSharp/Host Card Interfaces/HostCardManager.asset
View File

@ -116,16 +116,76 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _BetweenRoundsInterface Data: _PickupComponent
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _BetweenRoundsInterface Data: _PickupComponent
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 8|System.RuntimeType, mscorlib Data: 8|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: VRC.SDK3.Components.VRCPickup, VRCSDK3
- Name:
Entry: 8
Data:
- 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: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 10|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: _BetweenRoundsInterface
- Name: $v
Entry: 7
Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _BetweenRoundsInterface
- Name: <UserType>k__BackingField
Entry: 7
Data: 12|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: HostCardBetweenRoundsInterface, Assembly-CSharp Data: HostCardBetweenRoundsInterface, Assembly-CSharp
@ -149,88 +209,28 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 2 Data: 3
- Name: - Name:
Entry: 7 Entry: 7
Data: 10|UnityEngine.HeaderAttribute, UnityEngine.CoreModule Data: 14|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: UI
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 11|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: _MultipleChoiceInterface
- Name: $v
Entry: 7
Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _MultipleChoiceInterface
- Name: <UserType>k__BackingField
Entry: 7
Data: 13|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: HostCardMultipleChoiceInterface, Assembly-CSharp
- Name:
Entry: 8
Data:
- 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: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 15|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height - Name: height
Entry: 4 Entry: 4
Data: 8 Data: 8
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name:
Entry: 7
Data: 15|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: UI
- Name:
Entry: 8
Data:
- Name: - Name:
Entry: 7 Entry: 7
Data: 16|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 16|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -254,19 +254,19 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _LightningRoundInterface Data: _MultipleChoiceInterface
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _LightningRoundInterface Data: _MultipleChoiceInterface
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 18|System.RuntimeType, mscorlib Data: 18|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: HostCardLightningRoundInterface, Assembly-CSharp Data: HostCardMultipleChoiceInterface, Assembly-CSharp
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -288,12 +288,81 @@ MonoBehaviour:
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 20|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 21|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: _LightningRoundInterface
- Name: $v
Entry: 7
Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _LightningRoundInterface
- Name: <UserType>k__BackingField
Entry: 7
Data: 23|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: HostCardLightningRoundInterface, Assembly-CSharp
- Name:
Entry: 8
Data:
- 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: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 20|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -317,13 +386,13 @@ MonoBehaviour:
Data: _TheChaseInterface Data: _TheChaseInterface
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _TheChaseInterface Data: _TheChaseInterface
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 22|System.RuntimeType, mscorlib Data: 27|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: HostCardTheChaseInterface, Assembly-CSharp Data: HostCardTheChaseInterface, Assembly-CSharp
@ -347,13 +416,13 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 24|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -377,13 +446,13 @@ MonoBehaviour:
Data: _TiebreakerInterface Data: _TiebreakerInterface
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _TiebreakerInterface Data: _TiebreakerInterface
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 26|System.RuntimeType, mscorlib Data: 31|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: HostCardTiebreakerInterface, Assembly-CSharp Data: HostCardTiebreakerInterface, Assembly-CSharp
@ -407,79 +476,10 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name:
Entry: 7
Data: 28|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: _RecoverTheLootExplainerInterface
- Name: $v
Entry: 7
Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _RecoverTheLootExplainerInterface
- Name: <UserType>k__BackingField
Entry: 7
Data: 30|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: HostCardRecoverTheLootExplainerInterface, Assembly-CSharp
- Name:
Entry: 8
Data:
- 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: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 32|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name: - Name:
Entry: 7 Entry: 7
Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -503,19 +503,19 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _RecoverTheLootInterface Data: _RecoverTheLootExplainerInterface
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _RecoverTheLootInterface Data: _RecoverTheLootExplainerInterface
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 35|System.RuntimeType, mscorlib Data: 35|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: HostCardRecoverTheLootInterface, Assembly-CSharp Data: HostCardRecoverTheLootExplainerInterface, Assembly-CSharp
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -537,12 +537,81 @@ MonoBehaviour:
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 37|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 38|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: _RecoverTheLootInterface
- Name: $v
Entry: 7
Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _RecoverTheLootInterface
- Name: <UserType>k__BackingField
Entry: 7
Data: 40|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: HostCardRecoverTheLootInterface, Assembly-CSharp
- Name:
Entry: 8
Data:
- 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: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 37|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -566,13 +635,13 @@ MonoBehaviour:
Data: _RecoverTheLootEndInterface Data: _RecoverTheLootEndInterface
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _RecoverTheLootEndInterface Data: _RecoverTheLootEndInterface
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 39|System.RuntimeType, mscorlib Data: 44|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: HostCardRecoverTheLootEndInterface, Assembly-CSharp Data: HostCardRecoverTheLootEndInterface, Assembly-CSharp
@ -596,79 +665,10 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name:
Entry: 7
Data: 41|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: _CaptureCarmenExplainerInterface
- Name: $v
Entry: 7
Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CaptureCarmenExplainerInterface
- Name: <UserType>k__BackingField
Entry: 7
Data: 43|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: HostCardCaptureCarmenExplainerInterface, Assembly-CSharp
- Name:
Entry: 8
Data:
- 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: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 45|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name: - Name:
Entry: 7 Entry: 7
Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -692,19 +692,19 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CaptureCarmenInterface Data: _CaptureCarmenExplainerInterface
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CaptureCarmenInterface Data: _CaptureCarmenExplainerInterface
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 48|System.RuntimeType, mscorlib Data: 48|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: HostCardCaptureCarmenInterface, Assembly-CSharp Data: HostCardCaptureCarmenExplainerInterface, Assembly-CSharp
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -728,10 +728,19 @@ MonoBehaviour:
Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 2
- Name: - Name:
Entry: 7 Entry: 7
Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 50|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -752,19 +761,19 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _AdminPanelInterface Data: _CaptureCarmenInterface
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _AdminPanelInterface Data: _CaptureCarmenInterface
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 52|System.RuntimeType, mscorlib Data: 53|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: HostPanelInterface, Assembly-CSharp Data: HostCardCaptureCarmenInterface, Assembly-CSharp
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -785,19 +794,10 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 2 Data: 1
- Name:
Entry: 7
Data: 54|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name: - Name:
Entry: 7 Entry: 7
Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -821,25 +821,25 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _InteractionText Data: _AdminPanelInterface
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _InteractionText Data: _AdminPanelInterface
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 57|System.RuntimeType, mscorlib Data: 57|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro Data: HostPanelInterface, Assembly-CSharp
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 57 Data: 4
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -890,19 +890,19 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _PickupComponent Data: _InteractionText
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _PickupComponent Data: _InteractionText
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 62|System.RuntimeType, mscorlib Data: 62|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: VRC.SDK3.Components.VRCPickup, VRCSDK3 Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -920,13 +920,28 @@ MonoBehaviour:
Data: Data:
- Name: <IsSerialized>k__BackingField - Name: <IsSerialized>k__BackingField
Entry: 5 Entry: 5
Data: false Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 0 Data: 2
- Name:
Entry: 7
Data: 64|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name: - Name:
Entry: 13 Entry: 13
Data: Data:
@ -947,13 +962,13 @@ MonoBehaviour:
Data: _IsBeingHeld Data: _IsBeingHeld
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _IsBeingHeld Data: _IsBeingHeld
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 65|System.RuntimeType, mscorlib Data: 67|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: System.Boolean, mscorlib Data: System.Boolean, mscorlib
@ -962,7 +977,7 @@ MonoBehaviour:
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 65 Data: 67
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -977,7 +992,7 @@ MonoBehaviour:
Data: false Data: false
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 0 Data: 0
@ -1001,13 +1016,13 @@ MonoBehaviour:
Data: _StoredJumpImpulse Data: _StoredJumpImpulse
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _StoredJumpImpulse Data: _StoredJumpImpulse
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 68|System.RuntimeType, mscorlib Data: 70|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: System.Single, mscorlib Data: System.Single, mscorlib
@ -1016,7 +1031,7 @@ MonoBehaviour:
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 68 Data: 70
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -1031,7 +1046,7 @@ MonoBehaviour:
Data: false Data: false
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 0 Data: 0

30
Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs
View File

@ -11,8 +11,9 @@ using VRC.Udon.Common;
public class HostCardManager : UdonSharpBehaviour public class HostCardManager : UdonSharpBehaviour
{ {
[SerializeField] private GameManagerBase _GameManager; [SerializeField] private GameManagerBase _GameManager;
[SerializeField] private VRCPickup _PickupComponent;
[Header("UI")] [Space, Header("UI")]
[SerializeField] private HostCardBetweenRoundsInterface _BetweenRoundsInterface; [SerializeField] private HostCardBetweenRoundsInterface _BetweenRoundsInterface;
[Space] [Space]
@ -41,37 +42,26 @@ public class HostCardManager : UdonSharpBehaviour
[SerializeField] private TextMeshProUGUI _InteractionText; [SerializeField] private TextMeshProUGUI _InteractionText;
private VRCPickup _PickupComponent;
private bool _IsBeingHeld = false; private bool _IsBeingHeld = false;
private float _StoredJumpImpulse = 0.0f; private float _StoredJumpImpulse = 0.0f;
void Start() public void HostCardPickedUp()
{
_PickupComponent = GetComponent<VRCPickup>();
}
public override void OnPickup()
{ {
_StoredJumpImpulse = Networking.LocalPlayer.GetJumpImpulse(); _StoredJumpImpulse = Networking.LocalPlayer.GetJumpImpulse();
Networking.LocalPlayer.SetJumpImpulse(0.0f); Networking.LocalPlayer.SetJumpImpulse(0.0f);
_IsBeingHeld = true; _IsBeingHeld = true;
_InteractionText.gameObject.SetActive(true); _InteractionText.gameObject.SetActive(true);
base.OnPickup();
} }
public override void OnDrop() public void HostCardDropped()
{ {
Networking.LocalPlayer.SetJumpImpulse(_StoredJumpImpulse); Networking.LocalPlayer.SetJumpImpulse(_StoredJumpImpulse);
_StoredJumpImpulse = 0.0f; _StoredJumpImpulse = 0.0f;
_IsBeingHeld = false; _IsBeingHeld = false;
_InteractionText.gameObject.SetActive(false); _InteractionText.gameObject.SetActive(false);
base.OnDrop();
} }
public override void InputJump(bool Value, UdonInputEventArgs Args) public override void InputJump(bool Value, UdonInputEventArgs Args)
@ -106,24 +96,16 @@ public class HostCardManager : UdonSharpBehaviour
} }
public override void OnPickupUseDown() public void HostCardUseDown()
{ {
if (_GameManager) _GameManager.HostCardUseButtonDown(); if (_GameManager) _GameManager.HostCardUseButtonDown();
base.OnPickupUseDown();
} }
public void EnablePickup(bool Enable) public void EnablePickup(bool Enable)
{ {
_PickupComponent.pickupable = Enable; _PickupComponent.pickupable = Enable;
if (Networking.LocalPlayer.IsUserInVR()) _PickupComponent.AutoHold = Networking.LocalPlayer.IsUserInVR() ? VRC_Pickup.AutoHoldMode.No : VRC_Pickup.AutoHoldMode.Yes;
{
_PickupComponent.AutoHold = VRC_Pickup.AutoHoldMode.No;
}
else
{
_PickupComponent.AutoHold = VRC_Pickup.AutoHoldMode.Yes;
}
} }

26
Assets/UdonSharp/HostCardSpawner.asset
View File

@ -62,19 +62,13 @@ MonoBehaviour:
Data: 3|System.RuntimeType, mscorlib Data: 3|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: HostCardManager, Assembly-CSharp Data: UnityEngine.GameObject, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 7 Entry: 9
Data: 4|System.RuntimeType, mscorlib Data: 3
- Name:
Entry: 1
Data: VRC.Udon.UdonBehaviour, VRC.Udon
- Name:
Entry: 8
Data:
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -89,13 +83,13 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -119,13 +113,13 @@ MonoBehaviour:
Data: _InteractiveCollider Data: _InteractiveCollider
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _InteractiveCollider Data: _InteractiveCollider
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 8|System.RuntimeType, mscorlib Data: 7|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: UnityEngine.Collider, UnityEngine.PhysicsModule Data: UnityEngine.Collider, UnityEngine.PhysicsModule
@ -134,7 +128,7 @@ MonoBehaviour:
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 8 Data: 7
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -149,13 +143,13 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 9|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:

6
Assets/UdonSharp/HostCardSpawner.cs
View File

@ -2,18 +2,20 @@
using UdonSharp; using UdonSharp;
using UnityEngine; using UnityEngine;
using VRC.SDKBase; using VRC.SDKBase;
using VRC.Udon;
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
public class HostCardSpawner : UdonSharpBehaviour public class HostCardSpawner : UdonSharpBehaviour
{ {
[SerializeField] private HostCardManager _HostCard; [SerializeField] private GameObject _HostCard;
[SerializeField] private Collider _InteractiveCollider; [SerializeField] private Collider _InteractiveCollider;
public override void Interact() public override void Interact()
{ {
Networking.SetOwner(Networking.LocalPlayer, gameObject);
Networking.SetOwner(Networking.LocalPlayer, _HostCard);
_HostCard.transform.parent = transform; _HostCard.transform.parent = transform;
_HostCard.transform.localPosition = Vector3.zero; _HostCard.transform.localPosition = Vector3.zero;
_HostCard.transform.localRotation = Quaternion.identity; _HostCard.transform.localRotation = Quaternion.identity;

66
Assets/UdonSharp/Interacts/PickupUseCallback.asset
View File

@ -19,7 +19,7 @@ MonoBehaviour:
sourceCsScript: {fileID: 11500000, guid: 2b02b023f226de14f9feb829806abc3c, type: 3} sourceCsScript: {fileID: 11500000, guid: 2b02b023f226de14f9feb829806abc3c, type: 3}
scriptVersion: 2 scriptVersion: 2
compiledVersion: 2 compiledVersion: 2
behaviourSyncMode: 2 behaviourSyncMode: 1
hasInteractEvent: 0 hasInteractEvent: 0
scriptID: 219769535263690462 scriptID: 219769535263690462
serializationData: serializationData:
@ -44,7 +44,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 12 Entry: 12
Data: 4 Data: 5
- Name: - Name:
Entry: 7 Entry: 7
Data: Data:
@ -185,13 +185,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _UseDownCallbackFunction Data: _OnDropCallbackFunction
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _UseDownCallbackFunction Data: _OnDropCallbackFunction
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 8 Data: 8
@ -239,13 +239,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _UseUpCallbackFunction Data: _UseDownCallbackFunction
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _UseUpCallbackFunction Data: _UseDownCallbackFunction
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 8 Data: 8
@ -288,6 +288,60 @@ MonoBehaviour:
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _UseUpCallbackFunction
- Name: $v
Entry: 7
Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _UseUpCallbackFunction
- 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: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 20|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: - Name:
Entry: 13 Entry: 13
Data: Data:

13
Assets/UdonSharp/Interacts/PickupUseCallback.cs
View File

@ -4,12 +4,13 @@ using UnityEngine;
using VRC.SDKBase; using VRC.SDKBase;
[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)] [UdonBehaviourSyncMode(BehaviourSyncMode.None)]
public class PickupUseCallback : UdonSharpBehaviour public class PickupUseCallback : UdonSharpBehaviour
{ {
[SerializeField] private UdonSharpBehaviour _CallbackObject; [SerializeField] private UdonSharpBehaviour _CallbackObject;
[Space] [Space]
[SerializeField] private string _OnPickupCallbackFunction; [SerializeField] private string _OnPickupCallbackFunction;
[SerializeField] private string _OnDropCallbackFunction;
[SerializeField] private string _UseDownCallbackFunction; [SerializeField] private string _UseDownCallbackFunction;
[SerializeField] private string _UseUpCallbackFunction; [SerializeField] private string _UseUpCallbackFunction;
@ -24,6 +25,16 @@ public class PickupUseCallback : UdonSharpBehaviour
base.OnPickup(); base.OnPickup();
} }
public override void OnDrop()
{
if (_OnDropCallbackFunction != "" && Utilities.IsValid(_CallbackObject))
{
_CallbackObject.SendCustomEvent(_OnDropCallbackFunction);
}
base.OnDrop();
}
public override void OnPickupUseDown() public override void OnPickupUseDown()
{ {
if (_UseDownCallbackFunction != "" && Utilities.IsValid(_CallbackObject)) if (_UseDownCallbackFunction != "" && Utilities.IsValid(_CallbackObject))

119
Assets/UdonSharp/JailPhone.asset
View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 12 Entry: 12
Data: 7 Data: 8
- Name: - Name:
Entry: 7 Entry: 7
Data: Data:
@ -116,25 +116,25 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _PhoneObjectSync Data: _PermissionsPanel
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _PhoneObjectSync Data: _PermissionsPanel
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 8|System.RuntimeType, mscorlib Data: 8|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: VRC.SDK3.Components.VRCObjectSync, VRCSDK3 Data: PermissionsPanel, Assembly-CSharp
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 8 Data: 4
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -210,12 +210,81 @@ MonoBehaviour:
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 14|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 15|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: _PhoneBoxCoverAnimator
- Name: $v
Entry: 7
Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _PhoneBoxCoverAnimator
- Name: <UserType>k__BackingField
Entry: 7
Data: 17|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Animator, UnityEngine.AnimationModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 17
- 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: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -239,13 +308,13 @@ MonoBehaviour:
Data: _Active Data: _Active
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _Active Data: _Active
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 16|System.RuntimeType, mscorlib Data: 21|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: System.Boolean, mscorlib Data: System.Boolean, mscorlib
@ -254,7 +323,7 @@ MonoBehaviour:
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 16 Data: 21
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -269,13 +338,13 @@ MonoBehaviour:
Data: false Data: false
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 18|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime Data: 23|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -299,13 +368,13 @@ MonoBehaviour:
Data: _CallRecipient Data: _CallRecipient
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CallRecipient Data: _CallRecipient
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 20|System.RuntimeType, mscorlib Data: 25|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: System.String, mscorlib Data: System.String, mscorlib
@ -314,7 +383,7 @@ MonoBehaviour:
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 20 Data: 25
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -329,13 +398,13 @@ MonoBehaviour:
Data: false Data: false
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime Data: 27|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -359,16 +428,16 @@ MonoBehaviour:
Data: _CallHasBeenPlayed Data: _CallHasBeenPlayed
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CallHasBeenPlayed Data: _CallHasBeenPlayed
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 16 Data: 21
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 16 Data: 21
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -383,13 +452,13 @@ MonoBehaviour:
Data: false Data: false
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 25|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime Data: 30|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -413,16 +482,16 @@ MonoBehaviour:
Data: _Active_Cached Data: _Active_Cached
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _Active_Cached Data: _Active_Cached
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 16 Data: 21
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 16 Data: 21
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -437,7 +506,7 @@ MonoBehaviour:
Data: false Data: false
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 0 Data: 0

41
Assets/UdonSharp/JailPhone.cs
View File

@ -11,8 +11,10 @@ using VRC.Udon.Common.Interfaces;
public class JailPhone : UdonSharpBehaviour public class JailPhone : UdonSharpBehaviour
{ {
[SerializeField] private GameManagerRound2 _GameManager; [SerializeField] private GameManagerRound2 _GameManager;
[SerializeField] private VRCObjectSync _PhoneObjectSync; [SerializeField] private PermissionsPanel _PermissionsPanel;
[Space]
[SerializeField] private VRCPickup _PhonePickup; [SerializeField] private VRCPickup _PhonePickup;
[SerializeField] private Animator _PhoneBoxCoverAnimator;
[UdonSynced] private bool _Active = false; [UdonSynced] private bool _Active = false;
[UdonSynced] private string _CallRecipient = ""; [UdonSynced] private string _CallRecipient = "";
@ -24,14 +26,29 @@ public class JailPhone : UdonSharpBehaviour
public override void OnDeserialization(DeserializationResult Result) public override void OnDeserialization(DeserializationResult Result)
{ {
_Activate_Synced(); _Activate_Synced();
base.OnDeserialization(Result); base.OnDeserialization(Result);
} }
public override void OnOwnershipTransferred(VRCPlayerApi Player)
{
Networking.SetOwner(Player, _PhonePickup.gameObject);
base.OnOwnershipTransferred(Player);
}
public void HostEnabled()
{
_ResetPickupability();
}
public void HostDisabled()
{
_ResetPickupability();
}
public void JailPhonePickedUp() public void JailPhonePickedUp()
{ {
VRCPlayerApi LocalPlayer = Networking.LocalPlayer; VRCPlayerApi LocalPlayer = Networking.LocalPlayer;
Networking.SetOwner(LocalPlayer, gameObject);
if (LocalPlayer.displayName == _CallRecipient) if (LocalPlayer.displayName == _CallRecipient)
{ {
PlayJailCall(); PlayJailCall();
@ -51,11 +68,14 @@ public class JailPhone : UdonSharpBehaviour
public void Activate(bool Active, string CallRecipient = "") public void Activate(bool Active, string CallRecipient = "")
{ {
Networking.SetOwner(Networking.LocalPlayer, _PhonePickup.gameObject);
if (_GameManager.IsRoundInitialised()) if (_GameManager.IsRoundInitialised())
{ {
_Active = Active; _Active = Active;
_CallRecipient = CallRecipient; _CallRecipient = CallRecipient;
_Activate_Synced(); _Activate_Synced();
RequestSerialization(); RequestSerialization();
} }
} }
@ -63,23 +83,28 @@ public class JailPhone : UdonSharpBehaviour
{ {
if (_Active != _Active_Cached) if (_Active != _Active_Cached)
{ {
_PhoneObjectSync.enabled = _Active;
if (_Active) if (_Active)
{ {
_GameManager.PhoneRing(); _GameManager.PhoneRing();
} }
else else
{ {
_PhoneObjectSync.transform.localPosition = Vector3.zero; _PhonePickup.transform.localPosition = Vector3.zero;
_PhoneObjectSync.transform.localRotation = Quaternion.identity; _PhonePickup.transform.localRotation = Quaternion.identity;
_PhoneBoxCoverAnimator.SetBool("Open", false);
} }
} }
_PhonePickup.pickupable = _Active && (Networking.LocalPlayer == _GameManager.GetHostOwner() || Networking.LocalPlayer.displayName == _CallRecipient); _ResetPickupability();
_Active_Cached = _Active; _Active_Cached = _Active;
} }
private void _ResetPickupability()
{
_PhonePickup.AutoHold = Networking.LocalPlayer.IsUserInVR() ? VRC_Pickup.AutoHoldMode.No : VRC_Pickup.AutoHoldMode.Yes;
_PhonePickup.pickupable = _Active && (Networking.LocalPlayer.displayName == _CallRecipient || _PermissionsPanel.IsPlayerHost(Networking.LocalPlayer));
}
private void PlayJailCall() private void PlayJailCall()

BIN
Raw Files/Phone.blend
View File

Binary file not shown.