diff --git a/Assets/IMG/Animations/Player/Chopping.anim b/Assets/IMG/Animations/Player/Chopping.anim new file mode 100644 index 0000000..a7919ae --- /dev/null +++ b/Assets/IMG/Animations/Player/Chopping.anim @@ -0,0 +1,697 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Chopping + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -90, y: 0, 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.16666667 + value: {x: -90, y: 0, 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.33333334 + value: {x: 5.228, y: 45.128, z: -74.466} + inSlope: {x: 70.428085, y: 0, z: -41.087955} + outSlope: {x: 70.428085, y: 0, z: -41.087955} + 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: 11.097, y: 21.384, z: -77.89} + 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.6666667 + value: {x: 5.228, y: 45.128, z: -74.466} + inSlope: {x: -70.42801, y: 0, z: 41.087955} + outSlope: {x: -70.42801, y: 0, z: 41.087955} + 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: -90, y: 0, 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: 1 + value: {x: -90, y: 0, 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 + path: Main Camera/axe + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.575, y: -0.70000076, 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.16666667 + value: {x: 0.575, y: -0.217, z: 0.576} + inSlope: {x: 0, y: 0, z: 1.358098} + outSlope: {x: 0, y: 0, z: 1.358098} + 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.33333334 + value: {x: 0.7456374, y: -0.26878554, z: 0.68917483} + inSlope: {x: 0, y: -0.31500003, z: 0.71400017} + outSlope: {x: 0, y: -0.31500003, z: 0.71400017} + 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.594, y: -0.322, z: 0.814} + 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.6666667 + value: {x: 0.7456374, y: -0.26878554, z: 0.68917483} + inSlope: {x: 0, y: 0.31500003, z: -0.71400017} + outSlope: {x: 0, y: 0.31500003, z: -0.71400017} + 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.575, y: -0.217, z: 0.576} + inSlope: {x: 0, y: 0, z: -1.3580984} + outSlope: {x: 0, y: 0, z: -1.3580984} + 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.575, y: -0.70000076, 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 + path: Main Camera/axe + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 458944947 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 458944947 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.575 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.575 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.7456374 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.594 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.7456374 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.575 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.575 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Main Camera/axe + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.70000076 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -0.217 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: -0.26878554 + inSlope: -0.31500003 + outSlope: -0.31500003 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.322 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -0.26878554 + inSlope: 0.31500003 + outSlope: 0.31500003 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.217 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -0.70000076 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Main Camera/axe + classID: 4 + script: {fileID: 0} + flags: 0 + - 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.576 + inSlope: 1.358098 + outSlope: 1.358098 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.68917483 + inSlope: 0.71400017 + outSlope: 0.71400017 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.814 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.68917483 + inSlope: -0.71400017 + outSlope: -0.71400017 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.576 + inSlope: -1.3580984 + outSlope: -1.3580984 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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: m_LocalPosition.z + path: Main Camera/axe + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 5.228 + inSlope: 70.428085 + outSlope: 70.428085 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 11.097 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 5.228 + inSlope: -70.42801 + outSlope: -70.42801 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -90 + 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: Main Camera/axe + classID: 4 + script: {fileID: 0} + flags: 0 + - 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.33333334 + value: 45.128 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 21.384 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 45.128 + 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 + 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: Main Camera/axe + classID: 4 + script: {fileID: 0} + flags: 0 + - 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.33333334 + value: -74.466 + inSlope: -41.087955 + outSlope: -41.087955 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -77.89 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -74.466 + inSlope: 41.087955 + outSlope: 41.087955 + 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 + 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.z + path: Main Camera/axe + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Main Camera/axe + 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: Main Camera/axe + 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.z + path: Main Camera/axe + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/IMG/Animations/Player/Chopping.anim.meta b/Assets/IMG/Animations/Player/Chopping.anim.meta new file mode 100644 index 0000000..2c61890 --- /dev/null +++ b/Assets/IMG/Animations/Player/Chopping.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4522681ee7a4e1196af04c3f4fc704d6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Animations/Player/Mining.anim b/Assets/IMG/Animations/Player/Mining.anim index c338409..557a76e 100644 --- a/Assets/IMG/Animations/Player/Mining.anim +++ b/Assets/IMG/Animations/Player/Mining.anim @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -90, y: 0, z: 90} + value: {x: -90, y: 90, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -28,7 +28,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: -90, y: 0, z: 61.716} + value: {x: -90, y: 180, z: -114.412} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,7 +37,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: -29.814, y: -28.284, z: 90} + value: {x: -90, y: 180, z: -114.412} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -46,7 +46,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: -90, y: 0, z: 61.708} + value: {x: -169.299, y: 155.588, z: -90} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -55,7 +55,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: -29.814, y: -28.284, z: 90} + value: {x: -90, y: 180, z: -114.412} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -64,16 +64,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.8333333 - value: {x: -90, y: 0, z: 61.708} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -169.299, y: 155.588, z: -90} + inSlope: {x: 0, y: -270.00003, z: 292.94406} + outSlope: {x: 0, y: -270.00003, z: 292.94406} 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: -90, y: 0, z: 90} + value: {x: -90, y: 90, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -83,14 +83,14 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: pickaxe + path: Main Camera/pickaxe m_PositionCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.58, y: -0.374, z: -0.046} + value: {x: 0.575, y: -0.70000076, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -99,16 +99,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 0.75175714, y: 0.069000006, z: 0.7514484} - inSlope: {x: 0.008996482, y: 0, z: 0} - outSlope: {x: 0.008996482, y: 0, z: 0} + value: {x: 0.50386614, y: -0.581, z: 0.43372577} + inSlope: {x: 0, y: 0.69000226, z: 0} + outSlope: {x: 0, y: 0.69000226, 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.33333334 - value: {x: 0.75250685, y: 0.06626868, z: 0.7500547} + value: {x: 0.50386614, y: -0.47, z: 0.43372577} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -117,7 +117,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 0.7517569, y: 0.06900114, z: 0.75144887} + value: {x: 0.50492555, y: -0.47309375, z: 0.43139118} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -126,7 +126,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0.75250685, y: 0.06626868, z: 0.7500547} + value: {x: 0.50386614, y: -0.47, z: 0.43372577} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -135,16 +135,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.8333333 - value: {x: 0.7517569, y: 0.06900114, z: 0.75144887} - inSlope: {x: -0.008999349, y: 0, z: 0} - outSlope: {x: -0.008999349, y: 0, z: 0} + value: {x: 0.50492555, y: -0.47309375, z: 0.43139118} + inSlope: {x: 0.012712956, y: -0.03712499, z: -0.028015137} + outSlope: {x: 0.012712956, y: -0.03712499, z: -0.028015137} 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.58, y: -0.374, z: -0.046} + value: {x: 0.575, y: -0.70000076, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -154,7 +154,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: pickaxe + path: Main Camera/pickaxe m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -166,7 +166,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 4284607334 + path: 2849726309 attribute: 1 script: {fileID: 0} typeID: 4 @@ -175,7 +175,7 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 4284607334 + path: 2849726309 attribute: 4 script: {fileID: 0} typeID: 4 @@ -211,7 +211,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.58 + value: 0.575 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -220,16 +220,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 0.75175714 - inSlope: 0.008996482 - outSlope: 0.008996482 + value: 0.50386614 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 0.75250685 + value: 0.50386614 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -238,7 +238,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.7517569 + value: 0.50492555 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -247,7 +247,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0.75250685 + value: 0.50386614 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -256,16 +256,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: 0.7517569 - inSlope: -0.008999349 - outSlope: -0.008999349 + value: 0.50492555 + inSlope: 0.012712956 + outSlope: 0.012712956 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.58 + value: 0.575 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -276,7 +276,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: pickaxe + path: Main Camera/pickaxe classID: 4 script: {fileID: 0} flags: 0 @@ -286,7 +286,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.374 + value: -0.70000076 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -295,16 +295,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 0.069000006 - inSlope: 0 - outSlope: 0 + value: -0.581 + inSlope: 0.69000226 + outSlope: 0.69000226 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 0.06626868 + value: -0.47 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -313,7 +313,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.06900114 + value: -0.47309375 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -322,7 +322,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0.06626868 + value: -0.47 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -331,16 +331,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: 0.06900114 - inSlope: 0 - outSlope: 0 + value: -0.47309375 + inSlope: -0.03712499 + outSlope: -0.03712499 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -0.374 + value: -0.70000076 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -351,7 +351,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: pickaxe + path: Main Camera/pickaxe classID: 4 script: {fileID: 0} flags: 0 @@ -361,7 +361,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.046 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -370,7 +370,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 0.7514484 + value: 0.43372577 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -379,7 +379,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 0.7500547 + value: 0.43372577 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -388,7 +388,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.75144887 + value: 0.43139118 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -397,7 +397,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0.7500547 + value: 0.43372577 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -406,16 +406,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: 0.75144887 - inSlope: 0 - outSlope: 0 + value: 0.43139118 + inSlope: -0.028015137 + outSlope: -0.028015137 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -0.046 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -426,7 +426,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: pickaxe + path: Main Camera/pickaxe classID: 4 script: {fileID: 0} flags: 0 @@ -454,7 +454,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: -29.814 + value: -90 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -463,7 +463,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: -90 + value: -169.299 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -472,7 +472,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: -29.814 + value: -90 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -481,7 +481,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: -90 + value: -169.299 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -501,7 +501,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: pickaxe + path: Main Camera/pickaxe classID: 4 script: {fileID: 0} flags: 0 @@ -511,7 +511,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 90 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -520,7 +520,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 0 + value: 180 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -529,7 +529,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: -28.284 + value: 180 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -538,7 +538,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0 + value: 155.588 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -547,7 +547,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: -28.284 + value: 180 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -556,16 +556,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: 0 - inSlope: 0 - outSlope: 0 + value: 155.588 + inSlope: -270.00003 + outSlope: -270.00003 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0 + value: 90 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -576,7 +576,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: pickaxe + path: Main Camera/pickaxe classID: 4 script: {fileID: 0} flags: 0 @@ -586,7 +586,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 90 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -595,7 +595,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 61.716 + value: -114.412 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -604,7 +604,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 90 + value: -114.412 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -613,7 +613,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 61.708 + value: -90 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -622,7 +622,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 90 + value: -114.412 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -631,16 +631,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: 61.708 - inSlope: 0 - outSlope: 0 + value: -90 + inSlope: 292.94406 + outSlope: 292.94406 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 90 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -651,7 +651,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: pickaxe + path: Main Camera/pickaxe classID: 4 script: {fileID: 0} flags: 0 @@ -664,7 +664,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: pickaxe + path: Main Camera/pickaxe classID: 4 script: {fileID: 0} flags: 0 @@ -676,7 +676,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: pickaxe + path: Main Camera/pickaxe classID: 4 script: {fileID: 0} flags: 0 @@ -688,7 +688,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: pickaxe + path: Main Camera/pickaxe classID: 4 script: {fileID: 0} flags: 0 diff --git a/Assets/IMG/Animations/Player/PlayerAnimator.controller b/Assets/IMG/Animations/Player/PlayerAnimator.controller index 6293b53..1a3cfc0 100644 --- a/Assets/IMG/Animations/Player/PlayerAnimator.controller +++ b/Assets/IMG/Animations/Player/PlayerAnimator.controller @@ -1,5 +1,54 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7771493529717100687 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Chopping + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6591686978403362519} + 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: 4522681ee7a4e1196af04c3f4fc704d6, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-6591686978403362519 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-5770798371515671020 AnimatorStateMachine: serializedVersion: 6 @@ -15,6 +64,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -3519760693848770016} m_Position: {x: 430, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7771493529717100687} + m_Position: {x: 493.99478, y: -78.00911, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -35,7 +87,8 @@ AnimatorState: m_Name: Mining m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -1089065044845976680} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -51,6 +104,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-1089065044845976680 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + 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!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/FBX/axe.fbx b/Assets/Prefabs/FBX/axe.fbx new file mode 100644 index 0000000..efb701f Binary files /dev/null and b/Assets/Prefabs/FBX/axe.fbx differ diff --git a/Assets/Prefabs/FBX/axe.fbx.meta b/Assets/Prefabs/FBX/axe.fbx.meta new file mode 100644 index 0000000..209ccc1 --- /dev/null +++ b/Assets/Prefabs/FBX/axe.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 2c6dbc39964b98fa38907d40cc627d72 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/axe.prefab b/Assets/Prefabs/axe.prefab new file mode 100644 index 0000000..fcd4295 --- /dev/null +++ b/Assets/Prefabs/axe.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6594954373601723118 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalPosition.x + value: 3.336182 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalPosition.z + value: -1.4283476 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} + propertyPath: m_Name + value: axe + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2c6dbc39964b98fa38907d40cc627d72, type: 3} diff --git a/Assets/Prefabs/axe.prefab.meta b/Assets/Prefabs/axe.prefab.meta new file mode 100644 index 0000000..8532695 --- /dev/null +++ b/Assets/Prefabs/axe.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9830001f8f3e3d039b1099c0ad79015f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 5376150..0a3bb46 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -11307,6 +11307,84 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text +--- !u!1001 &629100252 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 963194228} + m_Modifications: + - target: {fileID: 5495633643471773290, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6288315761647534015, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_Name + value: axe + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalScale.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalScale.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalScale.z + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.575 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalPosition.y + value: -0.70000076 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} +--- !u!4 &629100253 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6633597135605327109, guid: 9830001f8f3e3d039b1099c0ad79015f, type: 3} + m_PrefabInstance: {fileID: 629100252} + m_PrefabAsset: {fileID: 0} --- !u!1 &640974226 GameObject: m_ObjectHideFlags: 0 @@ -18356,7 +18434,9 @@ Transform: m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 629100253} + - {fileID: 2137776343} m_Father: {fileID: 1031315370} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3.1250005} --- !u!82 &963194229 @@ -18467,7 +18547,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ccf47fd0e7044a6f08a0f3353ee62cf5, type: 3} m_Name: m_EditorClassIdentifier: - mouseSpeed: 1 + mouseSpeed: 100 controllerSpeed: 0.01 --- !u!1 &977259933 GameObject: @@ -19776,7 +19856,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 963194228} - - {fileID: 2137776343} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1031315371 @@ -39970,8 +40049,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1031315370} + m_TransformParent: {fileID: 963194228} m_Modifications: + - target: {fileID: 276715203862656762, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} propertyPath: m_LocalScale.x value: 5 @@ -39986,15 +40069,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} propertyPath: m_LocalPosition.x - value: 0.578 + value: 0.575 objectReference: {fileID: 0} - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} propertyPath: m_LocalPosition.y - value: -0.212 + value: -0.70000076 objectReference: {fileID: 0} - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} propertyPath: m_LocalPosition.z - value: -0.005 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/Controls.cs b/Assets/Scripts/Controls.cs index c725a82..a18a3cd 100644 --- a/Assets/Scripts/Controls.cs +++ b/Assets/Scripts/Controls.cs @@ -50,7 +50,7 @@ public class Controls : MonoBehaviour { if (uihandler.canPlayerRotate()) { - player.GetComponent().lookAround(view, playerInput.currentControlScheme == "Controller"); + playerCam.GetComponent().lookAround(view, playerInput.currentControlScheme == "Controller"); } if (uihandler.canPlayerMove()) { @@ -141,7 +141,7 @@ public class Controls : MonoBehaviour fight.GetComponent().startFight(worldGen.GetComponent().getCurrentTile(), target, player); break; case "Tree": - StartCoroutine(playParticle(target)); + StartCoroutine(playAnimation(target, "Chopping")); GameObject.Find("Inventory").GetComponent().addItem(new Item("Wood")); break; case "Stone": @@ -174,7 +174,7 @@ public class Controls : MonoBehaviour { GameObject.Find("Inventory").GetComponent().addItem(new Item("Tin ore")); } - Destroy(target); + StartCoroutine(playAnimation(target, "Mining")); break; } } diff --git a/Assets/Scripts/Fight.cs b/Assets/Scripts/Fight.cs index 931f3f3..c58f807 100644 --- a/Assets/Scripts/Fight.cs +++ b/Assets/Scripts/Fight.cs @@ -20,7 +20,7 @@ public class Fight : MonoBehaviour this.enemy = enemy; this.player = player; enemy.GetComponent().scaleEnemy(player.GetComponent()); - enemy.transform.rotation = Quaternion.Euler(0, player.transform.rotation.y + 180f, 0); + enemy.transform.rotation = Quaternion.Euler(0, GameObject.Find("Main Camera").transform.rotation.y, 0); uihandler = GameObject.Find("UIHandler").GetComponent(); uihandler.openFight(); diff --git a/Assets/Scripts/Handler/ButtonHandler.cs b/Assets/Scripts/Handler/ButtonHandler.cs index 02de93e..79a0e90 100644 --- a/Assets/Scripts/Handler/ButtonHandler.cs +++ b/Assets/Scripts/Handler/ButtonHandler.cs @@ -85,8 +85,8 @@ namespace Assets.Scripts saveText = saveText + uihandler.saveVideoSettings() + "\r\n"; saveText = saveText + uihandler.saveLanguage() + "\r\n"; saveText = saveText + audioHandler.saveAudioSettings() + "\r\n"; - GameObject.Find("Player").GetComponent().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent().value; - GameObject.Find("Player").GetComponent().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent().value; + GameObject.Find("Main Camera").GetComponent().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent().value; + GameObject.Find("Main Camera").GetComponent().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent().value; saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouse").GetComponent().value + "\r\n"; saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityController").GetComponent().value; FileHandler.saveOptions(saveText); diff --git a/Assets/Scripts/Handler/FileHandler.cs b/Assets/Scripts/Handler/FileHandler.cs index 3fe9aab..b6dc138 100644 --- a/Assets/Scripts/Handler/FileHandler.cs +++ b/Assets/Scripts/Handler/FileHandler.cs @@ -104,12 +104,12 @@ namespace Assets.Scripts break; case "SensitivityMouse": if(isIngame){ - GameObject.Find("Player").GetComponent().mouseSpeed = float.Parse(line.Split(':')[1]); + GameObject.Find("Main Camera").GetComponent().mouseSpeed = float.Parse(line.Split(':')[1]); } break; case "SensitivityController": if(isIngame){ - GameObject.Find("Player").GetComponent().controllerSpeed = float.Parse(line.Split(':')[1]); + GameObject.Find("Main Camera").GetComponent().controllerSpeed = float.Parse(line.Split(':')[1]); } break; } diff --git a/Assets/Scripts/Player/PlayerCamera.cs b/Assets/Scripts/Player/PlayerCamera.cs index 903fbbf..c343881 100644 --- a/Assets/Scripts/Player/PlayerCamera.cs +++ b/Assets/Scripts/Player/PlayerCamera.cs @@ -9,6 +9,11 @@ namespace Assets.Scripts.Player { UIHandler uihandler; GameObject interact; + public float mouseSpeed = 100; //the sensibility + public float controllerSpeed = 0.01f; //the sensibility + float xMaxLimit = 45.0f; + float xMinLimit = -45.0f; + Vector2 rotation = Vector2.zero; // Start is called before the first frame update void Start() @@ -42,6 +47,22 @@ namespace Assets.Scripts.Player return null; } + public void lookAround(Vector2 view, bool isController) + { + rotation.y += view.x; + rotation.x += -view.y; + rotation.x = Mathf.Clamp(rotation.x, xMinLimit, xMaxLimit); + if (isController) + { + transform.eulerAngles = rotation * (controllerSpeed * Time.deltaTime); + } + else + { + transform.eulerAngles = rotation * mouseSpeed; + //TODO: Look at camera movement -> Not rly smooth. Weird drag + } + } + void showInformation() { RaycastHit hit; diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index 2303c72..d987356 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -22,14 +22,8 @@ namespace Assets.Scripts.Player bool finishedGame = false; PlayerObject player; public float speed = 5f; - DateTime jumpTimer; DateTime now; int bobbingDirection = -1; - public float mouseSpeed = 100; //the sensibility - public float controllerSpeed = 0.01f; //the sensibility - float xMaxLimit = 45.0f; - float xMinLimit = -45.0f; - Vector2 rotation = Vector2.zero; private void OnEnable() { @@ -144,24 +138,19 @@ namespace Assets.Scripts.Player if (input.y != 0) { - if (jumpTimer != null) + RaycastHit hit; + if (Physics.Raycast(transform.position, -transform.up, out hit, Mathf.Infinity)) { - if (jumpTimer.AddSeconds(1).CompareTo(DateTime.Now) <= 0) + if (hit.distance <= 1.5f) { - jumpTimer = DateTime.Now; gameObject.GetComponent().velocity = new Vector3(0, 5, 0); audioHandler.playJump(); } } - else - { - jumpTimer = DateTime.Now; - gameObject.GetComponent().velocity = new Vector3(0, 5, 0); - audioHandler.playJump(); - } } - Vector3 movement = new Vector3(input.x, 0, input.z); + movement = camera.transform.TransformDirection(movement); + movement.y = 0; gameObject.transform.Translate(movement * speed * Time.deltaTime); if (input.z != 0) @@ -183,7 +172,7 @@ namespace Assets.Scripts.Player public void getRotation() { GameObject needle = GameObject.Find("imgNeedle"); - float rotation = gameObject.transform.rotation.eulerAngles.y; + float rotation = GameObject.Find("Main Camera").transform.rotation.eulerAngles.y; if (rotation < 0) { rotation += 360; @@ -382,21 +371,5 @@ namespace Assets.Scripts.Player { player.regainSecondary(inventory.getEquipmentBonus()["MPR"], inventory.getEquipmentBonus()["MP"]); } - - public void lookAround(Vector2 view, bool isController) - { - rotation.y += view.x; - rotation.x += -view.y; - rotation.x = Mathf.Clamp(rotation.x, xMinLimit, xMaxLimit); - if (isController) - { - transform.eulerAngles = rotation * (controllerSpeed * Time.deltaTime); - } - else - { - transform.eulerAngles = rotation * mouseSpeed; - //TODO: Look at camera movement -> Not rly smooth. Weird drag - } - } } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index fe8b97c..8c05ffe 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,10 +15,10 @@ EditorUserSettings: value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d flags: 0 RecentlyUsedSceneGuid-3: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a flags: 0 RecentlyUsedSceneGuid-4: - value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d