Jugg UI update (#71)

* new ui assets * new juggernaut hud * new inputs and events for toggle hud * new minimap icons * new death panel * new pause menu * reloading change * scavenger fix * recentered minimap * fixed hudmanagereditor and disable it * increase texture distance and new keybinds
Taliayaya · Mar 12, 2024 · f85def9 · f85def9
1 parent 302abd6
commit f85def9
Show file tree

Hide file tree

Showing 89 changed files with 8,496 additions and 1,823 deletions.
diff --git a/Assets/GameInputs.inputactions b/Assets/GameInputs.inputactions
@@ -148,6 +148,24 @@
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
+                },
+                {
+                    "name": "ToggleMap",
+                    "type": "Button",
+                    "id": "d9d1cd76-93c6-4d78-a463-2f76c258f2bb",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
+                },
+                {
+                    "name": "ToggleObjective",
+                    "type": "Button",
+                    "id": "091198a8-eb59-4ef5-923f-c6d503e9aaf1",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                 }
             ],
             "bindings": [
@@ -381,6 +399,28 @@
                     "action": "ChangeView",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "b57617f5-13e7-4169-9eaf-bd4c509bd2f8",
+                    "path": "<Keyboard>/m",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "ToggleMap",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "21827c78-185c-456b-bf60-438dea8372a7",
+                    "path": "<Keyboard>/n",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "ToggleObjective",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                 }
             ]
         },

diff --git a/Assets/HierarchyDecorator/Settings.asset b/Assets/HierarchyDecorator/Settings.asset
diff --git a/Assets/Resources/Models/Fido Material.meta b/Assets/Resources/Models/Fido Material.meta
diff --git a/Assets/Resources/Models/Juggernaut Textures.meta b/Assets/Resources/Models/Juggernaut Textures.meta
diff --git a/Assets/Resources/Prefabs/Ameise.prefab b/Assets/Resources/Prefabs/Ameise.prefab
@@ -1054,6 +1054,7 @@ MonoBehaviour:
   - {fileID: 1860889349433567840}
   - {fileID: 1860889347623382827}
   - {fileID: 1860889347333889345}
+  isGrounded: 0
   stepSize: 1
   stepHeight: 1.2
   smoothness: 6
@@ -1067,6 +1068,9 @@ MonoBehaviour:
   audioSource: {fileID: 1860889348233460758}
   stepSounds:
   - {fileID: 8300000, guid: cf87b5d8f7aef9d4d9cf5bea9c4a422a, type: 3}
+  onIsGrounded:
+    m_PersistentCalls:
+      m_Calls: []
   velocityMultiplier: 0.08
 --- !u!114 &761358363160916634
 MonoBehaviour:
