更新

2026-01-03 18:19:39 -05:00
parent 3bcd7c1cf8
commit 33b1795c1f
7387 changed files with 2762819 additions and 716926 deletions
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/Animations/NexusCrab.controller
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/Animations/NexusCrab.controller
@@ -350,6 +350,32 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &-6412285535266899553
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Paralyzed
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 2441d3f8d823da04c8dd19de1922e72a, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!206 &-6122759402110369977
 BlendTree:
  m_ObjectHideFlags: 1
@@ -539,7 +565,7 @@ AnimatorStateMachine:
    m_Position: {x: 1000, y: 480, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -3882456092660826825}
-    m_Position: {x: 40, y: 340, z: 0}
+    m_Position: {x: -20, y: 370, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 5378399707760178632}
    m_Position: {x: 170, y: 670, z: 0}
@@ -575,7 +601,7 @@ AnimatorStateMachine:
    m_Position: {x: 160, y: 440, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -9111028815829627132}
-    m_Position: {x: 40, y: 290, z: 0}
+    m_Position: {x: -20, y: 270, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 6911860839313068951}
    m_Position: {x: 350, y: 240, z: 0}
@@ -594,6 +620,9 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: 4817528361366497016}
    m_Position: {x: 160, y: 540, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -6412285535266899553}
+    m_Position: {x: -20, y: 320, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/Animations/Paralyzed.anim
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/Animations/Paralyzed.anim
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/Animations/Paralyzed.anim.meta
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/Animations/Paralyzed.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2441d3f8d823da04c8dd19de1922e72a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/Data/FuncAnims/NexusCrab_KnockOut.asset
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/Data/FuncAnims/NexusCrab_KnockOut.asset
@@ -65,10 +65,11 @@ MonoBehaviour:
    animationName: KnockOut
    stateName: KnockOut
    useRootMotion: 0
-    disruptionType: 1000
+    tags: []
+    disruptionType: 10000
    overridePlaySpeed: 1
    overrideStartFrame: 0
-    isAffectedBySpeedMultiplier: 1
+    isAffectedBySpeedMultiplier: 0
    description: 
  intervals:
  - intervalType: 0
@@ -88,19 +89,28 @@ MonoBehaviour:
    timeRange: {x: 0, y: 0}
  - intervalType: 30
    intervalName: 
-    timeRange: {x: 1.1666666, y: 1.1666666}
+    timeRange: {x: 0, y: 0}
  - intervalType: 31
    intervalName: 
-    timeRange: {x: 1.1666666, y: 1.1666666}
+    timeRange: {x: 0, y: 0}
  - intervalType: 40
    intervalName: 
    timeRange: {x: 0, y: 0}
  eventCollection:
-    animEvents: []
+    animEvents:
+    - triggerTime: 1.1333333
+      isEnd: 0
+      payload:
+        rid: 563130907227848820
    startEvents: []
    disruptionEvents: []
    updateEvents: []
    updateUntilEvents: []
  references:
    version: 2
-    RefIds: []
+    RefIds:
+    - rid: 563130907227848820
+      type: {class: SwitchFuncAnim, ns: Cielonos.MainGame.FunctionalAnimation, asm: Assembly-CSharp}
+      data:
+        eventName: AnimSwitchFuncAnim0
+        animationName: Paralyzed
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/Data/FuncAnims/NexusCrab_Paralyzed.asset
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/Data/FuncAnims/NexusCrab_Paralyzed.asset
@@ -0,0 +1,116 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aad7ba1072fa344088a099ea9469a38, type: 3}
+  m_Name: NexusCrab_Paralyzed
+  m_EditorClassIdentifier: Assembly-CSharp::SLSUtilities.FunctionalAnimation.FuncAnimData
+  serializationData:
+    SerializedFormat: 2
+    SerializedBytes: 
+    ReferencedUnityObjects: []
+    SerializedBytesString: 
+    Prefab: {fileID: 0}
+    PrefabModificationsReferencedUnityObjects: []
+    PrefabModifications: []
+    SerializationNodes:
+    - Name: variableCollection
+      Entry: 7
+      Data: 0|SLSUtilities.FunctionalAnimation.VariableCollection, Assembly-CSharp
+    - Name: variables
+      Entry: 7
+      Data: 1|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String,
+        mscorlib]], mscorlib
+    - Name: comparer
+      Entry: 7
+      Data: 2|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
+        mscorlib]], mscorlib
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: DashMoveMultiplier
+    - Name: $v
+      Entry: 1
+      Data: 3
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+  timeMode: 1
+  animationClip: {fileID: 7400000, guid: 2441d3f8d823da04c8dd19de1922e72a, type: 2}
+  animInfo:
+    animationName: Paralyzed
+    stateName: Paralyzed
+    useRootMotion: 0
+    tags: []
+    disruptionType: 10000
+    overridePlaySpeed: 1
+    overrideStartFrame: 0
+    isAffectedBySpeedMultiplier: 0
+    description: 
+  intervals:
+  - intervalType: 0
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 10
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 20
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 21
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 11
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 12
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 22
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 32
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 30
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 31
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 40
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  eventCollection:
+    animEvents: []
+    startEvents: []
+    disruptionEvents: []
+    updateEvents: []
+    updateUntilEvents: []
+  references:
+    version: 2
+    RefIds: []
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/Data/FuncAnims/NexusCrab_Paralyzed.asset.meta
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/Data/FuncAnims/NexusCrab_Paralyzed.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e5211e20d50aeec489f30f213bc964ce
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/Data/FuncAnims/NexusCrab_Rise.asset
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/Data/FuncAnims/NexusCrab_Rise.asset
@@ -30,10 +30,11 @@ MonoBehaviour:
    animationName: Rise
    stateName: Rise
    useRootMotion: 0
