Browse Source

增加5个随机动作

zhengchen 1 year ago
parent
commit
18dd862a22

+ 475 - 61
Assets/Resources/Cock/Cock Animator Controller.controller

@@ -14,7 +14,12 @@ AnimatorState:
   - {fileID: -4473315128745645665}
   - {fileID: -4473315128745645665}
   - {fileID: 2788325919306491345}
   - {fileID: 2788325919306491345}
   - {fileID: 7382943937658156781}
   - {fileID: 7382943937658156781}
-  - {fileID: -1568174313465977580}
+  - {fileID: 6050556604620719286}
+  - {fileID: 2606689197857555310}
+  - {fileID: -198685958074851722}
+  - {fileID: 9055306742748027863}
+  - {fileID: 4491894381806759091}
+  - {fileID: -4626789122114353730}
   m_StateMachineBehaviours: []
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
   m_IKOnFeet: 0
@@ -106,7 +111,7 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &-4473315128745645665
+--- !u!1101 &-4626789122114353730
 AnimatorStateTransition:
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -114,11 +119,11 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Name: 
   m_Conditions:
   m_Conditions:
-  - m_ConditionMode: 6
-    m_ConditionEvent: status
-    m_EventTreshold: 4
+  - m_ConditionMode: 1
+    m_ConditionEvent: random5
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -6846112518258496958}
+  m_DstState: {fileID: -647370048124823595}
   m_Solo: 0
   m_Solo: 0
   m_Mute: 0
   m_Mute: 0
   m_IsExit: 0
   m_IsExit: 0
@@ -126,12 +131,40 @@ AnimatorStateTransition:
   m_TransitionDuration: 0.25
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_TransitionOffset: 0
   m_ExitTime: 0.95454544
   m_ExitTime: 0.95454544
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &-3501271161860527057
+--- !u!1102 &-4547676964816671440
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: jump attack
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 5235830020426466314}
+  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: 1827226128182048838, guid: 7024c2f4a506b9c47b59b3fd7d2816bc,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-4473315128745645665
 AnimatorStateTransition:
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -139,24 +172,52 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Name: 
   m_Conditions:
   m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: die
-    m_EventTreshold: 0
+  - m_ConditionMode: 6
+    m_ConditionEvent: status
+    m_EventTreshold: 4
   m_DstStateMachine: {fileID: 0}
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 4835613726374646937}
+  m_DstState: {fileID: -6846112518258496958}
   m_Solo: 0
   m_Solo: 0
   m_Mute: 0
   m_Mute: 0
   m_IsExit: 0
   m_IsExit: 0
   serializedVersion: 3
   serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_TransitionOffset: 0
-  m_ExitTime: 0.75
-  m_HasExitTime: 0
+  m_ExitTime: 0.95454544
+  m_HasExitTime: 1
   m_HasFixedDuration: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &-3327778286610070961
+--- !u!1102 &-3613591249854972837
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: attack random 2
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -2653612831575421775}
+  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: 1827226128182048838, guid: b66c6568376d25844a02de1cf52d8098,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-3501271161860527057
 AnimatorStateTransition:
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -164,19 +225,19 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Name: 
   m_Conditions:
   m_Conditions:
-  - m_ConditionMode: 6
-    m_ConditionEvent: status
-    m_EventTreshold: 4
+  - m_ConditionMode: 1
+    m_ConditionEvent: die
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -6846112518258496958}
+  m_DstState: {fileID: 4835613726374646937}
   m_Solo: 0
   m_Solo: 0
   m_Mute: 0
   m_Mute: 0
   m_IsExit: 0
   m_IsExit: 0
   serializedVersion: 3
   serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_TransitionOffset: 0
-  m_ExitTime: 0.70000005
-  m_HasExitTime: 1
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_OrderedInterruption: 1
@@ -209,6 +270,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
   m_TimeParameter: 
