diff --git a/Assets/Animations/Goblin_Walk.anim b/Assets/Animations/Goblin_Walk.anim index 431fba8..3f035fb 100644 --- a/Assets/Animations/Goblin_Walk.anim +++ b/Assets/Animations/Goblin_Walk.anim @@ -472,14 +472,23 @@ 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 - value: {x: 0, y: 0, z: 162.663} + time: 0.43333334 + value: {x: 0, y: 0, z: 148.221} 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.5 + value: {x: 0, y: 0, z: 162.663} + inSlope: {x: 0, y: 0, z: 76.7559} + outSlope: {x: 0, y: 0, z: 76.7559} + 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: 1 value: {x: 0, y: 0, z: 191.716} @@ -492,6 +501,15 @@ AnimationClip: - serializedVersion: 3 time: 1.1666666 value: {x: 0, y: 0, z: 164.841} + inSlope: {x: 0, y: 0, z: -8.328004} + outSlope: {x: 0, y: 0, z: -8.328004} + 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: 1.3333334 + value: {x: 0, y: 0, z: 164.147} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -535,15 +553,6 @@ AnimationClip: - serializedVersion: 3 time: 1 value: {x: 0, y: 0, z: 66.66} - inSlope: {x: 0, y: 0, z: -65.3028} - outSlope: {x: 0, y: 0, z: -65.3028} - 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: 1.5 - value: {x: 0, y: 0, z: 40.45} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -604,7 +613,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.3333334 - value: {x: 0, y: 0, z: 63.072} + value: {x: 0, y: 0, z: 29.868} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -615,6 +624,67 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Goblin_parts/Stomach/Torso/R_Arm_Upper/R_Arm_low + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 3.314} + 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.16666667 + value: {x: 0, y: 0, z: -7.141} + 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.5 + value: {x: 0, y: 0, z: -1.024} + 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.8333333 + value: {x: 0, y: 0, z: -7.063} + 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: 1.1666666 + value: {x: 0, y: 0, z: -1.035} + 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: 1.3333334 + value: {x: 0, y: 0, z: -4.474} + 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Goblin_parts/Stomach/Torso/Head m_PositionCurves: - curve: serializedVersion: 2 @@ -918,6 +988,15 @@ AnimationClip: 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.43333334 + value: {x: 1.6700002, y: 1.4099978, 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} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -952,15 +1031,6 @@ AnimationClip: 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: 1.5 - value: {x: 2.9843485, y: 0.000003516674, 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} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1198,6 +1268,15 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 988245699 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3785893505 attribute: 1 @@ -3600,6 +3679,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 1.6700002 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3630,6 +3718,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 1.4099978 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3660,6 +3757,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3699,6 +3805,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 value: 0 @@ -3726,6 +3841,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3765,6 +3889,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 value: 0 @@ -3792,6 +3925,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3832,14 +3974,23 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 162.663 + time: 0.43333334 + value: 148.221 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 162.663 + inSlope: 76.7559 + outSlope: 76.7559 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 191.716 @@ -3852,6 +4003,15 @@ AnimationClip: - serializedVersion: 3 time: 1.1666666 value: 164.841 + inSlope: -8.328004 + outSlope: -8.328004 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: 164.147 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -3897,15 +4057,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 2.9843485 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3945,15 +4096,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 0.000003516674 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3993,15 +4135,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -4050,15 +4183,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -4107,15 +4231,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -4158,15 +4273,6 @@ AnimationClip: - serializedVersion: 3 time: 1 value: 66.66 - inSlope: -65.3028 - outSlope: -65.3028 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 - value: 40.45 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -4508,7 +4614,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.3333334 - value: 63.072 + value: 29.868 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -4523,6 +4629,204 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + 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.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1666666 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Goblin_parts/Stomach/Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + 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.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1666666 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Goblin_parts/Stomach/Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.314 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -7.141 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -1.024 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -7.063 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1666666 + value: -1.035 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: -4.474 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Goblin_parts/Stomach/Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 m_EulerEditorCurves: - serializedVersion: 2 curve: @@ -4748,7 +5052,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Goblin_parts/Stomach/Torso/R_Arm_Upper/R_Arm_low + path: Goblin_parts/Stomach/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -4760,7 +5064,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Goblin_parts/Stomach/Torso/R_Arm_Upper/R_Arm_low + path: Goblin_parts/Stomach/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -4772,7 +5076,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Goblin_parts/Stomach/Torso/R_Arm_Upper/R_Arm_low + path: Goblin_parts/Stomach/Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -4784,7 +5088,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Goblin_parts/Stomach/Torso/R_Arm_Upper + path: Goblin_parts/Stomach/Torso/L_arm_up/L_Arm_Down classID: 4 script: {fileID: 0} flags: 0 @@ -4796,7 +5100,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Goblin_parts/Stomach/Torso/R_Arm_Upper + path: Goblin_parts/Stomach/Torso/L_arm_up/L_Arm_Down classID: 4 script: {fileID: 0} flags: 0 @@ -4808,7 +5112,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Goblin_parts/Stomach/Torso/R_Arm_Upper + path: Goblin_parts/Stomach/Torso/L_arm_up/L_Arm_Down classID: 4 script: {fileID: 0} flags: 0 @@ -4855,8 +5159,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Goblin_parts/Stomach/Torso/L_arm_up/L_Arm_Down + attribute: m_LocalEulerAngles.z + path: Goblin_parts/Stomach/Torso/R_Arm_Upper/R_Arm_low classID: 4 script: {fileID: 0} flags: 0 @@ -4868,7 +5172,43 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Goblin_parts/Stomach/Torso/L_arm_up/L_Arm_Down + path: Goblin_parts/Stomach/Torso/R_Arm_Upper/R_Arm_low + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Goblin_parts/Stomach/Torso/R_Arm_Upper/R_Arm_low + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Goblin_parts/Stomach/Torso/R_Arm_Upper + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Goblin_parts/Stomach/Torso/R_Arm_Upper classID: 4 script: {fileID: 0} flags: 0 @@ -4880,7 +5220,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Goblin_parts/Stomach/Torso/L_arm_up/L_Arm_Down + path: Goblin_parts/Stomach/Torso/R_Arm_Upper classID: 4 script: {fileID: 0} flags: 0 diff --git a/Assets/Prefabs/Goblin.prefab b/Assets/Prefabs/Goblin.prefab index 033dbf8..c7b3fa6 100644 --- a/Assets/Prefabs/Goblin.prefab +++ b/Assets/Prefabs/Goblin.prefab @@ -462,13 +462,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3987986165604515662} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: -0.0272432, w: 0.99962884} - m_LocalPosition: {x: 1.9822497, y: -0.00000031725793, z: 0} + m_LocalRotation: {x: -0, y: -0, z: 0.028916435, w: 0.9995818} + m_LocalPosition: {x: 1.9822493, y: -0.0000013739191, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5733146693549929561} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3.314} --- !u!1 &4749471430504577575 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 446c410..468a2d7 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -475,8 +475,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 25.0764, y: -81.0002} - m_SizeDelta: {x: 187.1126, y: 33.8174} + m_AnchoredPosition: {x: 120.96556, y: -194.69562} + m_SizeDelta: {x: 413.4758, y: 67.4735} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &693968829 MonoBehaviour: @@ -608,8 +608,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 25.0764, y: -20.9077} - m_SizeDelta: {x: 187.1126, y: 33.8174} + m_AnchoredPosition: {x: 120.96556, y: -74.79744} + m_SizeDelta: {x: 413.4758, y: 67.4735} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &732222383 MonoBehaviour: @@ -727,8 +727,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 29.9277, y: -81} - m_SizeDelta: {x: 63.7943, y: 347.4991} + m_AnchoredPosition: {x: 131.6857, y: -194.69528} + m_SizeDelta: {x: 140.9707, y: 693.3401} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &811984177 MonoBehaviour: @@ -915,8 +915,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 46, y: 189} - m_SizeDelta: {x: 399.4829, y: 50} + m_AnchoredPosition: {x: 120.97, y: 335} + m_SizeDelta: {x: 360.9883, y: 82.0468} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1237552950 MonoBehaviour: @@ -1321,8 +1321,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 25.0764, y: 32.4889} - m_SizeDelta: {x: 187.1126, y: 33.8174} + m_AnchoredPosition: {x: 120.96556, y: 31.741} + m_SizeDelta: {x: 413.4758, y: 67.4735} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1885804709 MonoBehaviour: diff --git a/Assets/Scripts/EnemyAI.cs b/Assets/Scripts/EnemyAI.cs index 9de8466..1e79b7a 100644 --- a/Assets/Scripts/EnemyAI.cs +++ b/Assets/Scripts/EnemyAI.cs @@ -26,7 +26,7 @@ public class EnemyAI : Character { vertical = VerticalMove(verticalDistance); } - else if (verticalDistance < 0.1f && isAllowVertical && isCanGoDown) + else if (verticalDistance < 0f && isAllowVertical && isCanGoDown) { vertical = VerticalMove(verticalDistance); } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c25fb87..e152cb7 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -9,6 +9,6 @@ EditorBuildSettings: path: Assets/Scenes/MainMenu.unity guid: 2c228e0fac14ae54393476c86f2b803e - enabled: 1 - path: Assets/Scenes/SampleScene.unity + path: Assets/Scenes/Level 1.unity guid: 2cda990e2423bbf4892e6590ba056729 m_configObjects: {}