-    disruptionType: 1000
+    tags: []
+    disruptionType: 10000
    overridePlaySpeed: 1
    overrideStartFrame: 0
-    isAffectedBySpeedMultiplier: 1
+    isAffectedBySpeedMultiplier: 0
    description: 
  intervals:
  - intervalType: 0
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/Data/NexusCrab_AttackData.asset
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/Data/NexusCrab_AttackData.asset
@@ -59,6 +59,9 @@ MonoBehaviour:
    - Name: damageDeviation
      Entry: 4
      Data: 0
+    - Name: isIndependentPerHit
+      Entry: 5
+      Data: false
    - Name: criticalChance
      Entry: 4
      Data: 0
@@ -74,9 +77,15 @@ MonoBehaviour:
    - Name: disruptionType
      Entry: 3
      Data: 501
+    - Name: useVFXDataHit
+      Entry: 5
+      Data: false
    - Name: hitVFX
      Entry: 10
      Data: 1
+    - Name: vfxUnitName
+      Entry: 6
+      Data: 
    - Name: overrideDamageNumber
      Entry: 5
      Data: false
@@ -110,6 +119,9 @@ MonoBehaviour:
    - Name: damageDeviation
      Entry: 4
      Data: 0
+    - Name: isIndependentPerHit
+      Entry: 5
+      Data: false
    - Name: criticalChance
      Entry: 4
      Data: 0
@@ -125,9 +137,15 @@ MonoBehaviour:
    - Name: disruptionType
      Entry: 3
      Data: 501
+    - Name: useVFXDataHit
+      Entry: 5
+      Data: false
    - Name: hitVFX
      Entry: 10
      Data: 2
+    - Name: vfxUnitName
+      Entry: 6
+      Data: 
    - Name: overrideDamageNumber
      Entry: 5
      Data: false
@@ -161,6 +179,9 @@ MonoBehaviour:
    - Name: damageDeviation
      Entry: 4
      Data: 0
+    - Name: isIndependentPerHit
+      Entry: 5
+      Data: false
    - Name: criticalChance
      Entry: 4
      Data: 0
@@ -176,9 +197,15 @@ MonoBehaviour:
    - Name: disruptionType
      Entry: 3
      Data: 501
+    - Name: useVFXDataHit
+      Entry: 5
+      Data: false
    - Name: hitVFX
      Entry: 10
      Data: 3
+    - Name: vfxUnitName
+      Entry: 6
+      Data: 
    - Name: overrideDamageNumber
      Entry: 5
      Data: false
@@ -212,6 +239,9 @@ MonoBehaviour:
    - Name: damageDeviation
      Entry: 4
      Data: 0
+    - Name: isIndependentPerHit
+      Entry: 5
+      Data: false
    - Name: criticalChance
      Entry: 4
      Data: 0
@@ -227,9 +257,15 @@ MonoBehaviour:
    - Name: disruptionType
      Entry: 3
      Data: 501
+    - Name: useVFXDataHit
+      Entry: 5
+      Data: false
    - Name: hitVFX
      Entry: 10
      Data: 2
