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
2026-01-22 15:03:04 +01:00
parent 013dca60a5 a7f91bcd67
commit 916dae1183
5 changed files with 141 additions and 155 deletions
--- a/Assets/Scenes/00_Fight_Arena/Fight_Arena.unity
+++ b/Assets/Scenes/00_Fight_Arena/Fight_Arena.unity
@@ -19987,12 +19987,12 @@ PrefabInstance:
    - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 14980887
+      value: 13426280
      objectReference: {fileID: 0}
    - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -2396978
+      value: -2148229
      objectReference: {fileID: 0}
    - target: {fileID: 5265345828117443429, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
@@ -20039,31 +20039,6 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.size
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[4].id
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[5].id
-      value: 30
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[6].id
-      value: 30
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[7].id
-      value: 30
-      objectReference: {fileID: 0}
    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: startItems.Array.data[9].id
@@ -20164,21 +20139,6 @@ PrefabInstance:
      propertyPath: startItems.Array.data[28].id
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[4].amount
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[5].amount
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[6].amount
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: startItems.Array.data[9].amount
@@ -20279,46 +20239,6 @@ PrefabInstance:
      propertyPath: startItems.Array.data[28].amount
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[4].autoEquip
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[4].indexArea
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[5].autoEquip
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[5].indexArea
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[6].autoEquip
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[6].indexArea
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[7].autoEquip
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[7].indexArea
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: startItems.Array.data[9].autoEquip
@@ -20519,21 +20439,6 @@ PrefabInstance:
      propertyPath: startItems.Array.data[28].indexArea
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[4].addToEquipArea
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[5].addToEquipArea
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[6].addToEquipArea
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: startItems.Array.data[9].addToEquipArea
@@ -20644,21 +20549,6 @@ PrefabInstance:
      propertyPath: startItems.Array.data[3].attributes.Array.size
      value: 2
      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[5].attributes.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[6].attributes.Array.size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[7].attributes.Array.size
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: startItems.Array.data[3].attributes.Array.data[0].name
@@ -20669,21 +20559,6 @@ PrefabInstance:
      propertyPath: startItems.Array.data[3].attributes.Array.data[1].name
      value: 11
      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[5].attributes.Array.data[0].name
-      value: 12
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[6].attributes.Array.data[0].name
-      value: 12
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[7].attributes.Array.data[0].name
-      value: 12
-      objectReference: {fileID: 0}
    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: startItems.Array.data[3].attributes.Array.data[0].value
@@ -20694,21 +20569,6 @@ PrefabInstance:
      propertyPath: startItems.Array.data[3].attributes.Array.data[1].value
      value: 200
      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[5].attributes.Array.data[0].value
-      value: 15
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[6].attributes.Array.data[0].value
-      value: 15
-      objectReference: {fileID: 0}
-    - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: startItems.Array.data[7].attributes.Array.data[0].value
-      value: 15
-      objectReference: {fileID: 0}
    - target: {fileID: 5613825752652024524, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: m_Layer
@@ -20754,11 +20614,6 @@ PrefabInstance:
      propertyPath: 'm_Materials.Array.data[0]'
      value: 
      objectReference: {fileID: 2073985053}
-    - target: {fileID: 5911894960463639761, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 5926359455551299165, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: m_Layer
@@ -20862,7 +20717,7 @@ PrefabInstance:
    - target: {fileID: 6786312951323477463, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 6805818325285139100, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}