更新

2025-12-17 04:19:38 -05:00
parent 7c1cb7e8e1
commit d15957c719
4315 changed files with 8260710 additions and 2940 deletions
--- a/Assets/Prefabs/Characters/Player/PlayerAnimator.controller
+++ b/Assets/Prefabs/Characters/Player/PlayerAnimator.controller
@@ -44,33 +44,6 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1102 &-9097864352496997389
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: GetHitLightFront
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 8413014435192931226}
-  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: 72c439c77b7ef1340b0dd53e93a0b4d8, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
 --- !u!1101 &-8987580096454832563
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -235,7 +208,7 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: GetHitLightRight
+  m_Name: GetHitHeavyRight
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
@@ -249,7 +222,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: f52d616afa8adba48a158ea08256d21a, type: 2}
+  m_Motion: {fileID: 7400000, guid: 65e497bb7cf6d72499ca7517982edc19, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
@@ -1432,7 +1405,7 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: GetHitLightBack
+  m_Name: GetHitHeavyBack
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
@@ -1446,7 +1419,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 92a05bbab37dcc74590d0dd4e5037a74, type: 2}
+  m_Motion: {fileID: 7400000, guid: 468d58630242eb54b8c247544e709556, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
@@ -2092,22 +2065,16 @@ AnimatorStateMachine:
    m_Position: {x: 270, y: 190, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -4553640345759427425}
-    m_Position: {x: 70, y: 600, z: 0}
+    m_Position: {x: 500, y: 600, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 1323404661303659021}
-    m_Position: {x: 70, y: 660, z: 0}
+    m_Position: {x: 500, y: 660, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -8765853485130612529}
-    m_Position: {x: 70, y: 720, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -9097864352496997389}
-    m_Position: {x: 70, y: 550, z: 0}
+    m_Position: {x: 500, y: 720, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -1459804473153763200}
-    m_Position: {x: 610, y: 630, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 4656878464840562771}
-    m_Position: {x: 830, y: 630, z: 0}
+    m_Position: {x: 500, y: 550, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -4400923499621966798}
    m_Position: {x: 0, y: 70, z: 0}
@@ -2198,6 +2165,9 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: 1580738774528897934}
    m_Position: {x: 290, y: 720, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 566567942758385083}
+    m_Position: {x: 710, y: 550, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
@@ -2563,28 +2533,6 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &-2537241583204209866
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions: []
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.765625
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1101 &-2471508796391184913
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -2885,7 +2833,8 @@ AnimatorState:
  m_Name: GetHitHeavyFront
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 2986024065055868645}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -3571,6 +3520,33 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1102 &566567942758385083
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GetHitDisruptionFront
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1307116141377786621}
+  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: be2660eb64d0a60498242c08fc4143f6, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &621148957060572734
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -3717,6 +3693,28 @@ AnimatorStateTransition:
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
 --- !u!1101 &1198064956847895053
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1307116141377786621
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@@ -3745,7 +3743,7 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: GetHitLightLeft
+  m_Name: GetHitHeavyLeft
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
@@ -3759,7 +3757,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: e8ddc7a7d03a5014d88682f41efa8ced, type: 2}
+  m_Motion: {fileID: 7400000, guid: 7f9bfcedea7f3c24998db68b0ed92fa6, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
@@ -4419,6 +4417,28 @@ AnimatorState:
  m_CycleOffsetParameter: 
  m_TimeParameter: 
 --- !u!1101 &2944155920127158802
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &2986024065055868645
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@@ -4964,33 +4984,6 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &4656878464840562771
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RiseFront
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -2537241583204209866}
-  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: cfd96fc17408a3740a266f516b696c4d, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
 --- !u!1101 &4682383652894339095
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -6160,28 +6153,6 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &8413014435192931226
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions: []
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.75
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &8420777663153983490
 AnimatorState:
  serializedVersion: 6