From bd1d8f51a2fac32f9fcfdffa9f58c4d6dd23ccc9 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Thu, 16 Sep 2021 02:00:54 +0300 Subject: [PATCH] Enable Raygun animator, re-serialize some assets --- .../DefaultLightingSettings.lighting | 12 +- .../UniversalRenderPipelineAsset.asset | 12 +- Assets/Items/Raygun.prefab | 55 ++- Assets/Scenes/Stardust/TestScene.unity | 465 +++++++++--------- Assets/Scripts/Players/Player.cs | 3 +- 5 files changed, 288 insertions(+), 259 deletions(-) diff --git a/Assets/Core/RenderPipeline/DefaultLightingSettings.lighting b/Assets/Core/RenderPipeline/DefaultLightingSettings.lighting index 8db8686..db1ef6b 100644 --- a/Assets/Core/RenderPipeline/DefaultLightingSettings.lighting +++ b/Assets/Core/RenderPipeline/DefaultLightingSettings.lighting @@ -7,7 +7,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: DefaultLightingSettings - serializedVersion: 2 + serializedVersion: 3 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -16,20 +16,20 @@ LightingSettings: m_AlbedoBoost: 1 m_IndirectOutputScale: 1 m_UsingShadowmask: 0 - m_BakeBackend: 2 + m_BakeBackend: 1 m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 m_TextureCompression: 1 - m_AO: 0 + m_AO: 1 m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 m_ExtractAO: 0 m_MixedBakeMode: 0 - m_LightmapsBakeMode: 1 + m_LightmapsBakeMode: 0 m_FilterMode: 1 - m_LightmapParameters: {fileID: 0} + m_LightmapParameters: {fileID: 15200, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_RealtimeResolution: 2 @@ -46,7 +46,7 @@ LightingSettings: m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 - m_PVRRussianRouletteStartBounce: 2 + m_PVRMinBounces: 1 m_PVREnvironmentMIS: 1 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 diff --git a/Assets/Core/RenderPipeline/UniversalRenderPipelineAsset.asset b/Assets/Core/RenderPipeline/UniversalRenderPipelineAsset.asset index f9a6b6b..5948b8f 100644 --- a/Assets/Core/RenderPipeline/UniversalRenderPipelineAsset.asset +++ b/Assets/Core/RenderPipeline/UniversalRenderPipelineAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRenderPipelineAsset m_EditorClassIdentifier: - k_AssetVersion: 5 - k_AssetPreviousVersion: 5 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -33,9 +33,13 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 0 m_AdditionalLightsShadowmapResolution: 512 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 m_ShadowDistance: 50 - m_ShadowCascades: 0 + m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 + m_Cascade3Split: {x: 0.1, y: 0.3} m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 @@ -47,9 +51,11 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 1 m_ColorGradingLutSize: 32 + m_UseFastSRGBLinearConversion: 0 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_ShaderVariantLogLevel: 0 + m_ShadowCascades: 0 diff --git a/Assets/Items/Raygun.prefab b/Assets/Items/Raygun.prefab index 57872ef..be578cd 100644 --- a/Assets/Items/Raygun.prefab +++ b/Assets/Items/Raygun.prefab @@ -276,6 +276,7 @@ MonoBehaviour: m_StopNaN: 0 m_Dithering: 0 m_ClearDepth: 1 + m_AllowXRRendering: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -381,7 +382,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6228136265624521654} - m_Enabled: 0 + m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 8468d9a1f10314a4c998349493611489, type: 2} m_CullingMode: 0 @@ -430,6 +431,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 264070833573311472} m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} + propertyPath: m_LocalScale.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} + propertyPath: m_LocalScale.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} + propertyPath: m_LocalScale.z + value: 50 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalPosition.x value: -0.00030055165 @@ -442,6 +459,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0.00051991054 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} + propertyPath: m_LocalRotation.w + value: 0.002171528 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalRotation.x value: 0.0021719388 @@ -454,14 +475,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.7071033 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} - propertyPath: m_LocalRotation.w - value: 0.002171528 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90 @@ -474,27 +487,15 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} - propertyPath: m_LocalScale.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} - propertyPath: m_LocalScale.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} - propertyPath: m_LocalScale.z - value: 50 - objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_Name value: Raygun objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} ---- !u!1 &2151691675794878267 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} +--- !u!23 &494450782322855662 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} m_PrefabInstance: {fileID: 1233196832275173994} m_PrefabAsset: {fileID: 0} --- !u!4 &1627919879214167425 stripped @@ -502,8 +503,8 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} m_PrefabInstance: {fileID: 1233196832275173994} m_PrefabAsset: {fileID: 0} ---- !u!23 &494450782322855662 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} +--- !u!1 &2151691675794878267 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} m_PrefabInstance: {fileID: 1233196832275173994} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Stardust/TestScene.unity b/Assets/Scenes/Stardust/TestScene.unity index 3df448d..c6a96b1 100644 --- a/Assets/Scenes/Stardust/TestScene.unity +++ b/Assets/Scenes/Stardust/TestScene.unity @@ -15,9 +15,9 @@ RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogColor: {r: 0.1981132, g: 0.1981132, b: 0.1981132, a: 1} m_FogMode: 3 - m_FogDensity: 0.01 + m_FogDensity: 0.06 m_LinearFogStart: 0 m_LinearFogEnd: 300 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} @@ -245,6 +245,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 1.36e-43, y: 2.06e-43, z: 0, w: 8.770593e+9} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!224 &187323709 stripped @@ -282,7 +283,7 @@ Transform: - {fileID: 1734890299} - {fileID: 529416814} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &267525579 stripped RectTransform: @@ -296,6 +297,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 21404627} m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} propertyPath: m_LocalPosition.x value: -0 @@ -308,6 +313,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} propertyPath: m_LocalRotation.x value: -0.7071068 @@ -320,14 +329,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071067 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -340,29 +341,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} - propertyPath: m_ScaleInLightmap - value: 0.2 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} propertyPath: m_DynamicOccludee value: 0 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} + propertyPath: m_ScaleInLightmap + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} propertyPath: m_Name value: Stardust objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} - propertyPath: m_StaticEditorFlags - value: 4294967295 + propertyPath: m_Layer + value: 8 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} - propertyPath: m_Layer - value: 8 + propertyPath: m_StaticEditorFlags + value: 4294967295 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b9b55215c46317428803b7adeda89c3, type: 3} @@ -475,6 +476,42 @@ PrefabInstance: propertyPath: Crosshair value: objectReference: {fileID: 629769914} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -487,6 +524,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -500,12 +541,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_AnchoredPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_RootOrder - value: 1 + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -519,46 +560,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8861545984823841015, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 118c1cf390ce96243b1b8b147ae99885, type: 3} --- !u!224 &360197057 stripped @@ -857,6 +858,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3508e-41, z: 0, w: 1.2884902e+11} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &583983921 @@ -949,6 +951,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 1.2903e-41, z: 0, w: 3.5165045e+10} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &589581210 @@ -1176,6 +1179,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.6675e-41, z: 0, w: 1.5784005e+11} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &665920419 @@ -1268,6 +1272,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 1.36e-43, y: 2.06e-43, z: 0, w: 8.770593e+9} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &678608090 @@ -1360,6 +1365,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3441e-41, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &710357828 @@ -1452,6 +1458,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 1.75e-41, z: 0, w: 2.4024973e+10} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &738586440 @@ -1495,6 +1502,42 @@ PrefabInstance: propertyPath: m_Name value: StatScreenRoot objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1507,6 +1550,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -1520,12 +1567,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_AnchoredPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_RootOrder - value: 3 + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1539,46 +1586,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2609531472936249903, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 9081539380605237274, guid: e32cf25e03a88b04d929cd6fbf906421, type: 3} propertyPath: m_IsActive value: 0 @@ -1746,6 +1753,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3452e-41, z: 0, w: 1.6750372e+11} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &875920202 @@ -1870,6 +1878,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 1.36e-43, y: 4.08e-43, z: 0, w: 1.6851206e+11} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1001 &962083752 @@ -1879,6 +1888,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1891,6 +1904,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -1903,14 +1920,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -2062,6 +2071,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 1.36e-43, y: 4.08e-43, z: 0, w: 1.5792642e+11} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1262176261 @@ -2197,6 +2207,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3491e-41, z: 0, w: 1.5784005e+11} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1280423820 @@ -2324,6 +2335,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.6305e-41, z: 0, w: 4.670777e+10} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1358596444 @@ -2356,7 +2368,7 @@ Transform: - {fileID: 332119782} - {fileID: 850875929} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1544796994 GameObject: @@ -2448,6 +2460,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3458e-41, z: 0, w: 1.6750372e+11} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1645654010 @@ -2538,6 +2551,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1734890298 Canvas: m_ObjectHideFlags: 0 @@ -2673,6 +2687,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 1.36e-43, y: 4.08e-43, z: 0, w: 2.8737454e+10} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1741704826 @@ -2783,6 +2798,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2880,6 +2896,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3008,6 +3025,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.6378e-41, z: 0, w: 1.1542725e+10} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &1931179856 @@ -3143,6 +3161,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3486e-41, z: 0, w: 1.5784005e+11} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2012327804 @@ -3235,6 +3254,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3676e-41, z: 0, w: 3.422552e+10} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2030709493 @@ -3327,6 +3347,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 1.1821e-41, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2038603409 @@ -3419,6 +3440,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3469e-41, z: 0, w: 1.6750372e+11} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1 &2052767391 @@ -3561,6 +3583,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 2.3676e-41, z: 0, w: 3.422552e+10} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!1001 &170678578529524716 @@ -3574,6 +3597,42 @@ PrefabInstance: propertyPath: m_Name value: TerminalRoot objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3586,6 +3645,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -3599,12 +3662,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_AnchoredPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_RootOrder - value: 2 + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3618,48 +3681,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 170678578394383911, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_Pivot.y - value: 0.5 + - target: {fileID: 170678579363757820, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: m_Color.a + value: 0.7294118 objectReference: {fileID: 0} - target: {fileID: 170678579363757820, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_Color.r + propertyPath: m_Color.b value: 0 objectReference: {fileID: 0} - target: {fileID: 170678579363757820, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} @@ -3667,13 +3694,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 170678579363757820, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_Color.b + propertyPath: m_Color.r value: 0 objectReference: {fileID: 0} - - target: {fileID: 170678579363757820, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: m_Color.a - value: 0.7294118 - objectReference: {fileID: 0} - target: {fileID: 1980657648274802554, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} propertyPath: m_sharedMaterial value: @@ -3682,14 +3705,14 @@ PrefabInstance: propertyPath: m_sharedMaterial value: objectReference: {fileID: 4067991147299334843, guid: c780c2251e690fb498319dc38127843c, type: 2} - - target: {fileID: 2654296452177192280, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - propertyPath: EventSystem - value: - objectReference: {fileID: 529416813} - target: {fileID: 2654296452177192280, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} propertyPath: Player value: objectReference: {fileID: 856348856} + - target: {fileID: 2654296452177192280, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} + propertyPath: EventSystem + value: + objectReference: {fileID: 529416813} - target: {fileID: 4807139487522286296, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} propertyPath: m_sharedMaterial value: @@ -3715,6 +3738,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1599217288880773178, guid: 1a03b85f19189674187c9966f5f557e3, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 1599217288880773178, guid: 1a03b85f19189674187c9966f5f557e3, type: 3} propertyPath: m_LocalPosition.x value: 28.784727 @@ -3727,6 +3754,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 121.21231 objectReference: {fileID: 0} + - target: {fileID: 1599217288880773178, guid: 1a03b85f19189674187c9966f5f557e3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1599217288880773178, guid: 1a03b85f19189674187c9966f5f557e3, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -3739,14 +3770,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1599217288880773178, guid: 1a03b85f19189674187c9966f5f557e3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1599217288880773178, guid: 1a03b85f19189674187c9966f5f557e3, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 1599217288880773178, guid: 1a03b85f19189674187c9966f5f557e3, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -3776,6 +3799,42 @@ PrefabInstance: propertyPath: m_Name value: NetDebug objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3788,6 +3847,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -3801,12 +3864,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_AnchoredPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_RootOrder - value: 4 + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3820,46 +3883,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2333684850843635561, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 2333684851214627332, guid: a58c5106b49e7e14a8c5f2e7f8410513, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/Scripts/Players/Player.cs b/Assets/Scripts/Players/Player.cs index 0270e23..6b4e483 100644 --- a/Assets/Scripts/Players/Player.cs +++ b/Assets/Scripts/Players/Player.cs @@ -119,10 +119,9 @@ namespace NeonTea.Quakeball.Players { /// Applies the sync packet, checking it for cheatiness if shouldApply is false. public bool ProcessSyncPacket(PlayerSyncPacket syncPckt, bool shouldApplyWithoutInspection = true) { - bool ShouldApply = shouldApplyWithoutInspection; + bool ShouldApply = true; if (!shouldApplyWithoutInspection) { // TODO: Gaze into the crystal ball to determine the nefariousness level of the packet and update ShouldApply accordingly. - ShouldApply = true; } if (ShouldApply) { Vector3 Delta = transform.position - syncPckt.Location;