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/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab
+++ b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab
@@ -82717,6 +82717,11 @@ PrefabInstance:
      propertyPath: m_Name
      value: FlameThrower
      objectReference: {fileID: 0}
+    - target: {fileID: 4995691561355407686, guid: 336783fc6edf8e94186b6d9fd74effed,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 5156685312583568132, guid: 336783fc6edf8e94186b6d9fd74effed,
        type: 3}
      propertyPath: LightsModule.light
@@ -83127,6 +83132,11 @@ PrefabInstance:
      propertyPath: m_Name
      value: PowerShield
      objectReference: {fileID: 0}
+    - target: {fileID: 4418269076189414613, guid: 4ae14a17e640b604f8b4921d230b0c96,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@@ -83799,6 +83809,11 @@ PrefabInstance:
      propertyPath: m_Name
      value: Fireball
      objectReference: {fileID: 0}
+    - target: {fileID: 11175768915115734, guid: fa8fab8e229636f44b7f773bd46aaf07,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 1372023101484332010, guid: fa8fab8e229636f44b7f773bd46aaf07,
        type: 3}
      propertyPath: damage.damageType
--- a/Assets/Prefabs/Gameplay/Arrow.mat
+++ b/Assets/Prefabs/Gameplay/Arrow.mat
@@ -132,6 +132,7 @@ Material:
    - _DistortionStrength: 1
    - _DistortionStrengthScaled: 0.1
    - _DstBlend: 1
+    - _DstBlendAlpha: 1
    - _EmissionEnabled: 0
    - _EnvironmentReflections: 1
    - _FlipbookBlending: 0
@@ -158,6 +159,7 @@ Material:
    - _SoftParticlesNearFadeDistance: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 5
+    - _SrcBlendAlpha: 1
    - _StencilCompare: 6
    - _StencilRef: 0
    - _Surface: 1
--- a/Assets/Prefabs/PlayerWithUI.prefab
+++ b/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
--- 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}
--- a/Assets/Scripts/Characters/Skills/Spell_PurifyingBlaze.asset
+++ b/Assets/Scripts/Characters/Skills/Spell_PurifyingBlaze.asset
@@ -12,6 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 2fa1c233b63854f6d845066ccd8e48cd, type: 3}
  m_Name: Spell_PurifyingBlaze
  m_EditorClassIdentifier: 
+<<<<<<< HEAD
  spellName: Purifying Blaze
  category: 2
  animationClipName: FlameThrower
@@ -25,3 +26,16 @@ MonoBehaviour:
  preCastDelay: 0
  duration: 1.5
  postEndDelay: 0.1
+=======
+  spellName: 
+  animationClipName: 
+  description: 
+  baseFaithCost: 10
+  castTime: 0.5
+  rotationDuration: 0.3
+  type: 0
+  effectPrefab: {fileID: 0}
+  preCastDelay: 0
+  duration: 2
+  postEndDelay: 0
+>>>>>>> a7f91bcd67c0a8368057faade833aa8dd8d3dd2e