+--- !u!1101 &-2653612831575421775
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: status
+    m_EventTreshold: 4
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6846112518258496958}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  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!1107 &-2587867510945978625
 --- !u!1107 &-2587867510945978625
 AnimatorStateMachine:
 AnimatorStateMachine:
   serializedVersion: 6
   serializedVersion: 6
@@ -232,13 +318,28 @@ AnimatorStateMachine:
     m_Position: {x: 310, y: 20, z: 0}
     m_Position: {x: 310, y: 20, z: 0}
   - serializedVersion: 1
   - serializedVersion: 1
     m_State: {fileID: -2934458478026790603}
     m_State: {fileID: -2934458478026790603}
-    m_Position: {x: 560, y: 120, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 2795725357876623327}
-    m_Position: {x: 560, y: 250, z: 0}
+    m_Position: {x: 570, y: 120, z: 0}
   - serializedVersion: 1
   - serializedVersion: 1
     m_State: {fileID: 4835613726374646937}
     m_State: {fileID: 4835613726374646937}
     m_Position: {x: 310, y: -90, z: 0}
     m_Position: {x: 310, y: -90, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -1660898100971522330}
+    m_Position: {x: 780, y: 270, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -4547676964816671440}
+    m_Position: {x: 780, y: 210, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -3613591249854972837}
+    m_Position: {x: 780, y: 330, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -744403411430071406}
+    m_Position: {x: 780, y: 390, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4427251395351343897}
+    m_Position: {x: 780, y: 450, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -647370048124823595}
+    m_Position: {x: 780, y: 510, z: 0}
   m_ChildStateMachines: []
   m_ChildStateMachines: []
   m_AnyStateTransitions:
   m_AnyStateTransitions:
   - {fileID: -3501271161860527057}
   - {fileID: -3501271161860527057}
@@ -263,7 +364,6 @@ AnimatorState:
   m_Transitions:
   m_Transitions:
   - {fileID: -527083346156805456}
   - {fileID: -527083346156805456}
   - {fileID: 6145613691323835595}
   - {fileID: 6145613691323835595}
-  - {fileID: 3293535948838808382}
   m_StateMachineBehaviours: []
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
   m_IKOnFeet: 0
@@ -280,31 +380,34 @@ AnimatorState:
   m_MirrorParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
   m_TimeParameter: 
---- !u!1101 &-1568174313465977580
-AnimatorStateTransition:
+--- !u!1102 &-1660898100971522330
+AnimatorState:
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: jumpattack
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 2795725357876623327}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.95454544
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
+  m_Name: attack random 1
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 5183772703976258126}
+  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: 1827226128182048838, guid: f5aa94cee9fd5ed44940b064afb1f882,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-767737962788023419
 --- !u!1102 &-767737962788023419
 AnimatorState:
 AnimatorState:
   serializedVersion: 6
   serializedVersion: 6
@@ -334,6 +437,87 @@ AnimatorState:
   m_MirrorParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
   m_TimeParameter: 
+--- !u!1102 &-744403411430071406
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: attack random 3
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 2104861685444172984}
+  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: 1827226128182048838, guid: b523f22a24565364ab23386cd55e882b,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-647370048124823595
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: attack random 5
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -600614188832802210}
+  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: 1827226128182048838, guid: 9c33970e193e6e342bebb347b6565178,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-600614188832802210
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: status
+    m_EventTreshold: 4
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6846112518258496958}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  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 &-527083346156805456
 --- !u!1101 &-527083346156805456
 AnimatorStateTransition:
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1
@@ -359,6 +543,31 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &-198685958074851722
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: random2
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -3613591249854972837}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.95454544
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 --- !u!91 &9100000
 AnimatorController:
 AnimatorController:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -373,31 +582,61 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: attack
   - m_Name: attack
     m_Type: 9
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: underattack
   - m_Name: underattack
     m_Type: 9
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: jumpattack
   - m_Name: jumpattack
     m_Type: 9
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: die
   - m_Name: die
     m_Type: 9
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: random1
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: random2
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: random3
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: random4
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: random5
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   m_AnimatorLayers:
   - serializedVersion: 5
   - serializedVersion: 5
     m_Name: Base Layer
     m_Name: Base Layer
