diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index f895212..ee51d35 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -94,6 +94,7 @@
+
diff --git a/Assets/Materials/M_CaptureCarmenNewspaper.mat b/Assets/Materials/M_CaptureCarmenNewspaper.mat
index c4c7dff..047bbc7 100644
--- a/Assets/Materials/M_CaptureCarmenNewspaper.mat
+++ b/Assets/Materials/M_CaptureCarmenNewspaper.mat
@@ -8,13 +8,13 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: M_CaptureCarmenNewspaper
- m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3}
+ m_Shader: {fileID: 10708, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
- m_ValidKeywords:
+ m_ValidKeywords: []
+ m_InvalidKeywords:
- _GLOSSYREFLECTIONS_OFF
- _SPECULARHIGHLIGHTS_OFF
- m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
@@ -86,5 +86,5 @@ Material:
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/M_CaptureCarmenNewspaperPhotos.mat b/Assets/Materials/M_CaptureCarmenNewspaperPhotos.mat
index 8ff88fc..fb5db5d 100644
--- a/Assets/Materials/M_CaptureCarmenNewspaperPhotos.mat
+++ b/Assets/Materials/M_CaptureCarmenNewspaperPhotos.mat
@@ -8,13 +8,13 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: M_CaptureCarmenNewspaperPhotos
- m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3}
+ m_Shader: {fileID: 10708, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
- m_ValidKeywords:
+ m_ValidKeywords: []
+ m_InvalidKeywords:
- _GLOSSYREFLECTIONS_OFF
- _SPECULARHIGHLIGHTS_OFF
- m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
diff --git a/Assets/Materials/M_CaptureCarmenNewspaper_UIDisplay.mat b/Assets/Materials/M_CaptureCarmenNewspaper_UIDisplay.mat
new file mode 100644
index 0000000..6b9fb63
--- /dev/null
+++ b/Assets/Materials/M_CaptureCarmenNewspaper_UIDisplay.mat
@@ -0,0 +1,155 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: M_CaptureCarmenNewspaper_UIDisplay
+ m_Shader: {fileID: 10751, guid: 0000000000000000f000000000000000, type: 0}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords:
+ - _ALPHAPREMULTIPLY_ON
+ - _ENABLE_GEOMETRIC_SPECULAR_AA
+ - _GLOSSYREFLECTIONS_OFF
+ - _SPECULARHIGHLIGHTS_OFF
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _GlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _HueShiftMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 8600000, guid: fb730cd2dcc49654dbee12581f50a3c4, type: 2}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Matcap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MatcapMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OutlineMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Ramp:
+ m_Texture: {fileID: 2800000, guid: 636cf1b5dfca6f54b94ca3d2ff8216c9, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Bicubic: 0
+ - _BumpScale: 1
+ - _Culling: 2
+ - _Cutoff: 1
+ - _DetailHueShift: 0
+ - _DetailMaskChannel: 3
+ - _DetailMode: 0
+ - _DetailNormalMapScale: 1
+ - _DetailUV: 0
+ - _DstBlend: 10
+ - _EmissionHueShift: 0
+ - _EmissionStrength: 1
+ - _EmissionUV: 0
+ - _EnableGeometricSpecularAA: 1
+ - _GlossMapChannel: 3
+ - _GlossMapScale: 1
+ - _GlossStrength: 0.5
+ - _Glossiness: 0
+ - _GlossyReflections: 0
+ - _HueShift: 0
+ - _HueShiftMaskChannel: 1
+ - _LightmapType: 0
+ - _LimitBrightness: 1
+ - _MatcapMaskChannel: 0
+ - _MatcapStrength: 1
+ - _MatcapType: 0
+ - _Metallic: 0
+ - _MetallicMapChannel: 0
+ - _MetallicStrength: 0
+ - _MinBrightness: 0
+ - _Mode: 3
+ - _OcclusionMapChannel: 1
+ - _OcclusionStrength: 1
+ - _OutlineFromAlbedo: 0
+ - _OutlineMaskChannel: 0
+ - _OutlineThickness: 0.05
+ - _Parallax: 0.02
+ - _Reflectance: 0.5
+ - _RimAlbedoTint: 0
+ - _RimEnvironmental: 0
+ - _RimIntensity: 0.5
+ - _RimRange: 0.3
+ - _RimSharpness: 0.1
+ - _ShadowAlbedo: 0.5
+ - _ShadowBoost: 0
+ - _SmoothnessTextureChannel: 0
+ - _SpecularAAScreenSpaceVariance: 0.1
+ - _SpecularAAThreshold: 0.2
+ - _SpecularHighlights: 0
+ - _SpecularSharpness: 0
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _VertexColor: 0
+ - _ZWrite: 0
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+ - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
+ - _RimColor: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/M_CaptureCarmenNewspaper_UIDisplay.mat.meta b/Assets/Materials/M_CaptureCarmenNewspaper_UIDisplay.mat.meta
new file mode 100644
index 0000000..3ffb676
--- /dev/null
+++ b/Assets/Materials/M_CaptureCarmenNewspaper_UIDisplay.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 372c2f1b24e36bd438fea3de42b33e3b
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/RT_NewspaperDisplay.mat b/Assets/Materials/RT_NewspaperDisplay.mat
new file mode 100644
index 0000000..b98608a
--- /dev/null
+++ b/Assets/Materials/RT_NewspaperDisplay.mat
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: RT_NewspaperDisplay
+ m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords:
+ - _ENABLE_GEOMETRIC_SPECULAR_AA
+ - _GLOSSYREFLECTIONS_OFF
+ - _SPECULARHIGHLIGHTS_OFF
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 8600000, guid: fb730cd2dcc49654dbee12581f50a3c4, type: 2}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _Bicubic: 0
+ - _BumpScale: 1
+ - _DetailNormalMapScale: 1
+ - _EnableGeometricSpecularAA: 1
+ - _Glossiness: 1
+ - _GlossyReflections: 0
+ - _LightmapType: 0
+ - _Metallic: 1
+ - _OcclusionStrength: 1
+ - _SpecularAAScreenSpaceVariance: 0.1
+ - _SpecularAAThreshold: 0.2
+ - _SpecularHighlights: 0
+ - _UVSec: 0
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/RT_NewspaperDisplay.mat.meta b/Assets/Materials/RT_NewspaperDisplay.mat.meta
new file mode 100644
index 0000000..dfc1e75
--- /dev/null
+++ b/Assets/Materials/RT_NewspaperDisplay.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e22f1da637d6ee24ab557a3dccf69899
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Capture Carmen Newspaper.prefab b/Assets/Prefabs/Capture Carmen Newspaper.prefab
index c3f0cce..3793c6d 100644
--- a/Assets/Prefabs/Capture Carmen Newspaper.prefab
+++ b/Assets/Prefabs/Capture Carmen Newspaper.prefab
@@ -422,7 +422,7 @@ GameObject:
- component: {fileID: 8974211262632548065}
- component: {fileID: 3627944098001172186}
- component: {fileID: 5807763379893679145}
- m_Layer: 5
+ m_Layer: 0
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -674,6 +674,16 @@ PrefabInstance:
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: -7511558181221131132, guid: d71e5b9eaf8bc6043bdefe174c9de73d,
+ type: 3}
+ propertyPath: m_CastShadows
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -7511558181221131132, guid: d71e5b9eaf8bc6043bdefe174c9de73d,
+ type: 3}
+ propertyPath: m_ReceiveShadows
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: d71e5b9eaf8bc6043bdefe174c9de73d,
type: 3}
propertyPath: m_Materials.Array.data[0]
diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity
index 724f3a5..7a09dff 100644
--- a/Assets/Scenes/witwics.unity
+++ b/Assets/Scenes/witwics.unity
@@ -1556,6 +1556,11 @@ PrefabInstance:
propertyPath: _syncMethod
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 1340351174269024408, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 1340351174269024408, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: volumeTrigger
@@ -1600,7 +1605,7 @@ PrefabInstance:
- target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -1615,7 +1620,12 @@ PrefabInstance:
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_Enabled
- value: 0
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: m_ClearFlags
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -1637,6 +1647,26 @@ PrefabInstance:
propertyPath: m_TargetTexture
value:
objectReference: {fileID: 8400000, guid: 2d3f1c7c9a04ee2438d485de12c10db1, type: 2}
+ - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: m_BackGroundColor.a
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: m_BackGroundColor.b
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: m_BackGroundColor.g
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: m_BackGroundColor.r
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 5831530289992780649, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_TargetTexture
@@ -1713,7 +1743,7 @@ PrefabInstance:
- target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: sleepFlag
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -4038,6 +4068,94 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1499591484}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &107399072
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 107399073}
+ - component: {fileID: 107399075}
+ - component: {fileID: 107399074}
+ m_Layer: 0
+ m_Name: Newspaper Display
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &107399073
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 107399072}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -15.33, y: 0, z: 2.3}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 2128547809}
+ - {fileID: 359000343}
+ - {fileID: 1523711553}
+ m_Father: {fileID: 1276291775}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &107399074
+MonoBehaviour:
+ m_ObjectHideFlags: 2
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 107399072}
+ 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: 27108b45ff056ac4886d4058d930fde8,
+ type: 2}
+ programSource: {fileID: 11400000, guid: 59d48fd4fec18b74f842ca47091613e3, type: 2}
+ serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
+ publicVariablesUnityEngineObjects: []
+ publicVariablesSerializationDataFormat: 0
+--- !u!114 &107399075
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 107399072}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1fda5f76412adf045afddecf3961f77a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ serializationData:
+ SerializedFormat: 2
+ SerializedBytes:
+ ReferencedUnityObjects: []
+ SerializedBytesString:
+ Prefab: {fileID: 0}
+ PrefabModificationsReferencedUnityObjects: []
+ PrefabModifications: []
+ SerializationNodes: []
+ _udonSharpBackingUdonBehaviour: {fileID: 107399074}
+ _Camera: {fileID: 359000342}
+ _Screens:
+ - {fileID: 1523711552}
+ - {fileID: 1528283344}
--- !u!1 &107977963 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5319767931864254799, guid: aecb18996fccac6488cfcd38604796da,
@@ -8208,7 +8326,7 @@ PrefabInstance:
- target: {fileID: 8686606537753294948, guid: 126991d511ca61841a0ef899b6c038a6,
type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: -1000
objectReference: {fileID: 0}
- target: {fileID: 8686606537753294948, guid: 126991d511ca61841a0ef899b6c038a6,
type: 3}
@@ -9393,7 +9511,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1528283347}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &169430328 stripped
@@ -17071,6 +17193,98 @@ MonoBehaviour:
m_DeselectOnBackgroundClick: 1
m_PointerBehavior: 0
m_CursorLockBehavior: 0
+--- !u!1 &359000342
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 359000343}
+ - component: {fileID: 359000345}
+ - component: {fileID: 359000344}
+ m_Layer: 0
+ m_Name: Newspaper Camera
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &359000343
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 359000342}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0.020298894, y: -0.70681536, z: 0.020298898, w: 0.70681536}
+ m_LocalPosition: {x: 0.8800001, y: -6.43, z: 0.24399972}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 107399073}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!81 &359000344
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 359000342}
+ m_Enabled: 1
+--- !u!20 &359000345
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 359000342}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 2
+ m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
+ m_projectionMatrixMode: 1
+ m_GateFitMode: 2
+ m_FOVAxisMode: 0
+ m_Iso: 200
+ m_ShutterSpeed: 0.005
+ m_Aperture: 16
+ m_FocusDistance: 10
+ m_FocalLength: 50
+ m_BladeCount: 5
+ m_Curvature: {x: 2, y: 11}
+ m_BarrelClipping: 0.25
+ m_Anamorphism: 0
+ m_SensorSize: {x: 36, y: 24}
+ m_LensShift: {x: 0, y: 0}
+ m_NormalizedViewPortRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+ near clip plane: 0.3
+ far clip plane: 6
+ field of view: 30
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 8600000, guid: fb730cd2dcc49654dbee12581f50a3c4, type: 2}
+ m_TargetDisplay: 0
+ m_TargetEye: 3
+ m_HDR: 1
+ m_AllowMSAA: 1
+ m_AllowDynamicResolution: 0
+ m_ForceIntoRT: 0
+ m_OcclusionCulling: 1
+ m_StereoConvergence: 10
+ m_StereoSeparation: 0.022
--- !u!1 &359284015 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7140119044603383477, guid: 126991d511ca61841a0ef899b6c038a6,
@@ -36532,6 +36746,16 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1699893630}
m_Modifications:
+ - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ propertyPath: FOV
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ propertyPath: FarClippingPlane
+ value: 20
+ objectReference: {fileID: 0}
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: serializationData.Prefab
@@ -36546,12 +36770,12 @@ PrefabInstance:
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalPosition.x
- value: -12.585
+ value: -14.45
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalPosition.y
- value: 2.197
+ value: -6.43
objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
@@ -48537,6 +48761,7 @@ MonoBehaviour:
- {fileID: 1032576829}
- {fileID: 652699948}
_CaptureCarmenNewspaper: {fileID: 2128547811}
+ _NewspaperPublicDisplay: {fileID: 107399075}
_EndingPlayer: {fileID: 1762618935}
--- !u!1 &969958451 stripped
GameObject:
@@ -60743,12 +60968,12 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1757939442}
- - {fileID: 1699893630}
- {fileID: 1459858123}
- {fileID: 380717943}
+ - {fileID: 1699893630}
- {fileID: 772205214}
+ - {fileID: 107399073}
- {fileID: 1762618933}
- - {fileID: 1355971345}
- {fileID: 1657587667}
- {fileID: 1264786912}
- {fileID: 1343307840}
@@ -60756,7 +60981,6 @@ Transform:
- {fileID: 2063457642}
- {fileID: 1658730386}
- {fileID: 579108364}
- - {fileID: 2128547809}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1277454218 stripped
@@ -64299,89 +64523,6 @@ Transform:
m_Children: []
m_Father: {fileID: 865296976}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1355971342
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1355971345}
- - component: {fileID: 1355971344}
- - component: {fileID: 1355971343}
- m_Layer: 0
- m_Name: Camera Output Preview
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1355971343
-MonoBehaviour:
- m_ObjectHideFlags: 2
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1355971342}
- 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: 73ee4679e786b3949924c6bb7a80141c,
- type: 2}
- programSource: {fileID: 11400000, guid: 4ea6f23bf62bea7408c59a92ba47dfc1, type: 2}
- serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
- publicVariablesUnityEngineObjects: []
- publicVariablesSerializationDataFormat: 0
---- !u!114 &1355971344
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1355971342}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 06e7ae5ef6494464eb55af19a8faa259, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- serializationData:
- SerializedFormat: 2
- SerializedBytes:
- ReferencedUnityObjects: []
- SerializedBytesString:
- Prefab: {fileID: 0}
- PrefabModificationsReferencedUnityObjects: []
- PrefabModifications: []
- SerializationNodes: []
- _udonSharpBackingUdonBehaviour: {fileID: 1355971343}
- _Screen: {fileID: 1614278395}
---- !u!4 &1355971345
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1355971342}
- serializedVersion: 2
- m_LocalRotation: {x: -0.40374658, y: 0.58050716, z: -0.5805072, w: -0.4037469}
- m_LocalPosition: {x: -15.53, y: 1.99, z: 1.34}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1614278399}
- m_Father: {fileID: 1276291775}
- m_LocalEulerAnglesHint: {x: 90, y: 0, z: 110.362}
--- !u!1 &1356247071 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6133542484281842419, guid: be33bc7f6c414e6409becfa348b9310d,
@@ -72828,6 +72969,89 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 4438766482650780789}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1523711552
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1523711553}
+ - component: {fileID: 1523711556}
+ - component: {fileID: 1523711555}
+ m_Layer: 22
+ m_Name: Screen
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 1
+ m_IsActive: 0
+--- !u!4 &1523711553
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1523711552}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0.49789968, y: -0.5020911, z: 0.5020912, w: 0.4979005}
+ m_LocalPosition: {x: 0, y: 2.81, z: 0}
+ m_LocalScale: {x: 0.75, y: 1, z: 0.5625}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 107399073}
+ m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90.48}
+--- !u!23 &1523711555
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1523711552}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 0
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 2
+ m_LightProbeUsage: 1
+ 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 &1523711556
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1523711552}
+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1524048936
GameObject:
m_ObjectHideFlags: 0
@@ -73136,6 +73360,89 @@ 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: 0
+ m_Name: Newspaper Display
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 1
+ 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: 1
+ m_DynamicOccludee: 0
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 2
+ m_LightProbeUsage: 1
+ 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, y: -0.7071068, z: 0.7071068, w: 0}
+ m_LocalPosition: {x: -0, y: -0, z: 0.406}
+ m_LocalScale: {x: 0.024999999, y: 1, z: 0.018750003}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 169430328}
+ m_LocalEulerAnglesHint: {x: 90, y: 0, z: 180}
--- !u!1 &1528591628 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9009189034908819552, guid: e9914385266bca24db809c39e395f03c,
@@ -79435,112 +79742,6 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
---- !u!1 &1614278395
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1614278399}
- - component: {fileID: 1614278398}
- - component: {fileID: 1614278397}
- - component: {fileID: 1614278396}
- m_Layer: 22
- m_Name: Screen
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!64 &1614278396
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1614278395}
- 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: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &1614278397
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1614278395}
- 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: 5a56ded101f363e46861c8fe1c4f360e, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &1614278398
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1614278395}
- m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &1614278399
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1614278395}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.64, y: 0.039999995, z: 0.35999984}
- m_ConstrainProportionsScale: 1
- m_Children: []
- m_Father: {fileID: 1355971345}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1615707018 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8810461603221208661, guid: 79ebe62246f7f464e98373cb14765f9a,
@@ -103349,7 +103550,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 1276291775}
+ m_TransformParent: {fileID: 107399073}
m_Modifications:
- target: {fileID: 2027989583406737971, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
@@ -103372,40 +103573,55 @@ PrefabInstance:
propertyPath: m_Camera
value:
objectReference: {fileID: 1069902876}
+ - target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.5
+ objectReference: {fileID: 0}
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
propertyPath: m_LocalPosition.x
- value: -15.65
+ value: -4.61759
objectReference: {fileID: 0}
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: -8.250573
objectReference: {fileID: 0}
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
propertyPath: m_LocalPosition.z
- value: 2.0500002
+ value: 0.24399972
objectReference: {fileID: 0}
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
propertyPath: m_LocalRotation.w
- value: 0.7071058
+ value: 0.70681536
objectReference: {fileID: 0}
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
propertyPath: m_LocalRotation.x
- value: -0
+ value: -0.020298898
objectReference: {fileID: 0}
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
propertyPath: m_LocalRotation.y
- value: -0.7071078
+ value: 0.70681536
objectReference: {fileID: 0}
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
propertyPath: m_LocalRotation.z
- value: -0
+ value: 0.020298896
objectReference: {fileID: 0}
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
@@ -103415,7 +103631,7 @@ PrefabInstance:
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -90
+ value: 180
objectReference: {fileID: 0}
- target: {fileID: 5620460443277733213, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
@@ -112038,10 +112254,6 @@ MonoBehaviour:
ID: 1277
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
- - gameObject: {fileID: 1355971342}
- ID: 1278
- SerializedTypeNames:
- - VRC.Udon.UdonBehaviour
- gameObject: {fileID: 1930672082}
ID: 1279
SerializedTypeNames:
@@ -112118,6 +112330,10 @@ MonoBehaviour:
ID: 1297
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
+ - gameObject: {fileID: 107399072}
+ ID: 1298
+ SerializedTypeNames:
+ - VRC.Udon.UdonBehaviour
portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
PlayerPersistence: []
@@ -112590,7 +112806,7 @@ PrefabInstance:
- target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017,
type: 3}
propertyPath: _CameraEventListeners.Array.size
- value: 4
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017,
type: 3}
@@ -112651,7 +112867,7 @@ PrefabInstance:
type: 3}
propertyPath: _CameraEventListeners.Array.data[3]
value:
- objectReference: {fileID: 1355971343}
+ objectReference: {fileID: 0}
- target: {fileID: 5241448837431248765, guid: d0081ba0c86469447b4742edcbf39017,
type: 3}
propertyPath: m_AnchorMax.x
diff --git a/Assets/Textures/RT_NewspaperDisplay.asset b/Assets/Textures/RT_NewspaperDisplay.asset
new file mode 100644
index 0000000..970e33e
--- /dev/null
+++ b/Assets/Textures/RT_NewspaperDisplay.asset
@@ -0,0 +1,55 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!86 &8600000
+CustomRenderTexture:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: RT_NewspaperDisplay
+ m_ImageContentsHash:
+ serializedVersion: 2
+ Hash: 00000000000000000000000000000000
+ m_ForcedFallbackFormat: 4
+ m_DownscaleFallback: 0
+ m_IsAlphaChannelOptional: 0
+ serializedVersion: 5
+ m_Width: 512
+ m_Height: 384
+ m_AntiAliasing: 2
+ m_MipCount: -1
+ m_DepthStencilFormat: 0
+ m_ColorFormat: 8
+ m_MipMap: 0
+ m_GenerateMips: 1
+ m_SRGB: 0
+ m_UseDynamicScale: 0
+ m_BindMS: 0
+ m_EnableCompatibleFormat: 1
+ m_EnableRandomWrite: 0
+ m_TextureSettings:
+ serializedVersion: 2
+ m_FilterMode: 1
+ m_Aniso: 0
+ m_MipBias: 0
+ m_WrapU: 1
+ m_WrapV: 1
+ m_WrapW: 1
+ m_Dimension: 2
+ m_VolumeDepth: 1
+ m_ShadowSamplingMode: 2
+ m_Material: {fileID: 0}
+ m_InitSource: 0
+ m_InitMaterial: {fileID: 0}
+ m_InitColor: {r: 1, g: 1, b: 1, a: 1}
+ m_InitTexture: {fileID: 0}
+ m_UpdateMode: 0
+ m_InitializationMode: 2
+ m_UpdateZoneSpace: 0
+ m_CurrentUpdateZoneSpace: 0
+ m_UpdateZones: []
+ m_UpdatePeriod: 0
+ m_ShaderPass: 0
+ m_CubemapFaceMask: 4294967295
+ m_DoubleBuffered: 0
+ m_WrapUpdateZones: 0
diff --git a/Assets/Textures/RT_NewspaperDisplay.asset.meta b/Assets/Textures/RT_NewspaperDisplay.asset.meta
new file mode 100644
index 0000000..eadda7e
--- /dev/null
+++ b/Assets/Textures/RT_NewspaperDisplay.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fb730cd2dcc49654dbee12581f50a3c4
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 8600000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Textures/RT_VideoPlayer.asset b/Assets/Textures/RT_VideoPlayer.asset
index e02fbe5..1a7bdfd 100644
--- a/Assets/Textures/RT_VideoPlayer.asset
+++ b/Assets/Textures/RT_VideoPlayer.asset
@@ -14,8 +14,8 @@ CustomRenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
- m_Width: 854
- m_Height: 480
+ m_Width: 640
+ m_Height: 360
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 94
diff --git a/Assets/UdonSharp/CaptureCarmenNewspaper.asset b/Assets/UdonSharp/CaptureCarmenNewspaper.asset
index 80f16c0..666c1bd 100644
--- a/Assets/UdonSharp/CaptureCarmenNewspaper.asset
+++ b/Assets/UdonSharp/CaptureCarmenNewspaper.asset
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
- Data: 5
+ Data: 7
- Name:
Entry: 7
Data:
@@ -290,16 +290,154 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _Animator
+ Data: _PlayAnimation
- Name: $v
Entry: 7
Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _Animator
+ Data: _PlayAnimation
- Name: k__BackingField
Entry: 7
Data: 19|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: NewspaperAnimation, Assembly-CSharp
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 7
+ Data: 20|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: System.Int32, mscorlib
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 7
+ Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+ - Name:
+ Entry: 3
+ Data: 1
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 5
+ Data: false
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 2
+ - Name:
+ Entry: 7
+ Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data: 23|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: _WinningPlayer
+ - Name: $v
+ Entry: 7
+ Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _WinningPlayer
+ - Name: k__BackingField
+ Entry: 7
+ Data: 25|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: System.String, mscorlib
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 9
+ Data: 25
+ - 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: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 2
+ - Name:
+ Entry: 7
+ Data: 27|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data: 28|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: _Animator
+ - Name: $v
+ Entry: 7
+ Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _Animator
+ - Name: k__BackingField
+ Entry: 7
+ Data: 30|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Animator, UnityEngine.AnimationModule
@@ -308,7 +446,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 19
+ Data: 30
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -323,7 +461,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
diff --git a/Assets/UdonSharp/CaptureCarmenNewspaper.cs b/Assets/UdonSharp/CaptureCarmenNewspaper.cs
index 8d6cfa9..4d36b3f 100644
--- a/Assets/UdonSharp/CaptureCarmenNewspaper.cs
+++ b/Assets/UdonSharp/CaptureCarmenNewspaper.cs
@@ -6,6 +6,14 @@ using VRC.SDK3.UdonNetworkCalling;
using VRC.SDKBase;
+public enum NewspaperAnimation
+{
+ None,
+ Win,
+ Lose
+}
+
+
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
public class CaptureCarmenNewspaper : UdonSharpBehaviour
{
@@ -15,6 +23,9 @@ public class CaptureCarmenNewspaper : UdonSharpBehaviour
[SerializeField] private AudioManager _AudioManager;
+ [UdonSynced, FieldChangeCallback(nameof(PlayAnimation))] private NewspaperAnimation _PlayAnimation;
+ [UdonSynced, FieldChangeCallback(nameof(WinningPlayer))] private string _WinningPlayer;
+
private Animator _Animator;
@@ -24,26 +35,28 @@ public class CaptureCarmenNewspaper : UdonSharpBehaviour
}
- [NetworkCallable]
- public void PlayWinAnimation(string WinningPlayer)
+ public void PlayWinAnimation(string Winner)
{
- GetCurrentDate();
- SetHeadline(true, WinningPlayer);
- _Animator.SetBool("Speen", true);
+ WinningPlayer = Winner;
+ PlayAnimation = NewspaperAnimation.Win;
- SendCustomEventDelayedSeconds(nameof(ApplyJailEffect), 2.0f);
- SendCustomEventDelayedSeconds(nameof(ResetAnimation), 5.0f);
+ RequestSerialization();
}
- [NetworkCallable]
public void PlayLoseAnimation()
{
- GetCurrentDate();
- SetHeadline(false);
- _Animator.SetBool("Speen", true);
+ WinningPlayer = "";
+ PlayAnimation = NewspaperAnimation.Lose;
- SendCustomEventDelayedSeconds(nameof(ApplyEscapeEffect), 2.0f);
- SendCustomEventDelayedSeconds(nameof(ResetAnimation), 5.0f);
+ RequestSerialization();
+ }
+
+ public void ResetAnimation()
+ {
+ WinningPlayer = "";
+ PlayAnimation = NewspaperAnimation.None;
+
+ RequestSerialization();
}
public void ApplyJailEffect()
@@ -58,12 +71,6 @@ public class CaptureCarmenNewspaper : UdonSharpBehaviour
_CarmenPortrait.material.SetVector("_MainTex_ST", new Vector4(0.5f, 0.5f, 0.5f, 0.5f));
}
- public void ResetAnimation()
- {
- _Animator.SetBool("Speen", false);
- _CarmenPortrait.material.SetVector("_MainTex_ST", new Vector4(0.5f, 0.5f, 0.0f, 0.5f));
- }
-
private void GetCurrentDate()
{
@@ -73,9 +80,9 @@ public class CaptureCarmenNewspaper : UdonSharpBehaviour
MonthToString(CurrentDate.Month) + " " + CurrentDate.Day + ", " + CurrentDate.Year;
}
- private void SetHeadline(bool PlayerWon, string PlayerName = "")
+ private void SetHeadline(bool PlayerWon)
{
- _Headline.text = PlayerWon ? (PlayerName + "\nCaptures Carmen!") : "Carmen Sandiego\nEvades Capture";
+ _Headline.text = PlayerWon ? (WinningPlayer + "\nCaptures Carmen!") : "Carmen Sandiego\nEvades Capture";
}
@@ -113,4 +120,40 @@ public class CaptureCarmenNewspaper : UdonSharpBehaviour
}
return "[[ERROR]]";
}
+
+
+ private NewspaperAnimation PlayAnimation
+ {
+ set
+ {
+ _PlayAnimation = value;
+ GetCurrentDate();
+ switch (_PlayAnimation)
+ {
+ case NewspaperAnimation.None:
+ _Animator.SetBool("Speen", false);
+ _CarmenPortrait.material.SetVector("_MainTex_ST", new Vector4(0.5f, 0.5f, 0.0f, 0.5f));
+ break;
+ case NewspaperAnimation.Win:
+ _Animator.SetBool("Speen", true);
+ SendCustomEventDelayedSeconds(nameof(ApplyJailEffect), 2.0f);
+ break;
+ case NewspaperAnimation.Lose:
+ _Animator.SetBool("Speen", true);
+ SendCustomEventDelayedSeconds(nameof(ApplyEscapeEffect), 2.0f);
+ break;
+ }
+ }
+ get => _PlayAnimation;
+ }
+
+ private string WinningPlayer
+ {
+ set
+ {
+ _WinningPlayer = value;
+ SetHeadline(_WinningPlayer == "" ? false : true);
+ }
+ get => _WinningPlayer;
+ }
}
diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset
index 43aafa6..dcdc789 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: 22
+ Data: 23
- Name:
Entry: 7
Data:
@@ -728,19 +728,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _EndingPlayer
+ Data: _NewspaperPublicDisplay
- Name: $v
Entry: 7
Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _EndingPlayer
+ Data: _NewspaperPublicDisplay
- Name: k__BackingField
Entry: 7
Data: 49|System.RuntimeType, mscorlib
- Name:
Entry: 1
- Data: RandomVideoPlayer, Assembly-CSharp
+ Data: NewspaperDisplay, Assembly-CSharp
- Name:
Entry: 8
Data:
@@ -788,58 +788,46 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _CurrentlyActiveMap
+ Data: _EndingPlayer
- Name: $v
Entry: 7
Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _CurrentlyActiveMap
+ Data: _EndingPlayer
- Name: k__BackingField
Entry: 7
Data: 53|System.RuntimeType, mscorlib
- Name:
Entry: 1
- Data: ContinentMap, Assembly-CSharp
+ Data: RandomVideoPlayer, Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: k__BackingField
- Entry: 7
- Data: 54|System.RuntimeType, mscorlib
- - Name:
- Entry: 1
- Data: System.Int32, mscorlib
- - Name:
- Entry: 8
- Data:
+ Entry: 9
+ Data: 4
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
- Entry: 3
- Data: 1
+ Entry: 6
+ Data:
- Name:
Entry: 8
Data:
- Name: k__BackingField
Entry: 5
- Data: false
+ Data: true
- Name: _fieldAttributes
Entry: 7
- Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
- Data: 2
+ Data: 1
- Name:
Entry: 7
- Data: 56|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 7
- Data: 57|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+ Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -860,19 +848,31 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _ActiveMarker
+ Data: _CurrentlyActiveMap
- Name: $v
Entry: 7
- Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _ActiveMarker
+ Data: _CurrentlyActiveMap
- Name: k__BackingField
- Entry: 9
- Data: 54
+ Entry: 7
+ Data: 57|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: ContinentMap, Assembly-CSharp
+ - Name:
+ Entry: 8
+ Data:
- Name: k__BackingField
- Entry: 9
- Data: 54
+ Entry: 7
+ Data: 58|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: System.Int32, mscorlib
+ - Name:
+ Entry: 8
+ Data:
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -920,19 +920,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _StageIndex
+ Data: _ActiveMarker
- Name: $v
Entry: 7
Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _StageIndex
+ Data: _ActiveMarker
- Name: k__BackingField
Entry: 9
- Data: 54
+ Data: 58
- Name: k__BackingField
Entry: 9
- Data: 54
+ Data: 58
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -950,13 +950,73 @@ MonoBehaviour:
Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
- Data: 1
+ Data: 2
- Name:
Entry: 7
Data: 64|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
+ - Name:
+ Entry: 7
+ Data: 65|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data:
+ - Name: $k
+ Entry: 1
+ Data: _StageIndex
+ - Name: $v
+ Entry: 7
+ Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _StageIndex
+ - Name: k__BackingField
+ Entry: 9
+ Data: 58
+ - Name: k__BackingField
+ Entry: 9
+ Data: 58
+ - Name: k__BackingField
+ Entry: 7
+ Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+ - Name:
+ Entry: 3
+ Data: 1
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 5
+ Data: false
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 68|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ - Name:
+ Entry: 8
+ Data:
- Name:
Entry: 13
Data:
@@ -977,13 +1037,13 @@ MonoBehaviour:
Data: _ContinentData
- Name: $v
Entry: 7
- Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _ContinentData
- Name: k__BackingField
Entry: 7
- Data: 66|System.RuntimeType, mscorlib
+ Data: 70|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
@@ -992,7 +1052,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 66
+ Data: 70
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1007,7 +1067,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
@@ -1031,13 +1091,13 @@ MonoBehaviour:
Data: _GameStatus
- Name: $v
Entry: 7
- Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _GameStatus
- Name: k__BackingField
Entry: 7
- Data: 69|System.RuntimeType, mscorlib
+ Data: 73|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: GameStatus, Assembly-CSharp
@@ -1046,7 +1106,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 54
+ Data: 58
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1061,13 +1121,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -1091,7 +1151,7 @@ MonoBehaviour:
Data: _RunTimer
- Name: $v
Entry: 7
- Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _RunTimer
@@ -1115,13 +1175,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -1145,16 +1205,16 @@ MonoBehaviour:
Data: _Timer
- Name: $v
Entry: 7
- Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _Timer
- Name: k__BackingField
Entry: 9
- Data: 54
+ Data: 58
- Name: k__BackingField
Entry: 9
- Data: 54
+ Data: 58
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1169,13 +1229,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 77|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -1197,78 +1257,18 @@ MonoBehaviour:
- Name: $k
Entry: 1
Data: _SuccessCounter
- - Name: $v
- Entry: 7
- Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- - Name: k__BackingField
- Entry: 1
- Data: _SuccessCounter
- - Name: k__BackingField
- Entry: 9
- Data: 54
- - Name: k__BackingField
- Entry: 9
- Data: 54
- - 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: 2
- - Name:
- Entry: 7
- Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 7
- Data: 81|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: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _FailureCounter
+ Data: _SuccessCounter
- Name: k__BackingField
Entry: 9
- Data: 54
+ Data: 58
- Name: k__BackingField
Entry: 9
- Data: 54
+ Data: 58
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1316,16 +1316,76 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _CameraControllerRound3
+ Data: _FailureCounter
- Name: $v
Entry: 7
Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _FailureCounter
+ - Name: k__BackingField
+ Entry: 9
+ Data: 58
+ - Name: k__BackingField
+ Entry: 9
+ Data: 58
+ - 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: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 2
+ - Name:
+ Entry: 7
+ Data: 88|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data: 89|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: _CameraControllerRound3
+ - Name: $v
+ Entry: 7
+ Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _CameraControllerRound3
- Name: k__BackingField
Entry: 7
- Data: 87|System.RuntimeType, mscorlib
+ Data: 91|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CameraControllerRound3, Assembly-CSharp
@@ -1349,7 +1409,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs
index ca90a05..3fb9f32 100644
--- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs
+++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs
@@ -37,6 +37,7 @@ public class GameManagerRound3 : GameManagerBase
[SerializeField] private FloorMap[] _Maps;
[SerializeField] private FloorMapMarker[] _Markers;
[SerializeField] private CaptureCarmenNewspaper _CaptureCarmenNewspaper;
+ [SerializeField] private NewspaperDisplay _NewspaperPublicDisplay;
[SerializeField] private RandomVideoPlayer _EndingPlayer;
[UdonSynced, FieldChangeCallback(nameof(CurrentlyActiveMap))] private ContinentMap _CurrentlyActiveMap = ContinentMap.INDEX_MAX;
@@ -86,6 +87,10 @@ public class GameManagerRound3 : GameManagerBase
InitialiseMarkers();
GetCurrentMap().RandomiseCountries();
+ _EndingPlayer.PlayVideo = false;
+ _CaptureCarmenNewspaper.ResetAnimation();
+ _NewspaperPublicDisplay.Activate(false);
+
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false);
_CameraControllerRound3.InitialiseCameras();
@@ -110,6 +115,7 @@ public class GameManagerRound3 : GameManagerBase
Networking.SetOwner(NewOwner, _Markers[i].gameObject);
Networking.SetOwner(NewOwner, _CaptureCarmenNewspaper.gameObject);
+ Networking.SetOwner(NewOwner, _NewspaperPublicDisplay.gameObject);
Networking.SetOwner(NewOwner, _EndingPlayer.gameObject);
Networking.SetOwner(NewOwner, _CameraController.gameObject);
@@ -352,6 +358,8 @@ public class GameManagerRound3 : GameManagerBase
}
_CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = false;
+ _CameraControllerRound3.DisableAllSwitchers();
+ _CameraControllerRound3.SwitchToFrontCamera();
}
public void PlayWindDownMusic()
{
@@ -364,8 +372,9 @@ public class GameManagerRound3 : GameManagerBase
public void EndCarmenInJailSFX()
{
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "StopSFX");
-
- _CaptureCarmenNewspaper.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayWinAnimation", GetRound3PlayerName());
+
+ _CaptureCarmenNewspaper.PlayWinAnimation(GetRound3PlayerName());
+ _NewspaperPublicDisplay.Activate(true);
}
[NetworkCallable]
@@ -393,11 +402,14 @@ public class GameManagerRound3 : GameManagerBase
}
_CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = false;
+ _CameraControllerRound3.DisableAllSwitchers();
+ _CameraControllerRound3.SwitchToFrontCamera();
}
public void PlayNewspaperLoseAnimation()
{
- _CaptureCarmenNewspaper.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayLoseAnimation");
+ _CaptureCarmenNewspaper.PlayLoseAnimation();
+ _NewspaperPublicDisplay.Activate(true);
}
@@ -408,6 +420,8 @@ public class GameManagerRound3 : GameManagerBase
Interface.HeaderUI.text = "Rockin' it a capella";
Interface.CommentUI.text = "";
+ _NewspaperPublicDisplay.Activate(false);
+
_CameraControllerRound3.PlayDoItRockapella(true);
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic");
diff --git a/Assets/UdonSharp/NewspaperDisplay.asset b/Assets/UdonSharp/NewspaperDisplay.asset
new file mode 100644
index 0000000..2136db6
--- /dev/null
+++ b/Assets/UdonSharp/NewspaperDisplay.asset
@@ -0,0 +1,239 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
+ m_Name: NewspaperDisplay
+ m_EditorClassIdentifier:
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 27108b45ff056ac4886d4058d930fde8,
+ type: 2}
+ udonAssembly:
+ assemblyError:
+ sourceCsScript: {fileID: 11500000, guid: 1fda5f76412adf045afddecf3961f77a, type: 3}
+ scriptVersion: 2
+ compiledVersion: 2
+ behaviourSyncMode: 4
+ hasInteractEvent: 0
+ scriptID: -3194692906084292034
+ serializationData:
+ SerializedFormat: 2
+ SerializedBytes:
+ ReferencedUnityObjects: []
+ SerializedBytesString:
+ Prefab: {fileID: 0}
+ PrefabModificationsReferencedUnityObjects: []
+ PrefabModifications: []
+ SerializationNodes:
+ - Name: fieldDefinitions
+ Entry: 7
+ Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition,
+ UdonSharp.Editor]], mscorlib
+ - Name: comparer
+ Entry: 7
+ Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
+ mscorlib]], mscorlib
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 12
+ Data: 3
+ - Name:
+ Entry: 7
+ Data:
+ - Name: $k
+ Entry: 1
+ Data: _Camera
+ - Name: $v
+ Entry: 7
+ Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _Camera
+ - Name: k__BackingField
+ Entry: 7
+ Data: 3|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: UnityEngine.GameObject, UnityEngine.CoreModule
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 9
+ Data: 3
+ - Name: k__BackingField
+ Entry: 7
+ Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+ - Name:
+ Entry: 6
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 5
+ Data: true
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 5|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: _Screens
+ - Name: $v
+ Entry: 7
+ Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _Screens
+ - Name: k__BackingField
+ Entry: 7
+ Data: 7|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: UnityEngine.GameObject[], UnityEngine.CoreModule
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 9
+ Data: 7
+ - Name: k__BackingField
+ Entry: 7
+ Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+ - Name:
+ Entry: 6
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 5
+ Data: true
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 9|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: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _Active
+ - Name: k__BackingField
+ Entry: 7
+ Data: 11|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: System.Boolean, mscorlib
+ - Name:
+ Entry: 8
+ Data:
+ - 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 2
+ - Name:
+ Entry: 7
+ Data: 13|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data: 14|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
diff --git a/Assets/UdonSharp/NewspaperDisplay.asset.meta b/Assets/UdonSharp/NewspaperDisplay.asset.meta
new file mode 100644
index 0000000..8cd56c9
--- /dev/null
+++ b/Assets/UdonSharp/NewspaperDisplay.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 59d48fd4fec18b74f842ca47091613e3
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UdonSharp/NewspaperDisplay.cs b/Assets/UdonSharp/NewspaperDisplay.cs
new file mode 100644
index 0000000..6af6a11
--- /dev/null
+++ b/Assets/UdonSharp/NewspaperDisplay.cs
@@ -0,0 +1,38 @@
+
+using UdonSharp;
+using UnityEngine;
+using UnityEngine.Device;
+using VRC.SDKBase;
+using VRC.Udon;
+
+
+[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
+public class NewspaperDisplay : UdonSharpBehaviour
+{
+ [SerializeField] private GameObject _Camera;
+ [SerializeField] private GameObject[] _Screens;
+
+ [UdonSynced, FieldChangeCallback(nameof(Active))] private bool _Active;
+
+
+ public void Activate(bool Activate)
+ {
+ Active = Activate;
+ RequestSerialization();
+ }
+
+
+ private bool Active
+ {
+ set
+ {
+ _Active = value;
+ _Camera.SetActive(_Active);
+ foreach (GameObject Screen in _Screens)
+ {
+ Screen.SetActive(_Active);
+ }
+ }
+ get => _Active;
+ }
+}
diff --git a/Assets/UdonSharp/NewspaperDisplay.cs.meta b/Assets/UdonSharp/NewspaperDisplay.cs.meta
new file mode 100644
index 0000000..a252e5e
--- /dev/null
+++ b/Assets/UdonSharp/NewspaperDisplay.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1fda5f76412adf045afddecf3961f77a
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset
index 036a370..b946757 100644
--- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset
+++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: BoneFollower
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset
index 13d78db..b35639e 100644
--- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset
+++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: InteractToggle
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
index d89a1a4..1def3de 100644
--- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
+++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: PlayerModSetter
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
index ea98aa4..8101274 100644
--- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
+++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: GlobalToggleObject
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
index b4b3ede..901d05e 100644
--- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
+++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: MasterToggleObject
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
index c624599..da92932 100644
--- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
+++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: TrackingDataFollower
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
index 5226f4f..ee4621f 100644
--- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
+++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: WorldAudioSettings
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
type: 2}
udonAssembly:
assemblyError:
diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset
index ba6209e..d925021 100644
--- a/ProjectSettings/AudioManager.asset
+++ b/ProjectSettings/AudioManager.asset
@@ -10,8 +10,8 @@ AudioManager:
Default Speaker Mode: 2
m_SampleRate: 48000
m_DSPBufferSize: 1024
- m_VirtualVoiceCount: 64
- m_RealVoiceCount: 32
+ m_VirtualVoiceCount: 32
+ m_RealVoiceCount: 24
m_EnableOutputSuspension: 1
m_SpatializerPlugin: OculusSpatializer
m_AmbisonicDecoderPlugin: OculusSpatializer