diff --git a/.gitignore b/.gitignore index d13bacd..4ce41e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ Assets/_LastBuild* Assets/SerializedUdonPrograms/ +kernelsCache/ Library/ Logs/ Temp/ diff --git a/Assets/Materials/Assorted/M_Wood.mat b/Assets/Materials/Assorted/M_Wood.mat index 033ddc3..607ba9a 100644 --- a/Assets/Materials/Assorted/M_Wood.mat +++ b/Assets/Materials/Assorted/M_Wood.mat @@ -47,7 +47,7 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: cb072d3765e9cf443b3c71b63f2c4b9c, type: 3} - m_Scale: {x: 4.99, y: 0.08} + m_Scale: {x: 2, y: 0.03} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} diff --git a/Assets/Models/SM_Round1Floor.fbx b/Assets/Models/SM_Round1Floor.fbx index aac25e6..dc5ddff 100644 Binary files a/Assets/Models/SM_Round1Floor.fbx and b/Assets/Models/SM_Round1Floor.fbx differ diff --git a/Assets/Models/SM_Round1Floor.fbx.meta b/Assets/Models/SM_Round1Floor.fbx.meta index e489bfa..2715d07 100644 --- a/Assets/Models/SM_Round1Floor.fbx.meta +++ b/Assets/Models/SM_Round1Floor.fbx.meta @@ -48,7 +48,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 1 + generateSecondaryUV: 0 useFileUnits: 1 keepQuads: 0 weldVertices: 1 diff --git a/Assets/Models/SM_Round2Floor.fbx b/Assets/Models/SM_Round2Floor.fbx index 5ea44ed..82975a1 100644 Binary files a/Assets/Models/SM_Round2Floor.fbx and b/Assets/Models/SM_Round2Floor.fbx differ diff --git a/Assets/Models/SM_Round2Floor.fbx.meta b/Assets/Models/SM_Round2Floor.fbx.meta index 55c250f..49c948f 100644 --- a/Assets/Models/SM_Round2Floor.fbx.meta +++ b/Assets/Models/SM_Round2Floor.fbx.meta @@ -48,7 +48,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 1 + generateSecondaryUV: 0 useFileUnits: 1 keepQuads: 0 weldVertices: 1 diff --git a/Assets/Models/SM_Round2Podium.fbx b/Assets/Models/SM_Round2Podium.fbx new file mode 100644 index 0000000..eb32c23 Binary files /dev/null and b/Assets/Models/SM_Round2Podium.fbx differ diff --git a/Assets/Models/SM_Round2Podium.fbx.meta b/Assets/Models/SM_Round2Podium.fbx.meta new file mode 100644 index 0000000..329f396 --- /dev/null +++ b/Assets/Models/SM_Round2Podium.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: e1d6ac734219d0644a15c88ffde4b9f0 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 1 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SM_VHS.fbx.meta b/Assets/Models/SM_VHS.fbx.meta index 923f957..8830ac8 100644 --- a/Assets/Models/SM_VHS.fbx.meta +++ b/Assets/Models/SM_VHS.fbx.meta @@ -5,7 +5,7 @@ ModelImporter: internalIDToNameTable: [] externalObjects: {} materials: - materialImportMode: 2 + materialImportMode: 0 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -78,7 +78,7 @@ ModelImporter: blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] - importAnimation: 1 + importAnimation: 0 humanDescription: serializedVersion: 3 human: [] @@ -97,7 +97,7 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 0 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 diff --git a/Assets/Scenes/witwics.lighting b/Assets/Scenes/witwics.lighting index d7baa0b..3952244 100644 --- a/Assets/Scenes/witwics.lighting +++ b/Assets/Scenes/witwics.lighting @@ -18,8 +18,8 @@ LightingSettings: m_UsingShadowmask: 0 m_BakeBackend: 2 m_LightmapMaxSize: 1024 - m_BakeResolution: 32 - m_Padding: 7 + m_BakeResolution: 16 + m_Padding: 16 m_LightmapCompression: 3 m_AO: 1 m_AOMaxDistance: 1 @@ -40,9 +40,9 @@ LightingSettings: m_FinalGatherFiltering: 1 m_PVRCulling: 0 m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVREnvironmentSampleCount: 256 + m_PVRDirectSampleCount: 512 + m_PVRSampleCount: 4096 + m_PVREnvironmentSampleCount: 2048 m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 4 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 591fd3b..d371dd8 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -887,13 +887,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 33752258} serializedVersion: 2 - m_LocalRotation: {x: 0.026010746, y: -0.3991687, z: 0.70730406, w: 0.58284545} + m_LocalRotation: {x: 0.06642086, y: -0.36518085, z: 0.70465803, w: 0.6047216} m_LocalPosition: {x: -0.7910023, y: 5, z: 4.384001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 944796117} - m_LocalEulerAnglesHint: {x: 36.512, y: 327.781, z: 90.136} + m_LocalEulerAnglesHint: {x: 36.512, y: 334.339, z: 90.136} --- !u!108 &33752260 Light: m_ObjectHideFlags: 0 @@ -8005,7 +8005,7 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: 8df5fbca9e07d19448d12e788be6d510, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 8df5fbca9e07d19448d12e788be6d510, type: 3} @@ -8097,7 +8097,7 @@ PrefabInstance: - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.2 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -11626,22 +11626,27 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: fab43599890897f468898e08300c2ce1, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: fab43599890897f468898e08300c2ce1, type: 3} propertyPath: m_StitchLightmapSeams - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: fab43599890897f468898e08300c2ce1, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + objectReference: {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - target: {fileID: -7511558181221131132, guid: fab43599890897f468898e08300c2ce1, type: 3} propertyPath: m_Materials.Array.data[1] value: + objectReference: {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - target: {fileID: -7511558181221131132, guid: fab43599890897f468898e08300c2ce1, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: objectReference: {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - target: {fileID: 919132149155446097, guid: fab43599890897f468898e08300c2ce1, type: 3} @@ -11961,6 +11966,7 @@ MonoBehaviour: _Player2TeleportLocation: {fileID: 172614117} _Player3TeleportLocation: {fileID: 937910639} _AudienceTeleportLocation: {fileID: 1143449486} + _HostTeleportButton: {fileID: 600640153} _PlayerPodiums: - {fileID: 4438766482650780795} - {fileID: 1993364535} @@ -12984,12 +12990,12 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: 32ec9ca29cf431d42891b08b6c42eb19, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 2 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 32ec9ca29cf431d42891b08b6c42eb19, type: 3} propertyPath: m_StitchLightmapSeams - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 32ec9ca29cf431d42891b08b6c42eb19, type: 3} @@ -20442,7 +20448,8 @@ MonoBehaviour: _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} - _Microphone: {fileID: 431721603} + _PlayerMicrophone: {fileID: 431721603} + _AudienceSilencer: {fileID: 344488391} _VideoPlayer: {fileID: 2057791820} _TiebreakerData: url: https://witwics-dev.github.io/TiebreakerData.json @@ -26419,7 +26426,7 @@ PrefabInstance: - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.2 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -28845,6 +28852,98 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 807377335} m_CullTransparentMesh: 1 +--- !u!1001 &808969077 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1230983058} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.000000040028848 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.000000049378123 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - target: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_Name + value: Player 1 Podium + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1149080868} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 821639016} + m_SourcePrefab: {fileID: 100100000, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} +--- !u!4 &808969078 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + m_PrefabInstance: {fileID: 808969077} + m_PrefabAsset: {fileID: 0} --- !u!1001 &809107837 PrefabInstance: m_ObjectHideFlags: 0 @@ -29404,6 +29503,33 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &821639013 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + m_PrefabInstance: {fileID: 808969077} + m_PrefabAsset: {fileID: 0} +--- !u!65 &821639016 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 821639013} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.40000004, y: 0.14999999, z: 0.85} + m_Center: {x: -0.00000047683716, y: -0.00000047683716, z: 0.425} --- !u!1 &824392456 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7329620890145888132, guid: e9914385266bca24db809c39e395f03c, @@ -30089,6 +30215,7 @@ MonoBehaviour: _Round3Manager: {fileID: 969831474} _HostCard: {fileID: 379391087} _CaseManagerList: {fileID: 1145254423} + _HostTeleportButton: {fileID: 600640153} --- !u!4 &841163055 Transform: m_ObjectHideFlags: 0 @@ -30150,6 +30277,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} +--- !u!1 &848975620 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + m_PrefabInstance: {fileID: 2134288141} + m_PrefabAsset: {fileID: 0} --- !u!1 &850249521 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1611839904907316448, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -30405,7 +30538,8 @@ MonoBehaviour: _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} - _Microphone: {fileID: 51189182} + _PlayerMicrophone: {fileID: 51189182} + _AudienceSilencer: {fileID: 344488391} _Modem: {fileID: 966631266} _ArrivalDisplay: {fileID: 2013644315} _LocationBoard: {fileID: 1748199014} @@ -31323,7 +31457,7 @@ PrefabInstance: - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.2 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -32743,7 +32877,8 @@ MonoBehaviour: _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} - _Microphone: {fileID: 772205216} + _PlayerMicrophone: {fileID: 772205216} + _AudienceSilencer: {fileID: 344488391} _Maps: - {fileID: 886213381} - {fileID: 1534889734} @@ -39458,13 +39593,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1098268946} serializedVersion: 2 - m_LocalRotation: {x: -0.14896803, y: -0.5304062, z: 0.6919275, w: 0.46659854} + m_LocalRotation: {x: -0.18335958, y: -0.5530612, z: 0.68361825, w: 0.43950963} m_LocalPosition: {x: 1.4189978, y: 5, z: 6.594001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 944796117} - m_LocalEulerAnglesHint: {x: 36.512, y: 299.269, z: 90.136} + m_LocalEulerAnglesHint: {x: 36.512, y: 293.54, z: 90.136} --- !u!108 &1098268948 Light: m_ObjectHideFlags: 0 @@ -40708,13 +40843,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1149080867} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.000000014901159} - m_LocalPosition: {x: 0, y: -0.49999997, z: 2.120009} - m_LocalScale: {x: 2.4999995, y: 1.1764705, z: 6.666667} + m_LocalRotation: {x: -0.000000028304681, y: 0.70710677, z: 0.7071068, w: 0.00000006110229} + m_LocalPosition: {x: 0, y: -0.31800056, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 208954849} - m_Father: {fileID: 1824283968} + m_Father: {fileID: 808969078} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &1150079506 GameObject: @@ -42581,8 +42716,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1824283968} - - {fileID: 2073405177} + - {fileID: 808969078} + - {fileID: 2134288142} m_Father: {fileID: 1583513123} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1231090884 stripped @@ -45578,13 +45713,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1353767605} serializedVersion: 2 - m_LocalRotation: {x: -0.13881761, y: -0.5862881, z: 0.6986138, w: 0.38592064} + m_LocalRotation: {x: -0.23297022, y: -0.63351977, z: 0.67309445, w: 0.3021942} m_LocalPosition: {x: 1.7819978, y: 5, z: 8.835002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 944796117} - m_LocalEulerAnglesHint: {x: 45.401, y: 292.96802, z: 91.197} + m_LocalEulerAnglesHint: {x: 45.401, y: 277.262, z: 91.197} --- !u!108 &1353767607 Light: m_ObjectHideFlags: 0 @@ -45670,7 +45805,7 @@ PrefabInstance: - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.2 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -47854,7 +47989,7 @@ Transform: m_GameObject: {fileID: 1451322101} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.573578, z: -0, w: -0.81915104} - m_LocalPosition: {x: 0.265, y: 0.00635, z: -2.7308} + m_LocalPosition: {x: 0.265, y: 0.10795, z: -2.7308} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -57726,7 +57861,7 @@ PrefabInstance: - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.2 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} @@ -58563,13 +58698,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1617469055} serializedVersion: 2 - m_LocalRotation: {x: 0.09087256, y: -0.4328771, z: 0.7064518, w: 0.55252653} + m_LocalRotation: {x: 0.22657478, y: -0.31711343, z: 0.6752744, w: 0.62618494} m_LocalPosition: {x: -3.196, y: 5, z: 4.07} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 944796117} - m_LocalEulerAnglesHint: {x: 45.401, y: 330.105, z: 91.197} + m_LocalEulerAnglesHint: {x: 45.401, y: 352.542, z: 91.197} --- !u!108 &1617469057 Light: m_ObjectHideFlags: 0 @@ -58693,7 +58828,7 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: 2b5f22e139915474a9f2e20c3fd5f092, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 2b5f22e139915474a9f2e20c3fd5f092, type: 3} @@ -59223,7 +59358,7 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: 0e3e4782d1740d046b6dcc14b34885d3, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 0e3e4782d1740d046b6dcc14b34885d3, type: 3} @@ -61120,13 +61255,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1707600713} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.000000044703505} - m_LocalPosition: {x: 0, y: -0.49999997, z: 2.1200056} - m_LocalScale: {x: 2.4999995, y: 1.1764705, z: 6.666667} + m_LocalRotation: {x: -0.000000028304681, y: 0.70710677, z: 0.7071068, w: 0.00000006110229} + m_LocalPosition: {x: 0, y: -0.31800127, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1204040936} - m_Father: {fileID: 2073405177} + m_Father: {fileID: 2134288142} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &1708476651 GameObject: @@ -64121,112 +64256,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1294116878969307432} m_PrefabAsset: {fileID: 0} ---- !u!1 &1824283967 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1824283968} - - component: {fileID: 1824283971} - - component: {fileID: 1824283970} - - component: {fileID: 1824283969} - m_Layer: 0 - m_Name: Player 1 Podium - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &1824283968 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1824283967} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.000000014901159, z: -0, w: 1} - m_LocalPosition: {x: 0.4, y: 0.425, z: 0} - m_LocalScale: {x: 0.4, y: 0.85, z: 0.14999998} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1149080868} - m_Father: {fileID: 1230983058} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1824283969 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1824283967} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1824283970 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1824283967} - 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: bc5888e576e9cb34bab7b7af42d2b63f, 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 &1824283971 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1824283967} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1825216399 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5271460584489985050, guid: be33bc7f6c414e6409becfa348b9310d, @@ -71628,112 +71657,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2071042737} m_CullTransparentMesh: 1 ---- !u!1 &2073405176 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2073405177} - - component: {fileID: 2073405180} - - component: {fileID: 2073405179} - - component: {fileID: 2073405178} - m_Layer: 0 - m_Name: Player 2 Podium - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &2073405177 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2073405176} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.000000014901159, z: -0, w: 1} - m_LocalPosition: {x: -0.4, y: 0.425, z: 0} - m_LocalScale: {x: 0.4, y: 0.85, z: 0.14999998} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1707600714} - m_Father: {fileID: 1230983058} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &2073405178 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2073405176} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &2073405179 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2073405176} - 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: bc5888e576e9cb34bab7b7af42d2b63f, 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 &2073405180 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2073405176} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2074261459 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5945275497271804479, guid: e9914385266bca24db809c39e395f03c, @@ -72482,7 +72405,7 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: 5d7291fcde881de4aa65a8ad07e28f4b, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 5d7291fcde881de4aa65a8ad07e28f4b, type: 3} @@ -72736,7 +72659,7 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_ScaleInLightmap - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} @@ -72811,6 +72734,119 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2134288141 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1230983058} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.000000040028848 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.000000049378123 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - target: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_Name + value: Player 2 Podium + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1707600714} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2134288145} + m_SourcePrefab: {fileID: 100100000, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} +--- !u!4 &2134288142 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + m_PrefabInstance: {fileID: 2134288141} + m_PrefabAsset: {fileID: 0} +--- !u!65 &2134288145 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 848975620} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.40000004, y: 0.14999999, z: 0.85} + m_Center: {x: -0.00000047683716, y: -0.00000047683716, z: 0.425} --- !u!1 &2136439117 GameObject: m_ObjectHideFlags: 0 @@ -74172,7 +74208,7 @@ PrefabInstance: - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} propertyPath: m_ScaleInLightmap - value: 0.2 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 2708739958050211779, guid: d065e253d298f0f44bb1d1c926531103, type: 3} diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index b055f4a..7dd6c5b 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 62dd2cf..f049350 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/Lightmap-1_comp_light.exr b/Assets/Scenes/witwics/Lightmap-1_comp_light.exr deleted file mode 100644 index 3020d0e..0000000 Binary files a/Assets/Scenes/witwics/Lightmap-1_comp_light.exr and /dev/null differ diff --git a/Assets/Scenes/witwics/Lightmap-1_comp_light.exr.meta b/Assets/Scenes/witwics/Lightmap-1_comp_light.exr.meta deleted file mode 100644 index ff59163..0000000 --- a/Assets/Scenes/witwics/Lightmap-1_comp_light.exr.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: c199ac0f91be0084d99fac83604ed905 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 6 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index 8efd9de..f1a578d 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index 4f7ef11..f011bf9 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index 6cc8d61..ca1b345 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index af3fbb0..894bb3f 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index 463e4cd..ce80a41 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Textures/T_VHS.png b/Assets/Textures/T_VHS.png index 4f40c46..b315cd3 100644 Binary files a/Assets/Textures/T_VHS.png and b/Assets/Textures/T_VHS.png differ diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/CaseVideoSyncPlayer.cs index 6cfcbf3..6acc8c5 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.cs @@ -1,6 +1,4 @@  -using Newtonsoft.Json.Linq; -using System; using UdonSharp; using UnityEngine; using VRC.SDK3.Components.Video; @@ -199,14 +197,13 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour } public void TryLoadURL() { - if (VideoIndex < _CaseManager.GetVideoCount()) + if (VideoIndex >= 0 && VideoIndex < _CaseManager.GetVideoCount()) { _VideoPlayer.LoadURL(_CaseManager.GetVideo(VideoIndex, _UseFallback)); } else { - Debug.LogWarning("[CaseVideoSyncPlayer] Index is out of range. Retrying..."); - SendCustomEventDelayedSeconds(nameof(TryLoadURL), 1.0f); + Debug.LogWarning("[CaseVideoSyncPlayer] Index is out of range."); } } diff --git a/Assets/UdonSharp/Game Managers/CaseManager.asset b/Assets/UdonSharp/Game Managers/CaseManager.asset index 708dc11..7db9429 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.asset +++ b/Assets/UdonSharp/Game Managers/CaseManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 22 + Data: 23 - Name: Entry: 7 Data: @@ -443,19 +443,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileCluesURL + Data: _HostTeleportButton - Name: $v Entry: 7 Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileCluesURL + Data: _HostTeleportButton - Name: k__BackingField Entry: 7 Data: 31|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCUrl, VRCSDKBase + Data: UnityEngine.UI.Button, UnityEngine.UI - Name: Entry: 8 Data: @@ -466,14 +466,14 @@ MonoBehaviour: 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: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -482,7 +482,7 @@ MonoBehaviour: Data: 1 - Name: Entry: 7 - Data: 33|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -503,19 +503,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileLootImage + Data: _CaseFileCluesURL - Name: $v Entry: 7 Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileLootImage + Data: _CaseFileCluesURL - Name: k__BackingField - Entry: 9 - Data: 31 + Entry: 7 + Data: 35|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl, VRCSDKBase + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 31 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -530,13 +536,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 37|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -557,25 +563,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileMaps + Data: _CaseFileLootImage - Name: $v Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileMaps + Data: _CaseFileLootImage - Name: k__BackingField - Entry: 7 - Data: 38|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDKBase.VRCUrl[], VRCSDKBase - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 35 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -617,19 +617,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileVideos + Data: _CaseFileMaps - Name: $v Entry: 7 Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFileMaps + - Name: k__BackingField + Entry: 7 + Data: 42|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl[], VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 42 + - 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: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 44|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: _CaseFileVideos + - Name: $v + Entry: 7 + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileVideos - Name: k__BackingField Entry: 9 - Data: 38 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -644,13 +704,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -674,16 +734,16 @@ MonoBehaviour: Data: _CaseFileVideosFallback - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileVideosFallback - Name: k__BackingField Entry: 9 - Data: 38 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -698,13 +758,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 46|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -728,76 +788,16 @@ MonoBehaviour: Data: _CaseFileClueImages - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileClueImages - Name: k__BackingField Entry: 9 - Data: 38 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 38 - - 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: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 49|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: _CaseTitle - - Name: $v - Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CaseTitle - - Name: k__BackingField - Entry: 7 - Data: 51|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 51 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -839,19 +839,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseDescription + Data: _CaseTitle - Name: $v Entry: 7 Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseDescription + Data: _CaseTitle - Name: k__BackingField - Entry: 9 - Data: 51 + Entry: 7 + Data: 55|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 51 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -866,13 +872,13 @@ MonoBehaviour: 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 - Name: Entry: 7 - Data: 56|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 57|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -893,25 +899,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseIntroVideo + Data: _CaseDescription - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseIntroVideo + Data: _CaseDescription - Name: k__BackingField - Entry: 7 - Data: 58|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 58 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -953,19 +953,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseIntroVideoTranscript + Data: _CaseIntroVideo - Name: $v Entry: 7 Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseIntroVideo + - Name: k__BackingField + Entry: 7 + Data: 62|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 62 + - 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: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 64|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: _CaseIntroVideoTranscript + - Name: $v + Entry: 7 + Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseIntroVideoTranscript - Name: k__BackingField Entry: 9 - Data: 51 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 51 + Data: 55 - 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: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 63|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1010,76 +1070,16 @@ MonoBehaviour: Data: _StolenLoot - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StolenLoot - Name: k__BackingField Entry: 9 - Data: 51 + Data: 55 - 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: 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: _AccusedCrook - - Name: $v - Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AccusedCrook - - Name: k__BackingField - Entry: 7 - Data: 68|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: AccusedCrook, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 58 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1121,25 +1121,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FinalRoundContinent + Data: _AccusedCrook - Name: $v Entry: 7 Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FinalRoundContinent + Data: _AccusedCrook - Name: k__BackingField Entry: 7 Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: ContinentMap, Assembly-CSharp + Data: AccusedCrook, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 58 + Data: 62 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1181,25 +1181,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentWinningPlayers + Data: _FinalRoundContinent - Name: $v Entry: 7 Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentWinningPlayers + Data: _FinalRoundContinent - Name: k__BackingField Entry: 7 Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.String[], mscorlib + Data: ContinentMap, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 76 + Data: 62 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1241,16 +1241,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HostOwner + Data: _CurrentWinningPlayers - Name: $v Entry: 7 Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostOwner + Data: _CurrentWinningPlayers - Name: k__BackingField Entry: 7 Data: 80|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 80 + - 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: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 82|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: _HostOwner + - Name: $v + Entry: 7 + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _HostOwner + - Name: k__BackingField + Entry: 7 + Data: 84|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase @@ -1259,7 +1319,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 80 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1274,7 +1334,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1298,13 +1358,13 @@ MonoBehaviour: Data: _CaseFileDictionary - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileDictionary - Name: k__BackingField Entry: 7 - Data: 83|System.RuntimeType, mscorlib + Data: 87|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1313,7 +1373,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 83 + Data: 87 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1328,7 +1388,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 0b6d5b5..5e0bb3c 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -1,6 +1,7 @@  using UdonSharp; using UnityEngine; +using UnityEngine.UI; using VRC.SDK3.Data; using VRC.SDK3.StringLoading; using VRC.SDKBase; @@ -38,6 +39,7 @@ public class CaseManager : UdonSharpBehaviour [SerializeField] private HostCardManager _HostCard; [SerializeField] private CaseManagerListView _CaseManagerList; + [SerializeField] private Button _HostTeleportButton; [UdonSynced] private VRCUrl _CaseFileCluesURL; [UdonSynced] private VRCUrl _CaseFileLootImage; @@ -197,6 +199,8 @@ public class CaseManager : UdonSharpBehaviour Debug.LogError("[CaseManager] Malformed case file. " + ErrorString); } + _HostTeleportButton.gameObject.SetActive(true); + RequestSerialization(); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.asset b/Assets/UdonSharp/Game Managers/GameManagerBase.asset index 0bbecd4..f67d338 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 5 + Data: 6 - Name: Entry: 7 Data: @@ -236,13 +236,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Microphone + Data: _PlayerMicrophone - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Microphone + Data: _PlayerMicrophone - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib @@ -296,16 +296,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _AudienceSilencer - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudienceSilencer + - Name: k__BackingField + Entry: 9 + Data: 16 + - 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: 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: _AllowInteractionFromHostCard + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 20|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -314,7 +368,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 20 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -329,7 +383,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|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 9178a0b..138858d 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -41,7 +41,8 @@ public class GameManagerBase : UdonSharpBehaviour [SerializeField] protected HostCardManager _HostCard = null; [SerializeField] protected CaseManager _CaseManager; [SerializeField] protected AudioManager _AudioManager; - [SerializeField] protected Microphone _Microphone; + [SerializeField] protected Microphone _PlayerMicrophone; + [SerializeField] protected Microphone _AudienceSilencer; private bool _AllowInteractionFromHostCard = false; @@ -96,22 +97,28 @@ public class GameManagerBase : UdonSharpBehaviour { _AllowInteractionFromHostCard = true; - EnableMicrophone(true); + EnablePlayerMicrophone(true); } public virtual void DeinitialiseGameMode() { - EnableMicrophone(false); + EnablePlayerMicrophone(false); } - public void EnableMicrophone(bool Enable) + public void EnablePlayerMicrophone(bool Enable) { - _Microphone.gameObject.SetActive(Enable); + _PlayerMicrophone.gameObject.SetActive(Enable); + } + + public void EnableAudienceSilencer(bool Enable) + { + _AudienceSilencer.gameObject.SetActive(Enable); } public virtual void SetOwnershipOfObjects(VRCPlayerApi NewOwner) { - Networking.SetOwner(NewOwner, _Microphone.gameObject); + Networking.SetOwner(NewOwner, _PlayerMicrophone.gameObject); + Networking.SetOwner(NewOwner, _AudienceSilencer.gameObject); } public virtual void LoadQuestionData(DataToken Data) { } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index 83d8621..7792350 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 26 + Data: 27 - Name: Entry: 7 Data: @@ -236,13 +236,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Microphone + Data: _PlayerMicrophone - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Microphone + Data: _PlayerMicrophone - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib @@ -296,16 +296,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _AudienceSilencer - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudienceSilencer + - Name: k__BackingField + Entry: 9 + Data: 16 + - 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: 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: _AllowInteractionFromHostCard + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 20|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -314,7 +368,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 20 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -329,7 +383,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -353,13 +407,13 @@ MonoBehaviour: Data: _VideoPlayer - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayer - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaseVideoSyncPlayer, Assembly-CSharp @@ -383,13 +437,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 28|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -398,7 +452,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -422,13 +476,13 @@ MonoBehaviour: Data: _TiebreakerData - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerData - Name: k__BackingField Entry: 7 - Data: 28|System.RuntimeType, mscorlib + Data: 31|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl, VRCSDKBase @@ -437,7 +491,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 28 + Data: 31 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -452,13 +506,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -482,16 +536,16 @@ MonoBehaviour: Data: _GameHasBegun - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameHasBegun - Name: k__BackingField Entry: 9 - Data: 20 + Data: 23 - Name: k__BackingField Entry: 9 - Data: 20 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -506,13 +560,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 33|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -536,13 +590,13 @@ MonoBehaviour: Data: _QuestionIndex - Name: $v Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionIndex - Name: k__BackingField Entry: 7 - Data: 35|System.RuntimeType, mscorlib + Data: 38|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -551,61 +605,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 35 - - 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: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 37|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: _QuestionStage - - Name: $v - Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _QuestionStage - - Name: k__BackingField - Entry: 9 - Data: 35 - - Name: k__BackingField - Entry: 9 - Data: 35 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -647,19 +647,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionSubstage + Data: _QuestionStage - Name: $v Entry: 7 Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionSubstage + Data: _QuestionStage - Name: k__BackingField Entry: 9 - Data: 35 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -701,19 +701,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionCorrectResponse + Data: _QuestionSubstage - Name: $v Entry: 7 Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionCorrectResponse + Data: _QuestionSubstage - Name: k__BackingField Entry: 9 - Data: 35 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -755,25 +755,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentQuestionType + Data: _QuestionCorrectResponse - Name: $v Entry: 7 Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentQuestionType + Data: _QuestionCorrectResponse - Name: k__BackingField - Entry: 7 - Data: 48|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: RoundSegmentType, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -788,13 +782,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 49|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -815,31 +809,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionsList + Data: _CurrentQuestionType - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionsList + Data: _CurrentQuestionType - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 51|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataList, VRCSDK3 + Data: RoundSegmentType, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 52 + Data: 38 - 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: @@ -848,10 +842,16 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 53|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -869,19 +869,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentQuestion + Data: _QuestionsList - Name: $v Entry: 7 Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentQuestion + Data: _QuestionsList - Name: k__BackingField Entry: 7 Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + Data: VRC.SDK3.Data.DataList, VRCSDK3 - Name: Entry: 8 Data: @@ -923,19 +923,73 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _BuzzInAllowed + Data: _CurrentQuestion - Name: $v Entry: 7 Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CurrentQuestion + - Name: k__BackingField + Entry: 7 + Data: 58|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 58 + - 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: 59|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: _BuzzInAllowed + - Name: $v + Entry: 7 + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzInAllowed - Name: k__BackingField Entry: 9 - Data: 20 + Data: 23 - Name: k__BackingField Entry: 9 - Data: 20 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -950,13 +1004,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 58|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: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -980,13 +1034,13 @@ MonoBehaviour: Data: _PlayerBuzzInAllowed - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerBuzzInAllowed - Name: k__BackingField Entry: 7 - Data: 61|System.RuntimeType, mscorlib + Data: 64|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean[], mscorlib @@ -995,61 +1049,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 61 - - 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: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 63|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: _BuzzedInPlayer - - Name: $v - Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _BuzzedInPlayer - - Name: k__BackingField - Entry: 9 - Data: 35 - - Name: k__BackingField - Entry: 9 - Data: 35 + Data: 64 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1091,25 +1091,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FinalRoundPlayersSortedByScore + Data: _BuzzedInPlayer - Name: $v Entry: 7 Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FinalRoundPlayersSortedByScore + Data: _BuzzedInPlayer - Name: k__BackingField - Entry: 7 - Data: 68|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32[], mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 68 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1124,13 +1118,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 69|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: 70|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1151,19 +1145,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TiebreakerPlayerNumbers + Data: _FinalRoundPlayersSortedByScore - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TiebreakerPlayerNumbers + Data: _FinalRoundPlayersSortedByScore - Name: k__BackingField - Entry: 9 - Data: 68 + Entry: 7 + Data: 71|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32[], mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 68 + Data: 71 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1205,16 +1205,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerPodiums + Data: _TiebreakerPlayerNumbers - Name: $v Entry: 7 Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TiebreakerPlayerNumbers + - Name: k__BackingField + Entry: 9 + Data: 71 + - Name: k__BackingField + Entry: 9 + Data: 71 + - 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: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 76|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: _PlayerPodiums + - Name: $v + Entry: 7 + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPodiums - Name: k__BackingField Entry: 7 - Data: 75|System.RuntimeType, mscorlib + Data: 78|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodium[], Assembly-CSharp @@ -1223,7 +1277,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 76|System.RuntimeType, mscorlib + Data: 79|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -1244,13 +1298,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 81|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1259,7 +1313,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1283,13 +1337,13 @@ MonoBehaviour: Data: _VideoMusicClueSkateboard - Name: $v Entry: 7 - Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoMusicClueSkateboard - Name: k__BackingField Entry: 7 - Data: 81|System.RuntimeType, mscorlib + Data: 84|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VideoMusicClueSkateboard, Assembly-CSharp @@ -1313,13 +1367,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 83|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 86|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1328,7 +1382,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 84|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 87|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Props @@ -1337,7 +1391,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 85|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 88|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1361,13 +1415,13 @@ MonoBehaviour: Data: _ACMECrimenetComputer - Name: $v Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ACMECrimenetComputer - Name: k__BackingField Entry: 7 - Data: 87|System.RuntimeType, mscorlib + Data: 90|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ACMECrimenetComputer, Assembly-CSharp @@ -1391,13 +1445,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 89|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 92|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1421,13 +1475,13 @@ MonoBehaviour: Data: _Modem - Name: $v Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Modem - Name: k__BackingField Entry: 7 - Data: 91|System.RuntimeType, mscorlib + Data: 94|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -1451,13 +1505,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 93|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 96|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1481,13 +1535,13 @@ MonoBehaviour: Data: _ArrivalDisplay - Name: $v Entry: 7 - Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 - Data: 95|System.RuntimeType, mscorlib + Data: 98|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay, Assembly-CSharp @@ -1511,13 +1565,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 97|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 100|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1541,13 +1595,13 @@ MonoBehaviour: Data: _LightningRoundAnimator - Name: $v Entry: 7 - Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LightningRoundAnimator - Name: k__BackingField Entry: 7 - Data: 99|System.RuntimeType, mscorlib + Data: 102|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -1556,7 +1610,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 99 + Data: 102 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1571,14 +1625,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 101|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 104|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1587,7 +1641,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 102|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 105|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects @@ -1596,7 +1650,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 103|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 106|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 aa311ee..a8befd8 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -69,6 +69,8 @@ public class GameManagerRound1 : GameManagerBase _Modem.Activate(false); _ArrivalDisplay.Activate(false); + EnableAudienceSilencer(true); + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.WhereInTheWorld); SendCustomEventDelayedSeconds(nameof(PlaySecondPartOfThemeMusic), 3.6666666666f); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 939aa4e..2a23cac 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 20 + Data: 21 - Name: Entry: 7 Data: @@ -236,13 +236,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Microphone + Data: _PlayerMicrophone - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Microphone + Data: _PlayerMicrophone - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib @@ -296,16 +296,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _AudienceSilencer - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudienceSilencer + - Name: k__BackingField + Entry: 9 + Data: 16 + - 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: 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: _AllowInteractionFromHostCard + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 20|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -314,7 +368,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 20 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -329,7 +383,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -353,13 +407,13 @@ MonoBehaviour: Data: _Modem - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Modem - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -383,13 +437,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 28|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -398,7 +452,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -422,13 +476,13 @@ MonoBehaviour: Data: _ArrivalDisplay - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 - Data: 28|System.RuntimeType, mscorlib + Data: 31|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay, Assembly-CSharp @@ -452,13 +506,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -482,13 +536,13 @@ MonoBehaviour: Data: _LocationBoard - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LocationBoard - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: LocationBoard, Assembly-CSharp @@ -512,13 +566,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 37|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -542,13 +596,13 @@ MonoBehaviour: Data: _JailChain - Name: $v Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailChain - Name: k__BackingField Entry: 7 - Data: 36|System.RuntimeType, mscorlib + Data: 39|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailChain, Assembly-CSharp @@ -572,13 +626,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -602,13 +656,13 @@ MonoBehaviour: Data: _JailPhone - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPhone - Name: k__BackingField Entry: 7 - Data: 40|System.RuntimeType, mscorlib + Data: 43|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailPhone, Assembly-CSharp @@ -632,13 +686,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -662,13 +716,13 @@ MonoBehaviour: Data: _JailPlayer - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPlayer - Name: k__BackingField Entry: 7 - Data: 44|System.RuntimeType, mscorlib + Data: 47|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -692,13 +746,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -722,13 +776,13 @@ MonoBehaviour: Data: _Location - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Location - Name: k__BackingField Entry: 7 - Data: 48|System.RuntimeType, mscorlib + Data: 51|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -737,7 +791,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 48 + Data: 51 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -752,19 +806,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 53|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 51|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 54|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -788,13 +842,13 @@ MonoBehaviour: Data: _Landmarks - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Landmarks - Name: k__BackingField Entry: 7 - Data: 53|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -803,7 +857,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 53 + Data: 56 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -818,13 +872,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 55|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -848,13 +902,13 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -863,61 +917,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 57 - - 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: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 59|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: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CurrentPlayerCounter - - Name: k__BackingField - Entry: 9 - Data: 57 - - Name: k__BackingField - Entry: 9 - Data: 57 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -959,19 +959,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Players + Data: _CurrentPlayerCounter - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Players + Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 53 + Data: 60 - Name: k__BackingField Entry: 9 - Data: 53 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1013,16 +1013,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_STANDARD + Data: _Players - Name: $v Entry: 7 Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Players + - Name: k__BackingField + Entry: 9 + Data: 56 + - 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: 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: 67|System.RuntimeType, mscorlib + Data: 70|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Color, UnityEngine.CoreModule @@ -1031,7 +1085,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 67 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1046,7 +1100,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1070,16 +1124,16 @@ MonoBehaviour: Data: COLOR_RED - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 67 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 67 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1094,7 +1148,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 70|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 @@ -1118,16 +1172,16 @@ MonoBehaviour: Data: COLOR_YELLOW - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_YELLOW - Name: k__BackingField Entry: 9 - Data: 67 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 67 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1142,7 +1196,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1166,16 +1220,16 @@ MonoBehaviour: Data: COLOR_GREEN - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_GREEN - Name: k__BackingField Entry: 9 - Data: 67 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 67 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1190,7 +1244,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index cb8de8c..7910c59 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -59,6 +59,8 @@ public class GameManagerRound2 : GameManagerBase _JailPlayer.PlayVideo = false; + EnableAudienceSilencer(true); + RequestSerialization(); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index bde6b0f..ae11e0c 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 17 + Data: 18 - Name: Entry: 7 Data: @@ -236,13 +236,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Microphone + Data: _PlayerMicrophone - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Microphone + Data: _PlayerMicrophone - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib @@ -296,16 +296,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _AudienceSilencer - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudienceSilencer + - Name: k__BackingField + Entry: 9 + Data: 16 + - 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: 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: _AllowInteractionFromHostCard + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 20|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -314,7 +368,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 20 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -329,7 +383,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -353,13 +407,13 @@ MonoBehaviour: Data: _Maps - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Maps - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMap[], Assembly-CSharp @@ -368,7 +422,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 24|System.RuntimeType, mscorlib + Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -389,13 +443,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 26|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 29|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -404,7 +458,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 27|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -428,13 +482,13 @@ MonoBehaviour: Data: _Markers - Name: $v Entry: 7 - Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Markers - Name: k__BackingField Entry: 7 - Data: 29|System.RuntimeType, mscorlib + Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMapMarker[], Assembly-CSharp @@ -443,7 +497,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 24 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -458,13 +512,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 31|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -488,13 +542,13 @@ MonoBehaviour: Data: _EndingPlayer - Name: $v Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _EndingPlayer - Name: k__BackingField Entry: 7 - Data: 33|System.RuntimeType, mscorlib + Data: 36|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -518,13 +572,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -548,13 +602,13 @@ MonoBehaviour: Data: _CurrentlyActiveMap - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentlyActiveMap - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ContinentMap, Assembly-CSharp @@ -563,7 +617,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 38|System.RuntimeType, mscorlib + Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -584,19 +638,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 40|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 41|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 44|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -620,16 +674,16 @@ MonoBehaviour: Data: _ActiveMarker - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActiveMarker - Name: k__BackingField Entry: 9 - Data: 38 + Data: 41 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -644,19 +698,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 44|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 45|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 48|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -678,69 +732,69 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _StageIndex - - Name: $v - Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _StageIndex - - Name: k__BackingField - Entry: 9 - Data: 38 - - Name: k__BackingField - Entry: 9 - Data: 38 - - 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: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 48|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: _ContinentData - Name: $v Entry: 7 Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - 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: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 51|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: _ContinentData + - Name: $v + Entry: 7 + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 50|System.RuntimeType, mscorlib + Data: 53|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -749,7 +803,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 50 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -764,7 +818,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -788,13 +842,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 53|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -803,61 +857,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 38 - - 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: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _RunTimer - - Name: $v - Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _RunTimer - - Name: k__BackingField - Entry: 9 - Data: 20 - - Name: k__BackingField - Entry: 9 - Data: 20 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -899,19 +899,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Timer + Data: _RunTimer - Name: $v Entry: 7 Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Timer + Data: _RunTimer - Name: k__BackingField Entry: 9 - Data: 38 + Data: 23 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -953,19 +953,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SuccessCounter + Data: _Timer - Name: $v Entry: 7 Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SuccessCounter + Data: _Timer - Name: k__BackingField Entry: 9 - Data: 38 + Data: 41 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -983,16 +983,70 @@ MonoBehaviour: Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 Data: 64|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: 65|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: + - 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: @@ -1016,16 +1070,16 @@ MonoBehaviour: Data: _FailureCounter - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FailureCounter - Name: k__BackingField Entry: 9 - Data: 38 + Data: 41 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1040,19 +1094,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 68|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 69|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 72|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 9a21dd5..e295eae 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -71,6 +71,8 @@ public class GameManagerRound3 : GameManagerBase InitialiseMarkers(); GetCurrentMap().RandomiseCountries(); + EnableAudienceSilencer(false); + RequestSerialization(); } diff --git a/Assets/UdonSharp/Microphone.asset b/Assets/UdonSharp/Microphone.asset index 68dbe54..690fa2c 100644 --- a/Assets/UdonSharp/Microphone.asset +++ b/Assets/UdonSharp/Microphone.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 2 + Data: 3 - Name: Entry: 7 Data: @@ -159,6 +159,60 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _EnteredPlayers + - Name: $v + Entry: 7 + Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _EnteredPlayers + - Name: k__BackingField + Entry: 7 + Data: 10|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCPlayerApi[], VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 10 + - 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: 11|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/Microphone.cs b/Assets/UdonSharp/Microphone.cs index 2cbc9c1..09082a7 100644 --- a/Assets/UdonSharp/Microphone.cs +++ b/Assets/UdonSharp/Microphone.cs @@ -1,4 +1,5 @@  +using System; using UdonSharp; using UnityEngine; using VRC.SDKBase; @@ -10,15 +11,28 @@ public class Microphone : UdonSharpBehaviour [SerializeField] private float _MikedVoiceDistanceNear = 30.0f; [SerializeField] private float _MikedVoiceDistanceFar = 60.0f; + private VRCPlayerApi[] _EnteredPlayers = new VRCPlayerApi[MAX_PLAYERS]; + private const float DEFAULT_VOICE_DISTANCE_NEAR = 0.0f; private const float DEFAULT_VOICE_DISTANCE_FAR = 25.0f; + private const int MAX_PLAYERS = 100; + public override void OnPlayerTriggerEnter(VRCPlayerApi Player) { Player.SetVoiceDistanceNear(_MikedVoiceDistanceNear); Player.SetVoiceDistanceFar(_MikedVoiceDistanceFar); + for (int i = 0; i < _EnteredPlayers.Length; i++) + { + if (_EnteredPlayers[i] == null) + { + _EnteredPlayers[i] = Player; + break; + } + } + base.OnPlayerTriggerEnter(Player); } @@ -27,6 +41,29 @@ public class Microphone : UdonSharpBehaviour Player.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); Player.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + for (int i = 0; i < _EnteredPlayers.Length; i++) + { + if (_EnteredPlayers[i] == Player) + { + _EnteredPlayers[i] = null; + break; + } + } + base.OnPlayerTriggerExit(Player); } + + + public void OnDisable() + { + for (int i = 0; i < _EnteredPlayers.Length; i++) + { + if (_EnteredPlayers[i] != null && _EnteredPlayers[i].IsValid()) + { + _EnteredPlayers[i].SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); + _EnteredPlayers[i].SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + } + _EnteredPlayers[i] = null; + } + } } diff --git a/Assets/UdonSharp/PlayerTeleporter.asset b/Assets/UdonSharp/PlayerTeleporter.asset index 460d44a..81a2b68 100644 --- a/Assets/UdonSharp/PlayerTeleporter.asset +++ b/Assets/UdonSharp/PlayerTeleporter.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 6 + Data: 7 - Name: Entry: 7 Data: @@ -326,16 +326,85 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerPodiums + Data: _HostTeleportButton - Name: $v Entry: 7 Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayerPodiums + Data: _HostTeleportButton - Name: k__BackingField Entry: 7 Data: 19|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.UI.Button, UnityEngine.UI + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 19 + - 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: 2 + - Name: + Entry: 7 + Data: 21|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + 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: _PlayerPodiums + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayerPodiums + - Name: k__BackingField + Entry: 7 + Data: 24|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodium[], Assembly-CSharp @@ -344,7 +413,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 20|System.RuntimeType, mscorlib + Data: 25|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -365,13 +434,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 22|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 27|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -380,7 +449,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 23|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/PlayerTeleporter.cs b/Assets/UdonSharp/PlayerTeleporter.cs index ce8750b..8f0234e 100644 --- a/Assets/UdonSharp/PlayerTeleporter.cs +++ b/Assets/UdonSharp/PlayerTeleporter.cs @@ -1,9 +1,8 @@  using UdonSharp; using UnityEngine; -using VRC.SDK3.UdonNetworkCalling; +using UnityEngine.UI; using VRC.SDKBase; -using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -17,11 +16,27 @@ public class PlayerTeleporter : UdonSharpBehaviour [Space] + [SerializeField] private Button _HostTeleportButton; + + [Space] + [SerializeField] private PlayerPodium[] _PlayerPodiums; + public override void OnPlayerRespawn(VRCPlayerApi Player) + { + if (Player == Networking.InstanceOwner || Player == Networking.Master) + { + _HostTeleportButton.gameObject.SetActive(true); + } + + base.OnPlayerRespawn(Player); + } + + public void TeleportToHostPosition() { + _HostTeleportButton.gameObject.SetActive(false); Networking.LocalPlayer.TeleportTo(_HostTeleportLocation.position, _HostTeleportLocation.rotation); } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: diff --git a/kernelsCache/AIDenoiser-30c45d9b.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/AIDenoiser-30c45d9b.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index af02591..0000000 Binary files a/kernelsCache/AIDenoiser-30c45d9b.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/AIDenoiser-30c45d9b.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/AIDenoiser-30c45d9b.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index cd8cb73..0000000 Binary files a/kernelsCache/AIDenoiser-30c45d9b.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/AIDenoiser-3f200336.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/AIDenoiser-3f200336.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index 94c71dc..0000000 Binary files a/kernelsCache/AIDenoiser-3f200336.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/AIDenoiser-3f200336.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/AIDenoiser-3f200336.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index b636374..0000000 Binary files a/kernelsCache/AIDenoiser-3f200336.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/AIDenoiser-6af6594f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/AIDenoiser-6af6594f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index 6dd50d2..0000000 Binary files a/kernelsCache/AIDenoiser-6af6594f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/AIDenoiser-6af6594f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/AIDenoiser-6af6594f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index 88c62eb..0000000 Binary files a/kernelsCache/AIDenoiser-6af6594f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/AIDenoiser-e60aec8c.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/AIDenoiser-e60aec8c.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index 7e80827..0000000 Binary files a/kernelsCache/AIDenoiser-e60aec8c.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/AIDenoiser-e60aec8c.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/AIDenoiser-e60aec8c.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index 1e587fc..0000000 Binary files a/kernelsCache/AIDenoiser-e60aec8c.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/ConcatImageFromPlanar-191f144f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/ConcatImageFromPlanar-191f144f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index 7899ea1..0000000 Binary files a/kernelsCache/ConcatImageFromPlanar-191f144f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/ConcatImageFromPlanar-191f144f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/ConcatImageFromPlanar-191f144f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index 04eeb3c..0000000 Binary files a/kernelsCache/ConcatImageFromPlanar-191f144f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/ConcatImageFromPlanar-45dc16bd.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/ConcatImageFromPlanar-45dc16bd.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index fa5c139..0000000 Binary files a/kernelsCache/ConcatImageFromPlanar-45dc16bd.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/ConcatImageFromPlanar-45dc16bd.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/ConcatImageFromPlanar-45dc16bd.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index 03cccdc..0000000 Binary files a/kernelsCache/ConcatImageFromPlanar-45dc16bd.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/ConcatImageFromPlanar-4832339f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/ConcatImageFromPlanar-4832339f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index 8e2b9f4..0000000 Binary files a/kernelsCache/ConcatImageFromPlanar-4832339f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/ConcatImageFromPlanar-4832339f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/ConcatImageFromPlanar-4832339f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index 5f0de59..0000000 Binary files a/kernelsCache/ConcatImageFromPlanar-4832339f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/ConcatImageFromPlanar-656d2256.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/ConcatImageFromPlanar-656d2256.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index ebad0ce..0000000 Binary files a/kernelsCache/ConcatImageFromPlanar-656d2256.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/ConcatImageFromPlanar-656d2256.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/ConcatImageFromPlanar-656d2256.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index 02c1897..0000000 Binary files a/kernelsCache/ConcatImageFromPlanar-656d2256.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/PerceptuallyUniformEncoding-11bc2478.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/PerceptuallyUniformEncoding-11bc2478.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index a0cd20c..0000000 Binary files a/kernelsCache/PerceptuallyUniformEncoding-11bc2478.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/PerceptuallyUniformEncoding-11bc2478.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/PerceptuallyUniformEncoding-11bc2478.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index 9aa20a5..0000000 Binary files a/kernelsCache/PerceptuallyUniformEncoding-11bc2478.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/PerceptuallyUniformEncoding-788c080f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/PerceptuallyUniformEncoding-788c080f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index ecc2ea2..0000000 Binary files a/kernelsCache/PerceptuallyUniformEncoding-788c080f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/PerceptuallyUniformEncoding-788c080f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/PerceptuallyUniformEncoding-788c080f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index d1a3b03..0000000 Binary files a/kernelsCache/PerceptuallyUniformEncoding-788c080f.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/PerceptuallyUniformEncoding-c3305795.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/PerceptuallyUniformEncoding-c3305795.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index b8bc53f..0000000 Binary files a/kernelsCache/PerceptuallyUniformEncoding-c3305795.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/PerceptuallyUniformEncoding-c3305795.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/PerceptuallyUniformEncoding-c3305795.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index c11c9cc..0000000 Binary files a/kernelsCache/PerceptuallyUniformEncoding-c3305795.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ diff --git a/kernelsCache/PerceptuallyUniformEncoding-f9b8983d.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin b/kernelsCache/PerceptuallyUniformEncoding-f9b8983d.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin deleted file mode 100644 index 642404c..0000000 Binary files a/kernelsCache/PerceptuallyUniformEncoding-f9b8983d.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin and /dev/null differ diff --git a/kernelsCache/PerceptuallyUniformEncoding-f9b8983d.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check b/kernelsCache/PerceptuallyUniformEncoding-f9b8983d.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check deleted file mode 100644 index db2f761..0000000 Binary files a/kernelsCache/PerceptuallyUniformEncoding-f9b8983d.v.01070000BBCFD912.gfx1036.3640.0 (PAL,LC)_64.bin.check and /dev/null differ