@@ -411,6 +650,31 @@ AnimatorController:
     m_IKPass: 0
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
     m_Controller: {fileID: 9100000}
+--- !u!1101 &120510955580992770
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: status
+    m_EventTreshold: 4
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6846112518258496958}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  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 &351974859637822182
 --- !u!1102 &351974859637822182
 AnimatorState:
 AnimatorState:
   serializedVersion: 6
   serializedVersion: 6
@@ -439,6 +703,56 @@ AnimatorState:
   m_MirrorParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
   m_TimeParameter: 
+--- !u!1101 &2104861685444172984
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: status
+    m_EventTreshold: 4
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6846112518258496958}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  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 &2606689197857555310
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: random1
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1660898100971522330}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.95454544
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &2788325919306491345
 --- !u!1101 &2788325919306491345
 AnimatorStateTransition:
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1
@@ -464,18 +778,18 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
   m_CanTransitionToSelf: 1
---- !u!1102 &2795725357876623327
+--- !u!1102 &4427251395351343897
 AnimatorState:
 AnimatorState:
   serializedVersion: 6
   serializedVersion: 6
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: jump and attack
-  m_Speed: 1
+  m_Name: attack random 4
+  m_Speed: 4
   m_CycleOffset: 0
   m_CycleOffset: 0
   m_Transitions:
   m_Transitions:
-  - {fileID: -3327778286610070961}
+  - {fileID: 120510955580992770}
   m_StateMachineBehaviours: []
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
   m_IKOnFeet: 0
@@ -485,14 +799,14 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 1827226128182048838, guid: 7024c2f4a506b9c47b59b3fd7d2816bc,
+  m_Motion: {fileID: 1827226128182048838, guid: 88c01d4eb6475d544879cdf61423f720,
     type: 3}
     type: 3}
   m_Tag: 
   m_Tag: 
   m_SpeedParameter: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
   m_TimeParameter: 
---- !u!1101 &3293535948838808382
+--- !u!1101 &4491894381806759091
 AnimatorStateTransition:
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -501,17 +815,17 @@ AnimatorStateTransition:
   m_Name: 
   m_Name: 
   m_Conditions:
   m_Conditions:
   - m_ConditionMode: 1
   - m_ConditionMode: 1
-    m_ConditionEvent: jumpattack
+    m_ConditionEvent: random4
     m_EventTreshold: 0
     m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 2795725357876623327}
+  m_DstState: {fileID: 4427251395351343897}
   m_Solo: 0
   m_Solo: 0
   m_Mute: 0
   m_Mute: 0
   m_IsExit: 0
   m_IsExit: 0
   serializedVersion: 3
   serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_TransitionOffset: 0
-  m_ExitTime: 0.6250002
+  m_ExitTime: 0.95454544
   m_HasExitTime: 0
   m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_InterruptionSource: 0
@@ -544,6 +858,81 @@ AnimatorState:
   m_MirrorParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
   m_TimeParameter: 
+--- !u!1101 &5183772703976258126
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: status
+    m_EventTreshold: 4
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6846112518258496958}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75000095
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &5235830020426466314
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: status
+    m_EventTreshold: 4
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6846112518258496958}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.70000005
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &6050556604620719286
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: jumpattack
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -4547676964816671440}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.95454544
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &6145613691323835595
 --- !u!1101 &6145613691323835595
 AnimatorStateTransition:
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1
@@ -594,6 +983,31 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &9055306742748027863
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: random3
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -744403411430071406}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.95454544
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &9116208090115465312
 --- !u!1101 &9116208090115465312
 AnimatorStateTransition:
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_ObjectHideFlags: 1

+ 3 - 3
Assets/Scripts/Comp/BattleMainComp.cs

