Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Assets/Resources/PreFabs/Boss/Pride.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ GameObject:
m_Component:
- component: {fileID: 4350625489079944}
- component: {fileID: 114903779053869282}
- component: {fileID: 70307255014248104}
- component: {fileID: 70478785136066894}
m_Layer: 18
m_Name: DamageZone
m_TagString: Untagged
Expand Down Expand Up @@ -654,7 +654,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1641845997050472}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 22.87, y: -4.49, z: 0}
m_LocalPosition: {x: 22.87, y: -4.12, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4232994610428170}
Expand Down Expand Up @@ -682,7 +682,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1991446551563244}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.21, y: 3.44, z: 0}
m_LocalPosition: {x: -1.21, y: 3.04, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4545672074246678}
Expand Down Expand Up @@ -1069,7 +1069,7 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!70 &70307255014248104
--- !u!70 &70478785136066894
CapsuleCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
Expand Down Expand Up @@ -1795,7 +1795,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
target: {fileID: 0}
viewDistance: 10
strikeCount: 1
strikeCount: 2
trackingSpeed: 30
delay: 2
punchDelay: 2
Expand Down
83 changes: 82 additions & 1 deletion Assets/Resources/RealArtAssets/Animations/PrideAC.controller
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ AnimatorController:
m_PrefabInternal: {fileID: 0}
m_Name: PrideAC
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: IsChargingPunch
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 1
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand All @@ -21,6 +27,27 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101056169988668430
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102296240920957794}
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 &1101481787661121226
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand All @@ -42,6 +69,56 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101939385107395976
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsChargingPunch
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102257062877400174}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.70967746
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102257062877400174
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: PridePunchCharge
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101056169988668430}
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: 675cea13eef9b804387daf2c628deb16, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102296240920957794
AnimatorState:
serializedVersion: 5
Expand All @@ -53,6 +130,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101481787661121226}
- {fileID: 1101939385107395976}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand All @@ -79,6 +157,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1102296240920957794}
m_Position: {x: 372, y: 24, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102257062877400174}
m_Position: {x: 360, y: 168, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand Down
49 changes: 44 additions & 5 deletions Assets/Resources/RealArtAssets/Animations/PridePunchCharge.anim
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,60 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- time: 0.083333336
value: {fileID: 21300002, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- time: 0.16666667
value: {fileID: 21300004, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- time: 0.25
value: {fileID: 21300006, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- time: 0.33333334
value: {fileID: 21300030, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- time: 0.41666666
value: {fileID: 21300008, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- time: 0.5
value: {fileID: 21300034, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- time: 0.5833333
value: {fileID: 21300010, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- time: 1
value: {fileID: 21300010, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 120
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- {fileID: 21300002, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- {fileID: 21300004, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- {fileID: 21300006, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- {fileID: 21300030, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- {fileID: 21300008, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- {fileID: 21300034, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- {fileID: 21300010, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
- {fileID: 21300010, guid: e633ede3927f5ec478f0572236e6c17f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 1.0083333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand Down
Loading