Merge pull request #89 from EuleMitKeule/performance/floating-text

perf(ui): use single canvas for floating text
EuleMitKeule · Nov 28, 2022 · 0229017 · 0229017
2 parents 37510d4 + 21201a7
commit 0229017
Show file tree

Hide file tree

Showing 48 changed files with 8,323 additions and 519 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -189,7 +189,7 @@ jobs:
     if: ${{ needs.version.outputs.releaseCreated == 'true' }}
     strategy:
       matrix:
-        buildTarget: ["StandaloneWindows64", "StandaloneOSX", "StandaloneLinux64", "WebGL"]
+        buildTarget: ["StandaloneWindows64", "StandaloneOSX", "StandaloneLinux64"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -283,7 +283,7 @@ jobs:
     if: ${{ needs.release.outputs.releaseCreated == 'true' }}
     strategy:
       matrix:
-        buildTarget: ["StandaloneWindows64", "StandaloneOSX", "StandaloneLinux64", "WebGL"]
+        buildTarget: ["StandaloneWindows64", "StandaloneOSX", "StandaloneLinux64"]
 
     steps:
       - name: Checkout repository

diff --git a/TanksOnAPlain/Assets/GameAssets/HealthAssets/health_enemy_base.asset b/TanksOnAPlain/Assets/GameAssets/HealthAssets/health_enemy_base.asset
@@ -21,9 +21,18 @@ MonoBehaviour:
     PrefabModificationsReferencedUnityObjects: []
     PrefabModifications: []
     SerializationNodes:
-    - Name: StartHealth
-      Entry: 4
-      Data: 100
-    - Name: MaxHealth
-      Entry: 4
+    - Name: Health
+      Entry: 7
+      Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledInt, TanksOnAPlain.Unity
+    - Name: MinValue
+      Entry: 3
       Data: 100
+    - Name: MaxValue
+      Entry: 3
+      Data: 1000
+    - Name: Time
+      Entry: 3
+      Data: 900
+    - Name: 
+      Entry: 8
+      Data: 
diff --git a/TanksOnAPlain/Assets/GameAssets/HealthAssets/health_enemy_max_health.asset b/TanksOnAPlain/Assets/GameAssets/HealthAssets/health_enemy_max_health.asset
@@ -21,9 +21,18 @@ MonoBehaviour:
     PrefabModificationsReferencedUnityObjects: []
     PrefabModifications: []
     SerializationNodes:
-    - Name: StartHealth
-      Entry: 4
-      Data: 200
-    - Name: MaxHealth
-      Entry: 4
+    - Name: Health
+      Entry: 7
+      Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledInt, TanksOnAPlain.Unity
+    - Name: MinValue
+      Entry: 3
       Data: 200
+    - Name: MaxValue
+      Entry: 3
+      Data: 2000
+    - Name: Time
+      Entry: 3
+      Data: 900
+    - Name: 
+      Entry: 8
+      Data: 
diff --git a/TanksOnAPlain/Assets/GameAssets/HealthAssets/health_player_base.asset b/TanksOnAPlain/Assets/GameAssets/HealthAssets/health_player_base.asset
@@ -21,9 +21,18 @@ MonoBehaviour:
     PrefabModificationsReferencedUnityObjects: []
     PrefabModifications: []
     SerializationNodes:
-    - Name: StartHealth
-      Entry: 4
+    - Name: Health
+      Entry: 7
+      Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledInt, TanksOnAPlain.Unity
+    - Name: MinValue
+      Entry: 3
       Data: 100
-    - Name: MaxHealth
-      Entry: 4
+    - Name: MaxValue
+      Entry: 3
       Data: 100
+    - Name: Time
+      Entry: 3
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
diff --git a/TanksOnAPlain/Assets/GameAssets/PowerUpAssets/powerup_magnet.asset b/TanksOnAPlain/Assets/GameAssets/PowerUpAssets/powerup_magnet.asset
@@ -27,7 +27,7 @@ MonoBehaviour:
       Data: 0
     - Name: Radius
       Entry: 4
-      Data: 1
+      Data: 3
     - Name: RadiusPercentage
       Entry: 4
       Data: 10
diff --git a/TanksOnAPlain/Assets/GameAssets/SpawnAssets/spawner_base.asset b/TanksOnAPlain/Assets/GameAssets/SpawnAssets/spawner_base.asset
@@ -24,12 +24,18 @@ MonoBehaviour:
     - Name: SpawnRadius
       Entry: 4
       Data: 8
-    - Name: MaxSpawnCooldown
+    - Name: Cooldown
+      Entry: 7
+      Data: TanksOnAPlain.Unity.Components.Difficulty.ScaledFloat, TanksOnAPlain.Unity
+    - Name: StartValue
       Entry: 4
-      Data: 5
-    - Name: MinSpawnCooldown
-      Entry: 4
-      Data: 0.3
-    - Name: SpawnCooldownDifficultyModifier
+      Data: 10
+    - Name: EndValue
       Entry: 4
       Data: 1
+    - Name: Time
+      Entry: 3
+      Data: 900
+    - Name: 
+      Entry: 8
+      Data: