Skip to content

B
BattleMuscle
Commit baadb64f authored by czy's avatar czy
Browse files
Options

物理模拟击退效果，

parent 362a1dd4
Show whitespace changes
Inline Side-by-side
Showing with 439 additions and 34 deletions
BattleMuscle/Assets/Art_Assets/Animation/Animation/Boss/Hurricane Kick.anim
View file @ baadb64f
......@@ -8466,3 +8466,10 @@ AnimationClip:
floatParameter: 0
intParameter: 2
messageOptions: 0
- time: 1.8333334
functionName: ChangeAttackType
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
BattleMuscle/Assets/My/HurricaneKickBefor.anim → BattleMuscle/Assets/Art_Assets/Animation/Animation/Boss/HurricaneKickBefor.anim
View file @ baadb64f
......@@ -31,12 +31,12 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.98333335
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
......@@ -51,8 +51,15 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
- time: 0.98333335
functionName: HurricaneKickBeforEnd
- time: 0
functionName: ChangeAttackType
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 1
functionName: ChangeAttackType
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
......
BattleMuscle/Assets/My/HurricaneKickBefor.anim.meta → BattleMuscle/Assets/Art_Assets/Animation/Animation/Boss/HurricaneKickBefor.anim.meta
View file @ baadb64f
fileFormatVersion: 2
guid: d266a3801edfb2d4ebf814eeea93f5d2
guid: 1e8ba1c691d0bb6409b39a59d55e5c4b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
......
BattleMuscle/Assets/Art_Assets/Animation/Animation/Boss/Leg Sweep.anim
View file @ baadb64f
......@@ -37079,10 +37079,17 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
- time: 0
- time: 0.6
functionName: ChangeAttackType
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 1
messageOptions: 0
- time: 1.4666667
functionName: ChangeAttackType
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
BattleMuscle/Assets/Art_Assets/Animation/Animation/Boss/Running2.anim → BattleMuscle/Assets/Art_Assets/Animation/Animation/Boss/RunningBoss2.anim
View file @ baadb64f
......@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Running2
m_Name: RunningBoss2
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
......
BattleMuscle/Assets/Art_Assets/Animation/AnimationController/Running2.controller
View file @ baadb64f
......@@ -161,9 +161,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.048737466
m_TransitionOffset: 0
m_ExitTime: 0.75
m_ExitTime: 0.9825936
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
......@@ -313,9 +313,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.06047981
m_TransitionOffset: 0
m_ExitTime: 0.75
m_ExitTime: 0.011724846
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
......@@ -419,7 +419,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: d266a3801edfb2d4ebf814eeea93f5d2, type: 2}
m_Motion: {fileID: 7400000, guid: 1e8ba1c691d0bb6409b39a59d55e5c4b, type: 2}
m_Tag:
m_SpeedParameter: MoveSpeed
m_MirrorParameter:
......
BattleMuscle/Assets/Levels/Level 1.unity
View file @ baadb64f
......@@ -322,11 +322,56 @@ PrefabInstance:
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -7519532998605534014, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -73.98339
objectReference: {fileID: 0}
- target: {fileID: -7519532998605534014, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 71.647705
objectReference: {fileID: 0}
- target: {fileID: -7519532998605534014, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 81.69882
objectReference: {fileID: 0}
- target: {fileID: -6984002361558842191, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 25.165503
objectReference: {fileID: 0}
- target: {fileID: -6984002361558842191, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -11.111976
objectReference: {fileID: 0}
- target: {fileID: -6984002361558842191, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -11.566704
objectReference: {fileID: 0}
- target: {fileID: -6937200177745312252, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -6883891159914925115, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 18.659735
objectReference: {fileID: 0}
- target: {fileID: -6883891159914925115, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -5.214117
objectReference: {fileID: 0}
- target: {fileID: -6883891159914925115, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 5.114747
objectReference: {fileID: 0}
- target: {fileID: -6632131689168516589, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
......@@ -337,6 +382,36 @@ PrefabInstance:
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -5144743941457257460, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -0.10893341
objectReference: {fileID: 0}
- target: {fileID: -5144743941457257460, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -5.522031
objectReference: {fileID: 0}
- target: {fileID: -5144743941457257460, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -21.197369
objectReference: {fileID: 0}
- target: {fileID: -5065176076335225684, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -36.9988
objectReference: {fileID: 0}
- target: {fileID: -5065176076335225684, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -4.77508
objectReference: {fileID: 0}
- target: {fileID: -5065176076335225684, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -135.52197
objectReference: {fileID: 0}
- target: {fileID: -4993361902340503582, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
......@@ -427,6 +502,21 @@ PrefabInstance:
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -3261535237951071390, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -7.3398137
objectReference: {fileID: 0}
- target: {fileID: -3261535237951071390, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -3.884079
objectReference: {fileID: 0}
- target: {fileID: -3261535237951071390, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 65.53721
objectReference: {fileID: 0}
- target: {fileID: -3029444076808445479, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
......@@ -442,16 +532,76 @@ PrefabInstance:
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -1807306357841275755, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -12.272211
objectReference: {fileID: 0}
- target: {fileID: -1807306357841275755, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -0.43465254
objectReference: {fileID: 0}
- target: {fileID: -1807306357841275755, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -0.546787
objectReference: {fileID: 0}
- target: {fileID: -1792695488221546686, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -1697049548083054309, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 65.40091
objectReference: {fileID: 0}
- target: {fileID: -1697049548083054309, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -179.83241
objectReference: {fileID: 0}
- target: {fileID: -1697049548083054309, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -179.86511
objectReference: {fileID: 0}
- target: {fileID: -1695411754959855279, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 9464194c960614a43a6a515b5694837c, type: 2}
- target: {fileID: -1199401923691735959, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -75.83025
objectReference: {fileID: 0}
- target: {fileID: -1199401923691735959, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -139.53984
objectReference: {fileID: 0}
- target: {fileID: -1199401923691735959, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -94.14528
objectReference: {fileID: 0}
- target: {fileID: -1112810947780112947, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 2.4924002
objectReference: {fileID: 0}
- target: {fileID: -1112810947780112947, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -0.7723762
objectReference: {fileID: 0}
- target: {fileID: -1112810947780112947, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -10.811049
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Name
......@@ -462,6 +612,21 @@ PrefabInstance:
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 1140809339128530811, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 9.259758
objectReference: {fileID: 0}
- target: {fileID: 1140809339128530811, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -16.900887
objectReference: {fileID: 0}
- target: {fileID: 1140809339128530811, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 5.8934026
objectReference: {fileID: 0}
- target: {fileID: 1789740291984898735, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
......@@ -477,16 +642,91 @@ PrefabInstance:
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 4086095921734572578, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 54.57777
objectReference: {fileID: 0}
- target: {fileID: 4086095921734572578, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 179.87422
objectReference: {fileID: 0}
- target: {fileID: 4086095921734572578, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 179.91318
objectReference: {fileID: 0}
- target: {fileID: 4414759268549794378, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 2.0614586
objectReference: {fileID: 0}
- target: {fileID: 4414759268549794378, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -27.560272
objectReference: {fileID: 0}
- target: {fileID: 4414759268549794378, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -125.40353
objectReference: {fileID: 0}
- target: {fileID: 4471564477795453260, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 4965312770347051347, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -54.029728
objectReference: {fileID: 0}
- target: {fileID: 4965312770347051347, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 158.74948
objectReference: {fileID: 0}
- target: {fileID: 4965312770347051347, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -162.35678
objectReference: {fileID: 0}
- target: {fileID: 5560463630174226581, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 12.594616
objectReference: {fileID: 0}
- target: {fileID: 5560463630174226581, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -20.060995
objectReference: {fileID: 0}
- target: {fileID: 5560463630174226581, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 116.76083
objectReference: {fileID: 0}
- target: {fileID: 6132343894627748532, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 6301474076069580183, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 88.84733
objectReference: {fileID: 0}
- target: {fileID: 6301474076069580183, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 6301474076069580183, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 180
objectReference: {fileID: 0}
- target: {fileID: 6480516387375092837, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
......@@ -497,11 +737,56 @@ PrefabInstance:
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 6689581284347653050, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -5.082804
objectReference: {fileID: 0}
- target: {fileID: 6689581284347653050, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0.92683583
objectReference: {fileID: 0}
- target: {fileID: 6689581284347653050, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -38.667637
objectReference: {fileID: 0}
- target: {fileID: 6939401398325327039, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 11.27268
objectReference: {fileID: 0}
- target: {fileID: 6939401398325327039, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -34.582024
objectReference: {fileID: 0}
- target: {fileID: 6939401398325327039, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 8.241844
objectReference: {fileID: 0}
- target: {fileID: 7946771998673071904, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 7987552239307699282, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 43.461643
objectReference: {fileID: 0}
- target: {fileID: 7987552239307699282, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 36.388996
objectReference: {fileID: 0}
- target: {fileID: 7987552239307699282, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 6.8211026
objectReference: {fileID: 0}
- target: {fileID: 8208171171121102517, guid: 092b5adfc35664b43a5e216c3aba0c4d,
type: 3}
propertyPath: m_Layer
......@@ -1808,7 +2093,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
value: 0
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalRotation.y
......@@ -1820,7 +2105,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
value: 1
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_RootOrder
......@@ -1828,7 +2113,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
value: 0
objectReference: {fileID: 0}
- target: {fileID: 473558, guid: 632339e29e2ddd64aab6f9dd68facc82, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
......@@ -7487,7 +7772,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
VSpeed: 10
life: 300
life: 30
scale: 1
MinScale: 0.2
targetList:
......@@ -8488,6 +8773,7 @@ MonoBehaviour:
topPOS: {fileID: 1074946583}
Count: 0
tempFoodNumber: 0
rig: {fileID: 0}
--- !u!54 &616173311
Rigidbody:
m_ObjectHideFlags: 0
......@@ -11718,6 +12004,7 @@ MonoBehaviour:
topPOS: {fileID: 658860373}
tempFoodNumber: 0
Count: 0
rig: {fileID: 0}
--- !u!4 &883198006
Transform:
m_ObjectHideFlags: 0
......@@ -16961,7 +17248,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1290525174
RectTransform:
m_ObjectHideFlags: 0
......@@ -17650,6 +17937,7 @@ MonoBehaviour:
topPOS: {fileID: 861607386}
Count: 0
tempFoodNumber: 0
rig: {fileID: 0}
--- !u!54 &1342203614
Rigidbody:
m_ObjectHideFlags: 0
......@@ -38346,7 +38634,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6064464677770921088
RectTransform:
m_ObjectHideFlags: 0
BattleMuscle/Assets/My/Model/HurricaneKickTrigger.prefab
View file @ baadb64f
......@@ -50,7 +50,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7483224581113721909}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
......
BattleMuscle/Assets/My/Model/LegSweepTrigger.prefab
View file @ baadb64f
......@@ -50,7 +50,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6039842180593449807}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
......
BattleMuscle/Assets/My/Scripts/AI/AIMove.cs
View file @ baadb64f
......@@ -61,6 +61,8 @@ public class AIMove : MonoBehaviour
public GameObject topPOS;
public int Count = 0;
public int tempFoodNumber = 0;
public Rigidbody rig;
private Vector3 DistanceByForce = new Vector3(0, 0, 0);//在各个方向上的位移（模拟力）
// Start is called before the first frame update
void Start()
......@@ -73,6 +75,7 @@ public class AIMove : MonoBehaviour
aiState = AIState.FindFood;
animationManager = GetComponentInChildren<AnimationManager>();
tempFoodNumber = CurrentFood;
rig = GetComponentInChildren<Rigidbody>();
}
......@@ -496,6 +499,22 @@ public class AIMove : MonoBehaviour
//animator.SetBool("Push", false);
//animator.SetBool("Punch", false);
animationManager.ChangeAnimatorState(AnimationState.Vertigo);
//眩晕状态也会被击退
xDelta = 0;
yDelta = 0;
zDelta = 0;
//------------模拟力-----------------------
Vector3 tempDis = DistanceByForce;
DistanceByForce = Vector3.Lerp(DistanceByForce, new Vector3(0, 0, 0), 0.1f);
tempDis -= DistanceByForce;
//print("DistanceByForce:"+ DistanceByForce+ "tempDis:" + tempDis);
xDelta += tempDis.x;
yDelta += tempDis.y;
zDelta += tempDis.z;
//-----------------------------------------
characterController.Move(new Vector3(xDelta, yDelta, zDelta));//移动
}
else
{
......@@ -570,6 +589,16 @@ public class AIMove : MonoBehaviour
angle = -Mathf.Abs(angle);
}
transform.localEulerAngles = new Vector3(0, angle, 0);
//------------模拟力-----------------------
Vector3 tempDis = DistanceByForce;
DistanceByForce = Vector3.Lerp(DistanceByForce, new Vector3(0, 0, 0), 0.1f);
tempDis -= DistanceByForce;
//print("DistanceByForce:"+ DistanceByForce+ "tempDis:" + tempDis);
xDelta += tempDis.x;
yDelta += tempDis.y;
zDelta += tempDis.z;
//-----------------------------------------
//print(targetObj+"AI开始移动:"+ new Vector3(xDelta, yDelta, zDelta));
characterController.Move(new Vector3(xDelta, yDelta, zDelta));//移动
......@@ -649,6 +678,13 @@ public class AIMove : MonoBehaviour
rig.AddForce(Quaternion.Euler(new Vector3(-45, randomAngle+i * 360.0f / number, 0)) * Vector3.forward * Force);
}
}
public void GetHitToBack(Vector3 OtherPostion)
{
Vector3 dic = (transform.position - OtherPostion).normalized * 5;
dic.y = 0;
DistanceByForce = dic;
}
private void OnDestroy()
{
......
BattleMuscle/Assets/My/Scripts/AI/BossAttack.cs
View file @ baadb64f
......@@ -34,6 +34,7 @@ public class BossAttack : MonoBehaviour
// Update is called once per frame
void Update()
{
print(attackType);
switch (attackType)
{
case AttackType.Null:
......
BattleMuscle/Assets/My/Scripts/AI/BossMove.cs
View file @ baadb64f
......@@ -164,7 +164,7 @@ public class BossMove : MonoBehaviour
{
//print("游戏是否开始："+ BattleCtrl.instance.isStartBattle);
//print("游戏是否结束："+ BattleCtrl.instance.isEndBattle);
print(bossState);
//print(bossState);
//----技能冷却--------------------------------------------------------------
if (isDeltaTime)
......@@ -256,7 +256,7 @@ public class BossMove : MonoBehaviour
}
else
{
print("LegSweepIsFinsh:" + LegSweepIsFinsh+ "HurricaneKickIsFinsh:"+ HurricaneKickIsFinsh+ "dic >= 10:" + (dic >= 10)+ "dic:" + dic);
//print("LegSweepIsFinsh:" + LegSweepIsFinsh+ "HurricaneKickIsFinsh:"+ HurricaneKickIsFinsh+ "dic >= 10:" + (dic >= 10)+ "dic:" + dic);
print("攻击动画未完成，或者目标在攻击范围");
}
......@@ -290,7 +290,7 @@ public class BossMove : MonoBehaviour
// isHurricaneKick = false;
//}
bossAnimationManager.ChangeAnimatorState(BossAnimationState.HurricaneKick);
bossAttack.attackType = AttackType.HurricaneKick;
//bossAttack.attackType = AttackType.HurricaneKick; //由帧事件开启。
}
else if (dic < 10 && !isDeltaTime2)
{
......
BattleMuscle/Assets/My/Scripts/Player/AttackTrigger.cs
View file @ baadb64f
......@@ -53,16 +53,19 @@ public class AttackTrigger : MonoBehaviour
//print(other.name+"受到伤害：");
if (other.tag == "Player")
{
other.gameObject.GetComponentInChildren<PlayerMove>().Hurt(5);
ps= Instantiate(hitEffects, hitPos.transform.position, hitPos.transform.rotation);
other.gameObject.GetComponentInChildren<PlayerMove>().Hurt(3);
other.gameObject.GetComponentInChildren<PlayerMove>().GetHitToBack(Root.transform.position);
ps = Instantiate(hitEffects, hitPos.transform.position, hitPos.transform.rotation);
ps.gameObject.AddComponent<DestroyMySel>();
//Handheld.Vibrate();//手机震动
}
else if (other.tag == "Competitor")
{
other.gameObject.GetComponentInChildren<AIMove>().Hurt(5);
ps=Instantiate(hitEffects, hitPos.transform.position, hitPos.transform.rotation);
print(Root.name+"攻击了："+other.name);
other.gameObject.GetComponentInChildren<AIMove>().Hurt(3);
other.gameObject.GetComponentInChildren<AIMove>().GetHitToBack(Root.transform.position);
ps =Instantiate(hitEffects, hitPos.transform.position, hitPos.transform.rotation);
ps.gameObject.AddComponent<DestroyMySel>();
if (Root.tag == "Player")
{
......
BattleMuscle/Assets/My/Scripts/Player/PlayerMove.cs
View file @ baadb64f
......@@ -56,7 +56,9 @@ public class PlayerMove : MonoBehaviour
public int tempFoodNumber=0;
public int Count = 0;
public Rigidbody rig;
private Vector3 DistanceByForce=new Vector3(0,0,0);//在各个方向上的位移（模拟力）
// Start is called before the first frame update
void Start()
......@@ -70,6 +72,7 @@ public class PlayerMove : MonoBehaviour
characterController = GetComponentInChildren<CharacterController>();
animationManager = GetComponentInChildren<AnimationManager>();
tempFoodNumber = CurrentFood;
rig = GetComponentInChildren<Rigidbody>();
}
private void OnTriggerEnter(Collider other)
......@@ -164,6 +167,9 @@ public class PlayerMove : MonoBehaviour
ChangeAnimationscaleState(scale);
}
}
//受到伤害
public void Hurt(int hurt)
{
......@@ -296,6 +302,22 @@ public class PlayerMove : MonoBehaviour
//print("游戏是否开始："+ BattleCtrl.instance.isStartBattle);
//print("游戏是否结束："+ BattleCtrl.instance.isEndBattle);
//if (Input.GetKeyDown(KeyCode.W))
//{
// DistanceByForce += new Vector3(0,0,5);
//}
//if (Input.GetKeyDown(KeyCode.S))
//{
// DistanceByForce += new Vector3(0, 0, -5);
//}
//if (Input.GetKeyDown(KeyCode.Q))
//{
// DistanceByForce += new Vector3(-5, 0, 0);
//}
//if (Input.GetKeyDown(KeyCode.D))
//{
// DistanceByForce += new Vector3(5, 0, 0);
//}
reduceStep = 0.023f / 0.1f * addScale;
if (!BattleCtrl.instance.isStartBattle)
......@@ -309,9 +331,10 @@ public class PlayerMove : MonoBehaviour
return;
}
RaycastHit hit;
xDelta = 0;
yDelta = 0;
zDelta = 0;
//xDelta = 0;
//yDelta = 0;
//zDelta = 0;
//不在地面上给物体添加一个模拟重力
Grounded = characterController.isGrounded;
if (!Grounded)
......@@ -353,6 +376,23 @@ public class PlayerMove : MonoBehaviour
vertigoEffect.gameObject.SetActive(true);
//AnimationManager(AnimationState.Vertigo);//眩晕动画
animationManager.ChangeAnimatorState(AnimationState.Vertigo);
//眩晕状态也会被击退
xDelta = 0;
yDelta = 0;
zDelta = 0;
//------------模拟力-----------------------
Vector3 tempDis = DistanceByForce;
DistanceByForce = Vector3.Lerp(DistanceByForce, new Vector3(0, 0, 0), 0.1f);
tempDis -= DistanceByForce;
//print("DistanceByForce:"+ DistanceByForce+ "tempDis:" + tempDis);
xDelta += tempDis.x;
yDelta += tempDis.y;
zDelta += tempDis.z;
//-----------------------------------------
characterController.Move(new Vector3(xDelta, yDelta, zDelta));//移动
}
else
{
......@@ -427,10 +467,10 @@ public class PlayerMove : MonoBehaviour
{
//transform.position += transform.right * GameServices.inputService.joyStick.axisX.axisValue * HSpeed * Time.deltaTime;
xDelta += GameServices.inputService.joyStick.axisX.axisValue * VSpeed * Time.deltaTime;
xDelta = GameServices.inputService.joyStick.axisX.axisValue * VSpeed * Time.deltaTime;
//characterController.Move((transform.forward * MoveSpeed + new Vector3(0, _vertSpeed, 0)) * Time.deltaTime + (new Vector3(xDelta, 0, 0)));
}
zDelta += GameServices.inputService.joyStick.axisY.axisValue * VSpeed * Time.deltaTime;
zDelta = GameServices.inputService.joyStick.axisY.axisValue * VSpeed * Time.deltaTime;
if (xDelta!=0||zDelta!=0)
{
//float angle = Vector3.Angle(new Vector3(transform.forward.x, 0, transform.forward.z), new Vector3(xDelta, 0, zDelta));
......@@ -448,6 +488,16 @@ public class PlayerMove : MonoBehaviour
{
characterController.Move(new Vector3(0,0,0));
}
//------------模拟力-----------------------
Vector3 tempDis = DistanceByForce;
DistanceByForce = Vector3.Lerp(DistanceByForce,new Vector3(0,0,0),0.1f);
tempDis -=DistanceByForce;
//print("DistanceByForce:"+ DistanceByForce+ "tempDis:" + tempDis);
xDelta += tempDis.x;
yDelta += tempDis.y;
zDelta += tempDis.z;
//-----------------------------------------
//print("Player开始移动:" + new Vector3(xDelta, yDelta, zDelta));
characterController.Move(new Vector3(xDelta, yDelta, zDelta));//移动
......@@ -493,7 +543,13 @@ public class PlayerMove : MonoBehaviour
}
}
public void GetHitToBack(Vector3 OtherPostion)
{
Vector3 dic = (children.transform.position- OtherPostion).normalized *5;
dic.y = 0;
DistanceByForce = dic;
}
void OnDestroy()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment