diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 3df77dd..7a80d06 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -68,11 +68,13 @@ + + @@ -92,7 +94,6 @@ - diff --git a/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Host.mat b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Host.mat new file mode 100644 index 0000000..f81e3cc --- /dev/null +++ b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Host.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_VideoLoadIndicator_Host + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Bicubic: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableGeometricSpecularAA: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _LightmapType: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Host.mat.meta b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Host.mat.meta new file mode 100644 index 0000000..c1c7a94 --- /dev/null +++ b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Host.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a94d8fe1854504e47a64e023cecaa130 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player1.mat b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player1.mat new file mode 100644 index 0000000..60fd331 --- /dev/null +++ b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player1.mat @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_VideoLoadIndicator_Player1 + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player1.mat.meta b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player1.mat.meta new file mode 100644 index 0000000..febeb22 --- /dev/null +++ b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4e4a6e05f1eb9e40b245c97b9837de1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player2.mat b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player2.mat new file mode 100644 index 0000000..f5c39d4 --- /dev/null +++ b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player2.mat @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_VideoLoadIndicator_Player2 + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player2.mat.meta b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player2.mat.meta new file mode 100644 index 0000000..58b43f7 --- /dev/null +++ b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1f89d6919019b0f448994cf16358a645 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player3.mat b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player3.mat new file mode 100644 index 0000000..dcc3720 --- /dev/null +++ b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player3.mat @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_VideoLoadIndicator_Player3 + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player3.mat.meta b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player3.mat.meta new file mode 100644 index 0000000..1ac3e9f --- /dev/null +++ b/Assets/Materials/ClueVideoScreen/M_VideoLoadIndicator_Player3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f5c040cb557f6c499cd572a32b794b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 770e495..84ec557 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -8845,6 +8845,11 @@ PrefabInstance: propertyPath: _AuxiliaryMapScreen value: objectReference: {fileID: 1872997052} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _VideoLoadIndicator + value: + objectReference: {fileID: 1953513698} - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _AuxiliaryVideoScreen @@ -13424,6 +13429,139 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &312861885 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 312861886} + - component: {fileID: 312861890} + - component: {fileID: 312861889} + - component: {fileID: 312861888} + - component: {fileID: 312861887} + m_Layer: 22 + m_Name: Video Load Indicator - Host + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &312861886 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312861885} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.4382, y: 0.1067, z: 0.0916} + m_LocalScale: {x: 0.015, y: 0.015, z: 0.015} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2057791822} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &312861887 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312861885} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 055b39ce29e47bf43919be0d41337443, + type: 2} + programSource: {fileID: 11400000, guid: 04cac9381d0d46643a6e6fefe6d3dad8, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &312861888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312861885} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5910303773feb54d805c485ebec3ed4, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 312861887} +--- !u!23 &312861889 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312861885} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &312861890 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312861885} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &316030365 GameObject: m_ObjectHideFlags: 0 @@ -20989,20 +21127,21 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 515404445} + _HostVideoLoadIndicator: {fileID: 312861888} _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} _PlayerMicrophone: {fileID: 431721603} _AudienceSilencer: {fileID: 344488391} - _VideoPlayer: {fileID: 2057791820} _TiebreakerData: url: https://witwics-dev.github.io/TiebreakerData.json _PlayerPodiums: - {fileID: 4438766482650780795} - {fileID: 1993364535} - {fileID: 1589630268} - _VideoMusicClueSkateboard: {fileID: 4337638711874237563} + _VideoPlayer: {fileID: 2057791820} _ACMECrimenetComputer: {fileID: 5448599223445625653} + _VideoMusicClueSkateboard: {fileID: 4337638711874237563} _Modem: {fileID: 966631266} _ArrivalDisplay: {fileID: 2013644315} _LightningRoundAnimator: {fileID: 806909628} @@ -31862,6 +32001,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 865296977} + _HostVideoLoadIndicator: {fileID: 312861888} _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} @@ -32924,6 +33064,11 @@ PrefabInstance: propertyPath: _AuxiliaryMapScreen value: objectReference: {fileID: 1191802286} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _VideoLoadIndicator + value: + objectReference: {fileID: 1987643331} - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _AuxiliaryVideoScreen @@ -34620,6 +34765,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 969831473} + _HostVideoLoadIndicator: {fileID: 312861888} _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} @@ -56612,6 +56758,139 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1526794725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1526794726} + - component: {fileID: 1526794728} + - component: {fileID: 1526794727} + - component: {fileID: 1526794730} + - component: {fileID: 1526794729} + m_Layer: 22 + m_Name: Video Load Indicator - Player 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1526794726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526794725} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.4382, y: 0.0835, z: 0.0682} + m_LocalScale: {x: 0.015, y: 0.015, z: 0.015} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2057791822} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1526794727 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526794725} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c4e4a6e05f1eb9e40b245c97b9837de1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1526794728 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526794725} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1526794729 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526794725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 055b39ce29e47bf43919be0d41337443, + type: 2} + programSource: {fileID: 11400000, guid: 04cac9381d0d46643a6e6fefe6d3dad8, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1526794730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1526794725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5910303773feb54d805c485ebec3ed4, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1526794729} --- !u!1 &1528591628 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9009189034908819552, guid: e9914385266bca24db809c39e395f03c, @@ -71505,6 +71784,139 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1953513695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1953513696} + - component: {fileID: 1953513700} + - component: {fileID: 1953513699} + - component: {fileID: 1953513698} + - component: {fileID: 1953513697} + m_Layer: 22 + m_Name: Video Load Indicator - Player 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1953513696 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953513695} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.4382, y: 0.0835, z: 0.0916} + m_LocalScale: {x: 0.015, y: 0.015, z: 0.015} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2057791822} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1953513697 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953513695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 055b39ce29e47bf43919be0d41337443, + type: 2} + programSource: {fileID: 11400000, guid: 04cac9381d0d46643a6e6fefe6d3dad8, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1953513698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953513695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5910303773feb54d805c485ebec3ed4, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1953513697} +--- !u!23 &1953513699 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953513695} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1f89d6919019b0f448994cf16358a645, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1953513700 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953513695} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1953862613 GameObject: m_ObjectHideFlags: 0 @@ -72574,6 +72986,139 @@ Transform: - {fileID: 341561120} m_Father: {fileID: 938262255} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1987643328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1987643329} + - component: {fileID: 1987643333} + - component: {fileID: 1987643332} + - component: {fileID: 1987643331} + - component: {fileID: 1987643330} + m_Layer: 22 + m_Name: Video Load Indicator - Player 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1987643329 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987643328} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.4382, y: 0.0835, z: 0.114} + m_LocalScale: {x: 0.015, y: 0.015, z: 0.015} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2057791822} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1987643330 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987643328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 055b39ce29e47bf43919be0d41337443, + type: 2} + programSource: {fileID: 11400000, guid: 04cac9381d0d46643a6e6fefe6d3dad8, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1987643331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987643328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5910303773feb54d805c485ebec3ed4, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1987643330} +--- !u!23 &1987643332 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987643328} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0f5c040cb557f6c499cd572a32b794b1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1987643333 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987643328} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1991362173 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7034199273745288373, guid: 126991d511ca61841a0ef899b6c038a6, @@ -75335,13 +75880,17 @@ MonoBehaviour: _udonSharpBackingUdonBehaviour: {fileID: 2057791819} _CaseManager: {fileID: 841163054} _VideoPlayer: {fileID: 2057791821} - _SyncFrequency: 0 _BlankScreenMesh: {fileID: 616351405} _VideoScreenMesh: {fileID: 1123401066} _MapScreenMesh: {fileID: 1005643829} _MapScreenMaterial: {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} _PlaceholderMapTexture: {fileID: 2800000, guid: 44aab33f67dfa2949a8bd0a7e20d40e7, type: 3} + _VideoLoadIndicators: + - {fileID: 312861888} + - {fileID: 1526794730} + - {fileID: 1953513698} + - {fileID: 1987643331} --- !u!114 &2057791821 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75380,6 +75929,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 312861886} + - {fileID: 1526794726} + - {fileID: 1953513696} + - {fileID: 1987643329} - {fileID: 616351406} - {fileID: 1123401067} - {fileID: 1005643830} @@ -81491,6 +82044,11 @@ PrefabInstance: propertyPath: _AuxiliaryMapScreen value: objectReference: {fileID: 71785175} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _VideoLoadIndicator + value: + objectReference: {fileID: 1526794730} - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _AuxiliaryVideoScreen @@ -83840,14 +84398,30 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 20b7b61cb65ead644a4959264fc90833, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} @@ -83857,41 +84431,29 @@ MonoBehaviour: - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, 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: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 20b7b61cb65ead644a4959264fc90833, type: 2} - - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: c4e4a6e05f1eb9e40b245c97b9837de1, type: 2} + - {fileID: 2100000, guid: 1f89d6919019b0f448994cf16358a645, type: 2} + - {fileID: 2100000, guid: 0f5c040cb557f6c499cd572a32b794b1, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2} LightMapsNear: [] LightMapsFar: [] @@ -88474,6 +89036,22 @@ MonoBehaviour: ID: 1110 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 312861885} + ID: 1111 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1526794725} + ID: 1112 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1953513695} + ID: 1113 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1987643328} + ID: 1114 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.meta b/Assets/UdonSharp/CaseVideoSyncPlayer.meta new file mode 100644 index 0000000..f8a6f7e --- /dev/null +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11cd2aae1d595184d88cc51e180f3d02 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.asset b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset similarity index 80% rename from Assets/UdonSharp/CaseVideoSyncPlayer.asset rename to Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset index e05992a..1de83ea 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer.asset +++ b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 21 + Data: 22 - Name: Entry: 7 Data: @@ -116,400 +116,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SubMapIndex + Data: _VideoPlayer - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SubMapIndex + Data: _VideoPlayer - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 8 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 10|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 11|UdonSharp.FieldChangeCallbackAttribute, 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: _ShowScreen - - Name: $v - Entry: 7 - Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _ShowScreen - - Name: k__BackingField - Entry: 7 - Data: 13|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: ClueScreenType, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 8 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - 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|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 16|UdonSharp.FieldChangeCallbackAttribute, 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: _FlashCorrectAnswer - - Name: $v - Entry: 7 - Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _FlashCorrectAnswer - - Name: k__BackingField - Entry: 7 - Data: 18|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 18 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 20|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 21|UdonSharp.FieldChangeCallbackAttribute, 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: _VideoIndex - - Name: $v - Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoIndex - - Name: k__BackingField - Entry: 9 - Data: 8 - - Name: k__BackingField - Entry: 9 - Data: 8 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 24|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 25|UdonSharp.FieldChangeCallbackAttribute, 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: _TimeAndOffset - - Name: $v - Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _TimeAndOffset - - Name: k__BackingField - Entry: 7 - Data: 27|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Vector2, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 27 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 29|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 30|UdonSharp.FieldChangeCallbackAttribute, 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: _VideoIsPlaying - - Name: $v - Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoIsPlaying - - Name: k__BackingField - Entry: 9 - Data: 18 - - Name: k__BackingField - Entry: 9 - Data: 18 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 33|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 34|UdonSharp.FieldChangeCallbackAttribute, 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: _VideoPlayer - - Name: $v - Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoPlayer - - Name: k__BackingField - Entry: 7 - Data: 36|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 @@ -518,7 +134,433 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 36 + Data: 8 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: _SyncFrequency + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _SyncFrequency + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 13|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: _BlankScreenMesh + - Name: $v + Entry: 7 + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _BlankScreenMesh + - Name: k__BackingField + Entry: 7 + Data: 15|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 17|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Meshes + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 18|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: _VideoScreenMesh + - Name: $v + Entry: 7 + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoScreenMesh + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - 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: _MapScreenMesh + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _MapScreenMesh + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 24|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: _MapScreenMaterial + - Name: $v + Entry: 7 + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _MapScreenMaterial + - Name: k__BackingField + Entry: 7 + Data: 26|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Material, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 26 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 28|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Materials + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 29|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: _PlaceholderMapTexture + - Name: $v + Entry: 7 + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlaceholderMapTexture + - Name: k__BackingField + Entry: 7 + Data: 31|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Texture2D, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 31 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 33|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: _VideoLoadIndicators + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoLoadIndicators + - Name: k__BackingField + Entry: 7 + Data: 35|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VideoLoadIndicator[], Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 36|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -536,10 +578,19 @@ MonoBehaviour: Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Video Status + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -560,46 +611,52 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SyncFrequency + Data: _SubMapIndex - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SyncFrequency + Data: _SubMapIndex - Name: k__BackingField Entry: 7 - Data: 40|System.RuntimeType, mscorlib + Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Single, mscorlib + Data: System.Int32, mscorlib - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 40 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 44|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -620,46 +677,52 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _BlankScreenMesh + Data: _ShowScreen - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _BlankScreenMesh + Data: _ShowScreen - Name: k__BackingField Entry: 7 - Data: 44|System.RuntimeType, mscorlib + Data: 46|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule + Data: ClueScreenType, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 44 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 49|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -680,94 +743,52 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _VideoScreenMesh - - Name: $v - Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoScreenMesh - - Name: k__BackingField - Entry: 9 - Data: 44 - - Name: k__BackingField - Entry: 9 - Data: 44 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 49|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: _MapScreenMesh + Data: _FlashCorrectAnswer - Name: $v Entry: 7 Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapScreenMesh + Data: _FlashCorrectAnswer - Name: k__BackingField - Entry: 9 - Data: 44 + Entry: 7 + Data: 51|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 44 + Data: 51 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 54|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -788,46 +809,46 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapScreenMaterial + Data: _VideoIndex - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapScreenMaterial + Data: _VideoIndex - Name: k__BackingField - Entry: 7 - Data: 54|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Material, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 41 - Name: k__BackingField Entry: 9 - Data: 54 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 57|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 58|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -848,46 +869,112 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlaceholderMapTexture + Data: _TimeAndOffset - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlaceholderMapTexture + Data: _TimeAndOffset - Name: k__BackingField Entry: 7 - Data: 58|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Texture2D, UnityEngine.CoreModule + Data: UnityEngine.Vector2, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 58 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 - Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 60|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 63|UdonSharp.FieldChangeCallbackAttribute, 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: _VideoIsPlaying + - Name: $v + Entry: 7 + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoIsPlaying + - Name: k__BackingField + Entry: 9 + Data: 51 + - Name: k__BackingField + Entry: 9 + Data: 51 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 66|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 67|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -911,13 +998,13 @@ MonoBehaviour: Data: _MapDownloader - Name: $v Entry: 7 - Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapDownloader - Name: k__BackingField Entry: 7 - Data: 62|System.RuntimeType, mscorlib + Data: 69|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 @@ -926,7 +1013,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 62 + Data: 69 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -941,7 +1028,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -965,13 +1052,13 @@ MonoBehaviour: Data: _MapImages - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapImages - Name: k__BackingField Entry: 7 - Data: 65|System.RuntimeType, mscorlib + Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Texture2D[], UnityEngine.CoreModule @@ -980,7 +1067,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 65 + Data: 72 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -995,7 +1082,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1019,13 +1106,13 @@ MonoBehaviour: Data: _UdonEventReceiverThis - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _UdonEventReceiverThis - Name: k__BackingField Entry: 7 - Data: 68|System.RuntimeType, mscorlib + Data: 75|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.Common.Interfaces.IUdonEventReceiver, VRC.Udon.Common @@ -1034,157 +1121,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 68 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 69|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: _CachedMapIndices - - Name: $v - Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CachedMapIndices - - Name: k__BackingField - Entry: 7 - Data: 71|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32[], mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 71 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 72|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: _MapDownloadIndex - - Name: $v - Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _MapDownloadIndex - - Name: k__BackingField - Entry: 9 - Data: 8 - - Name: k__BackingField - Entry: 9 - Data: 8 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 74|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: _MapDownloadsInProgress - - Name: $v - Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _MapDownloadsInProgress - - Name: k__BackingField - Entry: 9 - Data: 18 - - Name: k__BackingField - Entry: 9 - Data: 18 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1220,19 +1157,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _UseFallback + Data: _CachedMapIndices - Name: $v Entry: 7 Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _UseFallback + Data: _CachedMapIndices - Name: k__BackingField - Entry: 9 - Data: 18 + Entry: 7 + Data: 78|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32[], mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 18 + Data: 78 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1247,7 +1190,151 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 79|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: _MapDownloadIndex + - Name: $v + Entry: 7 + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _MapDownloadIndex + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 81|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: _MapDownloadsInProgress + - Name: $v + Entry: 7 + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _MapDownloadsInProgress + - Name: k__BackingField + Entry: 9 + Data: 51 + - Name: k__BackingField + Entry: 9 + Data: 51 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 83|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: _UseFallback + - Name: $v + Entry: 7 + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _UseFallback + - Name: k__BackingField + Entry: 9 + Data: 51 + - Name: k__BackingField + Entry: 9 + Data: 51 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.asset.meta b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset.meta similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer.asset.meta rename to Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset.meta diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs similarity index 94% rename from Assets/UdonSharp/CaseVideoSyncPlayer.cs rename to Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs index 6acc8c5..d504630 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs @@ -1,4 +1,5 @@  +using Newtonsoft.Json.Linq; using UdonSharp; using UnityEngine; using VRC.SDK3.Components.Video; @@ -22,6 +23,21 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour { [SerializeField] private CaseManager _CaseManager; + [SerializeField] private BaseVRCVideoPlayer _VideoPlayer; + /*[SerializeField]*/ private float _SyncFrequency = 5.0f; + + [Header("Meshes")] + [SerializeField] private MeshRenderer _BlankScreenMesh; + [SerializeField] private MeshRenderer _VideoScreenMesh; + [SerializeField] private MeshRenderer _MapScreenMesh; + + [Header("Materials")] + [SerializeField] private Material _MapScreenMaterial; + [SerializeField] private Texture2D _PlaceholderMapTexture; + + [Header("Video Status")] + [SerializeField] private VideoLoadIndicator[] _VideoLoadIndicators; + [UdonSynced, FieldChangeCallback(nameof(SubMapIndex))] private int _SubMapIndex = 0; [UdonSynced, FieldChangeCallback(nameof(ShowScreen))] private ClueScreenType _ShowScreen = ClueScreenType.Blank; [UdonSynced, FieldChangeCallback(nameof(FlashCorrectAnswer))] private bool _FlashCorrectAnswer = false; @@ -31,16 +47,6 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour [UdonSynced, FieldChangeCallback(nameof(PlayVideo))] private bool _VideoIsPlaying; - [SerializeField] private BaseVRCVideoPlayer _VideoPlayer; - [SerializeField] private float _SyncFrequency = 5.0f; - - [SerializeField] private MeshRenderer _BlankScreenMesh; - [SerializeField] private MeshRenderer _VideoScreenMesh; - [SerializeField] private MeshRenderer _MapScreenMesh; - - [SerializeField] private Material _MapScreenMaterial; - [SerializeField] private Texture2D _PlaceholderMapTexture; - private VRCImageDownloader _MapDownloader; private Texture2D[] _MapImages = new Texture2D[0]; private IUdonEventReceiver _UdonEventReceiverThis; @@ -200,6 +206,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour if (VideoIndex >= 0 && VideoIndex < _CaseManager.GetVideoCount()) { _VideoPlayer.LoadURL(_CaseManager.GetVideo(VideoIndex, _UseFallback)); + SetVideoLoadStatus(IndicationStatus.Loading); } else { @@ -228,6 +235,8 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour _PlayVideo_Private(); } + SetVideoLoadStatus(IndicationStatus.LoadSuccess); + base.OnVideoReady(); } @@ -262,6 +271,8 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour SendCustomEventDelayedSeconds(nameof(TryLoadFallbackURL), 5.5f); } + SetVideoLoadStatus(IndicationStatus.LoadFailure); + base.OnVideoError(VideoError); } public void TryLoadFallbackURL() @@ -295,6 +306,17 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour base.OnVideoEnd(); } + public void SetVideoLoadStatus(IndicationStatus Status) + { + foreach (VideoLoadIndicator Indicator in _VideoLoadIndicators) + { + if (Indicator.GetOwner() == Networking.LocalPlayer.displayName) + { + Indicator.IndicateStatus = Status; + } + } + } + private void UpdateTimeAndOffset() { if (Networking.IsOwner(gameObject)) diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.cs.meta b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs.meta similarity index 100% rename from Assets/UdonSharp/CaseVideoSyncPlayer.cs.meta rename to Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs.meta diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset b/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset new file mode 100644 index 0000000..fe84990 --- /dev/null +++ b/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset @@ -0,0 +1,239 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: VideoLoadIndicator + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 055b39ce29e47bf43919be0d41337443, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: b5910303773feb54d805c485ebec3ed4, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 3627360377817521765 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Owner + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Owner + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|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: _IndicateStatus + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _IndicateStatus + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: IndicationStatus, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 10|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 11|UdonSharp.FieldChangeCallbackAttribute, 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: _IndicatorMesh + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _IndicatorMesh + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 13 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset.meta b/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset.meta new file mode 100644 index 0000000..14f4e3b --- /dev/null +++ b/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04cac9381d0d46643a6e6fefe6d3dad8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs b/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs new file mode 100644 index 0000000..1c1536c --- /dev/null +++ b/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs @@ -0,0 +1,62 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +public enum IndicationStatus +{ + Idle, + Loading, + LoadSuccess, + LoadFailure +} + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class VideoLoadIndicator : UdonSharpBehaviour +{ + [UdonSynced] private string _Owner = null; + [UdonSynced, FieldChangeCallback(nameof(IndicateStatus))] private IndicationStatus _IndicateStatus = IndicationStatus.Idle; + + private MeshRenderer _IndicatorMesh; + + + void Start() + { + _IndicatorMesh = GetComponent(); + _Owner = Networking.LocalPlayer.displayName; + } + + public override void OnOwnershipTransferred(VRCPlayerApi Player) + { + _Owner = Player.displayName; + RequestSerialization(); + + base.OnOwnershipTransferred(Player); + } + + public string GetOwner() + { + return _Owner; + } + + + public IndicationStatus IndicateStatus + { + set + { + _IndicateStatus = value; + switch(_IndicateStatus) + { + case IndicationStatus.Idle: _IndicatorMesh.material.SetColor("_Color", Color.black); break; + case IndicationStatus.Loading: _IndicatorMesh.material.SetColor("_Color", Color.yellow); break; + case IndicationStatus.LoadSuccess: _IndicatorMesh.material.SetColor("_Color", Color.green); break; + case IndicationStatus.LoadFailure: _IndicatorMesh.material.SetColor("_Color", Color.red); break; + } + Debug.Log("[VideoLoadIndicator] Setting load status to " + (int)_IndicateStatus); + RequestSerialization(); + } + get => _IndicateStatus; + } +} diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs.meta b/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs.meta new file mode 100644 index 0000000..79fb70b --- /dev/null +++ b/Assets/UdonSharp/CaseVideoSyncPlayer/VideoLoadIndicator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b5910303773feb54d805c485ebec3ed4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.asset b/Assets/UdonSharp/Game Managers/GameManagerBase.asset index f67d338..5d9a703 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.asset @@ -44,25 +44,25 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 6 + Data: 7 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _HostCard + Data: _HostVideoLoadIndicator - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostCard + Data: _HostVideoLoadIndicator - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: HostCardManager, Assembly-CSharp + Data: VideoLoadIndicator, Assembly-CSharp - Name: Entry: 8 Data: @@ -116,19 +116,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseManager + Data: _HostCard - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseManager + Data: _HostCard - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CaseManager, Assembly-CSharp + Data: HostCardManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -176,19 +176,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudioManager + Data: _CaseManager - Name: $v Entry: 7 Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudioManager + Data: _CaseManager - Name: k__BackingField Entry: 7 Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: AudioManager, Assembly-CSharp + Data: CaseManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -236,19 +236,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerMicrophone + Data: _AudioManager - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayerMicrophone + Data: _AudioManager - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Microphone, Assembly-CSharp + Data: AudioManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -296,16 +296,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudienceSilencer + Data: _PlayerMicrophone - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudienceSilencer + Data: _PlayerMicrophone - Name: k__BackingField - Entry: 9 - Data: 16 + Entry: 7 + Data: 20|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Microphone, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -323,13 +329,67 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 22|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: _AudienceSilencer + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudienceSilencer + - Name: k__BackingField + Entry: 9 + Data: 20 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -353,13 +413,13 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -368,7 +428,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -383,7 +443,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index 138858d..44410d1 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -38,6 +38,8 @@ public enum RoundSegmentType [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class GameManagerBase : UdonSharpBehaviour { + [SerializeField] protected VideoLoadIndicator _HostVideoLoadIndicator; + [SerializeField] protected HostCardManager _HostCard = null; [SerializeField] protected CaseManager _CaseManager; [SerializeField] protected AudioManager _AudioManager; @@ -117,6 +119,8 @@ public class GameManagerBase : UdonSharpBehaviour public virtual void SetOwnershipOfObjects(VRCPlayerApi NewOwner) { + Networking.SetOwner(NewOwner, _HostVideoLoadIndicator.gameObject); + Networking.SetOwner(NewOwner, _PlayerMicrophone.gameObject); Networking.SetOwner(NewOwner, _AudienceSilencer.gameObject); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index 7792350..844090a 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -44,25 +44,25 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 27 + Data: 28 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _HostCard + Data: _HostVideoLoadIndicator - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostCard + Data: _HostVideoLoadIndicator - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: HostCardManager, Assembly-CSharp + Data: VideoLoadIndicator, Assembly-CSharp - Name: Entry: 8 Data: @@ -116,19 +116,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseManager + Data: _HostCard - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseManager + Data: _HostCard - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CaseManager, Assembly-CSharp + Data: HostCardManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -176,19 +176,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudioManager + Data: _CaseManager - Name: $v Entry: 7 Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudioManager + Data: _CaseManager - Name: k__BackingField Entry: 7 Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: AudioManager, Assembly-CSharp + Data: CaseManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -236,19 +236,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerMicrophone + Data: _AudioManager - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayerMicrophone + Data: _AudioManager - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Microphone, Assembly-CSharp + Data: AudioManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -296,16 +296,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudienceSilencer + Data: _PlayerMicrophone - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudienceSilencer + Data: _PlayerMicrophone - Name: k__BackingField - Entry: 9 - Data: 16 + Entry: 7 + Data: 20|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Microphone, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -323,13 +329,67 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 22|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: _AudienceSilencer + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudienceSilencer + - Name: k__BackingField + Entry: 9 + Data: 20 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -353,13 +413,13 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -368,7 +428,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -383,7 +443,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -402,87 +462,18 @@ MonoBehaviour: - Name: Entry: 7 Data: - - Name: $k - Entry: 1 - Data: _VideoPlayer - - Name: $v - Entry: 7 - Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoPlayer - - Name: k__BackingField - Entry: 7 - Data: 26|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CaseVideoSyncPlayer, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 28|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 29|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: _TiebreakerData - Name: $v Entry: 7 - Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerData - Name: k__BackingField Entry: 7 - Data: 31|System.RuntimeType, mscorlib + Data: 30|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl, VRCSDKBase @@ -491,7 +482,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 31 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -506,10 +497,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 32|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -542,10 +542,10 @@ MonoBehaviour: Data: _GameHasBegun - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -986,10 +986,10 @@ MonoBehaviour: Data: _BuzzInAllowed - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1334,19 +1334,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _VideoMusicClueSkateboard + Data: _VideoPlayer - Name: $v Entry: 7 Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _VideoMusicClueSkateboard + Data: _VideoPlayer - Name: k__BackingField Entry: 7 Data: 84|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VideoMusicClueSkateboard, Assembly-CSharp + Data: CaseVideoSyncPlayer, Assembly-CSharp - Name: Entry: 8 Data: @@ -1472,19 +1472,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Modem + Data: _VideoMusicClueSkateboard - Name: $v Entry: 7 Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Modem + Data: _VideoMusicClueSkateboard - Name: k__BackingField Entry: 7 Data: 94|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Modem, Assembly-CSharp + Data: VideoMusicClueSkateboard, Assembly-CSharp - Name: Entry: 8 Data: @@ -1532,19 +1532,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ArrivalDisplay + Data: _Modem - Name: $v Entry: 7 Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ArrivalDisplay + Data: _Modem - Name: k__BackingField Entry: 7 Data: 98|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: ArrivalDisplay, Assembly-CSharp + Data: Modem, Assembly-CSharp - Name: Entry: 8 Data: @@ -1592,25 +1592,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LightningRoundAnimator + Data: _ArrivalDisplay - Name: $v Entry: 7 Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LightningRoundAnimator + Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 Data: 102|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule + Data: ArrivalDisplay, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 102 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1627,12 +1627,73 @@ MonoBehaviour: Entry: 7 Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 104|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: _LightningRoundAnimator + - Name: $v + Entry: 7 + Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LightningRoundAnimator + - Name: k__BackingField + Entry: 7 + Data: 106|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 106 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 104|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 108|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1641,7 +1702,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 105|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 109|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects @@ -1650,7 +1711,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 106|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 110|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index a73f36d..2b1b5f6 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -21,8 +21,6 @@ public class GameManagerRound1 : GameManagerBase { [Space] - [SerializeField] private CaseVideoSyncPlayer _VideoPlayer; - [SerializeField] private VRCUrl _TiebreakerData; [UdonSynced] protected bool _GameHasBegun = false; @@ -47,8 +45,9 @@ public class GameManagerRound1 : GameManagerBase [SerializeField] private PlayerPodium[] _PlayerPodiums; [Space, Header("Props")] - [SerializeField] private VideoMusicClueSkateboard _VideoMusicClueSkateboard; + [SerializeField] private CaseVideoSyncPlayer _VideoPlayer; [SerializeField] private ACMECrimenetComputer _ACMECrimenetComputer; + [SerializeField] private VideoMusicClueSkateboard _VideoMusicClueSkateboard; [SerializeField] private Modem _Modem; [SerializeField] private ArrivalDisplay _ArrivalDisplay; @@ -92,9 +91,10 @@ public class GameManagerRound1 : GameManagerBase public override void SetOwnershipOfObjects(VRCPlayerApi NewOwner) { Networking.SetOwner(NewOwner, _VideoPlayer.gameObject); + Networking.SetOwner(NewOwner, _ACMECrimenetComputer.gameObject); + Networking.SetOwner(NewOwner, _VideoMusicClueSkateboard.gameObject); Networking.SetOwner(NewOwner, _Modem.gameObject); Networking.SetOwner(NewOwner, _ArrivalDisplay.gameObject); - Networking.SetOwner(NewOwner, _VideoMusicClueSkateboard.gameObject); base.SetOwnershipOfObjects(NewOwner); } @@ -555,7 +555,6 @@ public class GameManagerRound1 : GameManagerBase private void BeginLightningRound() { SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayLightningRoundAnimation)); - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.Thunder); HostCardLightningRoundInterface Interface = (HostCardLightningRoundInterface)GetHostCardInterface(RoundSegmentType.LightningRound); @@ -575,6 +574,7 @@ public class GameManagerRound1 : GameManagerBase public void PlayLightningRoundAnimation() { _LightningRoundAnimator.SetBool("Lightning", true); + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.Thunder); SendCustomEventDelayedSeconds(nameof(ResetLightningRoundAnimation), 5.0f); } public void ResetLightningRoundAnimation() diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 2a23cac..d54d400 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,25 +44,25 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 21 + Data: 22 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _HostCard + Data: _HostVideoLoadIndicator - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostCard + Data: _HostVideoLoadIndicator - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: HostCardManager, Assembly-CSharp + Data: VideoLoadIndicator, Assembly-CSharp - Name: Entry: 8 Data: @@ -116,19 +116,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseManager + Data: _HostCard - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseManager + Data: _HostCard - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CaseManager, Assembly-CSharp + Data: HostCardManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -176,19 +176,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudioManager + Data: _CaseManager - Name: $v Entry: 7 Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudioManager + Data: _CaseManager - Name: k__BackingField Entry: 7 Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: AudioManager, Assembly-CSharp + Data: CaseManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -236,19 +236,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerMicrophone + Data: _AudioManager - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayerMicrophone + Data: _AudioManager - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Microphone, Assembly-CSharp + Data: AudioManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -296,16 +296,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudienceSilencer + Data: _PlayerMicrophone - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudienceSilencer + Data: _PlayerMicrophone - Name: k__BackingField - Entry: 9 - Data: 16 + Entry: 7 + Data: 20|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Microphone, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -323,13 +329,67 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 22|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: _AudienceSilencer + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudienceSilencer + - Name: k__BackingField + Entry: 9 + Data: 20 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -353,13 +413,13 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -368,7 +428,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -383,7 +443,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -407,13 +467,13 @@ MonoBehaviour: Data: _Modem - Name: $v Entry: 7 - Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Modem - Name: k__BackingField Entry: 7 - Data: 26|System.RuntimeType, mscorlib + Data: 30|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -437,79 +497,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 28|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 32|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 29|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: _ArrivalDisplay - - Name: $v - Entry: 7 - Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _ArrivalDisplay - - Name: k__BackingField - Entry: 7 - Data: 31|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: ArrivalDisplay, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -533,19 +533,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LocationBoard + Data: _ArrivalDisplay - Name: $v Entry: 7 Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LocationBoard + Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: LocationBoard, Assembly-CSharp + Data: ArrivalDisplay, Assembly-CSharp - Name: Entry: 8 Data: @@ -593,19 +593,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailChain + Data: _LocationBoard - Name: $v Entry: 7 Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _JailChain + Data: _LocationBoard - Name: k__BackingField Entry: 7 Data: 39|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: JailChain, Assembly-CSharp + Data: LocationBoard, Assembly-CSharp - Name: Entry: 8 Data: @@ -653,19 +653,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailPhone + Data: _JailChain - Name: $v Entry: 7 Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _JailPhone + Data: _JailChain - Name: k__BackingField Entry: 7 Data: 43|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: JailPhone, Assembly-CSharp + Data: JailChain, Assembly-CSharp - Name: Entry: 8 Data: @@ -713,19 +713,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailPlayer + Data: _JailPhone - Name: $v Entry: 7 Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _JailPlayer + Data: _JailPhone - Name: k__BackingField Entry: 7 Data: 47|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: RandomVideoPlayer, Assembly-CSharp + Data: JailPhone, Assembly-CSharp - Name: Entry: 8 Data: @@ -773,16 +773,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Location + Data: _JailPlayer - Name: $v Entry: 7 Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Location + Data: _JailPlayer - Name: k__BackingField Entry: 7 Data: 51|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: RandomVideoPlayer, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 53|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: _Location + - Name: $v + Entry: 7 + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Location + - Name: k__BackingField + Entry: 7 + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -791,7 +851,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 51 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -806,19 +866,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 53|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 57|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 54|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 58|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -840,78 +900,18 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _Landmarks - - Name: $v - Entry: 7 - Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Landmarks - - Name: k__BackingField - Entry: 7 - Data: 56|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String[], mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 56 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 58|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: _StageIndex - Name: $v Entry: 7 Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _StageIndex + Data: _Landmarks - Name: k__BackingField Entry: 7 Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Int32, mscorlib + Data: System.String[], mscorlib - Name: Entry: 8 Data: @@ -959,19 +959,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentPlayerCounter + Data: _StageIndex - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - Name: k__BackingField + Entry: 7 + Data: 64|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 64 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 66|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: _CurrentPlayerCounter + - Name: $v + Entry: 7 + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 60 + Data: 64 - Name: k__BackingField Entry: 9 - Data: 60 + Data: 64 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -986,13 +1046,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 65|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1016,16 +1076,16 @@ MonoBehaviour: Data: _Players - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Players - Name: k__BackingField Entry: 9 - Data: 56 + Data: 60 - Name: k__BackingField Entry: 9 - Data: 56 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1038,72 +1098,18 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 68|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: COLOR_STANDARD - - Name: $v - Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_STANDARD - - Name: k__BackingField - Entry: 7 - Data: 70|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 70 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - Name: _fieldAttributes Entry: 7 Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1121,67 +1127,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_RED + Data: COLOR_STANDARD - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_RED + Data: COLOR_STANDARD - Name: k__BackingField - Entry: 9 - Data: 70 + Entry: 7 + Data: 74|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 70 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 73|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_YELLOW - - Name: $v - Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_YELLOW - - Name: k__BackingField - Entry: 9 - Data: 70 - - Name: k__BackingField - Entry: 9 - Data: 70 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1217,19 +1181,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_GREEN + Data: COLOR_RED - Name: $v Entry: 7 Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_GREEN + Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 70 + Data: 74 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1260,6 +1224,102 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: COLOR_YELLOW + - Name: $v + Entry: 7 + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_YELLOW + - Name: k__BackingField + Entry: 9 + Data: 74 + - Name: k__BackingField + Entry: 9 + Data: 74 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 79|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_GREEN + - Name: $v + Entry: 7 + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_GREEN + - Name: k__BackingField + Entry: 9 + Data: 74 + - Name: k__BackingField + Entry: 9 + Data: 74 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index ae11e0c..a8c6fe6 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset @@ -44,25 +44,25 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 18 + Data: 19 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _HostCard + Data: _HostVideoLoadIndicator - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostCard + Data: _HostVideoLoadIndicator - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: HostCardManager, Assembly-CSharp + Data: VideoLoadIndicator, Assembly-CSharp - Name: Entry: 8 Data: @@ -116,19 +116,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseManager + Data: _HostCard - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseManager + Data: _HostCard - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CaseManager, Assembly-CSharp + Data: HostCardManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -176,19 +176,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudioManager + Data: _CaseManager - Name: $v Entry: 7 Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudioManager + Data: _CaseManager - Name: k__BackingField Entry: 7 Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: AudioManager, Assembly-CSharp + Data: CaseManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -236,19 +236,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerMicrophone + Data: _AudioManager - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayerMicrophone + Data: _AudioManager - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Microphone, Assembly-CSharp + Data: AudioManager, Assembly-CSharp - Name: Entry: 8 Data: @@ -296,16 +296,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AudienceSilencer + Data: _PlayerMicrophone - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AudienceSilencer + Data: _PlayerMicrophone - Name: k__BackingField - Entry: 9 - Data: 16 + Entry: 7 + Data: 20|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Microphone, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -323,13 +329,67 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 22|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: _AudienceSilencer + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudienceSilencer + - Name: k__BackingField + Entry: 9 + Data: 20 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -353,13 +413,13 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -368,7 +428,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -383,7 +443,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -407,13 +467,13 @@ MonoBehaviour: Data: _Maps - Name: $v Entry: 7 - Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Maps - Name: k__BackingField Entry: 7 - Data: 26|System.RuntimeType, mscorlib + Data: 30|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMap[], Assembly-CSharp @@ -422,7 +482,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 27|System.RuntimeType, mscorlib + Data: 31|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -443,79 +503,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 29|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 33|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 30|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: _Markers - - Name: $v - Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Markers - - Name: k__BackingField - Entry: 7 - Data: 32|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: FloorMapMarker[], Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 27 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -539,25 +539,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _EndingPlayer + Data: _Markers - Name: $v Entry: 7 Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _EndingPlayer + Data: _Markers - Name: k__BackingField Entry: 7 Data: 36|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: RandomVideoPlayer, Assembly-CSharp + Data: FloorMapMarker[], Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 31 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -599,58 +599,46 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentlyActiveMap + Data: _EndingPlayer - Name: $v Entry: 7 Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentlyActiveMap + Data: _EndingPlayer - Name: k__BackingField Entry: 7 Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: ContinentMap, Assembly-CSharp + Data: RandomVideoPlayer, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 41|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 4 - Name: 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: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 44|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -671,19 +659,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ActiveMarker + Data: _CurrentlyActiveMap - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ActiveMarker + Data: _CurrentlyActiveMap - Name: k__BackingField - Entry: 9 - Data: 41 + Entry: 7 + Data: 44|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: ContinentMap, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField - Entry: 9 - Data: 41 + Entry: 7 + Data: 45|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -731,19 +731,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _StageIndex + Data: _ActiveMarker - Name: $v Entry: 7 Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _StageIndex + Data: _ActiveMarker - Name: k__BackingField Entry: 9 - Data: 41 + Data: 45 - Name: k__BackingField Entry: 9 - Data: 41 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -761,13 +761,73 @@ MonoBehaviour: Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: 51|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 52|UdonSharp.FieldChangeCallbackAttribute, 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: _StageIndex + - Name: $v + Entry: 7 + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - Name: k__BackingField + Entry: 9 + Data: 45 + - Name: k__BackingField + Entry: 9 + Data: 45 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 55|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -788,13 +848,13 @@ MonoBehaviour: Data: _ContinentData - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 53|System.RuntimeType, mscorlib + Data: 57|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -803,7 +863,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 53 + Data: 57 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -818,7 +878,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -842,13 +902,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 56|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -857,7 +917,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 41 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -872,13 +932,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -902,16 +962,16 @@ MonoBehaviour: Data: _RunTimer - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RunTimer - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -926,13 +986,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 61|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 65|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -956,16 +1016,16 @@ MonoBehaviour: Data: _Timer - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Timer - Name: k__BackingField Entry: 9 - Data: 41 + Data: 45 - Name: k__BackingField Entry: 9 - Data: 41 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -980,13 +1040,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 64|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 68|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1008,78 +1068,18 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _SuccessCounter - - Name: $v - Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _SuccessCounter - - Name: k__BackingField - Entry: 9 - Data: 41 - - Name: k__BackingField - Entry: 9 - Data: 41 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 68|UdonSharp.FieldChangeCallbackAttribute, 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: _FailureCounter - Name: $v Entry: 7 Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FailureCounter + Data: _SuccessCounter - Name: k__BackingField Entry: 9 - Data: 41 + Data: 45 - Name: k__BackingField Entry: 9 - Data: 41 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1122,6 +1122,66 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _FailureCounter + - Name: $v + Entry: 7 + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FailureCounter + - Name: k__BackingField + Entry: 9 + Data: 45 + - Name: k__BackingField + Entry: 9 + Data: 45 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 76|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Podium/PlayerPodium.asset b/Assets/UdonSharp/Podium/PlayerPodium.asset index e2d55fb..7b7138d 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.asset +++ b/Assets/UdonSharp/Podium/PlayerPodium.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 23 + Data: 24 - Name: Entry: 7 Data: @@ -848,25 +848,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AuxiliaryVideoScreen + Data: _VideoLoadIndicator - Name: $v Entry: 7 Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AuxiliaryVideoScreen + Data: _VideoLoadIndicator - Name: k__BackingField Entry: 7 Data: 57|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Transform, UnityEngine.CoreModule + Data: VideoLoadIndicator, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 57 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -908,19 +908,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AuxiliaryMapScreen + Data: _AuxiliaryVideoScreen - Name: $v Entry: 7 Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AuxiliaryMapScreen + Data: _AuxiliaryVideoScreen - Name: k__BackingField - Entry: 9 - Data: 57 + Entry: 7 + Data: 61|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 57 + Data: 61 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -935,13 +941,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -962,25 +968,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _OwnershipInteract + Data: _AuxiliaryMapScreen - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _OwnershipInteract + Data: _AuxiliaryMapScreen - Name: k__BackingField - Entry: 7 - Data: 64|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CustomEventInteraction, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 61 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 61 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1022,10 +1022,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HighlightEffect + Data: _OwnershipInteract - Name: $v Entry: 7 Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _OwnershipInteract + - Name: k__BackingField + Entry: 7 + Data: 68|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CustomEventInteraction, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 7 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _HighlightEffect + - Name: $v + Entry: 7 + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _HighlightEffect @@ -1049,13 +1109,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 69|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 73|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1064,7 +1124,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 70|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 74|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects @@ -1073,7 +1133,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1097,7 +1157,7 @@ MonoBehaviour: Data: _ScorecardObject - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ScorecardObject @@ -1119,66 +1179,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 74|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: _NameplateUI - - Name: $v - Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _NameplateUI - - Name: k__BackingField - Entry: 7 - Data: 76|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 76 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - Name: _fieldAttributes Entry: 7 Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1208,19 +1208,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ScorecardUI + Data: _NameplateUI - Name: $v Entry: 7 Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ScorecardUI + Data: _NameplateUI - Name: k__BackingField - Entry: 9 - Data: 76 + Entry: 7 + Data: 80|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 76 + Data: 80 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1235,13 +1241,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1262,25 +1268,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ScorecardBackground + Data: _ScorecardUI - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ScorecardBackground + Data: _ScorecardUI - Name: k__BackingField - Entry: 7 - Data: 83|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.UI.Image, UnityEngine.UI - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 80 - Name: k__BackingField Entry: 9 - Data: 83 + Data: 80 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1322,19 +1322,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SpawnPoint + Data: _ScorecardBackground - Name: $v Entry: 7 Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SpawnPoint + Data: _ScorecardBackground - Name: k__BackingField - Entry: 9 - Data: 57 + Entry: 7 + Data: 87|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Image, UnityEngine.UI + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 57 + Data: 87 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1349,13 +1355,67 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 89|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: _SpawnPoint + - Name: $v + Entry: 7 + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _SpawnPoint + - Name: k__BackingField + Entry: 9 + Data: 61 + - Name: k__BackingField + Entry: 9 + Data: 61 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 88|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 92|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1364,7 +1424,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 89|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 93|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Miscellaneous @@ -1373,7 +1433,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 90|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1397,7 +1457,7 @@ MonoBehaviour: Data: _FlashingScoreboardCounter - Name: $v Entry: 7 - Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FlashingScoreboardCounter @@ -1421,7 +1481,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Podium/PlayerPodium.cs b/Assets/UdonSharp/Podium/PlayerPodium.cs index 44084ea..b7e46c3 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.cs +++ b/Assets/UdonSharp/Podium/PlayerPodium.cs @@ -32,6 +32,7 @@ public class PlayerPodium : UdonSharpBehaviour [SerializeField] private RiskCardGroup _RiskCards; [SerializeField] private Buzzer _Buzzer; [SerializeField] private GameObject _Pedestal; + [SerializeField] private VideoLoadIndicator _VideoLoadIndicator; [SerializeField] private Transform _AuxiliaryVideoScreen; [SerializeField] private Transform _AuxiliaryMapScreen; @@ -101,6 +102,7 @@ public class PlayerPodium : UdonSharpBehaviour Networking.SetOwner(Networking.LocalPlayer, _ChoiceCards.gameObject); Networking.SetOwner(Networking.LocalPlayer, _RiskCards.gameObject); Networking.SetOwner(Networking.LocalPlayer, _Buzzer.gameObject); + Networking.SetOwner(Networking.LocalPlayer, _VideoLoadIndicator.gameObject); PlayerName = Networking.LocalPlayer.displayName; _PlayerID = Networking.LocalPlayer.playerId;