+    - Name: vfxUnitName
+      Entry: 6
+      Data: 
    - Name: overrideDamageNumber
      Entry: 5
      Data: false
@@ -263,6 +299,9 @@ MonoBehaviour:
    - Name: damageDeviation
      Entry: 4
      Data: 0
+    - Name: isIndependentPerHit
+      Entry: 5
+      Data: false
    - Name: criticalChance
      Entry: 4
      Data: 0
@@ -278,9 +317,15 @@ MonoBehaviour:
    - Name: disruptionType
      Entry: 3
      Data: 501
+    - Name: useVFXDataHit
+      Entry: 5
+      Data: false
    - Name: hitVFX
      Entry: 10
      Data: 2
+    - Name: vfxUnitName
+      Entry: 6
+      Data: 
    - Name: overrideDamageNumber
      Entry: 5
      Data: false
@@ -314,6 +359,9 @@ MonoBehaviour:
    - Name: damageDeviation
      Entry: 4
      Data: 0
+    - Name: isIndependentPerHit
+      Entry: 5
+      Data: false
    - Name: criticalChance
      Entry: 4
      Data: 0
@@ -329,9 +377,15 @@ MonoBehaviour:
    - Name: disruptionType
      Entry: 3
      Data: 501
+    - Name: useVFXDataHit
+      Entry: 5
+      Data: false
    - Name: hitVFX
      Entry: 10
      Data: 4
+    - Name: vfxUnitName
+      Entry: 6
+      Data: 
    - Name: overrideDamageNumber
      Entry: 5
      Data: false
@@ -365,6 +419,9 @@ MonoBehaviour:
    - Name: damageDeviation
      Entry: 4
      Data: 0
+    - Name: isIndependentPerHit
+      Entry: 5
+      Data: false
    - Name: criticalChance
      Entry: 4
      Data: 0
@@ -380,9 +437,15 @@ MonoBehaviour:
    - Name: disruptionType
      Entry: 3
      Data: 501
+    - Name: useVFXDataHit
+      Entry: 5
+      Data: false
    - Name: hitVFX
      Entry: 10
      Data: 5
+    - Name: vfxUnitName
+      Entry: 6
+      Data: 
    - Name: overrideDamageNumber
      Entry: 5
      Data: false
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/Data/NexusCrab_AttributeData.asset
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/Data/NexusCrab_AttributeData.asset
@@ -34,7 +34,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 7
+      Data: 19
    - Name: 
      Entry: 7
      Data: 
@@ -119,6 +119,150 @@ MonoBehaviour:
    - Name: 
      Entry: 8
      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: FinalDamageGainMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: FinalDamageDealtMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: EnergyDamageGainMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: EnergyDamageDealtMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: KineticDamageDealtMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: KineticDamageGainMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: ExplosionDamageGainMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: ExplosionDamageDealtMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: MagicDamageDealtMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: MagicDamageGainMultiplier
+    - Name: $v
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: CriticalChance
+    - Name: $v
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: CriticalDamageAmplifier
+    - Name: $v
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: 
      Entry: 13
      Data: 
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Materials/Skin1/SciFi_Crab_Armor_Skin1
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Materials/Skin1/SciFi_Crab_Armor_Skin1
@@ -238,7 +238,7 @@ Material:
    - _ReceiveShadows: 1
    - _RimShadowStrength: 0.5
    - _SURFACE_TYPE: 0
-    - _Smoothness: 1
+    - _Smoothness: 0.75
    - _SmoothnessSrc: 4
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Materials/Skin1/SciFi_Crab_Body_Skin1
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Materials/Skin1/SciFi_Crab_Body_Skin1
@@ -238,7 +238,7 @@ Material:
    - _ReceiveShadows: 1
    - _RimShadowStrength: 0.5
    - _SURFACE_TYPE: 0
-    - _Smoothness: 1
+    - _Smoothness: 0.75
    - _SmoothnessSrc: 4
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
--- a/Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Materials/Skin1/SciFi_Crab_Claw_Skin1
+++ b/Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Materials/Skin1/SciFi_Crab_Claw_Skin1
@@ -251,7 +251,7 @@ Material:
    - _ReceiveShadows: 1
    - _RimShadowStrength: 0.5
    - _SURFACE_TYPE: 0
-    - _Smoothness: 1
+    - _Smoothness: 0.75
    - _SmoothnessSrc: 4
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1