@@ -45,7 +45,7 @@ namespace Comp
                 ApiComp.Instance.GetBattleDetail(GameCore.Instance.curBattleSession,
                 ApiComp.Instance.GetBattleDetail(GameCore.Instance.curBattleSession,
                     (obj) => { StartCoroutine(StartGame(obj)); }, (code, msg) =>
                     (obj) => { StartCoroutine(StartGame(obj)); }, (code, msg) =>
                     {
                     {
-                        // TODO Do nothing
+                        // TODO Do nothing 
                         Debug.LogWarning("request battle err " + msg);
                         Debug.LogWarning("request battle err " + msg);
                     });
                     });
             }
             }
@@ -105,9 +105,9 @@ namespace Comp
         }
         }
 
 
         public void Lift()
         public void Lift()
-        {   
+        {
             Debug.Log("click lift");
             Debug.Log("click lift");
-            // ApiComp.Instance.MsgInBattle(GameCore.Instance.curBattleSession, new MsgContent() { contentType = "lift" });
+            ApiComp.Instance.MsgInBattle(GameCore.Instance.curBattleSession, new MsgContent() { contentType = "lift" });
             GameCore.Instance.GetCurState().LiftCock();
             GameCore.Instance.GetCurState().LiftCock();
         }
         }
 
 

+ 19 - 2
Assets/Scripts/Comp/CockActionComp.cs

@@ -27,6 +27,8 @@ namespace Comp
 
 
         public Action curAction;
         public Action curAction;
 
 
+        public int randomAttack = 0;
+
         private readonly WaitForSeconds _waitEverySecond = new WaitForSeconds(1f);
         private readonly WaitForSeconds _waitEverySecond = new WaitForSeconds(1f);
 
 
         private Rigidbody _rigidbody;
         private Rigidbody _rigidbody;
@@ -50,7 +52,7 @@ namespace Comp
         private GameObject _missPrefab;
         private GameObject _missPrefab;
 
 
         private bool _createMiss = false;
         private bool _createMiss = false;
-        
+
         public ICockController CockController
         public ICockController CockController
         {
         {
             get
             get
@@ -91,7 +93,22 @@ namespace Comp
         {
         {
             while (true)
             while (true)
             {
             {
-                curAction?.Invoke();
+                if (curAction == CockController.JumpAndAttack)
+                {
+                    if (randomAttack == 0)
+                    {
+                        curAction?.Invoke();
+                    }
+                    else
+                    {
+                        CockController.RandomAttack(randomAttack);
+                        randomAttack = 0;
+                    }
+                }
+                else
+                {
+                    curAction?.Invoke();
+                }
                 curAction = null;
                 curAction = null;
                 yield return _waitEverySecond;
                 yield return _waitEverySecond;
             }
             }

+ 43 - 2
Assets/Scripts/Game/AnimatorCockController.cs

@@ -25,6 +25,16 @@ namespace Game
 
 
         private const string TriggerDie = "die";
         private const string TriggerDie = "die";
 
 
+        private const string TriggerRandom1 = "random1";
+
+        private const string TriggerRandom2 = "random2";
+
+        private const string TriggerRandom3 = "random3";
+
+        private const string TriggerRandom4 = "random4";
+
+        private const string TriggerRandom5 = "random5";
+
         public AnimatorCockController(Animator animator)
         public AnimatorCockController(Animator animator)
         {
         {
             _animator = animator;
             _animator = animator;
@@ -69,7 +79,7 @@ namespace Game
         }
         }
 
 
         public void JumpAndAttack()
         public void JumpAndAttack()
-        {
+        {   
             _animator.ResetTrigger(TriggerJumpAttack);
             _animator.ResetTrigger(TriggerJumpAttack);
             _animator.SetTrigger(TriggerJumpAttack);
             _animator.SetTrigger(TriggerJumpAttack);
             OnJumpAttack?.Invoke();
             OnJumpAttack?.Invoke();
@@ -87,9 +97,40 @@ namespace Game
             _animator.SetTrigger(TriggerDie);
             _animator.SetTrigger(TriggerDie);
         }
         }
 
 
+        public void RandomAttack(int attack)
+        {
+            switch (attack)
+            {
+                case 1:
+                    _animator.ResetTrigger(TriggerRandom1);
+                    _animator.SetTrigger(TriggerRandom1);
+                    break;
+                case 2:
+                    _animator.ResetTrigger(TriggerRandom2);
+                    _animator.SetTrigger(TriggerRandom2);
+                    break;
+                case 3:
+                    _animator.ResetTrigger(TriggerRandom3);
+                    _animator.SetTrigger(TriggerRandom3);
+                    break;
+                case 4:
+                    _animator.ResetTrigger(TriggerRandom4);
+                    _animator.SetTrigger(TriggerRandom4);
+                    break;
+                case 5:
+                    _animator.ResetTrigger(TriggerRandom5);
+                    _animator.SetTrigger(TriggerRandom5);
+                    break;
+                default:
+                    _animator.ResetTrigger(TriggerJumpAttack);
+                    _animator.SetTrigger(TriggerJumpAttack);
+                    break;
+            }
+            OnJumpAttack?.Invoke();
+        }
+
         public void BeLift()
         public void BeLift()
         {
         {
-          
         }
         }
     }
     }
 }
 }

