diff --git a/Assets/Material/Zone/MZone_Blue.mat b/Assets/Material/Zone/MZone_Blue.mat index 54731b93..98b7fc89 100644 --- a/Assets/Material/Zone/MZone_Blue.mat +++ b/Assets/Material/Zone/MZone_Blue.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Material/Zone/MZone_Gray.mat b/Assets/Material/Zone/MZone_Gray.mat index 1388fc4a..a1111deb 100644 --- a/Assets/Material/Zone/MZone_Gray.mat +++ b/Assets/Material/Zone/MZone_Gray.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Material/Zone/MZone_Green.mat b/Assets/Material/Zone/MZone_Green.mat index 8545c66d..6a45b70e 100644 --- a/Assets/Material/Zone/MZone_Green.mat +++ b/Assets/Material/Zone/MZone_Green.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Material/Zone/MZone_Red.mat b/Assets/Material/Zone/MZone_Red.mat index 0e75a67a..8a657ae4 100644 --- a/Assets/Material/Zone/MZone_Red.mat +++ b/Assets/Material/Zone/MZone_Red.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Material/Zone/MZone_Yellow.mat b/Assets/Material/Zone/MZone_Yellow.mat index 72b3322b..b7ee789e 100644 --- a/Assets/Material/Zone/MZone_Yellow.mat +++ b/Assets/Material/Zone/MZone_Yellow.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Scripts/Global/TileManagment.cs b/Assets/Scripts/Global/TileManagment.cs index 353b5319..c495243d 100644 --- a/Assets/Scripts/Global/TileManagment.cs +++ b/Assets/Scripts/Global/TileManagment.cs @@ -2,9 +2,15 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Jobs; +using Unity.Collections; +using Unity.Burst; +using Unity.Jobs; +using Unity.Mathematics; +[BurstCompile] public class TileManagment : MonoBehaviour -{ +{ public const int BASIC_DIRECTIONS = 6; public static List levelTiles = new List(); @@ -464,7 +470,7 @@ public class TileManagment : MonoBehaviour return connectedTiles; } - + public static void CheckIfSurroundedByOwner(List tiles, TileOwner ownerIndex, TileInfo startTile) { List connectedTiles = new List(); diff --git a/Assets/Scripts/TileMovement.cs b/Assets/Scripts/TileMovement.cs index 43a2f411..c954b8cd 100644 --- a/Assets/Scripts/TileMovement.cs +++ b/Assets/Scripts/TileMovement.cs @@ -93,7 +93,7 @@ public class TileMovement : MonoBehaviour _playerState.targetMoveTile = targetMoveTile; _playerState.targetMoveTile.canMove = false; _playerState.currentTile.canMove = true; - + //Debug.Log("wtf"); moveVFX.Play(); } diff --git a/Packages/manifest.json b/Packages/manifest.json index b126bbfb..fd5d1a1d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", + "com.unity.burst": "1.4.11", "com.unity.cinemachine": "2.6.5", "com.unity.collab-proxy": "1.5.7", "com.unity.device-simulator": "3.0.1-preview", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 56ac681a..932b769a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -6,6 +6,15 @@ "source": "builtin", "dependencies": {} }, + "com.unity.burst": { + "version": "1.4.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1" + }, + "url": "https://packages.unity.com" + }, "com.unity.cinemachine": { "version": "2.6.5", "depth": 0, @@ -61,6 +70,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.mathematics": { + "version": "1.2.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.nuget.newtonsoft-json": { "version": "2.0.0", "depth": 1, diff --git a/ProjectSettings/BurstAotSettings_Android.json b/ProjectSettings/BurstAotSettings_Android.json new file mode 100644 index 00000000..751473f1 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_Android.json @@ -0,0 +1,13 @@ +{ + "MonoBehaviour": { + "Version": 3, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0 + } +} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index cd7cf671..dd5615ec 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -127,7 +127,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.41 + bundleVersion: 0.44 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0