Body armor is now displayed on characters

enviGit · Dec 20, 2023 · 082ae90 · 082ae90
1 parent 4e6134b
commit 082ae90
Show file tree

Hide file tree

Showing 15 changed files with 7,892 additions and 15,335 deletions.
diff --git a/Assets/Art/_CharactersUsed/Prefabs/Alex.prefab b/Assets/Art/_CharactersUsed/Prefabs/Alex.prefab
@@ -2512,6 +2512,7 @@ MonoBehaviour:
   isMarkedAsDead: 0
   currentArmor: 0
   maxArmor: 100
+  armorSocket: {fileID: 1958878600300936004}
 --- !u!114 &2851880125368329928
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2552,8 +2553,6 @@ MonoBehaviour:
   layerMask:
     serializedVersion: 2
     m_Bits: 8193
-  trailPrefab: {fileID: 2122679543000649686, guid: a48743209c8956941b2e696a8dd30fe1,
-    type: 3}
   isReloading: 0
   isFiring: 0
 --- !u!114 &2851880125368329934
@@ -2583,8 +2582,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 148a8199b8b558440b9f38d9d269ef17, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  currentOffsetY: 0
-  currentOffsetZ: 0
   iterations: 10
   weight: 0.8
   angleLimit: 90

diff --git a/Assets/Art/_CharactersUsed/Prefabs/David.prefab b/Assets/Art/_CharactersUsed/Prefabs/David.prefab
@@ -5700,6 +5700,7 @@ MonoBehaviour:
   isMarkedAsDead: 0
   currentArmor: 0
   maxArmor: 100
+  armorSocket: {fileID: 5236179387003300779}
 --- !u!114 &8995285191399974304
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5740,8 +5741,6 @@ MonoBehaviour:
   layerMask:
     serializedVersion: 2
     m_Bits: 8193
-  trailPrefab: {fileID: 2122679543000649686, guid: a48743209c8956941b2e696a8dd30fe1,
-    type: 3}
   isReloading: 0
   isFiring: 0
 --- !u!114 &8995285191399974306
@@ -5771,8 +5770,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 148a8199b8b558440b9f38d9d269ef17, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  currentOffsetY: 0
-  currentOffsetZ: 0
   iterations: 10
   weight: 0.8
   angleLimit: 90

diff --git a/Assets/Art/_CharactersUsed/Prefabs/James.prefab b/Assets/Art/_CharactersUsed/Prefabs/James.prefab
@@ -3771,6 +3771,7 @@ MonoBehaviour:
   isMarkedAsDead: 0
   currentArmor: 0
   maxArmor: 100
+  armorSocket: {fileID: 7506774111598023049}
 --- !u!114 &5751964209664488743
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3811,8 +3812,6 @@ MonoBehaviour:
   layerMask:
     serializedVersion: 2
     m_Bits: 8193
-  trailPrefab: {fileID: 2122679543000649686, guid: a48743209c8956941b2e696a8dd30fe1,
-    type: 3}
   isReloading: 0
   isFiring: 0
 --- !u!114 &5751964209664488741
@@ -3842,8 +3841,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 148a8199b8b558440b9f38d9d269ef17, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  currentOffsetY: 0
-  currentOffsetZ: 0
   iterations: 10
   weight: 0.8
   angleLimit: 90

diff --git a/Assets/Art/_CharactersUsed/Prefabs/Levis.prefab b/Assets/Art/_CharactersUsed/Prefabs/Levis.prefab
@@ -3488,6 +3488,7 @@ MonoBehaviour:
   isMarkedAsDead: 0
   currentArmor: 0
   maxArmor: 100
+  armorSocket: {fileID: 6079361874399206376}
 --- !u!114 &7740597216640641022
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3528,8 +3529,6 @@ MonoBehaviour:
   layerMask:
     serializedVersion: 2
     m_Bits: 8193
-  trailPrefab: {fileID: 2122679543000649686, guid: a48743209c8956941b2e696a8dd30fe1,
-    type: 3}
   isReloading: 0
   isFiring: 0
 --- !u!114 &7740597216640641020
@@ -3559,8 +3558,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 148a8199b8b558440b9f38d9d269ef17, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  currentOffsetY: 0
-  currentOffsetZ: 0
   iterations: 10
   weight: 0.8
   angleLimit: 90