18 files changed, 24 insertions, 9 deletions
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta
index b402ae1..0ca3c42 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e749821f81bfed2428b1befd0927f182
+guid: d339f1fd84bbf184b8fe7847aaadfc04
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png
index c8571b8..c8571b8 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta
index 4e936cf..4e936cf 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png
index e33bf32..e33bf32 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta
index 3a2f65c..3a2f65c 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png
index 3036358..3036358 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta
index 78c3200..78c3200 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png
index 0b5cab0..0b5cab0 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta
index 8e738de..8e738de 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png
index 9fcb826..9fcb826 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta
index 31cb26f..31cb26f 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png
index 6008995..6008995 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta
index e719db3..e719db3 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png
index c2acabb..c2acabb 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta
index d55aa57..d55aa57 100644
--- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta
+++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta
diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
index 1a7ff02..65d34ed 100644
--- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
+++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
@@ -264,9 +264,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 563803806}
-  - component: {fileID: 2748991041996116403}
+  - component: {fileID: 696148772594564389}
+  - component: {fileID: 7551546431576210827}
   m_Layer: 5
-  m_Name: Root_Equip
+  m_Name: Root_Weapon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -293,7 +294,7 @@ RectTransform:
   m_AnchoredPosition: {x: 10, y: -25}
   m_SizeDelta: {x: 395.19995, y: 30}
   m_Pivot: {x: 0, y: 1}
---- !u!114 &2748991041996116403
+--- !u!114 &696148772594564389
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -305,8 +306,22 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3eefcc4321abff24e88f7cbb843e3fda, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EquipTemplate: {fileID: 1891821505}
-  m_EquipGrid: {fileID: 913444338}
+  m_WeaponTemplate: {fileID: 1891821505}
+  m_WeaponGrid: {fileID: 913444338}
+--- !u!114 &7551546431576210827
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 563803805}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3eefcc4321abff24e88f7cbb843e3fda, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WeaponTemplate: {fileID: 1891821505}
+  m_WeaponGrid: {fileID: 913444338}
 --- !u!1 &657550471
 GameObject:
   m_ObjectHideFlags: 0
@@ -914,7 +929,7 @@ GameObject:
   - component: {fileID: 1891821504}
   - component: {fileID: 1891821505}
   m_Layer: 5
-  m_Name: EquipTemplate
+  m_Name: WeaponTemplate
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1522,6 +1537,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9c7a0239a22d86847b5806d7e4f2e500, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EquipBar: {fileID: 2748991041996116403}
+  m_WeaponBar: {fileID: 696148772594564389}
   m_ItemBar: {fileID: 1336027010569382835}
   m_DecorationBar: {fileID: 1323087931109695763}
diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab
index a59dfcd..c0f697f 100644
--- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab
+++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab
@@ -452,7 +452,7 @@ GameObject:
   - component: {fileID: 8436628705391075523}
   - component: {fileID: 719302489}
   m_Layer: 5
-  m_Name: PanelEquipBar
+  m_Name: PanelWeaponBar
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab.meta b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab.meta
index 9a75998..9a75998 100644
--- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab.meta
+++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab.meta