Merge pull request #75 from EuleMitKeule/feature/stats-screen

feat(ui): implement stats screen
EuleMitKeule · Nov 23, 2022 · 18482da · 18482da
2 parents d844b8d + 699c9c3
commit 18482da
Show file tree

Hide file tree

Showing 31 changed files with 6,578 additions and 937 deletions.
diff --git a/Art/ui_panel.aseprite b/Art/ui_panel.aseprite
diff --git a/WorkingTitle/Assets/Fonts/pixelated/pixelated SDF.asset b/WorkingTitle/Assets/Fonts/pixelated/pixelated SDF.asset
diff --git a/WorkingTitle/Assets/GameAssets/SpawnAssets/spawntable_base.asset b/WorkingTitle/Assets/GameAssets/SpawnAssets/spawntable_base.asset
@@ -245,7 +245,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 3
-      Data: 11
+      Data: 7
     - Name: $v
       Entry: 7
       Data: 8|WorkingTitle.Unity.Assets.Spawning.SpawnTableEntry, WorkingTitle.Unity
@@ -278,7 +278,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 3
-      Data: 10
+      Data: 2
     - Name: $v
       Entry: 7
       Data: 9|WorkingTitle.Unity.Assets.Spawning.SpawnTableEntry, WorkingTitle.Unity

diff --git a/WorkingTitle/Assets/GameAssets/TankAssets/tank_attack_cooldown.asset b/WorkingTitle/Assets/GameAssets/TankAssets/tank_attack_cooldown.asset
@@ -40,4 +40,4 @@ MonoBehaviour:
       Data: 1
     - Name: SkillType
       Entry: 3
-      Data: 6
+      Data: 5
diff --git a/WorkingTitle/Assets/GameAssets/TankAssets/tank_life_steal.asset b/WorkingTitle/Assets/GameAssets/TankAssets/tank_life_steal.asset
@@ -40,4 +40,4 @@ MonoBehaviour:
       Data: 1
     - Name: SkillType
       Entry: 3
-      Data: 11
+      Data: 7
diff --git a/WorkingTitle/Assets/GameAssets/TankAssets/tank_magnet.asset b/WorkingTitle/Assets/GameAssets/TankAssets/tank_magnet.asset
@@ -40,4 +40,4 @@ MonoBehaviour:
       Data: 1
     - Name: SkillType
       Entry: 3
-      Data: 4
+      Data: 3
diff --git a/WorkingTitle/Assets/GameAssets/TankAssets/tank_max_health.asset b/WorkingTitle/Assets/GameAssets/TankAssets/tank_max_health.asset
@@ -40,4 +40,4 @@ MonoBehaviour:
       Data: 1
     - Name: SkillType
       Entry: 3
-      Data: 10
+      Data: 6
diff --git a/WorkingTitle/Assets/GameAssets/TankAssets/tank_movement_speed.asset b/WorkingTitle/Assets/GameAssets/TankAssets/tank_movement_speed.asset
@@ -40,4 +40,4 @@ MonoBehaviour:
       Data: 1
     - Name: SkillType
       Entry: 3
-      Data: 3
+      Data: 2
diff --git a/WorkingTitle/Assets/GameAssets/TankAssets/tank_projectile_speed.asset b/WorkingTitle/Assets/GameAssets/TankAssets/tank_projectile_speed.asset
@@ -40,4 +40,4 @@ MonoBehaviour:
       Data: 1
     - Name: SkillType
       Entry: 3
-      Data: 5
+      Data: 4
diff --git a/WorkingTitle/Assets/GameAssets/game_base.asset b/WorkingTitle/Assets/GameAssets/game_base.asset
@@ -87,7 +87,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 3
-      Data: 3
+      Data: 2
     - Name: $v
       Entry: 10
       Data: 4
@@ -99,7 +99,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 3
-      Data: 4
+      Data: 3
     - Name: $v
       Entry: 10
       Data: 5
@@ -111,7 +111,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 3
-      Data: 5
+      Data: 4
     - Name: $v
       Entry: 10
       Data: 6
@@ -123,7 +123,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 3
-      Data: 6
+      Data: 5
     - Name: $v
       Entry: 10
       Data: 7
@@ -135,7 +135,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 3
-      Data: 10
+      Data: 6
     - Name: $v
       Entry: 10
       Data: 8
@@ -147,7 +147,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 3
-      Data: 11
+      Data: 7
     - Name: $v
       Entry: 10
       Data: 9
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,4 +40,4 @@ MonoBehaviour: @@
           Data: 1
         - Name: SkillType
           Entry: 3
-          Data: 6
+          Data: 5