+ 35 - 0
Assets/Scripts/Game/AttackRandomUtil.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using UnityEngine;
+using Random = System.Random;
+
+namespace Game
+{
+    public class AttackRandomUtil
+    {
+        private static readonly Dictionary<int, int[]> CockAttackDict = new Dictionary<int, int[]>()
+        {
+            { 1, new int[] { 1, 2, 3, -1 } },
+            { 2, new int[] { 2, 3, 4, -1 } },
+            { 3, new int[] { 3, 4, 5, -1 } },
+            { 4, new int[] { 1, 2, 4, -1 } },
+            { 5, new int[] { 1, 2, 5, -1 } },
+            { 6, new int[] { 2, 4, 5, -1 } },
+            { 7, new int[] { 1, 3, 4, -1 } },
+        };
+
+        public static int GetRandomNumberFromDict(int cockId)
+        {   
+            Debug.Log("cock id is " + cockId);
+            if (CockAttackDict.ContainsKey(cockId))
+            {
+                var numbers = CockAttackDict[cockId];
+                var random = new Random();
+                var randomIndex = random.Next(0, numbers.Length);
+                return numbers[randomIndex];
+            }
+
+            // 如果 key 不存在,可以返回一个默认值或抛出异常等处理方式
+            return -1;
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Game/AttackRandomUtil.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a0c4a40d4f3a41edbe51b875a719f442
+timeCreated: 1686028673

+ 4 - 0
Assets/Scripts/Game/GameBattleState.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Timers;
 using System.Timers;
 using Comp;
 using Comp;
 using HttpApi;
 using HttpApi;
@@ -121,6 +122,9 @@ namespace Game
                 switch (log.type)
                 switch (log.type)
                 {
                 {
                     case 1:
                     case 1:
+                        var randomAttack = AttackRandomUtil.GetRandomNumberFromDict(attackCockActionComp.cockId);
+                        Debug.Log("random attack " + randomAttack);
+                        attackCockActionComp.randomAttack = randomAttack;
                         attackCockActionComp.curAction = attackCockActionComp.CockController.JumpAndAttack;
                         attackCockActionComp.curAction = attackCockActionComp.CockController.JumpAndAttack;
                         break;
                         break;
                     case 2:
                     case 2:

+ 2 - 0
Assets/Scripts/Game/ICockController.cs

@@ -29,5 +29,7 @@ namespace Game
         public void Die();
         public void Die();
 
 
         public void BeLift();
         public void BeLift();
+
+        public void RandomAttack(int attack);
     }
     }
 }
 }