- CameraAnchor can now have camera rotation offsets as well as FOV changes.

- CameraAnchor no longer needs to sync with LightSync, and so does not.
- Added noise texture to velvet rope material.
- Improved lightmaps on velvet rope model.
- Round 1 podiums now return empty strings when no player owns them.
- Winning player camera in round 2 now has rotation offset for a later effect.
- Jail phone syncs active status better, and finds a player to follow better.
This commit is contained in:
Jamie Greunbaum 2026-05-05 03:58:58 -04:00
parent 9cda4eaf7c
commit 7b113a5c8a
35 changed files with 517 additions and 550 deletions

View File

@ -22,34 +22,34 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: -0.06256307}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.16145308}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.3333334
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: -0}
outSlope: {x: 0, y: 0, z: -0.1135807}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: -0.13260512}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.2667992}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.17743969}
- serializedVersion: 3
time: 1.8333334
value: {x: 1, y: 1, z: 0.4}
inSlope: {x: 0, y: 0, z: -2.9403248}
outSlope: {x: 0, y: 0, z: 0}
value: {x: 1, y: 1, z: 0.25}
inSlope: {x: 0, y: 0, z: -3.3267188}
outSlope: {x: 0, y: 0, z: -3.3267188}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.09893775}
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.090620995}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Alternate Camera Anchors/Modem Camera Anchor/Camera FOV Scaler
path: Alternate Camera Anchors/Modem Camera Anchor/Camera Modifier
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
@ -60,7 +60,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 2239202214
path: 3153321509
attribute: 3
script: {fileID: 0}
typeID: 4
@ -97,35 +97,35 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 1
inSlope: -0.06256307
inSlope: 0
outSlope: 0
tangentMode: 65
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.16145308
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3333334
value: 1
inSlope: -0
outSlope: -0.1135807
tangentMode: 5
inSlope: 0
outSlope: -0.13260512
tangentMode: 1
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.2667992
outWeight: 0.17743969
- serializedVersion: 3
time: 1.8333334
value: 0.4
inSlope: -2.9403248
outSlope: 0
tangentMode: 65
value: 0.25
inSlope: -3.3267188
outSlope: -3.3267188
tangentMode: 0
weightedMode: 0
inWeight: 0.09893775
inWeight: 0.090620995
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: Alternate Camera Anchors/Modem Camera Anchor/Camera FOV Scaler
path: Alternate Camera Anchors/Modem Camera Anchor/Camera Modifier
classID: 4
script: {fileID: 0}
flags: 0

View File

@ -21,35 +21,35 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1, y: 1, z: 0.4}
inSlope: {x: 0, y: 0, z: -0.5630838}
value: {x: 1, y: 1, z: 0.25}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.11660179}
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.6666666
value: {x: 1, y: 1, z: 0.4}
inSlope: {x: 0, y: 0, z: -0}
outSlope: {x: 0, y: 0, z: 0.07339278}
value: {x: 1, y: 1, z: 0.25}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0.078221895}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.16056776}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.22560209}
- serializedVersion: 3
time: 2.1666667
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 2.6514857}
outSlope: {x: 0, y: 0, z: 2.6514857}
inSlope: {x: 0, y: 0, z: 2.741352}
outSlope: {x: 0, y: 0, z: 2.741352}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.10057256}
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.11533591}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Modem Camera Anchor/Camera FOV Scaler
path: Modem Camera Anchor/Camera Modifier
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
@ -60,7 +60,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1570307574
path: 1443062508
attribute: 3
script: {fileID: 0}
typeID: 4
@ -96,36 +96,36 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.4
inSlope: -0.5630838
value: 0.25
inSlope: 0
outSlope: 0
tangentMode: 65
tangentMode: 136
weightedMode: 0
inWeight: 0.11660179
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6666666
value: 0.4
inSlope: -0
outSlope: 0.07339278
tangentMode: 5
value: 0.25
inSlope: 0
outSlope: 0.078221895
tangentMode: 1
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.16056776
outWeight: 0.22560209
- serializedVersion: 3
time: 2.1666667
value: 1
inSlope: 2.6514857
outSlope: 2.6514857
inSlope: 2.741352
outSlope: 2.741352
tangentMode: 0
weightedMode: 0
inWeight: 0.10057256
inWeight: 0.11533591
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: Modem Camera Anchor/Camera FOV Scaler
path: Modem Camera Anchor/Camera Modifier
classID: 4
script: {fileID: 0}
flags: 0