@@ -1877,14 +1881,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1860889347602417254}
-  m_LocalRotation: {x: 0.7069834, y: -0, z: -0, w: 0.7072302}
-  m_LocalPosition: {x: 0, y: 0, z: 2.2653906}
-  m_LocalScale: {x: 7.930196, y: 7.930196, z: 7.930196}
+  m_LocalRotation: {x: 0, y: 0.7072302, z: -0.7069834, w: 0}
+  m_LocalPosition: {x: 0, y: 0.05, z: 0}
+  m_LocalScale: {x: 25, y: 25, z: 25}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 2186933566467260550}
   m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 89.98, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 89.98, y: 180, z: 0}
 --- !u!212 &1860889347602417240
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -1926,8 +1930,8 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 5313a58976e252d44aaf59790275197d, type: 3}
-  m_Color: {r: 1, g: 0.056943767, b: 0, a: 1}
+  m_Sprite: {fileID: 21300000, guid: 1ba5bbce93235d64698239e0cfa16f0e, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0

diff --git a/Assets/Resources/Prefabs/Damaged Ameise.prefab b/Assets/Resources/Prefabs/Damaged Ameise.prefab
@@ -0,0 +1,110 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &3319342142157169414
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 440560975, guid: 5f88132ef78f19647aaac97222672cff, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2049292796, guid: 5f88132ef78f19647aaac97222672cff, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268488, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_CollisionDetection
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268490, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: tree
+      value: 
+      objectReference: {fileID: 11400000, guid: 9a2589549de58f84fa2247c675fb2553,
+        type: 2}
+    - target: {fileID: 1860889347541268500, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_Name
+      value: Damaged Ameise
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1010.70734
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 30.585098
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1377.4521
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268501, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268502, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_Radius
+      value: 2.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 1860889347541268502, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_Center.y
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6576844422240144710, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6576844422240144710, guid: 5f88132ef78f19647aaac97222672cff,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5f88132ef78f19647aaac97222672cff, type: 3}
diff --git a/Assets/Resources/Prefabs/Damaged Ameise.prefab.meta b/Assets/Resources/Prefabs/Damaged Ameise.prefab.meta
diff --git a/Assets/Resources/Prefabs/Juggernaut 1.prefab b/Assets/Resources/Prefabs/Juggernaut 1.prefab
@@ -1513,7 +1513,7 @@ MonoBehaviour:
     m_Bits: 1
   m_VolumeTrigger: {fileID: 0}
   m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
+  m_RenderPostProcessing: 1
   m_Antialiasing: 0
   m_AntialiasingQuality: 2
   m_StopNaN: 0
@@ -2485,7 +2485,7 @@ Light:
   m_Shape: 0
   m_Color: {r: 1, g: 0.42618027, b: 0.1462264, a: 1}
   m_Intensity: 1
-  m_Range: 10
+  m_Range: 1
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
   m_CookieSize: 10
@@ -2664,7 +2664,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4781548307874533479}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
@@ -2685,7 +2685,7 @@ Transform:
   - {fileID: 740955420}
   m_Father: {fileID: 4781548308717753425}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!114 &4781548307874533477
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3238,14 +3238,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4781548308319336741}
-  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -12.65, y: 0.36, z: 8.090005}
-  m_LocalScale: {x: 50, y: 50.000023, z: 50.000023}
+  m_LocalRotation: {x: 0.54167527, y: -0.45451945, z: 0.45451945, w: 0.54167527}
+  m_LocalPosition: {x: -1.14, y: 0.36, z: 8.090005}
+  m_LocalScale: {x: 75, y: 75, z: 75}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 4781548307874533478}
   m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 90, y: -80, z: 0}
 --- !u!212 &4781548308319336739
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -3287,8 +3287,8 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 775f36921492ecf4e9eeaf4fbf409a74, type: 3}
-  m_Color: {r: 0.0990566, g: 0.48159727, b: 1, a: 1}
+  m_Sprite: {fileID: 21300000, guid: cade15bf2dc86a6478a21175cb0dfaa5, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
@@ -3388,7 +3388,7 @@ Light:
   m_Shape: 0
   m_Color: {r: 1, g: 0.42618027, b: 0.1462264, a: 1}
   m_Intensity: 1
-  m_Range: 10
+  m_Range: 1
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
   m_CookieSize: 10
@@ -3981,7 +3981,7 @@ MonoBehaviour:
   respawnScavengerOnDeath: 1
   goToTargetIndicatorPrefab: {fileID: 3435485861080877356, guid: e5258522085098d4d812fe8ebf2996ee,
     type: 3}
-  juggCamera: {fileID: 0}
+  juggCamera: {fileID: 4781548307381713081}
 --- !u!1 &4781548308759479855
 GameObject:
   m_ObjectHideFlags: 0
@@ -4416,7 +4416,7 @@ MonoBehaviour:
     m_Bits: 1
   m_VolumeTrigger: {fileID: 0}
   m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
+  m_RenderPostProcessing: 1
   m_Antialiasing: 0
   m_AntialiasingQuality: 2
   m_StopNaN: 0

diff --git a/Assets/Resources/Prefabs/Lowe.prefab b/Assets/Resources/Prefabs/Lowe.prefab
@@ -1053,14 +1053,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 293691076410357389}
-  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 4.1922016, y: 4.192202, z: 4.192202}
+  m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: 0, y: 0.06, z: 0}
+  m_LocalScale: {x: 10, y: 10, z: 10}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 259483675925536319}
   m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0}
 --- !u!212 &293691076410357391
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -1102,8 +1102,8 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 5313a58976e252d44aaf59790275197d, type: 3}
-  m_Color: {r: 1, g: 0, b: 0.106202126, a: 1}
+  m_Sprite: {fileID: 21300000, guid: cb92195c5f0a6e541be5ffa6b3d8445c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
@@ -1876,6 +1876,7 @@ MonoBehaviour:
   - {fileID: 293691075546833636}
   - {fileID: 293691075209117697}
   - {fileID: 293691075442299350}
+  isGrounded: 0
   stepSize: 3
   stepHeight: 2
   smoothness: 15
@@ -1892,6 +1893,9 @@ MonoBehaviour:
   - {fileID: 8300000, guid: b6272d4ea44a5e84cb026fdb9fb43853, type: 3}
   - {fileID: 8300000, guid: 02584afb3ec53644c932dff56d552a3c, type: 3}
   - {fileID: 8300000, guid: a6fdd23d5f7afd447a1c587d5e4e4481, type: 3}
+  onIsGrounded:
+    m_PersistentCalls:
+      m_Calls: []
   velocityMultiplier: 0.1
 --- !u!114 &293691076885334366
 MonoBehaviour: