Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory

# Conflicts:
#	Assets/Scenes/00_Fight_Arena/Fight_Arena.unity
#	Assets/Scripts/Characters/Skills/Spell_PurifyingBlaze.asset

Assets/Prefabs/PlayerWithUI.prefab

@@ -8903,7 +8903,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 1502754, y: -240440.39}
+  m_AnchoredPosition: {x: 1577328.6, y: -252372.25}
   m_SizeDelta: {x: 100, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &6801859473011826678
@@ -22411,27 +22411,47 @@ PrefabInstance:
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.size
-      value: 9
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[4].id
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[5].id
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[6].id
-      value: 85
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[7].id
-      value: 1
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[8].id
       value: 30
       objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[4].amount
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[5].amount
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[6].amount
-      value: 5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
@@ -22448,36 +22468,116 @@ PrefabInstance:
       propertyPath: startItems.Array.data[1].autoEquip
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[4].autoEquip
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[4].indexArea
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[5].autoEquip
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[5].indexArea
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[6].autoEquip
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[6].indexArea
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[7].autoEquip
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[7].indexArea
-      value: 0
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[4].addToEquipArea
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[5].addToEquipArea
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[6].addToEquipArea
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[5].attributes.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[6].attributes.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[7].attributes.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[8].attributes.Array.size
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[5].attributes.Array.data[0].name
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[6].attributes.Array.data[0].name
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[7].attributes.Array.data[0].name
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[8].attributes.Array.data[0].name
       value: 12
       objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[5].attributes.Array.data[0].value
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[6].attributes.Array.data[0].value
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
+        type: 3}
+      propertyPath: startItems.Array.data[7].attributes.Array.data[0].value
+      value: 15
+      objectReference: {fileID: 0}
     - target: {fileID: 6623428193696265639, guid: 60b79e23a507e0c48a94b7e3d5138383,
         type: 3}
       propertyPath: startItems.Array.data[8].attributes.Array.data[0].value