View File

@ -72,25 +72,25 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: 1, y: 1, z: 0.4}
inSlope: {x: 0, y: 0, z: 0.847138}
outSlope: {x: 0, y: 0, z: 0.847138}
inSlope: {x: 0, y: 0, z: 0.83526653}
outSlope: {x: 0, y: 0, z: 0.83526653}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.04411765}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.20247148}
- serializedVersion: 3
time: 2
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0.062066503}
outSlope: {x: 0, y: 0, z: 0.062066503}
inSlope: {x: 0, y: 0, z: 0.047847085}
outSlope: {x: 0, y: 0, z: 0.047847085}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.08137256}
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.092205346}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Overhead Camera Anchor/Camera FOV Scaler
path: Overhead Camera Anchor/Camera Modifier
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
@ -119,7 +119,7 @@ AnimationClip:
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 1531435860
path: 3279739263
attribute: 3
script: {fileID: 0}
typeID: 4
@ -329,66 +329,6 @@ AnimationClip:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: Overhead Camera Anchor/Camera FOV Scaler
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: Overhead Camera Anchor/Camera FOV Scaler
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
@ -396,26 +336,26 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0.4
inSlope: 0.847138
outSlope: 0.847138
inSlope: 0.83526653
outSlope: 0.83526653
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.04411765
outWeight: 0.20247148
- serializedVersion: 3
time: 2
value: 1
inSlope: 0.062066503
outSlope: 0.062066503
inSlope: 0.047847085
outSlope: 0.047847085
tangentMode: 0
weightedMode: 0
inWeight: 0.08137256
inWeight: 0.092205346
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: Overhead Camera Anchor/Camera FOV Scaler
path: Overhead Camera Anchor/Camera Modifier
classID: 4
script: {fileID: 0}
flags: 0

View File

@ -89,7 +89,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1, y: 1, z: 1}
value: {x: 1, y: 1, z: 0.75}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -97,18 +97,27 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 4.5
value: {x: 1, y: 1, z: 1}
time: 0.33333334
value: {x: 1, y: 1, z: 0.75}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0.018257992}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.14213821}
- serializedVersion: 3
time: 1.75
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0.021576764}
outSlope: {x: 0, y: 0, z: 0.021576764}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.16036682}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Overhead Camera Anchor/Camera FOV Scaler
path: Overhead Camera Anchor/Camera Modifier
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
@ -137,7 +146,7 @@ AnimationClip:
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 1531435860
path: 3279739263
attribute: 3
script: {fileID: 0}
typeID: 4
@ -407,7 +416,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 0.75
inSlope: 0
outSlope: 0
tangentMode: 136
@ -415,79 +424,28 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.5
value: 1
time: 0.33333334
value: 0.75
inSlope: 0
outSlope: 0
tangentMode: 136
outSlope: 0.018257992
tangentMode: 1
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: Overhead Camera Anchor/Camera FOV Scaler
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
outWeight: 0.14213821
- serializedVersion: 3
time: 0
time: 1.75
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
inSlope: 0.021576764
outSlope: 0.021576764
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: Overhead Camera Anchor/Camera FOV Scaler
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 4.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
inWeight: 0.16036682
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: Overhead Camera Anchor/Camera FOV Scaler
path: Overhead Camera Anchor/Camera Modifier
classID: 4
script: {fileID: 0}
flags: 0

View File

@ -12,6 +12,7 @@ Material:
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DETAIL
- _ENABLE_GEOMETRIC_SPECULAR_AA
- _GLOSSYREFLECTIONS_OFF
m_InvalidKeywords:
@ -31,8 +32,8 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Texture: {fileID: 2800000, guid: cb072d3765e9cf443b3c71b63f2c4b9c, type: 3}
m_Scale: {x: 60, y: 60}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}

Binary file not shown.

View File

