diff --git a/Assets/Animations/Idle.anim b/Assets/Animations/Idle.anim index 34ee69d..9334610 100644 --- a/Assets/Animations/Idle.anim +++ b/Assets/Animations/Idle.anim @@ -47,7 +47,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm - curve: serializedVersion: 2 m_Curve: @@ -81,7 +81,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm m_PositionCurves: - curve: serializedVersion: 2 @@ -116,7 +116,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -211,7 +211,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -250,7 +250,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -289,7 +289,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -328,7 +328,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -367,7 +367,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -406,7 +406,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -445,7 +445,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -484,7 +484,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -523,7 +523,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -536,7 +536,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -548,7 +548,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -560,7 +560,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -572,7 +572,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -584,7 +584,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -596,7 +596,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 0 diff --git a/Assets/Animations/Player.controller b/Assets/Animations/Player.controller index e9afbba..594c3df 100644 --- a/Assets/Animations/Player.controller +++ b/Assets/Animations/Player.controller @@ -129,7 +129,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: PlayerClimb + m_Name: Climb m_Speed: 1 m_CycleOffset: 0 m_Transitions: diff --git a/Assets/Animations/Player/Body_ThrowHammer.anim b/Assets/Animations/Player/Body_ThrowHammer.anim index 95f8172..10fa14b 100644 --- a/Assets/Animations/Player/Body_ThrowHammer.anim +++ b/Assets/Animations/Player/Body_ThrowHammer.anim @@ -74,7 +74,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm - curve: serializedVersion: 2 m_Curve: @@ -135,7 +135,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm - curve: serializedVersion: 2 m_Curve: @@ -196,7 +196,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm - curve: serializedVersion: 2 m_Curve: @@ -257,7 +257,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm m_PositionCurves: - curve: serializedVersion: 2 @@ -310,7 +310,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -441,7 +441,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -498,7 +498,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -555,7 +555,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -621,7 +621,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -687,7 +687,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -753,7 +753,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -819,7 +819,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -885,7 +885,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -951,7 +951,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -1017,7 +1017,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -1083,7 +1083,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -1149,7 +1149,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -1215,7 +1215,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -1281,7 +1281,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -1347,7 +1347,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -1360,7 +1360,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1372,7 +1372,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1384,7 +1384,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1396,7 +1396,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1408,7 +1408,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1420,7 +1420,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1432,7 +1432,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1444,7 +1444,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1456,7 +1456,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1468,7 +1468,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1480,7 +1480,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1492,7 +1492,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 0 diff --git a/Assets/Animations/Player/Body_Walk.anim b/Assets/Animations/Player/Body_Walk.anim index ee54340..5a27188 100644 --- a/Assets/Animations/Player/Body_Walk.anim +++ b/Assets/Animations/Player/Body_Walk.anim @@ -74,7 +74,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm - curve: serializedVersion: 2 m_Curve: @@ -126,7 +126,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm - curve: serializedVersion: 2 m_Curve: @@ -187,7 +187,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm - curve: serializedVersion: 2 m_Curve: @@ -248,7 +248,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm m_PositionCurves: - curve: serializedVersion: 2 @@ -301,7 +301,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -432,7 +432,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -489,7 +489,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -546,7 +546,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Viking_Parts/Torso/Head + path: Viking_Side/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -612,7 +612,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -678,7 +678,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -744,7 +744,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -801,7 +801,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -858,7 +858,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -915,7 +915,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -981,7 +981,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -1047,7 +1047,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -1113,7 +1113,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 16 @@ -1179,7 +1179,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -1245,7 +1245,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -1311,7 +1311,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 16 @@ -1324,7 +1324,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1336,7 +1336,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1348,7 +1348,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/L_Arm/L_LowerArm + path: Viking_Side/Torso/Head/L_Arm/L_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1360,7 +1360,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1372,7 +1372,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1384,7 +1384,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/R_Arm + path: Viking_Side/Torso/Head/R_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1396,7 +1396,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1408,7 +1408,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1420,7 +1420,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/L_Arm + path: Viking_Side/Torso/Head/L_Arm classID: 4 script: {fileID: 0} flags: 0 @@ -1432,7 +1432,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1444,7 +1444,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 0 @@ -1456,7 +1456,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/Head/R_Arm/R_LowerArm + path: Viking_Side/Torso/Head/R_Arm/R_LowerArm classID: 4 script: {fileID: 0} flags: 0 diff --git a/Assets/Animations/Player/Legs_Walk.anim b/Assets/Animations/Player/Legs_Walk.anim index 40badbb..a7dc5c6 100644 --- a/Assets/Animations/Player/Legs_Walk.anim +++ b/Assets/Animations/Player/Legs_Walk.anim @@ -56,7 +56,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg - curve: serializedVersion: 2 m_Curve: @@ -99,7 +99,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/L_Leg/L_Knee + path: Viking_Side/Torso/L_Leg/L_Knee - curve: serializedVersion: 2 m_Curve: @@ -160,7 +160,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/L_Leg/L_Knee/L_Toe + path: Viking_Side/Torso/L_Leg/L_Knee/L_Toe - curve: serializedVersion: 2 m_Curve: @@ -212,7 +212,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg - curve: serializedVersion: 2 m_Curve: @@ -264,7 +264,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/R_Leg/R_Knee + path: Viking_Side/Torso/R_Leg/R_Knee - curve: serializedVersion: 2 m_Curve: @@ -316,7 +316,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/R_Leg/R_Knee/R_Toe + path: Viking_Side/Torso/R_Leg/R_Knee/R_Toe m_PositionCurves: - curve: serializedVersion: 2 @@ -360,7 +360,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg - curve: serializedVersion: 2 m_Curve: @@ -403,7 +403,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -552,7 +552,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -600,7 +600,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -648,7 +648,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -696,7 +696,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg classID: 4 script: {fileID: 0} flags: 16 @@ -744,7 +744,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg classID: 4 script: {fileID: 0} flags: 16 @@ -792,7 +792,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg classID: 4 script: {fileID: 0} flags: 16 @@ -840,7 +840,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/L_Leg/L_Knee + path: Viking_Side/Torso/L_Leg/L_Knee classID: 4 script: {fileID: 0} flags: 16 @@ -888,7 +888,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/L_Leg/L_Knee + path: Viking_Side/Torso/L_Leg/L_Knee classID: 4 script: {fileID: 0} flags: 16 @@ -936,7 +936,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/L_Leg/L_Knee + path: Viking_Side/Torso/L_Leg/L_Knee classID: 4 script: {fileID: 0} flags: 16 @@ -1002,7 +1002,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/L_Leg/L_Knee/L_Toe + path: Viking_Side/Torso/L_Leg/L_Knee/L_Toe classID: 4 script: {fileID: 0} flags: 16 @@ -1068,7 +1068,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/L_Leg/L_Knee/L_Toe + path: Viking_Side/Torso/L_Leg/L_Knee/L_Toe classID: 4 script: {fileID: 0} flags: 16 @@ -1134,7 +1134,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/L_Leg/L_Knee/L_Toe + path: Viking_Side/Torso/L_Leg/L_Knee/L_Toe classID: 4 script: {fileID: 0} flags: 16 @@ -1182,7 +1182,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -1230,7 +1230,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -1278,7 +1278,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -1335,7 +1335,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg classID: 4 script: {fileID: 0} flags: 16 @@ -1392,7 +1392,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg classID: 4 script: {fileID: 0} flags: 16 @@ -1449,7 +1449,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg classID: 4 script: {fileID: 0} flags: 16 @@ -1506,7 +1506,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/R_Leg/R_Knee + path: Viking_Side/Torso/R_Leg/R_Knee classID: 4 script: {fileID: 0} flags: 16 @@ -1563,7 +1563,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/R_Leg/R_Knee + path: Viking_Side/Torso/R_Leg/R_Knee classID: 4 script: {fileID: 0} flags: 16 @@ -1620,7 +1620,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/R_Leg/R_Knee + path: Viking_Side/Torso/R_Leg/R_Knee classID: 4 script: {fileID: 0} flags: 16 @@ -1677,7 +1677,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: Viking_Parts/Torso/R_Leg/R_Knee/R_Toe + path: Viking_Side/Torso/R_Leg/R_Knee/R_Toe classID: 4 script: {fileID: 0} flags: 16 @@ -1734,7 +1734,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: Viking_Parts/Torso/R_Leg/R_Knee/R_Toe + path: Viking_Side/Torso/R_Leg/R_Knee/R_Toe classID: 4 script: {fileID: 0} flags: 16 @@ -1791,7 +1791,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: Viking_Parts/Torso/R_Leg/R_Knee/R_Toe + path: Viking_Side/Torso/R_Leg/R_Knee/R_Toe classID: 4 script: {fileID: 0} flags: 16 @@ -1804,7 +1804,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/L_Leg/L_Knee/L_Toe + path: Viking_Side/Torso/L_Leg/L_Knee/L_Toe classID: 4 script: {fileID: 0} flags: 0 @@ -1816,7 +1816,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/L_Leg/L_Knee/L_Toe + path: Viking_Side/Torso/L_Leg/L_Knee/L_Toe classID: 4 script: {fileID: 0} flags: 0 @@ -1828,7 +1828,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/L_Leg/L_Knee/L_Toe + path: Viking_Side/Torso/L_Leg/L_Knee/L_Toe classID: 4 script: {fileID: 0} flags: 0 @@ -1840,7 +1840,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/L_Leg/L_Knee + path: Viking_Side/Torso/L_Leg/L_Knee classID: 4 script: {fileID: 0} flags: 0 @@ -1852,7 +1852,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/L_Leg/L_Knee + path: Viking_Side/Torso/L_Leg/L_Knee classID: 4 script: {fileID: 0} flags: 0 @@ -1864,7 +1864,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/L_Leg/L_Knee + path: Viking_Side/Torso/L_Leg/L_Knee classID: 4 script: {fileID: 0} flags: 0 @@ -1876,7 +1876,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -1888,7 +1888,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -1900,7 +1900,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/L_Leg + path: Viking_Side/Torso/L_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -1912,7 +1912,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -1924,7 +1924,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -1936,7 +1936,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/R_Leg + path: Viking_Side/Torso/R_Leg classID: 4 script: {fileID: 0} flags: 0 @@ -1948,7 +1948,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/R_Leg/R_Knee + path: Viking_Side/Torso/R_Leg/R_Knee classID: 4 script: {fileID: 0} flags: 0 @@ -1960,7 +1960,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/R_Leg/R_Knee + path: Viking_Side/Torso/R_Leg/R_Knee classID: 4 script: {fileID: 0} flags: 0 @@ -1972,7 +1972,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/R_Leg/R_Knee + path: Viking_Side/Torso/R_Leg/R_Knee classID: 4 script: {fileID: 0} flags: 0 @@ -1984,7 +1984,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Viking_Parts/Torso/R_Leg/R_Knee/R_Toe + path: Viking_Side/Torso/R_Leg/R_Knee/R_Toe classID: 4 script: {fileID: 0} flags: 0 @@ -1996,7 +1996,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Viking_Parts/Torso/R_Leg/R_Knee/R_Toe + path: Viking_Side/Torso/R_Leg/R_Knee/R_Toe classID: 4 script: {fileID: 0} flags: 0 @@ -2008,7 +2008,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Viking_Parts/Torso/R_Leg/R_Knee/R_Toe + path: Viking_Side/Torso/R_Leg/R_Knee/R_Toe classID: 4 script: {fileID: 0} flags: 0 diff --git a/Assets/Animations/PlayerClimb.anim b/Assets/Animations/PlayerClimb.anim index 9af26c9..cb8964b 100644 --- a/Assets/Animations/PlayerClimb.anim +++ b/Assets/Animations/PlayerClimb.anim @@ -18,7 +18,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 + time: 0.125 value: {x: 0, y: 0, z: 14.94} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -44,7 +44,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.25 value: {x: 0.52619857, y: -0.000000071975734, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -53,7 +53,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.75 + time: 0.375 value: {x: 0.52619857, y: -0.000000071975734, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -78,7 +78,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.125 value: {x: 0.56080276, y: -0.0000000634452, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -87,7 +87,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.75 + time: 0.25 + value: {x: 0.56080276, y: -0.0000000634452, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.375 value: {x: 0.56080276, y: -0.0000000634452, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -112,7 +121,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.125 + value: {x: 1.0957183, y: -0.057362497, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 value: {x: 0.06422603, y: 0.1929832, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -121,7 +139,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.75 + time: 0.375 value: {x: 1.0464991, y: 0.0000005377195, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -146,7 +164,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.25 + time: 0.125 value: {x: 0.07570515, y: -0.2027902, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -155,7 +173,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.25 value: {x: 0.93103534, y: -0.00000006368785, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -164,7 +182,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.75 + time: 0.375 value: {x: 0.93103534, y: -0.00000006368785, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -189,7 +207,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.125 + value: {x: 0.47947475, y: -0.00000021830333, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 value: {x: -0.2153224, y: -0.14645535, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -198,7 +225,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.75 + time: 0.375 value: {x: 0.47947475, y: -0.00000021830333, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -223,7 +250,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.25 + time: 0.125 value: {x: -0.15964454, y: 0.030083083, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -232,7 +259,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.25 value: {x: 0.4865658, y: 0.0000000197559, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -241,7 +268,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.75 + time: 0.375 value: {x: 0.4865658, y: 0.0000000197559, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -256,7 +283,7 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 4 + m_SampleRate: 8 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -332,7 +359,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.75 + m_StopTime: 0.375 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -362,7 +389,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.25 value: 0.52619857 inSlope: 0 outSlope: 0 @@ -371,7 +398,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 0.52619857 inSlope: 0 outSlope: 0 @@ -401,7 +428,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.25 value: -0.000000071975734 inSlope: 0 outSlope: 0 @@ -410,7 +437,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: -0.000000071975734 inSlope: 0 outSlope: 0 @@ -440,7 +467,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -449,7 +476,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 0 inSlope: 0 outSlope: 0 @@ -479,7 +506,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.125 value: 0.56080276 inSlope: 0 outSlope: 0 @@ -488,7 +515,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.25 + value: 0.56080276 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.375 value: 0.56080276 inSlope: 0 outSlope: 0 @@ -518,7 +554,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.125 value: -0.0000000634452 inSlope: 0 outSlope: 0 @@ -527,7 +563,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.25 + value: -0.0000000634452 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.375 value: -0.0000000634452 inSlope: 0 outSlope: 0 @@ -557,7 +602,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.125 value: 0 inSlope: 0 outSlope: 0 @@ -566,7 +611,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.375 value: 0 inSlope: 0 outSlope: 0 @@ -596,7 +650,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.125 + value: 1.0957183 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 value: 0.06422603 inSlope: 0 outSlope: 0 @@ -605,7 +668,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 1.0464991 inSlope: 0 outSlope: 0 @@ -635,7 +698,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.125 + value: -0.057362497 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 value: 0.1929832 inSlope: 0 outSlope: 0 @@ -644,7 +716,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 0.0000005377195 inSlope: 0 outSlope: 0 @@ -674,7 +746,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.125 value: 0 inSlope: 0 outSlope: 0 @@ -683,7 +755,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.375 value: 0 inSlope: 0 outSlope: 0 @@ -713,7 +794,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.125 value: 0.07570515 inSlope: 0 outSlope: 0 @@ -722,7 +803,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.25 value: 0.93103534 inSlope: 0 outSlope: 0 @@ -731,7 +812,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 0.93103534 inSlope: 0 outSlope: 0 @@ -761,7 +842,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.125 value: -0.2027902 inSlope: 0 outSlope: 0 @@ -770,7 +851,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.25 value: -0.00000006368785 inSlope: 0 outSlope: 0 @@ -779,7 +860,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: -0.00000006368785 inSlope: 0 outSlope: 0 @@ -808,6 +889,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 value: 0 @@ -818,16 +908,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 0 inSlope: 0 outSlope: 0 @@ -857,7 +938,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.125 + value: 0.47947475 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 value: -0.2153224 inSlope: 0 outSlope: 0 @@ -866,7 +956,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 0.47947475 inSlope: 0 outSlope: 0 @@ -896,7 +986,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.125 + value: -0.00000021830333 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 value: -0.14645535 inSlope: 0 outSlope: 0 @@ -905,7 +1004,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: -0.00000021830333 inSlope: 0 outSlope: 0 @@ -935,7 +1034,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.125 value: 0 inSlope: 0 outSlope: 0 @@ -944,7 +1043,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.375 value: 0 inSlope: 0 outSlope: 0 @@ -974,7 +1082,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.125 value: -0.15964454 inSlope: 0 outSlope: 0 @@ -983,7 +1091,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.25 value: 0.4865658 inSlope: 0 outSlope: 0 @@ -992,7 +1100,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 0.4865658 inSlope: 0 outSlope: 0 @@ -1022,7 +1130,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.125 value: 0.030083083 inSlope: 0 outSlope: 0 @@ -1031,7 +1139,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.25 value: 0.0000000197559 inSlope: 0 outSlope: 0 @@ -1040,7 +1148,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 0.0000000197559 inSlope: 0 outSlope: 0 @@ -1069,6 +1177,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 value: 0 @@ -1079,16 +1196,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 + time: 0.375 value: 0 inSlope: 0 outSlope: 0 @@ -1109,7 +1217,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 + time: 0.125 value: 0 inSlope: 0 outSlope: 0 @@ -1130,7 +1238,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 + time: 0.125 value: 0 inSlope: 0 outSlope: 0 @@ -1151,7 +1259,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 + time: 0.125 value: 14.94 inSlope: 0 outSlope: 0 diff --git a/Assets/Prefabs/Hammer.prefab b/Assets/Prefabs/Hammer.prefab index 91a8ddf..67d04a3 100644 --- a/Assets/Prefabs/Hammer.prefab +++ b/Assets/Prefabs/Hammer.prefab @@ -226,7 +226,7 @@ Rigidbody2D: serializedVersion: 2 m_Bits: 0 m_Interpolate: 0 - m_SleepingMode: 1 + m_SleepingMode: 0 m_CollisionDetection: 0 m_Constraints: 0 --- !u!61 &1712685034475680566 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 0c0f9f4..2dbc21f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -3355,6 +3355,8 @@ MonoBehaviour: m_EditorClassIdentifier: _animator: {fileID: 0} MovementSpeed: 2 + _bonesSide: {fileID: 0} + _bonesBack: {fileID: 0} _mapLayer: serializedVersion: 2 m_Bits: 8 @@ -3638,6 +3640,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} m_PrefabInstance: {fileID: 975611551} m_PrefabAsset: {fileID: 0} +--- !u!1 &582706328 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9145485872817117069, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + m_PrefabInstance: {fileID: 5855359588613562702} + m_PrefabAsset: {fileID: 0} --- !u!1001 &621498133 PrefabInstance: m_ObjectHideFlags: 0 @@ -6699,6 +6706,22 @@ PrefabInstance: propertyPath: _animator value: objectReference: {fileID: 1627236053} + - target: {fileID: 1693252312754102175, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + propertyPath: _bonesBack + value: + objectReference: {fileID: 6535934} + - target: {fileID: 1693252312754102175, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + propertyPath: _bonesSide + value: + objectReference: {fileID: 582706328} + - target: {fileID: 1693252312754102175, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + propertyPath: _vikingBack + value: + objectReference: {fileID: 6535934} + - target: {fileID: 1693252312754102175, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + propertyPath: _vikingSide + value: + objectReference: {fileID: 582706328} - target: {fileID: 1716637651858965058, guid: a7f273d812293e54d92972f62e1f0159, type: 3} propertyPath: m_SleepingMode value: 0 @@ -6747,6 +6770,10 @@ PrefabInstance: propertyPath: m_Layer value: 8 objectReference: {fileID: 0} + - target: {fileID: 8710076703627450349, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + propertyPath: m_AlwaysUpdate + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9145485872817117069, guid: a7f273d812293e54d92972f62e1f0159, type: 3} propertyPath: m_Name value: Viking_Side @@ -6757,7 +6784,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9145485872817117069, guid: a7f273d812293e54d92972f62e1f0159, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index 6a5890c..379edad 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -7,9 +7,9 @@ public abstract class Character : MonoBehaviour [SerializeField] private float MovementSpeed = 1.5f; [SerializeField] - private GameObject _vikingSide; + protected GameObject _bonesSide; [SerializeField] - private GameObject _vikingBack; + protected GameObject _bonesBack; [SerializeField] private LayerMask _mapLayer; diff --git a/Assets/Scripts/EnemyAI.cs b/Assets/Scripts/EnemyAI.cs index a608511..ac7cafb 100644 --- a/Assets/Scripts/EnemyAI.cs +++ b/Assets/Scripts/EnemyAI.cs @@ -2,6 +2,10 @@ using UnityEngine; public class EnemyAI : Character { + protected override void SetClimbingAnimation(bool isClimbing) + { + } + protected override void SetWalkingAnimation(bool isWalking) { } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index bc38385..1be8e73 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -90,12 +90,19 @@ public class Player : Character protected override void SetWalkingAnimation(bool isWalking) { + _bonesBack.SetActive(false); + _bonesSide.SetActive(true); _animator.SetBool("Legs_Walk",isWalking); _animator.SetBool("Body_Walk", isWalking); } protected override void SetClimbingAnimation(bool isClimbing) { + if (isClimbing) + { + _bonesBack.SetActive(true); + _bonesSide.SetActive(false); + } _animator.SetBool("Climb", isClimbing); } }