From 28125eb382e3b42bb7de1d2131eabcff392dbfde Mon Sep 17 00:00:00 2001 From: ThomasCharester Date: Fri, 27 Feb 2026 14:16:48 +0300 Subject: [PATCH] Boar --- .idea/.idea.Infra/.idea/workspace.xml | 78 +----- .../Example/Platformer/Entity/Enemies/Boar.cs | 59 ++++ .../Platformer/Entity/Enemies/Boar.cs.meta | 3 + .../Platformer/Entity/Enemies/BoarRadar.cs | 19 ++ .../Entity/Enemies/BoarRadar.cs.meta | 3 + .../Assets/Buildings_0Tilemap.asset | 36 +++ .../Assets/Buildings_0Tilemap.asset.meta | 8 + .../Assets/Buildings_1Tilemap.asset | 36 +++ .../Assets/Buildings_1Tilemap.asset.meta | 8 + .../Platformer/Assets/New Palette.prefab | 189 +++++++++++++ .../Platformer/Assets/New Palette.prefab.meta | 7 + .../Example/Platformer/New Palette.prefab | 263 ++++++++++++++++++ .../Platformer/New Palette.prefab.meta | 7 + .../Example/Platformer/Boar.prefab | 125 ++++++++- .../Example/Platformer/Platformer.unity | 144 +++++++--- ...niversalRenderPipelineGlobalSettings.asset | 38 +-- Packages/manifest.json | 10 +- Packages/packages-lock.json | 18 +- ProjectSettings/ProjectVersion.txt | 4 +- 19 files changed, 912 insertions(+), 143 deletions(-) create mode 100644 Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs create mode 100644 Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs.meta create mode 100644 Assets/Code/Example/Platformer/Entity/Enemies/BoarRadar.cs create mode 100644 Assets/Code/Example/Platformer/Entity/Enemies/BoarRadar.cs.meta create mode 100644 Assets/Resources/Example/Platformer/Assets/Buildings_0Tilemap.asset create mode 100644 Assets/Resources/Example/Platformer/Assets/Buildings_0Tilemap.asset.meta create mode 100644 Assets/Resources/Example/Platformer/Assets/Buildings_1Tilemap.asset create mode 100644 Assets/Resources/Example/Platformer/Assets/Buildings_1Tilemap.asset.meta create mode 100644 Assets/Resources/Example/Platformer/Assets/New Palette.prefab create mode 100644 Assets/Resources/Example/Platformer/Assets/New Palette.prefab.meta create mode 100644 Assets/Resources/Example/Platformer/New Palette.prefab create mode 100644 Assets/Resources/Example/Platformer/New Palette.prefab.meta diff --git a/.idea/.idea.Infra/.idea/workspace.xml b/.idea/.idea.Infra/.idea/workspace.xml index cd5a35f..e90ea2c 100644 --- a/.idea/.idea.Infra/.idea/workspace.xml +++ b/.idea/.idea.Infra/.idea/workspace.xml @@ -5,73 +5,18 @@ + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - - - + diff --git a/Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs b/Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs new file mode 100644 index 0000000..7ad5b21 --- /dev/null +++ b/Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs @@ -0,0 +1,59 @@ +using Code.Infrastructure.Configs; +using UnityEngine; + +namespace Code.Example.Platformer.Entity.Enemies +{ + public class Boar : Entity + { + [SerializeField] private Vector2 groundLeft; + [SerializeField] private Vector2 groundRight; + private bool _directionRight; + + private float _acceleration = 3f; + + protected override void Move() + { + + if (_target) + { + _directionRight = (transform.position - _target.position).magnitude < float.Epsilon; + CheckupDirection(); + + rigidbody2D.linearVelocityX = _directionRight ? 0.5f : -0.5f; + rigidbody2D.linearVelocity *= _acceleration; + } + else + { + CheckupDirection(); + + rigidbody2D.linearVelocityX = _directionRight ? 0.5f : -0.5f; + } + } + + protected override void HandleFlipX() => spriteRenderer.flipX = rigidbody2D.linearVelocity.x > -0.01f; + + private void CheckupDirection() + { + if (_directionRight) + { + if (!Physics2D.OverlapPoint((Vector2)transform.position + groundRight, + LayerMasks.Masks[LayerMaskType.PlatformerGround])) + _directionRight = false; + } + else if (!Physics2D.OverlapPoint((Vector2)transform.position + groundLeft, + LayerMasks.Masks[LayerMaskType.PlatformerGround])) + _directionRight = true; + } + + private Transform _target; + + public void GotTarget(Transform target) + { + _target = target; + } + public void LostTarget() + { + _target = null; + } + } +} \ No newline at end of file diff --git a/Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs.meta b/Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs.meta new file mode 100644 index 0000000..b9c8963 --- /dev/null +++ b/Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8a21daf0f518490daeacea92cc2dee2d +timeCreated: 1772187830 \ No newline at end of file diff --git a/Assets/Code/Example/Platformer/Entity/Enemies/BoarRadar.cs b/Assets/Code/Example/Platformer/Entity/Enemies/BoarRadar.cs new file mode 100644 index 0000000..4f7db11 --- /dev/null +++ b/Assets/Code/Example/Platformer/Entity/Enemies/BoarRadar.cs @@ -0,0 +1,19 @@ +using UnityEngine; + +namespace Code.Example.Platformer.Entity.Enemies +{ + public class BoarRadar : MonoBehaviour + { + [SerializeField] private Boar boar; + + private void OnTriggerEnter2D(Collider2D other) + { + boar.GotTarget(other.transform); + } + + private void OnTriggerExit2D(Collider2D other) + { + boar.LostTarget(); + } + } +} \ No newline at end of file diff --git a/Assets/Code/Example/Platformer/Entity/Enemies/BoarRadar.cs.meta b/Assets/Code/Example/Platformer/Entity/Enemies/BoarRadar.cs.meta new file mode 100644 index 0000000..0cbb3bb --- /dev/null +++ b/Assets/Code/Example/Platformer/Entity/Enemies/BoarRadar.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e0976ba0c1904671ac17f194f8694aa1 +timeCreated: 1772187891 \ No newline at end of file diff --git a/Assets/Resources/Example/Platformer/Assets/Buildings_0Tilemap.asset b/Assets/Resources/Example/Platformer/Assets/Buildings_0Tilemap.asset new file mode 100644 index 0000000..e6fd1e7 --- /dev/null +++ b/Assets/Resources/Example/Platformer/Assets/Buildings_0Tilemap.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buildings_0Tilemap + m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.Tilemaps.Tile + m_Sprite: {fileID: -1902027194, guid: 6b7c943308e1fcdd5b986969ed12d0ae, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Resources/Example/Platformer/Assets/Buildings_0Tilemap.asset.meta b/Assets/Resources/Example/Platformer/Assets/Buildings_0Tilemap.asset.meta new file mode 100644 index 0000000..a6f0b7c --- /dev/null +++ b/Assets/Resources/Example/Platformer/Assets/Buildings_0Tilemap.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb0913ddc348c8d47b3da07d98b7a26a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Example/Platformer/Assets/Buildings_1Tilemap.asset b/Assets/Resources/Example/Platformer/Assets/Buildings_1Tilemap.asset new file mode 100644 index 0000000..05aca57 --- /dev/null +++ b/Assets/Resources/Example/Platformer/Assets/Buildings_1Tilemap.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buildings_1Tilemap + m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.Tilemaps.Tile + m_Sprite: {fileID: 1559098395, guid: 6b7c943308e1fcdd5b986969ed12d0ae, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Resources/Example/Platformer/Assets/Buildings_1Tilemap.asset.meta b/Assets/Resources/Example/Platformer/Assets/Buildings_1Tilemap.asset.meta new file mode 100644 index 0000000..3c617d8 --- /dev/null +++ b/Assets/Resources/Example/Platformer/Assets/Buildings_1Tilemap.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4f50621628629af4990c1130d4047f43 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Example/Platformer/Assets/New Palette.prefab b/Assets/Resources/Example/Platformer/Assets/New Palette.prefab new file mode 100644 index 0000000..15aba26 --- /dev/null +++ b/Assets/Resources/Example/Platformer/Assets/New Palette.prefab @@ -0,0 +1,189 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3294697580985394099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2677405102895797167} + - component: {fileID: 639411098736327442} + m_Layer: 0 + m_Name: New Palette + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2677405102895797167 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3294697580985394099} + 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: + - {fileID: 3477883521721161683} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &639411098736327442 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3294697580985394099} + m_Enabled: 1 + m_CellSize: {x: 0.61, y: 0.37, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!1 &5205507394775400102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3477883521721161683} + - component: {fileID: 5740991628300004005} + - component: {fileID: 2943647790425459606} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3477883521721161683 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5205507394775400102} + 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: 2677405102895797167} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &5740991628300004005 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5205507394775400102} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!483693784 &2943647790425459606 +TilemapRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5205507394775400102} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 +--- !u!114 &8780318962224839736 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12395, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Palette Settings + m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.GridPalette + cellSizing: 100 + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} diff --git a/Assets/Resources/Example/Platformer/Assets/New Palette.prefab.meta b/Assets/Resources/Example/Platformer/Assets/New Palette.prefab.meta new file mode 100644 index 0000000..b0fdc6e --- /dev/null +++ b/Assets/Resources/Example/Platformer/Assets/New Palette.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 201e2fb5c31b4aa468f77144833df1cc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Example/Platformer/New Palette.prefab b/Assets/Resources/Example/Platformer/New Palette.prefab new file mode 100644 index 0000000..e25938d --- /dev/null +++ b/Assets/Resources/Example/Platformer/New Palette.prefab @@ -0,0 +1,263 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &414249419208788077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7224473901867070023} + - component: {fileID: 6464760446734177124} + m_Layer: 0 + m_Name: New Palette + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7224473901867070023 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414249419208788077} + 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: + - {fileID: 4222138864514643433} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &6464760446734177124 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414249419208788077} + m_Enabled: 1 + m_CellSize: {x: 0.8, y: 0.67, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!1 &1641056797123392291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4222138864514643433} + - component: {fileID: 5514333813687002491} + - component: {fileID: 6032778158222718758} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4222138864514643433 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1641056797123392291} + 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: 7224473901867070023} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &5514333813687002491 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1641056797123392291} + m_Enabled: 1 + m_Tiles: + - first: {x: -3, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 5 + m_Data: {fileID: 11400000, guid: bb0913ddc348c8d47b3da07d98b7a26a, type: 2} + m_TileSpriteArray: + - m_RefCount: 5 + m_Data: {fileID: -1902027194, guid: 6b7c943308e1fcdd5b986969ed12d0ae, type: 3} + m_TileMatrixArray: + - m_RefCount: 5 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 5 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: -3, y: 0, z: 0} + m_Size: {x: 4, y: 2, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!483693784 &6032778158222718758 +TilemapRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1641056797123392291} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 +--- !u!114 &5465318034645326854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12395, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Palette Settings + m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.GridPalette + cellSizing: 0 + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} diff --git a/Assets/Resources/Example/Platformer/New Palette.prefab.meta b/Assets/Resources/Example/Platformer/New Palette.prefab.meta new file mode 100644 index 0000000..6b9e89c --- /dev/null +++ b/Assets/Resources/Example/Platformer/New Palette.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b29fed0b0c489d7428b3236c255c13ae +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/Example/Platformer/Boar.prefab b/Assets/Resources_moved/Example/Platformer/Boar.prefab index 1feb4f4..b82b0d6 100644 --- a/Assets/Resources_moved/Example/Platformer/Boar.prefab +++ b/Assets/Resources_moved/Example/Platformer/Boar.prefab @@ -1,5 +1,97 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2693549777469202377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6109117451541308529} + - component: {fileID: 400377387351889233} + - component: {fileID: 5873333687156324869} + m_Layer: 12 + m_Name: Radar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6109117451541308529 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2693549777469202377} + 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: 2972276770558329035} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &400377387351889233 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2693549777469202377} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 2.29, y: 0.33} + m_EdgeRadius: 0 +--- !u!114 &5873333687156324869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2693549777469202377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0976ba0c1904671ac17f194f8694aa1, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Example.Platformer.Entity.Enemies.BoarRadar + boar: {fileID: 5713908768014139622} --- !u!1 &3564754929267664154 GameObject: m_ObjectHideFlags: 0 @@ -13,7 +105,8 @@ GameObject: - component: {fileID: 1129769932863891170} - component: {fileID: 8711850399479606103} - component: {fileID: -3155582984912602300} - m_Layer: 0 + - component: {fileID: 5713908768014139622} + m_Layer: 11 m_Name: Boar m_TagString: Untagged m_Icon: {fileID: 0} @@ -32,7 +125,8 @@ Transform: m_LocalPosition: {x: 1.2501534, y: -0.28699002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6109117451541308529} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7973072655843182893 @@ -138,7 +232,7 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 0.39, y: 0.275} + m_Size: {x: 0.385, y: 0.275} m_EdgeRadius: 0 --- !u!50 &8711850399479606103 Rigidbody2D: @@ -151,8 +245,8 @@ Rigidbody2D: m_BodyType: 0 m_Simulated: 1 m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 0.10725 + m_UseAutoMass: 1 + m_Mass: 0.861575 m_LinearDamping: 0 m_AngularDamping: 0.05 m_GravityScale: 1 @@ -178,7 +272,7 @@ Animator: m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6cb3f78c39e95193882187241fd38a34, type: 2} - m_CullingMode: 0 + m_CullingMode: 2 m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 @@ -189,3 +283,22 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &5713908768014139622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3564754929267664154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a21daf0f518490daeacea92cc2dee2d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Example.Platformer.Entity.Enemies.Boar + rigidbody2D: {fileID: 8711850399479606103} + animator: {fileID: -3155582984912602300} + spriteRenderer: {fileID: 7973072655843182893} + groundPoint: {x: 0, y: 0} + groundLeft: {x: 0, y: 0} + groundRight: {x: 0, y: 0} + _directionRight: 0 diff --git a/Assets/Resources_moved/Example/Platformer/Platformer.unity b/Assets/Resources_moved/Example/Platformer/Platformer.unity index 5290a95..ca72723 100644 --- a/Assets/Resources_moved/Example/Platformer/Platformer.unity +++ b/Assets/Resources_moved/Example/Platformer/Platformer.unity @@ -218,6 +218,8 @@ GameObject: - component: {fileID: 494311810} - component: {fileID: 494311812} - component: {fileID: 494311811} + - component: {fileID: 494311814} + - component: {fileID: 494311813} m_Layer: 9 m_Name: Buildings_0 (3) m_TagString: Untagged @@ -234,7 +236,7 @@ Transform: m_GameObject: {fileID: 494311809} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.406, y: 0, z: 0} + m_LocalPosition: {x: -2.407, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -272,7 +274,7 @@ BoxCollider2D: m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_CompositeOperation: 0 + m_CompositeOperation: 1 m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: @@ -345,6 +347,92 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!66 &494311813 +CompositeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494311809} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_GeometryType: 0 + m_GenerationType: 0 + m_EdgeRadius: 0 + m_ColliderPaths: + - m_Collider: {fileID: 494311811} + m_ColliderPaths: + - - X: 4000000 + Y: 3350000 + - X: -4000000 + Y: 3350000 + - X: -4000000 + Y: -3350000 + - X: 4000000 + Y: -3350000 + m_CompositePaths: + m_Paths: + - - {x: 0.3999707, y: -0.335} + - {x: 0.3999707, y: 0.335} + - {x: -0.4, y: 0.3349707} + - {x: -0.3999707, y: -0.335} + m_VertexDistance: 0.0005 + m_OffsetDistance: 0.00005 + m_UseDelaunayMesh: 0 + m_CompositeGameObject: {fileID: 494311809} +--- !u!50 &494311814 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 494311809} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &595108273 GameObject: m_ObjectHideFlags: 0 @@ -1062,34 +1150,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1129769932863891170, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} - propertyPath: m_Size.x - value: 0.385 - objectReference: {fileID: 0} - - target: {fileID: 1129769932863891170, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} - propertyPath: m_Offset.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1129769932863891170, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} - propertyPath: m_Offset.y - value: -0.025 - objectReference: {fileID: 0} - - target: {fileID: 1129769932863891170, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1129769932863891170, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1129769932863891170, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.48 - objectReference: {fileID: 0} - - target: {fileID: 1129769932863891170, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.32 - objectReference: {fileID: 0} - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} propertyPath: m_LocalPosition.x value: -0.283 @@ -1134,13 +1194,25 @@ PrefabInstance: propertyPath: m_Name value: Boar objectReference: {fileID: 0} - - target: {fileID: 3564754929267664154, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} - propertyPath: m_Layer - value: 11 + - target: {fileID: 5713908768014139622, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} + propertyPath: groundLeft.x + value: -0.3 objectReference: {fileID: 0} - - target: {fileID: 8711850399479606103, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} - propertyPath: m_Simulated - value: 0 + - target: {fileID: 5713908768014139622, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} + propertyPath: groundLeft.y + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 5713908768014139622, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} + propertyPath: groundPoint.y + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 5713908768014139622, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} + propertyPath: groundRight.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 5713908768014139622, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3} + propertyPath: groundRight.y + value: -0.4 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 6c08d35..c9a8734 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -65,23 +65,11 @@ MonoBehaviour: - rid: 5565511524147789833 - rid: 5565511524147789834 - rid: 5565511524147789835 + - rid: 4361253075305103360 + - rid: 4361253075305103361 m_RuntimeSettings: - m_List: - - rid: 6852985685364965378 - - rid: 6852985685364965379 - - rid: 6852985685364965380 - - rid: 6852985685364965381 - - rid: 6852985685364965384 - - rid: 6852985685364965385 - - rid: 6852985685364965392 - - rid: 6852985685364965394 - - rid: 8712630790384254976 - - rid: 5565511524147789825 - - rid: 5565511524147789826 - - rid: 5565511524147789829 - - rid: 5565511524147789833 - - rid: 5565511524147789835 - m_AssetVersion: 9 + m_List: [] + m_AssetVersion: 10 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: - Light Layer default @@ -111,6 +99,18 @@ MonoBehaviour: references: version: 2 RefIds: + - rid: 4361253075305103360 + type: {class: URPTerrainShaderSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_IncludeTerrainShaders: 1 + - rid: 4361253075305103361 + type: {class: UniversalRenderPipelineRuntimeTerrainShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} - rid: 5565511524147789824 type: {class: RayTracingRenderPipelineResources, ns: UnityEngine.Rendering.UnifiedRayTracing, asm: Unity.UnifiedRayTracing.Runtime} data: @@ -276,9 +276,9 @@ MonoBehaviour: m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} + m_TerrainDetailLit: {fileID: 0} + m_TerrainDetailGrassBillboard: {fileID: 0} + m_TerrainDetailGrass: {fileID: 0} - rid: 6852985685364965381 type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: diff --git a/Packages/manifest.json b/Packages/manifest.json index 27faed7..96ab5c5 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,13 +5,13 @@ "com.gustavopsantos.reflex": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#14.1.0", "com.kyrylokuzyk.primetween": "file:../Assets/Plugins/PrimeTween/internal/com.kyrylokuzyk.primetween.tgz", "com.unity.2d.sprite": "1.0.0", - "com.unity.addressables": "2.8.0", - "com.unity.ai.navigation": "2.0.9", + "com.unity.addressables": "2.9.0", + "com.unity.ai.navigation": "2.0.10", "com.unity.cinemachine": "3.1.5", - "com.unity.collab-proxy": "2.11.2", + "com.unity.collab-proxy": "2.11.3", "com.unity.feature.2d": "2.0.2", - "com.unity.ide.rider": "3.0.38", - "com.unity.inputsystem": "1.17.0", + "com.unity.ide.rider": "3.0.39", + "com.unity.inputsystem": "1.18.0", "com.unity.multiplayer.center": "1.0.1", "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.render-pipelines.universal": "17.3.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b8610d7..dcb48d9 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -136,7 +136,7 @@ "url": "https://packages.unity.com" }, "com.unity.addressables": { - "version": "2.8.0", + "version": "2.9.0", "depth": 0, "source": "registry", "dependencies": { @@ -146,13 +146,13 @@ "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "2.5.1", + "com.unity.scriptablebuildpipeline": "2.6.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.ai.navigation": { - "version": "2.0.9", + "version": "2.0.10", "depth": 0, "source": "registry", "dependencies": { @@ -161,7 +161,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.27", + "version": "1.8.28", "depth": 2, "source": "registry", "dependencies": { @@ -181,7 +181,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.11.2", + "version": "2.11.3", "depth": 0, "source": "registry", "dependencies": {}, @@ -223,7 +223,7 @@ } }, "com.unity.ide.rider": { - "version": "3.0.38", + "version": "3.0.39", "depth": 0, "source": "registry", "dependencies": { @@ -232,7 +232,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.17.0", + "version": "1.18.0", "depth": 0, "source": "registry", "dependencies": { @@ -309,7 +309,7 @@ } }, "com.unity.scriptablebuildpipeline": { - "version": "2.5.1", + "version": "2.6.0", "depth": 1, "source": "registry", "dependencies": { @@ -342,7 +342,7 @@ } }, "com.unity.splines": { - "version": "2.8.2", + "version": "2.8.3", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ee8469e..3d1aea2 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.3.5f2 -m_EditorVersionWithRevision: 6000.3.5f2 (3fa8bc678cb0) +m_EditorVersion: 6000.3.10f1 +m_EditorVersionWithRevision: 6000.3.10f1 (e35f0c77bd8e)