diff --git a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs index 618d21e7b9d..70bbf164dc4 100644 --- a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs +++ b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs @@ -92,7 +92,7 @@ static void CreateAsset(string name, Action callback = null, string exte assetCreationCallback.extension = extension; var icon = AssetPreview.GetMiniTypeThumbnail(type); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, assetCreationCallback, name, icon, null, false); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, assetCreationCallback, name, icon, null, false); } class AssetCreationCallback : ProjectWindowCallback.AssetCreationEndAction diff --git a/Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs b/Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs index c11ff6e1809..3f675d9c7c2 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs @@ -34,7 +34,7 @@ public class CoreBuildData : IDisposable /// public List renderPipelineAssets { get; private set; } = new(); - internal Dictionary computeShaderCache { get; private set; } = new(); + internal Dictionary computeShaderCache { get; private set; } = new(); internal bool pipelineSupportGPUResidentDrawer { get; private set; } = false; internal bool playerNeedGPUResidentDrawer { get; private set; } = false; @@ -80,8 +80,10 @@ private void CheckGPUResidentDrawerUsage() if (!playerNeedGPUResidentDrawer) return; + #pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage GraphicsSettings.GetRenderPipelineSettings() .ForEachFieldOfType(computeShader => computeShaderCache.Add(computeShader.GetEntityId(), computeShader)); + #pragma warning restore 618 } /// diff --git a/Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/ShaderStrippers/SRPDisabledComputeShaderVariantStripper.cs b/Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/ShaderStrippers/SRPDisabledComputeShaderVariantStripper.cs index 49bdc1aa997..d4e71d90c1a 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/ShaderStrippers/SRPDisabledComputeShaderVariantStripper.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/ShaderStrippers/SRPDisabledComputeShaderVariantStripper.cs @@ -7,7 +7,9 @@ class SRPDisabledComputeShaderVariantStripper : IComputeShaderVariantStripper { public bool active => !CoreBuildData.instance.buildingPlayerForRenderPipeline; +#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage public bool CanRemoveVariant([DisallowNull] ComputeShader shader, string _, ShaderCompilerData __) => CoreBuildData.instance.computeShaderCache.ContainsKey(shader.GetEntityId()); +#pragma warning restore 618 } } \ No newline at end of file diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs index 954dc148af1..78fe73ff26c 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs @@ -104,7 +104,7 @@ public override void Initialize(ProbeVolumeBakingSet bakingSet, NativeArray perSubMeshOpaqueness = stackalloc bool[subMeshCount]; perSubMeshOpaqueness.Fill(true); - accelStruct.AddInstance(renderer.component.GetEntityId(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1); + accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1); } foreach (var terrain in contributors.terrains) { uint mask = GetInstanceMask(terrain.component.shadowCastingMode); uint materialID = terrain.component.renderingLayerMask; // repurpose the material id as we don't need it here - accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1); + accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1); } return accelStruct; diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs index 37eb01539a1..a1a3439789e 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs @@ -223,13 +223,13 @@ static AccelStructAdapter BuildAccelerationStructure() Span perSubMeshOpaqueness = stackalloc bool[subMeshCount]; perSubMeshOpaqueness.Fill(true); - accelStruct.AddInstance((int)renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1); + accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1); } foreach (var terrain in contributors.terrains) { uint mask = GetInstanceMask(terrain.component.shadowCastingMode); - accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1); + accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1); } return accelStruct; diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs index 6c86eddc9c3..1f306686115 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs @@ -149,7 +149,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask) Span perSubMeshOpaqueness = stackalloc bool[subMeshCount]; perSubMeshOpaqueness.Fill(true); - accelStruct.AddInstance(renderer.component.GetEntityId(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1); + accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1); } foreach (var terrain in contributors.terrains) @@ -157,8 +157,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask) int layerMask = 1 << terrain.component.gameObject.layer; if ((layerMask & mask) == 0) continue; - - accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1); + accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1); } return accelStruct; diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs index a6621e271af..c4de5688616 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs @@ -1643,13 +1643,15 @@ public static bool BakeAsync() /// Request additional bake request manager to recompute baked data for an array of requests /// /// Array of instance IDs of the probes doing the request. - public static void BakeAdditionalRequests(int[] probeInstanceIDs) + public static void BakeAdditionalRequests(EntityId[] probeInstanceIDs) { - List validProbeInstanceIDs = new List(); + List validProbeInstanceIDs = new List(); List positions = new List(); foreach (var probeInstanceID in probeInstanceIDs) { +#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage if (AdditionalGIBakeRequestsManager.GetPositionForRequest(probeInstanceID, out var position)) +#pragma warning restore 618 { validProbeInstanceIDs.Add(probeInstanceID); positions.Add(position); @@ -1667,21 +1669,47 @@ public static void BakeAdditionalRequests(int[] probeInstanceIDs) for (int probeIndex = 0; probeIndex < numValidProbes; ++probeIndex) { +#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage AdditionalGIBakeRequestsManager.SetSHCoefficients(validProbeInstanceIDs[probeIndex], sh[probeIndex], validity[probeIndex]); +#pragma warning restore 618 } } } + /// + /// Request additional bake request manager to recompute baked data for a given request + /// + /// The instance ID of the probe doing the request. + public static void BakeAdditionalRequest(EntityId probeEntityId) + { + EntityId[] probeEntityIds = new EntityId[1]; + probeEntityIds[0] = probeEntityId; + + BakeAdditionalRequests(probeEntityIds); + } + + // Obsolete wrapper methods for backward compatibility + /// + /// Request additional bake request manager to recompute baked data for an array of requests + /// + /// Array of instance IDs of the probes doing the request. + [System.Obsolete("Use BakeAdditionalRequests(EntityId[]) instead. This method will be removed in a future version.")] + public static void BakeAdditionalRequests(int[] probeInstanceIDs) + { + var entityIds = new EntityId[probeInstanceIDs.Length]; + for (int i = 0; i < probeInstanceIDs.Length; i++) + entityIds[i] = probeInstanceIDs[i]; + BakeAdditionalRequests(entityIds); + } + /// /// Request additional bake request manager to recompute baked data for a given request /// /// The instance ID of the probe doing the request. + [System.Obsolete("Use BakeAdditionalRequest(EntityId) instead. This method will be removed in a future version.")] public static void BakeAdditionalRequest(int probeInstanceID) { - int[] probeInstanceIDs = new int[1]; - probeInstanceIDs[0] = probeInstanceID; - - BakeAdditionalRequests(probeInstanceIDs); + BakeAdditionalRequest((EntityId)probeInstanceID); } static RenderingLayerBaker renderingLayerOverride = null; diff --git a/Packages/com.unity.render-pipelines.core/Editor/LookDev/Context.cs b/Packages/com.unity.render-pipelines.core/Editor/LookDev/Context.cs index 8ae795ad023..460a881c85d 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/LookDev/Context.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/LookDev/Context.cs @@ -345,7 +345,7 @@ public class ViewContext /// public bool hasViewedObject => !String.IsNullOrEmpty(viewedObjectAssetGUID) - || viewedObjecHierarchytEntityId != 0; + || viewedObjecHierarchytEntityId != EntityId.None; /// Reference to the object given for instantiation. public GameObject viewedObjectReference { get; private set; } @@ -428,7 +428,7 @@ void LoadEnvironmentFromGUID() public void UpdateViewedObject(GameObject viewedObject) { viewedObjectAssetGUID = ""; - viewedObjecHierarchytEntityId = 0; + viewedObjecHierarchytEntityId = EntityId.None; viewedObjectReference = null; if (viewedObject == null || viewedObject.Equals(null)) return; @@ -453,7 +453,7 @@ void LoadViewedObject() string path = AssetDatabase.GUIDToAssetPath(viewedObjectAssetGUID); viewedObjectReference = AssetDatabase.LoadAssetAtPath(path); } - else if (viewedObjecHierarchytEntityId != 0) + else if (viewedObjecHierarchytEntityId != EntityId.None) { viewedObjectReference = EditorUtility.EntityIdToObject(viewedObjecHierarchytEntityId) as GameObject; } @@ -468,7 +468,7 @@ internal void LoadAll(bool reloadWithTemporaryID) } internal void CleanTemporaryObjectIndexes() - => viewedObjecHierarchytEntityId = 0; + => viewedObjecHierarchytEntityId = EntityId.None; /// Reset the camera state to default values public void ResetCameraState() diff --git a/Packages/com.unity.render-pipelines.core/Editor/LookDev/EnvironmentLibrary.cs b/Packages/com.unity.render-pipelines.core/Editor/LookDev/EnvironmentLibrary.cs index adf751d1fb2..fff150ad7de 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/LookDev/EnvironmentLibrary.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/LookDev/EnvironmentLibrary.cs @@ -183,7 +183,7 @@ public override void Action(EntityId entityId, string pathName, string resourceF static void Create() { var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New EnvironmentLibrary.asset", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance(), "New EnvironmentLibrary.asset", icon, null); } public static void CreateAndAssignTo(ObjectField field) diff --git a/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditorUtils.cs b/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditorUtils.cs index 8b24f9eed68..b043b254ba8 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditorUtils.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditorUtils.cs @@ -35,7 +35,7 @@ public override void Action(EntityId entityId, string pathName, string resourceF internal static void CreateLensFlareDataSRPAsset() { const string relativePath = "New Lens Flare (SRP).asset"; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), relativePath, Icons.generic, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance(), relativePath, Icons.generic, null); } internal static LensFlareDataSRP CreateLensFlareDataSRPAsset(Scene scene, string targetName) diff --git a/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs b/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs index 75f587cb175..66398fca199 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs @@ -124,7 +124,7 @@ internal static partial class Classes bool m_Paused = false; - static int s_EditorWindowInstanceId; + static EntityId s_EditorWindowEntityId; DateTime m_LastDataCaptureTime = DateTime.MinValue; string m_ConnectedDeviceName = "Local Editor"; bool m_IsDeviceConnected = true; @@ -2087,7 +2087,7 @@ void DelayedRefresh() void CreateGUI() { - s_EditorWindowInstanceId = GetEntityId(); + s_EditorWindowEntityId = GetEntityId(); if (EditorPrefs.HasKey(kPassFilterLegacyEditorPrefsKey)) m_PassFilterLegacy = (PassFilterLegacy)EditorPrefs.GetInt(kPassFilterLegacyEditorPrefsKey); @@ -2143,7 +2143,7 @@ void OnDisable() // maximized, seemingly nothing happens. When it gets unmaximized, both OnEnable() and OnDisable() get called // on a new EditorWindow instance, which I guess was the maximized one? Anyway we need to ignore this event // because the DebugSession is static and we don't want to unsubscribe because the window is still open. - if (s_EditorWindowInstanceId != GetEntityId()) + if (s_EditorWindowEntityId != GetEntityId()) return; m_CurrentDebugData?.Clear(); diff --git a/Packages/com.unity.render-pipelines.core/Editor/UnifiedRayTracing/CreateUnifiedRTShaderMenuItem.cs b/Packages/com.unity.render-pipelines.core/Editor/UnifiedRayTracing/CreateUnifiedRTShaderMenuItem.cs index 2c8e8331131..51aad347df4 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/UnifiedRayTracing/CreateUnifiedRTShaderMenuItem.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/UnifiedRayTracing/CreateUnifiedRTShaderMenuItem.cs @@ -11,7 +11,7 @@ internal class ShaderTemplates internal static void CreateNewUnifiedRayTracingShader() { var action = ScriptableObject.CreateInstance(); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, action, "NewUnifiedRayTracingShader.urtshader", null, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, action, "NewUnifiedRayTracingShader.urtshader", null, null); } internal class DoCreateUnifiedRayTracingShader : AssetCreationEndAction diff --git a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileFactory.cs b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileFactory.cs index 1fed5e893f0..b2658df907a 100644 --- a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileFactory.cs +++ b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileFactory.cs @@ -16,7 +16,7 @@ public static class VolumeProfileFactory static void CreateVolumeProfile() { ProjectWindowUtil.StartNameEditingIfProjectWindowExists( - 0, + EntityId.None, ScriptableObject.CreateInstance(), "New Volume Profile.asset", CoreUtils.GetIconForType(), diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Common/DynamicResolutionHandler.cs b/Packages/com.unity.render-pipelines.core/Runtime/Common/DynamicResolutionHandler.cs index d98a8ac8f12..86bb4d0d255 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Common/DynamicResolutionHandler.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/Common/DynamicResolutionHandler.cs @@ -100,7 +100,7 @@ private struct ScalerContainer public DynamicResUpscaleFilter filter { get; private set; } // Used to detect the filters set via user API - static Dictionary s_CameraUpscaleFilters = new Dictionary(); + static Dictionary s_CameraUpscaleFilters = new Dictionary(); /// /// The viewport of the final buffer. This is likely the resolution the dynamic resolution starts from before any scaling. Note this is NOT the target resolution the rendering will happen in @@ -132,7 +132,7 @@ public bool runUpscalerFilterOnFullResolution private const int CameraDictionaryMaxcCapacity = 32; private WeakReference m_OwnerCameraWeakRef = null; - private static Dictionary s_CameraInstances = new Dictionary(CameraDictionaryMaxcCapacity); + private static Dictionary s_CameraInstances = new Dictionary(CameraDictionaryMaxcCapacity); private static DynamicResolutionHandler s_DefaultInstance = new DynamicResolutionHandler(); private static EntityId s_ActiveCameraId = EntityId.None; @@ -169,7 +169,7 @@ private static DynamicResolutionHandler GetOrCreateDrsInstanceHandler(Camera cam //first and foremost, if we exceed the dictionary capacity, lets try and recycle an object that is dead. if (s_CameraInstances.Count >= CameraDictionaryMaxcCapacity) { - int recycledInstanceKey = 0; + EntityId recycledInstanceKey = EntityId.None; DynamicResolutionHandler recycledInstance = null; foreach (var kv in s_CameraInstances) { @@ -412,7 +412,7 @@ public static void UpdateAndUseCamera(Camera camera, GlobalDynamicResolutionSett if (camera == null) { s_ActiveInstance = s_DefaultInstance; - newCameraId = 0; + newCameraId = EntityId.None; } else { diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/Debug/DebugDisplayGPUResidentDrawer.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/Debug/DebugDisplayGPUResidentDrawer.cs index 4f907799cfc..a50c4e29c06 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/Debug/DebugDisplayGPUResidentDrawer.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/Debug/DebugDisplayGPUResidentDrawer.cs @@ -37,7 +37,7 @@ private bool displayBatcherStats } /// Returns the view instances id for the selected occluder debug view index, or 0 if not valid. - internal bool GetOccluderViewInstanceID(out int viewInstanceID) + internal bool GetOccluderViewInstanceID(out EntityId viewInstanceID) { DebugRendererBatcherStats debugStats = GPUResidentDrawer.GetDebugStats(); if (debugStats != null) @@ -49,7 +49,7 @@ internal bool GetOccluderViewInstanceID(out int viewInstanceID) } } - viewInstanceID = 0; + viewInstanceID = EntityId.None; return false; } diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentBatcher.SpeedTree.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentBatcher.SpeedTree.cs index 92c6c9ae40d..dcc4b8aaeb4 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentBatcher.SpeedTree.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentBatcher.SpeedTree.cs @@ -36,7 +36,7 @@ private void ProcessTrees() m_ProcessedThisFrameTreeBits.Resize(maxInstancesCount); bool becomeVisibleOnly = !Application.isPlaying; - var visibleTreeRendererIDs = new NativeList(Allocator.TempJob); + var visibleTreeRendererIDs = new NativeList(Allocator.TempJob); var visibleTreeInstances = new NativeList(Allocator.TempJob); m_BatchersContext.GetVisibleTreeInstances(compactedVisibilityMasks, m_ProcessedThisFrameTreeBits, visibleTreeRendererIDs, visibleTreeInstances, @@ -64,7 +64,7 @@ private void ProcessTrees() Profiler.EndSample(); } - private unsafe void UpdateSpeedTreeWindAndUploadWindParamsToGPU(NativeArray treeRendererIDs, NativeArray treeInstances, bool history) + private unsafe void UpdateSpeedTreeWindAndUploadWindParamsToGPU(NativeArray treeRendererIDs, NativeArray treeInstances, bool history) { if (treeRendererIDs.Length == 0) return; @@ -88,7 +88,6 @@ private unsafe void UpdateSpeedTreeWindAndUploadWindParamsToGPU(NativeArray windParams.uintStride = uploader.GetUIntPerInstance(); windParams.elementOffset = 0; windParams.elementsCount = treeInstances.Length; - SpeedTreeWindManager.UpdateWindAndWriteBufferWindParams(treeRendererIDs, windParams, history); m_BatchersContext.SubmitToGpu(gpuInstanceIndices, ref uploader, submitOnlyWrittenParams: true); diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.cs index 9b2d6f98e48..798ba16771a 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.cs @@ -131,7 +131,7 @@ public static void ReinitializeIfNeeded() /// The rendering debugger debug settings to read parameters from. /// The instance ID of the camera using a GPU occlusion test. /// The color buffer to render the overlay on. - public static void RenderDebugOcclusionTestOverlay(RenderGraph renderGraph, DebugDisplayGPUResidentDrawer debugSettings, int viewInstanceID, TextureHandle colorBuffer) + public static void RenderDebugOcclusionTestOverlay(RenderGraph renderGraph, DebugDisplayGPUResidentDrawer debugSettings, EntityId viewInstanceID, TextureHandle colorBuffer) { s_Instance?.batcher.occlusionCullingCommon.RenderDebugOcclusionTestOverlay(renderGraph, debugSettings, viewInstanceID, colorBuffer); } @@ -334,7 +334,7 @@ private static void Recreate(GPUResidentDrawerSettings settings) private static readonly bool s_IsForcedOnViaCommandLine; private static readonly bool s_IsOcclusionForcedOnViaCommandLine; - private NativeList m_FrameCameraIDs; + private NativeList m_FrameCameraIDs; private bool m_FrameUpdateNeeded = false; private bool m_IsSelectionDirty; @@ -403,7 +403,7 @@ private GPUResidentDrawer(GPUResidentDrawerSettings settings, int maxInstanceCou #if UNITY_EDITOR AssemblyReloadEvents.beforeAssemblyReload += OnAssemblyReload; - m_FrameCameraIDs = new NativeList(1, Allocator.Persistent); + m_FrameCameraIDs = new NativeList(1, Allocator.Persistent); m_IsSelectionDirty = true; // Force at least one selection update #endif SceneManager.sceneLoaded += OnSceneLoaded; @@ -512,7 +512,7 @@ private void EditorFrameUpdate(List cameras) bool newFrame = false; foreach (Camera camera in cameras) { - int instanceID = camera.GetEntityId(); + EntityId instanceID = camera.GetEntityId(); if (m_FrameCameraIDs.Length == 0 || m_FrameCameraIDs.Contains(instanceID)) { newFrame = true; @@ -544,7 +544,7 @@ private void UpdateSelection() var rendererIDs = new NativeArray(renderers.Length, Allocator.TempJob, NativeArrayOptions.UninitializedMemory); for (int i = 0; i < renderers.Length; ++i) - rendererIDs[i] = renderers[i] ? renderers[i].GetEntityId() : 0; + rendererIDs[i] = renderers[i] ? renderers[i].GetEntityId() : EntityId.None; m_Batcher.UpdateSelectedRenderers(rendererIDs); @@ -945,7 +945,9 @@ public void Execute(int startIndex, int count) var meshID = meshIDArray[rendererIndex]; if (meshIDs.Contains(meshID)) { +#pragma warning disable 618 // todo @emilie.thaulow make renderID an EntityId renderersToAddForMeshes.AddNoResize(rendererID); +#pragma warning restore 618 // We can skip the material check if we found a mesh match since at this point // the renderer is already added and will be processed by the mesh branch continue; @@ -959,7 +961,10 @@ public void Execute(int startIndex, int count) var materialID = rendererMaterials[materialIndex]; if (materialIDs.Contains(materialID)) { + +#pragma warning disable 618 // todo @emilie.thaulow make renderID an EntityId renderersToAddForMaterials.AddNoResize(rendererID); +#pragma warning restore 618 break; } } diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawerDebug.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawerDebug.cs index 36102b9af21..0741f7d4d39 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawerDebug.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawerDebug.cs @@ -8,7 +8,7 @@ namespace UnityEngine.Rendering internal struct InstanceCullerViewStats { public BatchCullingViewType viewType; - public int viewInstanceID; + public EntityId viewInstanceID; public int splitIndex; public int visibleInstancesOnCPU; public int visibleInstancesOnGPU; @@ -25,7 +25,7 @@ internal enum InstanceOcclusionEventType internal struct InstanceOcclusionEventStats { - public int viewInstanceID; + public EntityId viewInstanceID; public InstanceOcclusionEventType eventType; public int occluderVersion; public int subviewMask; @@ -38,7 +38,7 @@ internal struct InstanceOcclusionEventStats internal struct DebugOccluderStats { - public int viewInstanceID; + public EntityId viewInstanceID; public int subviewCount; public Vector2Int occluderMipLayoutSize; } @@ -91,7 +91,7 @@ private InstanceOcclusionEventStats GetLastInstanceOcclusionEventStatsForView(in { if (viewIndex < instanceCullerStats.Length) { - int viewInstanceID = instanceCullerStats[viewIndex].viewInstanceID; + EntityId viewInstanceID = instanceCullerStats[viewIndex].viewInstanceID; for (int passIndex = instanceOcclusionEventStats.Length - 1; passIndex >= 0; passIndex--) { if (instanceOcclusionEventStats[passIndex].viewInstanceID == viewInstanceID) diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawerTypes.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawerTypes.cs index 4263e068c99..a304303dcf9 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawerTypes.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawerTypes.cs @@ -61,7 +61,7 @@ public struct SubviewOcclusionTest public struct OcclusionCullingSettings { /// The instance ID of the camera, to identify the culling output and occluders to use. - public int viewInstanceID; + public EntityId viewInstanceID; /// The occlusion test to use. public OcclusionTest occlusionTest; /// An instance multiplier to use for the generated indirect draw calls. @@ -70,7 +70,7 @@ public struct OcclusionCullingSettings /// Creates a new structure using the given parameters. /// The instance ID of the camera to find culling output and occluders for. /// The occlusion test to use. - public OcclusionCullingSettings(int viewInstanceID, OcclusionTest occlusionTest) + public OcclusionCullingSettings(EntityId viewInstanceID, OcclusionTest occlusionTest) { this.viewInstanceID = viewInstanceID; this.occlusionTest = occlusionTest; @@ -120,7 +120,7 @@ public OccluderSubviewUpdate(int subviewIndex) public struct OccluderParameters { /// The instance ID of the camera, used to identify these occluders for the occlusion test. - public int viewInstanceID; + public EntityId viewInstanceID; /// The total number of subviews for this occluder. public int subviewCount; @@ -133,7 +133,7 @@ public struct OccluderParameters /// Creates a new structure using the given parameters. /// The instance ID of the camera to associate with these occluders. - public OccluderParameters(int viewInstanceID) + public OccluderParameters(EntityId viewInstanceID) { this.viewInstanceID = viewInstanceID; this.subviewCount = 1; diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCuller.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCuller.cs index bc5527180cf..3974f0525da 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCuller.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCuller.cs @@ -69,7 +69,7 @@ internal struct DrawKey : IEquatable public int activeMeshLod; // or -1 if this draw is not using mesh LOD public BatchMaterialID materialID; public BatchDrawCommandFlags flags; - public int transparentInstanceId; // non-zero for transparent instances, to ensure each instance has its own draw command (for sorting) + public EntityId transparentInstanceId; // non-zero for transparent instances, to ensure each instance has its own draw command (for sorting) public uint overridenComponents; public RangeKey range; public int lightmapIndex; @@ -96,7 +96,7 @@ public override int GetHashCode() hash = (hash * 23) + (int)activeMeshLod; hash = (hash * 23) + (int)materialID.value; hash = (hash * 23) + (int)flags; - hash = (hash * 23) + transparentInstanceId; + hash = (hash * 23) + transparentInstanceId.GetHashCode(); hash = (hash * 23) + range.GetHashCode(); hash = (hash * 23) + (int)overridenComponents; hash = (hash * 23) + lightmapIndex; @@ -1472,7 +1472,7 @@ internal struct InstanceCullerSplitDebugArray : IDisposable internal struct Info { public BatchCullingViewType viewType; - public int viewInstanceID; + public EntityId viewInstanceID; public int splitIndex; } @@ -1496,7 +1496,7 @@ public void Dispose() m_CounterSync.Dispose(); } - public int TryAddSplits(BatchCullingViewType viewType, int viewInstanceID, int splitCount) + public int TryAddSplits(BatchCullingViewType viewType, EntityId viewInstanceID, int splitCount) { int baseIndex = m_Info.Length; if (baseIndex + splitCount > MaxSplitCount) @@ -1560,7 +1560,7 @@ internal struct InstanceOcclusionEventDebugArray : IDisposable internal struct Info { - public int viewInstanceID; + public EntityId viewInstanceID; public InstanceOcclusionEventType eventType; public int occluderVersion; public int subviewMask; @@ -1614,7 +1614,7 @@ public void Dispose() m_CounterBuffer.Dispose(); } - public int TryAdd(int viewInstanceID, InstanceOcclusionEventType eventType, int occluderVersion, int subviewMask, OcclusionTest occlusionTest) + public int TryAdd(EntityId viewInstanceID, InstanceOcclusionEventType eventType, int occluderVersion, int subviewMask, OcclusionTest occlusionTest) { int passIndex = m_PendingInfo.Length; if (passIndex + 1 > MaxPassCount) @@ -1722,7 +1722,7 @@ internal struct InstanceCuller : IDisposable { private struct AnimatedFadeData { - public int cameraID; + public EntityId cameraID; public JobHandle jobHandle; } @@ -1817,8 +1817,9 @@ private JobHandle AnimateCrossFades(CPUPerCameraInstanceData perCameraInstanceDa //For main camera, animate crossfades, and store the result in the hashmap to be retrieved by other cameras var viewID = cc.viewID.GetInstanceID(); - +#pragma warning disable 618 // todo @emilie.thaulow make viewID an EntityId hasAnimatedCrossfade = perCameraInstanceData.perCameraData.TryGetValue(viewID, out var tmpCameraInstanceData); +#pragma warning restore 618 if (hasAnimatedCrossfade == false) { // For picking / filtering and outlining passes. We do not have animated crossfade data. @@ -1835,7 +1836,9 @@ private JobHandle AnimateCrossFades(CPUPerCameraInstanceData perCameraInstanceDa crossFadeArray = cameraInstanceData.crossFades }.Schedule(perCameraInstanceData.instancesLength, AnimateCrossFadeJob.k_BatchSize); +#pragma warning disable 618 // todo @emilie.thaulow make viewID an EntityId m_LODParamsToCameraID.TryAdd(lodHash, new AnimatedFadeData(){ cameraID = viewID, jobHandle = handle}); +#pragma warning restore 618 return handle; } @@ -1865,9 +1868,10 @@ private unsafe JobHandle CreateFrustumCullingJob( InstanceCullerBurst.SetupCullingJobInput(QualitySettings.lodBias, QualitySettings.meshLodThreshold, contextPtr, &receiverPlanes, &receiverSphereCuller, &frustumPlaneCuller, &screenRelativeMetric, &meshLodConstant); } - +#pragma warning disable 618 // todo @emilie.thaulow make GetInstanceID return EntityId if (occlusionCullingCommon != null) occlusionCullingCommon.UpdateSilhouettePlanes(cc.viewID.GetInstanceID(), receiverPlanes.SilhouettePlaneSubArray()); +#pragma warning restore 618 var jobHandle = AnimateCrossFades(perCameraInstanceData, cc, out var cameraInstanceData, out var hasAnimatedCrossfade); @@ -2008,7 +2012,9 @@ public unsafe JobHandle CreateCullJobTree( int debugCounterBaseIndex = -1; if (m_DebugStats?.enabled ?? false) { +#pragma warning disable 618 // todo @emilie.thaulow make GetInstanceID return EntityId debugCounterBaseIndex = m_SplitDebugArray.TryAddSplits(cc.viewType, cc.viewID.GetInstanceID(), cc.cullingSplits.Length); +#pragma warning restore 618 } var batchCount = drawInstanceData.drawBatches.Length; @@ -2024,11 +2030,15 @@ public unsafe JobHandle CreateCullJobTree( var binVisibleInstanceOffsets = new NativeArray(maxBinCount, Allocator.TempJob, NativeArrayOptions.UninitializedMemory); int indirectContextIndex = -1; +#pragma warning disable 618 //todo @emilie.thaulow make GetInstanceID return EntityId bool useOcclusionCulling = (occlusionCullingCommon != null) && occlusionCullingCommon.HasOccluderContext(cc.viewID.GetInstanceID()); +#pragma warning restore 618 if (useOcclusionCulling) { +#pragma warning disable 618 // todo @emilie.thaulow make GetInstanceID return EntityId int viewInstanceID = cc.viewID.GetInstanceID(); indirectContextIndex = m_IndirectStorage.TryAllocateContext(viewInstanceID); +#pragma warning restore 618 cullingOutput.customCullingResult[0] = (IntPtr)viewInstanceID; } IndirectBufferLimits indirectBufferLimits = m_IndirectStorage.GetLimits(indirectContextIndex); @@ -2264,7 +2274,7 @@ private JobHandle CreatePickingCullingOutputJob_EditorOnly(in BatchCullingContex } #endif - public void InstanceOccludersUpdated(int viewInstanceID, int subviewMask, RenderersBatchersContext batchersContext) + public void InstanceOccludersUpdated(EntityId viewInstanceID, int subviewMask, RenderersBatchersContext batchersContext) { if (m_DebugStats?.enabled ?? false) { @@ -2350,7 +2360,7 @@ public void InstanceOcclusionTest(RenderGraph renderGraph, in OcclusionCullingSe } } - internal void EnsureValidOcclusionTestResults(int viewInstanceID) + internal void EnsureValidOcclusionTestResults(EntityId viewInstanceID) { int indirectContextIndex = m_IndirectStorage.TryGetContextIndex(viewInstanceID); if (indirectContextIndex >= 0) diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCullingBatcher.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCullingBatcher.cs index 3072af5d401..4a805041462 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCullingBatcher.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCullingBatcher.cs @@ -240,11 +240,13 @@ public unsafe void Execute(int startIndex, int count) for (int i = startIndex; i < startIndex + count; ++i) { - int instanceID = instanceIDs[i]; + EntityId entityId = instanceIDs[i]; - if (!hashMap.ContainsKey(instanceID)) + if (!hashMap.ContainsKey(entityId)) { - notFoundinstanceIDs.AddNoResize(instanceID); +#pragma warning disable 618 // todo @emilie.thaulow fix this + notFoundinstanceIDs.AddNoResize(entityId); +#pragma warning restore 618 notFoundPackedMaterialDatas.AddNoResize(packedMaterialDatas[i]); } } @@ -303,7 +305,7 @@ private void ProcessMaterial(int i) var materialID = materialIDs[i]; var packedMaterialData = packedMaterialDatas[i]; - if (materialID == 0) + if (materialID == EntityId.None) return; // Cache the packed material so we can detect a change in material that would need to update the renderer data. @@ -685,8 +687,11 @@ public unsafe JobHandle OnPerformCulling( public void OnFinishedCulling(IntPtr customCullingResult) { + int viewInstanceID = (int)customCullingResult; +#pragma warning disable 618 // todo @emilie.thaulow make this into an EntityId m_Culler.EnsureValidOcclusionTestResults(viewInstanceID); +#pragma warning restore 618 } public void DestroyDrawInstances(NativeArray instances) @@ -710,7 +715,7 @@ public void DestroyMaterials(NativeArray destroyedMaterials) var destroyedBatchMaterials = new NativeList(destroyedMaterials.Length, Allocator.TempJob); - foreach (int destroyedMaterial in destroyedMaterials) + foreach (EntityId destroyedMaterial in destroyedMaterials) { if (m_BatchMaterialHash.TryGetValue(destroyedMaterial, out var destroyedBatchMaterial)) { @@ -735,7 +740,7 @@ public void DestroyMeshes(NativeArray destroyedMeshes) Profiler.BeginSample("DestroyMeshes"); - foreach (int destroyedMesh in destroyedMeshes) + foreach (EntityId destroyedMesh in destroyedMeshes) { if (m_BatchMeshHash.TryGetValue(destroyedMesh, out var destroyedBatchMesh)) { @@ -850,7 +855,7 @@ public void BuildBatch( UpdateInstanceDataBufferLayoutVersion(); } - public void InstanceOccludersUpdated(int viewInstanceID, int subviewMask) + public void InstanceOccludersUpdated(EntityId viewInstanceID, int subviewMask) { m_Culler.InstanceOccludersUpdated(viewInstanceID, subviewMask, m_BatchersContext); } diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCullingBatcherBurst.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCullingBatcherBurst.cs index d3965464e77..ae60d8d5546 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCullingBatcherBurst.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCullingBatcherBurst.cs @@ -228,7 +228,7 @@ private static void ProcessRenderer(int i, bool implicitInstanceIndices, in GPUD var materialID = rendererData.materialID[materialIndex]; var packedMaterialData = packedMaterialDatas[matIndex]; - if (materialID == 0) + if (materialID == EntityId.None) { Debug.LogWarning("Material in the shared materials list is null. Object will be partially rendered."); continue; @@ -266,7 +266,7 @@ private static void ProcessRenderer(int i, bool implicitInstanceIndices, in GPUD submeshIndex = submeshIndex, activeMeshLod = meshLodInfo.lodSelectionActive ? lodLoopIndex : -1, flags = flags, - transparentInstanceId = packedMaterialData.isTransparent ? rendererGroupID : 0, + transparentInstanceId = packedMaterialData.isTransparent ? rendererGroupID : EntityId.None, range = rangeKey, overridenComponents = (uint)overridenComponents, // When we've opted out of lightmap texture arrays, we diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceData.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceData.cs index 15fa84a07e4..8bff455389d 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceData.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceData.cs @@ -311,7 +311,7 @@ internal struct CPUPerCameraInstanceData : IDisposable { public const byte k_InvalidByteData = 0xff; - public NativeParallelHashMap perCameraData; + public NativeParallelHashMap perCameraData; private NativeArray m_StructData; public int instancesLength { get => m_StructData[0]; set => m_StructData[0] = value; } @@ -361,7 +361,7 @@ internal void SetDefault(int index) public void Initialize(int initCapacity) { - perCameraData = new NativeParallelHashMap(1,Allocator.Persistent); + perCameraData = new NativeParallelHashMap(1,Allocator.Persistent); m_StructData = new NativeArray(2, Allocator.Persistent); instancesCapacity = initCapacity; instancesLength = 0; @@ -653,8 +653,8 @@ public void Remove(SharedInstanceHandle instance) // These accessors just for convenience and additional safety. // In general prefer converting an instance to an index and access by index. - public int Get_RendererGroupID(SharedInstanceHandle instance) { return rendererGroupIDs[SharedInstanceToIndex(instance)]; } - public int Get_MeshID(SharedInstanceHandle instance) { return meshIDs[SharedInstanceToIndex(instance)]; } + public EntityId Get_RendererGroupID(SharedInstanceHandle instance) { return rendererGroupIDs[SharedInstanceToIndex(instance)]; } + public EntityId Get_MeshID(SharedInstanceHandle instance) { return meshIDs[SharedInstanceToIndex(instance)]; } public unsafe ref AABB Get_LocalAABB(SharedInstanceHandle instance) { return ref UnsafeUtility.ArrayElementAsRef(localAABBs.GetUnsafePtr(), SharedInstanceToIndex(instance)); } public CPUSharedInstanceFlags Get_Flags(SharedInstanceHandle instance) { return flags[SharedInstanceToIndex(instance)]; } public uint Get_LODGroupAndMask(SharedInstanceHandle instance) { return lodGroupAndMasks[SharedInstanceToIndex(instance)]; } @@ -662,8 +662,8 @@ public void Remove(SharedInstanceHandle instance) public int Get_RefCount(SharedInstanceHandle instance) { return refCounts[SharedInstanceToIndex(instance)]; } public unsafe ref SmallEntityIdArray Get_MaterialIDs(SharedInstanceHandle instance) { return ref UnsafeUtility.ArrayElementAsRef(materialIDArrays.GetUnsafePtr(), SharedInstanceToIndex(instance)); } - public void Set_RendererGroupID(SharedInstanceHandle instance, int rendererGroupID) { rendererGroupIDs[SharedInstanceToIndex(instance)] = rendererGroupID; } - public void Set_MeshID(SharedInstanceHandle instance, int meshID) { meshIDs[SharedInstanceToIndex(instance)] = meshID; } + public void Set_RendererGroupID(SharedInstanceHandle instance, EntityId rendererGroupID) { rendererGroupIDs[SharedInstanceToIndex(instance)] = rendererGroupID; } + public void Set_MeshID(SharedInstanceHandle instance, EntityId meshID) { meshIDs[SharedInstanceToIndex(instance)] = meshID; } public void Set_LocalAABB(SharedInstanceHandle instance, in AABB localAABB) { localAABBs[SharedInstanceToIndex(instance)] = localAABB; } public void Set_Flags(SharedInstanceHandle instance, CPUSharedInstanceFlags instanceFlags) { flags[SharedInstanceToIndex(instance)] = instanceFlags; } public void Set_LODGroupAndMask(SharedInstanceHandle instance, uint lodGroupAndMask) { lodGroupAndMasks[SharedInstanceToIndex(instance)] = lodGroupAndMask; } @@ -676,7 +676,7 @@ public void Set_MaterialIDs(SharedInstanceHandle instance, in SmallEntityIdArray materialIDArrays[index] = materialIDs; } - public void Set(SharedInstanceHandle instance, EntityId rendererGroupID, in SmallEntityIdArray materialIDs, int meshID, in AABB localAABB, TransformUpdateFlags transformUpdateFlags, + public void Set(SharedInstanceHandle instance, EntityId rendererGroupID, in SmallEntityIdArray materialIDs, EntityId meshID, in AABB localAABB, TransformUpdateFlags transformUpdateFlags, InstanceFlags instanceFlags, uint lodGroupAndMask, GPUDrivenMeshLodInfo meshLodInfo, int gameObjectLayer, int refCount) { int index = SharedInstanceToIndex(instance); @@ -695,7 +695,7 @@ public void Set(SharedInstanceHandle instance, EntityId rendererGroupID, in Smal public void SetDefault(SharedInstanceHandle instance) { - Set(instance, EntityId.None, default, 0, new AABB(), TransformUpdateFlags.None, InstanceFlags.None, k_InvalidLODGroupAndMask, new GPUDrivenMeshLodInfo(), 0, 0); + Set(instance, EntityId.None, default, EntityId.None, new AABB(), TransformUpdateFlags.None, InstanceFlags.None, k_InvalidLODGroupAndMask, new GPUDrivenMeshLodInfo(), 0, 0); } public ReadOnly AsReadOnly() diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystem.Jobs.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystem.Jobs.cs index c499e4487b2..311b24f38a4 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystem.Jobs.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystem.Jobs.cs @@ -29,7 +29,7 @@ private unsafe struct QueryRendererGroupInstancesCountJob : IJobParallelForBatch [ReadOnly] public CPUInstanceData instanceData; [ReadOnly] public CPUSharedInstanceData sharedInstanceData; - [ReadOnly] public NativeParallelMultiHashMap rendererGroupInstanceMultiHash; + [ReadOnly] public NativeParallelMultiHashMap rendererGroupInstanceMultiHash; [NativeDisableContainerSafetyRestriction, NoAlias][ReadOnly] public NativeArray rendererGroupIDs; [NativeDisableContainerSafetyRestriction, NoAlias][WriteOnly] public NativeArray instancesCount; @@ -80,7 +80,7 @@ private unsafe struct QueryRendererGroupInstancesJob : IJobParallelForBatch { public const int k_BatchSize = 128; - [ReadOnly] public NativeParallelMultiHashMap rendererGroupInstanceMultiHash; + [ReadOnly] public NativeParallelMultiHashMap rendererGroupInstanceMultiHash; [NativeDisableContainerSafetyRestriction, NoAlias][ReadOnly] public NativeArray rendererGroupIDs; [NativeDisableContainerSafetyRestriction, NoAlias][WriteOnly] public NativeArray instances; @@ -113,7 +113,7 @@ private unsafe struct QueryRendererGroupInstancesMultiJob : IJobParallelForBatch { public const int k_BatchSize = 128; - [ReadOnly] public NativeParallelMultiHashMap rendererGroupInstanceMultiHash; + [ReadOnly] public NativeParallelMultiHashMap rendererGroupInstanceMultiHash; [NativeDisableContainerSafetyRestriction, NoAlias][ReadOnly] public NativeArray rendererGroupIDs; [NativeDisableContainerSafetyRestriction, NoAlias][ReadOnly] public NativeArray instancesOffsets; [NativeDisableContainerSafetyRestriction, NoAlias][ReadOnly] public NativeArray instancesCounts; @@ -490,7 +490,7 @@ private unsafe struct UpdateRendererInstancesJob : IJobParallelFor [ReadOnly] public bool implicitInstanceIndices; [ReadOnly] public GPUDrivenRendererGroupData rendererData; [ReadOnly] public NativeArray instances; - [ReadOnly] public NativeParallelHashMap lodGroupDataMap; + [ReadOnly] public NativeParallelHashMap lodGroupDataMap; [NativeDisableParallelForRestriction][NativeDisableContainerSafetyRestriction, NoAlias] public CPUInstanceData instanceData; [NativeDisableParallelForRestriction][NativeDisableContainerSafetyRestriction, NoAlias] public CPUSharedInstanceData sharedInstanceData; @@ -508,7 +508,7 @@ public void Execute(int index) int materialOffset = rendererData.materialsOffset[index]; int materialCount = rendererData.materialsCount[index]; - int meshID = rendererData.meshID[meshIndex]; + EntityId meshID = rendererData.meshID[meshIndex]; var meshLodInfo = rendererData.meshLodInfo[meshIndex]; const int k_LightmapIndexMask = 0xFFFF; @@ -654,7 +654,7 @@ private struct GetVisibleNonProcessedTreeInstancesJob : IJobParallelForBatch [NativeDisableParallelForRestriction] public ParallelBitArray processedBits; - [NativeDisableParallelForRestriction][WriteOnly] public NativeArray rendererIDs; + [NativeDisableParallelForRestriction][WriteOnly] public NativeArray rendererIDs; [NativeDisableParallelForRestriction][WriteOnly] public NativeArray instances; [NativeDisableUnsafePtrRestriction] public UnsafeAtomicCounter32 atomicTreeInstancesCount; @@ -711,7 +711,7 @@ public void Execute(int startIndex, int count) int instanceIndex = startIndex + validBitIndex; InstanceHandle instance = instanceData.IndexToInstance(instanceIndex); SharedInstanceHandle sharedInstanceHandle = instanceData.Get_SharedInstance(instance); - int rendererID = sharedInstanceData.Get_RendererGroupID(sharedInstanceHandle); + EntityId rendererID = sharedInstanceData.Get_RendererGroupID(sharedInstanceHandle); rendererIDs[writeIndex] = rendererID; instances[writeIndex] = instance; diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystem.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystem.cs index 918a2dd8087..ebd30511d98 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystem.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystem.cs @@ -16,7 +16,7 @@ internal partial class InstanceDataSystem : IDisposable private CPUPerCameraInstanceData m_PerCameraInstanceData; //@ We may want something a bit faster instead of multi hash map. Remove and search performance for multiple instances per renderer group is not great. - private NativeParallelMultiHashMap m_RendererGroupInstanceMultiHash; + private NativeParallelMultiHashMap m_RendererGroupInstanceMultiHash; private ComputeShader m_TransformUpdateCS; private ComputeShader m_WindDataUpdateCS; @@ -60,7 +60,7 @@ public InstanceDataSystem(int maxInstances, bool enableBoundingSpheres, GPUResid m_PerCameraInstanceData.Initialize(maxInstances); Assert.IsTrue(m_PerCameraInstanceData.instancesCapacity == m_InstanceData.instancesCapacity); - m_RendererGroupInstanceMultiHash = new NativeParallelMultiHashMap(maxInstances, Allocator.Persistent); + m_RendererGroupInstanceMultiHash = new NativeParallelMultiHashMap(maxInstances, Allocator.Persistent); m_TransformUpdateCS = resources.transformUpdaterKernels; m_WindDataUpdateCS = resources.windDataUpdaterKernels; @@ -501,7 +501,7 @@ public void FreeInstances(NativeArray instances) ref m_SharedInstanceData, ref m_RendererGroupInstanceMultiHash); } - public JobHandle ScheduleUpdateInstanceDataJob(NativeArray instances, in GPUDrivenRendererGroupData rendererData, NativeParallelHashMap lodGroupDataMap) + public JobHandle ScheduleUpdateInstanceDataJob(NativeArray instances, in GPUDrivenRendererGroupData rendererData, NativeParallelHashMap lodGroupDataMap) { bool implicitInstanceIndices = rendererData.instancesCount.Length == 0; @@ -712,7 +712,7 @@ public bool InternalSanityCheckStates() return true; } - public unsafe void GetVisibleTreeInstances(in ParallelBitArray compactedVisibilityMasks, in ParallelBitArray processedBits, NativeList visibeTreeRendererIDs, + public unsafe void GetVisibleTreeInstances(in ParallelBitArray compactedVisibilityMasks, in ParallelBitArray processedBits, NativeList visibeTreeRendererIDs, NativeList visibeTreeInstances, bool becomeVisibleOnly, out int becomeVisibeTreeInstancesCount) { Assert.AreEqual(visibeTreeRendererIDs.Length, 0); diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystemBurst.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystemBurst.cs index 1e9b6a28bc8..ee8fe52cd7f 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystemBurst.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceData/InstanceDataSystemBurst.cs @@ -11,7 +11,7 @@ internal static class InstanceDataSystemBurst public static void ReallocateInstances(bool implicitInstanceIndices, in NativeArray rendererGroupIDs, in NativeArray packedRendererData, in NativeArray instanceOffsets, in NativeArray instanceCounts, ref InstanceAllocators instanceAllocators, ref CPUInstanceData instanceData, ref CPUPerCameraInstanceData perCameraInstanceData, ref CPUSharedInstanceData sharedInstanceData, ref NativeArray instances, - ref NativeParallelMultiHashMap rendererGroupInstanceMultiHash) + ref NativeParallelMultiHashMap rendererGroupInstanceMultiHash) { for (int i = 0; i < rendererGroupIDs.Length; ++i) { @@ -113,7 +113,7 @@ public static void ReallocateInstances(bool implicitInstanceIndices, in NativeAr [BurstCompile(DisableSafetyChecks = true, OptimizeFor = OptimizeFor.Performance)] public static void FreeRendererGroupInstances(in NativeArray.ReadOnly rendererGroupsID, ref InstanceAllocators instanceAllocators, ref CPUInstanceData instanceData, - ref CPUPerCameraInstanceData perCameraInstanceData, ref CPUSharedInstanceData sharedInstanceData, ref NativeParallelMultiHashMap rendererGroupInstanceMultiHash) + ref CPUPerCameraInstanceData perCameraInstanceData, ref CPUSharedInstanceData sharedInstanceData, ref NativeParallelMultiHashMap rendererGroupInstanceMultiHash) { foreach (var rendererGroupID in rendererGroupsID) { @@ -150,7 +150,7 @@ public static void FreeRendererGroupInstances(in NativeArray.ReadOnly [BurstCompile(DisableSafetyChecks = true, OptimizeFor = OptimizeFor.Performance)] public static void FreeInstances(in NativeArray.ReadOnly instances, ref InstanceAllocators instanceAllocators, ref CPUInstanceData instanceData, - ref CPUPerCameraInstanceData perCameraInstanceData, ref CPUSharedInstanceData sharedInstanceData, ref NativeParallelMultiHashMap rendererGroupInstanceMultiHash) + ref CPUPerCameraInstanceData perCameraInstanceData, ref CPUSharedInstanceData sharedInstanceData, ref NativeParallelMultiHashMap rendererGroupInstanceMultiHash) { foreach (var instance in instances) { diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceOcclusionCuller.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceOcclusionCuller.cs index 06bdadb5b66..22a3974c8ed 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceOcclusionCuller.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceOcclusionCuller.cs @@ -591,7 +591,7 @@ internal struct IndirectBufferContextStorage : IDisposable private NativeArray m_DrawInfoStaging; private int m_ContextAllocCounter; - private NativeHashMap m_ContextIndexFromViewID; + private NativeHashMap m_ContextIndexFromViewID; private NativeList m_Contexts; private NativeArray m_ContextAllocInfo; private NativeArray m_AllocationCounters; @@ -630,7 +630,7 @@ public void Init() AllocateInstanceBuffers(initialInstanceCount); AllocateDrawBuffers(initialDrawCount); - m_ContextIndexFromViewID = new NativeHashMap(initialContextCount, Allocator.Persistent); + m_ContextIndexFromViewID = new NativeHashMap(initialContextCount, Allocator.Persistent); m_Contexts = new NativeList(initialContextCount, Allocator.Persistent); m_ContextAllocInfo = new NativeArray(initialContextCount, Allocator.Persistent, NativeArrayOptions.UninitializedMemory); @@ -740,7 +740,7 @@ public void ClearContextsAndGrowBuffers() ResetAllocators(); } - public int TryAllocateContext(int viewID) + public int TryAllocateContext(EntityId viewID) { // Disallow using the same viewID multiple times for a frame, since it is used as a UID to update indirect args // This will prevent multiple context being created for example if a custom pass is being used @@ -758,7 +758,7 @@ public int TryAllocateContext(int viewID) return contextIndex; } - public int TryGetContextIndex(int viewID) + public int TryGetContextIndex(EntityId viewID) { if (!m_ContextIndexFromViewID.TryGetValue(viewID, out var contextIndex)) contextIndex = -1; diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/LODGroupDataPool.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/LODGroupDataPool.cs index 207a4dcf21e..4d2cf597644 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/LODGroupDataPool.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/LODGroupDataPool.cs @@ -35,7 +35,7 @@ internal struct UpdateLODGroupTransformJob : IJobParallelFor { public const int k_BatchSize = 256; - [ReadOnly] public NativeParallelHashMap lodGroupDataHash; + [ReadOnly] public NativeParallelHashMap lodGroupDataHash; [ReadOnly] public NativeArray lodGroupIDs; [ReadOnly] public NativeArray worldSpaceReferencePoints; [ReadOnly] public NativeArray worldSpaceSizes; @@ -50,7 +50,7 @@ internal struct UpdateLODGroupTransformJob : IJobParallelFor public unsafe void Execute(int index) { - int lodGroupID = lodGroupIDs[index]; + EntityId lodGroupID = lodGroupIDs[index]; if (lodGroupDataHash.TryGetValue(lodGroupID, out var lodGroupInstance)) { @@ -176,8 +176,8 @@ public void Execute(int index) internal class LODGroupDataPool : IDisposable { private NativeList m_LODGroupData; - private NativeParallelHashMap m_LODGroupDataHash; - public NativeParallelHashMap lodGroupDataHash => m_LODGroupDataHash; + private NativeParallelHashMap m_LODGroupDataHash; + public NativeParallelHashMap lodGroupDataHash => m_LODGroupDataHash; private NativeList m_LODGroupCullingData; private NativeList m_FreeLODGroupDataHandles; @@ -204,7 +204,7 @@ private static class LodGroupShaderIDs public LODGroupDataPool(GPUResidentDrawerResources resources, int initialInstanceCount, bool supportDitheringCrossFade) { m_LODGroupData = new NativeList(Allocator.Persistent); - m_LODGroupDataHash = new NativeParallelHashMap(64, Allocator.Persistent); + m_LODGroupDataHash = new NativeParallelHashMap(64, Allocator.Persistent); m_LODGroupCullingData = new NativeList(Allocator.Persistent); m_FreeLODGroupDataHandles = new NativeList(Allocator.Persistent); diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/LODGroupDataPoolBurst.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/LODGroupDataPoolBurst.cs index d54d5888526..e9c86926498 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/LODGroupDataPoolBurst.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/LODGroupDataPoolBurst.cs @@ -9,11 +9,11 @@ internal static class LODGroupDataPoolBurst { [BurstCompile(DisableSafetyChecks = true, OptimizeFor = OptimizeFor.Performance)] public static int FreeLODGroupData(in NativeArray destroyedLODGroupsID, ref NativeList lodGroupsData, - ref NativeParallelHashMap lodGroupDataHash, ref NativeList freeLODGroupDataHandles) + ref NativeParallelHashMap lodGroupDataHash, ref NativeList freeLODGroupDataHandles) { int removedRendererCount = 0; - foreach (int lodGroupID in destroyedLODGroupsID) + foreach (EntityId lodGroupID in destroyedLODGroupsID) { if (lodGroupDataHash.TryGetValue(lodGroupID, out var lodGroupInstance)) { @@ -35,7 +35,7 @@ public static int FreeLODGroupData(in NativeArray destroyedLODGroupsID [BurstCompile(DisableSafetyChecks = true, OptimizeFor = OptimizeFor.Performance)] public static int AllocateOrGetLODGroupDataInstances(in NativeArray lodGroupsID, ref NativeList lodGroupsData, ref NativeList lodGroupCullingData, - ref NativeParallelHashMap lodGroupDataHash, ref NativeList freeLODGroupDataHandles, ref NativeArray lodGroupInstances) + ref NativeParallelHashMap lodGroupDataHash, ref NativeList freeLODGroupDataHandles, ref NativeArray lodGroupInstances) { int freeHandlesCount = freeLODGroupDataHandles.Length; int lodDataLength = lodGroupsData.Length; @@ -43,7 +43,7 @@ public static int AllocateOrGetLODGroupDataInstances(in NativeArray lo for (int i = 0; i < lodGroupsID.Length; ++i) { - int lodGroupID = lodGroupsID[i]; + EntityId lodGroupID = lodGroupsID[i]; if (!lodGroupDataHash.TryGetValue(lodGroupID, out var lodGroupInstance)) { diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/OcclusionCullingCommon.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/OcclusionCullingCommon.cs index bc1b05f43e9..7bbd2ae9290 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/OcclusionCullingCommon.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/OcclusionCullingCommon.cs @@ -40,11 +40,11 @@ internal struct SilhouettePlaneCache : IDisposable private struct Slot { public bool isActive; - public int viewInstanceID; + public EntityId viewInstanceID; public int planeCount; // planeIndex = slotIndex * kMaxSilhouettePlanes public int lastUsedFrameIndex; - public Slot(int viewInstanceID, int planeCount, int frameIndex) + public Slot(EntityId viewInstanceID, int planeCount, int frameIndex) { this.isActive = true; this.viewInstanceID = viewInstanceID; @@ -55,14 +55,14 @@ public Slot(int viewInstanceID, int planeCount, int frameIndex) private const int kMaxSilhouettePlanes = (int)OcclusionCullingCommonConfig.MaxOccluderSilhouettePlanes; - private NativeParallelHashMap m_SubviewIDToIndexMap; + private NativeParallelHashMap m_SubviewIDToIndexMap; private NativeList m_SlotFreeList; private NativeList m_Slots; private NativeList m_PlaneStorage; public void Init() { - m_SubviewIDToIndexMap = new NativeParallelHashMap(16, Allocator.Persistent); + m_SubviewIDToIndexMap = new NativeParallelHashMap(16, Allocator.Persistent); m_SlotFreeList = new NativeList(16, Allocator.Persistent); m_Slots = new NativeList(16, Allocator.Persistent); m_PlaneStorage = new NativeList(16 * kMaxSilhouettePlanes, Allocator.Persistent); @@ -76,7 +76,7 @@ public void Dispose() m_PlaneStorage.Dispose(); } - public void Update(int viewInstanceID, NativeArray planes, int frameIndex) + public void Update(EntityId viewInstanceID, NativeArray planes, int frameIndex) { int planeCount = Math.Min(planes.Length, kMaxSilhouettePlanes); @@ -131,7 +131,7 @@ public void FreeUnusedSlots(int frameIndex, int maximumAge) } } - public NativeArray GetSubArray(int viewInstanceID) + public NativeArray GetSubArray(EntityId viewInstanceID) { int planeOffset = 0; int planeCount = 0; @@ -150,7 +150,7 @@ private struct OccluderContextSlot { public bool valid; public int lastUsedFrameIndex; - public int viewInstanceID; + public EntityId viewInstanceID; } private static readonly int s_MaxContextGCFrame = 8; // Allow a few frames for alternate frame shadow updates before cleanup @@ -167,7 +167,7 @@ private struct OccluderContextSlot private SilhouettePlaneCache m_SilhouettePlaneCache; - private NativeParallelHashMap m_ViewIDToIndexMap; + private NativeParallelHashMap m_ViewIDToIndexMap; private List m_OccluderContextData; private NativeList m_OccluderContextSlots; private NativeList m_FreeOccluderContexts; @@ -194,7 +194,7 @@ internal void Init(GPUResidentDrawerResources resources) m_SilhouettePlaneCache.Init(); - m_ViewIDToIndexMap = new NativeParallelHashMap(64, Allocator.Persistent); + m_ViewIDToIndexMap = new NativeParallelHashMap(64, Allocator.Persistent); m_OccluderContextData = new List(); m_OccluderContextSlots = new NativeList(64, Allocator.Persistent); m_FreeOccluderContexts = new NativeList(64, Allocator.Persistent); @@ -262,7 +262,7 @@ private class OcclusionTestOverlayPassData public Material debugOcclusionTestMaterial; } - public void RenderDebugOcclusionTestOverlay(RenderGraph renderGraph, DebugDisplayGPUResidentDrawer debugSettings, int viewInstanceID, in TextureHandle colorBuffer) + public void RenderDebugOcclusionTestOverlay(RenderGraph renderGraph, DebugDisplayGPUResidentDrawer debugSettings, EntityId viewInstanceID, in TextureHandle colorBuffer) { if (debugSettings == null) return; @@ -305,7 +305,7 @@ public void RenderDebugOcclusionTestOverlay(RenderGraph renderGraph, DebugDispla builder.SetRenderAttachment(colorBuffer, 0); builder.UseBuffer(passData.debugPyramid); - builder.SetRenderFunc( + builder.SetRenderFunc( static (OcclusionTestOverlayPassData data, RasterGraphContext ctx) => { ctx.cmd.SetGlobalBuffer(ShaderIDs._OcclusionDebugOverlay, data.debugPyramid); @@ -364,7 +364,7 @@ public void RenderDebugOccluderOverlay(RenderGraph renderGraph, DebugDisplayGPUR passData.passIndex = passIndex; passData.validRange = debugSettings.occluderDebugViewRange; - builder.SetRenderFunc(static + builder.SetRenderFunc(static (OccluderOverlayPassData data, RasterGraphContext ctx) => { var mpb = ctx.renderGraphPool.GetTempMaterialPropertyBlock(); @@ -378,7 +378,7 @@ public void RenderDebugOccluderOverlay(RenderGraph renderGraph, DebugDisplayGPUR } } - private void DispatchDebugClear(ComputeCommandBuffer cmd, int viewInstanceID) + private void DispatchDebugClear(ComputeCommandBuffer cmd, EntityId viewInstanceID) { if (!m_ViewIDToIndexMap.TryGetValue(viewInstanceID, out var contextIndex)) return; @@ -489,12 +489,12 @@ public bool UpdateInstanceOccluders(RenderGraph renderGraph, in OccluderParamete return true; } - internal void UpdateSilhouettePlanes(int viewInstanceID, NativeArray planes) + internal void UpdateSilhouettePlanes(EntityId viewInstanceID, NativeArray planes) { m_SilhouettePlaneCache.Update(viewInstanceID, planes, m_FrameIndex); } - internal OcclusionCullingDebugOutput GetOcclusionTestDebugOutput(int viewInstanceID) + internal OcclusionCullingDebugOutput GetOcclusionTestDebugOutput(EntityId viewInstanceID) { if (m_ViewIDToIndexMap.TryGetValue(viewInstanceID, out var contextIndex) && m_OccluderContextSlots[contextIndex].valid) return m_OccluderContextData[contextIndex].GetDebugOutput(); @@ -518,12 +518,12 @@ public void UpdateOccluderStats(DebugRendererBatcherStats debugStats) } } - internal bool HasOccluderContext(int viewInstanceID) + internal bool HasOccluderContext(EntityId viewInstanceID) { return m_ViewIDToIndexMap.ContainsKey(viewInstanceID); } - internal bool GetOccluderContext(int viewInstanceID, out OccluderContext occluderContext) + internal bool GetOccluderContext(EntityId viewInstanceID, out OccluderContext occluderContext) { if (m_ViewIDToIndexMap.TryGetValue(viewInstanceID, out var contextIndex) && m_OccluderContextSlots[contextIndex].valid) { @@ -536,9 +536,9 @@ internal bool GetOccluderContext(int viewInstanceID, out OccluderContext occlude } internal void UpdateFrame() - { + { for (int i = 0; i < m_OccluderContextData.Count; ++i) - { + { if (!m_OccluderContextSlots[i].valid) continue; @@ -558,7 +558,7 @@ internal void UpdateFrame() ++m_FrameIndex; } - private int NewContext(int viewInstanceID) + private int NewContext(EntityId viewInstanceID) { int newSlot = -1; var newCtxSlot = new OccluderContextSlot { valid = true, viewInstanceID = viewInstanceID, lastUsedFrameIndex = m_FrameIndex }; @@ -581,7 +581,7 @@ private int NewContext(int viewInstanceID) return newSlot; } - private void DeleteContext(int viewInstanceID) + private void DeleteContext(EntityId viewInstanceID) { if (!m_ViewIDToIndexMap.TryGetValue(viewInstanceID, out var contextIndex) || !m_OccluderContextSlots[contextIndex].valid) return; diff --git a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/RenderersBatchersContext.cs b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/RenderersBatchersContext.cs index 16d5f433e39..4964b94faa2 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/RenderersBatchersContext.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/RenderersBatchersContext.cs @@ -370,7 +370,7 @@ public InstanceHandle GetRendererInstanceHandle(EntityId rendererID) return instance; } - public void GetVisibleTreeInstances(in ParallelBitArray compactedVisibilityMasks, in ParallelBitArray processedBits, NativeList visibeTreeRendererIDs, + public void GetVisibleTreeInstances(in ParallelBitArray compactedVisibilityMasks, in ParallelBitArray processedBits, NativeList visibeTreeRendererIDs, NativeList visibeTreeInstances, bool becomeVisibleOnly, out int becomeVisibeTreeInstancesCount) { m_InstanceDataSystem.GetVisibleTreeInstances(compactedVisibilityMasks, processedBits, visibeTreeRendererIDs, visibeTreeInstances, becomeVisibleOnly, out becomeVisibeTreeInstancesCount); diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.ReflProbeNormalization.cs b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.ReflProbeNormalization.cs index b8b2272c272..7552b23e8da 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.ReflProbeNormalization.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.ReflProbeNormalization.cs @@ -29,27 +29,27 @@ public class AdditionalGIBakeRequestsManager const float kInvalidValidity = 1f; const float kValidSHThresh = 0.33f; - private static Dictionary m_SHCoefficients = new Dictionary(); - private static Dictionary m_SHValidity = new Dictionary(); - private static Dictionary m_RequestPositions = new Dictionary(); + private static Dictionary m_SHCoefficients = new Dictionary(); + private static Dictionary m_SHValidity = new Dictionary(); + private static Dictionary m_RequestPositions = new Dictionary(); /// /// Enqueue a request for probe rendering at the specified location. /// /// The position at which a probe is baked. - /// The instance ID of the probe doing the request. - public void EnqueueRequest(Vector3 capturePosition, int probeInstanceID) + /// The entityId of the probe doing the request. + public void EnqueueRequest(Vector3 capturePosition, EntityId probeEntityId) { - m_SHCoefficients[probeInstanceID] = new SphericalHarmonicsL2(); - m_SHValidity[probeInstanceID] = kInvalidSH; - m_RequestPositions[probeInstanceID] = capturePosition; + m_SHCoefficients[probeEntityId] = new SphericalHarmonicsL2(); + m_SHValidity[probeEntityId] = kInvalidSH; + m_RequestPositions[probeEntityId] = capturePosition; } /// /// Dequeue a request for probe rendering. /// /// The instance ID of the probe for which we want to dequeue a request. - public void DequeueRequest(int probeInstanceID) + public void DequeueRequest(EntityId probeInstanceID) { if (m_SHCoefficients.ContainsKey(probeInstanceID)) { @@ -107,7 +107,7 @@ public bool RetrieveProbe(EntityId probeInstanceID, out Vector3 pos, out Spheric return false; } - static internal bool GetPositionForRequest(int probeInstanceID, out Vector3 pos) + static internal bool GetPositionForRequest(EntityId probeInstanceID, out Vector3 pos) { if (m_SHCoefficients.ContainsKey(probeInstanceID)) { @@ -124,7 +124,7 @@ static internal bool GetPositionForRequest(int probeInstanceID, out Vector3 pos) /// /// The instance ID of the probe doing the request and that wants the capture position updated. /// The position at which a probe is baked. - public void UpdatePositionForRequest(int probeInstanceID, Vector3 newPosition) + public void UpdatePositionForRequest(EntityId probeInstanceID, Vector3 newPosition) { if (m_SHCoefficients.ContainsKey(probeInstanceID)) { @@ -165,13 +165,13 @@ static void SetSHCoefficients(NativeArray sh, NativeArray< Debug.Assert(sh.Length == m_SHCoefficients.Count); Debug.Assert(sh.Length == validity.Length); - List requestsInstanceIDs = new List(m_SHCoefficients.Keys); + List requestsInstanceIDs = new List(m_SHCoefficients.Keys); for (int i = 0; i < sh.Length; ++i) SetSHCoefficients(requestsInstanceIDs[i], sh[i], validity[i]); } - static internal void SetSHCoefficients(int instanceID, SphericalHarmonicsL2 sh, float validity) + static internal void SetSHCoefficients(EntityId instanceID, SphericalHarmonicsL2 sh, float validity) { if (validity < kValidSHThresh) { diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl index 065960fa325..226f979cfc1 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl +++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl @@ -77,7 +77,13 @@ struct APVResources struct APVResourcesRW { +#ifdef SHADER_API_METAL + // We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise. + // See https://jira.unity3d.com/browse/UUM-127198 + RWTexture3D L0_L1Rx; +#else RWTexture3D L0_L1Rx; +#endif RWTexture3D L1G_L1Ry; RWTexture3D L1B_L1Rz; RWTexture3D L2_0; diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute index 30f8252f1d0..75d333d3b4f 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute +++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute @@ -15,7 +15,13 @@ Texture3D _State1_L0_L1Rx; Texture3D _State1_L1G_L1Ry; Texture3D _State1_L1B_L1Rz; +#ifdef SHADER_API_METAL +// We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise. +// See https://jira.unity3d.com/browse/UUM-127198 +RWTexture3D _Out_L0_L1Rx; +#else RWTexture3D _Out_L0_L1Rx; +#endif RWTexture3D _Out_L1G_L1Ry; RWTexture3D _Out_L1B_L1Rz; diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute index 33418a71fe4..e43d5d7767e 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute +++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute @@ -9,7 +9,13 @@ #pragma multi_compile_local _ PROBE_VOLUMES_SKY_SHADING_DIRECTION #pragma multi_compile_local _ PROBE_VOLUMES_PROBE_OCCLUSION +#ifdef SHADER_API_METAL +// We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise. +// See https://jira.unity3d.com/browse/UUM-127198 +RWTexture3D _Out_L0_L1Rx; +#else RWTexture3D _Out_L0_L1Rx; +#endif RWTexture3D _Out_L1G_L1Ry; RWTexture3D _Out_L1B_L1Rz; diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ManyLightSampling.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ManyLightSampling.cs index 3cba2489d07..bdbff7067bf 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ManyLightSampling.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ManyLightSampling.cs @@ -22,7 +22,7 @@ internal enum GridSizingStrategy { Uniform, FitToSceneBounds }; internal static class LightGridUtils { - public static Vector3Int ComputeLightGridDims(float3 sceneBounds, int maxLightGridCellCount, GridSizingStrategy lightGridSizingStrategy) + public static Vector3Int ComputeLightGridDims(Vector3 sceneBounds, int maxLightGridCellCount, GridSizingStrategy lightGridSizingStrategy) { if (lightGridSizingStrategy == GridSizingStrategy.Uniform) { @@ -131,12 +131,12 @@ public void Build(CommandBuffer cmd, World.LightState lightState, Bounds sceneBo _sceneBounds = sceneBounds; _lightGridDims = LightGridUtils.ComputeLightGridDims(sceneBounds.size, LightGridCellCount, LightGridSizingStrategy); - float3 div = new float3(1.0f / _lightGridDims.x, 1.0f / _lightGridDims.y, 1.0f / _lightGridDims.z); - Vector3 cellSize = sceneBounds.size * div; + Vector3 div = new Vector3(1.0f / _lightGridDims.x, 1.0f / _lightGridDims.y, 1.0f / _lightGridDims.z); + Vector3 cellSize = Vector3.Scale(sceneBounds.size, div); _cellSize = cellSize; // The length of the diagonal _cellSize.w = Mathf.Sqrt(cellSize.x * cellSize.x + cellSize.y * cellSize.y + cellSize.z * cellSize.z); - _invCellSize = new float4(1.0f) / _cellSize; + _invCellSize = new Vector4(1.0f / _cellSize.x, 1.0f / _cellSize.y, 1.0f / _cellSize.z, 1.0f / _cellSize.w); BindComputeResources(cmd, lightState, sceneBounds, samplingResources); @@ -274,12 +274,12 @@ public void Build(CommandBuffer cmd, World.LightState lightState, Bounds sceneBo int activeCandidates = NumCandidates == -1 ? lightState.LightCount : Mathf.Min(NumCandidates, lightState.LightCount); _lightGridDims = LightGridUtils.ComputeLightGridDims(sceneBounds.size, LightGridCellCount, LightGridSizingStrategy); - float3 div = new float3(1.0f / _lightGridDims.x, 1.0f / _lightGridDims.y, 1.0f / _lightGridDims.z); - Vector3 cellSize = sceneBounds.size * div; + Vector3 div = new Vector3(1.0f / _lightGridDims.x, 1.0f / _lightGridDims.y, 1.0f / _lightGridDims.z); + Vector3 cellSize = Vector3.Scale(sceneBounds.size, div); _cellSize = cellSize; // The length of the diagonal _cellSize.w = Mathf.Sqrt(cellSize.x * cellSize.x + cellSize.y * cellSize.y + cellSize.z * cellSize.z); - _invCellSize = new float4(1.0f) / _cellSize; + _invCellSize = new Vector4(1.0f / _cellSize.x, 1.0f / _cellSize.y, 1.0f / _cellSize.z, 1.0f / _cellSize.w); SamplingResources.Bind(cmd, samplingResources); diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs index 94b4e72fe9f..e78a05b9445 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs @@ -264,7 +264,7 @@ internal static ulong EntityIDToUlong(EntityId id) Debug.Assert(UnsafeUtility.SizeOf() == sizeof(int), "If this assert is firing, the size of EntityId has changed. Remove the intermediate cast to int below, and cast directly to ulong instead."); - return (ulong)(int)id; + return (ulong)(int)id.GetRawData(); } } } diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/World.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/World.cs index c1da6112adf..c27c4947045 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/World.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/World.cs @@ -434,7 +434,7 @@ public void RemoveInstance(InstanceHandle instance) { try { - _rayTracingAccelerationStructure.RemoveInstance(instance.ToInt()); + _rayTracingAccelerationStructure.RemoveInstance(instance.Value); _instanceHandleSet.Remove(instance); RemoveEmissiveMeshes(instance); } @@ -541,7 +541,7 @@ public InstanceHandle AddInstance( } InstanceHandle instance = _instanceHandleSet.Add(); - _rayTracingAccelerationStructure.AddInstance(instance.ToInt(), mesh, localToWorldMatrix, masks, materialIndices, isOpaque, renderingLayerMask); + _rayTracingAccelerationStructure.AddInstance(instance.Value, mesh, localToWorldMatrix, masks, materialIndices, isOpaque, renderingLayerMask); if (enableEmissiveSampling && !ProcessEmissiveMeshes(instance, mesh, bounds, materials, isStatic, _rayTracingAccelerationStructure, _materialPool, filter, _lightState.MeshLights, _subMeshIndices)) LogError($"Failed to process emissive triangles in mesh {mesh.name}."); @@ -551,16 +551,16 @@ public InstanceHandle AddInstance( public void UpdateInstanceTransform(InstanceHandle instance, Matrix4x4 localToWorldMatrix) { - _rayTracingAccelerationStructure.UpdateInstanceTransform(instance.ToInt(), localToWorldMatrix); + _rayTracingAccelerationStructure.UpdateInstanceTransform(instance.Value, localToWorldMatrix); } public void UpdateInstanceMask(InstanceHandle instance, Span perSubMeshMask) { - _rayTracingAccelerationStructure.UpdateInstanceMask(instance.ToInt(), perSubMeshMask); + _rayTracingAccelerationStructure.UpdateInstanceMask(instance.Value, perSubMeshMask); } public void UpdateInstanceMask(InstanceHandle instance, uint mask) { - _rayTracingAccelerationStructure.UpdateInstanceMask(instance.ToInt(), mask); + _rayTracingAccelerationStructure.UpdateInstanceMask(instance.Value, mask); } public void UpdateInstanceMaterials(InstanceHandle instance, Span materials) @@ -571,7 +571,7 @@ public void UpdateInstanceMaterials(InstanceHandle instance, Span [ExecuteAlways] [AddComponentMenu("Rendering/Lens Flare (SRP)")] + [CurrentPipelineHelpURL("shared/lens-flare/lens-flare-component")] public sealed class LensFlareComponentSRP : MonoBehaviour { [SerializeField] diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/NativePassCompiler.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/NativePassCompiler.cs index 0357f870dfe..0235dbbd32a 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/NativePassCompiler.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/NativePassCompiler.cs @@ -475,58 +475,59 @@ void CullUnusedRenderGraphPasses() return; // Must come first - // TODO make another subfunction CullRenderGraphPassesWithNoSideEffect() for this first step of the culling stage - var ctx = contextData; + CullRenderGraphPassesWithNoSideEffect(); - // Cull all passes first - ctx.CullAllPasses(true); - - // Flood fill downstream algorithm using BFS, - // starting from the passes with side effects (writting to imported texture, not allowed to be culled, globals modification...) - // to all their dependencies - while (m_HasSideEffectPassIdCullingStack.Count != 0) - { - int passId = m_HasSideEffectPassIdCullingStack.Pop(); + // Second step of the algorithm that comes later + CullRenderGraphPassesWritingOnlyUnusedResources(); + } + } - ref var passData = ref ctx.passData.ElementAt(passId); + void CullRenderGraphPassesWithNoSideEffect() + { + var ctx = contextData; - // We already found this node through another dependency chain - if (!passData.culled) continue; + // Cull all passes first + ctx.CullAllPasses(true); - // Flow upstream from this node - foreach (ref readonly var input in passData.Inputs(ctx)) - { - ref var inputVersionedDataRes = ref ctx.resources[input.resource]; + // Flood fill downstream algorithm using BFS, + // starting from the passes with side effects (writting to imported texture, not allowed to be culled, globals modification...) + // to all their dependencies + while (m_HasSideEffectPassIdCullingStack.Count != 0) + { + int passId = m_HasSideEffectPassIdCullingStack.Pop(); - if (inputVersionedDataRes.written) - { - m_HasSideEffectPassIdCullingStack.Push(inputVersionedDataRes.writePassId); - } - } + ref var passData = ref ctx.passData.ElementAt(passId); - // We need this node, don't cull it - passData.culled = false; - } + // We already found this node through another dependency chain + if (!passData.culled) continue; - // Update graph based on freshly culled nodes, remove any connection to them - // We start from the latest passes to the first ones as we might need to decrement the version number of unwritten resources - var numPasses = ctx.passData.Length; - for (int passIndex = numPasses - 1; passIndex >= 0; passIndex--) + // Flow upstream from this node + foreach (ref readonly var input in passData.Inputs(ctx)) { - ref readonly var pass = ref ctx.passData.ElementAt(passIndex); + ref var inputVersionedDataRes = ref ctx.resources[input.resource]; - // Remove the connections from the list so they won't be visited again - if (pass.culled) + if (inputVersionedDataRes.written) { - pass.DisconnectFromResources(ctx); + m_HasSideEffectPassIdCullingStack.Push(inputVersionedDataRes.writePassId); } } - // Second step of the algorithm, must come after - // TODO: The resources culling step is currently disabled due to an issue: https://jira.unity3d.com/projects/SRP/issues/SRP-897 - // Renabled the resource culling step after addressing the depth attachment problem above. - // Renabled the relevent tests - // CullRenderGraphPassesWritingOnlyUnusedResources(); + // We need this node, don't cull it + passData.culled = false; + } + + // Update graph based on freshly culled nodes, remove any connection to them + // We start from the latest passes to the first ones as we might need to decrement the version number of unwritten resources + var numPasses = ctx.passData.Length; + for (int passIndex = numPasses - 1; passIndex >= 0; passIndex--) + { + ref readonly var pass = ref ctx.passData.ElementAt(passIndex); + + // Remove the connections from the list so they won't be visited again + if (pass.culled) + { + pass.DisconnectFromResources(ctx); + } } } @@ -581,24 +582,25 @@ void CullRenderGraphPassesWritingOnlyUnusedResources() producerData.culled = true; producerData.DisconnectFromResources(ctx, unusedVersionedResourceIdCullingStack, type); } - else // Producer is (still) necessary, but we might need to remove the read of the previous version coming implicitly with the write of the current version + else { + // Producer is still necessary for now, but if the previous version is only implicitly read by it to write the unused resource + // then we can consider this version useless as well and add it to the stack. + // We purposefully keep the connection between the producer and this resource nevertheless to ensure proper lifetime handling and attachment setup. + // A more optimal approach memory-wise would be to cut the dependency, decrease the latestVersionNumber of the resource and release it earlier + // but we then need to create a transient resource with the right attachment properties and attach it to the non-culled producer or the native render pass setup will be incorrect. + // We always add written resource to the stack so versionedIndex > 0 var prevVersionedRes = new ResourceHandle(unusedResource, unusedResource.version - 1); - // If no explicit read is requested by the user (AccessFlag.Write only), we need to remove the implicit read - // so that we cut cleanly the connection between previous version of the resource and current producer bool isImplicitRead = graph.m_RenderPasses[producerData.passId].implicitReadsList.Contains(prevVersionedRes); if (isImplicitRead) { ref var prevVersionedDataRes = ref ctx.resources[prevVersionedRes]; - // Notify the previous version of this resource that it is not read anymore by this pass - prevVersionedDataRes.RemoveReadingPass(ctx, prevVersionedRes, producerData.passId); - - // We also need to add the previous version of the resource to the stack IF no other pass than current producer needed it - if (prevVersionedDataRes.written && prevVersionedDataRes.numReaders == 0) + // We add the previous version of the resource to the stack IF no other pass than current producer needs it + if (prevVersionedDataRes.written && prevVersionedDataRes.numReaders == 1) { unusedVersionedResourceIdCullingStack.Push(prevVersionedRes); } diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Debug/DebugMessageHandler.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Debug/DebugMessageHandler.cs index 0b95d64e792..385b631efb8 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Debug/DebugMessageHandler.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Debug/DebugMessageHandler.cs @@ -119,7 +119,9 @@ internal static byte[] SerializeMessage(MessageType type, IPayload payload = nul throw new InvalidOperationException("No valid payload provided"); writer.Write(debugDataPayload.graphName); +#pragma warning disable 618 //todo @emilie.thaulow replace with proper read of EntityId writer.Write(debugDataPayload.executionId); +#pragma warning restore 618 writer.Write(DebugDataSerialization.ToJson(debugDataPayload.debugData)); } else if (type == MessageType.AnalyticsData) @@ -156,7 +158,9 @@ internal static (MessageType, IPayload) DeserializeMessage(byte[] data) } payload.graphName = reader.ReadString(); +#pragma warning disable 618 //todo @emilie.thaulow replace with proper read of EntityId payload.executionId = reader.ReadInt32(); +#pragma warning restore 618 payload.debugData = DebugDataSerialization.FromJson(reader.ReadString()); return (type, payload); } diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Textures/PowerOfTwoTextureAtlas.cs b/Packages/com.unity.render-pipelines.core/Runtime/Textures/PowerOfTwoTextureAtlas.cs index 1c16a0dc057..4175f1fb208 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Textures/PowerOfTwoTextureAtlas.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/Textures/PowerOfTwoTextureAtlas.cs @@ -126,7 +126,9 @@ public override void BlitTexture(CommandBuffer cmd, Vector4 scaleOffset, Texture if (Is2D(texture)) { Blit2DTexture(cmd, scaleOffset, texture, sourceScaleOffset, blitMips, BlitType.Padding); +#pragma warning disable 618 // todo @emilie.thaulow replace with GetIdentifier() MarkGPUTextureValid(overrideInstanceID != -1 ? overrideInstanceID : texture.GetEntityId(), blitMips); +#pragma warning restore 618 } } @@ -145,7 +147,9 @@ public void BlitTextureMultiply(CommandBuffer cmd, Vector4 scaleOffset, Texture if (Is2D(texture)) { Blit2DTexture(cmd, scaleOffset, texture, sourceScaleOffset, blitMips, BlitType.PaddingMultiply); +#pragma warning disable 618 // todo @emilie.thaulow replace with GetIdentifier() MarkGPUTextureValid(overrideInstanceID != -1 ? overrideInstanceID : texture.GetEntityId(), blitMips); +#pragma warning restore 618 } } @@ -164,7 +168,9 @@ public override void BlitOctahedralTexture(CommandBuffer cmd, Vector4 scaleOffse if (Is2D(texture)) { Blit2DTexture(cmd, scaleOffset, texture, sourceScaleOffset, blitMips, BlitType.OctahedralPadding); +#pragma warning disable 618 // todo @emilie.thaulow replace with GetIdentifier() MarkGPUTextureValid(overrideInstanceID != -1 ? overrideInstanceID : texture.GetEntityId(), blitMips); +#pragma warning restore 618 } } @@ -183,7 +189,9 @@ public void BlitOctahedralTextureMultiply(CommandBuffer cmd, Vector4 scaleOffset if (Is2D(texture)) { Blit2DTexture(cmd, scaleOffset, texture, sourceScaleOffset, blitMips, BlitType.OctahedralPaddingMultiply); +#pragma warning disable 618 // todo @emilie.thaulow replace with GetIdentifier() MarkGPUTextureValid(overrideInstanceID != -1 ? overrideInstanceID : texture.GetEntityId(), blitMips); +#pragma warning restore 618 } } diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs b/Packages/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs index 45d840208c2..1d9eb5d7db9 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs @@ -208,12 +208,14 @@ internal void SetTexture(RenderTargetIdentifier tex) /// The RTHandle Instance ID. public int GetInstanceID() { +#pragma warning disable 618 // todo @emilie.thaulow replace with ulong if (m_RT != null) return m_RT.GetEntityId(); else if (m_ExternalTexture != null) return m_ExternalTexture.GetEntityId(); else return m_NameID.GetHashCode(); // No instance ID so we return the hash code. +#pragma warning restore 618 } /// diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Textures/Texture2DAtlas.cs b/Packages/com.unity.render-pipelines.core/Runtime/Textures/Texture2DAtlas.cs index 44f12424ae2..041baa4e01c 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Textures/Texture2DAtlas.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/Textures/Texture2DAtlas.cs @@ -490,7 +490,9 @@ public virtual bool AllocateTexture(CommandBuffer cmd, ref Vector4 scaleOffset, /// Allocated scale (.xy) and offset (.zw). /// True on success, false otherwise. public bool AllocateTextureWithoutBlit(Texture texture, int width, int height, ref Vector4 scaleOffset) +#pragma warning disable 618 // todo @emilie.thaulow replace with GetIdentifier() => AllocateTextureWithoutBlit(texture.GetEntityId(), width, height, ref scaleOffset); +#pragma warning restore 618 /// /// Allocate space from the atlas for a texture. @@ -537,7 +539,9 @@ private protected int GetTextureHash(Texture textureA, Texture textureB) /// Texture instance ID. public int GetTextureID(Texture texture) { +#pragma warning disable 618 // todo @emilie.thaulow replace with GetIdentifier() return texture.GetEntityId(); +#pragma warning restore 618 } /// diff --git a/Packages/com.unity.render-pipelines.core/Runtime/UnifiedRayTracing/Common/AccelStructAdapter.cs b/Packages/com.unity.render-pipelines.core/Runtime/UnifiedRayTracing/Common/AccelStructAdapter.cs index a14bccf7ed8..66541d68fca 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/UnifiedRayTracing/Common/AccelStructAdapter.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/UnifiedRayTracing/Common/AccelStructAdapter.cs @@ -17,13 +17,13 @@ internal sealed class AccelStructAdapter : IDisposable internal AccelStructInstances Instances { get => _instances; } - struct InstanceIDs + struct IdsOfInstances { - public int InstanceID; + public int IdOfInstance; public int AccelStructID; } - private readonly Dictionary _objectHandleToInstances = new(); + private readonly Dictionary _objectHandleToInstances = new(); public AccelStructAdapter(IRayTracingAccelStruct accelStruct, GeometryPool geometryPool) { @@ -57,7 +57,7 @@ public void Dispose() _objectHandleToInstances.Clear(); } - public void AddInstance(int objectHandle, Component meshRendererOrTerrain, Span perSubMeshMask, Span perSubMeshMaterialIDs, Span perSubMeshIsOpaque, uint renderingLayerMask) + public void AddInstance(UInt64 objectHandle, Component meshRendererOrTerrain, Span perSubMeshMask, Span perSubMeshMaterialIDs, Span perSubMeshIsOpaque, uint renderingLayerMask) { if (meshRendererOrTerrain is Terrain terrain) { @@ -82,11 +82,11 @@ public void AddInstance(int objectHandle, Component meshRendererOrTerrain, Span< } } - public void AddInstance(int objectHandle, Mesh mesh, Matrix4x4 localToWorldMatrix, Span perSubMeshMask, Span perSubMeshMaterialIDs, Span perSubMeshIsOpaque, uint renderingLayerMask) + public void AddInstance(UInt64 objectHandle, Mesh mesh, Matrix4x4 localToWorldMatrix, Span perSubMeshMask, Span perSubMeshMaterialIDs, Span perSubMeshIsOpaque, uint renderingLayerMask) { int subMeshCount = mesh.subMeshCount; - var instances = new InstanceIDs[subMeshCount]; + var instances = new IdsOfInstances[subMeshCount]; for (int i = 0; i < subMeshCount; ++i) { var instanceDesc = new MeshInstanceDesc(mesh, i) @@ -96,17 +96,17 @@ public void AddInstance(int objectHandle, Mesh mesh, Matrix4x4 localToWorldMatri opaqueGeometry = perSubMeshIsOpaque[i] }; - instances[i].InstanceID = _instances.AddInstance(instanceDesc, perSubMeshMaterialIDs[i], renderingLayerMask); - instanceDesc.instanceID = (uint)instances[i].InstanceID; + instances[i].IdOfInstance = _instances.AddInstance(instanceDesc, perSubMeshMaterialIDs[i], renderingLayerMask); + instanceDesc.instanceID = (uint)instances[i].IdOfInstance; instances[i].AccelStructID = _accelStruct.AddInstance(instanceDesc); } _objectHandleToInstances.Add(objectHandle, instances); } - private void AddInstance(int objectHandle, TerrainDesc terrainDesc) + private void AddInstance(UInt64 objectHandle, TerrainDesc terrainDesc) { - List instanceHandles = new List(); + List instanceHandles = new List(); AddHeightmap(terrainDesc, ref instanceHandles); AddTrees(terrainDesc, ref instanceHandles); @@ -115,7 +115,7 @@ private void AddInstance(int objectHandle, TerrainDesc terrainDesc) } - void AddHeightmap(TerrainDesc terrainDesc, ref List instanceHandles) + void AddHeightmap(TerrainDesc terrainDesc, ref List instanceHandles) { var terrainMesh = TerrainToMesh.Convert(terrainDesc.terrain); var instanceDesc = new MeshInstanceDesc(terrainMesh); @@ -128,17 +128,17 @@ void AddHeightmap(TerrainDesc terrainDesc, ref List instanceHandles } - void AddTrees(TerrainDesc terrainDesc, ref List instanceHandles) + void AddTrees(TerrainDesc terrainDesc, ref List instanceHandles) { TerrainData terrainData = terrainDesc.terrain.terrainData; - float4x4 terrainLocalToWorld = terrainDesc.localToWorldMatrix; - float3 positionScale = new float3((float)terrainData.heightmapResolution, 1.0f, (float)terrainData.heightmapResolution) * terrainData.heightmapScale; - float3 positionOffset = new float3(terrainLocalToWorld[3].x, terrainLocalToWorld[3].y, terrainLocalToWorld[3].z); + Matrix4x4 terrainLocalToWorld = terrainDesc.localToWorldMatrix; + Vector3 positionScale = Vector3.Scale(new Vector3(terrainData.heightmapResolution, 1.0f, terrainData.heightmapResolution), terrainData.heightmapScale); + Vector3 positionOffset = terrainLocalToWorld.GetPosition(); foreach (var treeInstance in terrainData.treeInstances) { var localToWorld = Matrix4x4.TRS( - positionOffset + new float3(treeInstance.position) * positionScale, + positionOffset + Vector3.Scale(treeInstance.position, positionScale), Quaternion.AngleAxis(treeInstance.rotation, Vector3.up), new Vector3(treeInstance.widthScale, treeInstance.heightScale, treeInstance.widthScale)); @@ -167,44 +167,44 @@ void AddTrees(TerrainDesc terrainDesc, ref List instanceHandles) } } - InstanceIDs AddInstance(MeshInstanceDesc instanceDesc, uint materialID, uint renderingLayerMask) + IdsOfInstances AddInstance(MeshInstanceDesc instanceDesc, uint materialID, uint renderingLayerMask) { - InstanceIDs res = new InstanceIDs(); - res.InstanceID = _instances.AddInstance(instanceDesc, materialID, renderingLayerMask); - instanceDesc.instanceID = (uint)res.InstanceID; + IdsOfInstances res = new IdsOfInstances(); + res.IdOfInstance = _instances.AddInstance(instanceDesc, materialID, renderingLayerMask); + instanceDesc.instanceID = (uint)res.IdOfInstance; res.AccelStructID = _accelStruct.AddInstance(instanceDesc); return res; } - public void RemoveInstance(int objectHandle) + public void RemoveInstance(UInt64 objectHandle) { bool success = _objectHandleToInstances.TryGetValue(objectHandle, out var instances); Assert.IsTrue(success); foreach (var instance in instances) { - _instances.RemoveInstance(instance.InstanceID); + _instances.RemoveInstance(instance.IdOfInstance); _accelStruct.RemoveInstance(instance.AccelStructID); } _objectHandleToInstances.Remove(objectHandle); } - public void UpdateInstanceTransform(int objectHandle, Matrix4x4 localToWorldMatrix) + public void UpdateInstanceTransform(UInt64 objectHandle, Matrix4x4 localToWorldMatrix) { bool success = _objectHandleToInstances.TryGetValue(objectHandle, out var instances); Assert.IsTrue(success); foreach(var instance in instances) { - _instances.UpdateInstanceTransform(instance.InstanceID, localToWorldMatrix); + _instances.UpdateInstanceTransform(instance.IdOfInstance, localToWorldMatrix); _accelStruct.UpdateInstanceTransform(instance.AccelStructID, localToWorldMatrix); } } - public void UpdateInstanceMaterialIDs(int objectHandle, Span perSubMeshMaterialIDs) + public void UpdateInstanceMaterialIDs(UInt64 objectHandle, Span perSubMeshMaterialIDs) { bool success = _objectHandleToInstances.TryGetValue(objectHandle, out var instances); Assert.IsTrue(success); @@ -212,11 +212,11 @@ public void UpdateInstanceMaterialIDs(int objectHandle, Span perSubMeshMat int i = 0; foreach (var instance in instances) { - _instances.UpdateInstanceMaterialID(instance.InstanceID, perSubMeshMaterialIDs[i++]); + _instances.UpdateInstanceMaterialID(instance.IdOfInstance, perSubMeshMaterialIDs[i++]); } } - public void UpdateInstanceMask(int objectHandle, Span perSubMeshMask) + public void UpdateInstanceMask(UInt64 objectHandle, Span perSubMeshMask) { bool success = _objectHandleToInstances.TryGetValue(objectHandle, out var instances); Assert.IsTrue(success); @@ -224,13 +224,13 @@ public void UpdateInstanceMask(int objectHandle, Span perSubMeshMask) int i = 0; foreach (var instance in instances) { - _instances.UpdateInstanceMask(instance.InstanceID, perSubMeshMask[i]); + _instances.UpdateInstanceMask(instance.IdOfInstance, perSubMeshMask[i]); _accelStruct.UpdateInstanceMask(instance.AccelStructID, perSubMeshMask[i]); i++; } } - public void UpdateInstanceMask(int objectHandle, uint mask) + public void UpdateInstanceMask(UInt64 objectHandle, uint mask) { bool success = _objectHandleToInstances.TryGetValue(objectHandle, out var instances); Assert.IsTrue(success); @@ -241,7 +241,7 @@ public void UpdateInstanceMask(int objectHandle, uint mask) int i = 0; foreach (var instance in instances) { - _instances.UpdateInstanceMask(instance.InstanceID, perSubMeshMask[i]); + _instances.UpdateInstanceMask(instance.IdOfInstance, perSubMeshMask[i]); _accelStruct.UpdateInstanceMask(instance.AccelStructID, perSubMeshMask[i]); i++; } @@ -258,15 +258,15 @@ public void NextFrame() _instances.NextFrame(); } - public bool GetInstanceIDs(int rendererID, out int[] instanceIDs) + public bool GetInstanceIDs(UInt64 rendererID, out int[] instanceIDs) { - if (!_objectHandleToInstances.TryGetValue(rendererID, out InstanceIDs[] instIDs)) + if (!_objectHandleToInstances.TryGetValue(rendererID, out IdsOfInstances[] instIDs)) { // This should never happen as long as the renderer was already added to the acceleration structure instanceIDs = null; return false; } - instanceIDs = Array.ConvertAll(instIDs, item => item.InstanceID); + instanceIDs = Array.ConvertAll(instIDs, item => item.IdOfInstance); return true; } diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs index e85681ad3e8..21bbc73173c 100644 --- a/Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs +++ b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs @@ -1947,6 +1947,37 @@ public static DepthBits GetDefaultDepthBufferBits() #endif } + /// + /// Indicates whether the combined camera viewports fully cover the screen area. + /// + /// List of cameras to render. + /// True if the combined camera viewports fully cover the screen area. + public static bool IsScreenFullyCoveredByCameras(List cameras) + { + if (cameras == null || cameras.Count == 0) + return false; + + bool isScreenFullyCovered = false; + using (ListPool.Get(out var cameraRects)) + { + // We don't need to exclude stacked cameras for the input camera list because the overlay camera have the same viewport with its base camera. + foreach (var camera in cameras) + { + if (camera.targetTexture != null || camera.cameraType != CameraType.Game) + continue; + + // Skip test if any viewport is full-screen + if (Mathf.Approximately(camera.rect.xMin, 0f) && Mathf.Approximately(camera.rect.yMin, 0f) && camera.rect.width >= Screen.width && camera.rect.height >= Screen.height) + return true; + + cameraRects.Add(camera.rect); + } + isScreenFullyCovered = Mathf.Approximately(SweepLineRectUtils.CalculateRectUnionArea(cameraRects), 1f); + } + + return isScreenFullyCovered; + } + #if UNITY_EDITOR /// /// Populates null fields or collection elements in a target object from a source object of the same type. diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Utilities/SweepLineRectUtils.cs b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/SweepLineRectUtils.cs new file mode 100644 index 00000000000..2f1d9189fb7 --- /dev/null +++ b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/SweepLineRectUtils.cs @@ -0,0 +1,173 @@ +using System.Buffers; +using System.Collections.Generic; +using Unity.Collections; + +namespace UnityEngine.Rendering +{ + /// + /// Utility class that computes the total rect area via a sweep-line. + /// + public static class SweepLineRectUtils + { + struct EventComparer : IComparer + { + public int Compare(Vector4 a, Vector4 b) + { + int cx = a.x.CompareTo(b.x); + if (cx != 0) return cx; + // tie on x: larger y first (+1 before -1) + return b.y.CompareTo(a.y); + } + } + struct ActiveComparer : IComparer + { + public int Compare(Vector2 a, Vector2 b) + { + return a.x.CompareTo(b.x); + } + } + + /// + /// Computes the total covered area (union) of a set of axis-aligned rectangles, counting overlaps only once. + /// + /// List of rects to compute. + /// The normalized union area in [0,1], with overlaps counted once. + public static float CalculateRectUnionArea(List rects) + { + int rectsCount = rects.Count; + var eventsBuffer = ArrayPool.Shared.Rent(rectsCount * 2); + var activeBuffer = ArrayPool.Shared.Rent(rectsCount); + + int eventCount = 0; + foreach (var rect in rects) + InsertEvents(rect, eventsBuffer, ref eventCount); + + float area = CalculateRectUnionArea(eventsBuffer, activeBuffer, eventCount); + ArrayPool.Shared.Return(eventsBuffer); + ArrayPool.Shared.Return(activeBuffer); + + return area; + } + + // Merge overlapping intervals and return total covered Y length + static float MergeLengthY(Vector2[] activeBuffer, int count) + { + if (count <= 0) + return 0f; + + // ActiveBuffer stores (yMin, yMax) + float total = 0f; + float cy0 = activeBuffer[0].x; + float cy1 = activeBuffer[0].y; + + for (int i = 1; i < count; i++) + { + float y0 = activeBuffer[i].x; + float y1 = activeBuffer[i].y; + if (y0 <= cy1) + { + if (y1 > cy1) cy1 = y1; + } + else + { + total += (cy1 - cy0); + cy0 = y0; cy1 = y1; + } + } + total += (cy1 - cy0); + return Mathf.Clamp01(total); + } + + /// + /// Computes the total covered area (union) of a set of axis-aligned rectangles using a sweep-line. + /// + static unsafe float CalculateRectUnionArea(Vector4[] eventsBuffer, Vector2[] activeBuffer, int eventCount) + { + if (eventCount == 0) + return 0f; + + // Sort events by (x asc, enter first) + fixed (Vector4* ptr = eventsBuffer) + { + NativeSortExtension.Sort(ptr, eventCount, new EventComparer()); + } + + int activeCount = 0; + float area = 0f; + float lastX = eventsBuffer[0].x; + bool needLastXUpdate = false; + int i = 0; + + while (i < eventCount) + { + float x = eventsBuffer[i].x; + + if (needLastXUpdate) + { + lastX = x; + needLastXUpdate = false; + } + + // Accumulate area over [lastX, x) + float dx = x - lastX; + if (dx > 0f && activeCount > 0) + { + fixed (Vector2* ptr = activeBuffer) + { + NativeSortExtension.Sort(ptr, activeCount, new ActiveComparer()); + } + area += MergeLengthY(activeBuffer, activeCount) * dx; + lastX = x; + } + + // Consume all events at this x (group approx-equal x's) + do + { + Vector4 ev = eventsBuffer[i]; + float y0 = ev.z; + float y1 = ev.w; + + if (ev.y > 0f) // Enter + { + activeBuffer[activeCount++] = new Vector2(y0, y1); + } + else // Leave + { + // Remove once (swap with last) + for (int k = 0; k < activeCount; k++) + { + Vector2 v = activeBuffer[k]; + if (Mathf.Approximately(v.x, y0) && Mathf.Approximately(v.y, y1)) + { + int last = activeCount - 1; + activeBuffer[k] = activeBuffer[last]; + activeCount = last; + break; + } + } + + if (activeCount == 0) + needLastXUpdate = true; + } + + i++; + } + while (i < eventCount && Mathf.Approximately(eventsBuffer[i].x, x)); + } + + return area; + } + + // Insert events with clamped rects + static void InsertEvents(in Rect rect, Vector4[] eventsBuffer, ref int eventCount) + { + if (rect.width > 0f && rect.height > 0f) + { + var y0 = Mathf.Clamp01(rect.yMin); + var y1 = Mathf.Clamp01(rect.yMax); + eventsBuffer[eventCount++] = new Vector4(Mathf.Clamp01(rect.xMin), +1f, y0, y1); // enter + eventsBuffer[eventCount++] = new Vector4(Mathf.Clamp01(rect.xMax), -1f, y0, y1); // leave + } + } + } +} diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Utilities/SweepLineRectUtils.cs.meta b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/SweepLineRectUtils.cs.meta new file mode 100644 index 00000000000..0334b975c4f --- /dev/null +++ b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/SweepLineRectUtils.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ff1aad7bfc102a847b1979aebf787494 \ No newline at end of file diff --git a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Materials/SubGraphs/GetColorRSUV.shadersubgraph b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Materials/SubGraphs/GetColorRSUV.shadersubgraph new file mode 100644 index 00000000000..486ee0d44d2 --- /dev/null +++ b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Materials/SubGraphs/GetColorRSUV.shadersubgraph @@ -0,0 +1,202 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "a42a90e435fa487c87108a7b28c61d3d", + "m_Properties": [], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "0c2e247e8af94197813fde28b5374908" + } + ], + "m_Nodes": [ + { + "m_Id": "ce1c1b2016d04364bb782648326a1b72" + }, + { + "m_Id": "0c5f8a1a1e124477ac6e8ef7868354b1" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "0c5f8a1a1e124477ac6e8ef7868354b1" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ce1c1b2016d04364bb782648326a1b72" + }, + "m_SlotId": 2 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Sub Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "ce1c1b2016d04364bb782648326a1b72" + }, + "m_SubDatas": [], + "m_ActiveTargets": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "0c2e247e8af94197813fde28b5374908", + "m_Name": "", + "m_ChildObjectList": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", + "m_ObjectId": "0c5f8a1a1e124477ac6e8ef7868354b1", + "m_Group": { + "m_Id": "" + }, + "m_Name": "GetColor (Custom Function)", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -88.66667938232422, + "y": -0.0000075997850217390809, + "width": 206.00001525878907, + "height": 96.0 + } + }, + "m_Slots": [ + { + "m_Id": "b4f1fd4d60cb490f9dc8d744619a337d" + } + ], + "synonyms": [ + "code", + "HLSL" + ], + "m_Precision": 1, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SourceType": 0, + "m_FunctionName": "GetColor", + "m_FunctionSource": "3f5ad0d251b7b794997e01f67893b6b8", + "m_FunctionSourceUsePragmas": true, + "m_FunctionBody": "Enter function body here..." +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "72640d7d8e0a4d169c0628904f7fcf39", + "m_Id": 2, + "m_DisplayName": "Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Color", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "b4f1fd4d60cb490f9dc8d744619a337d", + "m_Id": 0, + "m_DisplayName": "Color", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Color", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode", + "m_ObjectId": "ce1c1b2016d04364bb782648326a1b72", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Output", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 200.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "72640d7d8e0a4d169c0628904f7fcf39" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "IsFirstSlotValid": true +} + diff --git a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Materials/SubGraphs/GetColorRSUV.shadersubgraph.meta b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Materials/SubGraphs/GetColorRSUV.shadersubgraph.meta new file mode 100644 index 00000000000..1df8ca0c204 --- /dev/null +++ b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Materials/SubGraphs/GetColorRSUV.shadersubgraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c9305bc78a7b5344db004121914d1bb7 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3} diff --git a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_01.fbx.meta b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_01.fbx.meta index adc2ded1227..afcf5e88781 100644 --- a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_01.fbx.meta +++ b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_01.fbx.meta @@ -71,7 +71,7 @@ ModelImporter: nodeNameCollisionStrategy: 0 fileIdsGeneration: 1 swapUVChannels: 0 - generateSecondaryUV: 0 + generateSecondaryUV: 1 useFileUnits: 1 keepQuads: 0 weldVertices: 0 diff --git a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_02.fbx.meta b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_02.fbx.meta index 1d3b7532b7c..a17cd9bf61a 100644 --- a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_02.fbx.meta +++ b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_02.fbx.meta @@ -71,7 +71,7 @@ ModelImporter: nodeNameCollisionStrategy: 0 fileIdsGeneration: 1 swapUVChannels: 0 - generateSecondaryUV: 0 + generateSecondaryUV: 1 useFileUnits: 1 keepQuads: 0 weldVertices: 0 diff --git a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_03.fbx.meta b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_03.fbx.meta index 217727f15aa..d4bf0d83746 100644 --- a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_03.fbx.meta +++ b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Models/Agora/SM_Generic_Grass_Patch_03.fbx.meta @@ -71,7 +71,7 @@ ModelImporter: nodeNameCollisionStrategy: 0 fileIdsGeneration: 1 swapUVChannels: 0 - generateSecondaryUV: 0 + generateSecondaryUV: 1 useFileUnits: 1 keepQuads: 0 weldVertices: 0 diff --git a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Scripts/CustomFunctions/FunctionsRSUV.hlsl b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Scripts/CustomFunctions/FunctionsRSUV.hlsl index 8553bbceff1..6a8a8212084 100644 --- a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Scripts/CustomFunctions/FunctionsRSUV.hlsl +++ b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Scripts/CustomFunctions/FunctionsRSUV.hlsl @@ -9,6 +9,12 @@ void GetTexture2DArraySize_float(UnityTexture2DArray texture2DArray, out float W Height = h; } +void GetColor_float(out float4 Color) +{ + uint data = GetData(); + Color = DecodeUintToFloat4(data); +} + void GetRendererShaderUserValueHealth_float(out float Health, out bool ShowHealthBar, out float HealthBarOpacity) { uint data = GetData(); diff --git a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Scripts/HelpersRSUV.cs b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Scripts/HelpersRSUV.cs index 2f6dedd2cf7..ed3e542ac23 100644 --- a/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Scripts/HelpersRSUV.cs +++ b/Packages/com.unity.render-pipelines.core/Samples~/RendererShaderUserValue_Common/Scripts/HelpersRSUV.cs @@ -59,19 +59,19 @@ public static int DecodeData(uint value, int bitOffset, int length) // Encode a Color32 type into the full raw uint public static uint EncodeData(Color32 color) { - return ((uint)color.r << 24) | - ((uint)color.g << 16) | - ((uint)color.b << 8) | - (uint)color.a; + return ((uint)color.r << 16) | + ((uint)color.g << 8) | + ((uint)color.b << 0) | + (uint)color.a << 24; } // Encode a Color type into the full raw uint public static uint EncodeData(Color color) { - byte r = (byte)(Mathf.Clamp01(color.r) * 255f); - byte g = (byte)(Mathf.Clamp01(color.g) * 255f); - byte b = (byte)(Mathf.Clamp01(color.b) * 255f); - byte a = (byte)(Mathf.Clamp01(color.a) * 255f); + byte r = (byte)(Mathf.Clamp01(color.linear.r) * 255f); + byte g = (byte)(Mathf.Clamp01(color.linear.g) * 255f); + byte b = (byte)(Mathf.Clamp01(color.linear.b) * 255f); + byte a = (byte)(Mathf.Clamp01(color.linear.a) * 255f); return EncodeData(new Color32(r, g, b, a)); } diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/GPUDriven/GPUDrivenRenderingTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/GPUDriven/GPUDrivenRenderingTests.cs index 93f5c51d7b3..487b2a56a41 100644 --- a/Packages/com.unity.render-pipelines.core/Tests/Editor/GPUDriven/GPUDrivenRenderingTests.cs +++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/GPUDriven/GPUDrivenRenderingTests.cs @@ -990,7 +990,7 @@ public void TestInstanceData() renderersID[1] = gameObjects[1].GetComponent().GetEntityId(); renderersID[2] = gameObjects[2].GetComponent().GetEntityId(); - var lodGroupDataMap = new NativeParallelHashMap(64, Allocator.TempJob); + var lodGroupDataMap = new NativeParallelHashMap(64, Allocator.TempJob); gpuDrivenProcessor.EnableGPUDrivenRenderingAndDispatchRendererData(renderersID, (in GPUDrivenRendererGroupData rendererData, IList meshes, IList materials) => { diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/NativePassCompilerRenderGraphTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/NativePassCompilerRenderGraphTests.cs index d378ca1bb06..09fbb08b539 100644 --- a/Packages/com.unity.render-pipelines.core/Tests/Editor/NativePassCompilerRenderGraphTests.cs +++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/NativePassCompilerRenderGraphTests.cs @@ -1799,7 +1799,6 @@ public void BreakPasses_WhenNoOrDifferentShadingRateImage() } } -/* // DepthAttachment bug: https://jira.unity3d.com/projects/SRP/issues/SRP-897 [Test] public void UnusedResourceCulling_CullProducer_WhenVersionsAreNotExplicitlyRead() { @@ -1905,7 +1904,6 @@ public void UnusedResourceCulling_CullProducer_WhenNoneOfItsWrittenResourcesAreE // extraBuffer[2] latest version remains at 1 Assert.AreEqual(result.contextData.UnversionedResourceData(passes[0].attachments[1].handle).latestVersionNumber, 1); } -*/ [Test] public void UnusedResourceCulling_DoNotCullProducer_WhenOneOfItsWrittenResourcesIsExplicitlyRead() @@ -2009,6 +2007,42 @@ public void UnusedResourceCulling_CullProducer_WhenNextVersionOfProducedResource Assert.AreEqual(result.contextData.UnversionedResourceData(passes[0].attachments[0].handle).latestVersionNumber, 3); } + [Test] + public void UnusedResourceCulling_KeepUnusedLatestVersion_WhenProducerIsNotCulled() + { + var g = AllocateRenderGraph(); + var renderTargets = ImportAndCreateRenderTargets(g); + + // This pass implicitly reads version 0 of extraTextures[0] and writes its version 1 that will be implicitly read in the next pass - dependency + // It also explicitly reads version 0 of extraTextures[1] and writes its version 1 but none reads it - no side effect + // It also implicitly reads version 0 of depthBuffer that is imported in RG but don't write it - no side effect + using (var builder = g.AddRasterRenderPass("TestPass0", out var passData)) + { + builder.SetRenderAttachment(renderTargets.extraTextures[0], 0, AccessFlags.ReadWrite); + builder.SetRenderAttachment(renderTargets.backBuffer, 1, AccessFlags.Write); + builder.SetRenderFunc((RenderGraphTestPassData data, RasterGraphContext context) => { }); + } + + // This pass writes version 2 of extraTextures[2] that no one uses + // technically we could get rid of this version but we preserve it for now to ensure correct resource lifetime and render pass setup + // We explicitly request this pass not to be culled, so it will be preserved + using (var builder = g.AddRasterRenderPass("TestPass1", out var passData)) + { + builder.SetRenderAttachment(renderTargets.extraTextures[0], 0, AccessFlags.Write); + builder.SetRenderFunc((RenderGraphTestPassData data, RasterGraphContext context) => { }); + builder.AllowPassCulling(false); + } + + var result = g.CompileNativeRenderGraph(g.ComputeGraphHash()); + var passes = result.contextData.GetNativePasses(); + + // - TestPass1 can NOT be culled + // - TestPass1 can NOT be culled as it writes to an imported texture (backbuffer) + Assert.IsTrue(passes != null && passes.Count == 1 && passes[0].numGraphPasses == 2); + // extraBuffer[0] latest version remains at 2 if no one uses it + Assert.AreEqual(result.contextData.UnversionedResourceData(passes[0].attachments[0].handle).latestVersionNumber, 2); + } + // Test using a texture as both a texture and render attachment, one will require topleft and one bottom left so this should throw. [Test] public void TextureUVOrigin_CheckInvalidMixedUVOriginUseTextureCompiler() diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/SweepLineRectUtilsTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/SweepLineRectUtilsTests.cs new file mode 100644 index 00000000000..420b7be625c --- /dev/null +++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/SweepLineRectUtilsTests.cs @@ -0,0 +1,184 @@ +using NUnit.Framework; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering; + +namespace UnityEditor.Rendering.Tests +{ + class SweepLineRectUtilsTests + { + const float Epsilon = 1e-5f; + + static object[][] s_Empty = new object[][] + { + new object[] { new List() } + }; + + [Test] + [TestCaseSource("s_Empty")] + public void TestEmpty(List rects) + { + var area = SweepLineRectUtils.CalculateRectUnionArea(rects); + Assert.That(area, Is.EqualTo(0f).Within(Epsilon)); + } + + static object[][] s_SingleRect = new object[][] + { + new object[] { new Rect(0.1f, 0.2f, 0.3f, 0.4f), 0.12f }, + new object[] { new Rect(0f, 0f, 1f, 1f), 1f }, + }; + + [Test] + [TestCaseSource("s_SingleRect")] + public void SingleRect(Rect r, float expected) + { + var area = SweepLineRectUtils.CalculateRectUnionArea(new List { r }); + Assert.That(area, Is.EqualTo(expected).Within(Epsilon)); + } + + static object[][] s_NonOverlapping = new object[][] + { + new object[] + { + new List { new Rect(0f, 0f, 0.5f, 0.5f), new Rect(0.5f, 0.5f, 0.5f, 0.5f) }, 0.5f + }, + new object[] + { + new List + { + new Rect(0f, 0f, 0.2f, 0.2f), // 0.04 + new Rect(0.2f, 0f, 0.3f, 0.2f), // 0.06 + new Rect(0.5f, 0.5f, 0.25f, 0.25f) // 0.0625 + }, + 0.1625f + }, + new object[] + { + new List { new Rect(0f, 0f, 0.5f, 1f), new Rect(0.5f, 0f, 0.5f, 1f) }, 1f + }, + new object[] + { + new List { new Rect(0.2f, 0.2f, 0f, 0.5f), new Rect(0.2f, 0.2f, 0.5f, 0f) }, 0f + }, + new object[] + { + new List { new Rect(0f, 0f, 0f, 0f), new Rect(0.1f, 0.1f, 0.2f, 0.3f) }, 0.06f + }, + new object[] + { + new List + { + new Rect(0f, 0.3f, 0.3f, 0.3f), + new Rect(0.6f, 0.3f, 0.3f, 0.3f), + new Rect(0.3f, 0.3f, 0.3f, 0.3f), + new Rect(0f, 0.6f, 0.3f, 0.3f), + new Rect(0.7f, 0.7f, 0.3f, 0.3f), + }, + 0.45f + } + }; + + [Test] + [TestCaseSource("s_NonOverlapping")] + public void NonOverlappingRects(List rects, float expected) + { + var area = SweepLineRectUtils.CalculateRectUnionArea(rects); + Assert.That(area, Is.EqualTo(expected).Within(Epsilon)); + } + + static object[][] s_Overlapping = new object[][] + { + new object[] + { + new List + { + new Rect(0.2f, 0.2f, 0.4f, 0.3f), + new Rect(0.2f, 0.2f, 0.4f, 0.3f) + }, + 0.4f * 0.3f + }, + new object[] + { + new List + { + new Rect(0f, 0f, 0.6f, 0.5f), + new Rect(0.3f, 0f, 0.6f, 0.5f) + }, + 0.9f * 0.5f + }, + new object[] + { + new List + { + new Rect(0f, 0.3f, 0.4f, 0.4f), + new Rect(0.6f, 0.3f, 0.4f, 0.4f), + new Rect(0.3f, 0f, 0.4f, 0.4f), + new Rect(0.3f, 0.6f, 0.4f, 0.4f) + }, + 0.64f - 0.04f + } + }; + + [Test] + [TestCaseSource("s_Overlapping")] + public void OverlappingRects(List rects, float expected) + { + var area = SweepLineRectUtils.CalculateRectUnionArea(rects); + Assert.That(area, Is.EqualTo(expected).Within(Epsilon)); + } + + static object[][] s_ClampingOutside = new object[][] + { + new object[] + { + new List + { + new Rect(-0.2f, -0.2f, 0.3f, 0.3f), // clamps to [0,0,0.1,0.1] area 0.01 + new Rect(0.9f, 0.9f, 0.5f, 0.5f), // clamps to [0.9,0.9,0.1,0.1] area 0.01 + }, + 0.02f + }, + new object[] { new List { new Rect(-10f, -10f, 20f, 20f) }, 1f } + }; + + [Test] + [TestCaseSource("s_ClampingOutside")] + public void ClampingOutside(List rects, float expected) + { + var area = SweepLineRectUtils.CalculateRectUnionArea(rects); + Assert.That(area, Is.EqualTo(expected).Within(Epsilon)); + } + + static object[][] s_IntervalsSorting = new object[][] + { + new object[] + { + new List + { + new Rect(0.0f, 0.2f, 0.2f, 0.2f), + new Rect(0.0f, 0.0f, 0.2f, 0.1f), + new Rect(0.0f, 0.3f, 0.2f, 0.2f), + }, + 0.2f * 0.4f + }, + new object[] + { + new List + { + new Rect(0.0f, 0.0f, 0.2f, 0.1f), + new Rect(0.3f, 0.0f, 0.3f, 0.1f), + new Rect(0.5f, 0.0f, 0.2f, 0.1f), + }, + 0.6f * 0.1f + } + }; + + [Test] + [TestCaseSource("s_IntervalsSorting")] + public void IntervalsSorting(List rects, float expected) + { + var area = SweepLineRectUtils.CalculateRectUnionArea(rects); + Assert.That(area, Is.EqualTo(expected).Within(Epsilon)); + } + } +} diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/SweepLineRectUtilsTests.cs.meta b/Packages/com.unity.render-pipelines.core/Tests/Editor/SweepLineRectUtilsTests.cs.meta new file mode 100644 index 00000000000..cdc7c66baea --- /dev/null +++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/SweepLineRectUtilsTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: bfba7561301ac2a44b010c12825cd189 \ No newline at end of file diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/AccelStructAdapterTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/AccelStructAdapterTests.cs index 44bdeb1bed9..d14290492a2 100644 --- a/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/AccelStructAdapterTests.cs +++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/AccelStructAdapterTests.cs @@ -54,7 +54,7 @@ void RayTraceAndCheckUVs(Mesh mesh, float2 expected, int uvChannel, float tolera const int instanceCount = 4; CreateMatchingRaysAndInstanceDescs(instanceCount, mesh, out RayWithFlags[] rays, out MeshInstanceDesc[] instanceDescs); - for (int i = 0; i < instanceCount; ++i) + for (ulong i = 0; i < instanceCount; ++i) { m_AccelStruct.AddInstance(i, instanceDescs[i].mesh, instanceDescs[i].localToWorldMatrix, new uint[]{ 0xFFFFFFFF }, new uint[]{ 0xFFFFFFFF }, new bool[] { true }, 1); } diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/TableOfContents.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/TableOfContents.md index 6116eb75257..9a9408a9ba9 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/TableOfContents.md +++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/TableOfContents.md @@ -437,6 +437,7 @@ * [StackLit Master Stack reference](stacklit-master-stack-reference.md) * [Canvas Master Stack reference](canvas-master-stack-reference.md) * [Fog Volume Master Stack reference](fog-volume-master-stack-reference.md) + * [Six Way Master Stack reference](six-way-master-stack-reference.md) * [Water Master Stack reference](master-stack-water.md) * [Terrain Master Stack reference](terrain-master-stack-reference.md) * [Environmental effects reference](reference-environmental-effects.md) diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/shader-graph-materials-reference.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/shader-graph-materials-reference.md index d0e3963d7d8..9351c67f19f 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/shader-graph-materials-reference.md +++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/shader-graph-materials-reference.md @@ -16,8 +16,9 @@ Learn about the properties and behavior of HDRP Shader Graph contexts and master |[StackLit Master Stack reference](stacklit-master-stack-reference.md)|Properties and options in the StackLit master stack.| |[Canvas Master Stack reference](canvas-master-stack-reference.md)|Properties and options in the Canvas master stack.| |[Fog Volume Master Stack reference](fog-volume-master-stack-reference.md)|Properties and options in the Fog Volume master stack.| +|[Six Way Master Stack reference](six-way-master-stack-reference.md)|Properties and options in the Six Way master stack.| |[Terrain Master Stack reference](terrain-master-stack-reference.md)|Properties and options in the Terrain master stack.| ## Additional resources -- [Shader graph](https://docs.unity3d.com/Packages/com.unity.shadergraph@latest?subfolder=/manual/index.html) \ No newline at end of file +- [Shader graph](https://docs.unity3d.com/Packages/com.unity.shadergraph@latest?subfolder=/manual/index.html) diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/six-way-master-stack-reference.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/six-way-master-stack-reference.md new file mode 100644 index 00000000000..62fff10755d --- /dev/null +++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/six-way-master-stack-reference.md @@ -0,0 +1,105 @@ +# Six Way Master Stack reference + +The Six Way master stack refers to the settings and contexts that the Six Way shader graph includes by default. + +# Contexts + +A Shader Graph contains the following contexts: + +- [Vertex context](#vertex-context) +- [Fragment context](#fragment-context) + +The Six Way Master Stack has its own [Graph Settings](#graph-settings) that determine which blocks you can use in the Shader Graph contexts. For more information about the relationship between Graph Settings and blocks, refer to [Contexts and blocks](understand-shader-graph-in-hdrp.md). + +This section contains information on the blocks that this master stack material type uses by default, and which blocks you can use to affect the Graph Settings. + + + +## Vertex context + +The [Vertex context](vertex-context-reference.md) represents the vertex stage of a shader. + +### Default + +When you create a new Six Way Master Stack, the Vertex Context contains the following blocks by default: + +| **Property** | **Description** | **Setting Dependency** | **Default Value** | +|---|---|---|---| +| **Position** | Defines the per-vertex position in object space. | None | `CoordinateSpace.Object` | +| **Normal** | Defines the per-vertex normal vector in object space; expects a unit-length direction (magnitude 1). | None | `CoordinateSpace.Object` | +| **Tangent** | Defines the per-vertex tangent vector in object space; expects a unit-length direction aligned with mesh UVs. | None | `CoordinateSpace.Object` | + + + +## Fragment context + +The [Fragment context](fragment-context-reference.md) represents the fragment stage of a shader. + +### Default + +When you create a new Six Way Master Stack, the Fragment Context contains the following blocks by default: + +| **Property** | **Description** | **Setting Dependency** | **Default Value** | +|---|---|---|---| +| **Base Color** | Defines the base color of the material. | None | `Color.grey` | +| **Emission** | Defines the color of light emitted from the material’s surface. Emissive materials appear as light sources in the scene. | None | `Color.black` | +| **Ambient Occlusion** | Defines the material’s ambient occlusion (range 0–1). A value of 0 fully occludes a fragment (appears black) and 1 applies no occlusion (ambient color unchanged). | None | 1.0 | +| **Alpha** | Sets the material’s alpha (range 0–1). Determines transparency. | None | 1.0 | +| **Right Top Back** | Sets the color applied to surfaces facing the positive x-axis (right), positive y-axis (top), and negative z-axis (back). | None | `Color.grey` | +| **Left Bottom Front** | Sets the color applied to surfaces facing the negative x-axis (left), negative y-axis (bottom), and positive z-axis (front). | None | `Color.grey` | +| **Color Absorption Strength** | Controls how strongly the material absorbs light color as it passes through the object. Higher values increase the influence of the opposite face’s colors on visible shading. Default 0.5. Available only when **Use Color Absorption** is enabled in the graph settings. | **Use Color Absorption** enabled | 0.5 | + + + +## Graph settings + +The Graph Inspector contains the following properties. + +### Surface options + +| **Property** | **Option** | **Description** | +|---|---|---| +| **Surface Type** | N/A | Specifies whether the material supports transparency. Selecting **Transparent** increases rendering cost and exposes additional properties. The options are:
  • **Opaque**
  • **Transparent:** Simulates a translucent material that light can penetrate (for example, clear plastic or glass).
| +| **Surface Type** | **Rendering Pass** | Specifies the rendering pass HDRP uses for this material. Appears only when **Surface Type** is **Transparent**. The options are:
  • **Default:** Draws the GameObject in the default opaque or transparent pass, based on the Surface Type.
  • **Before Refraction:** Draws the GameObject before the refraction pass so it contributes to refraction.
  • **After post-process:** Draws after post-processing (Unlit Materials only).
| +| **Surface Type** | **Blending Mode** | Specifies how HDRP blends the material’s pixels with the background. Appears only when **Surface Type** is **Transparent**. The options are:
  • **Alpha:** Uses the material alpha to control transparency (0 = fully transparent, 1 = visually opaque but rendered in the Transparent pass).
  • **Additive:** Adds the material RGB to the background; alpha scales the added intensity (0–1).
  • **Premultiply:** Assumes RGB is pre-multiplied by alpha for better filtering and compositing.
| +| **Surface Type** | **Receive fog** | Indicates whether fog affects the transparent surface. Appears only when **Surface Type** is **Transparent**. | +| **Surface Type** | **Depth Test** | Specifies the depth-test comparison function HDRP uses. Appears only when **Surface Type** is **Transparent**. | +| **Surface Type** | **Depth Write** | Indicates whether HDRP writes depth for GameObjects using this material. Appears only when **Surface Type** is **Transparent**. | +| **Surface Type** | **Sorting Priority** | Adjusts the rendering order of overlapping transparent surfaces. Appears only when **Surface Type** is **Transparent**. | +| **Surface Type** | **Back Then Front Rendering** | Enables two-pass rendering that draws back faces first and front faces second. Appears only when **Surface Type** is **Transparent**. | +| **Surface Type** | **Transparent Depth Prepass** | Adds transparent surface polygons to the depth buffer before the lighting pass to improve sorting. Not supported when the rendering pass is Low Resolution. Appears only when **Surface Type** is **Transparent**. | +| **Surface Type** | **Transparent Depth Postpass** | Adds transparent surface polygons to the depth buffer after the lighting pass so they affect post-processing (for example, motion blur or depth of field). Not supported when the rendering pass is Low Resolution. Appears only when **Surface Type** is **Transparent**. | +| **Surface Type** | **Transparent Writes Motion Vectors** | Enables writing motion vectors for transparent GameObjects to support effects like motion blur. Not supported when the rendering pass is Low Resolution. Appears only when **Surface Type** is **Transparent**. | +| **Surface Type** | **Cull Mode** | Specifies which faces to cull. The options are:
  • **Back:** Culls back faces.
  • **Front:** Culls front faces.
| +| **Alpha Clipping** | N/A | Enables cutout rendering by discarding pixels below a threshold to create sharp transparency edges. | +| **Double Sided** | N/A | Specifies how HDRP renders polygon faces. The options are:
  • **Disabled:** Renders front faces only.
  • **Enabled:** Renders both faces with identical normals.
  • **Flipped Normals:** Renders both faces and flips back-face normals by 180°, making the material appear the same on both sides.
  • **Mirrored Normals:** Renders both faces and mirrors back-face normals, effectively inverting the material on the back face (useful for leaves).
| +| **Depth Offset** | N/A | Modifies the depth buffer according to displacement so depth-based effects (for example, Contact Shadows) capture pixel-level displacement. | +| **Add Custom Velocity** | N/A | Adds a provided object-space velocity to motion-vector calculation to support procedural geometry while still accounting for other deformations (for example, skinning or vertex animation). | +| **Exclude from Temporal Upscaling and Anti Aliasing** | N/A | Excludes the surface from temporal upscalers and temporal anti-aliasing to reduce blurring on content such as animated textures. Works only for **Transparent** surfaces. | +| **Tessellation** | N/A | Enables mesh subdivision using tessellation according to the material’s tessellation options. | +| **Tessellation** | **Max Displacement** | Specifies the maximum world-space displacement in meters to aid culling. Sets this to the maximum displacement magnitude from the displacement map. | +| **Tessellation** | **Triangle Culling Epsilon** | Specifies the culling epsilon for tessellated triangles. Sets to -1.0 to disable back-face culling; increases the value for more aggressive culling and better performance. | +| **Tessellation** | **Start Fade Distance** | Sets the camera distance (meters) at which tessellation begins to fade out. Fades out until the value set for the **End Fade Distance**, where tessellation stops. | +| **Tessellation** | **End Fade Distance** | Sets the maximum camera distance (meters) at which HDRP tessellates triangles; beyond this distance, no tessellation occurs. | +| **Tessellation** | **Triangle Size** | Sets the screen-space triangle size (pixels) that triggers subdivision (for example, 100 subdivides triangles that cover 100 pixels). Lower values tessellate smaller triangles but increase cost. | +| **Tessellation** | **Tessellation Mode** | Specifies whether HDRP applies Phong tessellation. Materials can use a displacement map for tessellation. The options are:
  • **None:** Uses displacement only (no tessellation if no displacement map is assigned).
  • **Phong:** Applies vertex interpolation to smooth geometry and displacement.
| +| **Receive Shadows** | N/A | Determines whether the material receives and displays shadows cast by other objects; may affect batching performance. | +| **Use Color Absorption** | N/A | Enables simulation of light passing through the object and picking up color from the opposite side. When enabled, Unity adds the **Color Absorption Strength** block to the Fragment context. | +### Advanced options + +The Graph Inspector contains the following advanced options. + +| **Property** | **Description** | +|---|---| +| **Support Lod Crossfade** | Indicates whether HDRP processes dithering when a mesh moves moves from one LOD level to another. | +| **Add Precomputed Velocity** | Indicates whether to use precomputed velocity information stored in an Alembic file. | + +### Other options + +The Graph Inspector also contains the following options. + +| **Property** | **Description** | +|---|---| +| **Custom Editor GUI** | Renders a custom editor GUI in the **Inspector** window of the material. Enter the name of the GUI class in the field. For more information, refer to [Control material properties in the Inspector window](../writing-shader-display-types). | +| **Support VFX Graph** | Indicates whether this Shader Graph supports the Visual Effect Graph. If you enable this property, output contexts can use this Shader Graph to render particles. The internal setup that Shader Graph does to support visual effects happens when Unity imports the Shader Graph. This means that if you enable this property, but don't use the Shader Graph in a visual effect, there is no impact on performance. It only affects the Shader Graph import time. | +| **Support High Quality Line Rendering** | Indicates whether this Shader Graph supports the High Quality Line Rendering feature. Enabling this property will only have an effect on renderers with line topology. | diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPBuildData.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPBuildData.cs index e316d3ca59a..08a985da7e7 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPBuildData.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPBuildData.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.Rendering; using UnityEngine.Rendering.HighDefinition; @@ -16,9 +17,10 @@ internal class HDRPBuildData : IDisposable public List renderPipelineAssets { get; private set; } = new List(); public bool playerNeedRaytracing { get; private set; } public bool stripDebugVariants { get; private set; } = true; + public bool dynamicLightmapsUsed { get; private set; } public bool waterDecalMaskAndCurrent { get; private set; } - public Dictionary rayTracingComputeShaderCache { get; private set; } = new(); - public Dictionary computeShaderCache { get; private set; } = new(); + public Dictionary rayTracingComputeShaderCache { get; private set; } = new(); + public Dictionary computeShaderCache { get; private set; } = new(); public HDRenderPipelineRuntimeShaders runtimeShaders { get; private set; } public HDRenderPipelineRuntimeMaterials materialResources { get; private set; } @@ -69,6 +71,35 @@ public HDRPBuildData(BuildTarget buildTarget, bool isDevelopmentBuild) m_Instance = this; } + public void SetDynamicLightmapsUsedInBuildScenes() + { + dynamicLightmapsUsed = DynamicLightmapsUsedInBuildScenes(); + } + + static bool DynamicLightmapsUsedInBuildScenes() + { + var originalSetup = EditorSceneManager.GetSceneManagerSetup(); + + bool dynamicLightmapsUsed = false; + foreach (EditorBuildSettingsScene scene in EditorBuildSettings.scenes) + { + if (!scene.enabled) continue; + + EditorSceneManager.OpenScene(scene.path, OpenSceneMode.Single); + + if (Lightmapping.HasDynamicGILightmapTextures()) + { + dynamicLightmapsUsed = true; + break; + } + } + + if (originalSetup.Length > 0) + EditorSceneManager.RestoreSceneManagerSetup(originalSetup); + + return dynamicLightmapsUsed; + } + public void Dispose() { renderPipelineAssets?.Clear(); @@ -76,6 +107,7 @@ public void Dispose() computeShaderCache?.Clear(); playerNeedRaytracing = false; stripDebugVariants = true; + dynamicLightmapsUsed = false; waterDecalMaskAndCurrent = false; buildingPlayerForHDRenderPipeline = false; runtimeShaders = null; diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs index 5a9a93713c7..b75c370ff69 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs @@ -33,6 +33,9 @@ public void OnPreprocessBuild(BuildReport report) bool isDevelopmentBuild = (report.summary.options & BuildOptions.Development) != 0; m_BuildData = new HDRPBuildData(EditorUserBuildSettings.activeBuildTarget, isDevelopmentBuild); + // Since the HDRPBuildData instance is used in a lot of places, doing this check here ensures that it is done before the build starts. + m_BuildData.SetDynamicLightmapsUsedInBuildScenes(); + if (m_BuildData.buildingPlayerForHDRenderPipeline) { // Now that we know that we are on HDRP we need to make sure everything is correct, otherwise we break the build. diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs index 989ca554694..bc6a6b9754f 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs @@ -1,3 +1,4 @@ +using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.Rendering; using UnityEngine.Rendering.HighDefinition; @@ -70,8 +71,10 @@ protected override bool DoShadersStripper(HDRenderPipelineAsset hdrpAsset, Shade // Remove editor only pass bool isSceneSelectionPass = snippet.passName == "SceneSelectionPass"; bool isScenePickingPass = snippet.passName == "ScenePickingPass"; - bool metaPassUnused = (snippet.passName == "META") && (SupportedRenderingFeatures.active.enlighten == false || - ((int)SupportedRenderingFeatures.active.lightmapBakeTypes | (int)LightmapBakeType.Realtime) == 0); + + bool isEnlightenSupported = SupportedRenderingFeatures.active.enlighten && ((int)SupportedRenderingFeatures.active.lightmapBakeTypes | (int)LightmapBakeType.Realtime) != 0; + bool metaPassUnused = (snippet.passName == "META") && (!isEnlightenSupported || !HDRPBuildData.instance.dynamicLightmapsUsed); + bool editorVisualization = inputData.shaderKeywordSet.IsEnabled(m_EditorVisualization); if (isSceneSelectionPass || isScenePickingPass || metaPassUnused || editorVisualization) return true; @@ -214,10 +217,9 @@ protected override bool DoShadersStripper(HDRenderPipelineAsset hdrpAsset, Shade } else { - // Strip all the area light shadow filtering variants when they are disabled in the shader config. - foreach (var areaShadowVariant in m_ShadowKeywords.AreaShadowVariants) - if (inputData.shaderKeywordSet.IsEnabled(areaShadowVariant.Value)) - return true; + // Strip only AREA_SHADOW_HIGH variant, because HDRP enables AREA_SHADOW_MEDIUM if area light is disabled in ShaderConfig + if (inputData.shaderKeywordSet.IsEnabled(m_AreaShadowHigh)) + return true; } if (!shadowInitParams.supportScreenSpaceShadows && shader == m_ShaderResources.screenSpaceShadowPS) diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/ShaderStrippers/HDRPComputeShaderVariantStripper.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/ShaderStrippers/HDRPComputeShaderVariantStripper.cs index a9ffa22b499..0bbbb6379c7 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/ShaderStrippers/HDRPComputeShaderVariantStripper.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/ShaderStrippers/HDRPComputeShaderVariantStripper.cs @@ -15,6 +15,7 @@ class HDRPComputeShaderVariantStripper : IComputeShaderVariantStripper, ICompute protected ShaderKeyword m_ProbeVolumesL1 = new ShaderKeyword("PROBE_VOLUMES_L1"); protected ShaderKeyword m_ProbeVolumesL2 = new ShaderKeyword("PROBE_VOLUMES_L2"); protected ShaderKeyword m_WaterAbsorption = new ShaderKeyword("SUPPORT_WATER_ABSORPTION"); + protected ShaderKeyword m_AreaShadowHigh = new ShaderKeyword("AREA_SHADOW_HIGH"); protected HDRenderPipelineRuntimeShaders m_Shaders; @@ -123,10 +124,9 @@ internal bool StripShader(HDRenderPipelineAsset hdAsset, ComputeShader shader, s } else { - // Strip all the area light shadow filtering variants when they are disabled in the shader config. - foreach (var areaShadowVariant in m_ShadowKeywords.AreaShadowVariants) - if (inputData.shaderKeywordSet.IsEnabled(areaShadowVariant.Value)) - return true; + // Strip only AREA_SHADOW_HIGH variant, because HDRP enables AREA_SHADOW_MEDIUM if area light is disabled in ShaderConfig + if (inputData.shaderKeywordSet.IsEnabled(m_AreaShadowHigh)) + return true; } // Screen space shadow variant is exclusive, either we have a variant with dynamic if that support screen space shadow or not diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/Reflection/HDBakedReflectionSystem.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/Reflection/HDBakedReflectionSystem.cs index 2bcdd91b723..e8dd740b34b 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/Reflection/HDBakedReflectionSystem.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/Reflection/HDBakedReflectionSystem.cs @@ -422,7 +422,7 @@ public static bool BakeProbes(IEnumerable bakedProbes) var probeFormat = GraphicsFormat.R16G16B16A16_SFloat; List activeProbes = new List(); - List probeInstanceIDs = new List(); + List probeEntityIds = new List(); // We must create a list of active probe instance IDs so we can perform all baking in a single batch foreach (var probe in bakedProbes) @@ -437,12 +437,12 @@ public static bool BakeProbes(IEnumerable bakedProbes) } activeProbes.Add(probe); - probeInstanceIDs.Add(probe.GetEntityId()); + probeEntityIds.Add(probe.GetEntityId()); } // APV Normalization (Execute baking) { - AdaptiveProbeVolumes.BakeAdditionalRequests(probeInstanceIDs.ToArray()); + AdaptiveProbeVolumes.BakeAdditionalRequests(probeEntityIds.ToArray()); } // Render and write the result to disk diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/BaseShaderPreprocessor.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/BaseShaderPreprocessor.cs index 77978a8b053..8425f8bd3e3 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/BaseShaderPreprocessor.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/BaseShaderPreprocessor.cs @@ -64,6 +64,7 @@ abstract class BaseShaderPreprocessor // Common keyword list protected ShaderKeyword m_Transparent; protected ShaderKeyword m_AlphaTestOn; + protected ShaderKeyword m_AreaShadowHigh; protected ShaderKeyword m_DebugDisplay; protected ShaderKeyword m_TileLighting; protected ShaderKeyword m_ClusterLighting; @@ -115,6 +116,7 @@ public BaseShaderPreprocessor() // INSTANCING_ON m_Transparent = new ShaderKeyword("_SURFACE_TYPE_TRANSPARENT"); m_AlphaTestOn = new ShaderKeyword("_ALPHATEST_ON"); + m_AreaShadowHigh = new ShaderKeyword("AREA_SHADOW_HIGH"); m_DebugDisplay = new ShaderKeyword("DEBUG_DISPLAY"); m_TileLighting = new ShaderKeyword("USE_FPTL_LIGHTLIST"); m_ClusterLighting = new ShaderKeyword("USE_CLUSTERED_LIGHTLIST"); diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/PBRSky/ShaderGraph/PBRSkySubTarget.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/PBRSky/ShaderGraph/PBRSkySubTarget.cs index aa649966b60..411e997093a 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/PBRSky/ShaderGraph/PBRSkySubTarget.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/PBRSky/ShaderGraph/PBRSkySubTarget.cs @@ -311,7 +311,7 @@ static void CreatePBRSkyGraph() */ // Copy the default graph from the package - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "PBR Sky Shader Graph.shadergraph", ShaderGraphImporter.GetIcon(), null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance(), "PBR Sky Shader Graph.shadergraph", ShaderGraphImporter.GetIcon(), null); } } } diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/Water/ShaderGraph/CreateWaterShaderGraph.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/Water/ShaderGraph/CreateWaterShaderGraph.cs index 15295623e31..dd902d93a57 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/Water/ShaderGraph/CreateWaterShaderGraph.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/Water/ShaderGraph/CreateWaterShaderGraph.cs @@ -48,7 +48,7 @@ public override void Action(EntityId entityId, string pathName, string resourceF [MenuItem("Assets/Create/Shader Graph/HDRP/Water Shader Graph", priority = CoreUtils.Priorities.assetsCreateShaderMenuPriority + 6)] static void CreateWaterGraphCopy() { - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "Water Shader Graph.shadergraph", ShaderGraphImporter.GetIcon(), null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance(), "Water Shader Graph.shadergraph", ShaderGraphImporter.GetIcon(), null); } } } diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDCameraEditor.Handlers.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDCameraEditor.Handlers.cs index 20e933aad82..fcac8e8633d 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDCameraEditor.Handlers.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDCameraEditor.Handlers.cs @@ -16,7 +16,7 @@ void OnSceneGUI() if (!CameraEditorUtils.IsViewPortRectValidToRender(c.rect)) return; - UnityEditor.CameraEditorUtils.HandleFrustum(c, c.GetEntityId()); + UnityEditor.CameraEditorUtils.HandleFrustum(c, c.GetEntityId().GetHashCode()); } } } diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs index 43612223180..0748625afa1 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDAssetFactory.cs @@ -25,7 +25,7 @@ public override void Action(EntityId entityId, string pathName, string resourceF static void CreateHDRenderPipeline() { var icon = CoreUtils.GetIconForType(); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New HDRenderPipelineAsset.asset", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance(), "New HDRenderPipelineAsset.asset", icon, null); } } } diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs index b22953031bd..5b6978312b0 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineMenuItems.cs @@ -260,7 +260,7 @@ protected override void PostCreateAssetWork(DiffusionProfileSettings asset) static void MenuCreateDiffusionProfile() { var icon = CoreUtils.GetIconForType(); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New Diffusion Profile.asset", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance(), "New Diffusion Profile.asset", icon, null); } [MenuItem("Assets/Create/Shader/HDRP Custom FullScreen Pass")] diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Sky/PhysicallyBasedSky/PhysicallyBasedSkyEditor.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Sky/PhysicallyBasedSky/PhysicallyBasedSkyEditor.cs index 58debd81be5..f7d15c678b1 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Sky/PhysicallyBasedSky/PhysicallyBasedSkyEditor.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Sky/PhysicallyBasedSky/PhysicallyBasedSkyEditor.cs @@ -232,7 +232,7 @@ internal void MaterialFieldWithButton(SerializedDataParameter prop, GUIContent l var materialIcon = AssetPreview.GetMiniTypeThumbnail(typeof(Material)); var action = ScriptableObject.CreateInstance(); action.physicallyBasedSky = target as PhysicallyBasedSky; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, action, materialName, materialIcon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, action, materialName, materialIcon, null); } } } diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.UIElement.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.UIElement.cs index 1262e1a1339..b248fc0e601 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.UIElement.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.UIElement.cs @@ -43,7 +43,7 @@ static ObjectSelector() Type objectSelectorType = playerSettingsType.Assembly.GetType("UnityEditor.ObjectSelector"); var instanceObjectSelectorInfo = objectSelectorType.GetProperty("get", BindingFlags.Static | BindingFlags.Public); #if UNITY_2022_2_OR_NEWER - var showInfo = objectSelectorType.GetMethod("Show", BindingFlags.Instance | BindingFlags.NonPublic, null, new[] { typeof(UnityEngine.Object), typeof(Type), typeof(UnityEngine.Object), typeof(bool), typeof(List), typeof(Action), typeof(Action), typeof(bool) }, null); + var showInfo = objectSelectorType.GetMethod("Show", BindingFlags.Instance | BindingFlags.NonPublic, null, new[] { typeof(UnityEngine.Object), typeof(Type), typeof(UnityEngine.Object), typeof(bool), typeof(List), typeof(Action), typeof(Action), typeof(bool) }, null); #elif UNITY_2020_1_OR_NEWER var showInfo = objectSelectorType.GetMethod("Show", BindingFlags.Instance | BindingFlags.NonPublic, null, new[] { typeof(UnityEngine.Object), typeof(Type), typeof(UnityEngine.Object), typeof(bool), typeof(List), typeof(Action), typeof(Action) }, null); #else @@ -58,7 +58,7 @@ static ObjectSelector() new[] { objectSelectorVariable }, Expression.Assign(objectSelectorVariable, Expression.Call(null, instanceObjectSelectorInfo.GetGetMethod())), #if UNITY_2022_2_OR_NEWER - Expression.Call(objectSelectorVariable, showInfo, objectParameter, typeParameter, Expression.Constant(null, typeof(UnityEngine.Object)), Expression.Constant(false), Expression.Constant(null, typeof(List)), Expression.Constant(null, typeof(Action)), onChangedObjectParameter, Expression.Constant(true)) + Expression.Call(objectSelectorVariable, showInfo, objectParameter, typeParameter, Expression.Constant(null, typeof(UnityEngine.Object)), Expression.Constant(false), Expression.Constant(null, typeof(List)), Expression.Constant(null, typeof(Action)), onChangedObjectParameter, Expression.Constant(true)) #elif UNITY_2020_1_OR_NEWER Expression.Call(objectSelectorVariable, showInfo, objectParameter, typeParameter, Expression.Constant(null, typeof(UnityEngine.Object)), Expression.Constant(false), Expression.Constant(null, typeof(List)), Expression.Constant(null, typeof(Action)), onChangedObjectParameter) #else diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Core/Textures/Texture2DAtlasDynamic.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Core/Textures/Texture2DAtlasDynamic.cs index eddaba6481d..2e3247346f1 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Core/Textures/Texture2DAtlasDynamic.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Core/Textures/Texture2DAtlasDynamic.cs @@ -442,7 +442,9 @@ public void ResetAllocator() /// Returns True if Unity successfully adds the texture. public bool AddTexture(CommandBuffer cmd, out Vector4 scaleOffset, Texture texture) { +#pragma warning disable 618 // Todo(@daniel.andersen): Potentially use GetRawData or sometin' int key = texture.GetEntityId(); +#pragma warning restore 618 if (!m_AllocationCache.TryGetValue(key, out scaleOffset)) { int width = texture.width; diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/NVIDIADebugView.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/NVIDIADebugView.cs index 7117e788231..0dfe0be0268 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/NVIDIADebugView.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/NVIDIADebugView.cs @@ -249,6 +249,9 @@ string GetPresetLabel(DLSSQuality quality, int index) private void UpdateDebugUITable() { + if (m_DlssViewStateTableRows == null) + return; + for (int r = 0; r < m_DlssViewStateTableRows.Length; ++r) { var d = m_Data.dlssFeatureInfos[r]; diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDLightRenderDatabase.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDLightRenderDatabase.cs index a2772f22367..60945b47321 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDLightRenderDatabase.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDLightRenderDatabase.cs @@ -317,7 +317,7 @@ private void EnsureNativeListsAreCreated() //Dots lights wont have to use this and instead will have to set this data on their own. public unsafe void AttachGameObjectData( HDLightRenderEntity entity, - int instanceID, + EntityId entityId, HDAdditionalLightData additionalLightData, GameObject aovGameObject) { @@ -329,10 +329,10 @@ public unsafe void AttachGameObjectData( if (dataIndex == InvalidDataIndex) return; - entityInfo.lightInstanceID = instanceID; + entityInfo.lightEntityId = entityId; m_LightEntities[entity.entityIndex] = entityInfo; - m_LightsToEntityItem.Add(entityInfo.lightInstanceID, entityInfo); + m_LightsToEntityItem.Add(entityInfo.lightEntityId, entityInfo); m_HDAdditionalLightData[dataIndex] = additionalLightData; m_AOVGameObjects[dataIndex] = aovGameObject; HDAdditionalLightDataUpdateInfo updateInfo = default; @@ -359,7 +359,7 @@ public unsafe void DestroyEntity(HDLightRenderEntity lightEntity) m_FreeIndices.Enqueue(lightEntity.entityIndex); LightEntityInfo entityData = m_LightEntities[lightEntity.entityIndex]; - m_LightsToEntityItem.Remove(entityData.lightInstanceID); + m_LightsToEntityItem.Remove(entityData.lightEntityId); var lightData = m_HDAdditionalLightData[entityData.dataIndex]; if (lightData != null) @@ -385,8 +385,8 @@ public unsafe void DestroyEntity(HDLightRenderEntity lightEntity) LightEntityInfo dataToUpdate = m_LightEntities[entityToUpdate.entityIndex]; dataToUpdate.dataIndex = entityData.dataIndex; m_LightEntities[entityToUpdate.entityIndex] = dataToUpdate; - if (dataToUpdate.lightInstanceID != entityData.lightInstanceID) - m_LightsToEntityItem[dataToUpdate.lightInstanceID] = dataToUpdate; + if (dataToUpdate.lightEntityId != entityData.lightEntityId) + m_LightsToEntityItem[dataToUpdate.lightEntityId] = dataToUpdate; } } @@ -541,9 +541,9 @@ public int FindEntityDataIndex(in Light light) private struct LightEntityInfo { public int dataIndex; - public int lightInstanceID; - public static readonly LightEntityInfo Invalid = new LightEntityInfo() { dataIndex = InvalidDataIndex, lightInstanceID = -1 }; - public bool valid { get { return dataIndex != -1 && lightInstanceID != -1; } } + public EntityId lightEntityId; + public static readonly LightEntityInfo Invalid = new LightEntityInfo() { dataIndex = InvalidDataIndex, lightEntityId = EntityId.None }; + public bool valid { get { return dataIndex != -1 && lightEntityId != EntityId.None; } } } internal struct SpotLightCallbackData @@ -569,7 +569,7 @@ internal struct SpotLightCallbackData private NativeList m_ShadowRequestSetPackedHandles; private Queue m_FreeIndices = new Queue(); - private Dictionary m_LightsToEntityItem = new Dictionary(); + private Dictionary m_LightsToEntityItem = new Dictionary(); private NativeArray m_LightData; private NativeArray m_OwnerEntity; @@ -652,7 +652,7 @@ private LightEntityInfo AllocateEntityData() } int newIndex = m_LightCount++; - LightEntityInfo newDataIndex = new LightEntityInfo { dataIndex = newIndex, lightInstanceID = -1 }; + LightEntityInfo newDataIndex = new LightEntityInfo { dataIndex = newIndex, lightEntityId = EntityId.None }; return newDataIndex; } diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs index 5a0efc6ab59..27c158a24f3 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs @@ -860,7 +860,7 @@ void LightLoopNewFrame(CommandBuffer cmd, HDCamera hdCamera) static int NumLightIndicesPerClusteredTile() { - return ShaderConfig.FPTLMaxLightCount * (1 << k_Log2NumClusters); // total footprint for all layers of the tile (measured in light index entries) + return (ShaderConfig.FPTLMaxLightCount + 1) * (1 << (k_Log2NumClusters + 1)); // total footprint for all layers of the tile (measured in light index entries) } void LightLoopAllocResolutionDependentBuffers(HDCamera hdCamera, int width, int height) diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/lightlistbuild-clustered.compute b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/lightlistbuild-clustered.compute index c40fb059194..0a1d500b406 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/lightlistbuild-clustered.compute +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/lightlistbuild-clustered.compute @@ -61,7 +61,9 @@ RWStructuredBuffer g_logBaseBuffer : register( u3 ); // don't #define MAX_NR_COARSE_ENTRIES LIGHT_CLUSTER_MAX_COARSE_ENTRIES +#define MAX_NR_VISIBLE_LIGHTS 826 // correspond to m_MaxLightsOnScreen in LightLoop.cs +groupshared unsigned int ldsTilePassList[MAX_NR_VISIBLE_LIGHTS]; groupshared unsigned int coarseList[MAX_NR_COARSE_ENTRIES]; groupshared unsigned int clusterIdxs[MAX_NR_COARSE_ENTRIES/2]; groupshared float4 lightPlanes[4*6]; // Each plane is defined by a float4. 6 planes per light, 4 lights (24 planes) @@ -241,6 +243,16 @@ void LIGHTLISTGEN(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_GroupID) uint2 tileIDX = u3GroupID.xy; uint t=threadID; + int i; + + const bool lightSortRequired = g_iNrVisibLights > MAX_NR_COARSE_ENTRIES; // Uniform runtime branch + if (lightSortRequired) + { + UNITY_LOOP + for(i=t; i>log2TileSize; @@ -340,7 +352,27 @@ void LIGHTLISTGEN(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_GroupID) unsigned int uInc = 1; unsigned int uIndex; InterlockedAdd(lightOffs, uInc, uIndex); - if(uIndex PLATFORM_LANE_COUNT + GroupMemoryBarrierWithGroupSync(); +#endif + // Ascending sort to prevent unpredictable light list when the number of visible lights is greater than the coarse entries. + if(t==0) + { + int c=0; + for(int ii=0; ii g_vBigTileLightList : register( t4 ); // don't sup RWStructuredBuffer g_vLightList : register( u0 ); // don't support RWBuffer yet in unity #define CATEGORY_LIST_SIZE LIGHTCATEGORY_COUNT +#define MAX_NR_VISIBLE_LIGHTS 826 // correspond to m_MaxLightsOnScreen in LightLoop.cs +groupshared unsigned int ldsTilePassList[MAX_NR_VISIBLE_LIGHTS]; groupshared unsigned int coarseList[LIGHT_LIST_MAX_COARSE_ENTRIES]; groupshared unsigned int prunedList[LIGHT_LIST_MAX_COARSE_ENTRIES]; // temporarily support room for all 64 while in LDS @@ -155,6 +157,15 @@ void TileLightListGen(uint3 dispatchThreadId : SV_DispatchThreadID, uint threadI if(i LIGHT_LIST_MAX_COARSE_ENTRIES; // Uniform runtime branch + if (lightSortRequired) + { + UNITY_LOOP + for(i=t; i PLATFORM_LANE_COUNT + GroupMemoryBarrierWithGroupSync(); +#endif + // Ascending sort to prevent unpredictable light list when the number of visible lights is greater than the coarse entries. + if(t==0) + { + int c=0; + for(int ii=0; ii PLATFORM_LANE_COUNT GroupMemoryBarrierWithGroupSync(); #endif @@ -626,7 +657,7 @@ void FinePruneLights(uint threadID, int iNrCoarseLights, uint2 viTilLL, float vL if (uIndex < LIGHT_LIST_MAX_COARSE_ENTRIES) { // InterlockedAdd ensures atomic and ordered writing to prunedList, preventing threads from overwriting each other's values. - // Increment ldsNrLightsFinal (represents the total number of lights for the tile). + // Increment ldsNrLightsFinal (represents the total number of lights for the tile). unsigned int uInc = 1; unsigned int finalPrunedLightIndex; InterlockedAdd(ldsNrLightsFinal, uInc, finalPrunedLightIndex); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/ReflectionProbeTextureCache.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/ReflectionProbeTextureCache.cs index f147e78a590..d4ba0df255a 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/ReflectionProbeTextureCache.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/ReflectionProbeTextureCache.cs @@ -113,13 +113,13 @@ private static int GetTextureIDAndSize(HDProbe probe, out int textureSize) { textureSize = GetTextureSizeInAtlas(probe); - int textureID = probe.texture.GetEntityId(); + int textureHash = probe.texture.GetEntityId().GetHashCode(); // Include texture size in ID using simple hash const int kPrime = 31; - textureID = kPrime * textureID + textureSize; + textureHash = kPrime * textureHash + textureSize; - return textureID; + return textureHash; } private static int GetTextureSizeInAtlas(HDProbe probe) diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDRenderPipeline.ScreenSpaceShadows.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDRenderPipeline.ScreenSpaceShadows.cs index e16d5a649e3..128da004096 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDRenderPipeline.ScreenSpaceShadows.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDRenderPipeline.ScreenSpaceShadows.cs @@ -239,7 +239,7 @@ void InitializeScreenSpaceShadows() break; } - switch (m_Asset.currentPlatformRenderPipelineSettings.hdShadowInitParams.directionalShadowFilteringQuality) + switch (m_Asset.currentPlatformRenderPipelineSettings.hdShadowInitParams.directionalShadowFilteringQuality) { case HDShadowFilteringQuality.Low: s_ScreenSpaceShadowsMat.EnableKeyword("DIRECTIONAL_SHADOW_LOW"); @@ -255,7 +255,9 @@ void InitializeScreenSpaceShadows() break; } - switch (m_Asset.currentPlatformRenderPipelineSettings.hdShadowInitParams.areaShadowFilteringQuality) + var areaShadowFilteringQuality = (ShaderConfig.s_AreaLights == 0) ? HDAreaShadowFilteringQuality.Medium + : m_Asset.currentPlatformRenderPipelineSettings.hdShadowInitParams.areaShadowFilteringQuality; + switch (areaShadowFilteringQuality) { case HDAreaShadowFilteringQuality.Medium: s_ScreenSpaceShadowsMat.EnableKeyword("AREA_SHADOW_MEDIUM"); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs index 3418ae84a04..f10a5d64f70 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDShadowManager.cs @@ -870,7 +870,7 @@ public static DirectionalShadowAlgorithm GetDirectionalShadowAlgorithm() public static HDShadowAtlas.BlurAlgorithm GetAreaLightShadowBlurAlgorithm() { - return HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.areaShadowFilteringQuality == HDAreaShadowFilteringQuality.High ? + return (ShaderConfig.s_AreaLights == 1 && HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.areaShadowFilteringQuality == HDAreaShadowFilteringQuality.High) ? HDShadowAtlas.BlurAlgorithm.None : HDShadowAtlas.BlurAlgorithm.EVSM; } @@ -904,7 +904,7 @@ public void UpdateDirectionalShadowResolution(int resolution, int cascadeCount) cachedShadowManager.directionalLightAtlas.UpdateSize(atlasResolution); } - internal int ReserveShadowResolutions(Vector2 resolution, ShadowMapType shadowMapType, int lightID, int index, ShadowMapUpdateType updateType) + internal int ReserveShadowResolutions(Vector2 resolution, ShadowMapType shadowMapType, EntityId lightID, int index, ShadowMapUpdateType updateType) { if (m_ShadowRequestCount >= m_MaxShadowRequests) { @@ -1238,7 +1238,8 @@ internal void GetUnmanageDataForShadowRequestJobs(ref HDShadowManagerDataForShad { shadowManagerData.shadowRequests = m_ShadowRequests; shadowManagerData.shadowResolutionRequestStorage = m_ShadowResolutionRequestStorage; - shadowManagerData.areaShadowFilteringQuality = HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.areaShadowFilteringQuality; + shadowManagerData.areaShadowFilteringQuality = (ShaderConfig.s_AreaLights == 0) ? HDAreaShadowFilteringQuality.Medium + : HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.areaShadowFilteringQuality; m_Atlas.GetUnmanageDataForShadowRequestJobs(ref shadowManagerData.atlas); m_CascadeAtlas.GetUnmanageDataForShadowRequestJobs(ref shadowManagerData.cascadeShadowAtlas); if (ShaderConfig.s_AreaLights == 1) diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs index 04edd353dc8..50f0e058ce7 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalSystem.cs @@ -80,10 +80,10 @@ public int QueryIndices(int maxLength, CullingGroup cullingGroup) } } - Dictionary m_Requests = new Dictionary(); - public Dictionary requests => m_Requests; + Dictionary m_Requests = new Dictionary(); + public Dictionary requests => m_Requests; - public Set this[int index] + public Set this[EntityId index] { get { @@ -150,9 +150,9 @@ public void Initialize(CullingGroup cullingGroup) } } - Dictionary m_Requests = new Dictionary(); + Dictionary m_Requests = new Dictionary(); - public Set this[int index] + public Set this[EntityId index] { get { @@ -190,10 +190,10 @@ void Dispose(bool disposing) } public const int kInvalidIndex = -1; - public const int kNullMaterialIndex = int.MaxValue; + public static readonly EntityId kNullMaterialIndex = EntityId.None; public class DecalHandle { - public DecalHandle(int index, int materialID) + public DecalHandle(int index, EntityId materialID) { m_MaterialID = materialID; m_Index = index; @@ -208,7 +208,7 @@ public static bool IsValid(DecalHandle handle) return true; } - public int m_MaterialID; // identifies decal set + public EntityId m_MaterialID; // identifies decal set public int m_Index; // identifies decal within the set } @@ -326,7 +326,7 @@ public enum DecalCullingMode static public float[] m_BoundingDistances = new float[1]; - private Dictionary m_DecalSets = new Dictionary(); + private Dictionary m_DecalSets = new Dictionary(); private List m_DecalSetsRenderList = new List(); // list of visible decalsets sorted by material draw order // current camera @@ -765,7 +765,7 @@ public void UpdateCachedDrawOrder() } // Update memory allocation and assign decal handle, then update cached data - public DecalHandle AddDecal(int materialID, DecalProjector decalProjector) + public DecalHandle AddDecal(EntityId materialID, DecalProjector decalProjector) { // increase array size if no space left if (m_DecalsCount == m_Handles.Length) @@ -1278,7 +1278,7 @@ public DecalHandle AddDecal(DecalProjector decalProjector) var material = decalProjector.material; DecalSet decalSet = null; - int key = material != null ? material.GetEntityId() : kNullMaterialIndex; + EntityId key = material != null ? material.GetEntityId() : kNullMaterialIndex; if (!m_DecalSets.TryGetValue(key, out decalSet)) { SetupMipStreamingSettings(material, true); @@ -1294,7 +1294,7 @@ public void RemoveDecal(DecalHandle handle) return; DecalSet decalSet = null; - int key = handle.m_MaterialID; + EntityId key = handle.m_MaterialID; if (m_DecalSets.TryGetValue(key, out decalSet)) { decalSet.RemoveDecal(handle); @@ -1314,8 +1314,8 @@ private DecalSet GetDecalSet(DecalHandle handle) return null; DecalSet decalSet = null; - int key = handle.m_MaterialID; - if (m_DecalSets.TryGetValue(key, out decalSet)) + EntityId decalMaterialId = handle.m_MaterialID; + if (m_DecalSets.TryGetValue(decalMaterialId, out decalSet)) return decalSet; else return null; @@ -1426,7 +1426,9 @@ public void AddTexture(CommandBuffer cmd, TextureScaleBias textureScaleBias) { if (!Atlas.IsCached(out textureScaleBias.m_ScaleBias, textureScaleBias.texture)) { +#pragma warning disable 618 // Todo(@daniel.andersen): Potentially use GetRawData or sometin' if (!Atlas.AllocateTextureWithoutBlit(textureScaleBias.texture.GetEntityId(), textureScaleBias.width, textureScaleBias.height, ref textureScaleBias.m_ScaleBias)) +#pragma warning restore 618 { m_AllocationSuccess = false; } diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/CompositeWithUIAndOETF.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/CompositeWithUIAndOETF.shader index 3cafebfa39d..830e7e13ec4 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/CompositeWithUIAndOETF.shader +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/CompositeWithUIAndOETF.shader @@ -21,6 +21,7 @@ Shader "Hidden/HDRP/CompositeUI" CBUFFER_START(cb) float4 _HDROutputParams; + float4 _OffscreenUIViewportParams; float4 _SrcOffset; int _NeedsFlip; int _BlitTexArraySlice; @@ -88,10 +89,11 @@ Shader "Hidden/HDRP/CompositeUI" outColor.xyz = afterPostColor.a * outColor.xyz + afterPostColor.xyz; #endif + float2 uiCoord = (samplePos * _ScreenSize.zw) * _OffscreenUIViewportParams.zw + _OffscreenUIViewportParams.xy; #if defined(USE_TEXTURE2D_X_AS_ARRAY) && defined(BLIT_SINGLE_SLICE) - float4 uiValue = LOAD_TEXTURE2D_ARRAY(_UITexture, samplePos.xy, _BlitTexArraySlice); + float4 uiValue = SAMPLE_TEXTURE2D_ARRAY_LOD(_UITexture, s_point_clamp_sampler, uiCoord, _BlitTexArraySlice, 0); #else - float4 uiValue = LOAD_TEXTURE2D_X(_UITexture, samplePos.xy); + float4 uiValue = SAMPLE_TEXTURE2D_X_LOD(_UITexture, s_point_clamp_sampler, uiCoord, 0); #endif diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/FinalPass.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/FinalPass.shader index bfa71b43af9..aa0447d84fc 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/FinalPass.shader +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/FinalPass.shader @@ -63,6 +63,7 @@ Shader "Hidden/HDRP/FinalPass" float4 _HDROutputParams; float4 _HDROutputParams2; + float4 _OffscreenUIViewportParams; #define _MinNits _HDROutputParams.x #define _MaxNits _HDROutputParams.y #define _PaperWhite _HDROutputParams.z @@ -208,7 +209,8 @@ Shader "Hidden/HDRP/FinalPass" #ifdef HDR_ENCODING // Screen space overlay blending. { - float4 uiValue = SAMPLE_TEXTURE2D_X_LOD(_UITexture, s_point_clamp_sampler, positionNDC.xy * _RTHandleScale.xy, 0); + float2 uiCoord = positionNDC.xy * _OffscreenUIViewportParams.zw + _OffscreenUIViewportParams.xy; + float4 uiValue = SAMPLE_TEXTURE2D_X_LOD(_UITexture, s_point_clamp_sampler, uiCoord, 0); outColor.rgb = SceneUIComposition(uiValue, outColor.rgb, _PaperWhite, _MaxNits); outColor.rgb = OETF(outColor.rgb, _MaxNits); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Accumulation/SubFrameManager.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Accumulation/SubFrameManager.cs index dacb3ffa135..0ae55c92dc4 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Accumulation/SubFrameManager.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Accumulation/SubFrameManager.cs @@ -116,9 +116,9 @@ internal class SubFrameManager float m_OriginalTimeScale = 0; // Per-camera data cache - Dictionary m_CameraCache = new Dictionary(); + Dictionary m_CameraCache = new Dictionary(); - internal CameraData GetCameraData(int camID) + internal CameraData GetCameraData(EntityId camID) { CameraData camData; if (!m_CameraCache.TryGetValue(camID, out camData)) @@ -133,7 +133,7 @@ internal CameraData GetCameraData(int camID) return camData; } - internal void SetCameraData(int camID, CameraData camData) + internal void SetCameraData(EntityId camID, CameraData camData) { m_CameraCache[camID] = camData; } @@ -156,7 +156,7 @@ public bool isRecording public float shutterInterval { get => m_ShutterInterval; } // Resets the sub-frame sequence - internal void Reset(int camID) + internal void Reset(EntityId camID) { CameraData camData = GetCameraData(camID); camData.ResetIteration(); @@ -165,7 +165,7 @@ internal void Reset(int camID) internal void Reset() { - foreach (int camID in m_CameraCache.Keys.ToList()) + foreach (EntityId camID in m_CameraCache.Keys.ToList()) Reset(camID); } @@ -176,7 +176,7 @@ internal void Clear() internal void SelectiveReset(uint maxSamples) { - foreach (int camID in m_CameraCache.Keys.ToList()) + foreach (EntityId camID in m_CameraCache.Keys.ToList()) { CameraData camData = GetCameraData(camID); if (camData.currentIteration >= maxSamples) @@ -266,7 +266,7 @@ internal void EndRecording() internal void PrepareNewSubFrame() { uint maxIteration = 0; - foreach (int camID in m_CameraCache.Keys.ToList()) + foreach (EntityId camID in m_CameraCache.Keys.ToList()) maxIteration = Math.Max(maxIteration, GetCameraData(camID).currentIteration); if (m_ShutterInterval == 0) @@ -336,7 +336,7 @@ float ShutterProfile(float time) // y: sum of weights until now, without the current frame // z: one over the sum of weights until now, including the current frame // w: unused - internal Vector4 ComputeFrameWeights(int camID) + internal Vector4 ComputeFrameWeights(EntityId camID) { CameraData camData = GetCameraData(camID); @@ -409,7 +409,7 @@ public void PrepareNewSubFrame() /// true if the accumulation is completed, false otherwise. public bool IsFrameCompleted(HDCamera hdCamera) { - int camID = hdCamera.camera.GetEntityId(); + EntityId camID = hdCamera.camera.GetEntityId(); CameraData camData = m_SubFrameManager.GetCameraData(camID); return camData.currentIteration >= m_SubFrameManager.subFrameCount; } @@ -436,7 +436,7 @@ class RenderAccumulationPassData void RenderAccumulation(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle inputTexture, TextureHandle outputTexture, List> AOVs, bool needExposure) { - int camID = hdCamera.camera.GetEntityId(); + EntityId camID = hdCamera.camera.GetEntityId(); Vector4 frameWeights = m_SubFrameManager.ComputeFrameWeights(camID); if (AOVs != null) @@ -506,7 +506,7 @@ void RenderAccumulation(RenderGraph renderGraph, HDCamera hdCamera, TextureHandl natCmd.DisableKeyword(accumulationShader, data.outputKeyword); // Get the per-camera data - int camID = data.hdCamera.camera.GetEntityId(); + EntityId camID = data.hdCamera.camera.GetEntityId(); CameraData camData = data.subFrameManager.GetCameraData(camID); // Accumulate the path tracing results diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs index 6db4b327f9a..747ee27aad4 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs @@ -367,7 +367,7 @@ public int GetHistoryFrameCount(int id) #region Internal API internal struct ShadowHistoryUsage { - public int lightInstanceID; + public EntityId lightEntityId; public uint frameCount; public GPULightType lightType; public Matrix4x4 transform; @@ -902,14 +902,14 @@ internal float probeRangeCompressionFactor internal bool ValidShadowHistory(HDAdditionalLightData lightData, int screenSpaceShadowIndex, GPULightType lightType) { - return shadowHistoryUsage[screenSpaceShadowIndex].lightInstanceID == lightData.GetEntityId() + return shadowHistoryUsage[screenSpaceShadowIndex].lightEntityId == lightData.GetEntityId() && (shadowHistoryUsage[screenSpaceShadowIndex].frameCount == (cameraFrameCount - 1)) && (shadowHistoryUsage[screenSpaceShadowIndex].lightType == lightType); } internal void PropagateShadowHistory(HDAdditionalLightData lightData, int screenSpaceShadowIndex, GPULightType lightType) { - shadowHistoryUsage[screenSpaceShadowIndex].lightInstanceID = lightData.GetEntityId(); + shadowHistoryUsage[screenSpaceShadowIndex].lightEntityId = lightData.GetEntityId(); shadowHistoryUsage[screenSpaceShadowIndex].frameCount = cameraFrameCount; shadowHistoryUsage[screenSpaceShadowIndex].lightType = lightType; shadowHistoryUsage[screenSpaceShadowIndex].transform = lightData.transform.localToWorldMatrix; diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDProfileId.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDProfileId.cs index fbcbcb60148..23a3a42c2cb 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDProfileId.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDProfileId.cs @@ -235,6 +235,7 @@ internal enum HDProfileId VolumeUpdate, CustomPassVolumeUpdate, OffscreenUIRendering, + ClearOffscreenUI, ComputeThickness, // XR diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs index 930f5f52eb1..05051fd4977 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.LightLoop.cs @@ -818,7 +818,9 @@ static void RenderComputeDeferredLighting(DeferredLightingPassData data, RenderT break; } - switch (HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.areaShadowFilteringQuality) + var areaShadowFilteringQuality = (ShaderConfig.s_AreaLights == 0) ? HDAreaShadowFilteringQuality.Medium + : HDRenderPipeline.currentAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.areaShadowFilteringQuality; + switch (areaShadowFilteringQuality) { case HDAreaShadowFilteringQuality.Medium: data.deferredComputeShader.EnableKeyword("AREA_SHADOW_MEDIUM"); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs index 6f23e082a26..5195b8d5529 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs @@ -5155,6 +5155,12 @@ static void GetHDROutputParameters(HDROutputUtils.HDRDisplayInformation hdrDispl hdrOutputParameters2 = new Vector4(eetfMode, hueShift, paperWhite, (int)ColorGamutUtility.GetColorPrimaries(gamut)); } + static void GetOffscreenUIViewportParams(HDCamera hdCamera, out Vector4 offscreenUIViewportParams) + { + var rcpScreenSize = new Vector2(1f / Mathf.Max(Screen.width, 1f), 1f / Mathf.Max(Screen.height, 1f)); + offscreenUIViewportParams = new Vector4(hdCamera.finalViewport.x * rcpScreenSize.x, hdCamera.finalViewport.y * rcpScreenSize.y, hdCamera.finalViewport.width * rcpScreenSize.x, hdCamera.finalViewport.height * rcpScreenSize.y); + } + void ComputeShadowsMidtonesHighlights(out Vector4 shadows, out Vector4 midtones, out Vector4 highlights, out Vector4 limits) { float weight; @@ -5977,6 +5983,7 @@ class FinalPassData public Vector4 hdroutParameters; public Vector4 hdroutParameters2; + public Vector4 offscreenUIViewportParams; public TextureHandle inputTest; @@ -6039,6 +6046,7 @@ void FinalPass(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle afterPo if (passData.hdrOutputIsActive) { GetHDROutputParameters(HDRDisplayInformationForCamera(hdCamera), HDRDisplayColorGamutForCamera(hdCamera), m_Tonemapping, out passData.hdroutParameters, out passData.hdroutParameters2); + GetOffscreenUIViewportParams(hdCamera, out passData.offscreenUIViewportParams); } builder.SetRenderFunc( @@ -6160,12 +6168,14 @@ void FinalPass(RenderGraph renderGraph, HDCamera hdCamera, TextureHandle afterPo finalPassMaterial.SetVector(HDShaderIDs._HDROutputParams, data.hdroutParameters); finalPassMaterial.SetVector(HDShaderIDs._HDROutputParams2, data.hdroutParameters2); + finalPassMaterial.SetVector(HDShaderIDs._OffscreenUIViewportParams, data.offscreenUIViewportParams); } else if (hdrOutputActive) { data.finalPassMaterial.EnableKeyword("HDR_INPUT"); finalPassMaterial.SetVector(HDShaderIDs._HDROutputParams, data.hdroutParameters); finalPassMaterial.SetVector(HDShaderIDs._HDROutputParams2, data.hdroutParameters2); + finalPassMaterial.SetVector(HDShaderIDs._OffscreenUIViewportParams, data.offscreenUIViewportParams); } finalPassMaterial.SetTexture(HDShaderIDs._UITexture, data.uiBuffer); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 33d57c6d587..332bc5ce6dd 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -258,7 +258,23 @@ void RecordRenderGraph(RenderRequest renderRequest, colorBuffer = RenderTransparency(m_RenderGraph, hdCamera, renderContext, colorBuffer, prepassOutput.resolvedNormalBuffer, vtFeedbackBuffer, currentColorPyramid, volumetricLighting, rayCountTexture, opticalFogTransmittance, m_SkyManager.GetSkyReflection(hdCamera), gpuLightListOutput, transparentPrepass, ref prepassOutput, shadowResult, cullingResults, customPassCullingResults, aovRequest, aovCustomPassBuffers); - uiBuffer = RenderTransparentUI(m_RenderGraph, hdCamera, renderContext); + bool rendersOffscreenUI = !m_OffscreenUIRenderedInCurrentFrame && HDROutputActiveForCameraType(hdCamera) && SupportedRenderingFeatures.active.rendersUIOverlay && !NeedHDRDebugMode(m_CurrentDebugDisplaySettings); + if (rendersOffscreenUI) + { + uiBuffer = RenderHDROffscreenUI(m_RenderGraph, hdCamera, renderContext); + m_OffscreenUIRenderedInCurrentFrame = true; + } + else + { + // We do not render offscreen ui for the rest of cameras. + uiBuffer = m_OffscreenUIRenderedInCurrentFrame ? m_RenderGraph.ImportTexture(m_OffscreenUIColorBuffer.Value) : m_RenderGraph.defaultResources.blackTextureXR; + } + + bool blitsOffscreenUICover = rendersOffscreenUI && m_RequireOffscreenUICoverPrepass; + if (blitsOffscreenUICover) + { + BlitFullscreenUIToOffscreen(m_RenderGraph, colorBackBuffer, uiBuffer, hdCamera); + } if (NeedMotionVectorForTransparent(hdCamera.frameSettings)) { @@ -440,7 +456,9 @@ void RecordRenderGraph(RenderRequest renderRequest, StopXRSinglePass(m_RenderGraph, hdCamera); if (renderRequest.isLast) + { RenderScreenSpaceOverlayUI(m_RenderGraph, hdCamera, colorBackBuffer); + } } } @@ -495,6 +513,7 @@ class FinalBlitPassData public Rect viewport; public Material blitMaterial; public Vector4 hdrOutputParmeters; + public Vector4 offscreenUIViewportParams; public bool applyAfterPP; public CubemapFace cubemapFace; @@ -538,6 +557,7 @@ void BlitFinalCameraTexture(RenderGraph renderGraph, HDCamera hdCamera, TextureH // Pick the right material based off XR rendering using texture arrays and if we are dealing with a single slice at the moment or processing all slices automatically. passData.blitMaterial = (TextureXR.useTexArray && passData.srcTexArraySlice >= 0) ? m_FinalBlitWithOETFTexArraySingleSlice : m_FinalBlitWithOETF; GetHDROutputParameters(HDRDisplayInformationForCamera(hdCamera), HDRDisplayColorGamutForCamera(hdCamera), m_Tonemapping, out passData.hdrOutputParmeters, out var unused); + GetOffscreenUIViewportParams(hdCamera, out passData.offscreenUIViewportParams); passData.uiTexture = uiTexture; builder.UseTexture(passData.uiTexture, AccessFlags.Read); passData.applyAfterPP = hdCamera.frameSettings.IsEnabled(FrameSettingsField.AfterPostprocess) && !NeedHDRDebugMode(m_CurrentDebugDisplaySettings); @@ -562,6 +582,7 @@ void BlitFinalCameraTexture(RenderGraph renderGraph, HDCamera hdCamera, TextureH propertyBlock.SetTexture(HDShaderIDs._InputTexture, sourceTexture); propertyBlock.SetVector(HDShaderIDs._HDROutputParams, data.hdrOutputParmeters); + propertyBlock.SetVector(HDShaderIDs._OffscreenUIViewportParams, data.offscreenUIViewportParams); propertyBlock.SetInt(HDShaderIDs._BlitTexArraySlice, data.srcTexArraySlice); HDROutputUtils.ConfigureHDROutput(data.blitMaterial, data.colorGamut, HDROutputUtils.Operation.ColorEncoding); @@ -1035,46 +1056,86 @@ class RenderOffscreenUIData public Rect viewport; } - TextureHandle CreateOffscreenUIBuffer(RenderGraph renderGraph, MSAASamples msaaSamples, Rect viewport) + TextureHandle CreateOffscreenUIDepthBuffer(RenderGraph renderGraph, MSAASamples msaaSamples) { - return renderGraph.CreateTexture(new TextureDesc((int)viewport.width, (int)viewport.height, false, true) - { format = GraphicsFormat.R8G8B8A8_SRGB, clearBuffer = false, msaaSamples = msaaSamples, name = "UI Color Buffer" }); + return renderGraph.CreateTexture(new TextureDesc(Screen.width, Screen.height, false, true) + { format = CoreUtils.GetDefaultDepthStencilFormat(), clearBuffer = true, msaaSamples = msaaSamples, name = "UI Depth Buffer" }); } - TextureHandle CreateOffscreenUIDepthBuffer(RenderGraph renderGraph, MSAASamples msaaSamples, Rect viewport) + TextureHandle RenderHDROffscreenUI(RenderGraph renderGraph, HDCamera hdCamera, ScriptableRenderContext renderContext) { - return renderGraph.CreateTexture(new TextureDesc((int)viewport.width, (int)viewport.height, false, true) - { format = CoreUtils.GetDefaultDepthStencilFormat(), clearBuffer = true, msaaSamples = msaaSamples, name = "UI Depth Buffer" }); + TextureHandle output; + using (var builder = renderGraph.AddUnsafePass("UI Rendering", out var passData, ProfilingSampler.Get(HDProfileId.OffscreenUIRendering))) + { + output = renderGraph.ImportTexture(m_OffscreenUIColorBuffer.Value); + builder.SetRenderAttachment(output, 0); + var depthBuffer = CreateOffscreenUIDepthBuffer(renderGraph, hdCamera.msaaSamples); + builder.SetRenderAttachmentDepth(depthBuffer); + + passData.camera = hdCamera.camera; + passData.rendererList = renderGraph.CreateUIOverlayRendererList(hdCamera.camera); + builder.UseRendererList(passData.rendererList); + passData.viewport = new Rect(0.0f, 0.0f, Screen.width, Screen.height); + + builder.SetRenderFunc(static (RenderOffscreenUIData data, UnsafeGraphContext ctx) => + { + ctx.cmd.SetViewport(data.viewport); + ctx.cmd.ClearRenderTarget(false, true, Color.clear); + if (data.camera.targetTexture == null) + ctx.cmd.DrawRendererList(data.rendererList); + }); + } + return output; } - TextureHandle RenderTransparentUI(RenderGraph renderGraph, HDCamera hdCamera, ScriptableRenderContext renderContext) + void BlitFullscreenUIToOffscreen(RenderGraph renderGraph, TextureHandle backBuffer, TextureHandle uiTexture, HDCamera hdCamera) { - var output = renderGraph.defaultResources.blackTextureXR; - if (HDROutputActiveForCameraType(hdCamera) && SupportedRenderingFeatures.active.rendersUIOverlay && !NeedHDRDebugMode(m_CurrentDebugDisplaySettings)) + using (var builder = renderGraph.AddUnsafePass("Offscreen UI Blit", out var passData, ProfilingSampler.Get(HDProfileId.OffscreenUIRendering))) { - using (var builder = renderGraph.AddUnsafePass("UI Rendering", out var passData, ProfilingSampler.Get(HDProfileId.OffscreenUIRendering))) - { - output = CreateOffscreenUIBuffer(renderGraph, hdCamera.msaaSamples, hdCamera.finalViewport); - builder.SetRenderAttachment(output, 0); - var depthBuffer = CreateOffscreenUIDepthBuffer(renderGraph, hdCamera.msaaSamples, hdCamera.finalViewport); - builder.SetRenderAttachmentDepth(depthBuffer); + passData.viewport = new Rect(0.0f, 0.0f, Screen.width, Screen.height); + passData.srcTexArraySlice = -1; + passData.dstTexArraySlice = -1; + passData.flip = hdCamera.flipYMode == HDAdditionalCameraData.FlipYMode.ForceFlipY || hdCamera.isMainGameView; + passData.blitMaterial = HDUtils.GetBlitMaterial(TextureDimension.Tex2D); + passData.destination = backBuffer; + builder.UseTexture(passData.destination, AccessFlags.Write); + passData.colorGamut = HDRDisplayColorGamutForCamera(hdCamera); - passData.camera = hdCamera.camera; - passData.rendererList = renderGraph.CreateUIOverlayRendererList(hdCamera.camera); - builder.UseRendererList(passData.rendererList); - passData.viewport = new Rect(0.0f, 0.0f, hdCamera.finalViewport.width, hdCamera.finalViewport.height); + passData.blitMaterial = m_BlitOffscreenUICover; + GetHDROutputParameters(HDRDisplayInformationForCamera(hdCamera), HDRDisplayColorGamutForCamera(hdCamera), m_Tonemapping, out passData.hdrOutputParmeters, out var unused); + passData.offscreenUIViewportParams = new Vector4(0f, 0f, hdCamera.finalViewport.width * (1f / Screen.width), hdCamera.finalViewport.height * (1f / Screen.height)); + passData.uiTexture = uiTexture; + builder.UseTexture(passData.uiTexture, AccessFlags.Read); + passData.applyAfterPP = false; + passData.cubemapFace = CubemapFace.Unknown; - builder.SetRenderFunc(static (RenderOffscreenUIData data, UnsafeGraphContext ctx) => + builder.SetRenderFunc( + static (FinalBlitPassData data, UnsafeGraphContext ctx) => { - ctx.cmd.SetViewport(data.viewport); - ctx.cmd.ClearRenderTarget(false, true, Color.clear); - if (data.camera.targetTexture == null) - ctx.cmd.DrawRendererList(data.rendererList); + var propertyBlock = ctx.renderGraphPool.GetTempMaterialPropertyBlock(); + RTHandle sourceTexture = TextureXR.GetBlackTexture(); + + // We are in HDR mode so the final blit is different + if (data.hdrOutputParmeters.x >= 0) + { + data.blitMaterial.SetInt(HDShaderIDs._NeedsFlip, data.flip ? 1 : 0); + propertyBlock.SetVector(HDShaderIDs._SrcOffset, new Vector4(data.viewport.x, data.viewport.y, Screen.width, Screen.height)); + propertyBlock.SetTexture(HDShaderIDs._UITexture, data.uiTexture); + propertyBlock.SetTexture(HDShaderIDs._InputTexture, sourceTexture); + + propertyBlock.SetVector(HDShaderIDs._HDROutputParams, data.hdrOutputParmeters); + propertyBlock.SetVector(HDShaderIDs._OffscreenUIViewportParams, data.offscreenUIViewportParams); + propertyBlock.SetInt(HDShaderIDs._BlitTexArraySlice, data.srcTexArraySlice); + + HDROutputUtils.ConfigureHDROutput(data.blitMaterial, data.colorGamut, HDROutputUtils.Operation.ColorEncoding); + + data.blitMaterial.DisableKeyword("APPLY_AFTER_POST"); + data.blitMaterial.SetTexture(HDShaderIDs._AfterPostProcessTexture, TextureXR.GetBlackTexture()); + } + + HDUtils.DrawFullScreen(CommandBufferHelpers.GetNativeCommandBuffer(ctx.cmd), data.viewport, data.blitMaterial, data.destination, data.cubemapFace, propertyBlock, 0, data.dstTexArraySlice); }); - } } - - return output; } class AfterPostProcessPassData diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index f51c0e5f40d..b43ac2887d5 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -149,6 +149,7 @@ internal static HDRenderPipeline currentPipeline Material m_ApplyDistortionMaterial; Material m_FinalBlitWithOETF; + Material m_BlitOffscreenUICover; Material m_FinalBlitWithOETFTexArraySingleSlice; Material m_ClearStencilBufferMaterial; @@ -157,6 +158,12 @@ internal static HDRenderPipeline currentPipeline Lazy m_CustomPassColorBuffer; Lazy m_CustomPassDepthBuffer; + Lazy m_OffscreenUIColorBuffer; + + // Use to check if offscreen UI cover prepass should be executed for the current frame. + bool m_RequireOffscreenUICoverPrepass = false; + // Keep track of whether the shared offscreen UI texture has been already rendered in the current frame or not. + bool m_OffscreenUIRenderedInCurrentFrame = false; RTHandle m_CurrentColorBackBuffer; RTHandle m_CurrentDepthBackBuffer; @@ -628,6 +635,7 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) m_ApplyDistortionMaterial = CoreUtils.CreateEngineMaterial(runtimeShaders.applyDistortionPS); m_FinalBlitWithOETF = CoreUtils.CreateEngineMaterial(runtimeShaders.compositeUIAndOETFApplyPS); + m_BlitOffscreenUICover = CoreUtils.CreateEngineMaterial(runtimeShaders.compositeUIAndOETFApplyPS); if (TextureXR.useTexArray) { @@ -707,6 +715,7 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) m_DepthPyramidMipLevelOffsetsBuffer = new ComputeBuffer(15, sizeof(int) * 2); AllocateCustomPassBuffers(); + m_OffscreenUIColorBuffer = new Lazy(() => RTHandles.Alloc(Screen.width, Screen.height, dimension: TextureXR.dimension, colorFormat: GraphicsFormat.R8G8B8A8_SRGB, useDynamicScale: false, wrapMode: TextureWrapMode.Clamp, autoGenerateMips: false, name: "UI Color Buffer")); // For debugging MousePositionDebug.instance.Build(); @@ -1025,6 +1034,7 @@ protected override void Dispose(bool disposing) CoreUtils.Destroy(m_ApplyDistortionMaterial); CoreUtils.Destroy(m_ClearStencilBufferMaterial); CoreUtils.Destroy(m_FinalBlitWithOETF); + CoreUtils.Destroy(m_BlitOffscreenUICover); CoreUtils.Destroy(m_FinalBlitWithOETFTexArraySingleSlice); XRSystem.Dispose(); @@ -1050,6 +1060,8 @@ protected override void Dispose(bool disposing) RTHandles.Release(m_CustomPassColorBuffer.Value); if (m_CustomPassDepthBuffer.IsValueCreated) RTHandles.Release(m_CustomPassDepthBuffer.Value); + if (m_OffscreenUIColorBuffer.IsValueCreated) + RTHandles.Release(m_OffscreenUIColorBuffer.Value); RTHandles.Release(m_CurrentColorBackBuffer); RTHandles.Release(m_CurrentDepthBackBuffer); @@ -2165,6 +2177,14 @@ protected override void Render(ScriptableRenderContext renderContext, List(() => RTHandles.Alloc(Screen.width, Screen.height, dimension: TextureXR.dimension, colorFormat: GraphicsFormat.R8G8B8A8_SRGB, useDynamicScale: false, wrapMode: TextureWrapMode.Clamp, autoGenerateMips: false, name: "UI Color Buffer")); + } + } + } + void AllocateCustomPassBuffers() { m_CustomPassColorBuffer = new Lazy(() => RTHandles.Alloc(Vector2.one, TextureXR.slices, dimension: TextureXR.dimension, colorFormat: GetCustomBufferFormat(), enableRandomWrite: true, useDynamicScale: true, name: "CustomPassColorBuffer")); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStringConstants.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStringConstants.cs index 4af62aaf16d..b8b45608de1 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStringConstants.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStringConstants.cs @@ -1128,6 +1128,7 @@ static class HDShaderIDs public static readonly int _UITexture = Shader.PropertyToID("_UITexture"); public static readonly int _HDROutputParams = Shader.PropertyToID("_HDROutputParams"); public static readonly int _HDROutputParams2 = Shader.PropertyToID("_HDROutputParams2"); + public static readonly int _OffscreenUIViewportParams = Shader.PropertyToID("_OffscreenUIViewportParams"); public static readonly int _NeedsFlip = Shader.PropertyToID("_NeedsFlip"); public static readonly int _MotionVecAndDepth = Shader.PropertyToID("_MotionVecAndDepth"); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs index ceb4eb14f0b..676c4c41e37 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/PathTracing.cs @@ -239,7 +239,7 @@ public partial class HDRenderPipeline #endif // UNITY_EDITOR uint m_CacheLightCount = 0; - int m_CameraID = 0; + EntityId m_CameraID = EntityId.None; int m_SkyHash = -1; int m_DebugMaterialOverrideHash = -1; bool m_RenderSky = true; @@ -335,12 +335,12 @@ public void ResetPathTracing() /// Camera for which the accumulation is reset. public void ResetPathTracing(HDCamera hdCamera) { - int camID = hdCamera.camera.GetEntityId(); + EntityId camID = hdCamera.camera.GetEntityId(); CameraData camData = m_SubFrameManager.GetCameraData(camID); ResetPathTracing(camID, camData); } - internal CameraData ResetPathTracing(int camID, CameraData camData) + internal CameraData ResetPathTracing(EntityId camID, CameraData camData) { m_RenderSky = true; camData.ResetIteration(); @@ -433,7 +433,7 @@ private AccelerationStructureSize GetAccelerationStructureSize(HDCamera hdCamera return accelSize; } - private CameraData CheckDirtiness(HDCamera hdCamera, int camID, CameraData camData) + private CameraData CheckDirtiness(HDCamera hdCamera, EntityId camID, CameraData camData) { bool isCameraDirty = false; // Check resolution dirtiness @@ -831,7 +831,7 @@ TextureHandle RenderPathTracing(RenderGraph renderGraph, ScriptableRenderContext pathTracedAOVs.Clear(); #endif - int camID = hdCamera.camera.GetEntityId(); + EntityId camID = hdCamera.camera.GetEntityId(); CameraData camData = m_SubFrameManager.GetCameraData(camID); ImportPathTracingTargetsToRenderGraph(); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs index e57a08e1bad..c228656b962 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs @@ -66,7 +66,7 @@ public partial class HDRenderPipeline static RayTracingSubMeshFlags[] subMeshFlagArray = new RayTracingSubMeshFlags[maxNumSubMeshes]; static uint[] vfxSystemMasks = new uint[maxNumSubMeshes]; static List materialArray = new List(maxNumSubMeshes); - static Dictionary m_MaterialCRCs = new Dictionary(); + static Dictionary m_MaterialCRCs = new Dictionary(); // Global shader variables ray tracing lightloop constant buffer ShaderVariablesRaytracingLightLoop m_ShaderVariablesRaytracingLightLoopCB = new ShaderVariablesRaytracingLightLoop(); @@ -200,7 +200,7 @@ static bool IsAlphaTestedMaterial(Material currentMaterial) && HDRenderQueue.k_RenderQueue_OpaqueAlphaTest.upperBound >= currentMaterial.renderQueue); } - private static bool UpdateMaterialCRC(int matInstanceId, int matCRC) + private static bool UpdateMaterialCRC(EntityId matInstanceId, int matCRC) { int matPrevCRC; if (m_MaterialCRCs.TryGetValue(matInstanceId, out matPrevCRC)) diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs index 79ef8444e1b..282dddfb6db 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs @@ -436,7 +436,7 @@ public void Cleanup(CommandBuffer cmdBuffer) private void CleanupCameraStates() { - Dictionary cameras = m_CameraStates.cameras; + Dictionary cameras = m_CameraStates.cameras; m_CommandBuffer.Clear(); foreach (var kv in cameras) { diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/FSR2Pass.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/FSR2Pass.cs index 532946b11e1..99b2b1f8b78 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/FSR2Pass.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/FSR2Pass.cs @@ -370,7 +370,7 @@ private void InternalAMDBeginFrame(HDCamera hdCamera) private void CleanupCameraStates() { - Dictionary cameras = m_CameraStates.cameras; + Dictionary cameras = m_CameraStates.cameras; m_CommandBuffer.Clear(); foreach (var kv in cameras) { @@ -403,7 +403,7 @@ private void InternalAMDSetupDRSScaling(bool enableAutomaticSettings, Camera cam float percentage = 100.0f; if (enableAutomaticSettings) { - var qualityMode = (AMD.FSR2Quality)(hdCam.fidelityFX2SuperResolutionUseCustomAttributes ? hdCam.fidelityFX2SuperResolutionQuality : dynamicResolutionSettings.FSR2QualitySetting); + var qualityMode = (AMD.FSR2Quality)(hdCam.fidelityFX2SuperResolutionUseCustomQualitySettings ? hdCam.fidelityFX2SuperResolutionQuality : dynamicResolutionSettings.FSR2QualitySetting); percentage = (1.0f / m_Device.GetUpscaleRatioFromQualityMode(qualityMode)) * 100.0f; DynamicResolutionHandler.SetSystemDynamicResScaler(fsr2Camera.ScaleDelegate, DynamicResScalePolicyType.ReturnsPercentage); DynamicResolutionHandler.SetActiveDynamicScalerSlot(DynamicResScalerSlot.System); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/UpscalerUtils.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/UpscalerUtils.cs index 62613371f22..0b3ff3a4f4a 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/UpscalerUtils.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/UpscalerUtils.cs @@ -14,11 +14,11 @@ public class State : IDisposable { internal WeakReference m_CamReference = new WeakReference(null); - public int key; + public EntityId key; public object data; public UInt64 lastFrameId { set; get; } - public static int GetKey(Camera camera) => camera.GetEntityId(); + public static EntityId GetKey(Camera camera) => camera.GetEntityId(); public void Init(Camera camera) { @@ -45,11 +45,11 @@ public void Dispose() //Amount of inactive frames dlss has rendered before we clean / destroy the plugin state. private static UInt64 sMaximumFrameExpiration = 400; - private Dictionary m_CameraStates = new Dictionary(); - private List m_InvalidCameraKeys = new List(); + private Dictionary m_CameraStates = new Dictionary(); + private List m_InvalidCameraKeys = new List(); private UInt64 m_FrameId = 0; - public Dictionary cameras => m_CameraStates; + public Dictionary cameras => m_CameraStates; public State GetState(Camera camera) { @@ -88,7 +88,7 @@ public void InvalidateState(State state) public void ProcessExpiredCameras() { - foreach (KeyValuePair kv in m_CameraStates) + foreach (KeyValuePair kv in m_CameraStates) { if (!HasCameraStateExpired(kv.Value)) continue; diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/DiffusionProfileHashTable.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/DiffusionProfileHashTable.cs index d070f3a59bb..7803fbffde8 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/DiffusionProfileHashTable.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/DiffusionProfileHashTable.cs @@ -13,7 +13,7 @@ namespace UnityEditor.Rendering.HighDefinition class DiffusionProfileHashTable { [System.NonSerialized] - static Dictionary diffusionProfileHashes = new Dictionary(); + static Dictionary diffusionProfileHashes = new Dictionary(); // Stable hash to avoid having different result after upgrading mono // Source: https://github.com/Unity-Technologies/mono/blob/unity-2021.2-mbe-pre-upgrade/mcs/class/referencesource/mscorlib/system/string.cs#L824 @@ -82,7 +82,9 @@ public static void UpdateDiffusionProfileHashNow(DiffusionProfileSettings profil // We can't move the asset } // If the asset is not in the list, we regenerate it's hash using the GUID (which leads to the same result every time) +#pragma warning disable 618 // Todo(@daniel.andersen): Potentially use GetRawData or sometin' else if (!diffusionProfileHashes.ContainsKey(profile.GetEntityId())) +#pragma warning restore 618 { uint newHash = GenerateUniqueHash(profile); if (newHash != profile.profile.hash) @@ -92,7 +94,9 @@ public static void UpdateDiffusionProfileHashNow(DiffusionProfileSettings profil } } else // otherwise, no issue, we don't change the hash and we keep it to check for collisions +#pragma warning disable 618 // Todo(@daniel.andersen): Potentially use GetRawData or sometin' diffusionProfileHashes.Add(profile.GetEntityId(), profile.profile.hash); +#pragma warning restore 618 } } } diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.Decals.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.Decals.cs index 6fbcf34bd0e..b5ffa242eaf 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.Decals.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.Decals.cs @@ -18,7 +18,7 @@ partial class WaterSystem int m_DecalAtlasSize; int m_MaxDecalCount; - GlobalKeyword horizontalDeformationKeyword; + GlobalKeyword horizontalDeformationKeyword; // Buffers used to hold all the water foam generators WaterDecalData[] m_WaterDecalDataCPU; @@ -136,7 +136,7 @@ static internal bool IsAffectingProperty(WaterDecal decal, int nameId) struct VisibleDecalData { public WaterDecal decal; - public int materialId; + public EntityId materialId; public readonly int resX => decal.resolution.x; public readonly int resY => decal.resolution.y; @@ -144,7 +144,7 @@ public int MaterialId(WaterDecal.PassType passType) { int hash = 17; hash = hash * 23 + (int)passType; - hash = hash * 23 + materialId; + hash = hash * 23 + materialId.GetHashCode(); return hash; } } diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs index 02353dc6437..c40e463a9aa 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs @@ -109,10 +109,13 @@ internal bool IsValidMaterial() #endif } - internal int GetMaterialAtlasingId() + internal EntityId GetMaterialAtlasingId() { + +#pragma warning disable 618 // Todo(@daniel.andersen): Potentially use GetRawData or sometin' // If material has a property block, we can't reuse the atlas slot return HasPropertyBlock() ? GetEntityId(): material.GetEntityId(); +#pragma warning restore 618 } #endregion diff --git a/Packages/com.unity.render-pipelines.high-definition/Samples~/RendererShaderUserValueSamples/Scenes/Agora.unity b/Packages/com.unity.render-pipelines.high-definition/Samples~/RendererShaderUserValueSamples/Scenes/Agora.unity index c40a453fb59..b0b62ab0ac4 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Samples~/RendererShaderUserValueSamples/Scenes/Agora.unity +++ b/Packages/com.unity.render-pipelines.high-definition/Samples~/RendererShaderUserValueSamples/Scenes/Agora.unity @@ -93,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: cb345d75ee0246d44b6ce6eb8211b579, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: a8852ced341344442b1bb320452ec689, type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -135,6 +135,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (8) @@ -143,6 +151,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -175,6 +191,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0893065 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0893065 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0893065 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.99 @@ -244,6 +272,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (78) @@ -252,6 +288,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -284,6 +328,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9872982 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9872982 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9872982 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.32 @@ -393,10 +449,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: b68ae174a46c96f4cad59fd475cad90f, type: 2} + objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -484,6 +544,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5aa0142fa7023c04889ea1b7925fbb0b, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 5aa0142fa7023c04889ea1b7925fbb0b, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -543,6 +607,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (14) @@ -551,6 +623,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -583,6 +663,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9089645 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9089645 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9089645 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.95 @@ -713,6 +805,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -825,6 +921,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -855,10 +955,18 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: fedf653bcb23d544192781d679700e05, type: 2} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (91) @@ -867,6 +975,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -899,6 +1015,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9627238 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9627238 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9627238 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.19 @@ -968,6 +1096,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (69) @@ -976,6 +1112,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -1008,6 +1152,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0480002 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0480002 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0480002 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.05 @@ -1082,6 +1238,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (17) @@ -1090,6 +1254,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -1122,6 +1294,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0909663 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0909663 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0909663 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.42 @@ -1236,6 +1420,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: bacb4abc2c025034093a0e95924b06d5, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: bacb4abc2c025034093a0e95924b06d5, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -1266,6 +1454,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (29) @@ -1274,6 +1470,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -1306,6 +1510,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9464527 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9464527 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9464527 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.35 @@ -1420,6 +1636,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 899464e5a9901b549b1524b7d740c0bd, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 899464e5a9901b549b1524b7d740c0bd, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -1460,6 +1680,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (22) @@ -1468,6 +1696,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -1500,6 +1736,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9432868 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9432868 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9432868 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.65 @@ -1609,6 +1857,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: ce1f1682f2adfb149a956aafbb0aa05c, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: ce1f1682f2adfb149a956aafbb0aa05c, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -1643,6 +1895,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (62) @@ -1651,6 +1911,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -1683,6 +1951,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0078843 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0078843 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0078843 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.05 @@ -1752,6 +2032,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (51) @@ -1760,6 +2048,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -1792,6 +2088,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0346084 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0346084 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0346084 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.22 @@ -1866,6 +2174,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (3) @@ -1874,6 +2190,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -1906,6 +2230,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0208879 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0208879 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0208879 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.7 @@ -1975,14 +2311,30 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} - - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} - propertyPath: m_Name - value: SoldierVAT (48) + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_Name + value: SoldierVAT (48) objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -2015,6 +2367,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.916811 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.916811 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.916811 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.39 @@ -2097,6 +2461,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (10) @@ -2105,6 +2477,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -2137,6 +2517,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0994226 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0994226 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0994226 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.19 @@ -2219,6 +2611,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (84) @@ -2227,6 +2627,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -2259,6 +2667,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.000177 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.000177 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.000177 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.64 @@ -2665,37 +3085,37 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 - m_HasValidSHForNormalization: 0 + m_HasValidSHForNormalization: 1 m_SHForNormalization: - 'sh[ 0]': 0 - 'sh[ 1]': 0 - 'sh[ 2]': 0 - 'sh[ 3]': 0 - 'sh[ 4]': 0 - 'sh[ 5]': 0 - 'sh[ 6]': 0 - 'sh[ 7]': 0 - 'sh[ 8]': 0 - 'sh[ 9]': 0 - 'sh[10]': 0 - 'sh[11]': 0 - 'sh[12]': 0 - 'sh[13]': 0 - 'sh[14]': 0 - 'sh[15]': 0 - 'sh[16]': 0 - 'sh[17]': 0 - 'sh[18]': 0 - 'sh[19]': 0 - 'sh[20]': 0 - 'sh[21]': 0 - 'sh[22]': 0 - 'sh[23]': 0 - 'sh[24]': 0 - 'sh[25]': 0 - 'sh[26]': 0 - m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} - m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} + 'sh[ 0]': 4115.263 + 'sh[ 1]': -2366.651 + 'sh[ 2]': -1171.7352 + 'sh[ 3]': -1001.63995 + 'sh[ 4]': 227.24252 + 'sh[ 5]': 243.74857 + 'sh[ 6]': 8.915682 + 'sh[ 7]': 20.083624 + 'sh[ 8]': -27.321764 + 'sh[ 9]': 3768.9263 + 'sh[10]': -2127.8408 + 'sh[11]': -1154.096 + 'sh[12]': -956.64484 + 'sh[13]': 216.12726 + 'sh[14]': 243.44696 + 'sh[15]': 10.955132 + 'sh[16]': 17.457268 + 'sh[17]': -15.505658 + 'sh[18]': 3783.314 + 'sh[19]': -2088.723 + 'sh[20]': -1254.9597 + 'sh[21]': -1007.25934 + 'sh[22]': 226.41228 + 'sh[23]': 268.31177 + 'sh[24]': 14.295511 + 'sh[25]': 16.20984 + 'sh[26]': -4.1878295 + m_SHValidForCapturePosition: {x: 0, y: 8, z: 0} + m_SHValidForSourcePosition: {x: 0, y: 8, z: 0} m_HDProbeVersion: 9 m_ObsoleteInfiniteProjection: 1 m_ObsoleteInfluenceVolume: @@ -2856,6 +3276,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 1.404 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -3158,7 +3582,7 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410087039} m_Enabled: 1 - serializedVersion: 12 + serializedVersion: 13 m_Type: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 100000 @@ -3200,7 +3624,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 1 m_LightShadowCasterMode: 2 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -3210,7 +3634,7 @@ Light: m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ForceVisible: 0 - m_ShadowRadius: 0 + m_ShapeRadius: 0.025 m_ShadowAngle: 0 m_LightUnit: 2 m_LuxAtDistance: 1 @@ -3253,6 +3677,7 @@ MonoBehaviour: m_ShapeWidth: -1 m_ShapeHeight: -1 m_AspectRatio: -1 + m_ShapeRadius: -1 m_SpotIESCutoffPercent: 100 m_LightDimmer: 1 m_VolumetricDimmer: 1 @@ -3261,7 +3686,6 @@ MonoBehaviour: m_AffectDiffuse: 1 m_AffectSpecular: 1 m_NonLightmappedOnly: 0 - m_ShapeRadius: 0.025 m_SoftnessScale: 1 m_UseCustomSpotLightShadowCone: 0 m_CustomSpotLightShadowCone: 30 @@ -3299,7 +3723,6 @@ MonoBehaviour: m_FilterTracedShadow: 1 m_FilterSizeTraced: 16 m_SunLightConeAngle: 0.5 - m_LightShadowRadius: 0.5 m_SemiTransparentShadow: 0 m_ColorShadow: 1 m_DistanceBasedFiltering: 0 @@ -3367,7 +3790,7 @@ MonoBehaviour: m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshLayer: -1 - m_Version: 14 + m_Version: 15 m_ObsoleteShadowResolutionTier: 1 m_ObsoleteUseShadowQualitySettings: 0 m_ObsoleteCustomShadowResolution: 512 @@ -3388,6 +3811,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (43) @@ -3396,6 +3827,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -3428,6 +3867,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9169406 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9169406 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9169406 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.84 @@ -3537,6 +3988,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: ce1f1682f2adfb149a956aafbb0aa05c, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: ce1f1682f2adfb149a956aafbb0aa05c, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -3571,6 +4026,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (72) @@ -3579,6 +4042,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -3611,6 +4082,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0738354 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0738354 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0738354 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.69 @@ -3736,6 +4219,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -3811,6 +4298,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 6c2171abcab706c4d8d25ac0c8c3f2a0, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 6c2171abcab706c4d8d25ac0c8c3f2a0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -3846,6 +4337,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (31) @@ -3854,6 +4353,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -3886,6 +4393,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9363249 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9363249 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9363249 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.88 @@ -3973,6 +4492,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (68) @@ -3981,6 +4508,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -4013,6 +4548,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9367119 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9367119 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9367119 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.16 @@ -4110,6 +4657,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (36) @@ -4118,6 +4673,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -4150,6 +4713,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.061087 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.061087 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.061087 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.16 @@ -4275,6 +4850,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -4305,6 +4884,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (66) @@ -4313,6 +4900,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -4345,6 +4940,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9669922 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9669922 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9669922 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.87 @@ -4427,6 +5034,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (7) @@ -4435,6 +5050,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -4467,6 +5090,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0512431 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0512431 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0512431 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.84 @@ -4546,6 +5181,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (6) @@ -4554,6 +5197,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -4586,6 +5237,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9510834 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9510834 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9510834 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 7.23 @@ -4700,6 +5363,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 899464e5a9901b549b1524b7d740c0bd, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 899464e5a9901b549b1524b7d740c0bd, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -4796,7 +5463,11 @@ PrefabInstance: value: 0.038 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} - propertyPath: 'm_Materials.Array.data[0]' + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} m_RemovedComponents: [] @@ -4825,6 +5496,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (81) @@ -4833,6 +5512,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -4865,6 +5552,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.94069934 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.94069934 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.94069934 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.29 @@ -4970,6 +5669,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (98) @@ -4978,6 +5685,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -5010,6 +5725,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.038296 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.038296 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.038296 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.312822 @@ -5189,10 +5916,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 87cc8c0832836144e9ac4d454b0c730e, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 87cc8c0832836144e9ac4d454b0c730e, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 87cc8c0832836144e9ac4d454b0c730e, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 87cc8c0832836144e9ac4d454b0c730e, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -5223,6 +5958,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (75) @@ -5231,6 +5974,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -5263,6 +6014,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0133225 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0133225 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0133225 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.94 @@ -5368,6 +6131,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (24) @@ -5376,6 +6147,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -5408,6 +6187,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.907773 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.907773 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.907773 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.89 @@ -5535,6 +6326,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: bc48358fa18d9b94fa3904f87e9bd7ac, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: bc48358fa18d9b94fa3904f87e9bd7ac, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -5631,10 +6426,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0a01edd7d7e655e4ea6b8ad06b153b52, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0a01edd7d7e655e4ea6b8ad06b153b52, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 0a01edd7d7e655e4ea6b8ad06b153b52, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 0a01edd7d7e655e4ea6b8ad06b153b52, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -5683,6 +6486,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (55) @@ -5691,6 +6502,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -5723,6 +6542,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0366294 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0366294 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0366294 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.78 @@ -5832,6 +6663,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 6c2171abcab706c4d8d25ac0c8c3f2a0, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 6c2171abcab706c4d8d25ac0c8c3f2a0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -5906,6 +6741,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 9f38a280a0ab75045bd8b14089b1bab8, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 9f38a280a0ab75045bd8b14089b1bab8, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -5936,6 +6775,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (59) @@ -5944,6 +6791,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -5976,6 +6831,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0158321 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0158321 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0158321 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.56 @@ -6045,6 +6912,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (30) @@ -6053,6 +6928,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -6085,6 +6968,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.94712937 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.94712937 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.94712937 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.33 @@ -6167,6 +7062,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (11) @@ -6175,6 +7078,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -6207,6 +7118,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0923939 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0923939 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0923939 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.46 @@ -6281,6 +7204,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (45) @@ -6289,6 +7220,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -6321,6 +7260,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0854784 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0854784 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0854784 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.01 @@ -6390,6 +7341,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (63) @@ -6398,6 +7357,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -6430,6 +7397,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9144595 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9144595 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9144595 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.87 @@ -6552,6 +7531,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.063 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -6671,6 +7654,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 2507734b9d399e5419f80712698ba861, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 2507734b9d399e5419f80712698ba861, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -6753,6 +7740,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -6783,6 +7774,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (86) @@ -6791,6 +7790,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -6823,6 +7830,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0238376 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0238376 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0238376 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.64 @@ -6905,6 +7924,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (46) @@ -6913,6 +7940,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -6945,6 +7980,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0510769 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0510769 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0510769 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.48 @@ -7032,6 +8079,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (50) @@ -7040,6 +8095,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -7072,6 +8135,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.96613806 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.96613806 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.96613806 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.85 @@ -7141,6 +8216,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (39) @@ -7149,6 +8232,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -7181,6 +8272,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0668436 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0668436 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0668436 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.99 @@ -7273,6 +8376,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (40) @@ -7281,6 +8392,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -7313,6 +8432,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.072029 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.072029 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.072029 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.97 @@ -7435,6 +8566,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: bc48358fa18d9b94fa3904f87e9bd7ac, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: bc48358fa18d9b94fa3904f87e9bd7ac, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -7479,6 +8614,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (33) @@ -7487,6 +8630,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -7519,6 +8670,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9314685 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9314685 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9314685 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.37 @@ -7593,6 +8756,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (27) @@ -7601,6 +8772,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -7633,6 +8812,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0438133 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0438133 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0438133 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.7 @@ -7699,6 +8890,56 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::LookAt target: {fileID: 1528244271} +--- !u!1 &953911667 +GameObject: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 953911669} + - component: {fileID: 953911668} + m_Layer: 0 + m_Name: ProbeVolumePerSceneData + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &953911668 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953911667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a83d2f7ae04ab6f4f99b0d85377be998, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.ProbeVolumePerSceneData + serializedBakingSet: {fileID: 11400000, guid: 698e26e9ed863464dbb8746dbe16605e, type: 2} + sceneGUID: 59c381e5d4ed75949858df4007dea34a + obsoleteAsset: {fileID: 0} + obsoleteCellSharedDataAsset: {fileID: 0} + obsoleteCellSupportDataAsset: {fileID: 0} + obsoleteSerializedScenarios: [] +--- !u!4 &953911669 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953911667} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &988387578 PrefabInstance: m_ObjectHideFlags: 0 @@ -7755,6 +8996,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 1.404 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -7790,6 +9035,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (26) @@ -7798,6 +9051,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -7830,6 +9091,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0664543 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0664543 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0664543 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.16 @@ -7957,6 +9230,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.626 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -8122,6 +9399,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.229 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -8152,6 +9433,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (96) @@ -8160,6 +9449,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -8192,6 +9489,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0951202 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0951202 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0951202 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.468 @@ -8344,10 +9653,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} propertyPath: m_Materials.Array.size value: 1 @@ -8386,6 +9703,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (61) @@ -8394,6 +9719,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -8426,6 +9759,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0279593 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0279593 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0279593 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.04 @@ -8508,6 +9853,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (67) @@ -8516,8 +9869,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} - propertyPath: headgear + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: headgear value: 1 objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} @@ -8548,6 +9909,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.92636883 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.92636883 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.92636883 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.57 @@ -8648,6 +10021,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (5) @@ -8656,6 +10037,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -8688,6 +10077,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0656452 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0656452 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0656452 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.47 @@ -8770,6 +10171,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (77) @@ -8778,6 +10187,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -8810,6 +10227,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.96063507 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.96063507 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.96063507 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.09 @@ -8892,6 +10321,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (15) @@ -8900,6 +10337,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -8932,6 +10377,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.97327 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.97327 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.97327 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.55 @@ -9019,6 +10476,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (88) @@ -9027,6 +10492,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -9059,6 +10532,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.945782 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.945782 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.945782 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.49 @@ -9191,6 +10676,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 1.404 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -9221,6 +10710,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (19) @@ -9229,6 +10726,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -9261,6 +10766,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9732036 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9732036 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9732036 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.31 @@ -9361,6 +10878,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (79) @@ -9369,6 +10894,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -9401,6 +10934,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.071631 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.071631 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.071631 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.71 @@ -9483,6 +11028,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (1) @@ -9491,6 +11044,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -9523,6 +11084,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9648487 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9648487 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9648487 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.79 @@ -9661,6 +11234,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 8cb65b77f37fd864e8acf4454ff7707b, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 8cb65b77f37fd864e8acf4454ff7707b, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -9732,7 +11309,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 + m_ReceiveGI: 2 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -9808,6 +11385,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (85) @@ -9816,6 +11401,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -9852,6 +11445,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.053351 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.053351 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.053351 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1.64 @@ -9926,6 +11531,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (35) @@ -9934,6 +11547,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -9966,6 +11587,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9743069 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9743069 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9743069 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.68 @@ -10079,10 +11712,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: a5dd37afefd165a4d8e0c1084b71d8f3, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: a5dd37afefd165a4d8e0c1084b71d8f3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: a5dd37afefd165a4d8e0c1084b71d8f3, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: a5dd37afefd165a4d8e0c1084b71d8f3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -10113,6 +11754,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (49) @@ -10121,6 +11770,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -10153,6 +11810,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0799673 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0799673 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0799673 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.76 @@ -10280,6 +11949,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: f852d85a21e7eb14db2009499113944a, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: f852d85a21e7eb14db2009499113944a, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -10317,21 +11990,97 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::LookAt target: {fileID: 1528244271} ---- !u!1001 &1293916879 -PrefabInstance: +--- !u!1 &1287004716 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1784669385} - m_Modifications: - - target: {fileID: 100000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} - propertyPath: m_Name - value: SM_Bld_Walkway_Wood_01 - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1287004717} + - component: {fileID: 1287004718} + m_Layer: 0 + m_Name: Adaptive Probe Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1287004717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287004716} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 3.1958222, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2107838231} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1287004718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1287004716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cded085d155cde949b60f67a11dbc3bd, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.ProbeVolume + mode: 2 + size: {x: 53, y: 21.021261, z: 53} + overrideRendererFilters: 0 + minRendererVolumeSize: 0.1 + objectLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + lowestSubdivLevelOverride: 0 + highestSubdivLevelOverride: 7 + overridesSubdivLevels: 0 + mightNeedRebaking: 0 + cachedTransform: + e00: 1 + e01: 0 + e02: 0 + e03: -0 + e10: 0 + e11: 1 + e12: 0 + e13: -6.1958222 + e20: 0 + e21: 0 + e22: 1 + e23: -0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + cachedHashCode: 435608010 + fillEmptySpaces: 0 + version: 2 + globalVolume: 0 +--- !u!1001 &1293916879 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1784669385} + m_Modifications: + - target: {fileID: 100000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_Name + value: SM_Bld_Walkway_Wood_01 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} propertyPath: m_LocalScale.x @@ -10389,6 +12138,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -10419,6 +12172,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (94) @@ -10427,6 +12188,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -10459,6 +12228,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.050471 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.050471 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.050471 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.6 @@ -10574,6 +12355,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (28) @@ -10582,6 +12371,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -10614,6 +12411,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.929742 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.929742 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.929742 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.86 @@ -10683,6 +12492,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (42) @@ -10691,6 +12508,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -10723,6 +12548,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9544632 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9544632 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9544632 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.06 @@ -10805,6 +12642,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (97) @@ -10813,6 +12658,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -10845,6 +12698,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0297606 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0297606 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0297606 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.558 @@ -10963,6 +12828,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (95) @@ -10971,6 +12844,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -11003,6 +12884,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9276006 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9276006 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9276006 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.318 @@ -11103,6 +12996,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (76) @@ -11111,6 +13012,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -11143,6 +13052,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9373142 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9373142 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9373142 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.95 @@ -11225,6 +13146,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (32) @@ -11233,6 +13162,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -11265,6 +13202,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9199833 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9199833 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9199833 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.63 @@ -11352,6 +13301,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (87) @@ -11360,6 +13317,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -11392,6 +13357,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0677443 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0677443 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0677443 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.47 @@ -11461,6 +13438,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (64) @@ -11469,6 +13454,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -11501,6 +13494,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0685408 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0685408 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0685408 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.87 @@ -11714,6 +13719,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (93) @@ -11722,6 +13735,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -11754,6 +13775,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.960319 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.960319 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.960319 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.19 @@ -11823,6 +13856,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (71) @@ -11831,6 +13872,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -11863,6 +13912,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9066928 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9066928 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9066928 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.16 @@ -11945,6 +14006,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (52) @@ -11953,6 +14022,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -11985,6 +14062,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0621996 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0621996 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0621996 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.12 @@ -12103,10 +14192,26 @@ PrefabInstance: propertyPath: healthBarOpacity value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: King objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 2 @@ -12213,6 +14318,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (82) @@ -12221,6 +14334,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -12253,6 +14374,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9954495 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9954495 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9954495 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.26 @@ -12384,6 +14517,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (73) @@ -12392,6 +14533,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -12424,6 +14573,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.09165 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.09165 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.09165 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.31 @@ -12493,6 +14654,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (56) @@ -12501,6 +14670,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -12533,6 +14710,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0917952 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0917952 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0917952 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1.47 @@ -12620,6 +14809,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (2) @@ -12628,6 +14825,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -12660,6 +14865,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9287156 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9287156 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9287156 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.87 @@ -12790,10 +15007,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -12824,6 +15049,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (90) @@ -12832,6 +15065,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -12864,6 +15105,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0039508 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0039508 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0039508 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.31 @@ -13043,6 +15296,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (25) @@ -13051,6 +15312,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -13083,6 +15352,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9151637 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9151637 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9151637 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.62 @@ -13165,6 +15446,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (47) @@ -13173,6 +15462,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -13205,6 +15502,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0574332 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0574332 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0574332 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.06 @@ -13345,6 +15654,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -0.014 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -13375,6 +15688,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (83) @@ -13383,6 +15704,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -13415,6 +15744,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9416057 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9416057 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9416057 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.28 @@ -13515,6 +15856,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (58) @@ -13523,6 +15872,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -13555,6 +15912,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0570375 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0570375 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0570375 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.17 @@ -13664,6 +16033,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 347a8cf8a2e4cf44d92eb6ee085c6e2a, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 347a8cf8a2e4cf44d92eb6ee085c6e2a, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -13694,6 +16067,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (70) @@ -13702,6 +16083,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -13734,6 +16123,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0761741 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0761741 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0761741 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.91 @@ -13816,6 +16217,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (60) @@ -13824,6 +16233,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -13852,9 +16269,21 @@ PrefabInstance: propertyPath: clothesColor value: 0 objectReference: {fileID: 0} - - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} - propertyPath: eyebrowsStyle - value: 2 + - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: eyebrowsStyle + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.949029 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.949029 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.949029 objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x @@ -13992,6 +16421,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (37) @@ -14000,6 +16437,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -14032,6 +16477,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0608329 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0608329 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0608329 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.31 @@ -14137,6 +16594,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (89) @@ -14145,6 +16610,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -14177,6 +16650,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0047321 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0047321 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0047321 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.44 @@ -14333,6 +16818,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (44) @@ -14341,6 +16834,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -14377,6 +16878,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0593358 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0593358 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0593358 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.97 @@ -14469,6 +16982,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (23) @@ -14477,6 +16998,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -14509,6 +17038,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9342072 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9342072 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9342072 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.8 @@ -14635,10 +17176,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 106d976df53495f4caed4323cfccba8b, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 106d976df53495f4caed4323cfccba8b, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 106d976df53495f4caed4323cfccba8b, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 106d976df53495f4caed4323cfccba8b, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -14721,6 +17270,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 6e52ea02117c25a4986a53c022cf4632, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 6e52ea02117c25a4986a53c022cf4632, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -14751,6 +17304,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT @@ -14759,6 +17320,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -14791,6 +17360,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.93893474 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.93893474 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.93893474 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.88 @@ -14891,6 +17472,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (13) @@ -14899,6 +17488,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -14931,6 +17528,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.96845335 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.96845335 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.96845335 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.35 @@ -15057,10 +17666,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -15091,6 +17708,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (9) @@ -15099,6 +17724,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -15131,6 +17764,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.98622876 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.98622876 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.98622876 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.04 @@ -15213,6 +17858,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (65) @@ -15221,6 +17874,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -15253,6 +17914,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0490599 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0490599 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0490599 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.41 @@ -15335,6 +18008,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (21) @@ -15343,6 +18024,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -15375,6 +18064,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0337663 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0337663 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0337663 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.08 @@ -15457,6 +18158,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (34) @@ -15465,6 +18174,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -15497,6 +18214,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.90775794 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.90775794 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.90775794 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.97 @@ -15579,6 +18308,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (12) @@ -15587,6 +18324,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -15619,6 +18364,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.98996544 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.98996544 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.98996544 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.35 @@ -15701,6 +18458,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (80) @@ -15709,6 +18474,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -15741,6 +18514,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0527371 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0527371 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0527371 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.86 @@ -15823,6 +18608,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (16) @@ -15831,6 +18624,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -15863,6 +18664,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0000024 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0000024 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0000024 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.75 @@ -15945,6 +18758,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (74) @@ -15953,6 +18774,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -15985,6 +18814,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0301332 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0301332 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0301332 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.66 @@ -16085,6 +18926,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (20) @@ -16093,6 +18942,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -16125,6 +18982,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.91584903 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.91584903 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.91584903 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1 @@ -16243,6 +19112,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (92) @@ -16251,6 +19128,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -16283,6 +19168,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0021532 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0021532 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0021532 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.19 @@ -16365,6 +19262,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (4) @@ -16373,6 +19278,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -16405,6 +19318,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0546832 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0546832 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0546832 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.31 @@ -16487,6 +19412,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (54) @@ -16495,6 +19428,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -16527,6 +19468,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.010268 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.010268 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.010268 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.88 @@ -16645,6 +19598,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (53) @@ -16653,6 +19614,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -16685,6 +19654,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0730177 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0730177 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0730177 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1.75 @@ -16785,6 +19766,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (41) @@ -16793,6 +19782,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -16825,6 +19822,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9581289 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9581289 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9581289 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.46 @@ -17026,6 +20035,7 @@ Transform: - {fileID: 832575519} - {fileID: 410087041} - {fileID: 320593546} + - {fileID: 1287004717} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2114852224 @@ -17100,10 +20110,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -17152,6 +20170,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (18) @@ -17160,6 +20186,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -17192,6 +20226,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9366031 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9366031 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9366031 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.16 @@ -17274,6 +20320,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (57) @@ -17282,6 +20336,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -17314,6 +20376,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9304542 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9304542 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9304542 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.09 @@ -17396,6 +20470,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (38) @@ -17404,6 +20486,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -17436,6 +20526,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0599905 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0599905 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0599905 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1.7 @@ -17511,3 +20613,4 @@ SceneRoots: - {fileID: 2107838231} - {fileID: 645097292} - {fileID: 2085262816} + - {fileID: 953911669} diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditor.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditor.cs index 04ffda3cf10..ca965fa570f 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditor.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditor.cs @@ -213,7 +213,10 @@ private void DrawHeaderFoldoutWithToggle(GUIContent title, SavedBool foldoutStat labelRect.xMin += 16f; labelRect.xMax -= 20f; - bool newToggleState = GUI.Toggle(labelRect, toggleState.boolValue, " "); // Needs a space because the checkbox won't have a proper outline if we don't make a space here + var labelRect_toggle = labelRect; + labelRect_toggle.width = labelRect.height; + + bool newToggleState = GUI.Toggle(labelRect_toggle, toggleState.boolValue, " "); // Needs a space because the checkbox won't have a proper outline if we don't make a space here bool newFoldoutState = CoreEditorUtils.DrawHeaderFoldout("", foldoutState.value); if (newToggleState != toggleState.boolValue) diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Overrides/SortingGroupEditor2DURP.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Overrides/SortingGroupEditor2DURP.cs index a840eff2323..1c69efee40f 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Overrides/SortingGroupEditor2DURP.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Overrides/SortingGroupEditor2DURP.cs @@ -8,7 +8,7 @@ namespace UnityEditor [CustomEditor(typeof(UnityEngine.Rendering.SortingGroup))] [SupportedOnRenderPipeline(typeof(UniversalRenderPipelineAsset))] [CanEditMultipleObjects] - internal class SortingGroupEditor2DURP : Editor + internal class SortingGroupEditor2DURP : SortingGroupEditor { private static class Styles { @@ -19,8 +19,10 @@ private static class Styles private SerializedProperty m_SortingLayerID; private SerializedProperty m_Sort3DAs2D; - public virtual void OnEnable() + public override void OnEnable() { + base.OnEnable(); + alwaysAllowExpansion = true; m_SortingOrder = serializedObject.FindProperty("m_SortingOrder"); m_SortingLayerID = serializedObject.FindProperty("m_SortingLayerID"); diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Renderer2DAnalytics.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Renderer2DAnalytics.cs index 246f94ba579..d7385f7db3d 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Renderer2DAnalytics.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Renderer2DAnalytics.cs @@ -19,11 +19,11 @@ struct AnalyticsDataTypes [AnalyticInfo(eventName: AnalyticsDataTypes.k_LightDataString, vendorKey: AnalyticsDataTypes.k_VendorKey, maxEventsPerHour: AnalyticsDataTypes.k_MaxEventsPerHour, maxNumberOfElements: AnalyticsDataTypes.k_MaxNumberOfElements)] internal class LightDataAnalytic : IAnalytic { - public LightDataAnalytic(int instance_id, bool was_create_event, Light2D.LightType light_type) + public LightDataAnalytic(EntityId entityId, bool was_create_event, Light2D.LightType light_type) { m_Data = new Light2DData { - instance_id = instance_id, + entityId = entityId, was_create_event = was_create_event, light_type = light_type }; @@ -35,7 +35,7 @@ internal struct Light2DData : IAnalytic.IData [SerializeField] public bool was_create_event; [SerializeField] - public int instance_id; + public EntityId entityId; [SerializeField] public Light2D.LightType light_type; }; @@ -51,11 +51,11 @@ public bool TryGatherData(out IAnalytic.IData data, out Exception error) [AnalyticInfo(eventName: AnalyticsDataTypes.k_Renderer2DDataString, vendorKey: AnalyticsDataTypes.k_VendorKey, maxEventsPerHour: AnalyticsDataTypes.k_MaxEventsPerHour, maxNumberOfElements: AnalyticsDataTypes.k_MaxNumberOfElements)] internal class RenderAssetAnalytic : IAnalytic { - public RenderAssetAnalytic(int instance_id, bool was_create_event, int blending_layers_count, int blending_modes_used) + public RenderAssetAnalytic(EntityId entityId, bool was_create_event, int blending_layers_count, int blending_modes_used) { m_Data = new RendererAssetData { - instance_id = instance_id, + entityId = entityId, was_create_event = was_create_event, blending_layers_count = blending_layers_count, blending_modes_used = blending_modes_used @@ -68,7 +68,7 @@ internal struct RendererAssetData : IAnalytic.IData [SerializeField] public bool was_create_event; [SerializeField] - public int instance_id; + public EntityId entityId; [SerializeField] public int blending_layers_count; [SerializeField] diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Renderer2DMenus.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Renderer2DMenus.cs index 5b820c95531..a1368ebfea4 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Renderer2DMenus.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Renderer2DMenus.cs @@ -16,7 +16,7 @@ static void Create2DRendererData(Action onCreatedCallback) { var instance = ScriptableObject.CreateInstance(); instance.onCreated += onCreatedCallback; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, instance, "New 2D Renderer Data.asset", CoreUtils.GetIconForType(), null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, instance, "New 2D Renderer Data.asset", CoreUtils.GetIconForType(), null); } class Create2DRendererDataAsset : AssetCreationEndAction diff --git a/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/URPProcessScene.cs b/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/URPProcessScene.cs index 1647f1a85bf..b6e9c20c9eb 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/URPProcessScene.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/URPProcessScene.cs @@ -44,13 +44,14 @@ public void OnProcessScene(UnityEngine.SceneManagement.Scene scene, BuildReport if (light.type != LightType.Directional && light.type != LightType.Point && light.type != LightType.Spot && - light.type != LightType.Rectangle) + light.type != LightType.Rectangle && + light.type != LightType.Disc) { Debug.LogWarning( $"The {light.type} light type on the GameObject '{light.gameObject.name}' is unsupported by URP, and will not be rendered." ); } - else if (light.type == LightType.Rectangle && light.lightmapBakeType != LightmapBakeType.Baked) + else if ((light.type == LightType.Rectangle || light.type == LightType.Disc) && light.lightmapBakeType != LightmapBakeType.Baked) { Debug.LogWarning( $"The GameObject '{light.gameObject.name}' is an area light type, but the mode is not set to baked. URP only supports baked area lights, not realtime or mixed ones." diff --git a/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/NewPostProcessTemplateDropdownItems.cs b/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/NewPostProcessTemplateDropdownItems.cs index f164566b529..2f62123ad03 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/NewPostProcessTemplateDropdownItems.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/NewPostProcessTemplateDropdownItems.cs @@ -67,7 +67,7 @@ static void MenuCreateCustomPostProcessVolumeRendererFeature() { Texture2D icon = EditorGUIUtility.IconContent("cs Script Icon").image as Texture2D; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance(), "NewPostProcessEffect.cs", icon, k_FeatureTemplatePath); } } diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs b/Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs index 2cbc9128f4e..1e94dfa46f9 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEditor.Build; using UnityEditor.Build.Reporting; +using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.Rendering.Universal; using UnityEngine.Rendering; @@ -133,6 +134,7 @@ class ShaderBuildPreprocessor : IPreprocessBuildWithReport, IPostprocessBuildWit public static bool s_Strip2DPasses; public static bool s_UseSoftShadowQualityLevelKeywords; public static bool s_StripXRVariants; + public static bool s_UsesDynamicLightmaps; public static List supportedFeaturesList { @@ -421,8 +423,9 @@ private static void GetEveryShaderFeatureAndUpdateURPAssets(List // Update the Prefiltering settings for this URP asset urpAsset.UpdateShaderKeywordPrefiltering(ref spd); - // Mark the asset dirty so it can be serialized once the build is finished + // Save the asset before build EditorUtility.SetDirty(urpAsset); + AssetDatabase.SaveAssetIfDirty(urpAsset); } } } @@ -430,6 +433,27 @@ private static void GetEveryShaderFeatureAndUpdateURPAssets(List // The path for gathering shader features for normal shader stripping private static void HandleEnabledShaderStripping() { + var originalSetup = EditorSceneManager.GetSceneManagerSetup(); + + bool dynamicLightmapsUsed = false; + foreach (EditorBuildSettingsScene scene in EditorBuildSettings.scenes) + { + if (!scene.enabled) continue; + + EditorSceneManager.OpenScene(scene.path, OpenSceneMode.Single); + + if (Lightmapping.HasDynamicGILightmapTextures()) + { + dynamicLightmapsUsed = true; + break; + } + } + + if (originalSetup.Length > 0) + EditorSceneManager.RestoreSceneManagerSetup(originalSetup); + + s_UsesDynamicLightmaps = dynamicLightmapsUsed; + s_Strip2DPasses = true; using (ListPool.Get(out List urpAssets)) { @@ -492,8 +516,9 @@ ref ssaoRendererFeatures // Update the Prefiltering settings for this URP asset urpAsset.UpdateShaderKeywordPrefiltering(ref spd); - // Mark the asset dirty so it can be serialized once the build is finished + // Save the asset before build EditorUtility.SetDirty(urpAsset); + AssetDatabase.SaveAssetIfDirty(urpAsset); // Clean up ssaoRendererFeatures.Clear(); diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderScriptableStripper.cs b/Packages/com.unity.render-pipelines.universal/Editor/ShaderScriptableStripper.cs index 9f02ae5723a..409a3e715a5 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/ShaderScriptableStripper.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/ShaderScriptableStripper.cs @@ -31,6 +31,7 @@ internal interface IShaderScriptableStrippingData public bool stripUnusedVariants { get; set; } public bool stripUnusedPostProcessingVariants { get; set; } public bool stripUnusedXRVariants { get; set; } + public bool usesDynamicLightmaps { get; set; } public Shader shader { get; set; } public ShaderType shaderType { get; set; } @@ -69,6 +70,7 @@ internal struct StrippingData : IShaderScriptableStrippingData public bool stripUnusedVariants { get; set; } public bool stripUnusedPostProcessingVariants { get; set; } public bool stripUnusedXRVariants { get; set; } + public bool usesDynamicLightmaps { get; set; } public Shader shader { get; set; } public ShaderType shaderType { get => passData.shaderType; set{} } @@ -1056,15 +1058,17 @@ internal bool StripUnusedPass_2D(ref IShaderScriptableStrippingData strippingDat internal bool StripUnusedPass_Meta(ref IShaderScriptableStrippingData strippingData) { - // Meta pass is needed in the player for Enlighten Precomputed Realtime GI albedo and emission. + bool isEnlightenSupported = SupportedRenderingFeatures.active.enlighten && ((int)SupportedRenderingFeatures.active.lightmapBakeTypes | (int)LightmapBakeType.Realtime) != 0; + + // Meta pass is needed in the player for Enlighten Precomputed Realtime GI albedo and emission, as well as Surface Cache Global Illumination. if (strippingData.passType == PassType.Meta) { - if (SupportedRenderingFeatures.active.enlighten == false - || ((int)SupportedRenderingFeatures.active.lightmapBakeTypes | (int)LightmapBakeType.Realtime) == 0 + if ((!isEnlightenSupported || !strippingData.usesDynamicLightmaps) + #if SURFACE_CACHE - || !strippingData.IsShaderFeatureEnabled(ShaderFeatures.SurfaceCache) + && !strippingData.IsShaderFeatureEnabled(ShaderFeatures.SurfaceCache) #endif - ) + ) return true; } return false; @@ -1230,6 +1234,7 @@ public bool CanRemoveVariant([DisallowNull] Shader shader, ShaderSnippetData pas stripUnusedVariants = ShaderBuildPreprocessor.s_StripUnusedVariants, stripUnusedPostProcessingVariants = ShaderBuildPreprocessor.s_StripUnusedPostProcessingVariants, stripUnusedXRVariants = ShaderBuildPreprocessor.s_StripXRVariants, + usesDynamicLightmaps = ShaderBuildPreprocessor.s_UsesDynamicLightmaps, IsHDRDisplaySupportEnabled = PlayerSettings.allowHDRDisplaySupport, shader = shader, passData = passData, diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs index 31f4a444887..711c6f005ce 100644 --- a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs +++ b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs @@ -206,7 +206,6 @@ public bool ReassignUnityObjectMaterials(Object obj, StringBuilder errors) { // Make sure the changes get saved EditorUtility.SetDirty(obj); - EditorSceneManager.SaveScene(SceneManager.GetActiveScene()); } else errors.AppendLine($"Could not reassign materials of {obj} with {obj.GetType()} type."); diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2D.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2D.cs index 3d77a64b56c..235ffb585d8 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2D.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2D.cs @@ -175,14 +175,14 @@ private enum ComponentVersions internal ushort[] indices { get { return m_Triangles; } set { m_Triangles = value; } } // Transients - int m_PreviousLightCookieSprite; + EntityId m_PreviousLightCookieSprite; internal Vector3 m_CachedPosition; // We use Blue Channel of LightMesh's vertex color to indicate Slot Index. int m_BatchSlotIndex = 0; internal int batchSlotIndex { get { return m_BatchSlotIndex; } set { m_BatchSlotIndex = value; } } - private int lightCookieSpriteInstanceID => lightCookieSprite?.GetEntityId() ?? EntityId.None; + private EntityId lightCookieSpriteEntityId => lightCookieSprite?.GetEntityId() ?? EntityId.None; internal bool useCookieSprite => (lightType == LightType.Point || lightType == LightType.Sprite) && (lightCookieSprite != null && lightCookieSprite.texture != null); @@ -484,7 +484,7 @@ internal bool NeedsColorIndexBaking() } return false; } - + internal void UpdateCookieSpriteTexture() { m_CookieSpriteTexture?.Release(); @@ -501,7 +501,7 @@ internal void UpdateMesh(bool forceUpdate = false) var parametricRadiusChanged = LightUtility.CheckForChange(m_ShapeLightParametricRadius, ref m_PreviousShapeLightParametricRadius); var parametricSidesChanged = LightUtility.CheckForChange(m_ShapeLightParametricSides, ref m_PreviousShapeLightParametricSides); var parametricAngleOffsetChanged = LightUtility.CheckForChange(m_ShapeLightParametricAngleOffset, ref m_PreviousShapeLightParametricAngleOffset); - var spriteInstanceChanged = LightUtility.CheckForChange(lightCookieSpriteInstanceID, ref m_PreviousLightCookieSprite); + var spriteInstanceChanged = LightUtility.CheckForChange(lightCookieSpriteEntityId, ref m_PreviousLightCookieSprite); var shapePathHashChanged = LightUtility.CheckForChange(shapePathHash, ref m_PreviousShapePathHash); var lightTypeChanged = LightUtility.CheckForChange(m_LightType, ref m_PreviousLightType); var hashChanged = fallOffSizeChanged || parametricRadiusChanged || parametricSidesChanged || @@ -585,7 +585,7 @@ private void Awake() void OnEnable() { - m_PreviousLightCookieSprite = lightCookieSpriteInstanceID; + m_PreviousLightCookieSprite = lightCookieSpriteEntityId; Light2DManager.RegisterLight(this); UpdateCookieSpriteTexture(); diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/LightUtility.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/LightUtility.cs index a92b6956af0..342ad65dc98 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/LightUtility.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/LightUtility.cs @@ -45,6 +45,14 @@ public static bool CheckForChange(int a, ref int b) return changed; } + public static bool CheckForChange(EntityId a, ref EntityId b) + { + var changed = a != b; + b = a; + return changed; + } + + public static bool CheckForChange(float a, ref float b) { var changed = a != b; diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/Renderer2DRendergraph.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/Renderer2DRendergraph.cs index 98b3a088113..0dd74fc9f8f 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/Renderer2DRendergraph.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/Renderer2DRendergraph.cs @@ -43,6 +43,7 @@ private struct ImportResourceSummary Material m_BlitMaterial; Material m_BlitHDRMaterial; + Material m_BlitOffscreenUICoverMaterial; Material m_SamplingMaterial; // 2D specific render passes @@ -55,6 +56,7 @@ private struct ImportResourceSummary UpscalePass m_UpscalePass; CopyCameraSortingLayerPass m_CopyCameraSortingLayerPass; FinalBlitPass m_FinalBlitPass; + FinalBlitPass m_OffscreenUICoverPrepass; DrawScreenSpaceUIPass m_DrawOffscreenUIPass; DrawScreenSpaceUIPass m_DrawOverlayUIPass; // from HDRP code @@ -97,6 +99,7 @@ public Renderer2D(Renderer2DData data) : base(data) { m_BlitMaterial = CoreUtils.CreateEngineMaterial(shadersResources.coreBlitPS); m_BlitHDRMaterial = CoreUtils.CreateEngineMaterial(shadersResources.blitHDROverlay); + m_BlitOffscreenUICoverMaterial = CoreUtils.CreateEngineMaterial(shadersResources.blitHDROverlay); m_SamplingMaterial = CoreUtils.CreateEngineMaterial(shadersResources.samplingPS); } @@ -112,6 +115,7 @@ public Renderer2D(Renderer2DData data) : base(data) m_UpscalePass = new UpscalePass(RenderPassEvent.AfterRenderingPostProcessing, m_BlitMaterial); m_CopyCameraSortingLayerPass = new CopyCameraSortingLayerPass(m_BlitMaterial); m_FinalBlitPass = new FinalBlitPass(RenderPassEvent.AfterRendering + k_FinalBlitPassQueueOffset, m_BlitMaterial, m_BlitHDRMaterial); + m_OffscreenUICoverPrepass = new FinalBlitPass(RenderPassEvent.BeforeRenderingPostProcessing, m_BlitMaterial, m_BlitOffscreenUICoverMaterial); m_DrawOffscreenUIPass = new DrawScreenSpaceUIPass(RenderPassEvent.BeforeRenderingPostProcessing, true); m_DrawOverlayUIPass = new DrawScreenSpaceUIPass(RenderPassEvent.AfterRendering + k_AfterFinalBlitPassQueueOffset, false); // after m_FinalBlitPass @@ -867,9 +871,21 @@ private void OnMainRendering(RenderGraph renderGraph) bool outputToHDR = cameraData.isHDROutputActive; if (shouldRenderUI && outputToHDR) { - TextureHandle overlayUI; - m_DrawOffscreenUIPass.RenderOffscreen(renderGraph, frameData, CoreUtils.GetDefaultDepthStencilFormat(), out overlayUI); - commonResourceData.overlayUITexture = overlayUI; + if (cameraData.rendersOffscreenUI) + { + m_DrawOffscreenUIPass.RenderOffscreen(renderGraph, frameData, CoreUtils.GetDefaultDepthStencilFormat(), commonResourceData.overlayUITexture); + if (cameraData.blitsOffscreenUICover) + { + var blackTextureDesc = new RenderTextureDescriptor(1, 1, GraphicsFormat.R8G8B8A8_SRGB, 0); + var source = UniversalRenderer.CreateRenderGraphTexture(renderGraph, blackTextureDesc, "BlackTexture", false); + m_OffscreenUICoverPrepass.Render(renderGraph, cameraData, commonResourceData, source, true); + } + } + else + { + // When the first camera renders the shared offscreen UI texture, register it as a global texture so subsequent cameras can use it in their final passes. + RenderGraphUtils.SetGlobalTexture(renderGraph, ShaderPropertyId.overlayUITexture, commonResourceData.overlayUITexture); + } } } @@ -1028,6 +1044,7 @@ private void CleanupRenderGraphResources() m_UpscalePass.Dispose(); m_CopyDepthPass?.Dispose(); m_FinalBlitPass?.Dispose(); + m_OffscreenUICoverPrepass?.Dispose(); m_DrawOffscreenUIPass?.Dispose(); m_DrawOverlayUIPass?.Dispose(); m_PostProcess?.Dispose(); @@ -1045,6 +1062,7 @@ private void CleanupRenderGraphResources() CoreUtils.Destroy(m_BlitMaterial); CoreUtils.Destroy(m_BlitHDRMaterial); + CoreUtils.Destroy(m_BlitOffscreenUICoverMaterial); CoreUtils.Destroy(m_SamplingMaterial); #if ENABLE_VR && ENABLE_XR_MODULE diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2DProvider.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2DProvider.cs index 80b18e26f0d..85c2eb639c1 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2DProvider.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2DProvider.cs @@ -12,6 +12,7 @@ namespace UnityEngine.Rendering.Universal /// /// Class ShadowShape2DProvider has methods called by a ShadowCaster2D to determine if it should be listed as a Casting Option, and to provide geometry if it is the active ShadowShape2DProvider /// + [Serializable] public abstract class ShadowShape2DProvider { /// diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Data/PostProcessData.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Data/PostProcessData.cs index 5422f622894..efcb98af8c7 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Data/PostProcessData.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Data/PostProcessData.cs @@ -34,7 +34,7 @@ public override void Action(EntityId entityId, string pathName, string resourceF static void CreatePostProcessData() { var icon = EditorGUIUtility.IconContent("ScriptableObject Icon").image as Texture2D; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, CreateInstance(), "CustomPostProcessData.asset", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, CreateInstance(), "CustomPostProcessData.asset", icon, null); } internal static PostProcessData GetDefaultPostProcessData() diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/FrameData/UniversalCameraData.cs b/Packages/com.unity.render-pipelines.universal/Runtime/FrameData/UniversalCameraData.cs index 6f758e37d75..0b740c43ef8 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/FrameData/UniversalCameraData.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/FrameData/UniversalCameraData.cs @@ -358,6 +358,18 @@ public ColorGamut hdrDisplayColorGamut /// public bool rendersOverlayUI => SupportedRenderingFeatures.active.rendersUIOverlay && resolveToScreen; + /// + /// Makes the Camera render the offscreen overlay UI needed for HDR outputs. + /// URP shares the offscreen texture between cameras once the first base camera renders it. + /// + internal bool rendersOffscreenUI; + + /// + /// Makes the Camera blit the offscreen overlay UI cover for HDR outputs. + /// The offscreen UI cover prepass ensures the overlay UI covers the entire display even when the combined camera viewports do not fill the screen. + /// + internal bool blitsOffscreenUICover; + /// /// True is the handle has its content flipped on the y axis. /// This happens only with certain rendering APIs. @@ -644,6 +656,8 @@ public override void Reset() isLastBaseCamera = false; stackAnyPostProcessingEnabled = false; stackLastCameraOutputToHDR = false; + rendersOffscreenUI = false; + blitsOffscreenUICover = false; } } } diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs b/Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs index 6507b71a1a1..e27fc4e29dd 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs @@ -86,9 +86,9 @@ private struct LightCookieMapping if (d == 0) { // Sort by texture ID if "undecided" to batch fetches to the same cookie texture. - int ai = alc.GetEntityId(); - int bi = blc.GetEntityId(); - return ai - bi; + var ai = alc.GetEntityId().GetRawData(); + var bi = blc.GetEntityId().GetRawData(); + return (int)(ai - bi); } return d; }; @@ -628,12 +628,12 @@ int FetchUVRects(CommandBuffer cmd, ref WorkSlice validLight uint ComputeCookieRequestPixelCount(ref WorkSlice validLightMappings) { uint requestPixelCount = 0; - int prevCookieID = 0; + EntityId prevCookieID = EntityId.None; for (int i = 0; i < validLightMappings.length; i++) { var lcm = validLightMappings[i]; Texture cookie = lcm.light.cookie; - int cookieID = cookie.GetEntityId(); + EntityId cookieID = cookie.GetEntityId(); // Consider only unique textures as atlas request pixels // NOTE: relies on same cookies being sorted together diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DrawScreenSpaceUIPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DrawScreenSpaceUIPass.cs index 013c0b37ff5..d34d35f7d76 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DrawScreenSpaceUIPass.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/DrawScreenSpaceUIPass.cs @@ -31,15 +31,26 @@ public DrawScreenSpaceUIPass(RenderPassEvent evt, bool renderOffscreen) /// Get a descriptor for the required color texture for this pass. /// /// Camera target descriptor. - /// Unscaled pixel width of the camera. - /// Unscaled pixel height of the camera. + /// The full screen width. + /// The full screen height. /// - public static void ConfigureColorDescriptor(ref RenderTextureDescriptor descriptor, int cameraWidth, int cameraHeight) + private static void ConfigureColorDescriptor(ref RenderTextureDescriptor descriptor, int screenWidth, int screenHeight) { descriptor.graphicsFormat = GraphicsFormat.R8G8B8A8_SRGB; descriptor.depthStencilFormat = GraphicsFormat.None; - descriptor.width = cameraWidth; - descriptor.height = cameraHeight; + descriptor.width = screenWidth; + descriptor.height = screenHeight; + } + + /// + /// Get a descriptor for the required color texture for offscreen UI pass. + /// + internal static void ConfigureOffscreenUITextureDesc(ref TextureDesc textureDesc) + { + textureDesc.format = GraphicsFormat.R8G8B8A8_SRGB; + textureDesc.depthBufferBits = 0; + textureDesc.width = Screen.width; + textureDesc.height = Screen.height; } /// @@ -47,15 +58,15 @@ public static void ConfigureColorDescriptor(ref RenderTextureDescriptor descript /// /// Camera target descriptor. /// Depth stencil format required. - /// Unscaled pixel width of the camera. - /// Unscaled pixel height of the camera. + /// The full screen width. + /// The full screen height. /// - public static void ConfigureDepthDescriptor(ref RenderTextureDescriptor descriptor, GraphicsFormat depthStencilFormat, int cameraWidth, int cameraHeight) + private static void ConfigureDepthDescriptor(ref RenderTextureDescriptor descriptor, GraphicsFormat depthStencilFormat, int screenWidth, int screenHeight) { descriptor.graphicsFormat = GraphicsFormat.None; descriptor.depthStencilFormat = depthStencilFormat; - descriptor.width = cameraWidth; - descriptor.height = cameraHeight; + descriptor.width = screenWidth; + descriptor.height = screenHeight; } private static void ExecutePass(RasterCommandBuffer commandBuffer, PassData passData, RendererList rendererList) @@ -86,11 +97,11 @@ public void Setup(UniversalCameraData cameraData, GraphicsFormat depthStencilFor if (m_RenderOffscreen) { RenderTextureDescriptor colorDescriptor = cameraData.cameraTargetDescriptor; - ConfigureColorDescriptor(ref colorDescriptor, cameraData.pixelWidth, cameraData.pixelHeight); + ConfigureColorDescriptor(ref colorDescriptor, Screen.width, Screen.height); RenderingUtils.ReAllocateHandleIfNeeded(ref m_ColorTarget, colorDescriptor, name: "_OverlayUITexture"); RenderTextureDescriptor depthDescriptor = cameraData.cameraTargetDescriptor; - ConfigureDepthDescriptor(ref depthDescriptor, depthStencilFormat, cameraData.pixelWidth, cameraData.pixelHeight); + ConfigureDepthDescriptor(ref depthDescriptor, depthStencilFormat, Screen.width, Screen.height); RenderingUtils.ReAllocateHandleIfNeeded(ref m_DepthTarget, depthDescriptor, name: "_OverlayUITexture_Depth"); } } @@ -108,14 +119,11 @@ private class UnsafePassData internal TextureHandle colorTarget; } - internal void RenderOffscreen(RenderGraph renderGraph, ContextContainer frameData, GraphicsFormat depthStencilFormat, out TextureHandle output) + internal void RenderOffscreen(RenderGraph renderGraph, ContextContainer frameData, GraphicsFormat depthStencilFormat, TextureHandle overlayUITexture) { UniversalCameraData cameraData = frameData.Get(); - RenderTextureDescriptor colorDescriptor = cameraData.cameraTargetDescriptor; - ConfigureColorDescriptor(ref colorDescriptor, cameraData.pixelWidth, cameraData.pixelHeight); - output = UniversalRenderer.CreateRenderGraphTexture(renderGraph, colorDescriptor, "_OverlayUITexture", true); RenderTextureDescriptor depthDescriptor = cameraData.cameraTargetDescriptor; - ConfigureDepthDescriptor(ref depthDescriptor, depthStencilFormat, cameraData.pixelWidth, cameraData.pixelHeight); + ConfigureDepthDescriptor(ref depthDescriptor, depthStencilFormat, Screen.width, Screen.height); TextureHandle depthBuffer = UniversalRenderer.CreateRenderGraphTexture(renderGraph, depthDescriptor, "_OverlayUITexture_Depth", false); // Render uGUI and UIToolkit overlays @@ -124,18 +132,19 @@ internal void RenderOffscreen(RenderGraph renderGraph, ContextContainer frameDat // UIToolkit/uGUI pass accept custom shaders, we need to make sure we use all global textures builder.UseAllGlobalTextures(true); - builder.SetRenderAttachment(output, 0); + builder.SetRenderAttachment(overlayUITexture, 0); passData.rendererList = renderGraph.CreateUIOverlayRendererList(cameraData.camera, UISubset.UIToolkit_UGUI); builder.UseRendererList(passData.rendererList); builder.SetRenderAttachmentDepth(depthBuffer, AccessFlags.ReadWrite); - if (output.IsValid()) - builder.SetGlobalTextureAfterPass(output, ShaderPropertyId.overlayUITexture); + if (overlayUITexture.IsValid()) + builder.SetGlobalTextureAfterPass(overlayUITexture, ShaderPropertyId.overlayUITexture); builder.SetRenderFunc(static (PassData data, RasterGraphContext context) => { + context.cmd.ClearRenderTarget(true, true, Color.clear); ExecutePass(context.cmd, data, data.rendererList); }); } @@ -145,8 +154,8 @@ internal void RenderOffscreen(RenderGraph renderGraph, ContextContainer frameDat // Note, these specific UI calls doesn't need depth buffer unlike UIToolkit/uGUI using (var builder = renderGraph.AddUnsafePass("Draw Screen Space IMGUI/SoftwareCursor - Offscreen", out var passData, profilingSampler)) { - passData.colorTarget = output; - builder.UseTexture(output, AccessFlags.Write); + passData.colorTarget = overlayUITexture; + builder.UseTexture(overlayUITexture, AccessFlags.Write); passData.rendererList = renderGraph.CreateUIOverlayRendererList(cameraData.camera, UISubset.LowLevel); builder.UseRendererList(passData.rendererList); diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs index 62681361765..b7475878df4 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs @@ -103,8 +103,10 @@ private static void ExecutePass(RasterCommandBuffer cmd, PassData data, RTHandle if (cameraData.xr.enabled) isRenderToBackBufferTarget = new RenderTargetIdentifier(destination.nameID, 0, CubemapFace.Unknown, -1) == new RenderTargetIdentifier(cameraData.xr.renderTarget, 0, CubemapFace.Unknown, -1); #endif + var pixelRect = data.useFullScreenViewport ? new Rect(0f, 0f, Screen.width, Screen.height) : cameraData.pixelRect; + RenderingUtils.SetupOffscreenUIViewportParams(data.blitMaterialData.material, ref pixelRect, isRenderToBackBufferTarget); if (isRenderToBackBufferTarget) - cmd.SetViewport(cameraData.pixelRect); + cmd.SetViewport(pixelRect); // turn off any global wireframe & "scene view wireframe shader hijack" settings for doing blits: // we never want them to show up as wireframe @@ -126,28 +128,26 @@ private class PassData internal bool enableAlphaOutput; internal BlitMaterialData blitMaterialData; internal UniversalCameraData cameraData; + internal bool useFullScreenViewport; } /// /// Initialize the shared pass data. /// /// - private void InitPassData(UniversalCameraData cameraData, ref PassData passData, BlitType blitType, bool enableAlphaOutput) + private void InitPassData(UniversalCameraData cameraData, ref PassData passData, BlitType blitType, bool enableAlphaOutput, bool useFullScreenViewport) { passData.cameraData = cameraData; passData.requireSrgbConversion = cameraData.requireSrgbConversion; passData.enableAlphaOutput = enableAlphaOutput; + passData.useFullScreenViewport = useFullScreenViewport; passData.blitMaterialData = m_BlitMaterialData[(int)blitType]; } - /// - override public void RecordRenderGraph(RenderGraph renderGraph, ContextContainer frameData) + // Shared by both FinalBlitPass and OffscreenUICoverPrepass. + internal void Render(RenderGraph renderGraph, UniversalCameraData cameraData, UniversalResourceData resourceData, TextureHandle sourceTexture, bool useFullScreenViewport = false) { - var cameraData = frameData.Get(); - var resourceData = frameData.Get(); - - var sourceTexture = resourceData.cameraColor; var destinationTexture = resourceData.backBufferColor; //By definition this pass blits to the backbuffer var overlayUITexture = resourceData.overlayUITexture; @@ -155,7 +155,7 @@ override public void RecordRenderGraph(RenderGraph renderGraph, ContextContainer { bool outputsToHDR = cameraData.isHDROutputActive; bool outputsAlpha = cameraData.isAlphaOutputEnabled; - InitPassData(cameraData, ref passData, outputsToHDR ? BlitType.HDR : BlitType.Core, outputsAlpha); + InitPassData(cameraData, ref passData, outputsToHDR ? BlitType.HDR : BlitType.Core, outputsAlpha, useFullScreenViewport); passData.sourceID = ShaderPropertyId.sourceTex; passData.source = sourceTexture; @@ -238,7 +238,14 @@ override public void RecordRenderGraph(RenderGraph renderGraph, ContextContainer }); } + } + /// + override public void RecordRenderGraph(RenderGraph renderGraph, ContextContainer frameData) + { + var cameraData = frameData.Get(); + var resourceData = frameData.Get(); + Render(renderGraph, cameraData, resourceData, resourceData.cameraColor); resourceData.SwitchActiveTexturesToBackbuffer(); } } diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/FinalPostProcessPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/FinalPostProcessPass.cs index 3e35a1b917f..7e3edcb0ca7 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/FinalPostProcessPass.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/FinalPostProcessPass.cs @@ -187,8 +187,11 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer if (applySrgbEncoding) material.EnableKeyword(ShaderKeywordStrings.LinearToSRGBConversion); - if(hdrColorEncoding) + if (hdrColorEncoding) + { PostProcessUtils.SetupHDROutput(material, cameraData.hdrDisplayInformation, cameraData.hdrDisplayColorGamut, data.tonemapping, data.hdrOperations, cameraData.rendersOverlayUI); + RenderingUtils.SetupOffscreenUIViewportParams(material, ref cameraData.pixelRect, cameraData.resolveFinalTarget); + } material.SetVector(ShaderConstants._SourceSize, PostProcessUtils.CalcShaderSourceSize(sourceTextureHdl)); diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/UberPostProcessPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/UberPostProcessPass.cs index 9f08b039edc..e99fe1e2c39 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/UberPostProcessPass.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/UberPostProcessPass.cs @@ -232,7 +232,10 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer } if(PostProcessUtils.RequireHDROutput(cameraData)) + { PostProcessUtils.SetupHDROutput(material, cameraData.hdrDisplayInformation, cameraData.hdrDisplayColorGamut, data.tonemapping, data.hdrOperations, cameraData.rendersOverlayUI); + RenderingUtils.SetupOffscreenUIViewportParams(material, ref cameraData.pixelRect, data.isFinalPass && cameraData.resolveFinalTarget); + } // Done with Uber, blit it #if ENABLE_VR && ENABLE_XR_MODULE diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/ReflectionProbeManager.cs b/Packages/com.unity.render-pipelines.universal/Runtime/ReflectionProbeManager.cs index 871fbac13e9..fbf8a2d6f6e 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/ReflectionProbeManager.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/ReflectionProbeManager.cs @@ -12,10 +12,10 @@ struct ReflectionProbeManager : IDisposable RenderTexture m_AtlasTexture1; RTHandle m_AtlasTexture0Handle; BuddyAllocator m_AtlasAllocator; - Dictionary m_Cache; - Dictionary m_WarningCache; - List m_NeedsUpdate; - List m_NeedsRemove; + Dictionary m_Cache; + Dictionary m_WarningCache; + List m_NeedsUpdate; + List m_NeedsRemove; // Pre-allocated arrays for filling constant buffers Vector4[] m_BoxMax; @@ -95,10 +95,10 @@ void Init() // The smallest allocatable resolution we want is 4x4. We calculate the number of levels as: // log2(max) - log2(4) = log2(max) - 2 m_AtlasAllocator = new BuddyAllocator(math.floorlog2(SystemInfo.maxTextureSize) - 2, 2); - m_Cache = new Dictionary(maxProbes); - m_WarningCache = new Dictionary(maxProbes); - m_NeedsUpdate = new List(maxProbes); - m_NeedsRemove = new List(maxProbes); + m_Cache = new Dictionary(maxProbes); + m_WarningCache = new Dictionary(maxProbes); + m_NeedsUpdate = new List(maxProbes); + m_NeedsRemove = new List(maxProbes); m_BoxMax = new Vector4[maxProbes]; m_BoxMin = new Vector4[maxProbes]; @@ -160,7 +160,9 @@ public unsafe void UpdateGpuData(CommandBuffer cmd, ref CullingResults cullResul var texture = probe.texture; var id = probe.reflectionProbe.GetEntityId(); +#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage var wasCached = m_Cache.TryGetValue(id, out var cachedProbe); +#pragma warning restore 618 if (!texture) { @@ -193,8 +195,10 @@ public unsafe void UpdateGpuData(CommandBuffer cmd, ref CullingResults cullResul // Check if we ran out of space in the atlas. if (mip < cachedProbe.mipCount) { +#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage if (!m_WarningCache.ContainsKey(id)) showFullWarning = true; m_WarningCache[id] = frameIndex; +#pragma warning restore 618 for (var i = 0; i < mip; i++) m_AtlasAllocator.Free(new BuddyAllocation(cachedProbe.levels[i], cachedProbe.dataIndices[i])); for (var i = 0; i < k_MaxMipCount; i++) cachedProbe.dataIndices[i] = -1; continue; @@ -218,7 +222,9 @@ public unsafe void UpdateGpuData(CommandBuffer cmd, ref CullingResults cullResul #if UNITY_EDITOR cachedProbe.imageContentsHash = texture.imageContentsHash; #endif +#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage m_NeedsUpdate.Add(id); +#pragma warning restore 618 } // If the probe is set to be updated every frame, we assign the last used frame to -1 so it's evicted in next frame. @@ -226,9 +232,11 @@ public unsafe void UpdateGpuData(CommandBuffer cmd, ref CullingResults cullResul cachedProbe.lastUsed = -1; else cachedProbe.lastUsed = frameIndex; - + cachedProbe.hdrData = probe.hdrData; +#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage m_Cache[id] = cachedProbe; +#pragma warning restore 618 } // Grow the atlas if it's not big enough to contain the current allocations. @@ -265,7 +273,9 @@ public unsafe void UpdateGpuData(CommandBuffer cmd, ref CullingResults cullResul var probe = probes[probeIndex]; var id = probe.reflectionProbe.GetEntityId(); var dataIndex = probeIndex - skipCount; +#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage if (!m_Cache.TryGetValue(id, out var cachedProbe) || !probe.texture) +#pragma warning restore 618 { skipCount++; continue; @@ -295,7 +305,7 @@ public unsafe void UpdateGpuData(CommandBuffer cmd, ref CullingResults cullResul var level = cachedProbe.levels[mip]; var dataIndex = cachedProbe.dataIndices[mip]; // If we need to y-flip we will instead flip the atlas since that is updated less frequent and then the lookup should be correct. - // By doing this we won't have to y-flip the lookup in the shader code. + // By doing this we won't have to y-flip the lookup in the shader code. var scaleBias = GetScaleOffset(level, dataIndex, true, !SystemInfo.graphicsUVStartsAtTop); var sizeWithoutPadding = (1 << (m_AtlasAllocator.levelCount + 1 - level)) - 2; Blitter.BlitCubeToOctahedral2DQuadWithPadding(cmd, cachedProbe.texture, new Vector2(sizeWithoutPadding, sizeWithoutPadding), scaleBias, mip, true, 2, cachedProbe.hdrData); @@ -339,7 +349,7 @@ public void Dispose() Object.DestroyImmediate(m_AtlasTexture0); Object.DestroyImmediate(m_AtlasTexture1); - + this = default; } } diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RenderingUtils.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RenderingUtils.cs index 97f54362248..924a6bd5cc4 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/RenderingUtils.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/RenderingUtils.cs @@ -167,6 +167,17 @@ internal static void SetScaleBiasRt(RasterCommandBuffer cmd, in UniversalCameraD cmd.SetGlobalVector(Shader.PropertyToID("_ScaleBiasRt"), scaleBiasRt); } + internal static void SetupOffscreenUIViewportParams(Material material, ref Rect pixelRect, bool isRenderToBackBufferTarget) + { + Vector4 offscreenUIViewportParams = new Vector4(0f, 0f, 1f, 1f); + if (isRenderToBackBufferTarget) + { + var rcpScreenSize = new Vector2(1f / Screen.width, 1f / Screen.height); + offscreenUIViewportParams = new Vector4(pixelRect.x * rcpScreenSize.x, pixelRect.y * rcpScreenSize.y, pixelRect.width * rcpScreenSize.x, pixelRect.height * rcpScreenSize.y); + } + material.SetVector(ShaderPropertyId.offscreenUIViewportParams, offscreenUIViewportParams); + } + // This is used to render materials that contain built-in shader passes not compatible with URP. // It will render those legacy passes with error/pink shader. [Conditional("DEVELOPMENT_BUILD"), Conditional("UNITY_EDITOR")] diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs index 65615b12704..e2796b5a0ed 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs @@ -191,6 +191,12 @@ internal static bool UseDynamicBranchFogKeyword() // Store locally the value on the instance due as the Render Pipeline Asset data might change before the disposal of the asset, making some APV Resources leak. internal bool apvIsEnabled = false; + // Flag to check if offscreen UI cover prepass should be executed for the current frame. + internal static bool requireOffscreenUICoverPrepass; + + // Flag to check if offscreen UI for HDR output is rendered in this frame at the first base camera. + internal static bool offscreenUIRenderedInCurrentFrame; + // In some specific cases, we modify Screen.msaaSamples to reduce GPU bandwidth internal static bool canOptimizeScreenMSAASamples { get; private set; } @@ -425,6 +431,10 @@ protected override void Render(ScriptableRenderContext renderContext, List(); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, CreateInstance(), "New Custom Universal Renderer Data.asset", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, CreateInstance(), "New Custom Universal Renderer Data.asset", icon, null); } #endif diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRendererRenderGraph.cs b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRendererRenderGraph.cs index 0eebdf50bc6..b5520354107 100644 --- a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRendererRenderGraph.cs +++ b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRendererRenderGraph.cs @@ -176,6 +176,7 @@ public sealed partial class UniversalRenderer private static RTHandle s_RenderGraphCameraDepthHandle; private static int s_CurrentColorHandle = 0; private static RTHandle s_RenderGraphDebugTextureHandle; + private static RTHandle s_OffscreenUIColorHandle; private RTHandle currentRenderGraphCameraColorHandle { @@ -226,6 +227,7 @@ private void CleanupRenderGraphResources() s_RenderGraphCameraDepthHandle?.Release(); s_RenderGraphDebugTextureHandle?.Release(); + s_OffscreenUIColorHandle?.Release(); } /// @@ -397,6 +399,9 @@ void CreateRenderGraphCameraRenderTargets(RenderGraph renderGraph, bool isCamera CreateMotionVectorTextures(renderGraph, cameraDescriptor); CreateRenderingLayersTexture(renderGraph, cameraDescriptor); + + if (cameraData.isHDROutputActive && cameraData.rendersOverlayUI) + CreateOffscreenUITexture(renderGraph, cameraDescriptor); } private readonly struct ClearCameraParams @@ -1325,9 +1330,21 @@ private void OnMainRendering(RenderGraph renderGraph, ScriptableRenderContext co bool outputToHDR = cameraData.isHDROutputActive; if (shouldRenderUI && outputToHDR) { - TextureHandle overlayUI; - m_DrawOffscreenUIPass.RenderOffscreen(renderGraph, frameData, cameraDepthAttachmentFormat, out overlayUI); - resourceData.overlayUITexture = overlayUI; + if (cameraData.rendersOffscreenUI) + { + m_DrawOffscreenUIPass.RenderOffscreen(renderGraph, frameData, cameraDepthAttachmentFormat, resourceData.overlayUITexture); + if (cameraData.blitsOffscreenUICover) + { + var blackTextureDesc = new RenderTextureDescriptor(1, 1, GraphicsFormat.R8G8B8A8_SRGB, 0); + var source = CreateRenderGraphTexture(renderGraph, blackTextureDesc, "BlackTexture", false); + m_OffscreenUICoverPrepass.Render(renderGraph, cameraData, resourceData, source, true); + } + } + else + { + // When the first camera renders the shared offscreen UI texture, register it as a global texture so subsequent cameras can use it in their final passes. + RenderGraphUtils.SetGlobalTexture(renderGraph, ShaderPropertyId.overlayUITexture, resourceData.overlayUITexture); + } } } @@ -1911,6 +1928,14 @@ void CreateRenderingLayersTexture(RenderGraph renderGraph, TextureDesc descripto } } + void CreateOffscreenUITexture(RenderGraph renderGraph, TextureDesc descriptor) + { + UniversalResourceData resourceData = frameData.Get(); + DrawScreenSpaceUIPass.ConfigureOffscreenUITextureDesc(ref descriptor); + RenderingUtils.ReAllocateHandleIfNeeded(ref s_OffscreenUIColorHandle, descriptor, name: "_OverlayUITexture"); + resourceData.overlayUITexture = renderGraph.ImportTexture(s_OffscreenUIColorHandle); + } + void DepthNormalPrepassRender(RenderGraph renderGraph, RenderPassInputSummary renderPassInputs, in TextureHandle depthTarget, uint batchLayerMask, bool setGlobalDepth, bool setGlobalTextures, bool partialPass) { UniversalResourceData resourceData = frameData.Get(); diff --git a/Packages/com.unity.render-pipelines.universal/Samples~/RendererShaderUserValueSamples/Scenes/Agora.unity b/Packages/com.unity.render-pipelines.universal/Samples~/RendererShaderUserValueSamples/Scenes/Agora.unity index 7218344dc49..f4ddce7fa3b 100644 --- a/Packages/com.unity.render-pipelines.universal/Samples~/RendererShaderUserValueSamples/Scenes/Agora.unity +++ b/Packages/com.unity.render-pipelines.universal/Samples~/RendererShaderUserValueSamples/Scenes/Agora.unity @@ -93,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: cb345d75ee0246d44b6ce6eb8211b579, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: a9f57593af98e79419dc47868a884af9, type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -135,6 +135,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (8) @@ -143,6 +151,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -175,6 +191,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9548192 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9548192 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9548192 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.99 @@ -244,6 +272,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (78) @@ -252,6 +288,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -284,6 +328,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9734527 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9734527 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9734527 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.32 @@ -393,10 +449,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: b68ae174a46c96f4cad59fd475cad90f, type: 2} + objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -484,6 +544,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 5aa0142fa7023c04889ea1b7925fbb0b, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 5aa0142fa7023c04889ea1b7925fbb0b, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -543,6 +607,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (14) @@ -551,6 +623,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -583,6 +663,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9441316 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9441316 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9441316 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.95 @@ -792,6 +884,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -904,6 +1000,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -934,10 +1034,18 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: fedf653bcb23d544192781d679700e05, type: 2} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (91) @@ -946,6 +1054,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -978,6 +1094,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9562945 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9562945 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9562945 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.19 @@ -1047,6 +1175,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (69) @@ -1055,6 +1191,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -1087,6 +1231,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9175536 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9175536 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9175536 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.05 @@ -1161,6 +1317,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (17) @@ -1169,6 +1333,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -1201,6 +1373,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.98711115 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.98711115 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.98711115 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.42 @@ -1315,6 +1499,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: bacb4abc2c025034093a0e95924b06d5, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: bacb4abc2c025034093a0e95924b06d5, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -1345,6 +1533,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (29) @@ -1353,6 +1549,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -1385,6 +1589,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9178277 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9178277 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9178277 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.35 @@ -1499,6 +1715,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 899464e5a9901b549b1524b7d740c0bd, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 899464e5a9901b549b1524b7d740c0bd, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -1539,6 +1759,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (22) @@ -1547,6 +1775,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -1579,6 +1815,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9337176 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9337176 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9337176 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.65 @@ -1688,6 +1936,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: ce1f1682f2adfb149a956aafbb0aa05c, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: ce1f1682f2adfb149a956aafbb0aa05c, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -1722,6 +1974,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (62) @@ -1730,6 +1990,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -1762,6 +2030,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0954665 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0954665 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0954665 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.05 @@ -1831,6 +2111,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (51) @@ -1839,6 +2127,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -1871,6 +2167,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.036018 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.036018 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.036018 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.22 @@ -1945,6 +2253,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (3) @@ -1953,6 +2269,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -1985,6 +2309,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9092977 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9092977 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9092977 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.7 @@ -2054,14 +2390,30 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} - - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} - propertyPath: m_Name - value: SoldierVAT (48) + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_Name + value: SoldierVAT (48) objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -2094,6 +2446,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0387284 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0387284 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0387284 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.39 @@ -2176,6 +2540,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (10) @@ -2184,6 +2556,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -2216,6 +2596,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0048623 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0048623 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0048623 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.19 @@ -2298,6 +2690,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (84) @@ -2306,6 +2706,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -2338,6 +2746,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0104953 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0104953 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0104953 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.64 @@ -2525,6 +2945,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 1.404 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -2732,7 +3156,7 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410087039} m_Enabled: 1 - serializedVersion: 12 + serializedVersion: 13 m_Type: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 2 @@ -2774,7 +3198,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -2784,7 +3208,7 @@ Light: m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ForceVisible: 0 - m_ShadowRadius: 0 + m_ShapeRadius: 0 m_ShadowAngle: 0 m_LightUnit: 1 m_LuxAtDistance: 1 @@ -2849,6 +3273,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (43) @@ -2857,6 +3289,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -2889,6 +3329,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.043858 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.043858 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.043858 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.84 @@ -2998,6 +3450,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: ce1f1682f2adfb149a956aafbb0aa05c, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: ce1f1682f2adfb149a956aafbb0aa05c, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -3032,6 +3488,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (72) @@ -3040,6 +3504,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -3072,6 +3544,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0865785 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0865785 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0865785 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.69 @@ -3197,6 +3681,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -3272,6 +3760,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 6c2171abcab706c4d8d25ac0c8c3f2a0, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 6c2171abcab706c4d8d25ac0c8c3f2a0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -3307,6 +3799,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (31) @@ -3315,6 +3815,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -3347,6 +3855,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0597335 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0597335 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0597335 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.88 @@ -3434,6 +3954,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (68) @@ -3442,6 +3970,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -3474,6 +4010,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0276741 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0276741 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0276741 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.16 @@ -3571,6 +4119,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (36) @@ -3579,6 +4135,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -3611,6 +4175,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9741254 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9741254 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9741254 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.16 @@ -3736,6 +4312,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -3766,6 +4346,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (66) @@ -3774,6 +4362,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -3806,6 +4402,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0495923 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0495923 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0495923 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.87 @@ -3888,6 +4496,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (7) @@ -3896,6 +4512,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -3928,6 +4552,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0943915 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0943915 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0943915 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.84 @@ -4007,6 +4643,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (6) @@ -4015,6 +4659,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -4047,6 +4699,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9079561 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9079561 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9079561 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 7.23 @@ -4161,6 +4825,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 899464e5a9901b549b1524b7d740c0bd, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 899464e5a9901b549b1524b7d740c0bd, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -4256,6 +4924,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.038 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -4286,6 +4958,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (81) @@ -4294,6 +4974,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -4326,6 +5014,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.022219 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.022219 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.022219 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.29 @@ -4431,6 +5131,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (98) @@ -4439,6 +5147,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -4471,6 +5187,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0235037 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0235037 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0235037 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.312822 @@ -4650,10 +5378,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 87cc8c0832836144e9ac4d454b0c730e, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 87cc8c0832836144e9ac4d454b0c730e, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 87cc8c0832836144e9ac4d454b0c730e, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 87cc8c0832836144e9ac4d454b0c730e, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -4684,6 +5420,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (75) @@ -4692,6 +5436,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -4724,6 +5476,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9686482 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9686482 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9686482 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.94 @@ -4829,6 +5593,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (24) @@ -4837,6 +5609,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -4869,6 +5649,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9028713 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9028713 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9028713 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.89 @@ -4935,6 +5727,56 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::LookAt target: {fileID: 1528244271} +--- !u!1 &723885790 +GameObject: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 723885792} + - component: {fileID: 723885791} + m_Layer: 0 + m_Name: ProbeVolumePerSceneData + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &723885791 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723885790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a83d2f7ae04ab6f4f99b0d85377be998, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.ProbeVolumePerSceneData + serializedBakingSet: {fileID: 11400000, guid: c70db1bae93d57544ba8e89571f4582a, type: 2} + sceneGUID: 4760627bc6393c1438677399c6690f99 + obsoleteAsset: {fileID: 0} + obsoleteCellSharedDataAsset: {fileID: 0} + obsoleteCellSupportDataAsset: {fileID: 0} + obsoleteSerializedScenarios: [] +--- !u!4 &723885792 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723885790} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &731213846 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} @@ -4996,6 +5838,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: bc48358fa18d9b94fa3904f87e9bd7ac, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: bc48358fa18d9b94fa3904f87e9bd7ac, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -5092,10 +5938,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0a01edd7d7e655e4ea6b8ad06b153b52, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0a01edd7d7e655e4ea6b8ad06b153b52, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 0a01edd7d7e655e4ea6b8ad06b153b52, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 0a01edd7d7e655e4ea6b8ad06b153b52, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -5144,6 +5998,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (55) @@ -5152,6 +6014,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -5184,6 +6054,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.95559263 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.95559263 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.95559263 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.78 @@ -5293,6 +6175,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 6c2171abcab706c4d8d25ac0c8c3f2a0, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 6c2171abcab706c4d8d25ac0c8c3f2a0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -5367,6 +6253,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 9f38a280a0ab75045bd8b14089b1bab8, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 9f38a280a0ab75045bd8b14089b1bab8, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -5397,6 +6287,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (59) @@ -5405,6 +6303,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -5437,6 +6343,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0872806 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0872806 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0872806 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.56 @@ -5506,6 +6424,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (30) @@ -5514,6 +6440,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -5546,6 +6480,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0594314 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0594314 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0594314 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.33 @@ -5628,6 +6574,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (11) @@ -5636,6 +6590,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -5668,6 +6630,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0430253 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0430253 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0430253 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.46 @@ -5742,6 +6716,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (45) @@ -5750,6 +6732,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -5782,6 +6772,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9071114 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9071114 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9071114 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.01 @@ -5835,6 +6837,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} m_PrefabInstance: {fileID: 803231817} m_PrefabAsset: {fileID: 0} +--- !u!1 &805922641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 805922643} + - component: {fileID: 805922642} + m_Layer: 0 + m_Name: Adaptive Probe Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &805922642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 805922641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cded085d155cde949b60f67a11dbc3bd, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.ProbeVolume + mode: 2 + size: {x: 51, y: 19.021261, z: 51} + overrideRendererFilters: 0 + minRendererVolumeSize: 0.1 + objectLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + lowestSubdivLevelOverride: 0 + highestSubdivLevelOverride: 7 + overridesSubdivLevels: 0 + mightNeedRebaking: 0 + cachedTransform: + e00: 1 + e01: 0 + e02: 0 + e03: -0 + e10: 0 + e11: 1 + e12: 0 + e13: -6.1958222 + e20: 0 + e21: 0 + e22: 1 + e23: -0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + cachedHashCode: -638264886 + fillEmptySpaces: 0 + version: 2 + globalVolume: 0 +--- !u!4 &805922643 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 805922641} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 3.1958222, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2107838231} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &828326118 PrefabInstance: m_ObjectHideFlags: 0 @@ -5851,6 +6929,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (63) @@ -5859,6 +6945,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -5891,6 +6985,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0119157 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0119157 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0119157 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.87 @@ -6013,6 +7119,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.063 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -6132,6 +7242,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 2507734b9d399e5419f80712698ba861, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 2507734b9d399e5419f80712698ba861, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -6214,6 +7328,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -6244,6 +7362,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (86) @@ -6252,6 +7378,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -6284,6 +7418,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0315402 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0315402 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0315402 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.64 @@ -6469,6 +7615,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (46) @@ -6477,6 +7631,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -6509,6 +7671,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0884721 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0884721 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0884721 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.48 @@ -6596,6 +7770,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (50) @@ -6604,6 +7786,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -6636,6 +7826,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.072971 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.072971 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.072971 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.85 @@ -6705,6 +7907,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (39) @@ -6713,6 +7923,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -6745,6 +7963,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.057808 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.057808 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.057808 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.99 @@ -6837,6 +8067,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (40) @@ -6845,6 +8083,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -6877,6 +8123,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0822561 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0822561 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0822561 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.97 @@ -6999,6 +8257,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: bc48358fa18d9b94fa3904f87e9bd7ac, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: bc48358fa18d9b94fa3904f87e9bd7ac, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -7043,6 +8305,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (33) @@ -7051,6 +8321,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -7083,6 +8361,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9752603 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9752603 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9752603 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.37 @@ -7157,6 +8447,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (27) @@ -7165,6 +8463,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -7197,6 +8503,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9074561 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9074561 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9074561 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.7 @@ -7319,6 +8637,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 1.404 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -7354,6 +8676,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (26) @@ -7362,6 +8692,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -7394,6 +8732,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0505339 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0505339 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0505339 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.16 @@ -7521,6 +8871,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.626 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -7609,6 +8963,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.229 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -7639,6 +8997,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (96) @@ -7647,6 +9013,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -7679,6 +9053,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0430053 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0430053 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0430053 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.468 @@ -7831,10 +9217,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} propertyPath: m_Materials.Array.size value: 1 @@ -7873,12 +9267,28 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (61) objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} - propertyPath: m_IsActive + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags value: 1 objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} @@ -7913,6 +9323,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0476038 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0476038 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0476038 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.04 @@ -7995,6 +9417,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (67) @@ -8003,6 +9433,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -8035,6 +9473,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0257822 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0257822 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0257822 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.57 @@ -8135,6 +9585,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (5) @@ -8143,6 +9601,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -8175,6 +9641,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9453074 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9453074 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9453074 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.47 @@ -8257,6 +9735,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (77) @@ -8265,6 +9751,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -8297,6 +9791,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0349554 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0349554 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0349554 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.09 @@ -8379,6 +9885,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (15) @@ -8387,6 +9901,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -8419,6 +9941,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.99468344 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.99468344 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.99468344 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.55 @@ -8506,6 +10040,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (88) @@ -8514,6 +10056,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -8546,6 +10096,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9773002 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9773002 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9773002 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.49 @@ -8678,6 +10240,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 1.404 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -8708,6 +10274,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (19) @@ -8716,6 +10290,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -8748,6 +10330,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9223863 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9223863 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9223863 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.31 @@ -8848,6 +10442,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (79) @@ -8856,6 +10458,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -8888,6 +10498,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0505316 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0505316 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0505316 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.71 @@ -8970,6 +10592,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (1) @@ -8978,6 +10608,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -9010,6 +10648,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.043423 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.043423 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.043423 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.79 @@ -9148,6 +10798,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 8cb65b77f37fd864e8acf4454ff7707b, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 8cb65b77f37fd864e8acf4454ff7707b, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -9219,7 +10873,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 + m_ReceiveGI: 2 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -9295,6 +10949,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (85) @@ -9303,6 +10965,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -9339,6 +11009,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9099301 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9099301 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9099301 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1.64 @@ -9413,6 +11095,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (35) @@ -9421,6 +11111,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -9453,6 +11151,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0502918 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0502918 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0502918 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.68 @@ -9566,10 +11276,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: a5dd37afefd165a4d8e0c1084b71d8f3, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: a5dd37afefd165a4d8e0c1084b71d8f3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: a5dd37afefd165a4d8e0c1084b71d8f3, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: a5dd37afefd165a4d8e0c1084b71d8f3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -9600,6 +11318,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (49) @@ -9608,6 +11334,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -9640,6 +11374,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0171762 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0171762 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0171762 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.76 @@ -9767,6 +11513,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: f852d85a21e7eb14db2009499113944a, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: f852d85a21e7eb14db2009499113944a, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -9876,6 +11626,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 0ca9365f85cb7da4da792c964fd39f54, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -9906,6 +11660,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (94) @@ -9914,6 +11676,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -9946,6 +11716,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9761894 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9761894 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9761894 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.6 @@ -10061,6 +11843,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (28) @@ -10069,6 +11859,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -10101,6 +11899,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0377662 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0377662 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0377662 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.86 @@ -10170,6 +11980,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (42) @@ -10178,6 +11996,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -10210,6 +12036,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0774306 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0774306 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0774306 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.06 @@ -10292,6 +12130,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (97) @@ -10300,6 +12146,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -10332,6 +12186,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0485204 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0485204 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0485204 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.558 @@ -10450,6 +12316,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (95) @@ -10458,6 +12332,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -10490,6 +12372,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9281969 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9281969 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9281969 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 6.318 @@ -10590,6 +12484,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (76) @@ -10598,6 +12500,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -10630,6 +12540,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9690346 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9690346 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9690346 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.95 @@ -10712,6 +12634,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (32) @@ -10720,6 +12650,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -10752,6 +12690,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.93658507 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.93658507 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.93658507 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.63 @@ -10839,6 +12789,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (87) @@ -10847,6 +12805,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -10879,6 +12845,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0941801 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0941801 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0941801 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -6.47 @@ -10948,6 +12926,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (64) @@ -10956,6 +12942,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -10988,6 +12982,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.097051 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.097051 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.097051 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.87 @@ -11201,6 +13207,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (93) @@ -11209,6 +13223,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -11241,6 +13263,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.91438067 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.91438067 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.91438067 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.19 @@ -11310,6 +13344,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (71) @@ -11318,6 +13360,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -11350,6 +13400,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0410879 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0410879 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0410879 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.16 @@ -11432,6 +13494,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (52) @@ -11440,6 +13510,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -11472,6 +13550,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.97510594 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.97510594 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.97510594 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.12 @@ -11590,10 +13680,26 @@ PrefabInstance: propertyPath: healthBarOpacity value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: King objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 2 @@ -11700,6 +13806,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (82) @@ -11708,6 +13822,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -11740,6 +13862,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0399404 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0399404 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0399404 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.26 @@ -11871,6 +14005,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (73) @@ -11879,6 +14021,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -11911,6 +14061,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0481031 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0481031 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0481031 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.31 @@ -11980,6 +14142,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (56) @@ -11988,6 +14158,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -12020,6 +14198,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0022744 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0022744 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0022744 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1.47 @@ -12184,6 +14374,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (2) @@ -12192,6 +14390,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -12224,6 +14430,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9008175 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9008175 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9008175 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.87 @@ -12354,10 +14572,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -12388,6 +14614,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (90) @@ -12396,6 +14630,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -12428,6 +14670,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9719699 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9719699 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9719699 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.31 @@ -12607,6 +14861,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (25) @@ -12615,6 +14877,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -12647,6 +14917,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0314665 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0314665 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0314665 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.62 @@ -12729,6 +15011,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (47) @@ -12737,6 +15027,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -12769,6 +15067,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9685648 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9685648 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9685648 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.06 @@ -12909,6 +15219,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -0.014 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 415f1ac0b26144142afe908ad4b0c783, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -12939,6 +15253,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (83) @@ -12947,6 +15269,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -12979,6 +15309,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.96915704 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.96915704 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.96915704 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.28 @@ -13079,6 +15421,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (58) @@ -13087,6 +15437,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -13119,6 +15477,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9899631 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9899631 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9899631 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.17 @@ -13228,6 +15598,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 347a8cf8a2e4cf44d92eb6ee085c6e2a, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 347a8cf8a2e4cf44d92eb6ee085c6e2a, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -13258,6 +15632,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (70) @@ -13266,6 +15648,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -13298,6 +15688,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9144656 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9144656 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9144656 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.91 @@ -13380,6 +15782,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (60) @@ -13388,6 +15798,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -13416,9 +15834,21 @@ PrefabInstance: propertyPath: clothesColor value: 0 objectReference: {fileID: 0} - - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} - propertyPath: eyebrowsStyle - value: 2 + - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: eyebrowsStyle + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.98843765 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.98843765 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.98843765 objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x @@ -13556,6 +15986,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (37) @@ -13564,6 +16002,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -13596,6 +16042,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0696908 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0696908 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0696908 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.31 @@ -13701,6 +16159,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (89) @@ -13709,6 +16175,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -13741,6 +16215,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.044556 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.044556 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.044556 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.44 @@ -13897,6 +16383,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (44) @@ -13905,6 +16399,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -13941,6 +16443,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.90432 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.90432 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.90432 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -0.97 @@ -14033,6 +16547,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (23) @@ -14041,6 +16563,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -14073,6 +16603,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0603274 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0603274 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0603274 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 3.8 @@ -14199,10 +16741,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 106d976df53495f4caed4323cfccba8b, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 106d976df53495f4caed4323cfccba8b, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 106d976df53495f4caed4323cfccba8b, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 106d976df53495f4caed4323cfccba8b, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -14285,6 +16835,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 6e52ea02117c25a4986a53c022cf4632, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 6e52ea02117c25a4986a53c022cf4632, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -14315,6 +16869,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT @@ -14323,6 +16885,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -14355,6 +16925,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9115925 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9115925 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9115925 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -5.88 @@ -14455,6 +17037,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (13) @@ -14463,6 +17053,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -14495,6 +17093,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0656186 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0656186 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0656186 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.35 @@ -14621,10 +17231,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 881a305724c009a4ca1d4f5fb6391fcc, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -14655,6 +17273,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (9) @@ -14663,6 +17289,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -14695,6 +17329,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0536145 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0536145 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0536145 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.04 @@ -14777,6 +17423,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (65) @@ -14785,6 +17439,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -14817,6 +17479,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.93809694 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.93809694 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.93809694 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.41 @@ -14899,6 +17573,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (21) @@ -14907,6 +17589,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -14939,6 +17629,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.91361535 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.91361535 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.91361535 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.08 @@ -15021,6 +17723,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (34) @@ -15029,6 +17739,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -15061,6 +17779,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0638146 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0638146 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0638146 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.97 @@ -15143,6 +17873,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (12) @@ -15151,6 +17889,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -15183,6 +17929,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0043046 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0043046 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0043046 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.35 @@ -15265,6 +18023,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (80) @@ -15273,6 +18039,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -15305,6 +18079,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.96066993 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.96066993 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.96066993 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.86 @@ -15387,6 +18173,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (16) @@ -15395,6 +18189,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -15427,6 +18229,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.99345714 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.99345714 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.99345714 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -3.75 @@ -15509,6 +18323,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (74) @@ -15517,6 +18339,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -15549,6 +18379,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.96991295 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.96991295 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.96991295 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -4.66 @@ -15649,6 +18491,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (20) @@ -15657,6 +18507,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -15689,6 +18547,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 1 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0713861 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0713861 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0713861 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1 @@ -15807,6 +18677,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (92) @@ -15815,6 +18693,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -15847,6 +18733,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0575417 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0575417 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0575417 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -8.19 @@ -15929,6 +18827,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (4) @@ -15937,6 +18843,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -15969,6 +18883,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0938828 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0938828 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0938828 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -1.31 @@ -16051,6 +18977,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (54) @@ -16059,6 +18993,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -16091,6 +19033,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0881846 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0881846 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0881846 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 0.88 @@ -16209,6 +19163,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (53) @@ -16217,6 +19179,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -16249,6 +19219,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 1.0611166 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 1.0611166 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 1.0611166 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1.75 @@ -16349,6 +19331,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (41) @@ -16357,6 +19347,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -16389,6 +19387,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.99196726 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.99196726 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.99196726 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 4.46 @@ -16487,6 +19497,7 @@ Transform: - {fileID: 832575519} - {fileID: 410087041} - {fileID: 320593546} + - {fileID: 805922643} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2114852224 @@ -16561,10 +19572,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: e9f4b183a58566d4299b2751d631355f, type: 2} + - target: {fileID: 2300002, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2300002, guid: 3ac7951d3b999c04895b301b74dd2adf, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -16613,6 +19632,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (18) @@ -16621,6 +19648,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -16653,6 +19688,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9307929 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9307929 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9307929 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 2.16 @@ -16735,6 +19782,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (57) @@ -16743,6 +19798,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 1 @@ -16775,6 +19838,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.9600012 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.9600012 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.9600012 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: -2.09 @@ -16857,6 +19932,14 @@ PrefabInstance: propertyPath: randomizeOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 640650025086167282, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3451908144454426449, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_ReceiveGI + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_Name value: SoldierVAT (38) @@ -16865,6 +19948,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5177070257224817189, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6301704350969161109, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_StaticEditorFlags + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7265683909056147353, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: headgear value: 0 @@ -16897,6 +19988,18 @@ PrefabInstance: propertyPath: eyebrowsStyle value: 2 objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.x + value: 0.96993464 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.y + value: 0.96993464 + objectReference: {fileID: 0} + - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} + propertyPath: m_LocalScale.z + value: 0.96993464 + objectReference: {fileID: 0} - target: {fileID: 8720414123375871680, guid: 6f2004ea2cb324a43980a8da7d382cdb, type: 3} propertyPath: m_LocalPosition.x value: 1.7 @@ -16973,3 +20076,4 @@ SceneRoots: - {fileID: 645097292} - {fileID: 858872785} - {fileID: 1636767091} + - {fileID: 723885792} diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/FinalPost.shader b/Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/FinalPost.shader index 9db8b030508..99176c35d53 100644 --- a/Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/FinalPost.shader +++ b/Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/FinalPost.shader @@ -33,6 +33,7 @@ Shader "Hidden/Universal Render Pipeline/FinalPost" float4 _Grain_TilingParams; float4 _Dithering_Params; float4 _HDROutputLuminanceParams; + float4 _OffscreenUIViewportParams; #define GrainIntensity _Grain_Params.x #define GrainResponse _Grain_Params.y @@ -127,7 +128,8 @@ Shader "Hidden/Universal Render Pipeline/FinalPost" { UNITY_BRANCH if(_HDR_OVERLAY) { - float4 uiSample = SAMPLE_TEXTURE2D_X(_OverlayUITexture, sampler_PointClamp, input.texcoord); + float2 uiCoord = input.texcoord * _OffscreenUIViewportParams.zw + _OffscreenUIViewportParams.xy; + float4 uiSample = SAMPLE_TEXTURE2D_X(_OverlayUITexture, sampler_PointClamp, uiCoord); color.rgb = SceneUIComposition(uiSample, color.rgb, PaperWhite, MaxNits); } @@ -174,7 +176,7 @@ Shader "Hidden/Universal Render Pipeline/FinalPost" } Pass - { + { Name "FinalPostXR" LOD 100 ZWrite Off ZTest LEqual Blend Off Cull Off @@ -207,7 +209,7 @@ Shader "Hidden/Universal Render Pipeline/FinalPost" } Pass - { + { Name "FinalPostXR" LOD 100 ZWrite Off ZTest LEqual Blend Off Cull Off diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/UberPost.shader b/Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/UberPost.shader index 52d6c70dd46..3fb34366c8e 100644 --- a/Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/UberPost.shader +++ b/Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/UberPost.shader @@ -70,6 +70,7 @@ Shader "Hidden/Universal Render Pipeline/UberPost" float4 _Bloom_Texture_TexelSize; float4 _Dithering_Params; float4 _HDROutputLuminanceParams; + float4 _OffscreenUIViewportParams; #define DistCenter _Distortion_Params1.xy #define DistAxis _Distortion_Params1.zw @@ -278,7 +279,8 @@ Shader "Hidden/Universal Render Pipeline/UberPost" // HDR UI composition UNITY_BRANCH if(_HDR_OVERLAY) { - float4 uiSample = SAMPLE_TEXTURE2D_X(_OverlayUITexture, sampler_PointClamp, input.texcoord); + float2 uiCoord = input.texcoord * _OffscreenUIViewportParams.zw + _OffscreenUIViewportParams.xy; + float4 uiSample = SAMPLE_TEXTURE2D_X(_OverlayUITexture, sampler_PointClamp, uiCoord); color.rgb = SceneUIComposition(uiSample, color.rgb, PaperWhite, MaxNits); } } diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/Utils/BlitHDROverlay.shader b/Packages/com.unity.render-pipelines.universal/Shaders/Utils/BlitHDROverlay.shader index 85b6e9f0f86..c5ce5e26de8 100644 --- a/Packages/com.unity.render-pipelines.universal/Shaders/Utils/BlitHDROverlay.shader +++ b/Packages/com.unity.render-pipelines.universal/Shaders/Utils/BlitHDROverlay.shader @@ -19,6 +19,7 @@ Shader "Hidden/Universal/BlitHDROverlay" TEXTURE2D_X(_OverlayUITexture); float4 _HDROutputLuminanceParams; + float4 _OffscreenUIViewportParams; #define MinNits _HDROutputLuminanceParams.x #define MaxNits _HDROutputLuminanceParams.y @@ -45,7 +46,8 @@ Shader "Hidden/Universal/BlitHDROverlay" return color; } - float4 uiSample = SAMPLE_TEXTURE2D_X(_OverlayUITexture, sampler_PointClamp, input.texcoord); + float2 uiCoord = input.texcoord * _OffscreenUIViewportParams.zw + _OffscreenUIViewportParams.xy; + float4 uiSample = SAMPLE_TEXTURE2D_X(_OverlayUITexture, sampler_PointClamp, uiCoord); return SceneComposition(color, uiSample); } @@ -54,7 +56,7 @@ Shader "Hidden/Universal/BlitHDROverlay" half4 FragmentURPBlitHDR(Varyings input, SamplerState blitsampler) { half4 color = FragBlitHDR(input, blitsampler); - + #if defined(DEBUG_DISPLAY) half4 debugColor = 0; float2 uv = input.texcoord; @@ -71,7 +73,7 @@ Shader "Hidden/Universal/BlitHDROverlay" SubShader { Tags{ "RenderPipeline" = "UniversalPipeline" } - + // 0: Bilinear blit with debug draw support Pass { diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderScriptableStripperTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderScriptableStripperTests.cs index 87fd36b065d..8c102078f17 100644 --- a/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderScriptableStripperTests.cs +++ b/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderScriptableStripperTests.cs @@ -3,11 +3,9 @@ using NUnit.Framework; using UnityEditor.Rendering; using UnityEditor.Rendering.Universal; -using UnityEditor.VersionControl; using UnityEngine; using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; -using UnityEngine.SocialPlatforms; using IShaderScriptableStrippingData = UnityEditor.Rendering.Universal.ShaderScriptableStripper.IShaderScriptableStrippingData; namespace ShaderStrippingAndPrefiltering @@ -31,6 +29,7 @@ internal struct TestStrippingData : IShaderScriptableStrippingData public bool stripUnusedVariants { get; set; } public bool stripUnusedPostProcessingVariants { get; set; } public bool stripUnusedXRVariants { get; set; } + public bool usesDynamicLightmaps { get; set; } public bool IsHDRDisplaySupportEnabled { get; set; } public bool IsRenderCompatibilityMode { get; set; } @@ -228,6 +227,7 @@ public void TestStripUnusedPass(string shaderName) helper.IsFalse(helper.stripper.StripUnusedPass(ref helper.data)); TestStripUnusedPass_2D(shader); + TestStripUnusedPass_Meta(shader); TestStripUnusedPass_XR(shader); TestStripUnusedPass_ShadowCaster(shader); TestStripUnusedPass_Decals(shader); @@ -250,6 +250,76 @@ public void TestStripUnusedPass_2D(Shader shader) helper.IsTrue(helper.stripper.StripUnusedPass(ref helper.data)); } + public void TestStripUnusedPass_Meta(Shader shader) + { + TestHelper helper; + + bool enlightenPrev = SupportedRenderingFeatures.active.enlighten; + LightmapBakeType lightmapBakeTypesPrev = SupportedRenderingFeatures.active.lightmapBakeTypes; + + SupportedRenderingFeatures.active.enlighten = false; + SupportedRenderingFeatures.active.lightmapBakeTypes = LightmapBakeType.Mixed | LightmapBakeType.Baked; + + helper = new TestHelper(shader, ShaderFeatures.None); + helper.data.usesDynamicLightmaps = false; + helper.data.passType = PassType.Meta; + helper.IsTrue(helper.stripper.StripUnusedPass_Meta(ref helper.data)); + helper.IsTrue(helper.stripper.StripUnusedPass(ref helper.data)); + + SupportedRenderingFeatures.active.enlighten = true; + SupportedRenderingFeatures.active.lightmapBakeTypes = LightmapBakeType.Mixed | LightmapBakeType.Baked; + helper = new TestHelper(shader, ShaderFeatures.None); + helper.data.usesDynamicLightmaps = false; + helper.data.passType = PassType.Meta; + helper.IsTrue(helper.stripper.StripUnusedPass_Meta(ref helper.data)); + helper.IsTrue(helper.stripper.StripUnusedPass(ref helper.data)); + + SupportedRenderingFeatures.active.enlighten = false; + SupportedRenderingFeatures.active.lightmapBakeTypes = LightmapBakeType.Realtime | LightmapBakeType.Mixed | LightmapBakeType.Baked; + helper = new TestHelper(shader, ShaderFeatures.None); + helper.data.usesDynamicLightmaps = false; + helper.data.passType = PassType.Meta; + helper.IsTrue(helper.stripper.StripUnusedPass_Meta(ref helper.data)); + helper.IsTrue(helper.stripper.StripUnusedPass(ref helper.data)); + + SupportedRenderingFeatures.active.enlighten = false; + SupportedRenderingFeatures.active.lightmapBakeTypes = LightmapBakeType.Mixed | LightmapBakeType.Baked; + helper = new TestHelper(shader, ShaderFeatures.None); + helper.data.usesDynamicLightmaps = true; + helper.data.passType = PassType.Meta; + helper.IsTrue(helper.stripper.StripUnusedPass_Meta(ref helper.data)); + helper.IsTrue(helper.stripper.StripUnusedPass(ref helper.data)); + + SupportedRenderingFeatures.active.enlighten = true; + SupportedRenderingFeatures.active.lightmapBakeTypes = LightmapBakeType.Realtime | LightmapBakeType.Mixed | LightmapBakeType.Baked; + helper = new TestHelper(shader, ShaderFeatures.None); + helper.data.usesDynamicLightmaps = true; + helper.data.passType = PassType.Meta; + helper.IsFalse(helper.stripper.StripUnusedPass_Meta(ref helper.data)); + helper.IsFalse(helper.stripper.StripUnusedPass(ref helper.data)); + +#if SURFACE_CACHE + SupportedRenderingFeatures.active.enlighten = false; + SupportedRenderingFeatures.active.lightmapBakeTypes = LightmapBakeType.Mixed | LightmapBakeType.Baked; + helper = new TestHelper(shader, ShaderFeatures.SurfaceCache); + helper.data.usesDynamicLightmaps = false; + helper.data.passType = PassType.Meta; + helper.IsFalse(helper.stripper.StripUnusedPass_Meta(ref helper.data)); + helper.IsFalse(helper.stripper.StripUnusedPass(ref helper.data)); + + SupportedRenderingFeatures.active.enlighten = true; + SupportedRenderingFeatures.active.lightmapBakeTypes = LightmapBakeType.Realtime | LightmapBakeType.Mixed | LightmapBakeType.Baked; + helper = new TestHelper(shader, ShaderFeatures.SurfaceCache); + helper.data.usesDynamicLightmaps = true; + helper.data.passType = PassType.Meta; + helper.IsFalse(helper.stripper.StripUnusedPass_Meta(ref helper.data)); + helper.IsFalse(helper.stripper.StripUnusedPass(ref helper.data)); +#endif + + // Restore previous SupportedRenderingFeatures values + SupportedRenderingFeatures.active.enlighten = enlightenPrev; + SupportedRenderingFeatures.active.lightmapBakeTypes = lightmapBakeTypesPrev; + } public void TestStripUnusedPass_XR(Shader shader) { diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderStripToolTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderStripToolTests.cs index bdc56e6804f..38376cf5ae7 100644 --- a/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderStripToolTests.cs +++ b/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderStripToolTests.cs @@ -30,6 +30,7 @@ internal struct TestStrippingData : IShaderScriptableStrippingData public bool stripUnusedVariants { get; set; } public bool stripUnusedPostProcessingVariants { get; set; } public bool stripUnusedXRVariants { get; set; } + public bool usesDynamicLightmaps { get; set; } public Shader shader { get; set; } public ShaderType shaderType { get; set; } diff --git a/Packages/com.unity.shadergraph/Documentation~/Custom-Function-Node.md b/Packages/com.unity.shadergraph/Documentation~/Custom-Function-Node.md index 81fc37ded71..909746678c6 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Custom-Function-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Custom-Function-Node.md @@ -91,7 +91,11 @@ void MyFunction_float(float3 A, float B, out float3 Out) #endif //MYHLSLINCLUDE_INCLUDED ``` -**File** mode allows for more flexibility with custom functions in a graph. You can define uniform variables outside the function scope, as shown here with a matrix. +The **File** mode allows for more flexibility with custom functions in a graph. + +#### Shared data and uniform variables + +To supply shared data to your function without additional ports, use uniform variables defined outside the function scope. ``` //UNITY_SHADER_NO_UPGRADE @@ -106,6 +110,14 @@ void MyFunction_float(float3 A, float B, out float3 Out) #endif //MYHLSLINCLUDE_INCLUDED ``` +When you add a uniform variable in a Custom Function, like the `float4x4` matrix in the example above, you make this variable global. As a result: + +- You can set this uniform globally only, using `Shader.SetGlobalMatrix()`. +- You don't have to add an input parameter to allow the shader to access them directly. +- You can't set it per material, because it's not declared in the `UnityPerMaterial` cbuffer and doesn't have a material property associated with it. + +#### Multiple functions and multiple files + You can define multiple functions in the same file, and call them from your referenced function. Alternatively, you can reference the same file, but use different functions from different Custom Function nodes. ``` diff --git a/Packages/com.unity.shadergraph/Documentation~/Sample-Texture-2D-LOD-Node.md b/Packages/com.unity.shadergraph/Documentation~/Sample-Texture-2D-LOD-Node.md index 5a10ce8e7f7..aff1599bd2e 100644 --- a/Packages/com.unity.shadergraph/Documentation~/Sample-Texture-2D-LOD-Node.md +++ b/Packages/com.unity.shadergraph/Documentation~/Sample-Texture-2D-LOD-Node.md @@ -2,7 +2,9 @@ ## Description -Samples a **Texture 2D** and returns a **Vector 4** color value for use in the shader. You can override the **UV** coordinates using the **UV** input and define a custom **Sampler State** using the **Sampler** input. Use the **LOD** input to adjust the level of detail of the sample. +Samples a **Texture 2D** and returns a **Vector 4** color value for use in the shader. You can override the **UV** coordinates using the **UV** input and define a custom **Sampler State** using the **Sampler** input. + +Use the **LOD** input to set the exact mip level to sample. This replaces the GPU's normal LOD selection and can result in visible aliasing, particularly for distant objects. To use the **Sample Texture 2D LOD Node** to sample a normal map, set the **Type** dropdown parameter to **Normal**. diff --git a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md index b864b3cbdbe..220a0983157 100644 --- a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md +++ b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md @@ -81,19 +81,20 @@ * [Flip](Flip-Node.md) * [Split](Split-Node.md) * [Swizzle](Swizzle-Node.md) - * [Custom Render Texture Nodes](Custom-Render-Texture-Nodes.md) + * [Custom Render Texture](Custom-Render-Texture-Nodes.md) * [Self](Custom-Texture-Self.md) * [Size](Custom-Texture-Size.md) * [Slice](Custom-Texture-Slice.md) + * [Dropdowns](Sub-Graph-Dropdown-Node.md) * [Input](Input-Nodes.md) * Basic * [Boolean](Boolean-Node.md) * [Color](Color-Node.md) * [Constant](Constant-Node.md) + * [Float](Float-Node.md) * [Integer](Integer-Node.md) * [Slider](Slider-Node.md) * [Time](Time-Node.md) - * [Float](Float-Node.md) * [Vector 2](Vector-2-Node.md) * [Vector 3](Vector-3-Node.md) * [Vector 4](Vector-4-Node.md) @@ -118,9 +119,9 @@ * [Custom Depth Buffer](HD-Custom-Depth-Node.md) * [Diffusion Profile](Diffusion-Profile-Node.md) * [Exposure](Exposure-Node.md) + * [HD Sample Buffer](HD-Sample-Buffer-Node.md) * [HD Scene Color](HD-Scene-Color-Node.md) * [HD Scene Depth](HD-Scene-Depth-Node.md) - * [HD Sample Buffer](HD-Sample-Buffer-Node.md) * Lighting * [Ambient](Ambient-Node.md) * [Baked GI](Baked-GI-Node.md) @@ -132,14 +133,12 @@ * [Matrix 4x4](Matrix-4x4-Node.md) * [Transformation Matrix](Transformation-Matrix-Node.md) * Mesh Deformation - * [Compute Deformation](Compute-Deformation-Node.md) - * [Linear Blend Skinning](Linear-Blend-Skinning-Node.md) - * Sprite Deformation - * [Sprite Skinning](Sprite-Skinning-Node.md) + * [Compute Deformation](Compute-Deformation-Node.md) + * [Linear Blend Skinning](Linear-Blend-Skinning-Node.md) + * [Sprite Skinning](Sprite-Skinning-Node.md) * PBR * [Dielectric Specular](Dielectric-Specular-Node.md) * [Metal Reflectance](Metal-Reflectance-Node.md) - * [Fresnel Equation](Fresnel-Equation-Node.md) * Scene * [Camera](Camera-Node.md) * [Eye Index](Eye-Index-Node.md) @@ -170,6 +169,7 @@ * [Element Layout UV](element-layout-uv-node.md) * [Element Texture Size](element-texture-size-node.md) * [Element Texture UV](element-texture-uv-node.md) + * [Keyword](Keyword-Node.md) * [Math](Math-Nodes.md) * Advanced * [Absolute](Absolute-Node.md) @@ -182,6 +182,8 @@ * [Posterize](Posterize-Node.md) * [Reciprocal](Reciprocal-Node.md) * [Reciprocal Square Root](Reciprocal-Square-Root-Node.md) + * High Definition Render Pipeline + * [Fresnel Equation](Fresnel-Equation-Node.md) * Basic * [Add](Add-Node.md) * [Divide](Divide-Node.md) @@ -249,17 +251,23 @@ * [Square Wave](Square-Wave-Node.md) * [Triangle Wave](Triangle-Wave-Node.md) * [Procedural](Procedural-Nodes.md) + * [Checkerboard](Checkerboard-Node.md) * Noise * [Gradient Noise](Gradient-Noise-Node.md) * [Simple Noise](Simple-Noise-Node.md) * [Voronoi](Voronoi-Node.md) - * Shapes + * Shape * [Ellipse](Ellipse-Node.md) * [Polygon](Polygon-Node.md) * [Rectangle](Rectangle-Node.md) * [Rounded Polygon](Rounded-Polygon-Node.md) * [Rounded Rectangle](Rounded-Rectangle-Node.md) - * [Checkerboard](Checkerboard-Node.md) + * [Sub Graphs](Sub-graph-Node.md) + * [UVCombine](UVCombine-Node.md) + * [Terrain](Terrain-Nodes.md) + * [Terrain Properties](Terrain-Properties-Node.md) + * [Terrain Texture](Terrain-Texture-Node.md) + * Layers * [UI](ui-nodes.md) * [Default Bitmap Text](default-bitmap-text-node.md) * [Default Gradient](default-gradient-node.md) @@ -270,19 +278,8 @@ * [Render Type Branch](render-type-branch-node.md) * [Sample Element Texture](sample-element-texture-node.md) * [Utility](Utility-Nodes.md) - * Logic - * [All](All-Node.md) - * [And](And-Node.md) - * [Any](Any-Node.md) - * [Branch](Branch-Node.md) - * [Branch On Input Connection](Branch-On-Input-Connection-Node.md) - * [Comparison](Comparison-Node.md) - * [Is Front Face](Is-Front-Face-Node.md) - * [Is Infinite](Is-Infinite-Node.md) - * [Is NaN](Is-NaN-Node.md) - * [Nand](Nand-Node.md) - * [Not](Not-Node.md) - * [Or](Or-Node.md) + * [Custom Function](Custom-Function-Node.md) + * [Preview](Preview-Node.md) * High Definition Render Pipeline * [Emission](Emission-Node.md) * Eye @@ -297,15 +294,24 @@ * [ScleraLimbalRing](Sclera-Limbal-Ring-Node.md) * [ScleraUVLocation](Sclera-UV-Location-Node.md) * Fabric - *[ThreadMapDetail](ThreadMapDetail-Node.md) - * [UVCombine](UVCombine-Node.md) - * [Custom Function](Custom-Function-Node.md) - * [Keyword](Keyword-Node.md) - * [Preview](Preview-Node.md) - * [Subgraph](Sub-graph-Node.md) - * [Subgraph Dropdown node](Sub-Graph-Dropdown-Node.md) + * [ThreadMapDetail](ThreadMapDetail-Node.md) + * Logic + * [All](All-Node.md) + * [And](And-Node.md) + * [Any](Any-Node.md) + * [Branch](Branch-Node.md) + * [Branch On Input Connection](Branch-On-Input-Connection-Node.md) + * [Comparison](Comparison-Node.md) + * [Is Front Face](Is-Front-Face-Node.md) + * [Is Infinite](Is-Infinite-Node.md) + * [Is NaN](Is-NaN-Node.md) + * [Nand](Nand-Node.md) + * [Not](Not-Node.md) + * [Or](Or-Node.md) * [UV](UV-Nodes.md) * [Flipbook](Flipbook-Node.md) + * [Parallax Mapping](Parallax-Mapping-Node.md) + * [Parallax Occlusion Mapping](Parallax-Occlusion-Mapping-Node.md) * [Polar Coordinates](Polar-Coordinates-Node.md) * [Radial Shear](Radial-Shear-Node.md) * [Rotate](Rotate-Node.md) @@ -313,13 +319,8 @@ * [Tiling And Offset](Tiling-And-Offset-Node.md) * [Triplanar](Triplanar-Node.md) * [Twirl](Twirl-Node.md) - * [Parallax Mapping](Parallax-Mapping-Node.md) - * [Parallax Occlusion Mapping](Parallax-Occlusion-Mapping-Node.md) * [Block Nodes](Block-Node.md) * [Built In Blocks](Built-In-Blocks.md) - * [Terrain](Terrain-Nodes.md) - * [Terrain Properties](Terrain-Properties-Node.md) - * [Terrain Texture](Terrain-Texture-Node.md) * [Samples](ShaderGraph-Samples.md) * [Feature Examples](Shader-Graph-Sample-Feature-Examples.md) * [Production Ready Shaders](Shader-Graph-Sample-Production-Ready.md) diff --git a/Packages/com.unity.shadergraph/Documentation~/index.md b/Packages/com.unity.shadergraph/Documentation~/index.md index 44e968d904d..4ca6632ad80 100644 --- a/Packages/com.unity.shadergraph/Documentation~/index.md +++ b/Packages/com.unity.shadergraph/Documentation~/index.md @@ -1,23 +1,11 @@ -# About Shader Graph - -## Description +# Shader Graph Shader Graph enables you to build shaders visually. Instead of writing code, you create and connect nodes in a graph framework. Shader Graph gives instant feedback that reflects your changes, and it’s simple enough for users who are new to shader creation. -For an introduction to Shader Graph, see [Getting Started](Getting-Started.md). - -Shader Graph is available through the Package Manager window in supported versions of the Unity Editor. If you install a Scriptable Render Pipeline (SRP) such as the [Universal Render Pipeline (URP)](https://docs.unity3d.com/Manual/urp/urp-introduction.html) or the [High Definition Render Pipeline (HDRP)](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest), Unity automatically installs Shader Graph in your project. - -Shader Graph package versions on Unity Engine 2018.x are *Preview* versions, which do not receive bug fixes and feature maintenance. To work with an actively supported version of Shader Graph, use Unity Engine 2019.1 or higher. - -### SRP packages are part of the core - -With the release of Unity 2021.1, graphics packages are relocating to the core of Unity. This move simplifies the experience of working with new Unity graphics features, as well as ensuring that your projects are always running on the latest verified graphics code. - -For each release of Unity (alpha / beta / patch release) graphics packages are embedded within the main Unity installer. When you install the latest release of Unity, you also get the latest [Universal Render Pipeline (URP)](https://docs.unity3d.com/Manual/urp/urp-introduction.html), [High Definition Render Pipeline (HDRP)](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest), Shader Graph, [Visual Effect (VFX) Graph](https://docs.unity3d.com/Packages/com.unity.visualeffectgraph@latest) packages, among others. - -Tying graphics packages to the main Unity release allows better testing to ensure that the graphics packages you use have been tested extensively with the version of Unity you have downloaded. +Shader Graph is automatically available in your project as soon as you install the [Universal Render Pipeline (URP)](https://docs.unity3d.com/Manual/urp/urp-introduction.html) or the [High Definition Render Pipeline (HDRP)](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest). Refer to [Shader Graph installation details](install-shader-graph.md). -You can also use a local copy or a custom version of the graphics packages with an override in the manifest file. +* [Get Started with Shader Graph](Getting-Started.md) +* [Shader Graph Node Library reference](Node-Library.md) +* [Shader Graph samples](ShaderGraph-Samples.md) -For more information, see the following post on the forum: [SRP v11 beta is available now](https://forum.unity.com/threads/srp-v11-beta-is-available-now.1046539/). +![Graph examples in the Shader Graph window](images/NodeReferenceSamples.png) diff --git a/Packages/com.unity.shadergraph/Documentation~/install-shader-graph.md b/Packages/com.unity.shadergraph/Documentation~/install-shader-graph.md index 06427688a16..fabdd054ab7 100644 --- a/Packages/com.unity.shadergraph/Documentation~/install-shader-graph.md +++ b/Packages/com.unity.shadergraph/Documentation~/install-shader-graph.md @@ -12,7 +12,10 @@ Use Shader Graph with either of the Scriptable Render Pipelines (SRPs) available As of Unity version 2021.2, you can also use Shader Graph with the [Built-In Render Pipeline](https://docs.unity3d.com/Documentation/Manual/built-in-render-pipeline.html). > [!NOTE] -> Shader Graph support for the Built-In Render Pipeline is for compatibility purposes only. Shader Graph doesn't receive updates for Built-In Render Pipeline support, aside from bug fixes for existing features. It's recommended to use Shader Graph with the Scriptable Render Pipelines. +> - Shader Graph support for the Built-In Render Pipeline is for compatibility purposes only. Shader Graph doesn't receive updates for Built-In Render Pipeline support, aside from bug fixes for existing features. It's recommended to use Shader Graph with the Scriptable Render Pipelines. +> - In the Built-In Render Pipeline, Shader Graph doesn't support XR. +> - In the Built-In Render Pipeline, GPU Instancing doesn't work with Shader Graph shaders. +> - In URP and HDRP, GPU instancing works with custom shaders only if you disable the [Scriptable Render Pipeline (SRP) Batcher](SRPBatcher) or [make a shader incompatible with the SRP Batcher](SRPBatcher-Incompatible). ## Installation diff --git a/Packages/com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderSubGraph.cs b/Packages/com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderSubGraph.cs index b1c66aa48a6..0f4a11abb3f 100644 --- a/Packages/com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderSubGraph.cs +++ b/Packages/com.unity.shadergraph/Editor/AssetCallbacks/CreateShaderSubGraph.cs @@ -10,7 +10,7 @@ class CreateShaderSubGraph : AssetCreationEndAction [MenuItem("Assets/Create/Shader Graph/Sub Graph", priority = CoreUtils.Sections.section1 + CoreUtils.Priorities.assetsCreateShaderMenuPriority + 1)] public static void CreateMaterialSubGraph() { - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, CreateInstance(), + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, CreateInstance(), string.Format("New Shader Sub Graph.{0}", ShaderSubGraphImporter.Extension), ShaderSubGraphImporter.GetIcon(), null); } diff --git a/Packages/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs b/Packages/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs index a6a6ea9bdba..2d5d60b908c 100644 --- a/Packages/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs +++ b/Packages/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs @@ -177,7 +177,7 @@ public void CreateAndRenameGraphFromTemplate(string templatePath, string assetPa } else { - endNameEditAction.Action(0, assetPath, ""); + endNameEditAction.Action(EntityId.None, assetPath, ""); } } @@ -263,7 +263,7 @@ public static void CreateNewGraph() { var graphItem = ScriptableObject.CreateInstance(); graphItem.targets = null; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, graphItem, + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, graphItem, string.Format("New Shader Graph.{0}", ShaderGraphImporter.Extension), ShaderGraphImporter.GetIcon(), null); } @@ -272,7 +272,7 @@ public static void CreateNewGraphWithOutputs(Target[] targets, BlockFieldDescrip var graphItem = ScriptableObject.CreateInstance(); graphItem.targets = targets; graphItem.blocks = blockDescriptors; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, graphItem, + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, graphItem, string.Format("New Shader Graph.{0}", ShaderGraphImporter.Extension), ShaderGraphImporter.GetIcon(), null); } diff --git a/Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs b/Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs index e85cc0ce175..a8affe50e5e 100644 --- a/Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs +++ b/Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs @@ -212,9 +212,9 @@ internal static bool ShowGraphEditWindow(string path) } [OnOpenAsset(0)] - public static bool OnOpenAsset(int instanceID, int line) + public static bool OnOpenAsset(EntityId entityId, int line) { - var path = AssetDatabase.GetAssetPath((EntityId)instanceID); + var path = AssetDatabase.GetAssetPath(entityId); return ShowGraphEditWindow(path); } } diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs index 5a3cd1daf21..27c09387b49 100644 --- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs +++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs @@ -96,7 +96,10 @@ public virtual Material GetModifiedMaterial(Material baseMaterial) { _material ??= new(baseMaterial); - _material.SetFloat(StatePropertyId, (int)currentSelectionState); + _material.CopyPropertiesFromMaterial(baseMaterial); + + if (_material.HasFloat(StatePropertyId)) + _material.SetFloat(StatePropertyId, (int)currentSelectionState); return _material; } diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs index 0b99f0e5a1c..d6ba085023c 100644 --- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs +++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs @@ -138,8 +138,13 @@ public virtual Material GetModifiedMaterial(Material baseMaterial) { _material ??= new(baseMaterial); - _material.SetFloat(StatePropertyId, (int)currentSelectionState); - _material.SetVector(SliderValuePropertyId, Vector); + _material.CopyPropertiesFromMaterial(baseMaterial); + + if (_material.HasFloat(StatePropertyId)) + _material.SetFloat(StatePropertyId, (int)currentSelectionState); + + if (_material.HasVector(SliderValuePropertyId)) + _material.SetVector(SliderValuePropertyId, Vector); return _material; } diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs index 4331139796e..78f076b33b8 100644 --- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs +++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs @@ -123,10 +123,14 @@ public virtual Material GetModifiedMaterial(Material baseMaterial) { _material ??= new(baseMaterial); - _material.SetFloat(StatePropertyId, (int)currentSelectionState); + _material.CopyPropertiesFromMaterial(baseMaterial); + + if (_material.HasFloat(StatePropertyId)) + _material.SetFloat(StatePropertyId, (int)currentSelectionState); if (_material.HasFloat(IsOnPropertyId)) _material.SetFloat(IsOnPropertyId, isOn ? 1 : 0); + return _material; } diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs index 2f582b90004..c1477e47b8a 100644 --- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs +++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs @@ -99,6 +99,8 @@ public virtual Material GetModifiedMaterial(Material baseMaterial) { _material ??= new(baseMaterial); + _material.CopyPropertiesFromMaterial(baseMaterial); + if (_material.HasFloat(MeterValuePropertyId)) _material.SetFloat(MeterValuePropertyId, Value); diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs index 0437a19fbdc..6c594ce6c3c 100644 --- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs +++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs @@ -128,6 +128,8 @@ public virtual Material GetModifiedMaterial(Material baseMaterial) { _material ??= new(baseMaterial); + _material.CopyPropertiesFromMaterial(baseMaterial); + if (_material.HasVector(RangeBarValuePropertyId)) _material.SetVector(RangeBarValuePropertyId, Vector); diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs index f9a6eb7c1a5..a5e23c61e56 100644 --- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs +++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs @@ -115,6 +115,8 @@ public Material GetModifiedMaterial(Material baseMaterial) { _material ??= new(baseMaterial); + _material.CopyPropertiesFromMaterial(baseMaterial); + if (_material.HasVector(PropertyId)) _material.SetVector(PropertyId, RectTransformInfo); diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopy.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopy.cs index 8dfa49c2f7a..6b0f69511a8 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopy.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopy.cs @@ -270,7 +270,7 @@ Parameter CreateParameter(VFXParameter parameter, ParameterNode[] nodes) { return new Parameter { - originalInstanceID = parameter.GetEntityId(), + originalEntityId = parameter.GetEntityId(), name = parameter.exposedName, category = parameter.category, order = parameter.order, diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopyPasteCommon.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopyPasteCommon.cs index 70635318659..e21f3759be8 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopyPasteCommon.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCopyPasteCommon.cs @@ -132,7 +132,7 @@ protected struct ParameterNode [Serializable] protected struct Parameter { - public int originalInstanceID; + public EntityId originalEntityId; public string name; public string category; public int order; diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXPaste.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXPaste.cs index a73b9b6e283..5b7594a3bce 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXPaste.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXPaste.cs @@ -824,7 +824,7 @@ private void PasteParameters(VFXViewController viewController, SerializableGraph foreach (var parameter in serializableGraph.parameterNodes) { // if we have a parameter with the same name use it else create it with the copied data - VFXParameter p = viewController.graph.children.OfType().FirstOrDefault(t => t.GetEntityId() == parameter.originalInstanceID); + VFXParameter p = viewController.graph.children.OfType().FirstOrDefault(t => t.GetEntityId() == parameter.originalEntityId); if (p == null) { Type type = parameter.value.type; diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Collision/CollisionSDF.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Collision/CollisionSDF.cs index 1c69f7bf7c4..4f451d3adbe 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Collision/CollisionSDF.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Collision/CollisionSDF.cs @@ -34,7 +34,7 @@ public override IEnumerable GetParameters(CollisionBase coll yield return p; } - + var w = new VFXExpressionCastUintToFloat(new VFXExpressionTextureWidth(SDF)); var h = new VFXExpressionCastUintToFloat(new VFXExpressionTextureHeight(SDF)); var d = new VFXExpressionCastUintToFloat(new VFXExpressionTextureDepth(SDF)); @@ -92,7 +92,16 @@ public override string GetSource(CollisionBase collisionBase) int i = 0; hit = false; float maxDist = length(tDelta * textureDimInvScale); - for(i = 0; i < ITERATION_COUNT; i++) + + int iterationCount = ITERATION_COUNT; + if(dist < VFX_EPSILON) + { + hit = true; + tHit = 0; + iterationCount = 0; + } + + for(i = 0; i < iterationCount; i++) { uvw = uvw + tDir * textureDimScale * dist; float newDist = colliderSign * (SampleSDF(DistanceField, uvw) - radiusOffset); @@ -119,14 +128,18 @@ public override string GetSource(CollisionBase collisionBase) string projectOnSurfaceCode = @" hit = true; - const int ITERATION_COUNT = 4; - int i = 0; + float3 uvw = saturate(tPos + 0.5f); float3 sdfNormal = normalize(SampleSDFUnscaledDerivatives(DistanceField, uvw, uvStep)); float radiusOffset = colliderSign * dot(sdfNormal*sdfNormal ,invScale * textureDimInvScale) * radius; + const int ITERATION_COUNT = 4; + int i = 0; for(i = 0; i < ITERATION_COUNT; i++) { + float dist = colliderSign * (SampleSDF(DistanceField, uvw) - radiusOffset); + if(abs(dist) < VFX_EPSILON) + break; uvw = IterateTowardSDFSurface(DistanceField, uvw, uvStep, radiusOffset, stepSizeMeter, sdfNormal); } tPos = uvw - 0.5f; @@ -136,7 +149,6 @@ public override string GetSource(CollisionBase collisionBase) tHit = 0; "; - var Source = new StringBuilder($@" if (isZeroScaled) return; diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/HLSL/CustomHLSL.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/HLSL/CustomHLSL.cs index 9a6df5fa796..52a0c63b4f3 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/HLSL/CustomHLSL.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/HLSL/CustomHLSL.cs @@ -230,7 +230,7 @@ public override IEnumerable GetSettings(bool listHidden, VFXSettingA } } - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (!ReferenceEquals(m_ShaderFile, null)) diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Spawn/VFXSpawnerCustomWrapper.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Spawn/VFXSpawnerCustomWrapper.cs index b9b5be9310f..689266cd7c1 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Spawn/VFXSpawnerCustomWrapper.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/Implementations/Spawn/VFXSpawnerCustomWrapper.cs @@ -81,7 +81,7 @@ public override void OnEnable() ResolveCustomCallbackInstance(); } - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (customBehavior != null) diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/VFXSubgraphBlock.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/VFXSubgraphBlock.cs index 121cb483c8a..01f708de893 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/VFXSubgraphBlock.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/VFXSubgraphBlock.cs @@ -22,7 +22,7 @@ class VFXSubgraphBlock : VFXBlock public VisualEffectSubgraphBlock subgraph => m_Subgraph; - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (!object.ReferenceEquals(m_Subgraph, null)) diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXComposedShading.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXComposedShading.cs index 0caf5788226..f9d1bb09672 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXComposedShading.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXComposedShading.cs @@ -186,7 +186,7 @@ public override TraitDescription GetDescription(VFXAbstractComposedParticleOutpu return desc; } - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (!ReferenceEquals(shaderGraph, null)) diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXStaticMeshOutput.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXStaticMeshOutput.cs index e634605c3de..c10509f0771 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXStaticMeshOutput.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXStaticMeshOutput.cs @@ -104,7 +104,7 @@ protected override void OnInvalidate(VFXModel model, VFXModel.InvalidationCause base.OnInvalidate(model, cause); } - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (!object.ReferenceEquals(shader, null)) diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXAbstractComposedParticleOutput.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXAbstractComposedParticleOutput.cs index 6c3a9ccd83e..8095caa044b 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXAbstractComposedParticleOutput.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXAbstractComposedParticleOutput.cs @@ -115,7 +115,7 @@ public virtual TraitDescription GetDescription(VFXAbstractComposedParticleOutput return traitDescription; } - public virtual void GetImportDependentAssets(HashSet dependencies) + public virtual void GetImportDependentAssets(HashSet dependencies) { } @@ -404,7 +404,7 @@ public sealed override bool CanBeCompiled() return base.CanBeCompiled() && m_Topology.CanBeCompiled() && m_Shading.CanBeCompiled(); } - public sealed override void GetImportDependentAssets(HashSet dependencies) + public sealed override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); m_Topology?.GetImportDependentAssets(dependencies); diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXSubgraphContext.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXSubgraphContext.cs index 5f4c87bd947..2ba0c27b290 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXSubgraphContext.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXSubgraphContext.cs @@ -39,7 +39,7 @@ public VFXSubgraphContext() : base(VFXContextType.Subgraph, VFXDataType.SpawnEve { } - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (!object.ReferenceEquals(m_Subgraph, null)) diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Operators/Implementations/CustomHLSL.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Operators/Implementations/CustomHLSL.cs index d90b5bc27d8..7ce80d0b4ff 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Operators/Implementations/CustomHLSL.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Operators/Implementations/CustomHLSL.cs @@ -223,7 +223,7 @@ public override IEnumerable GetSettings(bool listHidden, VFXSettingA } } - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (!ReferenceEquals(m_ShaderFile, null)) diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Operators/VFXSubgraphOperator.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Operators/VFXSubgraphOperator.cs index 99a8db383b3..2b9230fb465 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Operators/VFXSubgraphOperator.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Operators/VFXSubgraphOperator.cs @@ -186,7 +186,7 @@ protected override IEnumerable outputProperties } } - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (!object.ReferenceEquals(m_Subgraph, null)) diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotCameraBuffer.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotCameraBuffer.cs index 70faddfd417..67deb089284 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotCameraBuffer.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotCameraBuffer.cs @@ -10,7 +10,7 @@ class VFXSlotCameraBuffer : VFXSlot { public override VFXValue DefaultExpression(VFXValue.Mode mode) { - return new VFXCameraBufferValue(0, mode); + return new VFXCameraBufferValue(EntityId.None, mode); } } } diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture2D.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture2D.cs index 0e080b8bbde..c95b9c1afe3 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture2D.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture2D.cs @@ -16,7 +16,7 @@ internal override void GenerateErrors(VFXErrorReporter report) public override VFXValue DefaultExpression(VFXValue.Mode mode) { - return new VFXTexture2DValue(0, mode); + return new VFXTexture2DValue(EntityId.None, mode); } } } diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture2DArray.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture2DArray.cs index ec001a5c063..8de1f9ec79c 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture2DArray.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture2DArray.cs @@ -10,7 +10,7 @@ class VFXSlotTexture2DArray : VFXSlotObject { public override VFXValue DefaultExpression(VFXValue.Mode mode) { - return new VFXTexture2DArrayValue(0, mode); + return new VFXTexture2DArrayValue(EntityId.None, mode); } } } diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture3D.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture3D.cs index 839727fd983..52560f83f9e 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture3D.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTexture3D.cs @@ -17,7 +17,7 @@ internal override void GenerateErrors(VFXErrorReporter report) public override VFXValue DefaultExpression(VFXValue.Mode mode) { - return new VFXTexture3DValue(0, mode); + return new VFXTexture3DValue(EntityId.None, mode); } } } diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTextureCube.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTextureCube.cs index 9df812e2b7f..214cced7d48 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTextureCube.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTextureCube.cs @@ -18,7 +18,7 @@ internal override void GenerateErrors(VFXErrorReporter report) public override VFXValue DefaultExpression(VFXValue.Mode mode) { - return new VFXTextureCubeValue(0, mode); + return new VFXTextureCubeValue(EntityId.None, mode); } } } diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTextureCubeArray.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTextureCubeArray.cs index eab81f7fd6e..24907986710 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTextureCubeArray.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Slots/Implementations/VFXSlotTextureCubeArray.cs @@ -10,7 +10,7 @@ class VFXSlotTextureCubeArray : VFXSlotObject { public override VFXValue DefaultExpression(VFXValue.Mode mode) { - return new VFXTextureCubeArrayValue(0, mode); + return new VFXTextureCubeArrayValue(EntityId.None, mode); } } } diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs index 7333b3bb253..94b8a9beb2a 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs @@ -1748,16 +1748,16 @@ public string[] UpdateImportDependencies() { visualEffectResource.ClearImportDependencies(); - var dependencies = new HashSet(); + var dependencies = new HashSet(); GetImportDependentAssets(dependencies); var guids = new HashSet(); foreach (var dependency in dependencies) { - if (dependency == 0) + if (dependency == EntityId.None) continue; - if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier((EntityId)dependency, out string guid, out long localId)) + if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(dependency, out string guid, out long localId)) { if (!guids.Contains(guid)) { diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/VFXModel.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/VFXModel.cs index d72e3956ddf..e036b7d3800 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Models/VFXModel.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Models/VFXModel.cs @@ -96,7 +96,7 @@ public virtual void GetSourceDependentAssets(HashSet dependencies) child.GetSourceDependentAssets(dependencies); } - public virtual void GetImportDependentAssets(HashSet dependencies) + public virtual void GetImportDependentAssets(HashSet dependencies) { foreach (var child in children) { diff --git a/Packages/com.unity.visualeffectgraph/Editor/SamplesLinkPackageManagerExtension.cs b/Packages/com.unity.visualeffectgraph/Editor/SamplesLinkPackageManagerExtension.cs index b743bb50afe..8355a6959bb 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/SamplesLinkPackageManagerExtension.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/SamplesLinkPackageManagerExtension.cs @@ -19,6 +19,7 @@ public VisualElement CreateExtensionUI() { samplesButton = new Button(); samplesButton.text = SAMPLEBUTTON_TEXT; + samplesButton.style.whiteSpace = WhiteSpace.Normal; // Allow wrapping samplesButton.clickable.clicked += () => Application.OpenURL(GITHUB_URL); return samplesButton; } diff --git a/Packages/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXShaderGraphParticleOutput.cs b/Packages/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXShaderGraphParticleOutput.cs index c683a1defb7..ece46a85cc2 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXShaderGraphParticleOutput.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXShaderGraphParticleOutput.cs @@ -94,7 +94,7 @@ public override void OnSettingModified(VFXSetting setting) } } - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (!object.ReferenceEquals(shaderGraph, null)) diff --git a/Packages/com.unity.visualeffectgraph/Editor/Utilities/pCache/Operator/VFXOperatorPointCache.cs b/Packages/com.unity.visualeffectgraph/Editor/Utilities/pCache/Operator/VFXOperatorPointCache.cs index 5ad96e4517a..2b2b007fc2f 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/Utilities/pCache/Operator/VFXOperatorPointCache.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/Utilities/pCache/Operator/VFXOperatorPointCache.cs @@ -21,7 +21,7 @@ public class OutputProperties public uint Count = 0; } - public override void GetImportDependentAssets(HashSet dependencies) + public override void GetImportDependentAssets(HashSet dependencies) { base.GetImportDependentAssets(dependencies); if (!object.ReferenceEquals(Asset, null)) diff --git a/Packages/com.unity.visualeffectgraph/Editor/VFXAnalytics.cs b/Packages/com.unity.visualeffectgraph/Editor/VFXAnalytics.cs index 2bfd029af48..86574d52e0a 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/VFXAnalytics.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/VFXAnalytics.cs @@ -125,7 +125,7 @@ public void UpdateGraphData(VFXView view) var instanceId = view.controller.model.asset.GetEntityId(); var graphInfo = openedGraphInfo.SingleOrDefault(x => x.graph_id == instanceId); - if (graphInfo.graph_id > 0) + if (graphInfo.graph_id != EntityId.None) { openedGraphInfo.Remove(graphInfo); } @@ -195,7 +195,7 @@ private void Save() [Serializable] internal struct GraphInfo { - public int graph_id; + public EntityId graph_id; public int node_count; public List experimentatl_node_names; } diff --git a/Packages/com.unity.visualeffectgraph/Editor/VFXAssetEditorUtility.cs b/Packages/com.unity.visualeffectgraph/Editor/VFXAssetEditorUtility.cs index 2512589d565..08aa1dcdcd0 100644 --- a/Packages/com.unity.visualeffectgraph/Editor/VFXAssetEditorUtility.cs +++ b/Packages/com.unity.visualeffectgraph/Editor/VFXAssetEditorUtility.cs @@ -146,7 +146,7 @@ public static void CreateHLSLFileAsset() { var action = ScriptableObject.CreateInstance(); var icon = EditorGUIUtility.FindTexture(typeof(TextAsset)); - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, action, "New custom node.hlsl", icon, null); + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, action, "New custom node.hlsl", icon, null); } public static void CreateTemplateAsset(string pathName, string templateFilePath) diff --git a/Tests/SRPTests/Packages/local.gtf.references/package.json b/Tests/SRPTests/Packages/local.gtf.references/package.json new file mode 100644 index 00000000000..33e5a4c5b74 --- /dev/null +++ b/Tests/SRPTests/Packages/local.gtf.references/package.json @@ -0,0 +1,18 @@ +{ + "displayName": "Graphics Test Framework (published v9)", + "name": "local.gtf.references", + "version": "1.0.0", + "unity": "6000.4", + "description": "Shim package that contains a reference to the com.unity.testframework.graphics package for easier version pinning.", + "keywords": [ + "qa", + "test", + "testing", + "tests", + "graphics" + ], + "category": "Libraries", + "dependencies": { + "com.unity.testframework.graphics": "9.0.0-exp.33" + } +} diff --git a/Tests/SRPTests/Packages/local.gtf.references/package.json.meta b/Tests/SRPTests/Packages/local.gtf.references/package.json.meta new file mode 100644 index 00000000000..592a323c294 --- /dev/null +++ b/Tests/SRPTests/Packages/local.gtf.references/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 81773ed82dd27614a859d3f421000966 +PackageManifestImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/Tests/LightBaker/Utilities/SourceMapUtil.cs b/Tests/SRPTests/Projects/HDRP_Tests/Assets/Tests/LightBaker/Utilities/SourceMapUtil.cs index ba6f1d28c78..31ff33a0bc2 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/Tests/LightBaker/Utilities/SourceMapUtil.cs +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/Tests/LightBaker/Utilities/SourceMapUtil.cs @@ -11,8 +11,8 @@ internal static class SourceMapUtil if (go == null) return new uint?(); - int instanceID = go.GetEntityId(); - int instanceIndex = map.GetInstanceIndex(instanceID); + EntityId entityId = go.GetEntityId(); + int instanceIndex = map.GetInstanceIndex(entityId); if (instanceIndex == -1) return new uint?(); diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Packages/manifest.json b/Tests/SRPTests/Projects/HDRP_Tests/Packages/manifest.json index 5ee14eee138..50dbf92c92f 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Packages/manifest.json +++ b/Tests/SRPTests/Projects/HDRP_Tests/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.render-pipelines.high-definition-config": "file:../../../../../Packages/com.unity.render-pipelines.high-definition-config", "com.unity.shadergraph": "file:../../../../../Packages/com.unity.shadergraph", "com.unity.test-framework": "file:../../../../../Packages/com.unity.test-framework", - "com.unity.testframework.graphics": "file:../../../Packages/com.unity.test-framework.graphics", + "local.gtf.references": "file:../../../Packages/local.gtf.references", "com.unity.testing.common-graphics": "file:../../../Packages/com.unity.testing.common-graphics", "com.unity.testing.hdrp": "file:../../../Packages/com.unity.testing.hdrp", "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr", @@ -57,5 +57,14 @@ "com.unity.testing.hdrp", "com.unity.testing.xr", "com.unity.shadergraph" + ], + "scopedRegistries": [ + { + "name": "UPM Candidates (GTF)", + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", + "scopes": [ + "com.unity.testframework.graphics" + ] + } ] } diff --git a/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/RenderGraphViewer/RenderGraphViewerDebugDataSerializationTests.cs b/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/RenderGraphViewer/RenderGraphViewerDebugDataSerializationTests.cs index 0b199a2d88e..eadd1842f18 100644 --- a/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/RenderGraphViewer/RenderGraphViewerDebugDataSerializationTests.cs +++ b/Tests/SRPTests/Projects/SRP_SmokeTest/Assets/Tests/Editor/RenderGraphViewer/RenderGraphViewerDebugDataSerializationTests.cs @@ -156,7 +156,9 @@ public void DebugMessageHandler_DebugDataMessage_IsSerializedCorrectly() { version = DebugMessageHandler.k_Version, graphName = "TestGraph", +#pragma warning disable 618 // todo @emilie.thaulow replace with unique id executionId = 123, +#pragma warning restore 618 debugData = CreateTestDebugData() }; @@ -193,7 +195,10 @@ public void DebugMessageHandler_DebugDataMessage_IsCompatibleWithSerializedVersi Assert.AreEqual(DebugMessageHandler.MessageType.DebugData, deserializedMessageType); Assert.True(deserializedPayload.isCompatible); Assert.AreEqual(DebugMessageHandler.k_Version, deserializedPayload.version); + +#pragma warning disable 618 // todo @emilie.thaulow replace with unique id Assert.AreEqual(123, (int)deserializedDebugDataPayload.executionId); +#pragma warning restore 618 Assert.AreEqual("TestGraph", deserializedDebugDataPayload.graphName); Assert.NotNull(deserializedDebugDataPayload.debugData); } @@ -205,7 +210,9 @@ public static void DoSomething() { version = DebugMessageHandler.k_Version, graphName = "TestGraph", +#pragma warning disable 618 // todo @emilie.thaulow replace with unique id executionId = 123, +#pragma warning restore 618 debugData = CreateTestDebugData() }; diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Packages/manifest.json b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Packages/manifest.json index 5d052e35a7c..f69e3d01042 100644 --- a/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Packages/manifest.json +++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Packages/manifest.json @@ -14,7 +14,7 @@ "com.unity.render-pipelines.universal-config": "file:../../../../../Packages/com.unity.render-pipelines.universal-config", "com.unity.shadergraph": "file:../../../../../Packages/com.unity.shadergraph", "com.unity.test-framework": "file:../../../../../Packages/com.unity.test-framework", - "com.unity.testframework.graphics": "file:../../../Packages/com.unity.test-framework.graphics", + "local.gtf.references": "file:../../../Packages/local.gtf.references", "com.unity.testing.common-graphics": "file:../../../Packages/com.unity.testing.common-graphics", "com.unity.testing.urp": "file:../../../Packages/com.unity.testing.urp", "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr", @@ -56,5 +56,14 @@ "com.unity.render-pipelines.universal", "com.unity.testing.xr", "com.unity.testing.urp" + ], + "scopedRegistries": [ + { + "name": "UPM Candidates (GTF)", + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", + "scopes": [ + "com.unity.testframework.graphics" + ] + } ] }