Merge remote-tracking branch 'origin/NewStory' into NewStory

2025-07-25 01:51:50 +02:00
parent 15416d1772 d4d01dfb69
commit f5c1c37d32
32 changed files with 4877 additions and 3201 deletions
--- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity
+++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity
@@ -1494,7 +1494,7 @@ Material:
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 0.22641504, g: 0.22641504, b: 0.22641504, a: 0}
-    - _Color: {r: 0.22641507, g: 0.22641507, b: 0.22641507, a: 0.7176471}
+    - _Color: {r: 0.22641501, g: 0.22641501, b: 0.22641501, a: 0}
    - _EmisColor: {r: 0.29411763, g: 0, b: 0, a: 1}
    - _EmissionColor: {r: 0.00489498, g: 0.026072003, b: 0.20754719, a: 1}
    - _SpecColor: {r: 0.4852941, g: 0.19625866, b: 0.19625866, a: 1}
@@ -15731,12 +15731,12 @@ PrefabInstance:
        type: 3}
      propertyPath: animatorEvents.Array.data[3].onTriggerEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target
      value: 
-      objectReference: {fileID: 1516777686}
+      objectReference: {fileID: 4023472438366830938}
    - target: {fileID: 2849515580039403419, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: animatorEvents.Array.data[3].onTriggerEvent.m_PersistentCalls.m_Calls.Array.data[1].m_Target
      value: 
-      objectReference: {fileID: 4023472438366830938}
+      objectReference: {fileID: 1516777737}
    - target: {fileID: 2849515580039403419, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: animatorEvents.Array.data[3].onTriggerEvent.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
@@ -15745,22 +15745,22 @@ PrefabInstance:
    - target: {fileID: 2849515580039403419, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: animatorEvents.Array.data[3].onTriggerEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: TriggerWeakAttack
-      objectReference: {fileID: 0}
-    - target: {fileID: 2849515580039403419, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      propertyPath: animatorEvents.Array.data[3].onTriggerEvent.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
      value: Play
      objectReference: {fileID: 0}
+    - target: {fileID: 2849515580039403419, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: animatorEvents.Array.data[3].onTriggerEvent.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
+      value: OnEvadeEnd
+      objectReference: {fileID: 0}
    - target: {fileID: 2849515580039403419, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: animatorEvents.Array.data[3].onTriggerEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
-      value: Beyond.bMeleeCombatInput, Assembly-CSharp
+      value: UnityEngine.ParticleSystem, UnityEngine
      objectReference: {fileID: 0}
    - target: {fileID: 2849515580039403419, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: animatorEvents.Array.data[3].onTriggerEvent.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
-      value: UnityEngine.ParticleSystem, UnityEngine
+      value: Beyond.bThirdPersonController, Assembly-CSharp
      objectReference: {fileID: 0}
    - target: {fileID: 2849515580039403419, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
@@ -16195,7 +16195,7 @@ PrefabInstance:
    - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      propertyPath: selectedToolbar
-      value: 6
+      value: 7
      objectReference: {fileID: 0}
    - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
@@ -17938,10 +17938,6 @@ PrefabInstance:
      insertIndex: -1
      addedObject: {fileID: 1681403708}
    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 5935883485110830931, guid: 851e8e61247888340bdec90fc8aa37f5,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1516777657}
    - targetCorrespondingSourceObject: {fileID: 7577249534690070221, guid: 851e8e61247888340bdec90fc8aa37f5,
        type: 3}
      insertIndex: -1
@@ -19768,12 +19764,6 @@ Material:
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- !u!1 &1447701206 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5935883485110830931, guid: 851e8e61247888340bdec90fc8aa37f5,
-    type: 3}
-  m_PrefabInstance: {fileID: 1004473948}
-  m_PrefabAsset: {fileID: 0}
 --- !u!21 &1461622385
 Material:
  serializedVersion: 8
@@ -20140,77 +20130,30 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1004473948}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &1516777657
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447701206}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b3027f475235a4f7ab39c90b4bbf8567, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  splatMaterial: {fileID: 2100000, guid: 644c5fbe7e0624b239c5c09b7d1613ae, type: 2}
-  rateOverSteps: 1
-  rateOverTime: 0
-  rateOverDistance: 0
-  overridePosition: 0
-  position: {x: -0.13, y: 0}
-  positionRandomness: 0
-  overrideRotation: 1
-  rotation: 0
-  rotationRandomness: 0
-  scaleWithDistance: 0
-  scaleWithTransform: 0
-  scale: {x: 0.08, y: 0.08}
-  scaleRandomness: 0
-  velocityWeight: 0.2
-  velocityTexture: {fileID: 0}
-  maxRelativeVelocity: 2
-  velocityScale: {x: 3, y: 3, z: 0}
-  maxRelativeAngularVelocity: 12
-  angularVelocityScale: 0
-  force: {x: 0, y: 0, z: 0}
-  torque: 0
-  densityWeight: 0.01
-  densityTexture: {fileID: 2800000, guid: a2e7ead8889a04301b67bdd80469b3d3, type: 3}
-  srcBlend: 5
-  dstBlend: 10
-  blendOp: 2
-  color: {r: 0, g: 0, b: 0, a: 1}
-  noiseTexture: {fileID: 0}
-  densityNoise: 0
-  densityNoiseOffset: 0
-  densityNoiseTiling: 1
-  velocityNoise: 1
-  velocityNoiseOffset: 1
-  velocityNoiseTiling: 1
--- !u!114 &1516777686 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1385765897516864307, guid: 851e8e61247888340bdec90fc8aa37f5,
-    type: 3}
-  m_PrefabInstance: {fileID: 1004473948}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447701206}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 04fcf3aba7782a94e9ad337e474800d7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &1516777702 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 7158301901963754683, guid: 851e8e61247888340bdec90fc8aa37f5,
    type: 3}
  m_PrefabInstance: {fileID: 1004473948}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1447701206}
+  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 38b9f160099a9484b936b7192dd82968, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &1516777737 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
+    type: 3}
+  m_PrefabInstance: {fileID: 1004473948}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 90fb639067d504fc69e8ac3a3fa2283e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!21 &1523257492
 Material:
  serializedVersion: 8