diff --git a/Assets/Materials/Green.mat b/Assets/Materials/Green.mat
index d2198c2d..29d38ead 100644
--- a/Assets/Materials/Green.mat
+++ b/Assets/Materials/Green.mat
@@ -21,17 +21,17 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Green
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
+ m_ValidKeywords:
+ - _GLOSSYREFLECTIONS_OFF
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
@@ -115,6 +115,7 @@ Material:
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
+ - _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
@@ -125,6 +126,7 @@ Material:
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
+ - _UVSec: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZWrite: 1
diff --git a/Assets/Materials/Ground.mat b/Assets/Materials/Ground.mat
index ba377614..e2f88cc0 100644
--- a/Assets/Materials/Ground.mat
+++ b/Assets/Materials/Ground.mat
@@ -21,18 +21,18 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ground
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
+ - _GLOSSYREFLECTIONS_OFF
- _NORMALMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
@@ -116,6 +116,7 @@ Material:
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
+ - _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
@@ -126,6 +127,7 @@ Material:
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
+ - _UVSec: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZWrite: 1
diff --git a/Assets/Materials/Red.mat b/Assets/Materials/Red.mat
index 18009720..cc1a7e15 100644
--- a/Assets/Materials/Red.mat
+++ b/Assets/Materials/Red.mat
@@ -8,17 +8,17 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Red
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
+ m_ValidKeywords:
+ - _GLOSSYREFLECTIONS_OFF
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
- stringTagMap:
- RenderType: Opaque
+ stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
@@ -102,6 +102,7 @@ Material:
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
+ - _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
@@ -112,6 +113,7 @@ Material:
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
+ - _UVSec: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZWrite: 1
diff --git a/Assets/Materials/Separator.mat b/Assets/Materials/Separator.mat
index 7675a5c7..ff4648aa 100644
--- a/Assets/Materials/Separator.mat
+++ b/Assets/Materials/Separator.mat
@@ -8,19 +8,18 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Separator
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- - _ALPHAPREMULTIPLY_ON
+ - _GLOSSYREFLECTIONS_OFF
+ m_InvalidKeywords:
- _SURFACE_TYPE_TRANSPARENT
- m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 3000
- stringTagMap:
- RenderType: Transparent
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
@@ -99,13 +98,14 @@ Material:
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- - _DstBlend: 10
+ - _DstBlend: 0
- _DstBlendAlpha: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
+ - _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
@@ -116,9 +116,10 @@ Material:
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 1
+ - _UVSec: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- - _ZWrite: 0
+ - _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 0, b: 0, a: 0.5686275}
- _Color: {r: 1, g: 0, b: 0, a: 0.5686275}
diff --git a/Assets/Materials/Transparency.mat b/Assets/Materials/Transparency.mat
index 8d90c7ee..1cb6042e 100644
--- a/Assets/Materials/Transparency.mat
+++ b/Assets/Materials/Transparency.mat
@@ -8,19 +8,18 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Transparency
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- - _ALPHAPREMULTIPLY_ON
+ - _GLOSSYREFLECTIONS_OFF
+ m_InvalidKeywords:
- _SURFACE_TYPE_TRANSPARENT
- m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 3000
- stringTagMap:
- RenderType: Transparent
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
@@ -99,13 +98,14 @@ Material:
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- - _DstBlend: 10
+ - _DstBlend: 0
- _DstBlendAlpha: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
+ - _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
@@ -116,9 +116,10 @@ Material:
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 1
+ - _UVSec: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- - _ZWrite: 0
+ - _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.6462264, g: 1, b: 0.90943396, a: 1}
- _Color: {r: 0.6462264, g: 1, b: 0.90943396, a: 1}
diff --git a/Assets/Photon/Fusion/Editor/Fusion.Unity.Editor.asmdef b/Assets/Photon/Fusion/Editor/Fusion.Unity.Editor.asmdef
index 01a3b2cd..50e5558b 100644
--- a/Assets/Photon/Fusion/Editor/Fusion.Unity.Editor.asmdef
+++ b/Assets/Photon/Fusion/Editor/Fusion.Unity.Editor.asmdef
@@ -7,7 +7,8 @@
"GUID:1baf1ffff1031e948b3b228ab3453251",
"GUID:9e24947de15b9834991c9d8411ea37cf",
"GUID:69448af7b92c7f342b298e06a37122aa",
- "GUID:84651a3751eca9349aac36a66bba901b"
+ "GUID:84651a3751eca9349aac36a66bba901b",
+ "Unity.UI"
],
"includePlatforms": [
"Editor"
diff --git a/Assets/Photon/Fusion/Runtime/Fusion.Unity.asmdef b/Assets/Photon/Fusion/Runtime/Fusion.Unity.asmdef
index 74651ac1..b621cdb3 100644
--- a/Assets/Photon/Fusion/Runtime/Fusion.Unity.asmdef
+++ b/Assets/Photon/Fusion/Runtime/Fusion.Unity.asmdef
@@ -4,7 +4,8 @@
"references": [
"GUID:9e24947de15b9834991c9d8411ea37cf",
"GUID:84651a3751eca9349aac36a66bba901b",
- "GUID:2665a8d13d1b3f18800f46e256720795"
+ "GUID:2665a8d13d1b3f18800f46e256720795",
+ "Unity.UI"
],
"includePlatforms": [],
"excludePlatforms": [],
diff --git a/Assets/Photon/Fusion/Runtime/Statistics/.idea/.gitignore b/Assets/Photon/Fusion/Runtime/Statistics/.idea/.gitignore
new file mode 100644
index 00000000..bc1f60e9
--- /dev/null
+++ b/Assets/Photon/Fusion/Runtime/Statistics/.idea/.gitignore
@@ -0,0 +1,15 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/.idea.Statistics.iml
+/contentModel.xml
+/projectSettingsUpdater.xml
+/modules.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/Assets/Photon/Fusion/Runtime/Statistics/.idea/encodings.xml b/Assets/Photon/Fusion/Runtime/Statistics/.idea/encodings.xml
new file mode 100644
index 00000000..df87cf95
--- /dev/null
+++ b/Assets/Photon/Fusion/Runtime/Statistics/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Photon/Fusion/Runtime/Statistics/.idea/indexLayout.xml b/Assets/Photon/Fusion/Runtime/Statistics/.idea/indexLayout.xml
new file mode 100644
index 00000000..7b08163c
--- /dev/null
+++ b/Assets/Photon/Fusion/Runtime/Statistics/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Photon/Fusion/Runtime/Statistics/.idea/inspectionProfiles/Project_Default.xml b/Assets/Photon/Fusion/Runtime/Statistics/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..749afb51
--- /dev/null
+++ b/Assets/Photon/Fusion/Runtime/Statistics/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Photon/Fusion/Runtime/Statistics/.idea/vcs.xml b/Assets/Photon/Fusion/Runtime/Statistics/.idea/vcs.xml
new file mode 100644
index 00000000..bc599707
--- /dev/null
+++ b/Assets/Photon/Fusion/Runtime/Statistics/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics.meta b/Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics.meta
index 3d838761..730144e8 100644
--- a/Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics.meta
+++ b/Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 049b3685a0978b3458f7d3cb39e093a5
+guid: f00f776f1a5a52b4ba23e334684f1879
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/manifest.txt.meta b/Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/manifest.txt.meta
index 17c906a5..61a27c3a 100644
--- a/Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/manifest.txt.meta
+++ b/Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Mathematics/manifest.txt.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: d709a8c107bc33340b1dfbb0cdb4a9c8
+guid: 1257a8bc09cd4794e85fc95cebfccb2b
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/Assets/Scenes/Main Scene.unity b/Assets/Scenes/Main Scene.unity
index f4622278..073b6adf 100644
--- a/Assets/Scenes/Main Scene.unity
+++ b/Assets/Scenes/Main Scene.unity
@@ -183,8 +183,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b3d9934ebd60c9c4ea3e464b77fd7ae0, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::_PlayerDataManager
- _Players:
- _items: []
--- !u!1 &200732282
GameObject:
m_ObjectHideFlags: 0
@@ -295,23 +293,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
- m_UsePipelineSettings: 1
- m_AdditionalLightsShadowResolutionTier: 2
- m_CustomShadowLayers: 0
- m_LightCookieSize: {x: 1, y: 1}
- m_LightCookieOffset: {x: 0, y: 0}
- m_SoftShadowQuality: 0
- m_RenderingLayersMask:
- serializedVersion: 0
- m_Bits: 1
- m_ShadowRenderingLayersMask:
- serializedVersion: 0
- m_Bits: 1
- m_Version: 4
- m_LightLayerMask: 1
- m_ShadowLayerMask: 1
- m_RenderingLayers: 1
- m_ShadowRenderingLayers: 1
--- !u!1 &390662298
GameObject:
m_ObjectHideFlags: 0
@@ -500,11 +481,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.Volume
- m_IsGlobal: 1
- priority: 0
- blendDistance: 0
- weight: 1
- sharedProfile: {fileID: 11400000, guid: 66d4e46db74eed8459b64c8476ecb24a, type: 2}
--- !u!4 &1185172175
Transform:
m_ObjectHideFlags: 0
@@ -537,38 +513,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
- m_RenderShadows: 1
- m_RequiresDepthTextureOption: 2
- m_RequiresOpaqueTextureOption: 2
- m_CameraType: 0
- m_Cameras: []
- m_RendererIndex: -1
- m_VolumeLayerMask:
- serializedVersion: 2
- m_Bits: 1
- m_VolumeTrigger: {fileID: 0}
- m_VolumeFrameworkUpdateModeOption: 2
- m_RenderPostProcessing: 0
- m_Antialiasing: 0
- m_AntialiasingQuality: 2
- m_StopNaN: 0
- m_Dithering: 0
- m_ClearDepth: 1
- m_AllowXRRendering: 1
- m_AllowHDROutput: 1
- m_UseScreenCoordOverride: 0
- m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
- m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
- m_RequiresDepthTexture: 0
- m_RequiresColorTexture: 0
- m_TaaSettings:
- m_Quality: 3
- m_FrameInfluence: 0.1
- m_JitterScale: 1
- m_MipBias: 0
- m_VarianceClampScale: 0.9
- m_ContrastAdaptiveSharpening: 0
- m_Version: 2
--- !u!1 &1313417866
GameObject:
m_ObjectHideFlags: 0
@@ -620,38 +564,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
- m_RenderShadows: 1
- m_RequiresDepthTextureOption: 2
- m_RequiresOpaqueTextureOption: 2
- m_CameraType: 0
- m_Cameras: []
- m_RendererIndex: -1
- m_VolumeLayerMask:
- serializedVersion: 2
- m_Bits: 1
- m_VolumeTrigger: {fileID: 0}
- m_VolumeFrameworkUpdateModeOption: 2
- m_RenderPostProcessing: 0
- m_Antialiasing: 0
- m_AntialiasingQuality: 2
- m_StopNaN: 0
- m_Dithering: 0
- m_ClearDepth: 1
- m_AllowXRRendering: 1
- m_AllowHDROutput: 1
- m_UseScreenCoordOverride: 0
- m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
- m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
- m_RequiresDepthTexture: 0
- m_RequiresColorTexture: 0
- m_TaaSettings:
- m_Quality: 3
- m_FrameInfluence: 0.1
- m_JitterScale: 1
- m_MipBias: 0
- m_VarianceClampScale: 0.9
- m_ContrastAdaptiveSharpening: 0
- m_Version: 2
--- !u!1 &1368410212
GameObject:
m_ObjectHideFlags: 0