From ce40da5de0d0597456269bfdb193586704889fed Mon Sep 17 00:00:00 2001 From: Stedd Date: Sun, 8 Oct 2023 13:01:21 +0200 Subject: [PATCH] Unity 2022.3.10 --- .../Environment/Art/Materials/Blue_Mat.mat | 20 +- .../Art/Materials/GreyBlue_Mat.mat | 20 +- .../Art/Materials/GridBlue_01_Mat.mat | 20 +- .../Art/Materials/GridOrange_01_Mat.mat | 20 +- .../Art/Materials/GridWhite_01_Mat.mat | 20 +- .../ShaderGraphGrid_01_Mat.mat | 5 +- Assets/Handlers/BuildingHandler.cs | 24 +- Assets/Handlers/PowerHandler.cs | 3 +- Assets/InputSystem/CameraControllActions.cs | 274 ++++++++---------- Assets/InputSystem/HandlerControls.cs | 244 +++++++++------- Assets/Materials/ColliderIndicator.mat | 20 +- Assets/Materials/GhostMaterial.mat | 20 +- Assets/Materials/Opaque_Blue.mat | 20 +- Assets/Materials/Opaque_Gray.mat | 20 +- Assets/Materials/Opaque_Red.mat | 20 +- Assets/Materials/Transparent_Green.mat | 20 +- .../DefaultSettingsVolumeProfile.asset | 56 +++- Packages/manifest.json | 17 +- Packages/packages-lock.json | 107 +++---- .../BurstAotSettings_StandaloneWindows.json | 18 ++ ProjectSettings/CommonBurstAotSettings.json | 6 + ProjectSettings/HDRPProjectSettings.asset | 2 +- .../Settings.json | 2 - ProjectSettings/ProjectSettings.asset | 96 ++++-- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/QualitySettings.asset | 103 ++++++- ProjectSettings/VFXManager.asset | 6 +- ProjectSettings/boot.config | 0 28 files changed, 756 insertions(+), 431 deletions(-) create mode 100644 ProjectSettings/BurstAotSettings_StandaloneWindows.json create mode 100644 ProjectSettings/CommonBurstAotSettings.json delete mode 100644 ProjectSettings/boot.config diff --git a/Assets/AssetPacks/Environment/Art/Materials/Blue_Mat.mat b/Assets/AssetPacks/Environment/Art/Materials/Blue_Mat.mat index da4dc7a..752750b 100644 --- a/Assets/AssetPacks/Environment/Art/Materials/Blue_Mat.mat +++ b/Assets/AssetPacks/Environment/Art/Materials/Blue_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: @@ -25,6 +25,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Blue_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _NORMALMAP_TANGENT_SPACE @@ -40,6 +42,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -151,6 +154,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -180,6 +187,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -236,6 +245,8 @@ Material: - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OcclusionStrength: 1 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 @@ -262,9 +273,9 @@ Material: - _StencilRefGBuffer: 10 - _StencilRefMV: 40 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 @@ -272,6 +283,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 diff --git a/Assets/AssetPacks/Environment/Art/Materials/GreyBlue_Mat.mat b/Assets/AssetPacks/Environment/Art/Materials/GreyBlue_Mat.mat index 9900f88..88d40a3 100644 --- a/Assets/AssetPacks/Environment/Art/Materials/GreyBlue_Mat.mat +++ b/Assets/AssetPacks/Environment/Art/Materials/GreyBlue_Mat.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GreyBlue_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _NORMALMAP_TANGENT_SPACE @@ -24,6 +26,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -135,6 +138,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -164,6 +171,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -220,6 +229,8 @@ Material: - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OcclusionStrength: 1 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 @@ -246,9 +257,9 @@ Material: - _StencilRefGBuffer: 10 - _StencilRefMV: 40 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 @@ -256,6 +267,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 @@ -303,7 +315,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: diff --git a/Assets/AssetPacks/Environment/Art/Materials/GridBlue_01_Mat.mat b/Assets/AssetPacks/Environment/Art/Materials/GridBlue_01_Mat.mat index 69e5bbf..5bbebb5 100644 --- a/Assets/AssetPacks/Environment/Art/Materials/GridBlue_01_Mat.mat +++ b/Assets/AssetPacks/Environment/Art/Materials/GridBlue_01_Mat.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GridBlue_01_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _EMISSIVE_COLOR_MAP @@ -26,6 +28,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -137,6 +140,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -166,6 +173,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -222,6 +231,8 @@ Material: - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OcclusionStrength: 0 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 @@ -248,9 +259,9 @@ Material: - _StencilRefGBuffer: 10 - _StencilRefMV: 40 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 @@ -258,6 +269,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 @@ -305,7 +317,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: diff --git a/Assets/AssetPacks/Environment/Art/Materials/GridOrange_01_Mat.mat b/Assets/AssetPacks/Environment/Art/Materials/GridOrange_01_Mat.mat index 474bb55..3fa31b0 100644 --- a/Assets/AssetPacks/Environment/Art/Materials/GridOrange_01_Mat.mat +++ b/Assets/AssetPacks/Environment/Art/Materials/GridOrange_01_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: @@ -25,6 +25,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GridOrange_01_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _EMISSIVE_COLOR_MAP @@ -42,6 +44,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +156,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -182,6 +189,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -238,6 +247,8 @@ Material: - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OcclusionStrength: 0 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 @@ -264,9 +275,9 @@ Material: - _StencilRefGBuffer: 10 - _StencilRefMV: 40 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 @@ -274,6 +285,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 diff --git a/Assets/AssetPacks/Environment/Art/Materials/GridWhite_01_Mat.mat b/Assets/AssetPacks/Environment/Art/Materials/GridWhite_01_Mat.mat index ba9a9b1..bf10b89 100644 --- a/Assets/AssetPacks/Environment/Art/Materials/GridWhite_01_Mat.mat +++ b/Assets/AssetPacks/Environment/Art/Materials/GridWhite_01_Mat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: @@ -25,6 +25,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GridWhite_01_Mat m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _EMISSIVE_COLOR_MAP @@ -42,6 +44,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +156,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -182,6 +189,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -238,6 +247,8 @@ Material: - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OcclusionStrength: 0 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 @@ -264,9 +275,9 @@ Material: - _StencilRefGBuffer: 10 - _StencilRefMV: 40 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 @@ -274,6 +285,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 diff --git a/Assets/AssetPacks/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat b/Assets/AssetPacks/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat index e2d4470..6c7701a 100644 --- a/Assets/AssetPacks/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat +++ b/Assets/AssetPacks/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ShaderGraphGrid_01_Mat m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_DECALS - _DISABLE_SSR_TRANSPARENT @@ -23,6 +25,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - RayTracingPrepass + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -174,7 +177,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: diff --git a/Assets/Handlers/BuildingHandler.cs b/Assets/Handlers/BuildingHandler.cs index df96d9c..48b8a57 100644 --- a/Assets/Handlers/BuildingHandler.cs +++ b/Assets/Handlers/BuildingHandler.cs @@ -21,6 +21,7 @@ namespace AsteroidGame.Handlers [SerializeField] private SStructureBaseList _availableSStructures; #region Private + private Color _colorCurrent; private Camera _camera; private Vector3 _tempVec; @@ -34,14 +35,9 @@ namespace AsteroidGame.Handlers protected override void OnEnable() { base.OnEnable(); - // for (int i = 0; i < _availableStructuresObject._structureList.Count; i++) - // { - // _availableStructures.Add(i, _availableStructuresObject._structureList[i]); - // } _camera = Camera.main; _buildPlane = new Plane(Vector3.up, Vector3.zero); - //_activeStructures.Clear(); } private void Update() @@ -107,7 +103,8 @@ namespace AsteroidGame.Handlers private void SpawnGhostStructure() { - _ghostStructure = Instantiate(_availableSStructures._structureList[_buildingSelector], GetPlanePoint(), Quaternion.identity, + _ghostStructure = Instantiate(_availableSStructures._structureList[_buildingSelector], GetPlanePoint(), + Quaternion.identity, transform); _ghostStructure.name = "GhostStructure"; @@ -131,10 +128,9 @@ namespace AsteroidGame.Handlers private void SpawnStructure() { - _tempStructure = Instantiate(_availableSStructures._structureList[_buildingSelector], GetPlanePoint(), Quaternion.identity, + _tempStructure = Instantiate(_availableSStructures._structureList[_buildingSelector], GetPlanePoint(), + Quaternion.identity, transform); - // _activeStructures.Add(_tempStructure); - // _buildingLists[0].Add(_tempStructure); } #region Getters @@ -151,16 +147,6 @@ namespace AsteroidGame.Handlers return Vector3.zero; } - // public List GetAvailableStructures() - // { - // return _availableStructures._structureList; - // } - - // public List GetActiveStructures() - // { - // return _activeStructures; - // } - #endregion #region Setters diff --git a/Assets/Handlers/PowerHandler.cs b/Assets/Handlers/PowerHandler.cs index 3f0c2c5..5b3ecf1 100644 --- a/Assets/Handlers/PowerHandler.cs +++ b/Assets/Handlers/PowerHandler.cs @@ -15,6 +15,7 @@ namespace AsteroidGame.Handlers [Header("Connections")] [SerializeField] private SPowerBaseRuntimeSet _activePowerStructures; + private void Update() { _powerConsumption = 0; @@ -43,7 +44,7 @@ namespace AsteroidGame.Handlers _powerFactor = 0; } } - + public int GetMaxPower() { throw new NotImplementedException(); diff --git a/Assets/InputSystem/CameraControllActions.cs b/Assets/InputSystem/CameraControllActions.cs index f98e0e7..dfcb260 100644 --- a/Assets/InputSystem/CameraControllActions.cs +++ b/Assets/InputSystem/CameraControllActions.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.3.0 +// version 1.7.0 // from Assets/InputSystem/CameraControllActions.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -15,15 +15,12 @@ using System.Collections.Generic; using UnityEngine.InputSystem; using UnityEngine.InputSystem.Utilities; -namespace InputSystem +public partial class @CameraControllActions: IInputActionCollection2, IDisposable { - public partial class @CameraControllActions : IInputActionCollection2, IDisposable + public InputActionAsset asset { get; } + public @CameraControllActions() { - public InputActionAsset asset { get; } - - public @CameraControllActions() - { - asset = InputActionAsset.FromJson(@"{ + asset = InputActionAsset.FromJson(@"{ ""name"": ""CameraControllActions"", ""maps"": [ { @@ -141,149 +138,134 @@ namespace InputSystem ], ""controlSchemes"": [] }"); - // Camera - m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true); - m_Camera_Movement = m_Camera.FindAction("Movement", throwIfNotFound: true); - m_Camera_RotateCamera = m_Camera.FindAction("RotateCamera", throwIfNotFound: true); - m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true); - } - - public void Dispose() - { - UnityEngine.Object.Destroy(asset); - } - - public InputBinding? bindingMask - { - get => asset.bindingMask; - set => asset.bindingMask = value; - } - - public ReadOnlyArray? devices - { - get => asset.devices; - set => asset.devices = value; - } - - public ReadOnlyArray controlSchemes => asset.controlSchemes; - - public bool Contains(InputAction action) - { - return asset.Contains(action); - } - - public IEnumerator GetEnumerator() - { - return asset.GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - - public void Enable() - { - asset.Enable(); - } - - public void Disable() - { - asset.Disable(); - } - - public IEnumerable bindings => asset.bindings; - - public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) - { - return asset.FindAction(actionNameOrId, throwIfNotFound); - } - - public int FindBinding(InputBinding bindingMask, out InputAction action) - { - return asset.FindBinding(bindingMask, out action); - } - // Camera - private readonly InputActionMap m_Camera; - private ICameraActions m_CameraActionsCallbackInterface; - private readonly InputAction m_Camera_Movement; - private readonly InputAction m_Camera_RotateCamera; - private readonly InputAction m_Camera_ZoomCamera; + m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true); + m_Camera_Movement = m_Camera.FindAction("Movement", throwIfNotFound: true); + m_Camera_RotateCamera = m_Camera.FindAction("RotateCamera", throwIfNotFound: true); + m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true); + } - public struct CameraActions + public void Dispose() + { + UnityEngine.Object.Destroy(asset); + } + + public InputBinding? bindingMask + { + get => asset.bindingMask; + set => asset.bindingMask = value; + } + + public ReadOnlyArray? devices + { + get => asset.devices; + set => asset.devices = value; + } + + public ReadOnlyArray controlSchemes => asset.controlSchemes; + + public bool Contains(InputAction action) + { + return asset.Contains(action); + } + + public IEnumerator GetEnumerator() + { + return asset.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + + public void Enable() + { + asset.Enable(); + } + + public void Disable() + { + asset.Disable(); + } + + public IEnumerable bindings => asset.bindings; + + public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) + { + return asset.FindAction(actionNameOrId, throwIfNotFound); + } + + public int FindBinding(InputBinding bindingMask, out InputAction action) + { + return asset.FindBinding(bindingMask, out action); + } + + // Camera + private readonly InputActionMap m_Camera; + private List m_CameraActionsCallbackInterfaces = new List(); + private readonly InputAction m_Camera_Movement; + private readonly InputAction m_Camera_RotateCamera; + private readonly InputAction m_Camera_ZoomCamera; + public struct CameraActions + { + private @CameraControllActions m_Wrapper; + public CameraActions(@CameraControllActions wrapper) { m_Wrapper = wrapper; } + public InputAction @Movement => m_Wrapper.m_Camera_Movement; + public InputAction @RotateCamera => m_Wrapper.m_Camera_RotateCamera; + public InputAction @ZoomCamera => m_Wrapper.m_Camera_ZoomCamera; + public InputActionMap Get() { return m_Wrapper.m_Camera; } + public void Enable() { Get().Enable(); } + public void Disable() { Get().Disable(); } + public bool enabled => Get().enabled; + public static implicit operator InputActionMap(CameraActions set) { return set.Get(); } + public void AddCallbacks(ICameraActions instance) { - private @CameraControllActions m_Wrapper; - - public CameraActions(@CameraControllActions wrapper) - { - m_Wrapper = wrapper; - } - - public InputAction @Movement => m_Wrapper.m_Camera_Movement; - public InputAction @RotateCamera => m_Wrapper.m_Camera_RotateCamera; - public InputAction @ZoomCamera => m_Wrapper.m_Camera_ZoomCamera; - - public InputActionMap Get() - { - return m_Wrapper.m_Camera; - } - - public void Enable() - { - Get().Enable(); - } - - public void Disable() - { - Get().Disable(); - } - - public bool enabled => Get().enabled; - - public static implicit operator InputActionMap(CameraActions set) - { - return set.Get(); - } - - public void SetCallbacks(ICameraActions instance) - { - if (m_Wrapper.m_CameraActionsCallbackInterface != null) - { - @Movement.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement; - @Movement.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement; - @Movement.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement; - @RotateCamera.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera; - @RotateCamera.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera; - @RotateCamera.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera; - @ZoomCamera.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera; - @ZoomCamera.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera; - @ZoomCamera.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera; - } - - m_Wrapper.m_CameraActionsCallbackInterface = instance; - if (instance != null) - { - @Movement.started += instance.OnMovement; - @Movement.performed += instance.OnMovement; - @Movement.canceled += instance.OnMovement; - @RotateCamera.started += instance.OnRotateCamera; - @RotateCamera.performed += instance.OnRotateCamera; - @RotateCamera.canceled += instance.OnRotateCamera; - @ZoomCamera.started += instance.OnZoomCamera; - @ZoomCamera.performed += instance.OnZoomCamera; - @ZoomCamera.canceled += instance.OnZoomCamera; - } - } + if (instance == null || m_Wrapper.m_CameraActionsCallbackInterfaces.Contains(instance)) return; + m_Wrapper.m_CameraActionsCallbackInterfaces.Add(instance); + @Movement.started += instance.OnMovement; + @Movement.performed += instance.OnMovement; + @Movement.canceled += instance.OnMovement; + @RotateCamera.started += instance.OnRotateCamera; + @RotateCamera.performed += instance.OnRotateCamera; + @RotateCamera.canceled += instance.OnRotateCamera; + @ZoomCamera.started += instance.OnZoomCamera; + @ZoomCamera.performed += instance.OnZoomCamera; + @ZoomCamera.canceled += instance.OnZoomCamera; } - public CameraActions @Camera => new CameraActions(this); - - public interface ICameraActions + private void UnregisterCallbacks(ICameraActions instance) { - void OnMovement(InputAction.CallbackContext context); - void OnRotateCamera(InputAction.CallbackContext context); - void OnZoomCamera(InputAction.CallbackContext context); + @Movement.started -= instance.OnMovement; + @Movement.performed -= instance.OnMovement; + @Movement.canceled -= instance.OnMovement; + @RotateCamera.started -= instance.OnRotateCamera; + @RotateCamera.performed -= instance.OnRotateCamera; + @RotateCamera.canceled -= instance.OnRotateCamera; + @ZoomCamera.started -= instance.OnZoomCamera; + @ZoomCamera.performed -= instance.OnZoomCamera; + @ZoomCamera.canceled -= instance.OnZoomCamera; + } + + public void RemoveCallbacks(ICameraActions instance) + { + if (m_Wrapper.m_CameraActionsCallbackInterfaces.Remove(instance)) + UnregisterCallbacks(instance); + } + + public void SetCallbacks(ICameraActions instance) + { + foreach (var item in m_Wrapper.m_CameraActionsCallbackInterfaces) + UnregisterCallbacks(item); + m_Wrapper.m_CameraActionsCallbackInterfaces.Clear(); + AddCallbacks(instance); } } -} \ No newline at end of file + public CameraActions @Camera => new CameraActions(this); + public interface ICameraActions + { + void OnMovement(InputAction.CallbackContext context); + void OnRotateCamera(InputAction.CallbackContext context); + void OnZoomCamera(InputAction.CallbackContext context); + } +} diff --git a/Assets/InputSystem/HandlerControls.cs b/Assets/InputSystem/HandlerControls.cs index 13b18d2..12a6697 100644 --- a/Assets/InputSystem/HandlerControls.cs +++ b/Assets/InputSystem/HandlerControls.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.3.0 +// version 1.7.0 // from Assets/InputSystem/HandlerControls.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -17,7 +17,7 @@ using UnityEngine.InputSystem.Utilities; namespace AsteroidGame { - public partial class @HandlerControls : IInputActionCollection2, IDisposable + public partial class @HandlerControls: IInputActionCollection2, IDisposable { public InputActionAsset asset { get; } public @HandlerControls() @@ -964,12 +964,14 @@ namespace AsteroidGame { asset.Disable(); } + public IEnumerable bindings => asset.bindings; public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) { return asset.FindAction(actionNameOrId, throwIfNotFound); } + public int FindBinding(InputBinding bindingMask, out InputAction action) { return asset.FindBinding(bindingMask, out action); @@ -977,7 +979,7 @@ namespace AsteroidGame // Player private readonly InputActionMap m_Player; - private IPlayerActions m_PlayerActionsCallbackInterface; + private List m_PlayerActionsCallbackInterfaces = new List(); private readonly InputAction m_Player_Move; private readonly InputAction m_Player_Look; private readonly InputAction m_Player_LeftClick; @@ -997,52 +999,65 @@ namespace AsteroidGame public void Disable() { Get().Disable(); } public bool enabled => Get().enabled; public static implicit operator InputActionMap(PlayerActions set) { return set.Get(); } + public void AddCallbacks(IPlayerActions instance) + { + if (instance == null || m_Wrapper.m_PlayerActionsCallbackInterfaces.Contains(instance)) return; + m_Wrapper.m_PlayerActionsCallbackInterfaces.Add(instance); + @Move.started += instance.OnMove; + @Move.performed += instance.OnMove; + @Move.canceled += instance.OnMove; + @Look.started += instance.OnLook; + @Look.performed += instance.OnLook; + @Look.canceled += instance.OnLook; + @LeftClick.started += instance.OnLeftClick; + @LeftClick.performed += instance.OnLeftClick; + @LeftClick.canceled += instance.OnLeftClick; + @Build.started += instance.OnBuild; + @Build.performed += instance.OnBuild; + @Build.canceled += instance.OnBuild; + @RightClick.started += instance.OnRightClick; + @RightClick.performed += instance.OnRightClick; + @RightClick.canceled += instance.OnRightClick; + } + + private void UnregisterCallbacks(IPlayerActions instance) + { + @Move.started -= instance.OnMove; + @Move.performed -= instance.OnMove; + @Move.canceled -= instance.OnMove; + @Look.started -= instance.OnLook; + @Look.performed -= instance.OnLook; + @Look.canceled -= instance.OnLook; + @LeftClick.started -= instance.OnLeftClick; + @LeftClick.performed -= instance.OnLeftClick; + @LeftClick.canceled -= instance.OnLeftClick; + @Build.started -= instance.OnBuild; + @Build.performed -= instance.OnBuild; + @Build.canceled -= instance.OnBuild; + @RightClick.started -= instance.OnRightClick; + @RightClick.performed -= instance.OnRightClick; + @RightClick.canceled -= instance.OnRightClick; + } + + public void RemoveCallbacks(IPlayerActions instance) + { + if (m_Wrapper.m_PlayerActionsCallbackInterfaces.Remove(instance)) + UnregisterCallbacks(instance); + } + public void SetCallbacks(IPlayerActions instance) { - if (m_Wrapper.m_PlayerActionsCallbackInterface != null) - { - @Move.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnMove; - @Move.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnMove; - @Move.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnMove; - @Look.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLook; - @Look.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLook; - @Look.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLook; - @LeftClick.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLeftClick; - @LeftClick.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLeftClick; - @LeftClick.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLeftClick; - @Build.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnBuild; - @Build.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnBuild; - @Build.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnBuild; - @RightClick.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnRightClick; - @RightClick.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnRightClick; - @RightClick.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnRightClick; - } - m_Wrapper.m_PlayerActionsCallbackInterface = instance; - if (instance != null) - { - @Move.started += instance.OnMove; - @Move.performed += instance.OnMove; - @Move.canceled += instance.OnMove; - @Look.started += instance.OnLook; - @Look.performed += instance.OnLook; - @Look.canceled += instance.OnLook; - @LeftClick.started += instance.OnLeftClick; - @LeftClick.performed += instance.OnLeftClick; - @LeftClick.canceled += instance.OnLeftClick; - @Build.started += instance.OnBuild; - @Build.performed += instance.OnBuild; - @Build.canceled += instance.OnBuild; - @RightClick.started += instance.OnRightClick; - @RightClick.performed += instance.OnRightClick; - @RightClick.canceled += instance.OnRightClick; - } + foreach (var item in m_Wrapper.m_PlayerActionsCallbackInterfaces) + UnregisterCallbacks(item); + m_Wrapper.m_PlayerActionsCallbackInterfaces.Clear(); + AddCallbacks(instance); } } public PlayerActions @Player => new PlayerActions(this); // UI private readonly InputActionMap m_UI; - private IUIActions m_UIActionsCallbackInterface; + private List m_UIActionsCallbackInterfaces = new List(); private readonly InputAction m_UI_Navigate; private readonly InputAction m_UI_Submit; private readonly InputAction m_UI_Cancel; @@ -1072,75 +1087,88 @@ namespace AsteroidGame public void Disable() { Get().Disable(); } public bool enabled => Get().enabled; public static implicit operator InputActionMap(UIActions set) { return set.Get(); } + public void AddCallbacks(IUIActions instance) + { + if (instance == null || m_Wrapper.m_UIActionsCallbackInterfaces.Contains(instance)) return; + m_Wrapper.m_UIActionsCallbackInterfaces.Add(instance); + @Navigate.started += instance.OnNavigate; + @Navigate.performed += instance.OnNavigate; + @Navigate.canceled += instance.OnNavigate; + @Submit.started += instance.OnSubmit; + @Submit.performed += instance.OnSubmit; + @Submit.canceled += instance.OnSubmit; + @Cancel.started += instance.OnCancel; + @Cancel.performed += instance.OnCancel; + @Cancel.canceled += instance.OnCancel; + @Point.started += instance.OnPoint; + @Point.performed += instance.OnPoint; + @Point.canceled += instance.OnPoint; + @Click.started += instance.OnClick; + @Click.performed += instance.OnClick; + @Click.canceled += instance.OnClick; + @ScrollWheel.started += instance.OnScrollWheel; + @ScrollWheel.performed += instance.OnScrollWheel; + @ScrollWheel.canceled += instance.OnScrollWheel; + @MiddleClick.started += instance.OnMiddleClick; + @MiddleClick.performed += instance.OnMiddleClick; + @MiddleClick.canceled += instance.OnMiddleClick; + @RightClick.started += instance.OnRightClick; + @RightClick.performed += instance.OnRightClick; + @RightClick.canceled += instance.OnRightClick; + @TrackedDevicePosition.started += instance.OnTrackedDevicePosition; + @TrackedDevicePosition.performed += instance.OnTrackedDevicePosition; + @TrackedDevicePosition.canceled += instance.OnTrackedDevicePosition; + @TrackedDeviceOrientation.started += instance.OnTrackedDeviceOrientation; + @TrackedDeviceOrientation.performed += instance.OnTrackedDeviceOrientation; + @TrackedDeviceOrientation.canceled += instance.OnTrackedDeviceOrientation; + } + + private void UnregisterCallbacks(IUIActions instance) + { + @Navigate.started -= instance.OnNavigate; + @Navigate.performed -= instance.OnNavigate; + @Navigate.canceled -= instance.OnNavigate; + @Submit.started -= instance.OnSubmit; + @Submit.performed -= instance.OnSubmit; + @Submit.canceled -= instance.OnSubmit; + @Cancel.started -= instance.OnCancel; + @Cancel.performed -= instance.OnCancel; + @Cancel.canceled -= instance.OnCancel; + @Point.started -= instance.OnPoint; + @Point.performed -= instance.OnPoint; + @Point.canceled -= instance.OnPoint; + @Click.started -= instance.OnClick; + @Click.performed -= instance.OnClick; + @Click.canceled -= instance.OnClick; + @ScrollWheel.started -= instance.OnScrollWheel; + @ScrollWheel.performed -= instance.OnScrollWheel; + @ScrollWheel.canceled -= instance.OnScrollWheel; + @MiddleClick.started -= instance.OnMiddleClick; + @MiddleClick.performed -= instance.OnMiddleClick; + @MiddleClick.canceled -= instance.OnMiddleClick; + @RightClick.started -= instance.OnRightClick; + @RightClick.performed -= instance.OnRightClick; + @RightClick.canceled -= instance.OnRightClick; + @TrackedDevicePosition.started -= instance.OnTrackedDevicePosition; + @TrackedDevicePosition.performed -= instance.OnTrackedDevicePosition; + @TrackedDevicePosition.canceled -= instance.OnTrackedDevicePosition; + @TrackedDeviceOrientation.started -= instance.OnTrackedDeviceOrientation; + @TrackedDeviceOrientation.performed -= instance.OnTrackedDeviceOrientation; + @TrackedDeviceOrientation.canceled -= instance.OnTrackedDeviceOrientation; + } + + public void RemoveCallbacks(IUIActions instance) + { + if (m_Wrapper.m_UIActionsCallbackInterfaces.Remove(instance)) + UnregisterCallbacks(instance); + } + public void SetCallbacks(IUIActions instance) { - if (m_Wrapper.m_UIActionsCallbackInterface != null) - { - @Navigate.started -= m_Wrapper.m_UIActionsCallbackInterface.OnNavigate; - @Navigate.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnNavigate; - @Navigate.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnNavigate; - @Submit.started -= m_Wrapper.m_UIActionsCallbackInterface.OnSubmit; - @Submit.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnSubmit; - @Submit.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnSubmit; - @Cancel.started -= m_Wrapper.m_UIActionsCallbackInterface.OnCancel; - @Cancel.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnCancel; - @Cancel.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnCancel; - @Point.started -= m_Wrapper.m_UIActionsCallbackInterface.OnPoint; - @Point.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnPoint; - @Point.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnPoint; - @Click.started -= m_Wrapper.m_UIActionsCallbackInterface.OnClick; - @Click.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnClick; - @Click.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnClick; - @ScrollWheel.started -= m_Wrapper.m_UIActionsCallbackInterface.OnScrollWheel; - @ScrollWheel.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnScrollWheel; - @ScrollWheel.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnScrollWheel; - @MiddleClick.started -= m_Wrapper.m_UIActionsCallbackInterface.OnMiddleClick; - @MiddleClick.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnMiddleClick; - @MiddleClick.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnMiddleClick; - @RightClick.started -= m_Wrapper.m_UIActionsCallbackInterface.OnRightClick; - @RightClick.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnRightClick; - @RightClick.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnRightClick; - @TrackedDevicePosition.started -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDevicePosition; - @TrackedDevicePosition.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDevicePosition; - @TrackedDevicePosition.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDevicePosition; - @TrackedDeviceOrientation.started -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDeviceOrientation; - } - m_Wrapper.m_UIActionsCallbackInterface = instance; - if (instance != null) - { - @Navigate.started += instance.OnNavigate; - @Navigate.performed += instance.OnNavigate; - @Navigate.canceled += instance.OnNavigate; - @Submit.started += instance.OnSubmit; - @Submit.performed += instance.OnSubmit; - @Submit.canceled += instance.OnSubmit; - @Cancel.started += instance.OnCancel; - @Cancel.performed += instance.OnCancel; - @Cancel.canceled += instance.OnCancel; - @Point.started += instance.OnPoint; - @Point.performed += instance.OnPoint; - @Point.canceled += instance.OnPoint; - @Click.started += instance.OnClick; - @Click.performed += instance.OnClick; - @Click.canceled += instance.OnClick; - @ScrollWheel.started += instance.OnScrollWheel; - @ScrollWheel.performed += instance.OnScrollWheel; - @ScrollWheel.canceled += instance.OnScrollWheel; - @MiddleClick.started += instance.OnMiddleClick; - @MiddleClick.performed += instance.OnMiddleClick; - @MiddleClick.canceled += instance.OnMiddleClick; - @RightClick.started += instance.OnRightClick; - @RightClick.performed += instance.OnRightClick; - @RightClick.canceled += instance.OnRightClick; - @TrackedDevicePosition.started += instance.OnTrackedDevicePosition; - @TrackedDevicePosition.performed += instance.OnTrackedDevicePosition; - @TrackedDevicePosition.canceled += instance.OnTrackedDevicePosition; - @TrackedDeviceOrientation.started += instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.performed += instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.canceled += instance.OnTrackedDeviceOrientation; - } + foreach (var item in m_Wrapper.m_UIActionsCallbackInterfaces) + UnregisterCallbacks(item); + m_Wrapper.m_UIActionsCallbackInterfaces.Clear(); + AddCallbacks(instance); } } public UIActions @UI => new UIActions(this); diff --git a/Assets/Materials/ColliderIndicator.mat b/Assets/Materials/ColliderIndicator.mat index 75fcde9..551e8f0 100644 --- a/Assets/Materials/ColliderIndicator.mat +++ b/Assets/Materials/ColliderIndicator.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: @@ -25,6 +25,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ColliderIndicator m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _ENABLE_FOG_ON_TRANSPARENT @@ -43,6 +45,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,6 +125,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -151,6 +158,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 10 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -201,6 +210,8 @@ Material: - _MetallicRemapMin: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 @@ -223,9 +234,9 @@ Material: - _StencilRefGBuffer: 2 - _StencilRefMV: 32 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 1 @@ -233,6 +244,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 diff --git a/Assets/Materials/GhostMaterial.mat b/Assets/Materials/GhostMaterial.mat index 6b6966c..25effb1 100644 --- a/Assets/Materials/GhostMaterial.mat +++ b/Assets/Materials/GhostMaterial.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GhostMaterial m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _ENABLE_FOG_ON_TRANSPARENT @@ -27,6 +29,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -106,6 +109,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -135,6 +142,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 10 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -185,6 +194,8 @@ Material: - _MetallicRemapMin: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 @@ -207,9 +218,9 @@ Material: - _StencilRefGBuffer: 2 - _StencilRefMV: 32 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 1 @@ -217,6 +228,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 @@ -263,7 +275,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: diff --git a/Assets/Materials/Opaque_Blue.mat b/Assets/Materials/Opaque_Blue.mat index 745392d..49f5d3e 100644 --- a/Assets/Materials/Opaque_Blue.mat +++ b/Assets/Materials/Opaque_Blue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: @@ -25,6 +25,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Opaque_Blue m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _NORMALMAP_TANGENT_SPACE @@ -40,6 +42,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -119,6 +122,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -148,6 +155,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -198,6 +207,8 @@ Material: - _MetallicRemapMin: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 @@ -220,9 +231,9 @@ Material: - _StencilRefGBuffer: 10 - _StencilRefMV: 40 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 @@ -230,6 +241,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 diff --git a/Assets/Materials/Opaque_Gray.mat b/Assets/Materials/Opaque_Gray.mat index 640bcb8..172a3cf 100644 --- a/Assets/Materials/Opaque_Gray.mat +++ b/Assets/Materials/Opaque_Gray.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Opaque_Gray m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _NORMALMAP_TANGENT_SPACE @@ -24,6 +26,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -135,6 +138,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -164,6 +171,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -220,6 +229,8 @@ Material: - _Mode: 0 - _NormalMapSpace: 0 - _NormalScale: 1.24 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OcclusionStrength: 1 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 @@ -246,9 +257,9 @@ Material: - _StencilRefGBuffer: 10 - _StencilRefMV: 40 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 @@ -256,6 +267,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 @@ -303,7 +315,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: diff --git a/Assets/Materials/Opaque_Red.mat b/Assets/Materials/Opaque_Red.mat index 9865554..4f0ab4a 100644 --- a/Assets/Materials/Opaque_Red.mat +++ b/Assets/Materials/Opaque_Red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: @@ -25,6 +25,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Opaque_Red m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _NORMALMAP_TANGENT_SPACE @@ -40,6 +42,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -119,6 +122,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -148,6 +155,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -198,6 +207,8 @@ Material: - _MetallicRemapMin: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 @@ -220,9 +231,9 @@ Material: - _StencilRefGBuffer: 10 - _StencilRefMV: 40 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 @@ -230,6 +241,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 diff --git a/Assets/Materials/Transparent_Green.mat b/Assets/Materials/Transparent_Green.mat index 611c253..7fb8f49 100644 --- a/Assets/Materials/Transparent_Green.mat +++ b/Assets/Materials/Transparent_Green.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} m_Name: m_EditorClassIdentifier: - version: 12 + version: 13 hdPluginSubTargetMaterialVersions: m_Keys: [] m_Values: @@ -25,6 +25,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Transparent_Green m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT - _ENABLE_FOG_ON_TRANSPARENT @@ -43,6 +45,7 @@ Material: - TransparentBackface - RayTracingPrepass - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,6 +125,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TransmittanceColorMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -151,6 +158,8 @@ Material: - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 10 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 - _AlphaToMask: 0 - _AlphaToMaskInspectorValue: 0 @@ -201,6 +210,8 @@ Material: - _MetallicRemapMin: 0 - _NormalMapSpace: 0 - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 - _OpaqueCullMode: 2 - _PPDLodThreshold: 5 - _PPDMaxSamples: 15 @@ -223,9 +234,9 @@ Material: - _StencilRefGBuffer: 2 - _StencilRefMV: 32 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 1 @@ -233,6 +244,7 @@ Material: - _TexWorldScaleEmissive: 1 - _Thickness: 1 - _TransmissionEnable: 1 + - _TransmissionMask: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 diff --git a/Assets/Packages/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset b/Assets/Packages/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset index fd16943..f2dec16 100644 --- a/Assets/Packages/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset +++ b/Assets/Packages/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset @@ -46,6 +46,24 @@ MonoBehaviour: m_SampleCount: m_OverrideState: 1 m_Value: 8 +--- !u!114 &-1793858814174886103 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a7ff42a8c5be6646ad3975f3a54c1eb, type: 3} + m_Name: DiffusionProfileList + m_EditorClassIdentifier: + active: 1 + diffusionProfiles: + m_OverrideState: 1 + m_Value: + - {fileID: 11400000, guid: eceab268f6a04e749af041e5e365872a, type: 2} + - {fileID: 11400000, guid: 3370ac1ab02538142af9851e66038745, type: 2} --- !u!114 &-1016694868962581565 MonoBehaviour: m_ObjectHideFlags: 3 @@ -117,6 +135,7 @@ MonoBehaviour: - {fileID: 1932259527246508038} - {fileID: 448115243408767295} - {fileID: -7089757308646879465} + - {fileID: -1793858814174886103} --- !u!114 &448115243408767295 MonoBehaviour: m_ObjectHideFlags: 3 @@ -143,10 +162,10 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 1 upperHemisphereLuxValue: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0.4660715 upperHemisphereLuxColor: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: {x: 0.18750614, y: 0.29181972, z: 0.5} desiredLuxValue: m_OverrideState: 0 @@ -511,6 +530,9 @@ MonoBehaviour: m_Value: serializedVersion: 2 m_Bits: 4294967295 + specularOcclusion: + m_OverrideState: 0 + m_Value: 0.5 occluderMotionRejection: m_OverrideState: 0 m_Value: 1 @@ -560,6 +582,9 @@ MonoBehaviour: mode: m_OverrideState: 1 m_Value: 2 + useFullACES: + m_OverrideState: 0 + m_Value: 0 toeStrength: m_OverrideState: 0 m_Value: 0 @@ -584,6 +609,33 @@ MonoBehaviour: lutContribution: m_OverrideState: 0 m_Value: 1 + neutralHDRRangeReductionMode: + m_OverrideState: 0 + m_Value: 2 + acesPreset: + m_OverrideState: 0 + m_Value: 3 + fallbackMode: + m_OverrideState: 0 + m_Value: 1 + hueShiftAmount: + m_OverrideState: 0 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 0 + m_Value: 0 + paperWhite: + m_OverrideState: 0 + m_Value: 300 + detectBrightnessLimits: + m_OverrideState: 0 + m_Value: 1 + minNits: + m_OverrideState: 0 + m_Value: 0.005 + maxNits: + m_OverrideState: 0 + m_Value: 1000 --- !u!114 &7686318427622180703 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Packages/manifest.json b/Packages/manifest.json index a9c4ced..bd04add 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,19 +1,20 @@ { "dependencies": { - "com.unity.collab-proxy": "1.17.2", + "com.unity.ai.navigation": "1.1.4", + "com.unity.collab-proxy": "2.0.7", "com.unity.feature.development": "1.0.1", - "com.unity.ide.rider": "3.0.15", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.rider": "3.0.24", + "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.4.2", - "com.unity.render-pipelines.high-definition": "12.1.7", - "com.unity.test-framework": "1.1.31", + "com.unity.inputsystem": "1.7.0", + "com.unity.render-pipelines.high-definition": "14.0.8", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.7.5", "com.unity.ugui": "1.0.0", "com.unity.ui": "2.0.0", "com.unity.ui.builder": "2.0.0", - "com.unity.visualscripting": "1.7.8", + "com.unity.visualscripting": "1.9.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 2ab3c5f..6b3300a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,16 @@ { "dependencies": { + "com.unity.ai.navigation": { + "version": "1.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { - "version": "1.6.6", + "version": "1.8.8", "depth": 1, "source": "registry", "dependencies": { @@ -10,12 +19,10 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.17.2", + "version": "2.0.7", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.editorcoroutines": { @@ -37,17 +44,17 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.16", - "com.unity.ide.rider": "3.0.15", + "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ide.rider": "3.0.24", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", - "com.unity.performance.profile-analyzer": "1.1.1", - "com.unity.test-framework": "1.1.31", - "com.unity.testtools.codecoverage": "1.0.1" + "com.unity.performance.profile-analyzer": "1.2.2", + "com.unity.test-framework": "1.1.33", + "com.unity.testtools.codecoverage": "1.2.4" } }, "com.unity.ide.rider": { - "version": "3.0.15", + "version": "3.0.24", "depth": 0, "source": "registry", "dependencies": { @@ -56,7 +63,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -72,7 +79,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.4.2", + "version": "1.7.0", "depth": 0, "source": "registry", "dependencies": { @@ -87,91 +94,74 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.performance.profile-analyzer": { - "version": "1.1.1", + "version": "1.2.2", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.high-definition": { - "version": "12.1.7", + "version": "14.0.8", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.4", - "com.unity.burst": "1.6.0", + "com.unity.burst": "1.8.4", "com.unity.modules.video": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.render-pipelines.core": "12.1.7", - "com.unity.shadergraph": "12.1.7", - "com.unity.visualeffectgraph": "12.1.7", - "com.unity.render-pipelines.high-definition-config": "12.1.7" + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.shadergraph": "14.0.8", + "com.unity.visualeffectgraph": "14.0.8", + "com.unity.render-pipelines.high-definition-config": "14.0.8" } }, "com.unity.render-pipelines.high-definition-config": { - "version": "12.1.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.7" + "com.unity.render-pipelines.core": "14.0.8" } }, "com.unity.searcher": { - "version": "4.9.1", + "version": "4.9.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.services.core": { - "version": "1.4.2", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.settings-manager": { - "version": "1.0.3", + "version": "2.0.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.7", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -182,7 +172,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.0.1", + "version": "1.2.4", "depth": 1, "source": "registry", "dependencies": { @@ -201,7 +191,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.5", "depth": 0, "source": "registry", "dependencies": { @@ -234,16 +224,16 @@ "dependencies": {} }, "com.unity.visualeffectgraph": { - "version": "12.1.7", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.shadergraph": "12.1.7", - "com.unity.render-pipelines.core": "12.1.7" + "com.unity.shadergraph": "14.0.8", + "com.unity.render-pipelines.core": "14.0.8" } }, "com.unity.visualscripting": { - "version": "1.7.8", + "version": "1.9.0", "depth": 0, "source": "registry", "dependencies": { @@ -384,17 +374,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json new file mode 100644 index 0000000..58cf25f --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -0,0 +1,18 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json new file mode 100644 index 0000000..0293daf --- /dev/null +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -0,0 +1,6 @@ +{ + "MonoBehaviour": { + "Version": 4, + "DisabledWarnings": "" + } +} diff --git a/ProjectSettings/HDRPProjectSettings.asset b/ProjectSettings/HDRPProjectSettings.asset index 06c298f..6fb2e80 100644 --- a/ProjectSettings/HDRPProjectSettings.asset +++ b/ProjectSettings/HDRPProjectSettings.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_ProjectSettingFolderPath: HDRPDefaultResources m_WizardPopupAtStart: 0 - m_LastMaterialVersion: 12 + m_LastMaterialVersion: 13 m_HDShaderGraphLastSeenVersion: 0 m_PluginMaterialVersions: m_Keys: [] diff --git a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json index ad11087..3c7b4c1 100644 --- a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json +++ b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json @@ -1,6 +1,4 @@ { - "m_Name": "Settings", - "m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json", "m_Dictionary": { "m_DictionaryValues": [] } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index be3711b..2c71d59 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: d003377464fe2f043a1d84fa3cee25a6 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -85,6 +86,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -119,8 +121,12 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,14 +134,10 @@ PlayerSettings: vulkanEnablePreTransform: 1 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: 2f27ffbbbd54d9c4b9435071982af520, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -147,7 +149,7 @@ PlayerSettings: enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -157,6 +159,7 @@ PlayerSettings: applicationIdentifier: {} buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 @@ -174,12 +177,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -227,8 +233,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -243,6 +251,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -250,6 +259,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -263,7 +273,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -286,6 +295,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -337,6 +347,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -358,7 +370,21 @@ PlayerSettings: m_EncodingQuality: 2 - m_BuildTarget: Windows Store Apps m_EncodingQuality: 2 + m_BuildTargetGroupHDRCubemapEncodingQuality: + - m_BuildTarget: Android + m_EncodingQuality: 2 + - m_BuildTarget: iPhone + m_EncodingQuality: 1 + - m_BuildTarget: tvOS + m_EncodingQuality: 1 + - m_BuildTarget: Standalone + m_EncodingQuality: 2 + - m_BuildTarget: Lumin + m_EncodingQuality: 1 + - m_BuildTarget: Windows Store Apps + m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: - m_BuildTarget: Android m_Encoding: 1 @@ -379,6 +405,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -386,10 +413,12 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 switchUseGOLDLinker: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -463,7 +492,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -505,6 +533,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -517,6 +546,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -604,6 +634,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -616,21 +647,41 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -703,8 +754,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 1 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -712,6 +769,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8ea1b85..88bb9cf 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.11f1 -m_EditorVersionWithRevision: 2021.3.11f1 (0a5ca18544bf) +m_EditorVersion: 2022.3.10f1 +m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 0505fe1..9549fd2 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -6,7 +6,7 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 5 m_QualitySettings: - - serializedVersion: 2 + - serializedVersion: 3 name: Very Low pixelLightCount: 0 shadows: 0 @@ -19,16 +19,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 1 - textureQuality: 1 + globalTextureMipmapLimit: 1 + textureMipmapLimitSettings: [] anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.3 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -41,8 +45,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Low pixelLightCount: 0 shadows: 0 @@ -55,16 +68,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 2 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.4 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -77,8 +94,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Medium pixelLightCount: 1 shadows: 1 @@ -91,16 +117,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 2 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 25 lodBias: 0.7 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -113,8 +143,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: High pixelLightCount: 2 shadows: 2 @@ -127,16 +166,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 skinWeights: 2 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 50 lodBias: 1 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -149,8 +192,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Very High pixelLightCount: 3 shadows: 2 @@ -163,16 +215,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 skinWeights: 4 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 50 lodBias: 1.5 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -185,8 +241,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Ultra pixelLightCount: 4 shadows: 2 @@ -199,16 +264,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 skinWeights: 4 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 2 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 100 lodBias: 1 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -221,7 +290,17 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 0} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] + m_TextureMipmapLimitGroupNames: [] m_PerPlatformDefaultQuality: Android: 2 Lumin: 5 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset index b004c5e..87823a9 100644 --- a/ProjectSettings/VFXManager.asset +++ b/ProjectSettings/VFXManager.asset @@ -10,6 +10,8 @@ VFXManager: m_RenderPipeSettingsPath: m_FixedTimeStep: 0.016666668 m_MaxDeltaTime: 0.05 - m_CompiledVersion: 4 - m_RuntimeVersion: 22 + m_MaxScrubTime: 30 + m_CompiledVersion: 7 + m_RuntimeVersion: 35 m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2} + m_BatchEmptyLifetime: 300 diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29..0000000