diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index a212f73..2559a19 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -86,7 +86,6 @@ - @@ -95,13 +94,13 @@ - + @@ -136,6 +135,7 @@ + diff --git a/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim b/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim index 45c7798..a584c37 100644 --- a/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim +++ b/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim @@ -27,13 +27,13 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1 + time: 2.25 value: {x: -1.2, y: 125.088, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: -21.087936, y: 0, z: 0} + outSlope: {x: -21.087936, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.04467678, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -46,20 +46,20 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 8.582, y: 3.428, z: -4.583} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0.08442107, z: 0} + outSlope: {x: 0, y: 0.08442107, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.05703422, z: 0.33333334} - serializedVersion: 3 - time: 1 + time: 2.25 value: {x: 7.226, y: 1.283, z: -3.621} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: -1.105126, z: 0} + outSlope: {x: 0, y: -1.105126, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.05228138, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -129,7 +129,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 2.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -159,13 +159,13 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 2.25 value: -1.2 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: -21.087936 + outSlope: -21.087936 + tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.04467678 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -189,7 +189,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 2.25 value: 125.088 inSlope: 0 outSlope: 0 @@ -219,7 +219,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 2.25 value: 0 inSlope: 0 outSlope: 0 @@ -249,7 +249,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 2.25 value: 7.226 inSlope: 0 outSlope: 0 @@ -272,20 +272,20 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 3.428 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 0.08442107 + outSlope: 0.08442107 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.05703422 - serializedVersion: 3 - time: 1 + time: 2.25 value: 1.283 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: -1.105126 + outSlope: -1.105126 + tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.05228138 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -309,7 +309,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 2.25 value: -3.621 inSlope: 0 outSlope: 0 diff --git a/Assets/Animations/Timer Overlay.meta b/Assets/Animations/Overlays.meta similarity index 100% rename from Assets/Animations/Timer Overlay.meta rename to Assets/Animations/Overlays.meta diff --git a/Assets/Animations/Timer Overlay/Fade Out Elements.anim b/Assets/Animations/Overlays/Fade Out Elements.anim similarity index 100% rename from Assets/Animations/Timer Overlay/Fade Out Elements.anim rename to Assets/Animations/Overlays/Fade Out Elements.anim diff --git a/Assets/Animations/Timer Overlay/Fade Out Elements.anim.meta b/Assets/Animations/Overlays/Fade Out Elements.anim.meta similarity index 100% rename from Assets/Animations/Timer Overlay/Fade Out Elements.anim.meta rename to Assets/Animations/Overlays/Fade Out Elements.anim.meta diff --git a/Assets/Animations/Timer Overlay/Initialise Elements.anim b/Assets/Animations/Overlays/Initialise Elements.anim similarity index 100% rename from Assets/Animations/Timer Overlay/Initialise Elements.anim rename to Assets/Animations/Overlays/Initialise Elements.anim diff --git a/Assets/Animations/Timer Overlay/Initialise Elements.anim.meta b/Assets/Animations/Overlays/Initialise Elements.anim.meta similarity index 100% rename from Assets/Animations/Timer Overlay/Initialise Elements.anim.meta rename to Assets/Animations/Overlays/Initialise Elements.anim.meta diff --git a/Assets/Animations/Timer Overlay/Timer Overlay.controller b/Assets/Animations/Overlays/Timer Overlay.controller similarity index 97% rename from Assets/Animations/Timer Overlay/Timer Overlay.controller rename to Assets/Animations/Overlays/Timer Overlay.controller index 21ada9e..252bd04 100644 --- a/Assets/Animations/Timer Overlay/Timer Overlay.controller +++ b/Assets/Animations/Overlays/Timer Overlay.controller @@ -9,7 +9,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: Fade Out Elements + m_ConditionEvent: Fade Out m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -86,7 +86,7 @@ AnimatorController: m_Name: Timer Overlay serializedVersion: 5 m_AnimatorParameters: - - m_Name: Fade Out Elements + - m_Name: Fade Out m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 @@ -114,7 +114,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Fade Out Elements + m_ConditionEvent: Fade Out m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -3310454412444321219} diff --git a/Assets/Animations/Timer Overlay/Timer Overlay.controller.meta b/Assets/Animations/Overlays/Timer Overlay.controller.meta similarity index 100% rename from Assets/Animations/Timer Overlay/Timer Overlay.controller.meta rename to Assets/Animations/Overlays/Timer Overlay.controller.meta diff --git a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat index 40702bc..f90fc6d 100644 --- a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat +++ b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat @@ -93,7 +93,7 @@ Material: - _Thickness: 0.07 - _UVSec: 0 - _VerticalLineCorrection: 0 - - _WiperProgress: 0.044444446 + - _WiperProgress: 1 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Models/SM_DrywallPanel5x6.fbx b/Assets/Models/SM_DrywallPanel5x6.fbx index c7c134c..6111d5b 100644 Binary files a/Assets/Models/SM_DrywallPanel5x6.fbx and b/Assets/Models/SM_DrywallPanel5x6.fbx differ diff --git a/Assets/Models/SM_DrywallPanel5x7.1.fbx b/Assets/Models/SM_DrywallPanel5x7.1.fbx index 5122292..093fbc8 100644 Binary files a/Assets/Models/SM_DrywallPanel5x7.1.fbx and b/Assets/Models/SM_DrywallPanel5x7.1.fbx differ diff --git a/Assets/Models/SM_DrywallPanel5x9.fbx b/Assets/Models/SM_DrywallPanel5x9.fbx index f7bb6c9..463c40b 100644 Binary files a/Assets/Models/SM_DrywallPanel5x9.fbx and b/Assets/Models/SM_DrywallPanel5x9.fbx differ diff --git a/Assets/Models/SM_Round1DoorwayStairs.fbx b/Assets/Models/SM_Round1DoorwayStairs.fbx index c14f06c..f10c1f7 100644 Binary files a/Assets/Models/SM_Round1DoorwayStairs.fbx and b/Assets/Models/SM_Round1DoorwayStairs.fbx differ diff --git a/Assets/Models/SM_Round1DoorwayStairs.fbx.meta b/Assets/Models/SM_Round1DoorwayStairs.fbx.meta index 864610b..25acbac 100644 --- a/Assets/Models/SM_Round1DoorwayStairs.fbx.meta +++ b/Assets/Models/SM_Round1DoorwayStairs.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_TheChase.fbx.meta b/Assets/Models/SM_TheChase.fbx.meta index f90798b..d88f643 100644 --- a/Assets/Models/SM_TheChase.fbx.meta +++ b/Assets/Models/SM_TheChase.fbx.meta @@ -74,7 +74,7 @@ ModelImporter: normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] diff --git a/Assets/Prefabs/Timer.meta b/Assets/Prefabs/Overlays.meta similarity index 100% rename from Assets/Prefabs/Timer.meta rename to Assets/Prefabs/Overlays.meta diff --git a/Assets/Prefabs/Overlays/Newspaper Overlay.prefab b/Assets/Prefabs/Overlays/Newspaper Overlay.prefab new file mode 100644 index 0000000..e3791e9 --- /dev/null +++ b/Assets/Prefabs/Overlays/Newspaper Overlay.prefab @@ -0,0 +1,193 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2396313974114816115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7241432374676536911} + - component: {fileID: 8045183386931381925} + - component: {fileID: 6622382881250925265} + - component: {fileID: 2104256769495490831} + m_Layer: 0 + m_Name: Newspaper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7241432374676536911 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2396313974114816115} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1949222043524572353} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8045183386931381925 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2396313974114816115} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6622382881250925265 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2396313974114816115} + 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: 372c2f1b24e36bd438fea3de42b33e3b, 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!64 &2104256769495490831 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2396313974114816115} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &8073544392714602498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1949222043524572353} + - component: {fileID: 2551137153161031695} + - component: {fileID: 1742954083948632810} + m_Layer: 0 + m_Name: Newspaper Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1949222043524572353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8073544392714602498} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3333334, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7241432374676536911} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2551137153161031695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8073544392714602498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1742954083948632810} + _Animator: {fileID: 0} + _OverlayElements: {fileID: 2396313974114816115} + _AspectRatio: 1.3333334 +--- !u!114 &1742954083948632810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8073544392714602498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 6e1c5cb02e885ca42ba9cbe7b5796eaf, + type: 2} + programSource: {fileID: 11400000, guid: 2923fcd444bb991459686ced4864c9bf, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 diff --git a/Assets/Prefabs/Overlays/Newspaper Overlay.prefab.meta b/Assets/Prefabs/Overlays/Newspaper Overlay.prefab.meta new file mode 100644 index 0000000..0c27644 --- /dev/null +++ b/Assets/Prefabs/Overlays/Newspaper Overlay.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: abf495bec3a7cf64c98c5e7a25fd446e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Timer/Timer Overlay.prefab b/Assets/Prefabs/Overlays/Timer Overlay.prefab similarity index 97% rename from Assets/Prefabs/Timer/Timer Overlay.prefab rename to Assets/Prefabs/Overlays/Timer Overlay.prefab index 3726a23..ff18da7 100644 --- a/Assets/Prefabs/Timer/Timer Overlay.prefab +++ b/Assets/Prefabs/Overlays/Timer Overlay.prefab @@ -256,8 +256,8 @@ GameObject: m_Component: - component: {fileID: 5001696690852369563} - component: {fileID: 8727178232818392669} - - component: {fileID: 4137502481405882845} - - component: {fileID: 535394471847203586} + - component: {fileID: 7239883688309986466} + - component: {fileID: 7056734146676153633} m_Layer: 23 m_Name: Timer Overlay m_TagString: Untagged @@ -302,7 +302,7 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &4137502481405882845 +--- !u!114 &7239883688309986466 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -311,7 +311,7 @@ MonoBehaviour: m_GameObject: {fileID: 6724496829687796463} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f352b68a08f42be43a596f353c9f165d, type: 3} + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} m_Name: m_EditorClassIdentifier: serializationData: @@ -323,10 +323,11 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 535394471847203586} + _udonSharpBackingUdonBehaviour: {fileID: 7056734146676153633} _Animator: {fileID: 8727178232818392669} _OverlayElements: {fileID: 2305955422126925254} ---- !u!114 &535394471847203586 + _AspectRatio: 1.7777778 +--- !u!114 &7056734146676153633 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -346,9 +347,9 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: aa2be4ed8a6461f408a0f163a1b7ec39, + serializedProgramAsset: {fileID: 11400000, guid: 6e1c5cb02e885ca42ba9cbe7b5796eaf, type: 2} - programSource: {fileID: 11400000, guid: bdc81495c4c96fe4ca34aac37847cb12, type: 2} + programSource: {fileID: 11400000, guid: 2923fcd444bb991459686ced4864c9bf, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 diff --git a/Assets/Prefabs/Timer/Timer Overlay.prefab.meta b/Assets/Prefabs/Overlays/Timer Overlay.prefab.meta similarity index 100% rename from Assets/Prefabs/Timer/Timer Overlay.prefab.meta rename to Assets/Prefabs/Overlays/Timer Overlay.prefab.meta diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 8226742..b320562 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -1496,11 +1496,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1300477146} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &50383830 stripped @@ -1521,12 +1517,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &50383832 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - m_PrefabInstance: {fileID: 50383829} - m_PrefabAsset: {fileID: 0} --- !u!1 &51134226 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1705145681487634870, guid: e9914385266bca24db809c39e395f03c, @@ -3965,7 +3955,7 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: e895dfd21d145a545bdf44e3d1658043, type: 3} propertyPath: m_ScaleInLightmap - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: e895dfd21d145a545bdf44e3d1658043, type: 3} @@ -3976,12 +3966,12 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + objectReference: {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - target: {fileID: -7511558181221131132, guid: e895dfd21d145a545bdf44e3d1658043, type: 3} propertyPath: m_Materials.Array.data[1] value: - objectReference: {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + objectReference: {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - target: {fileID: 919132149155446097, guid: e895dfd21d145a545bdf44e3d1658043, type: 3} propertyPath: m_Name @@ -4578,13 +4568,74 @@ MonoBehaviour: _Camera: {fileID: 359000342} _Screens: - {fileID: 1523711552} - - {fileID: 1528283344} --- !u!1 &107977963 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5319767931864254799, guid: aecb18996fccac6488cfcd38604796da, type: 3} m_PrefabInstance: {fileID: 652699947} m_PrefabAsset: {fileID: 0} +--- !u!1001 &109444586 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1983062414} + m_Modifications: + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_Name + value: Newspaper Overlay + objectReference: {fileID: 0} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} +--- !u!4 &109444587 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 109444586} + m_PrefabAsset: {fileID: 0} +--- !u!114 &109444588 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 109444586} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491029419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &109908407 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, @@ -10013,11 +10064,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1528283347} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &169430328 stripped @@ -10038,12 +10085,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &169430330 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - m_PrefabInstance: {fileID: 169430327} - m_PrefabAsset: {fileID: 0} --- !u!1 &169542778 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4032262213944914853, guid: be33bc7f6c414e6409becfa348b9310d, @@ -17879,7 +17920,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &359000343 Transform: m_ObjectHideFlags: 0 @@ -18269,6 +18310,10 @@ PrefabInstance: type: 3} insertIndex: 0 addedObject: {fileID: 1498879995} + - targetCorrespondingSourceObject: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + insertIndex: 1 + addedObject: {fileID: 1358424164} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} --- !u!4 &364742167 stripped @@ -21422,7 +21467,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -26601,6 +26646,68 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1001 &599732472 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1390751085} + m_Modifications: + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_Name + value: Newspaper Overlay + objectReference: {fileID: 0} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} +--- !u!4 &599732473 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 599732472} + m_PrefabAsset: {fileID: 0} +--- !u!114 &599732474 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 599732472} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630188782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &600479467 PrefabInstance: m_ObjectHideFlags: 0 @@ -27466,7 +27573,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 0 m_Viewport: {fileID: 1012206127} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 446317309} @@ -27752,6 +27859,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &630188782 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 599732472} + m_PrefabAsset: {fileID: 0} --- !u!1 &631295195 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2091615389816979297, guid: a631a07c8ce3bed4cbc15b339c28a7a4, @@ -29361,6 +29474,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &664667484 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 1630319355} + m_PrefabAsset: {fileID: 0} --- !u!1 &665314706 GameObject: m_ObjectHideFlags: 0 @@ -30045,6 +30164,12 @@ Transform: m_Children: [] m_Father: {fileID: 760334291} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &683841852 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 1072779559} + m_PrefabAsset: {fileID: 0} --- !u!1001 &687105344 PrefabInstance: m_ObjectHideFlags: 0 @@ -30079,6 +30204,17 @@ PrefabInstance: propertyPath: m_Name value: Timer Overlay objectReference: {fileID: 0} + - target: {fileID: 6724496829687796463, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -30438,14 +30574,14 @@ GameObject: m_PrefabAsset: {fileID: 0} --- !u!114 &699852686 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4137502481405882845, guid: bfad626e12b63a5498032479904068c7, + m_CorrespondingSourceObject: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, type: 3} m_PrefabInstance: {fileID: 687105344} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 699852684} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f352b68a08f42be43a596f353c9f165d, type: 3} + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &702180712 stripped @@ -32722,6 +32858,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[3] value: objectReference: {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} + - target: {fileID: -7511558181221131132, guid: 4418ea84766ed04468a42f24f5d9fdac, + type: 3} + propertyPath: m_Materials.Array.data[4] + value: + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - target: {fileID: 919132149155446097, guid: 4418ea84766ed04468a42f24f5d9fdac, type: 3} propertyPath: m_Name @@ -36910,6 +37051,11 @@ PrefabInstance: propertyPath: TriggerModule.primitives.Array.data[0] value: objectReference: {fileID: 1584295245487527436} + - target: {fileID: 501462611461476599, guid: 3335b7f583a8c6d4daa78783b408b94b, + type: 3} + propertyPath: m_AllowRoll + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2952248492377177537, guid: 3335b7f583a8c6d4daa78783b408b94b, type: 3} propertyPath: m_Name @@ -39665,7 +39811,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.2725, y: 0} + m_AnchoredPosition: {x: 0, y: 0.1575} m_SizeDelta: {x: 640, y: 360} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &967689109 @@ -40064,6 +40210,11 @@ MonoBehaviour: - {fileID: 699852686} - {fileID: 1844228493} - {fileID: 1927269626} + _NewspaperCameraOverlays: + - {fileID: 1358424165} + - {fileID: 1630319357} + - {fileID: 599732474} + - {fileID: 109444588} _EndingPlayer: {fileID: 1762618935} --- !u!1 &969958451 stripped GameObject: @@ -46431,6 +46582,76 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1072779559 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1276291775} + m_Modifications: + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalPosition.x + value: -16.45 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.03 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_Name + value: Newspaper Overlay (1) + objectReference: {fileID: 0} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} +--- !u!4 &1072779560 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 1072779559} + m_PrefabAsset: {fileID: 0} --- !u!1 &1074789658 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6882989511465335218, guid: bf667ba13e10e0c48a06066e3e1a29ae, @@ -47376,6 +47597,17 @@ PrefabInstance: propertyPath: m_Name value: Timer Overlay objectReference: {fileID: 0} + - target: {fileID: 6724496829687796463, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -52130,6 +52362,7 @@ Transform: - {fileID: 2063457642} - {fileID: 1658730386} - {fileID: 579108364} + - {fileID: 1072779560} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1277454218 stripped @@ -52702,89 +52935,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1299739207} m_PrefabAsset: {fileID: 0} ---- !u!1 &1300477145 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1300477146} - - component: {fileID: 1300477148} - - component: {fileID: 1300477147} - m_Layer: 23 - m_Name: Newspaper Display - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1300477146 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1300477145} - serializedVersion: 2 - m_LocalRotation: {x: -0.000000044703484, y: 0.7071068, z: -0.7071068, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0.32099998} - m_LocalScale: {x: 0.028, y: 1.1199996, z: 0.020999996} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 50383832} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 180} ---- !u!23 &1300477147 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1300477145} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 0 - m_StaticShadowCaster: 0 - m_MotionVectors: 2 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, 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: 2 - 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 &1300477148 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1300477145} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1300947708 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3956068066517853170, guid: fac4aa7abd3ecbe44a9eaf7f05275244, @@ -55045,6 +55195,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1783459326248680204} m_PrefabAsset: {fileID: 0} +--- !u!1 &1345845700 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 1358424163} + m_PrefabAsset: {fileID: 0} --- !u!1 &1347311699 GameObject: m_ObjectHideFlags: 0 @@ -55845,6 +56001,68 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1358424163 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 364742167} + m_Modifications: + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_Name + value: Newspaper Overlay + objectReference: {fileID: 0} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} +--- !u!4 &1358424164 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 1358424163} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1358424165 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 1358424163} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345845700} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1358503111 PrefabInstance: m_ObjectHideFlags: 0 @@ -56730,6 +56948,10 @@ PrefabInstance: type: 3} insertIndex: 0 addedObject: {fileID: 1831441062} + - targetCorrespondingSourceObject: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + insertIndex: 1 + addedObject: {fileID: 599732473} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} --- !u!4 &1390751085 stripped @@ -57711,11 +57933,41 @@ PrefabInstance: propertyPath: m_Materials.Array.data[2] value: objectReference: {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - target: {fileID: -7511558181221131132, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - target: {fileID: -4683669308469848369, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - target: {fileID: -4683669308469848369, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - target: {fileID: -4683669308469848369, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - target: {fileID: -4683669308469848369, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - target: {fileID: 919132149155446097, guid: f4209ba9c393af2458ad4629a4196850, type: 3} propertyPath: m_Name value: SM_DrywallPanel5x6 objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f4209ba9c393af2458ad4629a4196850, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: f4209ba9c393af2458ad4629a4196850, type: 3} propertyPath: m_StaticEditorFlags @@ -60195,6 +60447,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1472688266} + _Camera: {fileID: 1880742076} _Timer: {fileID: 1377320498} _TimerMaterial: {fileID: 2100000, guid: 7b4f757c1cd157943ac2082269832a49, type: 2} _MaxSeconds: 45 @@ -60851,6 +61104,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1491029419 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 109444586} + m_PrefabAsset: {fileID: 0} --- !u!1 &1491430254 GameObject: m_ObjectHideFlags: 0 @@ -61287,14 +61546,14 @@ Transform: m_PrefabAsset: {fileID: 0} --- !u!114 &1498879997 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4137502481405882845, guid: bfad626e12b63a5498032479904068c7, + m_CorrespondingSourceObject: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, type: 3} m_PrefabInstance: {fileID: 8414245152996885721} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1498879994} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f352b68a08f42be43a596f353c9f165d, type: 3} + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &1499408564 stripped @@ -65125,7 +65384,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1523711553 Transform: m_ObjectHideFlags: 0 @@ -65503,89 +65762,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &1528283344 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1528283347} - - component: {fileID: 1528283346} - - component: {fileID: 1528283345} - m_Layer: 23 - m_Name: Newspaper Display - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &1528283345 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1528283344} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 0 - m_StaticShadowCaster: 0 - m_MotionVectors: 2 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, 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: 2 - 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 &1528283346 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1528283344} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1528283347 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1528283344} - serializedVersion: 2 - m_LocalRotation: {x: -0.000000007450581, y: -0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0.406} - m_LocalScale: {x: 0.025, y: 1, z: 0.018750004} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 169430330} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 180} --- !u!1 &1528591628 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9009189034908819552, guid: e9914385266bca24db809c39e395f03c, @@ -72988,6 +73164,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[2] value: objectReference: {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - target: {fileID: -7511558181221131132, guid: 0e3e4782d1740d046b6dcc14b34885d3, + type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - target: {fileID: 919132149155446097, guid: 0e3e4782d1740d046b6dcc14b34885d3, type: 3} propertyPath: m_Name @@ -73138,6 +73319,68 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1001 &1630319355 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1832440712} + m_Modifications: + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_Name + value: Newspaper Overlay + objectReference: {fileID: 0} + - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} +--- !u!4 &1630319356 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 1630319355} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1630319357 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + m_PrefabInstance: {fileID: 1630319355} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664667484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1630582920 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2068852170125876732, guid: be33bc7f6c414e6409becfa348b9310d, @@ -79031,6 +79274,17 @@ PrefabInstance: propertyPath: m_Name value: Timer Overlay objectReference: {fileID: 0} + - target: {fileID: 6724496829687796463, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -79239,6 +79493,10 @@ PrefabInstance: type: 3} insertIndex: 0 addedObject: {fileID: 687105345} + - targetCorrespondingSourceObject: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + insertIndex: 1 + addedObject: {fileID: 1630319356} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} --- !u!4 &1832440712 stripped @@ -79998,14 +80256,14 @@ GameObject: m_PrefabAsset: {fileID: 0} --- !u!114 &1844228493 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4137502481405882845, guid: bfad626e12b63a5498032479904068c7, + m_CorrespondingSourceObject: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, type: 3} m_PrefabInstance: {fileID: 1831441061} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1844228491} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f352b68a08f42be43a596f353c9f165d, type: 3} + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &1844300294 stripped @@ -81162,7 +81420,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1880742077 Transform: m_ObjectHideFlags: 0 @@ -82460,14 +82718,14 @@ GameObject: m_PrefabAsset: {fileID: 0} --- !u!114 &1927269626 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4137502481405882845, guid: bfad626e12b63a5498032479904068c7, + m_CorrespondingSourceObject: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, type: 3} m_PrefabInstance: {fileID: 1105031936} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1927269624} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f352b68a08f42be43a596f353c9f165d, type: 3} + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &1927349417 stripped @@ -85512,6 +85770,10 @@ PrefabInstance: type: 3} insertIndex: 0 addedObject: {fileID: 1105031937} + - targetCorrespondingSourceObject: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + insertIndex: 1 + addedObject: {fileID: 109444587} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} --- !u!4 &1983062414 stripped @@ -92646,6 +92908,11 @@ PrefabInstance: propertyPath: TriggerModule.primitives.Array.data[0] value: objectReference: {fileID: 1584295245487527436} + - target: {fileID: 501462611461476599, guid: 3335b7f583a8c6d4daa78783b408b94b, + type: 3} + propertyPath: m_AllowRoll + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2952248492377177537, guid: 3335b7f583a8c6d4daa78783b408b94b, type: 3} propertyPath: m_Name @@ -105298,6 +105565,26 @@ MonoBehaviour: ID: 1317 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1491029419} + ID: 1318 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1345845700} + ID: 1319 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 664667484} + ID: 1320 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 630188782} + ID: 1321 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 683841852} + ID: 1322 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -106042,6 +106329,17 @@ PrefabInstance: propertyPath: m_Name value: Timer Overlay objectReference: {fileID: 0} + - target: {fileID: 6724496829687796463, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7239883688309986466, guid: bfad626e12b63a5498032479904068c7, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index f0d8b90..6e7e6f0 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 684e68f..4e27222 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/OcclusionCullingData.asset b/Assets/Scenes/witwics/OcclusionCullingData.asset index 8b9bdf5..4cf0cdb 100644 --- a/Assets/Scenes/witwics/OcclusionCullingData.asset +++ b/Assets/Scenes/witwics/OcclusionCullingData.asset @@ -7,176 +7,164 @@ OcclusionCullingData: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: OcclusionCullingData - m_PVSData: 120000d6c18b7e64002900000000a04100000000000020c20000a0c10000a0c10000a0410000a04100002042200000005001000000000000010000006001000055000000700200000000000000000000700a0000a7000000a00100007400000000000000000000000000000000000000000000000000000000000000010000005002000000000000900100000100000001000000010000007001000080010000d00b0000000000000000000000000000000000000000000000000000542032302e3020534f20352e3020534820302e323530204246203130302046203020435320302e30202d20332e332e3232204620302030204f4720300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f000000000000000000000000010000000000000000000000000000003aba2740000000000000000000000000000000002c000000000000000000000086a0188eb0d38570088d700aa9c012b2501b818010947009a3500a843009a6800a2ae12233811b87a0088e10093f720cce101d83600881f0088520088d000926c21ab24013ba3009808011a0c1099f100884600883500887a0088e32099680219e40081cf1098150188a90080b42219320088010088480088591109230099030088f10098120081431129360100e310881400880600998300906d1109f300882000893100890f0088200099330080000000000000000000000000000ffff0000ffffffff000000000000000000000000f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc1c2f5c8c10000a0bf666676c13c0a9f4100000036cdccc4411f85adc1503e4abf35338fc11f85adc1375c1341cfccd841d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841fc4264c100806bb60ae62bc1941ee23fe514dd3d99e8e83fb1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a641a85d99bf74be1b8c8309e03faf2901410000a040afc16e41c4dea0c0e014dd3da082144112ba973d5474a3407b216641ca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b040ca2f92c191c2753ed6a3b04074da8cc10ad7233feb517841e20d84c0748f93bddb552041309a49be3797ef3e62365f41a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c414adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b4173f144c1e414dd3dcc549a41cc405bc05474a34003bca74113f45cc0e414dd3d200f6641405ba93d5474a34092df9a41e4d074c000000000fc124841045d26410000a0401cd2d541c2f5c8c180c295bfb3c2c2413e0a9f41ac470d41e7d6c241b2d8514086ebb1be08cd9c410115064148e19440769cc54101cea440f61203ba04c5ab41e409c140d1b80840fdd3b241c2f5c8c100000041666676c13e0a9f4100000041cdccc441ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b040ca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c04096cb64c1e414dd3d07822dc130a39bc05474a3402c22eac0ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040f3a79bc0e414dd3d27722dc1629ae13e5474a340b29104c1ec81c83ee414dd3d903505c1cefcee3f5474a340fbe290c0f69a86c0e414dd3d2620dec0ba631ac05474a340292551c0224f2ec0df14dd3d495a16c01aca1ac0383c753f2930f6bf79d8bfbfbc14dd3d025906c0d0adb23eac8b1b40200f193ef84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebee74213c0df14dd3d355b50c0be7bffbf383c753f001935c0b96899bfe414dd3dc7e790c01685ee3f5474a340ac9cee3fa507bf3f506b963f6c59a8c03b7ed73fe17a0240cc8b97c06f4eb43f4f6b963f511189c00189d23fe27a02400fb971c08b3fb53f52a60840b99488c025aed13f80eb3f4006ad72c0ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb517841ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff6288041d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e41581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c41fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d4125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c41e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f5934179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc9904163d8ecc01c36793f80029c416a2096c07c771d40a8e89f4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d413d4de6c049a912402a5a9e41cd1de0c05989244075629f413c60d3c09b61194024299d4135bccec0ab412b40929d9e41fc5798c04846f33ff00c9b41438692c034830b40f1359c41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e41dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f413998f1c04846f33f3f379f41b791eac034830b40efd89f418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e41a44f64c0208edd3f7f2d2d41d2054bc04a0c2640f57f3341437d2bc035efe83e91133a41fb0ae6bfe8de254084314841d49582bf74711b3fafee5541674d67bf343c3d3f93cc57417c6b83bfdc3b0e3fcdd15541c77b3fbfb4059a3f97485a41501fb2bedc3b0e3f42ae6041b6a38dbdb4059a3f0c256541b1c8aebe74711b3f24cb60415e1866be343c3d3f08a96241b1c8aebe72d7aa3f24cb60415e1866bed2bcbb3f08a96241501fb2bea63ca43f42ae6041b6a38dbd6c24f73f0c2565416268afbfce32004032525041c9ba8bbfb1a62940fcc85441b492aebf35800340136f504194a39fbfe5f20b40f74c5241cc9582bf72d7aa3fb0ee5541574d67bfd2bcbb3f94cc57417e6b83bfa63ca43fcfd15541cb7b3fbf6c24f73f99485a4157f32fbfce32004009405b414230d1beb0a62940bdb55f41b492aebf74711b3f136f504194a39fbf343c3d3ff74c52416268afbfdc3b0e3f32525041c9ba8bbfb4059a3ffcc854416268afbfa63ca43f32525041c9ba8bbf6c24f73ffcc85441b492aebf72d7aa3f136f504194a39fbfd2bcbb3ff74c5241ce1f46c0208edd3f49b73441fad52cc04a0c2640bf093b4105482ebf74711b3fea5c5b41c36910bf343c3d3fce3a5d4140f32fbfdc3b0e3f09405b411e30d1beb4059a3fd3b65f41cc9582bf35800340b0ee5541574d67bfe5f20b4094cc57417e6b83bfce320040cfd15541cb7b3fbfb1a6294099485a41b1c8aebe3580034024cb60415e1866bee5f20b4008a96241501fb2bece32004042ae6041b6a38dbdb1a629400c25654140f32fbfa63ca43f09405b411e30d1be6c24f73fd3b65f4105482ebf72d7aa3fea5c5b41c36910bfd2bcbb3fce3a5d41000000000000000027000000430000001500000032000000490000001a00000051000000420000000d0000001600000014000000180000002f0000003f0000003d000000500000004f0000001b0000002300000002000000410000002b0000000a000000220000004e0000000500000000000000040000000100000031000000330000003e000000340000004c0000003c0000002500000021000000240000002c000000290000002a00000035000000370000003600000044000000400000004d00000007000000060000000e0000000300000011000000170000001e000000200000001f0000003000000026000000280000003b00000038000000450000004600000048000000470000004a0000004b0000003a000000390000005200000053000000540000000b0000000c00000009000000080000001900000012000000130000001c0000001d0000000f000000100000002e0000002d000000000000000000000000000000e00b0000000000000000000000000000000020c20000a0c10000a0c10000a0410000a04100002042a7780000c0190000701b00001b000000001b000001201d000000a03e2c0001005000000080060000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000055550000aaaa0040090000000c0000004b000000030000000000000000000000ff3f000055550000aaaa008015000000070000000000000000000000000000000000000000005555ffff0000ab2a00601c000000060000005f000000040000000000000000000000ff5f5555ffff0000ab2a008022000000080000005f00000003000000000000000000000000005555ffffaa2a5555007e2a000000060000004d00000008000000000000000000000000005555aaaa5555008000803000000007000000440000000a000000000000000000000000005555aaaaff7faaaa0080370000000b0000002400000006000000000000000000000000000000aaaaaaaaffff00804200000009000000350000000c00000000000000000000000000aaaaffff5555ffff00804b0000000e0000006b000000040000000000000000000000ff7f00000040000055d500c0590000000700000069000000050000000000000000000000ff7fff3fffff0000561500c060000000010000006a000000050000000000000000000000ff7fff3f564daa1600bc00b26100000007000000490000000a0000000000000000000000ff7faa4e0080aa16555500b2680000000600000069000000040000000000000000000000ffb3ff3fffff5515555500c06e0000000900000000000000000000000000000000000000ffbf0000ffff00005555ffff770000000400000060000000050000000000000000000000ff7fff7faaaaaa16003000a07b0000000500000060000000060000000000000000000000ff81ff7faaaaaa16ab2a00b280000000090000003d0000000c0000000000000000000000ff7fff7faaaaaa2a555500b2890000000a0000002f0000000d0000000000000000000000ff7faaaa00ccaa16ab6a00b2930000000200000031000000090000000000000000000000ff81aaaa55b1aa32ab4e00a0950000000700000058000000060000000000000000000000ff7faa4e55555555aaaa00a09c0000000400000059000000060000000000000000000000ff8baa4e55555555559500b2a0000000050000004a000000020000000000000000000000ffb3ff3f55555555aaaa00c0a50000000b00000000000000000000000000000000000000ffbf000055555555ffffffffb0000000040000004a000000020000000000000000000000ff9faa4e55555495aaaa00b2b4000000040000000c000000070000000000000000000000ff7f5555005c555555950086b80000000c00000004000000210000000000000000000000ff7f555555955555aaaa00b2c40000000700000072000000020000000000000000000000ffb35555ffff5555aaaaffffcb0000000600000041000000090000000000000000000000ff7f5495aaaa5555008000a0d10000000200000033000000050000000000000000000000ff7faaa6aaaaaa56556100a0d30000000800000065000000060000000000000000000000ff9f5495aaaa5555aaaa00b2db00000006000000000000002b0000000000000000000000ff815495aaaaff7faaaa00a0e10000000900000024000000120000000000000000000000ff81aa4eaaaaaaaa00bc00b2ea0000000800000054000000060000000000000000000000ff7fff3fffff54bd55d500a0f20000000700000070000000030000000000000000000000ff9fff3f5555aaaa55d500c0f90000000800000000000000000000000000000000000000ff7f0000555554d5ffff00c0010100000800000053000000040000000000000000000000ff9f5555ffffaaaa55d5ffff090100000900000000000000000000000000000000000000ff7f5555ffff54d5ffffffff12010000070000001a000000120000000000000000000000ff81aaaa00ccaa6aaaaa00a0190100000300000022000000040000000000000000000000ff8154b100ccaa6a009000a01c010000090000005c000000060000000000000000000000ff9faaaa00ccaa6aaaaa00b2250100000300000055000000040000000000000000000000ff8154b900ccff97aaaa00a028010000060000006c000000040000000000000000000000ff81aaaa00c0aaaa00bc00b22e0100000600000052000000070000000000000000000000ff81aaaa00ccaaaa00bc00b200000060ff3f0100aaaa0000555500000000002055550200ff3f0000aa2a00000000002055550400ff3f00005555aa2a0000002055550500ff3f0000ff7f55550000002055550600ff3f0000aaaaff7f000000a0aaaa070055550000ff3f0000ffffff930000000055550000ff3f0000ffffff1300000000ff3f0000aaaa0000ffffff5300000000aaaa00005555000000000040ff3f0000aaaa0000555500000000002055550200ff5fff3faa2a00000000002055550300ff7fff5faa2a00000000002055550400ff7dff3f5555aa2a0000002055550500ff7fff3fff7f55550000002055550600ff7fff3faaaaff7f000000a0aaaa070055550000ff7fff3f00000060ff7f0900aa2a0000ff3f000000000060ff7f0900aaaaaa2aaa3e000000000060ff7f0a00aa1200005555ff3fffffff930000000055550000ff7fff3fffffff1300000000ff7fff3faaaa0000000000a0aa2a0400ffff5555ff5f000000000060ff5f0300aa2a0000ffff55550000000055550000ff3f0000aa2a00000000000055550100ff5fff3faa2a0000ffffff9300000000ffff5555ff5f0000ffffff33ffff0000ff5f0000aa2a0000ffffff5300000000aa2a0000ffff555500000040ff5f0200aa2a0000ffff5555000000a0aa2a0400ffff5555ff7dff5f0000000055550100ff7fff5faa2a000000000060ff7f0a00aa120000ffff5555ffffff9300000000ffff5555ff7fff5fffffff33ffff0000ff7fff5faa2a000000000080aa2a0200ffff5555ff5f000000000080aa2a0300ffff5555ff7dff5f0000000055550000ff3f00005555aa2a0000000055550100ff7dff3f5555aa2a000000a055550500aaaa5555ff7d0000000000a055550800ffffaaaaff7d0000ffffff33ffff0000ff7d00005555aa2affffff53000000005555aa2affff5555000000a0ff7f0600aaaa5555ff7f00000000000055550000ff3f0000ff7f55550000000055550100ff7fff3fff7f555500000020aaaa0800ff7f0000ff7f55550000008055550400aaaa5555ff7d0000ffffff5300000000ff7f5555aaaa555500000080ff7f0500aaaa5555ff7f00000000000055550000ff3f0000aaaaff7f0000000055550100ff7fff3faaaaff7f000000a0aaaa0700aaaa5555ff7f000000000020aaaa0800ff7f0000aaaaff7f00000060ff7f1a00ffa7aaa25495aa8affffff5300000000aaaaff7faaaa555500000080aaaa000055550000ff3f000000000080aaaa010055550000ff7fff3f00000080aaaa0600aaaa5555ff7f000000000020aaaa0800ff7f0000ffffaaaa00000060ff7f090054d5aaaaff3f000000000060ff7f210054d5a9beaaaaff3f00000060ff7f2300ffff54d55555000000000060ff7f2500ffff54d5aaaa5555ffffff1300000000ff7f0000ffffaaaaffffffb3ffff0000aaaa0000ff7f0000ffffff5300000000ffffaaaaaaaa000000000000aaaa0500ff7f0000ff7f555500000000aaaa0600ff7f0000aaaaff7f00000000aaaa0700ff7f0000ffffaaaa0000008055550400ffffaaaaff7d000000000060ff7f210054d5a9beffffaaaa00000060ff7f2500ffff54d5ffffaaaaffffffb3ffff0000ffffaaaaff7f0000ffffff33ffff0000ff7f0000ffff5555ffffff5300000000ffff5555ffffaaaa00000060ffbf0e0055550000ff3f000000000020ff3f0a00ffbfff7f5515000000000020ff3f0b00ffb1ff7fffbbaa1600000020ff3f0d00ffbfffb35555551500000060ffbf170054d55555ff3f000000000020ff3f1600ffbfffb3aaaa5555000000a054d52300ff3f0000ffbfff7f00000020ff3f2100ff9fff7f54d554bd00000020ff3f2200ffbfff9f54d5aaaa00000040ff7f0100aa2a0000ff3f000000000040ff7f0100aaaaaa2aaa3e000000000040ff7f070054d5aaaaff3f0000ffffff9300000000ff3f0000ffbfff7fffffff1300000000ffbfff7f54d5000000000000ff3f0900ffbfff7f5515000000000060ffbf0e0055150000ffffff3f000000a055150d00ffffff3fffbfffb900000040ff7f0100aa1200005555ff3f00000040ff7f0300aa120000ffff5555ffffff9300000000ffffff3fffbfff7fffffff33ffff0000ffbfff7f5515000000000000ff3f0900ffb1ff7fffbbaa1600000020ff7f0f00ff9fff7f552daa1600000020ff7f1000ffb1ff9faa2aaa1600000020ff7f1100ffb1ff7f5555aa2a000000a0555514005555aa4eff89ff7f000000a0555515005555aa4effb1ff8b000000a055551900ff5b5555ff85ff7f000000a055551a00ff7f5555ffb1ff7f00000000ff3f0900ffbfffb3555555150000008055150a00ffffff3fffbfffb900000060ffbf0e0055555515ffffff3f000000a0555516005555ff3fffbfffb3000000a055551b00ffff5555ffbfffb3ffffff33ffff0000ffbfffb35555551500000040ffbf090055550000ff3f000000000040ffbf0a0055150000ffffff3f00000040ffbf0d0055555515ffffff3f000000a05555170055550000ffffffbf000000a055551b00ffff5555ffffffbfffffff9300000000ffff0000ffffffbfffffff1300000000ffffffbf55550000ffffff33ffff0000ffffffbf55550000ffffff73ffff000055550000ffff000000000000ff7f0c00ff9fff7f552daa1600000060ff9f1000aa2aaa16aaaaff7f00000060ff9f1100ff2faa2aaaaaff7f00000020aaaa1200ff9fff7fff2faa16000000a0aa2a110054995491ff9fff81000000a0aa2a1100aaaaff7fffb1ff9f00000040ff9f0f00aa2aaa16aaaaff7f00000000ff7f0c00ffb1ff9faa2aaa1600000020aaaa1200ffb1ff9faa2aaa1600000000ff7f0c00ffb1ff7f5555aa2a00000080aa2a100054995491ff9fff8100000080aa2a1000aaaaff7fffb1ff9f00000040ff9f0f00ff2faa2aaaaaff7f00000020aaaa1300ff9fff81aa4eaa3200000020aaaa1200ffb1ff9f5555aa2a000000a055551a005495ff7fffb1ff7f000000a055551c00ffa75495ff9fff7f000000a055551e00aaaa5495ffb1ff9f00000040ff9f1300aa4eaa3254b1aaaa00000000aaaa0f00ff9fff7fff2faa1600000000aaaa1000ffb1ff9faa2aaa1600000000aaaa1100ffb1ff9f5555aa2a000000a0aa6a2700ffcb54b1ff9fff81000000a0aa6a260054adaaaaff9fff81000000a0aa6a2800ffcbaaaaffb1ff9f00000000aaaa1c00ff9fff7faa6aaa6600000000aaaa1d00ff9fff7f5461aa5600000000aaaa1e00ffb1ff9faa6a555500000060ff9f1200aa4eaa3254b1aaaa00000000aaaa1100ff9fff81aa4eaa3200000080549515005555aa4eff9fff8b00000060ff9f1800aaaa54955555aa4e0000002055551900ff85ff7fff5f55550000002055551900ff85ff815495ff5f0000002055551a00ff9fff81aaaa5495000000a0aaaa20005555aa4eff9fff810000008055550c005555aa4eff89ff7f000000a0549514005555aa4eff9fff8b000000a0549518005555aa4effb1ff9f0000002055551a00ffb1ff8b549555550000008055550c005555aa4effb1ff8b00000000ff3f0900ffbfffb3aaaa555500000060ffbf1700aaaa55555555ff3f0000002055551b00ffbfffb3aaaa5555000000a0aaaa22005555ff3fffbfffb30000008055550d005555ff3fffbfffb300000040ffbf090054d55555ff3f000000000040ffbf1600aaaa55555555ff3f0000002055551b00ffffffbfaaaa555500000040ffbf220054d5aaaa5555ff3f00000040ffbf2300ffff54d5555500000000002055552400ffffffbf54d5aaaa0000002055552500ffffffbfffff54d50000008055550e0055550000ffffffbfffffff1300000000ffffffbfffff5555ffffffb3ffff000055550000ffffffbfffffff73ffff0000ffff55555555000000000040ff9f1400aaaa54955555aa4e00000080549515005555aa4effb1ff9f0000002055551a00ffb1ff9faaaa5495000000a0aaaa20005555aa4effb1ff9f000000a054951a00ff5b5555ff85ff810000000055551400ff85ff7fff5f55550000000055551400ff85ff815495ff5f0000008055550c00ff5b5555ff85ff7f0000002054951c00ff9fff7fff7b55550000002054951e00ffb1ff9faaaa55550000008054951900ff5b5555ff85ff810000002054951f00ff9fff81ffa7ff7f0000000055551400ff9fff81aaaa54950000000055551500ffb1ff8b549555550000000055551800ffb1ff9faaaa5495000000a0aaaa2000aa825555ff9fff81000000a0aaaa200054955555ffb1ff9f0000008055550c00ff7f5555ffb1ff7f00000080555511005495ff7fffb1ff7f00000040ff7f0600ffa7aaa25495aa8a0000000055551600ffbfffb3aaaa55550000000055551700ffffffbfaaaa5555000000a0aaaa2400ffff5555ffffffb30000008055550d00ffff5555ffbfffb30000008055550e00ffff5555ffffffbfffffff33ffff0000ffffffb3aaaa5555ffffff73ffff0000aaaa5555ffff55550000000054951a00ff9fff7fff7b555500000060ff9f1e00ff7f5555aaaa5495000000a0ff7f1f00aaaaaa9aff9fff8100000020aaaa1200ff9fff7faa6aaa6600000020aaaa2600ff9fff81ff7faa6a0000008055551100ffa75495ff9fff7f00000060ff9f1e005461aa56aaaaaaa600000020aaaa1200ff9fff7f5461aa560000000054951a00ffb1ff9faaaa555500000040ff9f1c00ff7f5555aaaa549500000040ff9f1d005461aa56aaaaaaa600000040ff9f1f00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ffb1ff9f00000020aaaa1200ffb1ff9faa6a555500000020aaaa2800ffb1ff9faaaaaa6a0000008055551100aaaa5495ffb1ff9f0000000054951a00ff9fff81ffa7ff7f00000080ff7f1c00aaaaaa9aff9fff8100000060ff9f1e00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ff9fff8100000020aaaa2600ff9fff81ff8fff7f00000020aaaa2600ff9fff81aaaaff9300000080aaaa14005555aa4eff9fff8100000080aaaa18005555aa4effb1ff9f00000080aaaa1a00aa825555ff9fff8100000080aaaa1a0054955555ffb1ff9f00000080aaaa1e00aaaa5495ffb1ff9f00000080aaaa1f00aaaa5495ff9fff8100000020aaaa2a00ff9fff8154b5aaaa00000020aaaa2a00ffb1ff9fffbbaaaa00000020aaaa2b00ff9fff81ffbb54b900000000ff3f0900ff9fff7f54d554bd00000060ff9f220054d554bd5555ff3f000000a054d523005555ff3fff9fff7f00000060ff9f240054d554bdffff5555000000a054d52500ffff5555ff9fff7f00000040ff7f070054d5a9beaaaaff3f00000040ff7f080054d5a9beffffaaaaffffff33ffff0000ff9fff7f54d554bd00000000ff3f0900ffbfff9f54d5aaaa00000060ffbf170054d5aaaa5555ff3f00000040ff9f210054d554bd5555ff3f000000a054d523005555ff3fffbfff9f0000002055552400ffbfffb354bdaaaa0000002055552400ffbfff9f54d554bd00000080aaaa16005555ff3fffbfffb300000060ffbf1700ffff54d5555500000000008054d50900ff3f0000ffbfff7f0000008054d521005555ff3fff9fff7f0000008054d522005555ff3fffbfff9f0000002055552500ffbfff7fffff54d500000040ff7f0700ffff54d555550000ffffff1300000000ffbfff7fffff54d5ffffffb3ffff000055550000ffbfff7f00000040ff9f210054d554bdffff5555000000a054d52500ffff5555ffffff9f0000000055552200ffbfffb354bdaaaa0000000055552200ffbfff9f54d554bd0000000055551700ffffffbf54d5aaaa00000080aaaa1b00ffff5555ffffffb3ffffff33ffff0000ffffff9f54d5aaaaffffff73ffff000054d5aaaaffff55550000008054d52100ffff5555ff9fff7f0000008054d52400ffff5555ffffff9f0000000055551700ffffffbfffff54d50000000055552300ffbfff7fffff54d500000040ff7f0700ffff54d5aaaa555500000040ff7f0800ffff54d5ffffaaaaffffffb3ffff0000ffff5555ffffff7fffffff33ffff0000ffffff7fffff54d5ffffff73ffff0000ffff54d5ffff555500000080aa6a120054adaaaaff9fff8100000060ff9f2800aaaaaa6affbfaaaa00000060ff9f2800ff9f5485ffcbffbf000000a0aaaa2a0054b5aaaaff9fff8100000000aaaa1c00ff9fff81ff7faa6a00000000aaaa1f00ff9fff81ff8fff7f00000000aaaa1f00ff9fff81aaaaff9300000080aa6a1200ffcb54b1ff9fff8100000060ff9f2800ff7faa6affbf54b100000060ff9f2800ff8faa6affcbffbf00000040ff9f2600aaaaaa6affbfaaaa00000040ff9f2600ff9f5485ffcbffbf00000080aa6a1200ffcbaaaaffb1ff9f00000040ff9f2700ff7faa6affbf54b100000040ff9f2700ff8faa6affcbffbf00000040ff9f2900aaaaff97ffcb54b9000000a0aaaa2a00ffbfaaaaffb1ff9f000000a0aaaa2b00ffcbffbfffb1ff9f00000000aaaa1e00ffb1ff9faaaaaa6a00000060ff9f2800aaaaff97ffcb54b9000000a0aaaa2b0054bd54b9ff9fff9d000000a0aaaa2b00ffcb54bdff9fff8100000040ff9f2b00ffbbaaaaffbfaaaa00000020ffbf2b00ffb1ff9fffbbaaaa00000080aaaa260054b5aaaaff9fff8100000080aaaa2800ffbfaaaaffb1ff9f00000000aaaa2000ff9fff8154b5aaaa00000000aaaa2000ffb1ff9fffbbaaaa00000060ff9f2a00ffbbaaaaffbfaaaa00000000ffbf2a00ffb1ff9fffbbaaaa00000080aaaa2800ffcbffbfffb1ff9f00000080aaaa290054bd54b9ff9fff9d00000080aaaa2900ffcb54bdff9fff8100000000aaaa2000ff9fff81ffbb54b929407ae83773415eae7b25f7ff8308b7b7fbded4f4027bd5519d3581c694123c0d9d9ddff1dd225cadfe941ef3104fdf5c739f3755f37edfd594dfadb62a4f3f73433f7ceb1f1171f377ebeb19740ff0e3563df3cfafbfef2bc2f4d150f3fe43edf43aefffb0aaef9c9dfdf00cf3c03231334cf374378e12bdfee7823a2f38bcf67aaff3afabb32ff7ddff10333ff3f4322f4e2b3f7fabefba8eaffbfaf77ffee7ff0fbff338dcf3ddfffcf0e0fe33332feafc30cfcdb0ffcccfdcf7b78fbfafffff3df3f10f3fff3c73e6fcfec3fbf3fffffdffcfccfdff9cfff3f33737f3defcffbffdccff33fb8ffdfbfff3fff8ffcf030000a8003a01ac0100000e19232c343f4d5a646f7a828b939e08131a252e333e474f57606a737f880811181e292f383d42494e565f656b03081015161a1f26292e323500000000000000000000000000000000000000000000000000a0c1000000000000a0c100000000000020c1000020c10000a0410000000000002041000000000000a0410000a0410000000000000000000020c1000000000000a0c1000000000000f0c10000000000002041000020410000a0c10000a0c100000000084080707008120ec7a62418000205c36573296d48898442d1488c480a462311222d188c4844229124129a4488244185480bc6a2c178401a918644d2d068349acf46e3019d2428d386b1682c188c46a3c168441a0d4963a1d170349bcd2624026d36a6146ab35a30188d0563c1683c1e90462422692c2c8b8546c3d16c3c1b108804229d4c920d6a633aad562bd56ac158301e8f48443291542a968585b2b068340b50084402914c27d329b50a915424d28ac458301e8f8744329148169445655159542a96050563c968381cd06221128142211089743299522693299552ad56a1908aa422ad482bd282f1803c208fc82322994824144aa5b2a02c2a8bca62815968329c056811028540a20508443a994c2793e9643a9d4c269329a552855424d28a448a3c261389642299482895458542a95430190da7d3e12c40a00568b110814420d3c9643a994ea6d4c974329952a6946aa55a8554a415e91179442492c98452595416984ca6c3e92c40a00508b41089442290c9643a994ea1d54432914c24194da6b3002d400b114804329d4ca6d34432c968389d0508040a9952a6d444b200995226530a000000000000000000 + m_PVSData: 120000d6de7678cf902900000000a04100000000000020c20000a0c10000a0c10000a0410000a0410000204220000000500100000000000001000000600100005a000000800200000000000000000000f00a0000a7000000a00100007700000000000000000000000000000000000000000000000000000000000000010000006002000000000000900100000100000001000000010000007001000080010000600c0000000000000000000000000000000000000000000000000000542032302e3020534f20352e3020534820302e323530204246203130302046203020435320302e30202d20332e332e3232204620302030204f4720300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000ffff7f7f000000000000000000000000010000000000000000000000000000003aba2740000000000000000000000000000000002c00000000000000000000008790080be108bb6f088ad008a7c00a2e111bba1008858008947009a3500a843009a68022ad000b3473088ac00891b00b41c314d2500dd930088910088f600882d008906022ac101bb83109808011a0c1099f10088490088360108ac0080f32099680219e40081cf1098160100951080b42219320088010088480088591109230099030088f10098120081431129390108cf0088310088400089680099390100cf1098320088030098100098f2008903009830000000000000000000000000000000000000000000000000000ffff0000ffffffff000000000000000000000000f0f4c8c194c295bf86eb6dc1100b9f41ae470d4184eb6dc1c2f5c8c10000a0bf666676c13c0a9f4100000036cdccc4411f85adc1503e4abf35338fc11f85adc1375c1341cfccd841d6a30041c85278bf36338fc1d8a30041f07a1041d0ccd841fc4264c100806bb60ae62bc1941ee23fe514dd3d99e8e83fca2f92c191c2753ed6a3b04074da8cc10ad7233feb517841b1ed44c10082b739e7bb154100a0e2ba3fcddd3d15e3a641e20d84c0748f93bddb552041309a49be3797ef3e62365f41ca2f92c191c2753e2a5c8fc074da8cc10ad7233fd6a3b040a85d99bf74be1b8c8309e03faf2901410000a040afc16e41a635a1c0e014dd3da082144112ba973d5474a340ed4c66414adb81c050cedd3df0ac2d4177d24bc0b1a9da3ff7a53b415fbd5dc0e414dd3de2eb6541405ba93d5474a34092df9a411efc44c1e414dd3d8e369a41cc405bc05474a34003bca741a26891c0dc14dd3d73bf8241a12f68c0ae47ea3f48228c41e4d074c000000000fc124841045d26410000a0401cd2d541c2f5c8c180c295bfb3c2c2413e0a9f41ac470d41e7d6c241b2d8514086ebb1be4fb79c417240064148e19440769cc54101cea440f61203ba04c5ab41e409c140d1b80840fdd3b241c2f5c8c100000041666676c13e0a9f4100000041cdccc441ca2fa2c153b89e3f2a5c8fc074da9cc185ebd13fd6a3b040ca2faac153b8de3f53b87ec074daa4c1c3f50840d6a3c04096cb64c1e414dd3d07822dc130a39bc05474a3402c22eac0ca2f9ac1a4703d3f53b87ec074da94c185eb913fd6a3c040f3a79bc0e414dd3d27722dc1629ae13e5474a340b29104c1ec81c83ee414dd3d903505c1cefcee3f5474a340fbe290c0f69a86c0e414dd3d2620dec0ba631ac05474a340292551c0e74213c0df14dd3d355b50c0be7bffbf383c753f001935c079d8bfbfbc14dd3d025906c0d0adb23eac8b1b40200f193ef84eb2bfd2b23f3f5a03fcbfd0bf29bf62340140e894cebe224f2ec0df14dd3d495a16c01aca1ac0383c753f2930f6bfb96899bfe414dd3dc7e790c01685ee3f5474a340ac9cee3f6f4eb43f4f6b963f511189c00189d23fe27a02400fb971c0a507bf3f506b963f6c59a8c03b7ed73fe17a0240cc8b97c08b3fb53f52a60840b99488c025aed13f80eb3f4006ad72c0ca2fa2c153b89e3fd6a3b04074da9cc185ebd13feb517841ca2faac153b8de3fd6a3c04074daa4c1c3f50840f6288041cd2f9ac1a4703d3fd4a3c04071da94c185eb913ff62880418973c9c09b61194009949c414a0fc6c0ab412b40bd3b9e41581d97c0dc5ed73fcdea9a41a28f91c0fc1efb3f12289c41fd30b4c09b611940ebb69b41fe60b1c0ab412b407f6f9d41fedabcc09b61194001fb9b413f76bbc0ab412b40b7d19d415928d8c09ca21b3fd69d8d41c75fbec08bdba43fe4919241ec23d7c0fb188f3fd3688e41cc11c1c0dd93a33fcd658f4163d8ecc01c36793f80029c416a2096c07c771d40a8e89f413998f1c04846f33f3f379f41b791eac034830b40efd89f41cda4b8c09ca21b3f353a8c413bdc9ec08bdba43f432e914160a0b7c0fb188f3f32058d41408ea1c0dd93a33f2c028e41dbd2f2c0dc5ed73f1e459f4159ccebc0fc1efb3fcee69f4127d39bc0a30d06401bd09a41feb197c0b3ed1740f75b9c416b86abc09d8c1840124c9b41acffa8c0ae6c2a40b20d9d41fc5798c04846f33ff00c9b41438692c034830b40f1359c41e4abf7c09ca21b3f78018f4152e3ddc08bdba43f86f5934179a7f6c0fb188f3f75cc8f415995e0c0dd93a33f6fc990418c0fedc0a30d064073939e41ce1ce7c0b3ed174069b19f413d4de6c049a912402a5a9e41cd1de0c05989244075629f413c60d3c09b61194024299d4135bccec0ab412b40929d9e41d00adcc09d8c1840f18a9d41c966d7c0ad6c2a405fff9e4125d2a2c049a912403a2e9b414f5a9ec05a892440eaaa9c4140f32fbfa63ca43f09405b411e30d1be6c24f73fd3b65f4105482ebf72d7aa3fea5c5b41c36910bfd2bcbb3fce3a5d416268afbfa63ca43f32525041c9ba8bbf6c24f73ffcc85441b492aebf72d7aa3f136f504194a39fbfd2bcbb3ff74c52417e6b83bfa63ca43fcfd15541cb7b3fbf6c24f73f99485a41cc9582bf72d7aa3fb0ee5541574d67bfd2bcbb3f94cc5741b1c8aebe72d7aa3f24cb60415e1866bed2bcbb3f08a96241501fb2bea63ca43f42ae6041b6a38dbd6c24f73f0c256541b1c8aebe3580034024cb60415e1866bee5f20b4008a96241501fb2bece32004042ae6041b6a38dbdb1a629400c2565410a6cf4be96941a3fde956941da8ea2bd25fc0d401ff1714105a956bf96941a3f5ed67141b689e1be25fc0d409f317a41bdbc10c086941a3f402d89416687eebf21fc0d40e05a8d41a44f64c0208edd3f7f2d2d41d2054bc04a0c2640f57f3341ce1f46c0208edd3f49b73441fad52cc04a0c2640bf093b416268afbfdc3b0e3f32525041c9ba8bbfb4059a3ffcc85441b492aebf74711b3f136f504194a39fbf343c3d3ff74c5241501fb2bedc3b0e3f42ae6041b6a38dbdb4059a3f0c256541b1c8aebe74711b3f24cb60415e1866be343c3d3f08a962416268afbfce32004032525041c9ba8bbfb1a62940fcc85441b492aebf35800340136f504194a39fbfe5f20b40f74c52417e6b83bfce320040cfd15541cb7b3fbfb1a6294099485a41cc9582bf35800340b0ee5541574d67bfe5f20b4094cc574157f32fbfce32004009405b414230d1beb0a62940bdb55f413240f3bf96941a3f050d85411e4ec0bf25fc0d40a53a8941437d2bc035efe83e91133a41fb0ae6bfe8de25408431484120cf15c086ce063ffc1d68410000adb8ef4c3f40e6168e41d49582bf74711b3fafee5541674d67bf343c3d3f93cc57417c6b83bfdc3b0e3fcdd15541c77b3fbfb4059a3f97485a4105482ebf74711b3fea5c5b41c36910bf343c3d3fce3a5d4140f32fbfdc3b0e3f09405b411e30d1beb4059a3fd3b65f413b00000050000000080000005200000041000000290000002e0000003f000000020000004b000000140000001000000000000000370000003e0000001b000000210000001600000013000000150000000a0000002d0000002a000000010000004a0000001e0000004000000038000000470000003a00000051000000480000002200000057000000560000001a0000002b0000000e000000300000002c000000240000002f0000003d0000003c000000340000003900000043000000420000004500000044000000460000004f000000120000001100000017000000070000000f0000000400000003000000260000002500000036000000350000004d0000004c000000540000005500000058000000590000004e00000049000000530000001f0000000d0000001d0000001c000000060000000500000019000000180000000c0000000b00000009000000200000003300000023000000310000003200000027000000280000000000000000000000700c0000000000000000000000000000000020c20000a0c10000a0c10000a0410000a04100002042a7780000c0190000701b00001b000000001b000001201d000000a03e2c0001005000000080060000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000055550000aaaa0040090000000c0000004d000000030000000000000000000000ff3f000055550000aaaa008015000000070000000000000000000000000000000000000000005555ffff0000ab2a00601c0000000600000062000000040000000000000000000000ff5f5555ffff0000ab2a008022000000080000006200000003000000000000000000000000005555ffffaa2a5555007e2a000000060000004f00000008000000000000000000000000005555aaaa5555008000803000000007000000460000000a000000000000000000000000005555aaaaff7faaaa0080370000000b0000002700000006000000000000000000000000000000aaaaaaaaffff00804200000009000000370000000c00000000000000000000000000aaaaffff5555ffff00804b0000000e0000006e000000040000000000000000000000ff7f00000040000055d500c059000000070000006c000000050000000000000000000000ff7fff3fffff0000561500c060000000010000006d000000050000000000000000000000ff7fff3f564daa1600bc00b261000000070000004b0000000a0000000000000000000000ff7faa4e0080aa16555500b268000000060000006c000000040000000000000000000000ffb3ff3fffff5515555500c06e0000000900000000000000000000000000000000000000ffbf0000ffff00005555ffff770000000400000063000000050000000000000000000000ff7fff7faaaaaa16003000a07b0000000500000063000000060000000000000000000000ff81ff7faaaaaa16ab2a00b280000000090000003f0000000c0000000000000000000000ff7fff7faaaaaa2a555500b2890000000a000000310000000d0000000000000000000000ff7faaaa00ccaa16ab6a00b2930000000200000033000000090000000000000000000000ff81aaaa55b1aa32ab4e00a095000000070000005a000000060000000000000000000000ff7faa4e55555555aaaa00a09c000000040000005b000000060000000000000000000000ff8baa4e55555555559500b2a0000000050000004c000000020000000000000000000000ffb3ff3f55555555aaaa00c0a50000000b00000000000000000000000000000000000000ffbf000055555555ffffffffb0000000040000004c000000020000000000000000000000ff9faa4e55555495aaaa00b2b4000000040000000d000000070000000000000000000000ff7f5555005c555555950086b80000000c00000005000000210000000000000000000000ff7f555555955555aaaa00b2c40000000700000075000000020000000000000000000000ffb35555ffff5555aaaaffffcb0000000600000043000000090000000000000000000000ff7f5495aaaa5555008000a0d10000000200000035000000050000000000000000000000ff7faaa6aaaaaa56556100a0d30000000800000068000000060000000000000000000000ff9f5495aaaa5555aaaa00b2db0000000600000000000000300000000000000000000000ff815495aaaaff7faaaa00a0e10000000900000027000000120000000000000000000000ff81aa4eaaaaaaaa00bc00b2ea0000000800000056000000060000000000000000000000ff7fff3fffff54bd55d500a0f20000000700000073000000030000000000000000000000ff9fff3f5555aaaa55d500c0f90000000800000000000000000000000000000000000000ff7f0000555554d5ffff00c0010100000800000055000000040000000000000000000000ff9f5555ffffaaaa55d5ffff090100000900000000000000000000000000000000000000ff7f5555ffff54d5ffffffff12010000070000001b000000150000000000000000000000ff81aaaa00ccaa6aaaaa00a0190100000300000025000000040000000000000000000000ff8154b100ccaa6a009000a01c010000090000005e000000060000000000000000000000ff9faaaa00ccaa6aaaaa00b2250100000300000057000000040000000000000000000000ff8154b900ccff97aaaa00a028010000060000006f000000040000000000000000000000ff81aaaa00c0aaaa00bc00b22e0100000600000054000000070000000000000000000000ff81aaaa00ccaaaa00bc00b200000060ff3f0100aaaa0000555500000000002055550200ff3f0000aa2a00000000002055550400ff3f00005555aa2a0000002055550500ff3f0000ff7f55550000002055550600ff3f0000aaaaff7f000000a0aaaa070055550000ff3f0000ffffff930000000055550000ff3f0000ffffff1300000000ff3f0000aaaa0000ffffff5300000000aaaa00005555000000000040ff3f0000aaaa0000555500000000002055550200ff5fff3faa2a00000000002055550300ff7fff5faa2a00000000002055550400ff7dff3f5555aa2a0000002055550500ff7fff3fff7f55550000002055550600ff7fff3faaaaff7f000000a0aaaa070055550000ff7fff3f00000060ff7f0900aa2a0000ff3f000000000060ff7f0900aaaaaa2aaa3e000000000060ff7f0a00aa1200005555ff3fffffff930000000055550000ff7fff3fffffff1300000000ff7fff3faaaa0000000000a0aa2a0400ffff5555ff5f000000000060ff5f0300aa2a0000ffff55550000000055550000ff3f0000aa2a00000000000055550100ff5fff3faa2a0000ffffff9300000000ffff5555ff5f0000ffffff33ffff0000ff5f0000aa2a0000ffffff5300000000aa2a0000ffff555500000040ff5f0200aa2a0000ffff5555000000a0aa2a0400ffff5555ff7dff5f0000000055550100ff7fff5faa2a000000000060ff7f0a00aa120000ffff5555ffffff9300000000ffff5555ff7fff5fffffff33ffff0000ff7fff5faa2a000000000080aa2a0200ffff5555ff5f000000000080aa2a0300ffff5555ff7dff5f0000000055550000ff3f00005555aa2a0000000055550100ff7dff3f5555aa2a000000a055550500aaaa5555ff7d0000000000a055550800ffffaaaaff7d0000ffffff33ffff0000ff7d00005555aa2affffff53000000005555aa2affff5555000000a0ff7f0600aaaa5555ff7f00000000000055550000ff3f0000ff7f55550000000055550100ff7fff3fff7f555500000020aaaa0800ff7f0000ff7f55550000008055550400aaaa5555ff7d0000ffffff5300000000ff7f5555aaaa555500000080ff7f0500aaaa5555ff7f00000000000055550000ff3f0000aaaaff7f0000000055550100ff7fff3faaaaff7f000000a0aaaa0700aaaa5555ff7f000000000020aaaa0800ff7f0000aaaaff7f00000060ff7f1a00ffa7aaa25495aa8affffff5300000000aaaaff7faaaa555500000080aaaa000055550000ff3f000000000080aaaa010055550000ff7fff3f00000080aaaa0600aaaa5555ff7f000000000020aaaa0800ff7f0000ffffaaaa00000060ff7f090054d5aaaaff3f000000000060ff7f210054d5a9beaaaaff3f00000060ff7f2300ffff54d55555000000000060ff7f2500ffff54d5aaaa5555ffffff1300000000ff7f0000ffffaaaaffffffb3ffff0000aaaa0000ff7f0000ffffff5300000000ffffaaaaaaaa000000000000aaaa0500ff7f0000ff7f555500000000aaaa0600ff7f0000aaaaff7f00000000aaaa0700ff7f0000ffffaaaa0000008055550400ffffaaaaff7d000000000060ff7f210054d5a9beffffaaaa00000060ff7f2500ffff54d5ffffaaaaffffffb3ffff0000ffffaaaaff7f0000ffffff33ffff0000ff7f0000ffff5555ffffff5300000000ffff5555ffffaaaa00000060ffbf0e0055550000ff3f000000000020ff3f0a00ffbfff7f5515000000000020ff3f0b00ffb1ff7fffbbaa1600000020ff3f0d00ffbfffb35555551500000060ffbf170054d55555ff3f000000000020ff3f1600ffbfffb3aaaa5555000000a054d52300ff3f0000ffbfff7f00000020ff3f2100ff9fff7f54d554bd00000020ff3f2200ffbfff9f54d5aaaa00000040ff7f0100aa2a0000ff3f000000000040ff7f0100aaaaaa2aaa3e000000000040ff7f070054d5aaaaff3f0000ffffff9300000000ff3f0000ffbfff7fffffff1300000000ffbfff7f54d5000000000000ff3f0900ffbfff7f5515000000000060ffbf0e0055150000ffffff3f000000a055150d00ffffff3fffbfffb900000040ff7f0100aa1200005555ff3f00000040ff7f0300aa120000ffff5555ffffff9300000000ffffff3fffbfff7fffffff33ffff0000ffbfff7f5515000000000000ff3f0900ffb1ff7fffbbaa1600000020ff7f0f00ff9fff7f552daa1600000020ff7f1000ffb1ff9faa2aaa1600000020ff7f1100ffb1ff7f5555aa2a000000a0555514005555aa4eff89ff7f000000a0555515005555aa4effb1ff8b000000a055551900ff5b5555ff85ff7f000000a055551a00ff7f5555ffb1ff7f00000000ff3f0900ffbfffb3555555150000008055150a00ffffff3fffbfffb900000060ffbf0e0055555515ffffff3f000000a0555516005555ff3fffbfffb3000000a055551b00ffff5555ffbfffb3ffffff33ffff0000ffbfffb35555551500000040ffbf090055550000ff3f000000000040ffbf0a0055150000ffffff3f00000040ffbf0d0055555515ffffff3f000000a05555170055550000ffffffbf000000a055551b00ffff5555ffffffbfffffff9300000000ffff0000ffffffbfffffff1300000000ffffffbf55550000ffffff33ffff0000ffffffbf55550000ffffff73ffff000055550000ffff000000000000ff7f0c00ff9fff7f552daa1600000060ff9f1000aa2aaa16aaaaff7f00000060ff9f1100ff2faa2aaaaaff7f00000020aaaa1200ff9fff7fff2faa16000000a0aa2a110054995491ff9fff81000000a0aa2a1100aaaaff7fffb1ff9f00000040ff9f0f00aa2aaa16aaaaff7f00000000ff7f0c00ffb1ff9faa2aaa1600000020aaaa1200ffb1ff9faa2aaa1600000000ff7f0c00ffb1ff7f5555aa2a00000080aa2a100054995491ff9fff8100000080aa2a1000aaaaff7fffb1ff9f00000040ff9f0f00ff2faa2aaaaaff7f00000020aaaa1300ff9fff81aa4eaa3200000020aaaa1200ffb1ff9f5555aa2a000000a055551a005495ff7fffb1ff7f000000a055551c00ffa75495ff9fff7f000000a055551e00aaaa5495ffb1ff9f00000040ff9f1300aa4eaa3254b1aaaa00000000aaaa0f00ff9fff7fff2faa1600000000aaaa1000ffb1ff9faa2aaa1600000000aaaa1100ffb1ff9f5555aa2a000000a0aa6a2700ffcb54b1ff9fff81000000a0aa6a260054adaaaaff9fff81000000a0aa6a2800ffcbaaaaffb1ff9f00000000aaaa1c00ff9fff7faa6aaa6600000000aaaa1d00ff9fff7f5461aa5600000000aaaa1e00ffb1ff9faa6a555500000060ff9f1200aa4eaa3254b1aaaa00000000aaaa1100ff9fff81aa4eaa3200000080549515005555aa4eff9fff8b00000060ff9f1800aaaa54955555aa4e0000002055551900ff85ff7fff5f55550000002055551900ff85ff815495ff5f0000002055551a00ff9fff81aaaa5495000000a0aaaa20005555aa4eff9fff810000008055550c005555aa4eff89ff7f000000a0549514005555aa4eff9fff8b000000a0549518005555aa4effb1ff9f0000002055551a00ffb1ff8b549555550000008055550c005555aa4effb1ff8b00000000ff3f0900ffbfffb3aaaa555500000060ffbf1700aaaa55555555ff3f0000002055551b00ffbfffb3aaaa5555000000a0aaaa22005555ff3fffbfffb30000008055550d005555ff3fffbfffb300000040ffbf090054d55555ff3f000000000040ffbf1600aaaa55555555ff3f0000002055551b00ffffffbfaaaa555500000040ffbf220054d5aaaa5555ff3f00000040ffbf2300ffff54d5555500000000002055552400ffffffbf54d5aaaa0000002055552500ffffffbfffff54d50000008055550e0055550000ffffffbfffffff1300000000ffffffbfffff5555ffffffb3ffff000055550000ffffffbfffffff73ffff0000ffff55555555000000000040ff9f1400aaaa54955555aa4e00000080549515005555aa4effb1ff9f0000002055551a00ffb1ff9faaaa5495000000a0aaaa20005555aa4effb1ff9f000000a054951a00ff5b5555ff85ff810000000055551400ff85ff7fff5f55550000000055551400ff85ff815495ff5f0000008055550c00ff5b5555ff85ff7f0000002054951c00ff9fff7fff7b55550000002054951e00ffb1ff9faaaa55550000008054951900ff5b5555ff85ff810000002054951f00ff9fff81ffa7ff7f0000000055551400ff9fff81aaaa54950000000055551500ffb1ff8b549555550000000055551800ffb1ff9faaaa5495000000a0aaaa2000aa825555ff9fff81000000a0aaaa200054955555ffb1ff9f0000008055550c00ff7f5555ffb1ff7f00000080555511005495ff7fffb1ff7f00000040ff7f0600ffa7aaa25495aa8a0000000055551600ffbfffb3aaaa55550000000055551700ffffffbfaaaa5555000000a0aaaa2400ffff5555ffffffb30000008055550d00ffff5555ffbfffb30000008055550e00ffff5555ffffffbfffffff33ffff0000ffffffb3aaaa5555ffffff73ffff0000aaaa5555ffff55550000000054951a00ff9fff7fff7b555500000060ff9f1e00ff7f5555aaaa5495000000a0ff7f1f00aaaaaa9aff9fff8100000020aaaa1200ff9fff7faa6aaa6600000020aaaa2600ff9fff81ff7faa6a0000008055551100ffa75495ff9fff7f00000060ff9f1e005461aa56aaaaaaa600000020aaaa1200ff9fff7f5461aa560000000054951a00ffb1ff9faaaa555500000040ff9f1c00ff7f5555aaaa549500000040ff9f1d005461aa56aaaaaaa600000040ff9f1f00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ffb1ff9f00000020aaaa1200ffb1ff9faa6a555500000020aaaa2800ffb1ff9faaaaaa6a0000008055551100aaaa5495ffb1ff9f0000000054951a00ff9fff81ffa7ff7f00000080ff7f1c00aaaaaa9aff9fff8100000060ff9f1e00aaaaff7faaaa5495000000a0aaaa2000aaaa5495ff9fff8100000020aaaa2600ff9fff81ff8fff7f00000020aaaa2600ff9fff81aaaaff9300000080aaaa14005555aa4eff9fff8100000080aaaa18005555aa4effb1ff9f00000080aaaa1a00aa825555ff9fff8100000080aaaa1a0054955555ffb1ff9f00000080aaaa1e00aaaa5495ffb1ff9f00000080aaaa1f00aaaa5495ff9fff8100000020aaaa2a00ff9fff8154b5aaaa00000020aaaa2a00ffb1ff9fffbbaaaa00000020aaaa2b00ff9fff81ffbb54b900000000ff3f0900ff9fff7f54d554bd00000060ff9f220054d554bd5555ff3f000000a054d523005555ff3fff9fff7f00000060ff9f240054d554bdffff5555000000a054d52500ffff5555ff9fff7f00000040ff7f070054d5a9beaaaaff3f00000040ff7f080054d5a9beffffaaaaffffff33ffff0000ff9fff7f54d554bd00000000ff3f0900ffbfff9f54d5aaaa00000060ffbf170054d5aaaa5555ff3f00000040ff9f210054d554bd5555ff3f000000a054d523005555ff3fffbfff9f0000002055552400ffbfffb354bdaaaa0000002055552400ffbfff9f54d554bd00000080aaaa16005555ff3fffbfffb300000060ffbf1700ffff54d5555500000000008054d50900ff3f0000ffbfff7f0000008054d521005555ff3fff9fff7f0000008054d522005555ff3fffbfff9f0000002055552500ffbfff7fffff54d500000040ff7f0700ffff54d555550000ffffff1300000000ffbfff7fffff54d5ffffffb3ffff000055550000ffbfff7f00000040ff9f210054d554bdffff5555000000a054d52500ffff5555ffffff9f0000000055552200ffbfffb354bdaaaa0000000055552200ffbfff9f54d554bd0000000055551700ffffffbf54d5aaaa00000080aaaa1b00ffff5555ffffffb3ffffff33ffff0000ffffff9f54d5aaaaffffff73ffff000054d5aaaaffff55550000008054d52100ffff5555ff9fff7f0000008054d52400ffff5555ffffff9f0000000055551700ffffffbfffff54d50000000055552300ffbfff7fffff54d500000040ff7f0700ffff54d5aaaa555500000040ff7f0800ffff54d5ffffaaaaffffffb3ffff0000ffff5555ffffff7fffffff33ffff0000ffffff7fffff54d5ffffff73ffff0000ffff54d5ffff555500000080aa6a120054adaaaaff9fff8100000060ff9f2800aaaaaa6affbfaaaa00000060ff9f2800ff9f5485ffcbffbf000000a0aaaa2a0054b5aaaaff9fff8100000000aaaa1c00ff9fff81ff7faa6a00000000aaaa1f00ff9fff81ff8fff7f00000000aaaa1f00ff9fff81aaaaff9300000080aa6a1200ffcb54b1ff9fff8100000060ff9f2800ff7faa6affbf54b100000060ff9f2800ff8faa6affcbffbf00000040ff9f2600aaaaaa6affbfaaaa00000040ff9f2600ff9f5485ffcbffbf00000080aa6a1200ffcbaaaaffb1ff9f00000040ff9f2700ff7faa6affbf54b100000040ff9f2700ff8faa6affcbffbf00000040ff9f2900aaaaff97ffcb54b9000000a0aaaa2a00ffbfaaaaffb1ff9f000000a0aaaa2b00ffcbffbfffb1ff9f00000000aaaa1e00ffb1ff9faaaaaa6a00000060ff9f2800aaaaff97ffcb54b9000000a0aaaa2b0054bd54b9ff9fff9d000000a0aaaa2b00ffcb54bdff9fff8100000040ff9f2b00ffbbaaaaffbfaaaa00000020ffbf2b00ffb1ff9fffbbaaaa00000080aaaa260054b5aaaaff9fff8100000080aaaa2800ffbfaaaaffb1ff9f00000000aaaa2000ff9fff8154b5aaaa00000000aaaa2000ffb1ff9fffbbaaaa00000060ff9f2a00ffbbaaaaffbfaaaa00000000ffbf2a00ffb1ff9fffbbaaaa00000080aaaa2800ffcbffbfffb1ff9f00000080aaaa290054bd54b9ff9fff9d00000080aaaa2900ffcb54bdff9fff8100000000aaaa2000ff9fff81ffbb54b929407ae83773415eae7b25f7ff8308b7b7fbded4f4027bd5519d3581c694123c0d9d9ddff1dd225cadfe941ef3104fdf5c739f3755f37edfd594dfadb62a4f3f73433f7ceb1f1171f377ebeb19740ff0e3563df3cfafbfef2bc2f4d150f3fe43edf43aefffb0aaef9c9dfdf00cf3c03231334cf374378e12bdfee7823a2f38bcf67aaff3afabb32ff7ddff10333ff3f4322f4e2b3f7fabefba8eaffbfaf77ffee7ff0fbff338dcf3ddfffcf0e0fe33332feafc30cfcdb0ffcccfdcf7b78fbfafffff3df3f10f3fff3c73e6fcfec3fbf3fffffdffcfccfdff9cfff3f33737f3defcffbffdccff33fb8ffdfbfff3fff8ffcf030000a8003a01ac0100000e19232c343f4d5a646f7a828b939e08131a252e333e474f57606a737f880811181e292f383d42494e565f656b03081015161a1f26292e323500000000000000000000000000000000000000000000000000a0c1000000000000a0c100000000000020c1000020c10000a0410000000000002041000000000000a0410000a0410000000000000000000020c1000000000000a0c1000000000000f0c10000000000002041000020410000a0c10000a0c100000000084080707008120ec7a62418000205c36573296d48898442d1488c480a462311222d188c4844229124129a4488244185480bc6a2c178401a918644d2d068349acf46e3019d2428d386b1682c188c46a3c168441a0d4963a1d170349bcd2624026d36a6146ab35a30188d0563c1683c1e90462422692c2c8b8546c3d16c3c1b108804229d4c920d6a633aad562bd56ac158301e8f48443291542a968585b2b068340b50084402914c27d329b50a915424d28ac458301e8f8744329148169445655159542a96050563c968381cd06221128142211089743299522693299552ad56a1908aa422ad482bd282f1803c208fc82322994824144aa5b2a02c2a8bca62815968329c056811028540a20508443a994c2793e9643a9d4c269329a552855424d28a448a3c261389642299482895458542a95430190da7d3e12c40a00568b110814420d3c9643a994ea6d4c974329952a6946aa55a8554a415e91179442492c98452595416984ca6c3e92c40a00508b41089442290c9643a994ea1d54432914c24194da6b3002d400b114804329d4ca6d34432c968389d0508040a9952a6d444b200995226530a000000000000000000 m_Scenes: - indexRenderers: 0 - sizeRenderers: 85 + sizeRenderers: 90 indexPortals: 0 sizePortals: 0 scene: 234ac6652f2be3943b8974a3fcbaba1f m_StaticRenderers: - targetObject: -7511558181221131132 - targetPrefab: 124273105 - - targetObject: -7511558181221131132 - targetPrefab: 1470660570 - - targetObject: 2708739958050211779 - targetPrefab: 1369540354 - - targetObject: -7511558181221131132 - targetPrefab: 651901189 - - targetObject: -7511558181221131132 - targetPrefab: 808969077 - - targetObject: -7511558181221131132 - targetPrefab: 2128415471 - - targetObject: 1968900501911500709 - targetPrefab: 172614115 - - targetObject: 940995387610717004 - targetPrefab: 172614115 - - targetObject: 1466060218924807064 - targetPrefab: 1329794381 - - targetObject: 2751096909771140069 - targetPrefab: 1329794381 - - targetObject: -7511558181221131132 - targetPrefab: 139770782 - - targetObject: 1466060218924807064 - targetPrefab: 1918973202 - - targetObject: 2751096909771140069 - targetPrefab: 1918973202 + targetPrefab: 1427476862 + - targetObject: 4351601775851787701 + targetPrefab: 633609066 - targetObject: 4351601775851787701 targetPrefab: 1294116878969307432 - targetObject: -7511558181221131132 - targetPrefab: 1463594309 - - targetObject: 1466060218924807064 - targetPrefab: 428989207 - - targetObject: 2751096909771140069 - targetPrefab: 428989207 - - targetObject: -7511558181221131132 - targetPrefab: 353645666 - - targetObject: 1466060218924807064 - targetPrefab: 1018401441 - - targetObject: 2751096909771140069 - targetPrefab: 1018401441 - - targetObject: -7511558181221131132 - targetPrefab: 102513283 - - targetObject: 2708739958050211779 - targetPrefab: 146729477 - - targetObject: 4351601775851787701 - targetPrefab: 2024292607 - - targetObject: -7511558181221131132 - targetPrefab: 723913190 - - targetObject: -7511558181221131132 - targetPrefab: 1123331143 - - targetObject: 5395762849033877597 - targetPrefab: 789002245204939195 - - targetObject: -7511558181221131132 - targetPrefab: 297529246 - - targetObject: -7511558181221131132 - targetPrefab: 1586593148 - - targetObject: 1466060218924807064 - targetPrefab: 1249864385 - - targetObject: 2751096909771140069 - targetPrefab: 1249864385 - - targetObject: -7511558181221131132 - targetPrefab: 1972023585 - - targetObject: 1968900501911500709 - targetPrefab: 937910637 - - targetObject: 940995387610717004 - targetPrefab: 937910637 - - targetObject: 4351601775851787701 - targetPrefab: 1058862682 - - targetObject: 4351601775851787701 - targetPrefab: 633609066 - - targetObject: 8810932174823803713 - targetPrefab: 1669769486 - - targetObject: 4351601775851787701 - targetPrefab: 832323181 - - targetObject: 4351601775851787701 - targetPrefab: 1720149715 - - targetObject: -7511558181221131132 - targetPrefab: 1299739207 - - targetObject: 2708739958050211779 - targetPrefab: 934922675 - - targetObject: -7511558181221131132 - targetPrefab: 1873800957 - - targetObject: -7511558181221131132 - targetPrefab: 859579629 - - targetObject: -7511558181221131132 - targetPrefab: 600479467 - - targetObject: 4351601775851787701 - targetPrefab: 91371483 + targetPrefab: 1188236244 - targetObject: -7511558181221131132 targetPrefab: 1584083749 - targetObject: 1466060218924807064 - targetPrefab: 414428781 + targetPrefab: 1305776201 - targetObject: 2751096909771140069 - targetPrefab: 414428781 + targetPrefab: 1305776201 + - targetObject: -7511558181221131132 + targetPrefab: 353645666 + - targetObject: 2708739958050211779 + targetPrefab: 146729477 + - targetObject: -7511558181221131132 + targetPrefab: 1557255132 + - targetObject: 4351601775851787701 + targetPrefab: 1768602428 + - targetObject: 1466060218924807064 + targetPrefab: 1249864385 + - targetObject: 2751096909771140069 + targetPrefab: 1249864385 + - targetObject: 5395762849033877597 + targetPrefab: 789002245204939195 + - targetObject: 4351601775851787701 + targetPrefab: 832323181 + - targetObject: -7511558181221131132 + targetPrefab: 723913190 - targetObject: 5444317254943555344 targetPrefab: 4953860686005405531 - - targetObject: -7511558181221131132 - targetPrefab: 580345162 - - targetObject: 4856842162814790411 - targetPrefab: 6044205050412544512 - - targetObject: 2708739958050211779 - targetPrefab: 1582278623 - - targetObject: -7511558181221131132 - targetPrefab: 2134288141 - - targetObject: 5395762849033877597 - targetPrefab: 1984717371 - - targetObject: -7511558181221131132 - targetPrefab: 1188236244 - targetObject: 1968900501911500709 targetPrefab: 4438766482650780789 - targetObject: 940995387610717004 targetPrefab: 4438766482650780789 - targetObject: 8810932174823803713 - targetPrefab: 6146163849592780820 - - targetObject: 1466060218924807064 - targetPrefab: 1962599170 - - targetObject: 2751096909771140069 - targetPrefab: 1962599170 - - targetObject: 7006853779014437907 - targetPrefab: 515796176453664510 - - targetObject: -7511558181221131132 - targetPrefab: 577030235 - - targetObject: -7511558181221131132 - targetPrefab: 1427476862 - - targetObject: -7511558181221131132 - targetPrefab: 2119386629 - - targetObject: -7511558181221131132 - targetPrefab: 1629735784 - - targetObject: -7511558181221131132 - targetPrefab: 2045833766 - - targetObject: 4351601775851787701 - targetPrefab: 1768602428 + targetPrefab: 1669769486 - targetObject: -7511558181221131132 targetPrefab: 760334290 - targetObject: 2708739958050211779 - targetPrefab: 1584295245487527435 + targetPrefab: 1369540354 - targetObject: -7511558181221131132 - targetPrefab: 1279360754 - - targetObject: 1466060218924807064 - targetPrefab: 298932333 - - targetObject: 2751096909771140069 - targetPrefab: 298932333 - - targetObject: 1466060218924807064 - targetPrefab: 1305776201 - - targetObject: 2751096909771140069 - targetPrefab: 1305776201 + targetPrefab: 1586593148 - targetObject: -7511558181221131132 - targetPrefab: 267965641 + targetPrefab: 1463594309 - targetObject: 1466060218924807064 - targetPrefab: 990092987 + targetPrefab: 1962599170 - targetObject: 2751096909771140069 - targetPrefab: 990092987 + targetPrefab: 1962599170 + - targetObject: 4351601775851787701 + targetPrefab: 1720149715 + - targetObject: -7511558181221131132 + targetPrefab: 749395700 + - targetObject: 1466060218924807064 + targetPrefab: 1918973202 + - targetObject: 2751096909771140069 + targetPrefab: 1918973202 + - targetObject: -7511558181221131132 + targetPrefab: 2128415471 + - targetObject: 7006853779014437907 + targetPrefab: 515796176453664510 + - targetObject: -7511558181221131132 + targetPrefab: 1548013197 + - targetObject: 2708739958050211779 + targetPrefab: 734635744 - targetObject: 7006853779014437907 targetPrefab: 1049045427 + - targetObject: -7511558181221131132 + targetPrefab: 1488972618 - targetObject: -7511558181221131132 targetPrefab: 366681287 + - targetObject: 1466060218924807064 + targetPrefab: 414428781 + - targetObject: 2751096909771140069 + targetPrefab: 414428781 + - targetObject: 1466060218924807064 + targetPrefab: 1018401441 + - targetObject: 2751096909771140069 + targetPrefab: 1018401441 + - targetObject: 4351601775851787701 + targetPrefab: 2024292607 + - targetObject: -7511558181221131132 + targetPrefab: 139770782 + - targetObject: 4351601775851787701 + targetPrefab: 1058862682 + - targetObject: -7511558181221131132 + targetPrefab: 859579629 + - targetObject: 4351601775851787701 + targetPrefab: 91371483 + - targetObject: -7511558181221131132 + targetPrefab: 297529246 + - targetObject: -7511558181221131132 + targetPrefab: 600479467 + - targetObject: -7511558181221131132 + targetPrefab: 1873800957 + - targetObject: 1466060218924807064 + targetPrefab: 298932333 + - targetObject: 2751096909771140069 + targetPrefab: 298932333 + - targetObject: 8810932174823803713 + targetPrefab: 6146163849592780820 + - targetObject: -7511558181221131132 + targetPrefab: 1279360754 + - targetObject: 1466060218924807064 + targetPrefab: 1329794381 + - targetObject: 2751096909771140069 + targetPrefab: 1329794381 + - targetObject: -7511558181221131132 + targetPrefab: 1629735784 + - targetObject: -7511558181221131132 + targetPrefab: 2134288141 + - targetObject: -7511558181221131132 + targetPrefab: 1299739207 + - targetObject: 4856842162814790411 + targetPrefab: 6044205050412544512 + - targetObject: 2708739958050211779 + targetPrefab: 934922675 + - targetObject: 1968900501911500709 + targetPrefab: 172614115 + - targetObject: 940995387610717004 + targetPrefab: 172614115 + - targetObject: -7511558181221131132 + targetPrefab: 1123331143 + - targetObject: -7511558181221131132 + targetPrefab: 102513283 + - targetObject: -7511558181221131132 + targetPrefab: 124273105 + - targetObject: -7511558181221131132 + targetPrefab: 267965641 + - targetObject: 1968900501911500709 + targetPrefab: 937910637 + - targetObject: 940995387610717004 + targetPrefab: 937910637 + - targetObject: -7511558181221131132 + targetPrefab: 2045833766 + - targetObject: -7511558181221131132 + targetPrefab: 580345162 + - targetObject: -7511558181221131132 + targetPrefab: 651901189 + - targetObject: -7511558181221131132 + targetPrefab: 1470660570 + - targetObject: -7511558181221131132 + targetPrefab: 2119386629 + - targetObject: -7511558181221131132 + targetPrefab: 25650784 - targetObject: -7511558181221131132 targetPrefab: 1617502299 - - targetObject: 2708739958050211779 - targetPrefab: 734635744 - - targetObject: -7511558181221131132 - targetPrefab: 749395700 - targetObject: -7511558181221131132 targetPrefab: 1976503209 - targetObject: 1466060218924807064 @@ -184,5 +172,27 @@ OcclusionCullingData: - targetObject: 2751096909771140069 targetPrefab: 4480648499976004208 - targetObject: -7511558181221131132 - targetPrefab: 1557255132 + targetPrefab: 383052033 + - targetObject: -7511558181221131132 + targetPrefab: 1972023585 + - targetObject: 2708739958050211779 + targetPrefab: 1584295245487527435 + - targetObject: -7511558181221131132 + targetPrefab: 808969077 + - targetObject: 2708739958050211779 + targetPrefab: 1582278623 + - targetObject: -7511558181221131132 + targetPrefab: 1012354932 + - targetObject: 1466060218924807064 + targetPrefab: 990092987 + - targetObject: 2751096909771140069 + targetPrefab: 990092987 + - targetObject: -7511558181221131132 + targetPrefab: 577030235 + - targetObject: 5395762849033877597 + targetPrefab: 1984717371 + - targetObject: 1466060218924807064 + targetPrefab: 428989207 + - targetObject: 2751096909771140069 + targetPrefab: 428989207 m_Portals: [] diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index f771be7..697f83c 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 3413876..6ca981d 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 bc86e54..638e63d 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 58dda44..84f70d6 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 c80df3b..c1a78ac 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index bcd07bf..bdeefc1 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index ce3b2b7..595d5fd 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: 26 + Data: 27 - Name: Entry: 7 Data: @@ -920,7 +920,7 @@ MonoBehaviour: Data: 61|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: TimerOverlay[], Assembly-CSharp + Data: CameraOverlay[], Assembly-CSharp - Name: Entry: 8 Data: @@ -968,16 +968,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _EndingPlayer + Data: _NewspaperCameraOverlays - Name: $v Entry: 7 Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _NewspaperCameraOverlays + - Name: k__BackingField + Entry: 9 + Data: 61 + - Name: k__BackingField + Entry: 9 + Data: 36 + - 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: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 66|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: _EndingPlayer + - Name: $v + Entry: 7 + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _EndingPlayer - Name: k__BackingField Entry: 7 - Data: 65|System.RuntimeType, mscorlib + Data: 68|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -1001,13 +1055,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1031,13 +1085,13 @@ MonoBehaviour: Data: _CurrentlyActiveMap - Name: $v Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentlyActiveMap - Name: k__BackingField Entry: 7 - Data: 69|System.RuntimeType, mscorlib + Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ContinentMap, Assembly-CSharp @@ -1046,7 +1100,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 70|System.RuntimeType, mscorlib + Data: 73|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1067,19 +1121,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 73|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 76|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1103,16 +1157,16 @@ MonoBehaviour: Data: _ActiveMarker - Name: $v Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActiveMarker - Name: k__BackingField Entry: 9 - Data: 70 + Data: 73 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 73 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1127,19 +1181,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 77|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 80|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1161,69 +1215,69 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _StageIndex - - Name: $v - Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _StageIndex - - Name: k__BackingField - Entry: 9 - Data: 70 - - Name: k__BackingField - Entry: 9 - Data: 70 - - 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: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 80|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: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - Name: k__BackingField + Entry: 9 + Data: 73 + - Name: k__BackingField + Entry: 9 + Data: 73 + - 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: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 83|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: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 82|System.RuntimeType, mscorlib + Data: 85|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1232,7 +1286,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 82 + Data: 85 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1247,7 +1301,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1271,13 +1325,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 85|System.RuntimeType, mscorlib + Data: 88|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -1286,61 +1340,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 70 - - 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: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 87|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: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _RunTimer - - Name: k__BackingField - Entry: 9 - Data: 32 - - Name: k__BackingField - Entry: 9 - Data: 32 + Data: 73 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1382,19 +1382,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Timer + Data: _RunTimer - Name: $v Entry: 7 Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Timer + Data: _RunTimer - Name: k__BackingField Entry: 9 - Data: 70 + Data: 32 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1436,19 +1436,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SuccessCounter + Data: _Timer - Name: $v Entry: 7 Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SuccessCounter + Data: _Timer - Name: k__BackingField Entry: 9 - Data: 70 + Data: 73 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 73 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1466,19 +1466,13 @@ MonoBehaviour: Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 Data: 96|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 97|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - Name: Entry: 13 Data: @@ -1496,19 +1490,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FailureCounter + Data: _SuccessCounter - Name: $v Entry: 7 - Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FailureCounter + Data: _SuccessCounter - Name: k__BackingField Entry: 9 - Data: 70 + Data: 73 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 73 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1523,19 +1517,80 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 100|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 99|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 101|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 100|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _FailureCounter + - Name: $v + Entry: 7 + Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FailureCounter + - Name: k__BackingField + Entry: 9 + Data: 73 + - Name: k__BackingField + Entry: 9 + Data: 73 + - 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: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 103|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 104|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1559,13 +1614,13 @@ MonoBehaviour: Data: _CameraControllerRound3 - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound3 - Name: k__BackingField Entry: 7 - Data: 103|System.RuntimeType, mscorlib + Data: 106|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound3, Assembly-CSharp @@ -1589,7 +1644,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 38e8a14..625e497 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -40,7 +40,8 @@ public class GameManagerRound3 : GameManagerBase [SerializeField] private NewspaperDisplay _NewspaperPublicDisplay; [SerializeField] private TimerDisplay _TimerPublicDisplay; [SerializeField] private SimpleEnable _Scoreboard; - [SerializeField] private TimerOverlay[] _TimerCameraOverlays; + [SerializeField] private CameraOverlay[] _TimerCameraOverlays; + [SerializeField] private CameraOverlay[] _NewspaperCameraOverlays; [SerializeField] private RandomVideoPlayer _EndingPlayer; [UdonSynced, FieldChangeCallback(nameof(CurrentlyActiveMap))] private ContinentMap _CurrentlyActiveMap = ContinentMap.INDEX_MAX; @@ -96,6 +97,18 @@ public class GameManagerRound3 : GameManagerBase _TimerPublicDisplay.Initialise(); _Scoreboard.Enable(false); + foreach (CameraOverlay Overlay in _TimerCameraOverlays) + { + Overlay.EnableOverlayElements(false); + Overlay.gameObject.SetActive(false); + } + + foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) + { + Overlay.EnableOverlayElements(false); + Overlay.gameObject.SetActive(false); + } + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false); _CameraControllerRound3.InitialiseCameras(); @@ -111,6 +124,9 @@ public class GameManagerRound3 : GameManagerBase _EndingPlayer.PlayVideo = false; _CameraControllerRound3.DeinitialiseCameras(); + _NewspaperPublicDisplay.Activate(false); + _TimerPublicDisplay.Activate(false); + base.DeinitialiseGameMode(); } @@ -124,9 +140,15 @@ public class GameManagerRound3 : GameManagerBase Networking.SetOwner(NewOwner, _CaptureCarmenNewspaper.gameObject); Networking.SetOwner(NewOwner, _NewspaperPublicDisplay.gameObject); + Networking.SetOwner(NewOwner, _TimerPublicDisplay.gameObject); Networking.SetOwner(NewOwner, _EndingPlayer.gameObject); - foreach (TimerOverlay Overlay in _TimerCameraOverlays) + foreach (CameraOverlay Overlay in _TimerCameraOverlays) + { + Networking.SetOwner(NewOwner, Overlay.gameObject); + } + + foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) { Networking.SetOwner(NewOwner, Overlay.gameObject); } @@ -210,9 +232,11 @@ public class GameManagerRound3 : GameManagerBase BetweenRoundsInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.CaptureCarmen); BetweenRoundsInterface.CommentUI.text = "On your mark...\nGet set..."; + _TimerPublicDisplay.Activate(true); _Scoreboard.Enable(true); - foreach (TimerOverlay Overlay in _TimerCameraOverlays) + foreach (CameraOverlay Overlay in _TimerCameraOverlays) { + Overlay.gameObject.SetActive(true); Overlay.EnableOverlayElements(true); } @@ -233,8 +257,9 @@ public class GameManagerRound3 : GameManagerBase _CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = true; InitialiseGameplayCameraFollowers(); - foreach (TimerOverlay Overlay in _TimerCameraOverlays) + foreach (CameraOverlay Overlay in _TimerCameraOverlays) { + Overlay.gameObject.SetActive(true); Overlay.EnableOverlayElements(true); } @@ -386,7 +411,7 @@ public class GameManagerRound3 : GameManagerBase _GameHasBeenLost(HaveWeRunOutOfMarkers); } - foreach (TimerOverlay Overlay in _TimerCameraOverlays) + foreach (CameraOverlay Overlay in _TimerCameraOverlays) { Overlay.PlayFadeOutAnimation(); } @@ -437,6 +462,12 @@ public class GameManagerRound3 : GameManagerBase _CaptureCarmenNewspaper.PlayWinAnimation(GetRound3PlayerName()); _NewspaperPublicDisplay.Activate(true); + + foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) + { + Overlay.EnableOverlayElements(true); + Overlay.gameObject.SetActive(true); + } } private void _GameHasBeenLost(bool HaveWeRunOutOfMarkers) @@ -471,6 +502,12 @@ public class GameManagerRound3 : GameManagerBase { _CaptureCarmenNewspaper.PlayLoseAnimation(); _NewspaperPublicDisplay.Activate(true); + + foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) + { + Overlay.EnableOverlayElements(true); + Overlay.gameObject.SetActive(true); + } } @@ -481,11 +518,21 @@ public class GameManagerRound3 : GameManagerBase Interface.HeaderUI.text = "Rockin' it a capella"; Interface.CommentUI.text = ""; + _CaptureCarmenNewspaper.ResetAnimation(); _NewspaperPublicDisplay.Activate(false); _Scoreboard.Enable(false); - foreach (TimerOverlay Overlay in _TimerCameraOverlays) + _TimerPublicDisplay.Activate(false); + + foreach (CameraOverlay Overlay in _TimerCameraOverlays) { Overlay.EnableOverlayElements(false); + Overlay.gameObject.SetActive(false); + } + + foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) + { + Overlay.EnableOverlayElements(false); + Overlay.gameObject.SetActive(false); } _CameraControllerRound3.DisableAllSwitchers(); @@ -542,6 +589,8 @@ public class GameManagerRound3 : GameManagerBase _CameraControllerRound3.SwitchToFrontCamera(); _CameraControllerRound3.DeinitialiseCameras(); + DeinitialiseGameplayCameraFollowers(); + DeinitialiseEndingCameraFollowers(); _CaseManager.EndGame(); @@ -630,6 +679,7 @@ public class GameManagerRound3 : GameManagerBase } private void DeinitialiseEndingCameraFollowers() { + _CameraControllerRound3.FrontCamera_StopFollowingPlayers(); _CameraControllerRound3.OverheadCamera_StopFollowingPlayers(); } diff --git a/Assets/UdonSharp/NewspaperDisplay.cs b/Assets/UdonSharp/NewspaperDisplay.cs index 6af6a11..d5e2082 100644 --- a/Assets/UdonSharp/NewspaperDisplay.cs +++ b/Assets/UdonSharp/NewspaperDisplay.cs @@ -1,9 +1,6 @@  using UdonSharp; using UnityEngine; -using UnityEngine.Device; -using VRC.SDKBase; -using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] diff --git a/Assets/UdonSharp/Timer.meta b/Assets/UdonSharp/Overlay.meta similarity index 100% rename from Assets/UdonSharp/Timer.meta rename to Assets/UdonSharp/Overlay.meta diff --git a/Assets/UdonSharp/Timer/TimerDisplay.asset b/Assets/UdonSharp/Overlay/CameraOverlay.asset similarity index 79% rename from Assets/UdonSharp/Timer/TimerDisplay.asset rename to Assets/UdonSharp/Overlay/CameraOverlay.asset index c824d76..71e017f 100644 --- a/Assets/UdonSharp/Timer/TimerDisplay.asset +++ b/Assets/UdonSharp/Overlay/CameraOverlay.asset @@ -10,18 +10,18 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} - m_Name: TimerDisplay + m_Name: CameraOverlay m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 826894f4c0ed86448a7338f803c36cd7, + serializedUdonProgramAsset: {fileID: 11400000, guid: 6e1c5cb02e885ca42ba9cbe7b5796eaf, type: 2} udonAssembly: assemblyError: - sourceCsScript: {fileID: 11500000, guid: abfe7bfee170dee4090708b5013ea14e, type: 3} + sourceCsScript: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} scriptVersion: 2 compiledVersion: 2 behaviourSyncMode: 4 hasInteractEvent: 0 - scriptID: 6875150117956857215 + scriptID: -4680746526483242509 serializationData: SerializedFormat: 2 SerializedBytes: @@ -50,19 +50,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Timer + Data: _Animator - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Timer + Data: _Animator - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.UI.RawImage, UnityEngine.UI + Data: UnityEngine.Animator, UnityEngine.AnimationModule - Name: Entry: 8 Data: @@ -110,19 +110,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TimerMaterial + Data: _OverlayElements - Name: $v Entry: 7 Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TimerMaterial + Data: _OverlayElements - Name: k__BackingField Entry: 7 Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Material, UnityEngine.CoreModule + Data: UnityEngine.GameObject, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -170,19 +170,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MaxSeconds + Data: _AspectRatio - Name: $v Entry: 7 Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MaxSeconds + Data: _AspectRatio - Name: k__BackingField Entry: 7 Data: 11|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Int32, mscorlib + Data: System.Single, mscorlib - Name: Entry: 8 Data: @@ -206,10 +206,31 @@ MonoBehaviour: Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 - Name: Entry: 7 - Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 13|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 15|UnityEngine.RangeAttribute, UnityEngine.CoreModule + - Name: min + Entry: 4 + Data: 0 + - Name: max + Entry: 4 + Data: 2.5 - Name: Entry: 8 Data: @@ -230,85 +251,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CounterText + Data: _OverlayElementsEnabled - Name: $v Entry: 7 - Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CounterText + Data: _OverlayElementsEnabled - Name: k__BackingField Entry: 7 - Data: 15|System.RuntimeType, mscorlib + Data: 17|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + Data: System.Boolean, mscorlib - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 15 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 + Entry: 3 Data: 1 - - Name: - Entry: 7 - Data: 17|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: _ElapsedSeconds - - Name: $v - Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _ElapsedSeconds - - Name: k__BackingField - Entry: 9 - Data: 11 - - Name: k__BackingField - Entry: 9 - Data: 11 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - Name: Entry: 8 Data: @@ -317,10 +284,16 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 19|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -338,25 +311,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CorrectMarkers + Data: _FadeOutAnimation - Name: $v Entry: 7 Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CorrectMarkers + Data: _FadeOutAnimation - Name: k__BackingField Entry: 9 - Data: 11 + Data: 17 - Name: k__BackingField Entry: 9 - Data: 11 + Data: 17 - 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: @@ -366,6 +339,66 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 22|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: _Camera + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Camera + - Name: k__BackingField + Entry: 7 + Data: 24|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Camera, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 24 + - 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: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Timer/TimerOverlay.asset.meta b/Assets/UdonSharp/Overlay/CameraOverlay.asset.meta similarity index 79% rename from Assets/UdonSharp/Timer/TimerOverlay.asset.meta rename to Assets/UdonSharp/Overlay/CameraOverlay.asset.meta index d883075..9326ab8 100644 --- a/Assets/UdonSharp/Timer/TimerOverlay.asset.meta +++ b/Assets/UdonSharp/Overlay/CameraOverlay.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bdc81495c4c96fe4ca34aac37847cb12 +guid: 2923fcd444bb991459686ced4864c9bf NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/UdonSharp/Timer/TimerOverlay.cs b/Assets/UdonSharp/Overlay/CameraOverlay.cs similarity index 83% rename from Assets/UdonSharp/Timer/TimerOverlay.cs rename to Assets/UdonSharp/Overlay/CameraOverlay.cs index 2269daf..9b5aa98 100644 --- a/Assets/UdonSharp/Timer/TimerOverlay.cs +++ b/Assets/UdonSharp/Overlay/CameraOverlay.cs @@ -1,24 +1,24 @@  using UdonSharp; using UnityEngine; -using VRC.SDKBase; -using VRC.Udon; using VRC.Udon.Common; +[ExecuteInEditMode] [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] -public class TimerOverlay : UdonSharpBehaviour +public class CameraOverlay : UdonSharpBehaviour { [SerializeField] private Animator _Animator; [SerializeField] private GameObject _OverlayElements; + [Space] + [SerializeField, Range(0.0f, 2.5f)] private float _AspectRatio = 1.7777777777777777777777777777777777777f; [UdonSynced] private bool _OverlayElementsEnabled = false; [UdonSynced] private bool _FadeOutAnimation = false; private Camera _Camera = null; - private const float ASPECT_16_9 = 1.7777777777777777777777777777777777777f; - private const float NEAR_PLANE_OFFSET = 0.025f; + private const float NEAR_PLANE_OFFSET = 0.01f; void Update() @@ -77,7 +77,10 @@ public class TimerOverlay : UdonSharpBehaviour } private void _PlayFadeOutAnimation_Synced() { - _Animator.SetBool("Fade Out Elements", _FadeOutAnimation); + if (_Animator) + { + _Animator.SetBool("Fade Out", _FadeOutAnimation); + } } @@ -89,7 +92,7 @@ public class TimerOverlay : UdonSharpBehaviour Vector3 Scale = Vector3.one; Scale.y = 2.0f * Position.z * Mathf.Tan(_Camera.fieldOfView * 0.5f * Mathf.Deg2Rad); - Scale.x = Scale.y * ASPECT_16_9; + Scale.x = Scale.y * _AspectRatio; transform.localScale = Scale; } } diff --git a/Assets/UdonSharp/Timer/TimerOverlay.cs.meta b/Assets/UdonSharp/Overlay/CameraOverlay.cs.meta similarity index 83% rename from Assets/UdonSharp/Timer/TimerOverlay.cs.meta rename to Assets/UdonSharp/Overlay/CameraOverlay.cs.meta index e18493e..629778f 100644 --- a/Assets/UdonSharp/Timer/TimerOverlay.cs.meta +++ b/Assets/UdonSharp/Overlay/CameraOverlay.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f352b68a08f42be43a596f353c9f165d +guid: 9d644aadcdc06b74aa51fe63b67e74f8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/UdonSharp/Timer/TimerOverlay.asset b/Assets/UdonSharp/Overlay/TimerDisplay.asset similarity index 58% rename from Assets/UdonSharp/Timer/TimerOverlay.asset rename to Assets/UdonSharp/Overlay/TimerDisplay.asset index edc5d31..e0b87d3 100644 --- a/Assets/UdonSharp/Timer/TimerOverlay.asset +++ b/Assets/UdonSharp/Overlay/TimerDisplay.asset @@ -10,18 +10,18 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} - m_Name: TimerOverlay + m_Name: TimerDisplay m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: aa2be4ed8a6461f408a0f163a1b7ec39, + serializedUdonProgramAsset: {fileID: 11400000, guid: 826894f4c0ed86448a7338f803c36cd7, type: 2} udonAssembly: assemblyError: - sourceCsScript: {fileID: 11500000, guid: f352b68a08f42be43a596f353c9f165d, type: 3} + sourceCsScript: {fileID: 11500000, guid: abfe7bfee170dee4090708b5013ea14e, type: 3} scriptVersion: 2 compiledVersion: 2 behaviourSyncMode: 4 hasInteractEvent: 0 - scriptID: -3289623183486534552 + scriptID: 6875150117956857215 serializationData: SerializedFormat: 2 SerializedBytes: @@ -44,25 +44,25 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 5 + Data: 8 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _Animator + Data: _Camera - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Animator + Data: _Camera - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule + Data: UnityEngine.GameObject, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -110,19 +110,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _OverlayElements + Data: _Timer - Name: $v Entry: 7 Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _OverlayElements + Data: _Timer - Name: k__BackingField Entry: 7 Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.GameObject, UnityEngine.CoreModule + Data: UnityEngine.UI.RawImage, UnityEngine.UI - Name: Entry: 8 Data: @@ -170,19 +170,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _OverlayElementsEnabled + Data: _TimerMaterial - Name: $v Entry: 7 Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _OverlayElementsEnabled + Data: _TimerMaterial - Name: k__BackingField Entry: 7 Data: 11|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Boolean, mscorlib + Data: UnityEngine.Material, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -192,135 +192,315 @@ MonoBehaviour: - 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 13|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: _FadeOutAnimation - - Name: $v - Entry: 7 - Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _FadeOutAnimation - - Name: k__BackingField - Entry: 9 - Data: 11 - - Name: k__BackingField - Entry: 9 - Data: 11 - - 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: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 16|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: _Camera - - Name: $v - Entry: 7 - Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Camera - - Name: k__BackingField - Entry: 7 - Data: 18|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Camera, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 18 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: Entry: 6 Data: - Name: Entry: 8 Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _MaxSeconds + - Name: $v + Entry: 7 + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _MaxSeconds + - Name: k__BackingField + Entry: 7 + Data: 15|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 17|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: _CounterText + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CounterText + - Name: k__BackingField + Entry: 7 + Data: 19|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - 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: 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: _Active + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Active + - Name: k__BackingField + Entry: 7 + Data: 23|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 23 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 5 Data: false - Name: _fieldAttributes Entry: 7 - Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 25|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: _ElapsedSeconds + - Name: $v + Entry: 7 + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ElapsedSeconds + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 28|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: _CorrectMarkers + - Name: $v + Entry: 7 + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CorrectMarkers + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 9 + Data: 15 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 31|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Timer/TimerDisplay.asset.meta b/Assets/UdonSharp/Overlay/TimerDisplay.asset.meta similarity index 100% rename from Assets/UdonSharp/Timer/TimerDisplay.asset.meta rename to Assets/UdonSharp/Overlay/TimerDisplay.asset.meta diff --git a/Assets/UdonSharp/Timer/TimerDisplay.cs b/Assets/UdonSharp/Overlay/TimerDisplay.cs similarity index 76% rename from Assets/UdonSharp/Timer/TimerDisplay.cs rename to Assets/UdonSharp/Overlay/TimerDisplay.cs index 1b8aedb..09b40ee 100644 --- a/Assets/UdonSharp/Timer/TimerDisplay.cs +++ b/Assets/UdonSharp/Overlay/TimerDisplay.cs @@ -2,6 +2,7 @@ using TMPro; using UdonSharp; using UnityEngine; +using UnityEngine.Device; using UnityEngine.UI; using VRC.Udon.Common; @@ -9,13 +10,16 @@ using VRC.Udon.Common; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class TimerDisplay : UdonSharpBehaviour { + [SerializeField] private GameObject _Camera; [SerializeField] private RawImage _Timer; [SerializeField] private Material _TimerMaterial; [SerializeField] private int _MaxSeconds = 45; [SerializeField] private TextMeshProUGUI _CounterText; - private int _ElapsedSeconds = 0; - private int _CorrectMarkers = 0; + [UdonSynced] private bool _Active; + + [UdonSynced] private int _ElapsedSeconds = 0; + [UdonSynced] private int _CorrectMarkers = 0; public override void OnDeserialization(DeserializationResult Result) @@ -33,6 +37,13 @@ public class TimerDisplay : UdonSharpBehaviour RequestSerialization(); } + public void Activate(bool Activate) + { + _Active = Activate; + _SyncedValues(); + RequestSerialization(); + } + public void SecondsElapsed(int ElapsedSeconds) { _ElapsedSeconds = ElapsedSeconds; @@ -50,6 +61,7 @@ public class TimerDisplay : UdonSharpBehaviour private void _SyncedValues() { + _Camera.SetActive(_Active); Debug.Log("[TimerDisplay] Elapsed seconds: " + _ElapsedSeconds); _Timer.material.SetFloat("_WiperProgress", (float)_ElapsedSeconds / (float)_MaxSeconds); _CounterText.text = _CorrectMarkers.ToString(); diff --git a/Assets/UdonSharp/Timer/TimerDisplay.cs.meta b/Assets/UdonSharp/Overlay/TimerDisplay.cs.meta similarity index 100% rename from Assets/UdonSharp/Timer/TimerDisplay.cs.meta rename to Assets/UdonSharp/Overlay/TimerDisplay.cs.meta 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: