diff --git a/Assets/Materials/VFX/Construction Materials/Defense Construction.mat b/Assets/Materials/VFX/Construction Materials/Defense Construction.mat index a70a5e34..9d86226d 100644 --- a/Assets/Materials/VFX/Construction Materials/Defense Construction.mat +++ b/Assets/Materials/VFX/Construction Materials/Defense Construction.mat @@ -25,7 +25,7 @@ Material: type: 3} m_ShaderKeywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: 2475 stringTagMap: diff --git a/Assets/Materials/VFX/Construction Materials/Gathering Construction.mat b/Assets/Materials/VFX/Construction Materials/Gathering Construction.mat index 5c2eb980..68c457d5 100644 --- a/Assets/Materials/VFX/Construction Materials/Gathering Construction.mat +++ b/Assets/Materials/VFX/Construction Materials/Gathering Construction.mat @@ -25,7 +25,7 @@ Material: type: 3} m_ShaderKeywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: 2475 stringTagMap: diff --git a/Assets/Materials/VFX/Construction Materials/Military Construction.mat b/Assets/Materials/VFX/Construction Materials/Military Construction.mat index 7ce4cb1d..2ddb938c 100644 --- a/Assets/Materials/VFX/Construction Materials/Military Construction.mat +++ b/Assets/Materials/VFX/Construction Materials/Military Construction.mat @@ -25,7 +25,7 @@ Material: type: 3} m_ShaderKeywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: 2475 stringTagMap: diff --git a/Assets/Materials/VFX/Construction Materials/Production Construction.mat b/Assets/Materials/VFX/Construction Materials/Production Construction.mat index 1493fc86..5ec9308a 100644 --- a/Assets/Materials/VFX/Construction Materials/Production Construction.mat +++ b/Assets/Materials/VFX/Construction Materials/Production Construction.mat @@ -25,7 +25,7 @@ Material: type: 3} m_ShaderKeywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: 2475 stringTagMap: diff --git a/Assets/Materials/VFX/Construction Materials/Structure Construction.mat b/Assets/Materials/VFX/Construction Materials/Structure Construction.mat index 7af1d555..d8c13183 100644 --- a/Assets/Materials/VFX/Construction Materials/Structure Construction.mat +++ b/Assets/Materials/VFX/Construction Materials/Structure Construction.mat @@ -25,7 +25,7 @@ Material: type: 3} m_ShaderKeywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: 2475 stringTagMap: diff --git a/Assets/Materials/VFX/Construction Materials/Tech Construction.mat b/Assets/Materials/VFX/Construction Materials/Tech Construction.mat index e7201b0f..9232605c 100644 --- a/Assets/Materials/VFX/Construction Materials/Tech Construction.mat +++ b/Assets/Materials/VFX/Construction Materials/Tech Construction.mat @@ -25,7 +25,7 @@ Material: type: 3} m_ShaderKeywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: 2475 stringTagMap: diff --git a/Assets/Materials/VFX/Construction Materials/Unit Construction.mat b/Assets/Materials/VFX/Construction Materials/Unit Construction.mat index fbccf795..476db77e 100644 --- a/Assets/Materials/VFX/Construction Materials/Unit Construction.mat +++ b/Assets/Materials/VFX/Construction Materials/Unit Construction.mat @@ -25,7 +25,7 @@ Material: type: 3} m_ShaderKeywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: 2475 stringTagMap: diff --git a/Assets/Scripts/Game Logic/Systems/Combat/TurretSystem.cs b/Assets/Scripts/Game Logic/Systems/Combat/TurretSystem.cs index a8678f88..b23923ab 100644 --- a/Assets/Scripts/Game Logic/Systems/Combat/TurretSystem.cs +++ b/Assets/Scripts/Game Logic/Systems/Combat/TurretSystem.cs @@ -111,7 +111,7 @@ protected override void OnUpdate() }); //Shoot Turret - Entities.WithAll().ForEach((Entity e, ref Turret t, ref Translation pos, ref AttackSpeed speed, ref AttackTarget attackTarget) => + Entities.WithNone().WithAll().ForEach((Entity e, ref Turret t, ref Translation pos, ref AttackSpeed speed, ref AttackTarget attackTarget) => { if (Time.ElapsedTime < speed.NextAttackTime) return; @@ -162,7 +162,7 @@ protected override void OnUpdate() }); //Shoot Artillery - Entities.WithAll().ForEach((Entity e, ref Turret t, ref Translation pos, ref AttackSpeed speed, ref AttackTarget attackTarget) => + Entities.WithNone().WithAll().ForEach((Entity e, ref Turret t, ref Translation pos, ref AttackSpeed speed, ref AttackTarget attackTarget) => { if (Time.ElapsedTime < speed.NextAttackTime) return; diff --git a/Assets/Scripts/Game Logic/Systems/General/TimedDeathSystem.cs b/Assets/Scripts/Game Logic/Systems/General/TimedDeathSystem.cs index 1c6cc298..fb8da120 100644 --- a/Assets/Scripts/Game Logic/Systems/General/TimedDeathSystem.cs +++ b/Assets/Scripts/Game Logic/Systems/General/TimedDeathSystem.cs @@ -9,7 +9,8 @@ protected override void OnUpdate() { Entities.ForEach((Entity e, ref DeathTime t) => { - if (Time.ElapsedTime >= t.Value) + + if (UnityEngine.Time.time >= t.Value) PostUpdateCommands.DestroyEntity(e); }); } diff --git a/Assets/Scripts/Map/Tiles/MappedTiles/Buildings/MetaTile.cs b/Assets/Scripts/Map/Tiles/MappedTiles/Buildings/MetaTile.cs index 64ca4ead..220a2cba 100644 --- a/Assets/Scripts/Map/Tiles/MappedTiles/Buildings/MetaTile.cs +++ b/Assets/Scripts/Map/Tiles/MappedTiles/Buildings/MetaTile.cs @@ -70,7 +70,7 @@ public override StringBuilder GetNameString() #if UNITY_EDITOR return ParentTile.GetNameString().Append(" [Meta]"); #else - return ParentTile.GetName(); + return ParentTile.GetNameString(); #endif } diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log index 3c2d950a..5694d439 100644 --- a/Logs/Packages-Update.log +++ b/Logs/Packages-Update.log @@ -238,3 +238,11 @@ Update Mode: updateDependencies The following packages were updated: com.unity.render-pipelines.high-definition from version 10.2.2 to 10.3.1 + +=== Sat Feb 20 23:37:29 2021 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were updated: + com.unity.test-framework from version 1.1.20 to 1.1.22 diff --git a/Packages/manifest.json b/Packages/manifest.json index 62e99dea..b55a878d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -18,7 +18,7 @@ "com.unity.render-pipelines.high-definition": "10.3.1", "com.unity.rendering.hybrid": "0.11.0-preview.42", "com.unity.scriptablebuildpipeline": "1.14.1", - "com.unity.test-framework": "1.1.20", + "com.unity.test-framework": "1.1.22", "com.unity.test-framework.performance": "2.0.9-preview", "com.unity.textmeshpro": "3.0.3", "com.unity.timeline": "1.3.2", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1eac7249..6727b2ef 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -287,7 +287,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.20", + "version": "1.1.22", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 833e6ef6..6943671b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.4f1 -m_EditorVersionWithRevision: 2020.2.4f1 (becced5a802b) +m_EditorVersion: 2020.2.5f1 +m_EditorVersionWithRevision: 2020.2.5f1 (e2c53f129de5)