@ -92,8 +92,9 @@ MonoBehaviour:
FOV: 60
NearClippingPlane: 0.3
FarClippingPlane: 1000
CameraRoot: {fileID: 6802575006468162178}
CameraFOVScaler: {fileID: 4789832517991542133}
_CameraRoot: {fileID: 6802575006468162178}
_CameraModifier: {fileID: 4789832517991542133}
FollowMethod: 0
--- !u!114 &4941474114823655580
MonoBehaviour:
m_ObjectHideFlags: 0
@ -130,7 +131,7 @@ GameObject:
m_Component:
- component: {fileID: 4789832517991542133}
m_Layer: 0
m_Name: Camera FOV Scaler
m_Name: Camera Modifier
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

View File

@ -325,6 +325,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 21599afa6ab27574182496d3ebe3232c,
type: 3}
propertyPath: m_CastShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 21599afa6ab27574182496d3ebe3232c,
type: 3}
propertyPath: m_Materials.Array.data[0]
@ -335,6 +340,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 565668218006355825, guid: 21599afa6ab27574182496d3ebe3232c,
type: 3}
propertyPath: m_CastShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: 565668218006355825, guid: 21599afa6ab27574182496d3ebe3232c,
type: 3}
propertyPath: m_Materials.Array.data[0]
@ -583,7 +593,7 @@ MonoBehaviour:
lateLooper: {fileID: 637467565593588835}
rigid: {fileID: 4575308875957934130}
pickup: {fileID: 3019992558134816461}
respawnHeight: -1.5
respawnHeight: -10
smoothingTime: -0.25
allowTheftFromSelf: 1
allowTheftWhenAttachedToPlayer: 1
@ -647,6 +657,7 @@ MonoBehaviour:
SerializationNodes: []
_udonSharpBackingUdonBehaviour: {fileID: 5741219692586799498}
_GameManager: {fileID: 0}
_ObjectSync: {fileID: 7664069034163716319}
--- !u!114 &7251063502356948773
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -2732,8 +2732,7 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
objectReference: {fileID: 0}
- target: {fileID: 407602586891760847, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_Enabled
@ -2748,8 +2747,7 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 879219473364115229, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
objectReference: {fileID: 0}
- target: {fileID: 946568412400953762, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: _syncMethod
@ -2795,8 +2793,7 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 2558719919891730038, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
objectReference: {fileID: 0}
- target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_Name
@ -2806,8 +2803,7 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
objectReference: {fileID: 0}
- target: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_Materials.Array.data[0]
@ -2985,8 +2981,7 @@ PrefabInstance:
type: 3}
propertyPath: serializationData.Prefab
value:
objectReference: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -38475,11 +38470,6 @@ PrefabInstance:
propertyPath: m_ScaleInLightmap
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 041fc504ffe97874884e52d5d72fe840,
type: 3}
propertyPath: m_StitchLightmapSeams
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 041fc504ffe97874884e52d5d72fe840,
type: 3}
propertyPath: m_Materials.Array.data[0]
@ -66054,6 +66044,31 @@ PrefabInstance:
propertyPath: m_Name
value: Winning Player Camera Anchor
objectReference: {fileID: 0}
- target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.99959785
objectReference: {fileID: 0}
- target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.028357802
objectReference: {fileID: 0}
- target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 3.25
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalPosition.x
@ -113681,37 +113696,84 @@ MonoBehaviour:
useAssignedLayers: 0
DynamicPrefabs: []
DynamicMaterials:
- {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2}
- {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2}
- {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2}
- {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2}
- {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2}
- {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2}
- {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2}
- {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2}
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
- {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2}
- {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2}
- {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
- {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2}
- {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2}
- {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2}
- {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2}
- {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
- {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2}
- {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2}
- {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2}
- {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2}
- {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2}
- {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2}
- {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2}
- {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2}
- {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2}
- {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2}
- {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2}
- {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2}
- {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2}
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
- {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2}
- {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2}
- {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2}
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
- {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
- {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2}
- {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
- {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2}
- {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2}
- {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
- {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2}
- {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2}
- {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2}
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
- {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2}
- {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
- {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2}
- {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2}
- {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2}
- {fileID: 2100000, guid: 03943341e30772e44ba4bbd3d57d75ee, type: 2}
- {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2}
- {fileID: 2100000, guid: 52bf82e7bd694ae44b45ce6f356fa6d2, type: 2}
- {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2}
- {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2}
- {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2}
- {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2}
- {fileID: 2100000, guid: e633280d5439fd24cbf88344782787d3, type: 2}
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2}
- {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2}
- {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
- {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2}
- {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2}
- {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2}
- {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2}
- {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
- {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2}
- {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2}
- {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
- {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2}
- {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2}
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
- {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2}
- {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2}
- {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2}
- {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2}
- {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2}
- {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2}
- {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2}
- {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2}
- {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2}
- {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2}
- {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2}
- {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2}
- {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2}
- {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2}
- {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2}
- {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2}
- {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2}
- {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2}
- {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2}
- {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2}
- {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2}
- {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2}
- {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2}
- {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2}
- {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2}
- {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2}
- {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2}
- {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2}
- {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2}
@ -113721,100 +113783,55 @@ MonoBehaviour:
- {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2}
- {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2}
- {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2}
- {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2}
- {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2}
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
- {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
- {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2}
- {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2}
- {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2}
- {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2}
- {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2}
- {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2}
- {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2}
- {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2}
- {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2}
- {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2}
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2}
- {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2}
- {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2}
- {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2}
- {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2}
- {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2}
- {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2}
- {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2}
- {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2}
- {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2}
- {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2}
- {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2}
- {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2}
- {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2}
- {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2}
- {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2}
- {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2}
- {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2}
- {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2}
- {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2}
- {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2}
- {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2}
- {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2}
- {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2}
- {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
- {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2}
- {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2}
- {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
- {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2}
- {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2}
- {fileID: 2100000, guid: 03943341e30772e44ba4bbd3d57d75ee, type: 2}
- {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2}
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
- {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2}
- {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2}
- {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2}
- {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2}
- {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2}
- {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2}
- {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
- {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2}
- {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
- {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2}
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
- {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2}
- {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2}
- {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2}
- {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2}
- {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2}
- {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2}
- {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2}
- {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2}
- {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2}
- {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2}
- {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
- {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2}
- {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2}
- {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2}
- {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2}
- {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2}
- {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2}
- {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2}
- {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2}
- {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2}
- {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2}
- {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2}
- {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2}
- {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2}
- {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2}
- {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2}
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2}
- {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2}
- {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2}
- {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2}
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
- {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2}
- {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2}
- {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2}
- {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2}
- {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2}
- {fileID: 2100000, guid: 52bf82e7bd694ae44b45ce6f356fa6d2, type: 2}
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
- {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
- {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2}
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
- {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2}
- {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2}
- {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2}
- {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
- {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
- {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
- {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
- {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
- {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2}
- {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2}
- {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2}
- {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
- {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2}
- {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2}
- {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2}
- {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2}
- {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2}
- {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2}
- {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2}
- {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2}
- {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2}
- {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2}
- {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2}
- {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2}
- {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2}
- {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
- {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2}
- {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2}
- {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2}
- {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2}
LightMapsNear: []
LightMapsFar: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 628 KiB

After

Width:  |  Height:  |  Size: 629 KiB

View File

@ -293,13 +293,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: CameraRoot
Data: _CameraRoot
- Name: $v
Entry: 7
Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: CameraRoot
Data: _CameraRoot
- Name: <UserType>k__BackingField
Entry: 7
Data: 19|System.RuntimeType, mscorlib
@ -362,13 +362,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: CameraFOVScaler
Data: _CameraModifier
- Name: $v
Entry: 7
Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: CameraFOVScaler
Data: _CameraModifier
- Name: <UserType>k__BackingField
Entry: 9
Data: 19
@ -398,8 +398,11 @@ MonoBehaviour:
Data: 25|UnityEngine.TooltipAttribute, UnityEngine.CoreModule
- Name: tooltip
Entry: 1
Data: Changing the Z scale of this object will change the FOV of the attached
camera.
Data: 'Changing the position and rotation of this object will change the position/rotation
offset of the attached camera.
Changing the Z scale of this object
will change the FOV of the attached camera.'
- Name:
Entry: 8
Data:

View File

@ -1,7 +1,5 @@

using CameraSystem;
using MMMaellon.LightSync;
using System.Linq;
using UdonSharp;
using UnityEngine;
using VRC.SDKBase;
@ -28,9 +26,9 @@ public class CameraAnchor : UdonSharpBehaviour
[SerializeField] private float NearClippingPlane = 0.3f;
[SerializeField] private float FarClippingPlane = 1000.0f;
[Space]
[SerializeField] private Transform CameraRoot;
[Tooltip("Changing the Z scale of this object will change the FOV of the attached camera.")]
[SerializeField] private Transform CameraFOVScaler;
[SerializeField] private Transform _CameraRoot;
[Tooltip("Changing the position and rotation of this object will change the position/rotation offset of the attached camera.\nChanging the Z scale of this object will change the FOV of the attached camera.")]
[SerializeField] private Transform _CameraModifier;
[Space]
[Tooltip("How the camera should follow players, if it's set to do so.")]
[SerializeField] private PossibleFollowMethods FollowMethod;
@ -49,7 +47,7 @@ public class CameraAnchor : UdonSharpBehaviour
{
if (_AttachedCamera)
{
if (_AttachedCamera.transform.parent != CameraRoot)
if (_AttachedCamera.transform.parent != _CameraRoot)
{
Debug.Log("[CameraAnchor] Camera has been detached from " + gameObject.name + ".");
_AttachedCamera = null;
@ -58,7 +56,15 @@ public class CameraAnchor : UdonSharpBehaviour
}
else
{
_AttachedCamera.fieldOfView = FOV * CameraFOVScaler.transform.localScale.z;
_AttachedCamera.transform.localPosition = Vector3.Lerp(
_AttachedCamera.transform.localPosition,
_CameraModifier.localPosition,
_CameraFollowSpeed / 10.0f);
_AttachedCamera.transform.localRotation = Quaternion.Lerp(
_AttachedCamera.transform.localRotation,
_CameraModifier.localRotation,
_CameraFollowSpeed / 10.0f);
_AttachedCamera.fieldOfView = FOV * _CameraModifier.localScale.z;
}
}
@ -84,16 +90,16 @@ public class CameraAnchor : UdonSharpBehaviour
Vector3 CentroidAverage = CentroidSum / _FollowedPlayers.Length;
Vector3 LookDirection = (CentroidAverage - transform.position).normalized;
CameraRoot.transform.rotation = Quaternion.LookRotation(
_CameraRoot.transform.rotation = Quaternion.LookRotation(
Vector3.Lerp(
CameraRoot.transform.forward,
Vector3.RotateTowards(CameraRoot.transform.forward, LookDirection, 10.0f, 0.0f),
_CameraRoot.transform.forward,
Vector3.RotateTowards(_CameraRoot.transform.forward, LookDirection, 10.0f, 0.0f),
_CameraFollowSpeed / 10.0f)
);
}
else
{
CameraRoot.transform.localRotation = Quaternion.identity;
_CameraRoot.transform.localRotation = Quaternion.identity;
}
}
@ -248,8 +254,9 @@ public class CameraAnchor : UdonSharpBehaviour
_AttachedCamera.fieldOfView = FOV;
_AttachedCamera.nearClipPlane = NearClippingPlane;
_AttachedCamera.farClipPlane = FarClippingPlane;
_AttachedCamera.transform.parent = CameraRoot;
_AttachedCamera.GetComponent<LightSync>().TeleportToLocalSpace(Vector3.zero, Quaternion.identity, true);
_AttachedCamera.transform.parent = _CameraRoot;
_AttachedCamera.transform.localPosition = _CameraModifier.localPosition;
_AttachedCamera.transform.localRotation = _CameraModifier.localRotation;
}
}
}

View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 32
Data: 31
- Name:
Entry: 7
Data:
@ -1448,19 +1448,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Players
Data: _RoundIsOver
- Name: $v
Entry: 7
Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Players
Data: _RoundIsOver
- Name: <UserType>k__BackingField
Entry: 9
Data: 85
Data: 42
- Name: <SystemType>k__BackingField
Entry: 9
Data: 85
Data: 42
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -1502,70 +1502,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _RoundIsOver
Data: _CameraControllerRound2
- Name: $v
Entry: 7
Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _RoundIsOver
- Name: <UserType>k__BackingField
Entry: 9
Data: 42
- Name: <SystemType>k__BackingField
Entry: 9
Data: 42
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 3
Data: 1
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 100|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- 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: _CameraControllerRound2
- Name: $v
Entry: 7
Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CameraControllerRound2
- Name: <UserType>k__BackingField
Entry: 7
Data: 102|System.RuntimeType, mscorlib
Data: 99|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CameraControllerRound2, Assembly-CSharp
@ -1589,7 +1535,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
@ -1614,7 +1560,7 @@ MonoBehaviour:
Data: _PlayingJailCall
- Name: $v
Entry: 7
Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _PlayingJailCall
@ -1638,7 +1584,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 105|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
@ -1663,7 +1609,7 @@ MonoBehaviour:
Data: _PanelToReveal_Cache
- Name: $v
Entry: 7
Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _PanelToReveal_Cache
@ -1685,6 +1631,61 @@ MonoBehaviour:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 104|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: COLOR_STANDARD
- Name: $v
Entry: 7
Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_STANDARD
- Name: <UserType>k__BackingField
Entry: 7
Data: 106|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 106
- 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: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
@ -1709,25 +1710,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: COLOR_STANDARD
Data: COLOR_RED
- Name: $v
Entry: 7
Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_STANDARD
Data: COLOR_RED
- Name: <UserType>k__BackingField
Entry: 7
Data: 109|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Color, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
Entry: 9
Data: 106
- Name: <SystemType>k__BackingField
Entry: 9
Data: 109
Data: 106
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -1742,56 +1737,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 110|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: COLOR_RED
- Name: $v
Entry: 7
Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_RED
- Name: <UserType>k__BackingField
Entry: 9
Data: 109
- Name: <SystemType>k__BackingField
Entry: 9
Data: 109
- 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: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
@ -1816,16 +1762,16 @@ MonoBehaviour:
Data: COLOR_YELLOW
- Name: $v
Entry: 7
Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_YELLOW
- Name: <UserType>k__BackingField
Entry: 9
Data: 109
Data: 106
- Name: <SystemType>k__BackingField
Entry: 9
Data: 109
Data: 106
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -1840,7 +1786,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
@ -1865,16 +1811,16 @@ MonoBehaviour:
Data: COLOR_GREEN
- Name: $v
Entry: 7
Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: COLOR_GREEN
- Name: <UserType>k__BackingField
Entry: 9
Data: 109
Data: 106
- Name: <SystemType>k__BackingField
Entry: 9
Data: 109
Data: 106
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -1889,7 +1835,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12

View File

@ -39,7 +39,6 @@ public class GameManagerRound2 : GameManagerBase
[UdonSynced] private int _StageIndex = 0;
[UdonSynced] private int _CurrentPlayerCounter = 0;
[UdonSynced] private string[] _Players = new string[2];
[UdonSynced] private bool _RoundIsOver = false;
private CameraControllerRound2 _CameraControllerRound2 = null;
@ -111,7 +110,7 @@ public class GameManagerRound2 : GameManagerBase
{
_PlayingJailCall = false;
_JailPhone.Activate = false;
_JailPhone.Activate(false);
_JailChain.Show = false;
foreach (ArrivalDisplay Display in _ArrivalDisplays)
@ -234,16 +233,11 @@ public class GameManagerRound2 : GameManagerBase
_CurrentPlayerCounter = 0;
_RoundIsOver = false;
for (int i = 0; i < _PlayerPodiums.Length && i < _Players.Length; i++)
{
_Players[i] = _PlayerPodiums[i].GetPlayer();
}
if (Networking.LocalPlayer == _CaseManager.GetHostOwner())
{
HostCardRecoverTheLootInterface RecoverTheLootInterface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
RecoverTheLootInterface.SetComment(_Players[_CurrentPlayerCounter % _Players.Length] + ", you're up first.", COLOR_STANDARD);
RecoverTheLootInterface.SetComment(_PlayerPodiums[_CurrentPlayerCounter % _PlayerPodiums.Length].GetPlayer() + ", you're up first.", COLOR_STANDARD);
RecoverTheLootInterface.SetLootButton(_LocationBoard.LootLocation);
RecoverTheLootInterface.SetWarrantButton(_LocationBoard.WarrantLocation);
RecoverTheLootInterface.SetCrookButton(_LocationBoard.CrookLocation);
@ -361,9 +355,13 @@ public class GameManagerRound2 : GameManagerBase
if (Networking.LocalPlayer != _CaseManager.GetHostOwner()) return;
_RoundIsOver = true;
int WinningPlayerNumber = _CurrentPlayerCounter % _Players.Length;
int WinningPlayerNumber = _CurrentPlayerCounter % _PlayerPodiums.Length;
string[] Winner = new string[1];
Winner[0] = _Players[WinningPlayerNumber];
Winner[0] = _PlayerPodiums[WinningPlayerNumber].GetPlayer();
if (Winner[0] == "")
{
Winner[0] = _CaseManager.GetHostOwner().displayName;
}
_CaseManager.SetCurrentWinningPlayers(Winner);
HostCardRecoverTheLootInterface Interface =
@ -394,7 +392,7 @@ public class GameManagerRound2 : GameManagerBase
[NetworkCallable]
public void YoureWinnerConfettiPlayer()
{
_PlayerConfettiCannons[_CurrentPlayerCounter % _Players.Length].Play();
_PlayerConfettiCannons[_CurrentPlayerCounter % _PlayerConfettiCannons.Length].Play();
}
@ -422,7 +420,7 @@ public class GameManagerRound2 : GameManagerBase
BetweenRoundsInterface.HeaderUI.text = "Phone Call: " + _CaseManager.GetCrookName();
BetweenRoundsInterface.CommentUI.text = "- You and I are going to " + _CaseManager.ContinentToString(_CaseManager.GetFinalRoundContinent());
_JailPhone.Activate = true;
_JailPhone.Activate(true);
_CameraControllerRound2.DeactivateHostWinnerCameraTrigger();
@ -456,7 +454,7 @@ public class GameManagerRound2 : GameManagerBase
{
HostCardRecoverTheLootInterface Interface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.SetComment(_Players[_CurrentPlayerCounter % _Players.Length] + ", your turn.", COLOR_STANDARD);
Interface.SetComment(_PlayerPodiums[_CurrentPlayerCounter % _PlayerPodiums.Length] + ", your turn.", COLOR_STANDARD);
SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtons_DelayFunction), 0.5f);
}
@ -592,6 +590,15 @@ public class GameManagerRound2 : GameManagerBase
_CameraControllerRound2.SwitchToHostAndWinnerCamera();
}
[NetworkCallable]
public void FollowPlayerHoldingPhone(string PlayerToFollow)
{
if (_CaseManager.GetCurrentWinningPlayers()[0] == "")
{
_CameraControllerRound2.WinningPlayerCamera_FollowPlayers(new string[1] { PlayerToFollow });
}
}
[NetworkCallable]
public void PlayJailCall()
{

View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 4
Data: 5
- Name:
Entry: 7
Data:
@ -116,52 +116,46 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _Activate
Data: _ObjectSync
- Name: $v
Entry: 7
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Activate
Data: _ObjectSync
- Name: <UserType>k__BackingField
Entry: 7
Data: 8|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Boolean, mscorlib
Data: MMMaellon.LightSync.LightSync, com.mmmaellon.lightsync
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 3
Data: 1
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
Data: 1
- Name:
Entry: 7
Data: 10|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 11|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@ -182,19 +176,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CallHasBeenPlayed
Data: _Active
- Name: $v
Entry: 7
Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CallHasBeenPlayed
Data: _Active
- Name: <UserType>k__BackingField
Entry: 9
Data: 8
Entry: 7
Data: 12|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Boolean, mscorlib
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 8
Data: 12
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -236,25 +236,73 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ObjectSync
Data: _CallHasBeenPlayed
- Name: $v
Entry: 7
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ObjectSync
Data: _CallHasBeenPlayed
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
- Name: <SystemType>k__BackingField
Entry: 9
Data: 12
- Name: <SyncMode>k__BackingField
Entry: 7
Data: 16|System.RuntimeType, mscorlib
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 1
Data: MMMaellon.LightSync.LightSync, com.mmmaellon.lightsync
Entry: 3
Data: 1
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 17|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- 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: _Active_Cached
- Name: $v
Entry: 7
Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _Active_Cached
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
Data: 12
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -269,7 +317,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0

View File

@ -2,8 +2,8 @@
using MMMaellon.LightSync;
using UdonSharp;
using UnityEngine;
using VRC.SDK3.Components;
using VRC.SDKBase;
using VRC.Udon.Common;
using VRC.Udon.Common.Interfaces;
@ -11,11 +11,12 @@ using VRC.Udon.Common.Interfaces;
public class JailPhone : UdonSharpBehaviour
{
[SerializeField] private GameManagerRound2 _GameManager;
[SerializeField] private LightSync _ObjectSync;
[UdonSynced, FieldChangeCallback(nameof(Activate))] private bool _Activate = false;
[UdonSynced] private bool _Active = false;
[UdonSynced] private bool _CallHasBeenPlayed = false;
private LightSync _ObjectSync;
private bool _Active_Cached = false;
void Start()
@ -23,21 +24,17 @@ public class JailPhone : UdonSharpBehaviour
_ObjectSync = GetComponent<LightSync>();
}
public void Initialise()
public override void OnDeserialization(DeserializationResult Result)
{
_ObjectSync.TeleportToLocalSpace(Vector3.zero, Quaternion.identity, false);
Activate = false;
_CallHasBeenPlayed = false;
RequestSerialization();
_Activate_Synced();
base.OnDeserialization(Result);
}
public override void OnPickup()
{
if (Networking.LocalPlayer != _GameManager.GetHostOwner())
{
PlayJailCall();
Networking.SetOwner(Networking.LocalPlayer, gameObject);
}
base.OnPickup();
}
@ -51,10 +48,51 @@ public class JailPhone : UdonSharpBehaviour
base.OnPickupUseDown();
}
public override void OnOwnershipTransferred(VRCPlayerApi Player)
{
_GameManager.SendCustomNetworkEvent(NetworkEventTarget.Owner, "FollowPlayerHoldingPhone", Player.displayName);
PlayJailCall();
base.OnOwnershipTransferred(Player);
}
public void Initialise()
{
Activate(false);
_CallHasBeenPlayed = false;
RequestSerialization();
}
public void Activate(bool Active)
{
_Active = Active;
_Activate_Synced();
_ObjectSync.pickup.pickupable = _Active;
RequestSerialization();
}
private void _Activate_Synced()
{
if (_Active != _Active_Cached)
{
if (_Active)
{
_GameManager.PhoneRing();
}
else
{
transform.localPosition = Vector3.zero;
transform.localRotation = Quaternion.identity;
}
}
_Active_Cached = _Active;
}
private void PlayJailCall()
{
if (Activate && !_CallHasBeenPlayed)
if (_Active && !_CallHasBeenPlayed)
{
SendCustomEventDelayedSeconds(nameof(PlayJailCall_Delayed), 0.75f);
_CallHasBeenPlayed = true;
@ -65,21 +103,4 @@ public class JailPhone : UdonSharpBehaviour
{
_GameManager.SendCustomNetworkEvent(NetworkEventTarget.Owner, "PlayJailCall");
}
public bool Activate
{
set
{
_Activate = value;
if (_Activate)
{
_GameManager.PhoneRing();
}
_ObjectSync.pickup.pickupable = _Activate;
Debug.Log("[JailPhone] Pickupable status is now " + (_ObjectSync.pickup.pickupable ? "true" : "false"));
RequestSerialization();
}
get => _Activate;
}
}

View File

@ -16,7 +16,7 @@ public class PlayerPodium : UdonSharpBehaviour
[SerializeField] private GameManagerRound1 _GameManager;
[SerializeField] private GameObject _TeleportButton;
[UdonSynced, FieldChangeCallback(nameof(PlayerName))] private string _PlayerName = "Player";
[UdonSynced, FieldChangeCallback(nameof(PlayerName))] private string _PlayerName = "";
[UdonSynced] private int _PlayerID = -1;
[UdonSynced, FieldChangeCallback(nameof(PlayerScore))] private int _PlayerScore = 50;
[UdonSynced, FieldChangeCallback(nameof(ShowScoreCard))] private bool _ShowScoreCard = false;
@ -121,7 +121,7 @@ public class PlayerPodium : UdonSharpBehaviour
[NetworkCallable]
public void ResetOwner()
{
PlayerName = "Player " + PlayerNumber;
PlayerName = "";
_PlayerID = -1;
_Pedestal.EnableStandInteractLocally(false);
@ -322,8 +322,15 @@ public class PlayerPodium : UdonSharpBehaviour
set
{
_PlayerName = value;
if (_PlayerName == "")
{
_NameplateUI.text = "Player " + PlayerNumber;
}
else
{
_NameplateUI.text = value;
}
}
get => _PlayerName;
}

Binary file not shown.