diff --git a/Assets/Animation/idle/player-idle-front.anim b/Assets/Animation/idle/player-idle-front.anim index 457164a..08a4045 100644 --- a/Assets/Animation/idle/player-idle-front.anim +++ b/Assets/Animation/idle/player-idle-front.anim @@ -20,9 +20,16 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 63784583, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} + value: {fileID: 391566232, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite - path: + path: Arms + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 241008847, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + attribute: m_Sprite + path: PlayerSprite classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -33,14 +40,22 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 1288071446 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 533382794 attribute: 0 script: {fileID: 0} typeID: 212 customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 63784583, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} + - {fileID: 391566232, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 241008847, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Animation/walk/player-walk-back.anim b/Assets/Animation/walk/player-walk-back.anim index b40c442..e723689 100644 --- a/Assets/Animation/walk/player-walk-back.anim +++ b/Assets/Animation/walk/player-walk-back.anim @@ -20,17 +20,48 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 107193491, guid: 18ef006103d462149b586907eb1f6032, type: 3} - - time: 0.25 - value: {fileID: 1744669623, guid: 18ef006103d462149b586907eb1f6032, type: 3} - - time: 0.5 - value: {fileID: 1855638800, guid: 18ef006103d462149b586907eb1f6032, type: 3} + value: {fileID: 73861881, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.083333336 + value: {fileID: -835024067, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.21666667 + value: {fileID: -835024067, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.28333333 + value: {fileID: -835024067, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.36666667 + value: {fileID: 73861881, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.46666667 + value: {fileID: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.53333336 + value: {fileID: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.6666667 + value: {fileID: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - time: 0.75 - value: {fileID: -79117903, guid: 18ef006103d462149b586907eb1f6032, type: 3} - - time: 1 - value: {fileID: -79117903, guid: 18ef006103d462149b586907eb1f6032, type: 3} + value: {fileID: 73861881, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite - path: + path: Arms + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -1260523453, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.083333336 + value: {fileID: -1743232175, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.21666667 + value: {fileID: 1725496955, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.28333333 + value: {fileID: -1743232175, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.36666667 + value: {fileID: -1260523453, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.46666667 + value: {fileID: -2069280162, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.53333336 + value: {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.6666667 + value: {fileID: -2069280162, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.75 + value: {fileID: -1260523453, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + attribute: m_Sprite + path: PlayerSprite classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -41,24 +72,44 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 1288071446 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 533382794 attribute: 0 script: {fileID: 0} typeID: 212 customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 107193491, guid: 18ef006103d462149b586907eb1f6032, type: 3} - - {fileID: 1744669623, guid: 18ef006103d462149b586907eb1f6032, type: 3} - - {fileID: 1855638800, guid: 18ef006103d462149b586907eb1f6032, type: 3} - - {fileID: -79117903, guid: 18ef006103d462149b586907eb1f6032, type: 3} - - {fileID: -79117903, guid: 18ef006103d462149b586907eb1f6032, type: 3} + - {fileID: 73861881, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -835024067, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -835024067, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -835024067, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 73861881, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 73861881, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1260523453, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1743232175, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1725496955, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1743232175, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1260523453, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -2069280162, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -2069280162, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1260523453, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 0.76666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animation/walk/player-walk-front.anim b/Assets/Animation/walk/player-walk-front.anim index 0f3caab..f493c20 100644 --- a/Assets/Animation/walk/player-walk-front.anim +++ b/Assets/Animation/walk/player-walk-front.anim @@ -20,17 +20,48 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 63784583, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} - - time: 0.25 - value: {fileID: -564741586, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} - - time: 0.5 - value: {fileID: -1581151036, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} - - time: 0.75 - value: {fileID: -2021447072, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} - - time: 1 - value: {fileID: -2021447072, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} + value: {fileID: 391566232, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.11666667 + value: {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.23333333 + value: {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.35 + value: {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.46666667 + value: {fileID: 391566232, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.56666666 + value: {fileID: 1944640713, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.68333334 + value: {fileID: 1944640713, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.8 + value: {fileID: 1944640713, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.9166667 + value: {fileID: 391566232, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite - path: + path: Arms + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 241008847, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.11666667 + value: {fileID: -1521974398, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.23333333 + value: {fileID: -405298126, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.35 + value: {fileID: -1521974398, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.46666667 + value: {fileID: 241008847, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.56666666 + value: {fileID: -1287590234, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.68333334 + value: {fileID: 1059285035, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.8 + value: {fileID: -1287590234, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.9166667 + value: {fileID: 241008847, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + attribute: m_Sprite + path: PlayerSprite classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -41,24 +72,44 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 1288071446 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 533382794 attribute: 0 script: {fileID: 0} typeID: 212 customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 63784583, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} - - {fileID: -564741586, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} - - {fileID: -1581151036, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} - - {fileID: -2021447072, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} - - {fileID: -2021447072, guid: 8013b5e4a9fd62a4e961f41fa9b2e04f, type: 3} + - {fileID: 391566232, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 391566232, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1944640713, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1944640713, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1944640713, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 391566232, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 241008847, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1521974398, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -405298126, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1521974398, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 241008847, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1287590234, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1059285035, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1287590234, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 241008847, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 0.93333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animation/walk/player-walk-left.anim b/Assets/Animation/walk/player-walk-left.anim index 9b04c3f..292521f 100644 --- a/Assets/Animation/walk/player-walk-left.anim +++ b/Assets/Animation/walk/player-walk-left.anim @@ -20,17 +20,32 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -1619581746, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} + value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.13333334 + value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - time: 0.25 - value: {fileID: 1604011369, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} + value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.36666667 + value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - time: 0.5 - value: {fileID: 1263210280, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} - - time: 0.75 - value: {fileID: 554051057, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} - - time: 1 - value: {fileID: 554051057, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} + value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite - path: + path: Arms + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -852492858, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.13333334 + value: {fileID: 185238784, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.25 + value: {fileID: 1841773777, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.36666667 + value: {fileID: 1241877341, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.5 + value: {fileID: -852492858, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + attribute: m_Sprite + path: PlayerSprite classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -41,24 +56,36 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 1288071446 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 533382794 attribute: 0 script: {fileID: 0} typeID: 212 customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -1619581746, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} - - {fileID: 1604011369, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} - - {fileID: 1263210280, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} - - {fileID: 554051057, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} - - {fileID: 554051057, guid: 111764db714ab4c47994b1e1bc0f79c5, type: 3} + - {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -852492858, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 185238784, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1841773777, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1241877341, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -852492858, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animation/walk/player-walk-right.anim b/Assets/Animation/walk/player-walk-right.anim index 1346743..ce67dbb 100644 --- a/Assets/Animation/walk/player-walk-right.anim +++ b/Assets/Animation/walk/player-walk-right.anim @@ -20,17 +20,32 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 137852102, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} + value: {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.083333336 + value: {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.16666667 + value: {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - time: 0.25 - value: {fileID: -1626674455, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} - - time: 0.5 - value: {fileID: -949030097, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} - - time: 0.75 - value: {fileID: -457270515, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} - - time: 1 - value: {fileID: -457270515, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} + value: {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.33333334 + value: {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite - path: + path: Arms + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -566106182, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.083333336 + value: {fileID: 802980270, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.16666667 + value: {fileID: 2018705060, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.25 + value: {fileID: -1952266300, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.33333334 + value: {fileID: -566106182, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + attribute: m_Sprite + path: PlayerSprite classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -41,24 +56,36 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 1288071446 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 533382794 attribute: 0 script: {fileID: 0} typeID: 212 customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 137852102, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} - - {fileID: -1626674455, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} - - {fileID: -949030097, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} - - {fileID: -457270515, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} - - {fileID: -457270515, guid: d72124af197bb6c408ebaf9279dfe5a1, type: 3} + - {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -566106182, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 802980270, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 2018705060, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1952266300, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -566106182, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 0.35000002 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Aseprite Projects/newPlayer.aseprite b/Assets/Aseprite Projects/newPlayer.aseprite index fd59455..674ddd8 100644 Binary files a/Assets/Aseprite Projects/newPlayer.aseprite and b/Assets/Aseprite Projects/newPlayer.aseprite differ diff --git a/Assets/Aseprite Projects/newPlayer.aseprite.meta b/Assets/Aseprite Projects/newPlayer.aseprite.meta new file mode 100644 index 0000000..b147f34 --- /dev/null +++ b/Assets/Aseprite Projects/newPlayer.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 06708f97b8b1b5b4a8f35ba81bb67e05 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index f9fbba3..433249d 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -300,7 +300,7 @@ Transform: - {fileID: 1759039339} - {fileID: 1938035018} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &37679768 GameObject: @@ -625,7 +625,7 @@ Transform: - {fileID: 1523942492} - {fileID: 466200731} m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &138750305 GameObject: @@ -910,7 +910,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 310196954} - - component: {fileID: 310196953} - component: {fileID: 310196956} - component: {fileID: 310196951} - component: {fileID: 310196961} @@ -949,58 +948,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 1 m_Constraints: 4 ---- !u!212 &310196953 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 310196950} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: fb5dff93729dd844b8c1171e22fe44d7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 2, y: 2} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!4 &310196954 Transform: m_ObjectHideFlags: 0 @@ -1014,8 +961,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 519420032} + - {fileID: 2093017062} + - {fileID: 749003804} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!70 &310196956 CapsuleCollider2D: @@ -1189,7 +1138,7 @@ MonoBehaviour: m_Intensity: 1 m_LightVolumeIntensity: 1 m_LightVolumeIntensityEnabled: 0 - m_ApplyToSortingLayers: bbcf1c00a7c2801a00000000 + m_ApplyToSortingLayers: bbcf1c00a7c2801a00000000bde82176 m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} m_LightOrder: 0 @@ -2407,6 +2356,90 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &749003803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 749003804} + - component: {fileID: 749003805} + m_Layer: 3 + m_Name: PlayerSprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &749003804 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749003803} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 310196954} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &749003805 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749003803} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 241008847, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &760798426 GameObject: m_ObjectHideFlags: 0 @@ -6332,7 +6365,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1335747190 MonoBehaviour: @@ -17955,7 +17988,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1891261597 PrefabInstance: @@ -31031,7 +31064,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1992707781 GameObject: @@ -31191,7 +31224,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2032016596 PrefabInstance: @@ -31680,6 +31713,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2092224469} m_CullTransparentMesh: 1 +--- !u!1 &2093017061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2093017062} + - component: {fileID: 2093017063} + m_Layer: 3 + m_Name: Arms + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2093017062 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093017061} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 310196954} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2093017063 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093017061} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 391566232, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2096937631 GameObject: m_ObjectHideFlags: 0 @@ -31944,7 +32061,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5128193789106105257, guid: 4ca350a347d8520448f562297fbf46d4, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 5128193789106105257, guid: 4ca350a347d8520448f562297fbf46d4, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Sprites/player/newPlayer.png b/Assets/Sprites/player/newPlayer.png new file mode 100644 index 0000000..e8ed36c Binary files /dev/null and b/Assets/Sprites/player/newPlayer.png differ diff --git a/Assets/Sprites/player/newPlayer.png.meta b/Assets/Sprites/player/newPlayer.png.meta new file mode 100644 index 0000000..96e68c4 --- /dev/null +++ b/Assets/Sprites/player/newPlayer.png.meta @@ -0,0 +1,706 @@ +fileFormatVersion: 2 +guid: 5ef811201fe6c354197ef0aa99ba35cc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: newPlayer_0 + rect: + serializedVersion: 2 + x: 0 + y: 96 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 648daae6e37bac64fa525cc9c9d0fe52 + internalID: 241008847 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_1 + rect: + serializedVersion: 2 + x: 16 + y: 96 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 770eb63fc5676d34c9e4bebd98b48550 + internalID: -1521974398 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_2 + rect: + serializedVersion: 2 + x: 32 + y: 96 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 78cfeeba36fea5645a8e09d8bed45b84 + internalID: -405298126 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_3 + rect: + serializedVersion: 2 + x: 48 + y: 96 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7b514395ba9851646b22146f8fe1574e + internalID: -1287590234 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_4 + rect: + serializedVersion: 2 + x: 64 + y: 96 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 86140299abcc1e24b805345266076b9b + internalID: 1059285035 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_5 + rect: + serializedVersion: 2 + x: 80 + y: 96 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7148976ae0cd2374987037aa0d5464ff + internalID: 391566232 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_6 + rect: + serializedVersion: 2 + x: 96 + y: 96 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7b607cff67388f3458ef7b3b0a1fe5f6 + internalID: -734795956 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_7 + rect: + serializedVersion: 2 + x: 112 + y: 96 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e505119ce6afcea45a22cd8d00e006b9 + internalID: 1944640713 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_8 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 73d00b0e20e9aa343bd9777947c454df + internalID: -566106182 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_9 + rect: + serializedVersion: 2 + x: 16 + y: 64 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a30850a47304def46a0883bc5db39144 + internalID: 802980270 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_10 + rect: + serializedVersion: 2 + x: 32 + y: 64 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7347a3a3de93adc46841a80dc660eec7 + internalID: 2018705060 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_11 + rect: + serializedVersion: 2 + x: 48 + y: 64 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0eef0e807edea2149965a583e1c0cce5 + internalID: -1952266300 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_12 + rect: + serializedVersion: 2 + x: 64 + y: 64 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3fecefb6756d1da43b768fabb34c8fa7 + internalID: -1146310612 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_13 + rect: + serializedVersion: 2 + x: 0 + y: 32 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8eff0af8d6bded841954aa603f29bbd3 + internalID: -1260523453 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_14 + rect: + serializedVersion: 2 + x: 16 + y: 32 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f45f0457aaa86074f900255f3d825a1c + internalID: -1743232175 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_15 + rect: + serializedVersion: 2 + x: 32 + y: 32 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8cf7434d1465dba4a8d3f088825e0619 + internalID: 1725496955 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_16 + rect: + serializedVersion: 2 + x: 48 + y: 32 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 01029cb6f3c9b6e4b9f4540968100a98 + internalID: -2069280162 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_17 + rect: + serializedVersion: 2 + x: 64 + y: 32 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 234529c112145a745a66d793571aa482 + internalID: -418912137 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_18 + rect: + serializedVersion: 2 + x: 80 + y: 32 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 43c92d19d66fc8149af401b4593e2cf7 + internalID: 73861881 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_19 + rect: + serializedVersion: 2 + x: 96 + y: 32 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2b3c0f5337d7a7145b867250dee084d7 + internalID: -835024067 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_20 + rect: + serializedVersion: 2 + x: 112 + y: 32 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 76f6d1385c9e2b341a147ac593ccd539 + internalID: 1222150050 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_21 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7dced2e77cede9a408a43fb4acda84bc + internalID: -852492858 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_22 + rect: + serializedVersion: 2 + x: 16 + y: 0 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f79a00d0dbc28c3419872c36bb970834 + internalID: 185238784 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_23 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dbcdfc365871b2c4982006520794a6f9 + internalID: 1841773777 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_24 + rect: + serializedVersion: 2 + x: 48 + y: 0 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 872ce7f318dd645418ccb2e19aecf31e + internalID: 1241877341 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: newPlayer_25 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 16 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 36f4d69cb5f702a4db990467ebf4e02a + internalID: 1347399267 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + newPlayer_4: 1059285035 + newPlayer_10: 2018705060 + newPlayer_1: -1521974398 + newPlayer_2: -405298126 + newPlayer_14: -1743232175 + newPlayer_12: -1146310612 + newPlayer_22: 185238784 + newPlayer_13: -1260523453 + newPlayer_25: 1347399267 + newPlayer_15: 1725496955 + newPlayer_5: 391566232 + newPlayer_7: 1944640713 + newPlayer_19: -835024067 + newPlayer_11: -1952266300 + newPlayer_9: 802980270 + newPlayer_23: 1841773777 + newPlayer_6: -734795956 + newPlayer_0: 241008847 + newPlayer_16: -2069280162 + newPlayer_21: -852492858 + newPlayer_8: -566106182 + newPlayer_3: -1287590234 + newPlayer_17: -418912137 + newPlayer_20: 1222150050 + newPlayer_24: 1241877341 + newPlayer_18: 73861881 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index b3b4ee6..066b818 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -47,3 +47,9 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + - name: Arms + uniqueID: 1981933757 + locked: 0 + - name: Envoirement + uniqueID: 4114961911 + locked: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 8fa8c66..ec07bab 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Inspector + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 136 + controlID: 129 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1416 + width: 1415 height: 939 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 66 + controlID: 117 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1416 + width: 1415 height: 635 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 67 + controlID: 118 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -191,9 +191,9 @@ MonoBehaviour: height: 635 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -213,13 +213,14 @@ MonoBehaviour: serializedVersion: 2 x: 342 y: 0 - width: 1074 + width: 1073 height: 635 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} + - {fileID: 15} + - {fileID: 13} - {fileID: 12} m_Selected: 0 m_LastSelected: 1 @@ -233,23 +234,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 635 - width: 1416 + width: 1415 height: 304 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 16} m_Panes: - - {fileID: 15} - {fileID: 16} - m_Selected: 1 - m_LastSelected: 0 + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -265,18 +266,82 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1416 + x: 1415 y: 0 - width: 504 + width: 505 height: 939 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 17} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 342 + y: 73 + width: 1071 + height: 614 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -6355261309599086672, guid: 90bb3dd39fb871f45afc69781292e62c, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: 127 + e10: 0 + e11: 1 + e12: 0 + e13: -8 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 90bb3dd39fb871f45afc69781292e62c, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -6355261309599086672, guid: 90bb3dd39fb871f45afc69781292e62c, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -298,7 +363,7 @@ MonoBehaviour: serializedVersion: 2 x: 342 y: 73 - width: 1072 + width: 1071 height: 614 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -337,7 +402,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -346,29 +411,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1072 + width: 1071 height: 593 m_Scale: {x: 1, y: 1} - m_Translation: {x: 536, y: 296.5} + m_Translation: {x: 535.5, y: 296.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -536 + x: -535.5 y: -296.5 - width: 1072 + width: 1071 height: 593 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1072, y: 614} + m_LastWindowPixelSize: {x: 1071, y: 614} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -401,7 +466,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 3c6b0000 m_LastClickedID: 27452 - m_ExpandedIDs: 20fbffff + m_ExpandedIDs: 0ec4ffff16f5ffff26fbffff3c6b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -417,7 +482,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 10} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -425,7 +490,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -447,7 +512,7 @@ MonoBehaviour: serializedVersion: 2 x: 342 y: 73 - width: 1072 + width: 1071 height: 614 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -672,9 +737,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 4.669037, y: -2.1873548, z: -1.1641145} + m_Target: {x: 5.6581492, y: -0.44872323, z: -1.0488174} speed: 2 - m_Value: {x: 5.290587, y: -2.2289233, z: -1.169934} + m_Value: {x: 5.6581492, y: -0.44872323, z: -1.0488174} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -725,9 +790,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.350506 + m_Target: 2.6507616 speed: 2 - m_Value: 12.9324665 + m_Value: 2.6507616 m_Ortho: m_Target: 1 speed: 2 @@ -752,7 +817,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -774,7 +839,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 708 - width: 1415 + width: 1414 height: 283 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -793,22 +858,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Inventory + - Assets/Sprites/player m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 63 m_LastFolders: - - Assets/Scripts/Inventory + - Assets/Sprites/player m_LastFoldersGridSize: 63 m_LastProjectPath: M:\UnityProjects\2d-top-down m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 79} - m_SelectedIDs: 2e720000 - m_LastClickedID: 29230 - m_ExpandedIDs: 000000007471000076710000787100007a7100008c71000000ca9a3bffffff7f + scrollPos: {x: 0, y: 121} + m_SelectedIDs: 7e710000 + m_LastClickedID: 29054 + m_ExpandedIDs: 00000000787100007a7100007c7100007e710000847100009071000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -836,7 +901,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007471000076710000787100007a710000 + m_ExpandedIDs: 00000000787100007a7100007c7100007e710000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -861,10 +926,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 3c6b0000 - m_LastClickedInstanceID: 27452 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c623000000000000d06e0000 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c623000000000000d06e00001e720000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -892,7 +957,7 @@ MonoBehaviour: m_GridSize: 63 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -914,13 +979,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 708 - width: 1415 + width: 1414 height: 283 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -940,9 +1005,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1416 + x: 1415 y: 73 - width: 503 + width: 504 height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: