diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 70dc262..d836da0 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -86,6 +86,7 @@
+
@@ -173,6 +174,7 @@
+
@@ -180,6 +182,7 @@
+
diff --git a/Assets/Materials/M_Timer_UIDisplay.mat b/Assets/Materials/M_Timer_UIDisplay.mat
new file mode 100644
index 0000000..6368129
--- /dev/null
+++ b/Assets/Materials/M_Timer_UIDisplay.mat
@@ -0,0 +1,156 @@
+%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_Timer_UIDisplay
+ m_Shader: {fileID: 4800000, guid: f2fef445ad9ee8141a02c08e2c7dbcb4, type: 3}
+ 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: 59013d5ff390016428ea7feb21b9ac16, 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}
+ - _Skew: {r: 0, g: 0, b: 0, a: 0}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/M_Timer_UIDisplay.mat.meta b/Assets/Materials/M_Timer_UIDisplay.mat.meta
new file mode 100644
index 0000000..075d6c3
--- /dev/null
+++ b/Assets/Materials/M_Timer_UIDisplay.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a64c9a0fcb65ce84f8aaa9f5b6449fde
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Timer.meta b/Assets/Materials/Timer.meta
new file mode 100644
index 0000000..a6b6a50
--- /dev/null
+++ b/Assets/Materials/Timer.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4e481397ab5047149ba4ab3186e07079
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Timer/M_Counter.mat b/Assets/Materials/Timer/M_Counter.mat
new file mode 100644
index 0000000..b58a5bb
--- /dev/null
+++ b/Assets/Materials/Timer/M_Counter.mat
@@ -0,0 +1,95 @@
+%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_Counter
+ m_Shader: {fileID: 4800000, guid: bdbecd808900b3a49963019f31a76291, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords:
+ - _ALPHABLEND_ON
+ - _GLOSSYREFLECTIONS_OFF
+ - _SPECULARHIGHLIGHTS_OFF
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3001
+ 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: 8600000, guid: 59013d5ff390016428ea7feb21b9ac16, type: 2}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 8600000, guid: 59013d5ff390016428ea7feb21b9ac16, type: 2}
+ m_Scale: {x: 0.5, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Text:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _TextAlpha:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 10
+ - _GlossMapScale: 1
+ - _Glossiness: 0
+ - _GlossyReflections: 0
+ - _Metallic: 0
+ - _Mode: 2
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 0
+ - _SrcBlend: 5
+ - _UVSec: 0
+ - _ZWrite: 0
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+ - _Skew: {r: 0, g: 0, b: 0, a: 0}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/Timer/M_Counter.mat.meta b/Assets/Materials/Timer/M_Counter.mat.meta
new file mode 100644
index 0000000..331bd56
--- /dev/null
+++ b/Assets/Materials/Timer/M_Counter.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7972f00661b47a448a7252e73486dd75
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Timer/M_CounterCrosshairs_UI.mat b/Assets/Materials/Timer/M_CounterCrosshairs_UI.mat
new file mode 100644
index 0000000..9aa8f32
--- /dev/null
+++ b/Assets/Materials/Timer/M_CounterCrosshairs_UI.mat
@@ -0,0 +1,103 @@
+%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_CounterCrosshairs_UI
+ m_Shader: {fileID: 4800000, guid: 792e8f5848e022e4baecdd1f69ada66a, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ColourTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Crosshairs:
+ m_Texture: {fileID: 2800000, guid: 33ead63c507cff444a04b98db066e683, type: 3}
+ 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: 2800000, guid: 33ead63c507cff444a04b98db066e683, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Wiper:
+ m_Texture: {fileID: 2800000, guid: 3cf216dc7d9dd154aac0f2614235b389, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _CrosshairsThickness: 0.4
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _LineThickness: 0.15
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _Progress: 1
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Thickness: 0.07
+ - _UVSec: 0
+ - _VerticalLineCorrection: 0
+ - _WiperProgress: 1.0222223
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _Thickness: {r: 0.4, g: 1, b: 0, a: 0}
+ - _Tint: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/Timer/M_CounterCrosshairs_UI.mat.meta b/Assets/Materials/Timer/M_CounterCrosshairs_UI.mat.meta
new file mode 100644
index 0000000..b940e26
--- /dev/null
+++ b/Assets/Materials/Timer/M_CounterCrosshairs_UI.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 27d6a54c1c648aa4cb8c7d4fa8a98281
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Timer/M_Counter_Shadow.mat b/Assets/Materials/Timer/M_Counter_Shadow.mat
new file mode 100644
index 0000000..1ca0af6
--- /dev/null
+++ b/Assets/Materials/Timer/M_Counter_Shadow.mat
@@ -0,0 +1,34 @@
+%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_Counter_Shadow
+ m_Shader: {fileID: 4800000, guid: bdbecd808900b3a49963019f31a76291, type: 3}
+ m_Parent: {fileID: 2100000, guid: 7972f00661b47a448a7252e73486dd75, type: 2}
+ m_ModifiedSerializedProperties: 16
+ m_ValidKeywords: []
+ m_InvalidKeywords:
+ - _ALPHABLEND_ON
+ - _GLOSSYREFLECTIONS_OFF
+ - _SPECULARHIGHLIGHTS_OFF
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs: []
+ m_Ints: []
+ m_Floats: []
+ m_Colors:
+ - _Color: {r: 0, g: 0, b: 0, a: 0.7529412}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/Timer/M_Counter_Shadow.mat.meta b/Assets/Materials/Timer/M_Counter_Shadow.mat.meta
new file mode 100644
index 0000000..40c8403
--- /dev/null
+++ b/Assets/Materials/Timer/M_Counter_Shadow.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 40eda022ac86f554a90493976fe7f704
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Timer/M_Timer.mat b/Assets/Materials/Timer/M_Timer.mat
new file mode 100644
index 0000000..758ce95
--- /dev/null
+++ b/Assets/Materials/Timer/M_Timer.mat
@@ -0,0 +1,93 @@
+%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_Timer
+ m_Shader: {fileID: 4800000, guid: bdbecd808900b3a49963019f31a76291, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords:
+ - _ALPHABLEND_ON
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3001
+ 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: 8600000, guid: 59013d5ff390016428ea7feb21b9ac16, type: 2}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 8600000, guid: 59013d5ff390016428ea7feb21b9ac16, type: 2}
+ m_Scale: {x: 0.5, y: 1}
+ m_Offset: {x: 0.5, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Text:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _TextAlpha:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 10
+ - _GlossMapScale: 1
+ - _Glossiness: 0
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 2
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 5
+ - _UVSec: 0
+ - _ZWrite: 0
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+ - _Skew: {r: 0, g: 0, b: 0, a: 0}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/Timer/M_Timer.mat.meta b/Assets/Materials/Timer/M_Timer.mat.meta
new file mode 100644
index 0000000..8d224a6
--- /dev/null
+++ b/Assets/Materials/Timer/M_Timer.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 39976bce5d49cbf42912dee6e930edb1
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat
new file mode 100644
index 0000000..e6842ee
--- /dev/null
+++ b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat
@@ -0,0 +1,103 @@
+%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_TimerCrosshairs_UI
+ m_Shader: {fileID: 4800000, guid: 792e8f5848e022e4baecdd1f69ada66a, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 1
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ColourTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Crosshairs:
+ m_Texture: {fileID: 2800000, guid: 33ead63c507cff444a04b98db066e683, type: 3}
+ 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: 2800000, guid: 33ead63c507cff444a04b98db066e683, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Wiper:
+ m_Texture: {fileID: 2800000, guid: 3cf216dc7d9dd154aac0f2614235b389, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _CrosshairsThickness: 0.4
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _LineThickness: 0.15
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _Progress: 1
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Thickness: 0.07
+ - _UVSec: 0
+ - _VerticalLineCorrection: 0
+ - _WiperProgress: 0.93333334
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _Thickness: {r: 0.4, g: 1, b: 0, a: 0}
+ - _Tint: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat.meta b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat.meta
new file mode 100644
index 0000000..882c6e3
--- /dev/null
+++ b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b4f757c1cd157943ac2082269832a49
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Timer/M_Timer_Shadow.mat b/Assets/Materials/Timer/M_Timer_Shadow.mat
new file mode 100644
index 0000000..26284cf
--- /dev/null
+++ b/Assets/Materials/Timer/M_Timer_Shadow.mat
@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: M_Timer_Shadow
+ m_Shader: {fileID: 4800000, guid: bdbecd808900b3a49963019f31a76291, type: 3}
+ m_Parent: {fileID: 2100000, guid: 39976bce5d49cbf42912dee6e930edb1, type: 2}
+ m_ModifiedSerializedProperties: 16
+ m_ValidKeywords: []
+ m_InvalidKeywords:
+ - _ALPHABLEND_ON
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs: []
+ m_Ints: []
+ m_Floats: []
+ m_Colors:
+ - _Color: {r: 0, g: 0, b: 0, a: 0.7529412}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/Timer/M_Timer_Shadow.mat.meta b/Assets/Materials/Timer/M_Timer_Shadow.mat.meta
new file mode 100644
index 0000000..e1aa0b3
--- /dev/null
+++ b/Assets/Materials/Timer/M_Timer_Shadow.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 624f773968d277049b20343ebfb6883c
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Capture Carmen Newspaper.prefab b/Assets/Prefabs/Capture Carmen Newspaper.prefab
index 7e43233..8cf8a16 100644
--- a/Assets/Prefabs/Capture Carmen Newspaper.prefab
+++ b/Assets/Prefabs/Capture Carmen Newspaper.prefab
@@ -384,6 +384,7 @@ MonoBehaviour:
_Date: {fileID: 4693766213138297865}
_Headline: {fileID: 7465527118717481133}
_CarmenPortrait: {fileID: 2025158899292727713}
+ _Animator: {fileID: 5216652645283146527}
_AudioManager: {fileID: 0}
--- !u!114 &3854043598536334604
MonoBehaviour:
diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity
index 6ef93f0..5fe68e3 100644
--- a/Assets/Scenes/witwics.unity
+++ b/Assets/Scenes/witwics.unity
@@ -1426,7 +1426,7 @@ PrefabInstance:
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: FarClippingPlane
- value: 20
+ value: 30
objectReference: {fileID: 0}
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
@@ -1952,7 +1952,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 1808255083}
+ m_TransformParent: {fileID: 624948965}
m_Modifications:
- target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -1988,7 +1988,7 @@ PrefabInstance:
type: 3}
propertyPath: volumeTrigger
value:
- objectReference: {fileID: 70805495}
+ objectReference: {fileID: 1390751085}
- target: {fileID: 2014676780200193698, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_Enabled
@@ -4944,6 +4944,112 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 116074573}
m_CullTransparentMesh: 1
+--- !u!1 &117516715
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 117516716}
+ - component: {fileID: 117516719}
+ - component: {fileID: 117516718}
+ - component: {fileID: 117516717}
+ m_Layer: 0
+ m_Name: Timer Shadow
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &117516716
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 117516715}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.015, y: -0.015, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 1241344965}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!64 &117516717
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 117516715}
+ 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!23 &117516718
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 117516715}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 624f773968d277049b20343ebfb6883c, 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 &117516719
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 117516715}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &119254901 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 262535302795885026, guid: e9914385266bca24db809c39e395f03c,
@@ -15360,7 +15466,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1390751085}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &306921568 stripped
@@ -16045,7 +16155,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 593766640}
+ m_TransformParent: {fileID: 1561088478}
m_Modifications:
- target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -16086,7 +16196,7 @@ PrefabInstance:
type: 3}
propertyPath: volumeTrigger
value:
- objectReference: {fileID: 336011330}
+ objectReference: {fileID: 1390751085}
- target: {fileID: 2014676780200193698, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_Enabled
@@ -16126,7 +16236,7 @@ PrefabInstance:
- target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_IsActive
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -16239,7 +16349,7 @@ PrefabInstance:
- target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: sleepFlag
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -17769,7 +17879,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &359000343
Transform:
m_ObjectHideFlags: 0
@@ -18061,6 +18171,11 @@ PrefabInstance:
propertyPath: m_TargetTexture
value:
objectReference: {fileID: 8400000, guid: 159f7ed7127b3814fa2d7cfc6da0f429, type: 2}
+ - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: near clip plane
+ value: 0.3
+ objectReference: {fileID: 0}
- target: {fileID: 6426376458612370810, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: _syncMethod
@@ -18097,41 +18212,6 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -18155,17 +18235,17 @@ PrefabInstance:
- target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: spawnRot.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: spawnRot.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: spawnRot.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -23822,6 +23902,112 @@ Transform:
m_Children: []
m_Father: {fileID: 1868785874}
m_LocalEulerAnglesHint: {x: 141.56601, y: -213.148, z: -90}
+--- !u!1 &525518442
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 525518443}
+ - component: {fileID: 525518446}
+ - component: {fileID: 525518445}
+ - component: {fileID: 525518444}
+ m_Layer: 0
+ m_Name: Counter Shadow
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &525518443
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 525518442}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.015, y: -0.015, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 2128345790}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!64 &525518444
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 525518442}
+ 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!23 &525518445
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 525518442}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 40eda022ac86f554a90493976fe7f704, 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 &525518446
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 525518442}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &525846578 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1177052548670801575, guid: 40955da061a841841a91c845049f1e11,
@@ -26377,11 +26563,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
- type: 3}
- insertIndex: -1
- addedObject: {fileID: 336011330}
+ m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &593766640 stripped
@@ -27459,6 +27641,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!4 &624948965 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ m_PrefabInstance: {fileID: 1808255082}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &625165541 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5097244626893553077, guid: 899ce13087fd5974f88dcbccaea2df85,
@@ -31733,11 +31921,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
- type: 3}
- insertIndex: -1
- addedObject: {fileID: 1832440712}
+ m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &739684420 stripped
@@ -39829,6 +40013,7 @@ MonoBehaviour:
- {fileID: 652699948}
_CaptureCarmenNewspaper: {fileID: 2128547811}
_NewspaperPublicDisplay: {fileID: 107399075}
+ _TimerPublicDisplay: {fileID: 1472688267}
_EndingPlayer: {fileID: 1762618935}
--- !u!1 &969958451 stripped
GameObject:
@@ -47619,11 +47804,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
- type: 3}
- insertIndex: -1
- addedObject: {fileID: 1390751085}
+ m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &1117826904 stripped
@@ -48124,6 +48305,12 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 4953860686005405531}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &1141781604 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ m_PrefabInstance: {fileID: 306921567}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1143449485
GameObject:
m_ObjectHideFlags: 0
@@ -48263,6 +48450,109 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &1144860545
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1144860546}
+ - component: {fileID: 1144860549}
+ - component: {fileID: 1144860548}
+ - component: {fileID: 1144860547}
+ m_Layer: 0
+ m_Name: Timer Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1144860546
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1144860545}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 2053100623}
+ - {fileID: 1377320497}
+ m_Father: {fileID: 1472688265}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 1440, y: 720}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1144860547
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1144860545}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &1144860548
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1144860545}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 1
+--- !u!223 &1144860549
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1144860545}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_VertexColorAlwaysGammaSpace: 0
+ m_AdditionalShaderChannelsFlag: 25
+ m_UpdateRectTransformForStandalone: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
--- !u!1 &1145254420 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1158789763999725350, guid: f6b3266d95cfe0342aa45faf5a1547f5,
@@ -50966,6 +51256,113 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 4362789101225005290}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1241344964
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1241344965}
+ - component: {fileID: 1241344968}
+ - component: {fileID: 1241344967}
+ - component: {fileID: 1241344966}
+ m_Layer: 0
+ m_Name: Timer
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1241344965
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1241344964}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.552, y: -0.228, z: 0}
+ m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
+ m_ConstrainProportionsScale: 1
+ m_Children:
+ - {fileID: 117516716}
+ m_Father: {fileID: 1498879995}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!64 &1241344966
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1241344964}
+ 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!23 &1241344967
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1241344964}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 39976bce5d49cbf42912dee6e930edb1, 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 &1241344968
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1241344964}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &1242312397
PrefabInstance:
m_ObjectHideFlags: 0
@@ -51735,6 +52132,7 @@ Transform:
- {fileID: 1699893630}
- {fileID: 772205214}
- {fileID: 107399073}
+ - {fileID: 1472688265}
- {fileID: 1762618933}
- {fileID: 1657587667}
- {fileID: 1264786912}
@@ -55677,6 +56075,78 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 4362789101225005290}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1377320496
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1377320497}
+ - component: {fileID: 1377320499}
+ - component: {fileID: 1377320498}
+ m_Layer: 0
+ m_Name: Timer
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1377320497
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1377320496}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1144860546}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0.5}
+ m_AnchorMax: {x: 1, y: 0.5}
+ m_AnchoredPosition: {x: -360, y: 0}
+ m_SizeDelta: {x: 720, y: 720}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1377320498
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1377320496}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: 7b4f757c1cd157943ac2082269832a49, type: 2}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Texture: {fileID: 0}
+ m_UVRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+--- !u!222 &1377320499
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1377320496}
+ m_CullTransparentMesh: 1
--- !u!1 &1377550929
GameObject:
m_ObjectHideFlags: 0
@@ -55974,7 +56444,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 1117826904}
+ m_TransformParent: {fileID: 1141781604}
m_Modifications:
- target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -56055,18 +56525,23 @@ PrefabInstance:
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: field of view
- value: 14
+ value: 8.5
objectReference: {fileID: 0}
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: far clip plane
- value: 10
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_TargetTexture
value:
objectReference: {fileID: 8400000, guid: d24baa8d32998f74ea3081579f49738d, type: 2}
+ - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: near clip plane
+ value: 0.3
+ objectReference: {fileID: 0}
- target: {fileID: 6426376458612370810, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: _syncMethod
@@ -59538,6 +60013,93 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1471187087}
m_CullTransparentMesh: 1
+--- !u!1 &1472688264
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1472688265}
+ - component: {fileID: 1472688267}
+ - component: {fileID: 1472688266}
+ m_Layer: 0
+ m_Name: Timer Display
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1472688265
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1472688264}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0.8227235, z: -0, w: 0.56844175}
+ m_LocalPosition: {x: -10.815001, y: -6.94, z: -1.9019998}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 1
+ m_Children:
+ - {fileID: 1144860546}
+ - {fileID: 1880742077}
+ m_Father: {fileID: 1276291775}
+ m_LocalEulerAnglesHint: {x: 0, y: -110.717, z: 0}
+--- !u!114 &1472688266
+MonoBehaviour:
+ m_ObjectHideFlags: 2
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1472688264}
+ 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: 826894f4c0ed86448a7338f803c36cd7,
+ type: 2}
+ programSource: {fileID: 11400000, guid: edf37eae631c891429ee0f63b73162ce, type: 2}
+ serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
+ publicVariablesUnityEngineObjects: []
+ publicVariablesSerializationDataFormat: 0
+--- !u!114 &1472688267
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1472688264}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: abfe7bfee170dee4090708b5013ea14e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ serializationData:
+ SerializedFormat: 2
+ SerializedBytes:
+ ReferencedUnityObjects: []
+ SerializedBytesString:
+ Prefab: {fileID: 0}
+ PrefabModificationsReferencedUnityObjects: []
+ PrefabModifications: []
+ SerializationNodes: []
+ _udonSharpBackingUdonBehaviour: {fileID: 1472688266}
+ _Timer: {fileID: 1377320498}
+ _TimerMaterial: {fileID: 2100000, guid: 7b4f757c1cd157943ac2082269832a49, type: 2}
+ _MaxSeconds: 45
+ _CounterText: {fileID: 1534120849}
--- !u!1 &1472851365 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6756654082349777749, guid: be33bc7f6c414e6409becfa348b9310d,
@@ -60612,6 +61174,39 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 134225857}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1498879994
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1498879995}
+ m_Layer: 0
+ m_Name: Timer Overlay
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1498879995
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1498879994}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: -4.82, y: 1.888, z: 5.69}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 2128345790}
+ - {fileID: 1241344965}
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1 &1499408564 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2046462932149409572, guid: 126991d511ca61841a0ef899b6c038a6,
@@ -64380,7 +64975,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1983062414}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &1519421598 stripped
@@ -65185,6 +65784,141 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 134225857}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1534120847
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1534120848}
+ - component: {fileID: 1534120850}
+ - component: {fileID: 1534120849}
+ m_Layer: 0
+ m_Name: Count
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1534120848
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1534120847}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0.1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2053100623}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1534120849
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1534120847}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: 0
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2}
+ m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9,
+ type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 440
+ m_fontSizeBase: 440
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1534120850
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1534120847}
+ m_CullTransparentMesh: 1
--- !u!1 &1534227776 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3764671091980473729, guid: be33bc7f6c414e6409becfa348b9310d,
@@ -69527,6 +70261,12 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1042026143}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &1561088478 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ m_PrefabInstance: {fileID: 1914584491}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1561169167 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4391151498557473743, guid: 126991d511ca61841a0ef899b6c038a6,
@@ -69651,11 +70391,6 @@ PrefabInstance:
propertyPath: m_Name
value: Player 1 Camera Anchor
objectReference: {fileID: 0}
- - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
propertyPath: m_LocalPosition.x
@@ -76192,6 +76927,12 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 134225857}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &1755966544 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ m_PrefabInstance: {fileID: 1519421597}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1755987941 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6182363686866075181, guid: be33bc7f6c414e6409becfa348b9310d,
@@ -77458,6 +78199,12 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
+--- !u!4 &1792866062 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ m_PrefabInstance: {fileID: 1858619630}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1798321063 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3838454230324214191, guid: e9914385266bca24db809c39e395f03c,
@@ -77923,7 +78670,7 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ - targetCorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
type: 3}
insertIndex: -1
addedObject: {fileID: 70805495}
@@ -78166,7 +78913,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 739684420}
+ m_TransformParent: {fileID: 1792866062}
m_Modifications:
- target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -78192,7 +78939,7 @@ PrefabInstance:
type: 3}
propertyPath: volumeTrigger
value:
- objectReference: {fileID: 1832440712}
+ objectReference: {fileID: 1390751085}
- target: {fileID: 2014676780200193698, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_Enabled
@@ -78247,7 +78994,7 @@ PrefabInstance:
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: field of view
- value: 10
+ value: 8.5
objectReference: {fileID: 0}
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -78259,6 +79006,11 @@ PrefabInstance:
propertyPath: m_TargetTexture
value:
objectReference: {fileID: 8400000, guid: bee0ce1012cf16c4eb256607d3ed6761, type: 2}
+ - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
+ type: 3}
+ propertyPath: near clip plane
+ value: 0.3
+ objectReference: {fileID: 0}
- target: {fileID: 6426376458612370810, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: _syncMethod
@@ -78295,31 +79047,6 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -78328,7 +79055,7 @@ PrefabInstance:
- target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -17.458
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -79481,7 +80208,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1832440712}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &1858619631 stripped
@@ -80257,6 +80988,98 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1499591484}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1880742076
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1880742077}
+ - component: {fileID: 1880742079}
+ - component: {fileID: 1880742078}
+ m_Layer: 0
+ m_Name: Timer Camera
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1880742077
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1880742076}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0.624}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1472688265}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!81 &1880742078
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1880742076}
+ m_Enabled: 1
+--- !u!20 &1880742079
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1880742076}
+ 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: 1
+ field of view: 60
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 264241151
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 8600000, guid: 59013d5ff390016428ea7feb21b9ac16, 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 &1881327616 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7735891243018796990, guid: 126991d511ca61841a0ef899b6c038a6,
@@ -80870,7 +81693,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 6802575006468162178, guid: b7be9e74a7f7fe24cb526bc367e85829,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 336011330}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &1914584492 stripped
@@ -81204,11 +82031,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
- type: 3}
- insertIndex: -1
- addedObject: {fileID: 1983062414}
+ m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
--- !u!4 &1922829038 stripped
@@ -84328,7 +85151,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 1922829038}
+ m_TransformParent: {fileID: 1755966544}
m_Modifications:
- target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -84354,7 +85177,7 @@ PrefabInstance:
type: 3}
propertyPath: volumeTrigger
value:
- objectReference: {fileID: 1983062414}
+ objectReference: {fileID: 1390751085}
- target: {fileID: 2014676780200193698, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: m_Enabled
@@ -84409,12 +85232,12 @@ PrefabInstance:
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: field of view
- value: 30
+ value: 15
objectReference: {fileID: 0}
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
propertyPath: far clip plane
- value: 10
+ value: 20
objectReference: {fileID: 0}
- target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244,
type: 3}
@@ -87442,6 +88265,82 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1499591484}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2053100622
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2053100623}
+ - component: {fileID: 2053100625}
+ - component: {fileID: 2053100624}
+ m_Layer: 0
+ m_Name: Counter
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2053100623
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2053100622}
+ 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:
+ - {fileID: 1534120848}
+ m_Father: {fileID: 1144860546}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 360, y: 0}
+ m_SizeDelta: {x: 720, y: 720}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2053100624
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2053100622}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 2100000, guid: 27d6a54c1c648aa4cb8c7d4fa8a98281, type: 2}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &2053100625
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2053100622}
+ m_CullTransparentMesh: 1
--- !u!1001 &2053568536
PrefabInstance:
m_ObjectHideFlags: 0
@@ -89336,6 +90235,113 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1534889732}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2128345789
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2128345790}
+ - component: {fileID: 2128345793}
+ - component: {fileID: 2128345792}
+ - component: {fileID: 2128345791}
+ m_Layer: 0
+ m_Name: Counter
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2128345790
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2128345789}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0.552, y: -0.228, z: 0}
+ m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
+ m_ConstrainProportionsScale: 1
+ m_Children:
+ - {fileID: 525518443}
+ m_Father: {fileID: 1498879995}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!64 &2128345791
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2128345789}
+ 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!23 &2128345792
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2128345789}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 7972f00661b47a448a7252e73486dd75, 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 &2128345793
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2128345789}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &2128415471
PrefabInstance:
m_ObjectHideFlags: 0
@@ -95594,6 +96600,11 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 107399073}
m_Modifications:
+ - target: {fileID: 995327048070551574, guid: f02831e826ef4484899eeac5b18c77ef,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 2027989583406737971, guid: f02831e826ef4484899eeac5b18c77ef,
type: 3}
propertyPath: _AudioManager
@@ -104084,6 +105095,10 @@ MonoBehaviour:
ID: 1311
SerializedTypeNames:
- VRC.Udon.UdonBehaviour
+ - gameObject: {fileID: 1472688264}
+ ID: 1312
+ SerializedTypeNames:
+ - VRC.Udon.UdonBehaviour
portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
PlayerPersistence: []
@@ -104808,3 +105823,4 @@ SceneRoots:
- {fileID: 1027471609}
- {fileID: 1276291775}
- {fileID: 1855771788}
+ - {fileID: 1498879995}
diff --git a/Assets/Shaders/Map Marker Lamp.shader b/Assets/Shaders/Map Marker Lamp.shader
index 71bbf8c..39e94d6 100644
--- a/Assets/Shaders/Map Marker Lamp.shader
+++ b/Assets/Shaders/Map Marker Lamp.shader
@@ -1,4 +1,4 @@
-Shader "Carmen/Map/Marker Lamp"
+Shader "Carmen/Marker Lamp"
{
Properties
{
diff --git a/Assets/Shaders/RenderTextureUI.shader b/Assets/Shaders/RenderTextureUI.shader
new file mode 100644
index 0000000..da0a265
--- /dev/null
+++ b/Assets/Shaders/RenderTextureUI.shader
@@ -0,0 +1,71 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt)
+
+// Simplified Diffuse shader. Differences from regular Diffuse one:
+// - no Main Color
+// - fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH.
+
+
+Shader "Carmen/Render Texture UI"
+{
+ Properties
+ {
+ _MainTex ("Logo Image", 2D) = "white" {}
+ _Color ("Colour", Color) = (1.0, 1.0, 1.0, 1.0)
+ }
+ SubShader
+ {
+ Tags { "Queue"="Overlay" "RenderType"="Transparent" "CanUseSpriteAtlas"="True" }
+ LOD 200
+
+ Pass {
+ Cull Back
+ Lighting Off
+ Blend SrcAlpha OneMinusSrcAlpha
+ ZWrite Off
+ ZTest Always
+
+ CGPROGRAM
+ #include "UnityCG.cginc"
+ #pragma target 4.5
+ #pragma vertex vert
+ #pragma fragment frag
+
+ UNITY_DECLARE_TEX2D(_MainTex);
+ float4 _MainTex_ST;
+ half4 _Color;
+ half4 _Skew;
+
+ struct Data
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct V2F
+ {
+ float4 position : SV_POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ V2F vert(Data v)
+ {
+ V2F o;
+ o.position = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ return o;
+ }
+
+ fixed4 frag(V2F i) : SV_TARGET
+ {
+ return UNITY_SAMPLE_TEX2D(_MainTex, i.uv) * _Color;
+ }
+ ENDCG
+ }
+ }
+ FallBack "Diffuse"
+}
+
diff --git a/Assets/Shaders/RenderTextureUI.shader.meta b/Assets/Shaders/RenderTextureUI.shader.meta
new file mode 100644
index 0000000..d731b49
--- /dev/null
+++ b/Assets/Shaders/RenderTextureUI.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bdbecd808900b3a49963019f31a76291
+ShaderImporter:
+ externalObjects: {}
+ defaultTextures: []
+ nonModifiableTextures: []
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Shaders/SDF Timer.shader b/Assets/Shaders/SDF Timer.shader
new file mode 100644
index 0000000..fe8c7b6
--- /dev/null
+++ b/Assets/Shaders/SDF Timer.shader
@@ -0,0 +1,100 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt)
+
+// Simplified Diffuse shader. Differences from regular Diffuse one:
+// - no Main Color
+// - fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH.
+
+
+Shader "Carmen/SDF/Timer"
+{
+ Properties
+ {
+ _Tint ("Tint", Color) = (1.0, 1.0, 1.0, 1.0)
+
+ _Crosshairs ("Crosshairs", 2D) = "white" {}
+ _CrosshairsThickness ("Thickness", Range(0.0, 1.0)) = 0.5
+
+ _WiperProgress ("Wiper Progress", Range(0.0, 1.0)) = 1.0
+ }
+ SubShader
+ {
+ Tags { "Queue"="Transparent" "RenderType"="Transparent" "CanUseSpriteAtlas"="True" "ForceNoShadowCasting"="True" }
+ LOD 200
+
+ Pass {
+ Cull Back
+ Lighting Off
+ Blend SrcAlpha OneMinusSrcAlpha
+
+ CGPROGRAM
+ #include "UnityCG.cginc"
+ #pragma target 4.5
+ #pragma vertex vert
+ #pragma fragment frag
+
+ half4 _Tint;
+
+ UNITY_DECLARE_TEX2D(_Crosshairs);
+ half4 _Crosshairs_ST;
+ half _CrosshairsThickness;
+ half _WiperProgress;
+
+ struct Data
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct V2F
+ {
+ float4 position : SV_POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ V2F vert(Data v)
+ {
+ V2F o;
+
+ o.position = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _Crosshairs);
+
+ return o;
+ }
+
+ fixed4 frag(V2F i) : SV_TARGET
+ {
+ half crosshairs_sample = UNITY_SAMPLE_TEX2D(_Crosshairs, i.uv).r;
+ half crosshairs_halfchange = (abs(ddx(crosshairs_sample)) + abs(ddy(crosshairs_sample))) / 2.0;
+ half crosshairs_loweredge = 0.5 - crosshairs_halfchange;
+ half crosshairs_upperedge = 0.5 + crosshairs_halfchange;
+ half crosshairs = saturate((crosshairs_sample - crosshairs_loweredge) / (crosshairs_upperedge - crosshairs_loweredge));
+
+ half wiper_circlemask_sample = distance(float2(0.5, 0.5), i.uv) * 1.9;
+ half wiper_circlemask_halfchange = (abs(ddx(wiper_circlemask_sample)) + abs(ddy(wiper_circlemask_sample))) / 2.0;
+ half wiper_circlemask_loweredge = 0.5 - wiper_circlemask_halfchange;
+ half wiper_circlemask_upperedge = 0.5 + wiper_circlemask_halfchange;
+ half wiper_circlemask = 1.0 - saturate((wiper_circlemask_sample - wiper_circlemask_loweredge) / (wiper_circlemask_upperedge - wiper_circlemask_loweredge));
+
+ half2 wiper_quadrantmask_sample = ceil((i.uv) - half2(0.5, 0.5));
+ half wiper_quadrantmask = saturate(1.0 - ceil(wiper_quadrantmask_sample.g - (wiper_quadrantmask_sample.r + wiper_quadrantmask_sample.g / 2.0)));
+
+ half2 uvcentre = i.uv - 0.5;
+ half pixelsize = ((1.0 / _ScreenParams.x) + (1.0 / _ScreenParams.y)) / 2.0;
+ half wiper = smoothstep(_WiperProgress - pixelsize, _WiperProgress + pixelsize, ((atan2(uvcentre.y, uvcentre.x) / 3.141592) + 1.0) / 1.5075);
+
+ wiper = wiper * wiper_quadrantmask * wiper_circlemask;
+
+ return fixed4(_Tint.r, _Tint.g, _Tint.b, saturate(crosshairs + wiper) * _Tint.a);
+ }
+ ENDCG
+ }
+ }
+ FallBack "Diffuse"
+}
+
diff --git a/Assets/Shaders/SDF Timer.shader.meta b/Assets/Shaders/SDF Timer.shader.meta
new file mode 100644
index 0000000..84f354c
--- /dev/null
+++ b/Assets/Shaders/SDF Timer.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 792e8f5848e022e4baecdd1f69ada66a
+ShaderImporter:
+ externalObjects: {}
+ defaultTextures: []
+ nonModifiableTextures: []
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Textures/RT_TimerDisplay.asset b/Assets/Textures/RT_TimerDisplay.asset
new file mode 100644
index 0000000..81d1576
--- /dev/null
+++ b/Assets/Textures/RT_TimerDisplay.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_TimerDisplay
+ m_ImageContentsHash:
+ serializedVersion: 2
+ Hash: 00000000000000000000000000000000
+ m_ForcedFallbackFormat: 4
+ m_DownscaleFallback: 0
+ m_IsAlphaChannelOptional: 0
+ serializedVersion: 5
+ m_Width: 960
+ m_Height: 480
+ 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_TimerDisplay.asset.meta b/Assets/Textures/RT_TimerDisplay.asset.meta
new file mode 100644
index 0000000..920d2b2
--- /dev/null
+++ b/Assets/Textures/RT_TimerDisplay.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 59013d5ff390016428ea7feb21b9ac16
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 8600000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Textures/Timer.meta b/Assets/Textures/Timer.meta
new file mode 100644
index 0000000..c47fc31
--- /dev/null
+++ b/Assets/Textures/Timer.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a3acc648be45d7a44b2a3a8ccb0506c8
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Textures/Timer/T_TimerCrosshairs_SDF.png b/Assets/Textures/Timer/T_TimerCrosshairs_SDF.png
new file mode 100644
index 0000000..b564e52
Binary files /dev/null and b/Assets/Textures/Timer/T_TimerCrosshairs_SDF.png differ
diff --git a/Assets/Textures/Timer/T_TimerCrosshairs_SDF.png.meta b/Assets/Textures/Timer/T_TimerCrosshairs_SDF.png.meta
new file mode 100644
index 0000000..d33a846
--- /dev/null
+++ b/Assets/Textures/Timer/T_TimerCrosshairs_SDF.png.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 33ead63c507cff444a04b98db066e683
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 1
+ enableMipMap: 1
+ sRGBTexture: 0
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 10
+ textureShape: 1
+ singleChannelComponent: 1
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 256
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 3
+ compressionQuality: 30
+ crunchedCompression: 1
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 256
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 0
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 256
+ resizeAlgorithm: 0
+ textureFormat: 50
+ textureCompression: 1
+ compressionQuality: 0
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UdonSharp/CaptureCarmenNewspaper.asset b/Assets/UdonSharp/CaptureCarmenNewspaper.asset
index 666c1bd..d245e44 100644
--- a/Assets/UdonSharp/CaptureCarmenNewspaper.asset
+++ b/Assets/UdonSharp/CaptureCarmenNewspaper.asset
@@ -224,16 +224,76 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _AudioManager
+ Data: _Animator
- Name: $v
Entry: 7
Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _AudioManager
+ Data: _Animator
- Name: k__BackingField
Entry: 7
Data: 14|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: UnityEngine.Animator, UnityEngine.AnimationModule
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 9
+ Data: 14
+ - 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: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 16|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: _AudioManager
+ - Name: $v
+ Entry: 7
+ Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _AudioManager
+ - Name: k__BackingField
+ Entry: 7
+ Data: 18|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: AudioManager, Assembly-CSharp
@@ -242,7 +302,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 7
- Data: 15|System.RuntimeType, mscorlib
+ Data: 19|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: VRC.Udon.UdonBehaviour, VRC.Udon
@@ -263,13 +323,13 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
- Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule
+ Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -293,13 +353,13 @@ MonoBehaviour:
Data: _PlayAnimation
- Name: $v
Entry: 7
- Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _PlayAnimation
- Name: k__BackingField
Entry: 7
- Data: 19|System.RuntimeType, mscorlib
+ Data: 23|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: NewspaperAnimation, Assembly-CSharp
@@ -308,7 +368,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 7
- Data: 20|System.RuntimeType, mscorlib
+ Data: 24|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Int32, mscorlib
@@ -329,19 +389,19 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
- Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ Data: 26|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
- Name:
Entry: 7
- Data: 23|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+ Data: 27|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -365,13 +425,13 @@ MonoBehaviour:
Data: _WinningPlayer
- Name: $v
Entry: 7
- Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _WinningPlayer
- Name: k__BackingField
Entry: 7
- Data: 25|System.RuntimeType, mscorlib
+ Data: 29|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.String, mscorlib
@@ -380,7 +440,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 25
+ Data: 29
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -395,19 +455,19 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
- Data: 27|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ Data: 31|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
- Name:
Entry: 7
- Data: 28|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+ Data: 32|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -423,60 +483,6 @@ MonoBehaviour:
- 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
- - Name:
- Entry: 8
- Data:
- - Name: k__BackingField
- Entry: 9
- Data: 30
- - 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: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- - Name:
- Entry: 12
- Data: 0
- - Name:
- Entry: 13
- Data:
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 8
- Data:
- Name:
Entry: 13
Data:
diff --git a/Assets/UdonSharp/CaptureCarmenNewspaper.cs b/Assets/UdonSharp/CaptureCarmenNewspaper.cs
index 4d36b3f..99221ea 100644
--- a/Assets/UdonSharp/CaptureCarmenNewspaper.cs
+++ b/Assets/UdonSharp/CaptureCarmenNewspaper.cs
@@ -20,20 +20,13 @@ public class CaptureCarmenNewspaper : UdonSharpBehaviour
[SerializeField] private TextMeshProUGUI _Date;
[SerializeField] private TextMeshProUGUI _Headline;
[SerializeField] private MeshRenderer _CarmenPortrait;
+ [SerializeField] private Animator _Animator;
[SerializeField] private AudioManager _AudioManager;
[UdonSynced, FieldChangeCallback(nameof(PlayAnimation))] private NewspaperAnimation _PlayAnimation;
[UdonSynced, FieldChangeCallback(nameof(WinningPlayer))] private string _WinningPlayer;
- private Animator _Animator;
-
-
- public void Start()
- {
- _Animator = GetComponent();
- }
-
public void PlayWinAnimation(string Winner)
{
diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset
index dcdc789..bfcf212 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: 23
+ Data: 24
- Name:
Entry: 7
Data:
@@ -788,19 +788,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _EndingPlayer
+ Data: _TimerPublicDisplay
- Name: $v
Entry: 7
Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _EndingPlayer
+ Data: _TimerPublicDisplay
- Name: k__BackingField
Entry: 7
Data: 53|System.RuntimeType, mscorlib
- Name:
Entry: 1
- Data: RandomVideoPlayer, Assembly-CSharp
+ Data: TimerDisplay, Assembly-CSharp
- Name:
Entry: 8
Data:
@@ -848,58 +848,46 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _CurrentlyActiveMap
+ Data: _EndingPlayer
- Name: $v
Entry: 7
Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _CurrentlyActiveMap
+ Data: _EndingPlayer
- Name: k__BackingField
Entry: 7
Data: 57|System.RuntimeType, mscorlib
- Name:
Entry: 1
- Data: ContinentMap, Assembly-CSharp
+ Data: RandomVideoPlayer, Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: k__BackingField
- Entry: 7
- Data: 58|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: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
- Data: 2
+ Data: 1
- Name:
Entry: 7
- Data: 60|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 7
- Data: 61|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+ Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -920,19 +908,31 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _ActiveMarker
+ Data: _CurrentlyActiveMap
- Name: $v
Entry: 7
- Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _ActiveMarker
+ Data: _CurrentlyActiveMap
- Name: k__BackingField
- Entry: 9
- Data: 58
+ Entry: 7
+ Data: 61|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: ContinentMap, Assembly-CSharp
+ - Name:
+ Entry: 8
+ Data:
- Name: k__BackingField
- Entry: 9
- Data: 58
+ Entry: 7
+ Data: 62|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
@@ -980,19 +980,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _StageIndex
+ Data: _ActiveMarker
- Name: $v
Entry: 7
Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _StageIndex
+ Data: _ActiveMarker
- Name: k__BackingField
Entry: 9
- Data: 58
+ Data: 62
- Name: k__BackingField
Entry: 9
- Data: 58
+ Data: 62
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1010,13 +1010,73 @@ MonoBehaviour:
Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
- Data: 1
+ Data: 2
- Name:
Entry: 7
Data: 68|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
+ - Name:
+ Entry: 7
+ Data: 69|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: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _StageIndex
+ - Name: k__BackingField
+ Entry: 9
+ Data: 62
+ - Name: k__BackingField
+ Entry: 9
+ Data: 62
+ - Name: k__BackingField
+ Entry: 7
+ Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+ - Name:
+ Entry: 3
+ Data: 1
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 5
+ Data: false
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ - Name:
+ Entry: 8
+ Data:
- Name:
Entry: 13
Data:
@@ -1037,13 +1097,13 @@ MonoBehaviour:
Data: _ContinentData
- Name: $v
Entry: 7
- Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _ContinentData
- Name: k__BackingField
Entry: 7
- Data: 70|System.RuntimeType, mscorlib
+ Data: 74|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
@@ -1052,7 +1112,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 70
+ Data: 74
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1067,7 +1127,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
@@ -1091,13 +1151,13 @@ MonoBehaviour:
Data: _GameStatus
- Name: $v
Entry: 7
- Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _GameStatus
- Name: k__BackingField
Entry: 7
- Data: 73|System.RuntimeType, mscorlib
+ Data: 77|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: GameStatus, Assembly-CSharp
@@ -1106,7 +1166,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 58
+ Data: 62
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1121,13 +1181,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -1151,7 +1211,7 @@ MonoBehaviour:
Data: _RunTimer
- Name: $v
Entry: 7
- Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _RunTimer
@@ -1175,13 +1235,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -1205,16 +1265,16 @@ MonoBehaviour:
Data: _Timer
- Name: $v
Entry: 7
- Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _Timer
- Name: k__BackingField
Entry: 9
- Data: 58
+ Data: 62
- Name: k__BackingField
Entry: 9
- Data: 58
+ Data: 62
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1229,13 +1289,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ Data: 85|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -1257,78 +1317,18 @@ MonoBehaviour:
- Name: $k
Entry: 1
Data: _SuccessCounter
- - Name: $v
- Entry: 7
- Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- - Name: k__BackingField
- Entry: 1
- Data: _SuccessCounter
- - 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: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- - Name:
- Entry: 12
- Data: 2
- - Name:
- Entry: 7
- Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 7
- Data: 85|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: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _FailureCounter
+ Data: _SuccessCounter
- Name: k__BackingField
Entry: 9
- Data: 58
+ Data: 62
- Name: k__BackingField
Entry: 9
- Data: 58
+ Data: 62
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1376,16 +1376,76 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _CameraControllerRound3
+ Data: _FailureCounter
- Name: $v
Entry: 7
Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _FailureCounter
+ - Name: k__BackingField
+ Entry: 9
+ Data: 62
+ - Name: k__BackingField
+ Entry: 9
+ Data: 62
+ - Name: k__BackingField
+ Entry: 7
+ Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+ - Name:
+ Entry: 3
+ Data: 1
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 5
+ Data: false
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 2
+ - Name:
+ Entry: 7
+ Data: 92|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data: 93|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: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _CameraControllerRound3
- Name: k__BackingField
Entry: 7
- Data: 91|System.RuntimeType, mscorlib
+ Data: 95|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CameraControllerRound3, Assembly-CSharp
@@ -1409,7 +1469,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs
index d1457d7..d08bd8d 100644
--- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs
+++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs
@@ -38,6 +38,7 @@ public class GameManagerRound3 : GameManagerBase
[SerializeField] private FloorMapMarker[] _Markers;
[SerializeField] private CaptureCarmenNewspaper _CaptureCarmenNewspaper;
[SerializeField] private NewspaperDisplay _NewspaperPublicDisplay;
+ [SerializeField] private TimerDisplay _TimerPublicDisplay;
[SerializeField] private RandomVideoPlayer _EndingPlayer;
[UdonSynced, FieldChangeCallback(nameof(CurrentlyActiveMap))] private ContinentMap _CurrentlyActiveMap = ContinentMap.INDEX_MAX;
@@ -90,6 +91,7 @@ public class GameManagerRound3 : GameManagerBase
_EndingPlayer.PlayVideo = false;
_CaptureCarmenNewspaper.ResetAnimation();
_NewspaperPublicDisplay.Activate(false);
+ _TimerPublicDisplay.Initialise();
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false);
@@ -232,6 +234,7 @@ public class GameManagerRound3 : GameManagerBase
if (!_RunTimer) return;
_Timer--;
+ _TimerPublicDisplay.SecondsElapsed(TIMER_LENGTH - _Timer);
if (_Timer < 0)
{
SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(GameIsOver), false, false);
@@ -250,6 +253,7 @@ public class GameManagerRound3 : GameManagerBase
{
FloorMapMarker CurrentMarker = GetCurrentMarker();
CurrentMarker.SendCustomNetworkEvent(NetworkEventTarget.Owner, "SetLit", true);
+ _TimerPublicDisplay.NewCorrectMarker();
PlayCorrectSound();
SuccessCounter++;
diff --git a/Assets/UdonSharp/Timer.meta b/Assets/UdonSharp/Timer.meta
new file mode 100644
index 0000000..e8de232
--- /dev/null
+++ b/Assets/UdonSharp/Timer.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b6096ff5c72e0ce49a5bb5505e761112
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UdonSharp/Timer/TimerDisplay.asset b/Assets/UdonSharp/Timer/TimerDisplay.asset
new file mode 100644
index 0000000..c824d76
--- /dev/null
+++ b/Assets/UdonSharp/Timer/TimerDisplay.asset
@@ -0,0 +1,389 @@
+%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: TimerDisplay
+ m_EditorClassIdentifier:
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 826894f4c0ed86448a7338f803c36cd7,
+ type: 2}
+ udonAssembly:
+ assemblyError:
+ sourceCsScript: {fileID: 11500000, guid: abfe7bfee170dee4090708b5013ea14e, type: 3}
+ scriptVersion: 2
+ compiledVersion: 2
+ behaviourSyncMode: 4
+ hasInteractEvent: 0
+ scriptID: 6875150117956857215
+ 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: 6
+ - Name:
+ Entry: 7
+ Data:
+ - Name: $k
+ Entry: 1
+ Data: _Timer
+ - Name: $v
+ Entry: 7
+ Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _Timer
+ - Name: k__BackingField
+ Entry: 7
+ Data: 3|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: UnityEngine.UI.RawImage, UnityEngine.UI
+ - 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: _TimerMaterial
+ - Name: $v
+ Entry: 7
+ Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _TimerMaterial
+ - Name: k__BackingField
+ Entry: 7
+ Data: 7|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: UnityEngine.Material, 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: _MaxSeconds
+ - Name: $v
+ Entry: 7
+ Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _MaxSeconds
+ - Name: k__BackingField
+ Entry: 7
+ Data: 11|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: System.Int32, 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: 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: _CounterText
+ - Name: $v
+ Entry: 7
+ Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _CounterText
+ - Name: k__BackingField
+ Entry: 7
+ Data: 15|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro
+ - 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: _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:
+ - Name: k__BackingField
+ Entry: 5
+ Data: false
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 0
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data:
+ - Name: $k
+ Entry: 1
+ Data: _CorrectMarkers
+ - Name: $v
+ Entry: 7
+ Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _CorrectMarkers
+ - 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:
+ - 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: 0
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
diff --git a/Assets/UdonSharp/Timer/TimerDisplay.asset.meta b/Assets/UdonSharp/Timer/TimerDisplay.asset.meta
new file mode 100644
index 0000000..08512d6
--- /dev/null
+++ b/Assets/UdonSharp/Timer/TimerDisplay.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: edf37eae631c891429ee0f63b73162ce
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UdonSharp/Timer/TimerDisplay.cs b/Assets/UdonSharp/Timer/TimerDisplay.cs
new file mode 100644
index 0000000..1b8aedb
--- /dev/null
+++ b/Assets/UdonSharp/Timer/TimerDisplay.cs
@@ -0,0 +1,57 @@
+
+using TMPro;
+using UdonSharp;
+using UnityEngine;
+using UnityEngine.UI;
+using VRC.Udon.Common;
+
+
+[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
+public class TimerDisplay : UdonSharpBehaviour
+{
+ [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;
+
+
+ public override void OnDeserialization(DeserializationResult Result)
+ {
+ _SyncedValues();
+ base.OnDeserialization(Result);
+ }
+
+
+ public void Initialise()
+ {
+ _ElapsedSeconds = 0;
+ _CorrectMarkers = 0;
+ _SyncedValues();
+ RequestSerialization();
+ }
+
+ public void SecondsElapsed(int ElapsedSeconds)
+ {
+ _ElapsedSeconds = ElapsedSeconds;
+ _SyncedValues();
+ RequestSerialization();
+ }
+
+ public void NewCorrectMarker()
+ {
+ _CorrectMarkers++;
+ _SyncedValues();
+ RequestSerialization();
+ }
+
+
+ private void _SyncedValues()
+ {
+ 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/Timer/TimerDisplay.cs.meta
new file mode 100644
index 0000000..8b930af
--- /dev/null
+++ b/Assets/UdonSharp/Timer/TimerDisplay.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: abfe7bfee170dee4090708b5013ea14e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
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
diff --git a/Raw Files/Timer Crosshairs.svg b/Raw Files/Timer Crosshairs.svg
new file mode 100644
index 0000000..fda4b5b
--- /dev/null
+++ b/Raw Files/Timer Crosshairs.svg
@@ -0,0 +1,38 @@
+
+
+
+
diff --git a/Raw Files/Timer Graphics.xcf b/Raw Files/Timer Graphics.xcf
new file mode 100644
index 0000000..e4dc64e
Binary files /dev/null and b/Raw Files/Timer Graphics.xcf differ