diff --git a/Assets/Animation/walk/player-walk-back.anim b/Assets/Animation/walk/player-walk-back.anim index e723689..72691db 100644 --- a/Assets/Animation/walk/player-walk-back.anim +++ b/Assets/Animation/walk/player-walk-back.anim @@ -20,46 +20,46 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - 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} + value: {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.13333334 + value: {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.25 + value: {fileID: -418912137, 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} + value: {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.5 + value: {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.6333333 + value: {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - time: 0.75 - value: {fileID: 73861881, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + value: {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.8666667 + value: {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 1 + value: {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite path: Arms classID: 212 script: {fileID: 0} - curve: - time: 0 + value: {fileID: -1146310612, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.13333334 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 + - time: 0.25 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.5 + value: {fileID: -1146310612, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.6333333 + value: {fileID: 1725496955, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - time: 0.75 - value: {fileID: -1260523453, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + value: {fileID: -2069280162, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.8666667 + value: {fileID: 1725496955, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 1 + value: {fileID: -1146310612, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite path: PlayerSprite classID: 212 @@ -86,30 +86,30 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {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: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -418912137, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1146310612, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - {fileID: -1260523453, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1743232175, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1260523453, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1146310612, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1725496955, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -2069280162, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1725496955, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1146310612, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.76666665 + m_StopTime: 1.0166667 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 292521f..a7c2540 100644 --- a/Assets/Animation/walk/player-walk-left.anim +++ b/Assets/Animation/walk/player-walk-left.anim @@ -20,32 +20,24 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - - time: 0.13333334 - value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - - time: 0.25 - value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - - time: 0.36666667 - value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - - time: 0.5 - value: {fileID: 1347399267, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + value: {fileID: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.3 + value: {fileID: -852492858, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.5833333 + value: {fileID: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite - path: Arms + path: PlayerSprite 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} + - time: 0.3 + value: {fileID: 1841773777, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.5833333 + value: {fileID: 1841773777, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite - path: PlayerSprite + path: Arms classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -55,13 +47,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 1288071446 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - serializedVersion: 2 path: 533382794 attribute: 0 @@ -69,23 +54,26 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 1288071446 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 pptrCurveMapping: - - {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: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - {fileID: -852492858, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - - {fileID: 185238784, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1222150050, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1841773777, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: 1841773777, 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: 0.51666665 + m_StopTime: 0.59999996 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 ce67dbb..afd1bcb 100644 --- a/Assets/Animation/walk/player-walk-right.anim +++ b/Assets/Animation/walk/player-walk-right.anim @@ -20,15 +20,11 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - 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: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - - time: 0.33333334 - value: {fileID: -734795956, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + value: {fileID: -1952266300, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.3 + value: {fileID: -1952266300, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - time: 0.5833333 + value: {fileID: -1952266300, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite path: Arms classID: 212 @@ -36,13 +32,9 @@ AnimationClip: - curve: - time: 0 value: {fileID: -566106182, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} - - time: 0.083333336 + - time: 0.3 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 + - time: 0.5833333 value: {fileID: -566106182, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} attribute: m_Sprite path: PlayerSprite @@ -70,22 +62,18 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {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: -1952266300, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1952266300, guid: 5ef811201fe6c354197ef0aa99ba35cc, type: 3} + - {fileID: -1952266300, 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: 0.35000002 + m_StopTime: 0.59999996 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 433249d..e36ec47 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -31791,7 +31791,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 1, y: 2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Sprites/player/newPlayer.png b/Assets/Sprites/player/newPlayer.png index e8ed36c..134d11b 100644 Binary files a/Assets/Sprites/player/newPlayer.png and b/Assets/Sprites/player/newPlayer.png differ diff --git a/Assets/Sprites/player/newPlayer.png.meta b/Assets/Sprites/player/newPlayer.png.meta index 96e68c4..f476a9e 100644 --- a/Assets/Sprites/player/newPlayer.png.meta +++ b/Assets/Sprites/player/newPlayer.png.meta @@ -308,7 +308,7 @@ TextureImporter: name: newPlayer_9 rect: serializedVersion: 2 - x: 16 + x: 32 y: 64 width: 16 height: 32 @@ -329,7 +329,7 @@ TextureImporter: name: newPlayer_10 rect: serializedVersion: 2 - x: 32 + x: 48 y: 64 width: 16 height: 32 @@ -350,7 +350,7 @@ TextureImporter: name: newPlayer_11 rect: serializedVersion: 2 - x: 48 + x: 64 y: 64 width: 16 height: 32 @@ -371,8 +371,8 @@ TextureImporter: name: newPlayer_12 rect: serializedVersion: 2 - x: 64 - y: 64 + x: 0 + y: 32 width: 16 height: 32 alignment: 0 @@ -392,7 +392,7 @@ TextureImporter: name: newPlayer_13 rect: serializedVersion: 2 - x: 0 + x: 16 y: 32 width: 16 height: 32 @@ -413,7 +413,7 @@ TextureImporter: name: newPlayer_14 rect: serializedVersion: 2 - x: 16 + x: 32 y: 32 width: 16 height: 32 @@ -434,7 +434,7 @@ TextureImporter: name: newPlayer_15 rect: serializedVersion: 2 - x: 32 + x: 48 y: 32 width: 16 height: 32 @@ -455,7 +455,7 @@ TextureImporter: name: newPlayer_16 rect: serializedVersion: 2 - x: 48 + x: 64 y: 32 width: 16 height: 32 @@ -476,7 +476,7 @@ TextureImporter: name: newPlayer_17 rect: serializedVersion: 2 - x: 64 + x: 80 y: 32 width: 16 height: 32 @@ -497,7 +497,7 @@ TextureImporter: name: newPlayer_18 rect: serializedVersion: 2 - x: 80 + x: 96 y: 32 width: 16 height: 32 @@ -518,7 +518,7 @@ TextureImporter: name: newPlayer_19 rect: serializedVersion: 2 - x: 96 + x: 112 y: 32 width: 16 height: 32 @@ -539,8 +539,8 @@ TextureImporter: name: newPlayer_20 rect: serializedVersion: 2 - x: 112 - y: 32 + x: 0 + y: 0 width: 16 height: 32 alignment: 0 @@ -560,7 +560,7 @@ TextureImporter: name: newPlayer_21 rect: serializedVersion: 2 - x: 0 + x: 32 y: 0 width: 16 height: 32 @@ -581,7 +581,7 @@ TextureImporter: name: newPlayer_22 rect: serializedVersion: 2 - x: 16 + x: 48 y: 0 width: 16 height: 32 @@ -602,7 +602,7 @@ TextureImporter: name: newPlayer_23 rect: serializedVersion: 2 - x: 32 + x: 64 y: 0 width: 16 height: 32 @@ -619,48 +619,6 @@ TextureImporter: 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: [] @@ -680,7 +638,6 @@ TextureImporter: newPlayer_12: -1146310612 newPlayer_22: 185238784 newPlayer_13: -1260523453 - newPlayer_25: 1347399267 newPlayer_15: 1725496955 newPlayer_5: 391566232 newPlayer_7: 1944640713 @@ -696,7 +653,6 @@ TextureImporter: newPlayer_3: -1287590234 newPlayer_17: -418912137 newPlayer_20: 1222150050 - newPlayer_24: 1241877341 newPlayer_18: 73861881 spritePackingTag: pSDRemoveMatte: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index ec07bab..f67929c 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 + x: -1920 y: 43 width: 1920 height: 989 @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 129 + controlID: 138 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 117 + controlID: 33 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 118 + controlID: 34 --- !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: 14} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 14} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -217,10 +217,9 @@ MonoBehaviour: height: 635 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 15} - - {fileID: 13} + - {fileID: 14} - {fileID: 12} m_Selected: 0 m_LastSelected: 1 @@ -245,10 +244,10 @@ MonoBehaviour: height: 304 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 15} m_Panes: + - {fileID: 15} - {fileID: 16} - - {fileID: 17} m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 @@ -272,76 +271,12 @@ MonoBehaviour: height: 939 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 18} + - {fileID: 17} 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} @@ -361,7 +296,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 342 + x: -1578 y: 73 width: 1071 height: 614 @@ -433,7 +368,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &14 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -453,7 +388,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 + x: -1920 y: 73 width: 341 height: 614 @@ -464,9 +399,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3c6b0000 - m_LastClickedID: 27452 - m_ExpandedIDs: 0ec4ffff16f5ffff26fbffff3c6b0000 + m_SelectedIDs: 426f0000 + m_LastClickedID: 0 + m_ExpandedIDs: 2efbffff346b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -490,7 +425,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -510,7 +445,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 342 + x: -1578 y: 73 width: 1071 height: 614 @@ -737,9 +672,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 5.6581492, y: -0.44872323, z: -1.0488174} + m_Target: {x: 3.8774223, y: -0.5788353, z: -1.0512989} speed: 2 - m_Value: {x: 5.6581492, y: -0.44872323, z: -1.0488174} + m_Value: {x: 3.8774223, y: -0.5788353, z: -1.0512989} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -790,9 +725,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.6507616 + m_Target: 2.898895 speed: 2 - m_Value: 2.6507616 + m_Value: 2.898895 m_Ortho: m_Target: 1 speed: 2 @@ -817,7 +752,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -837,7 +772,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 + x: -1920 y: 708 width: 1414 height: 283 @@ -870,10 +805,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 121} - m_SelectedIDs: 7e710000 - m_LastClickedID: 29054 - m_ExpandedIDs: 00000000787100007a7100007c7100007e710000847100009071000000ca9a3bffffff7f + scrollPos: {x: 0, y: 57} + m_SelectedIDs: 92710000 + m_LastClickedID: 29074 + m_ExpandedIDs: 000000008c7100008e7100009071000092710000b271000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -901,7 +836,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000787100007a7100007c7100007e710000 + m_ExpandedIDs: 000000008c7100008e7100009071000092710000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -929,7 +864,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000000000000d06e00001e720000 + m_ExpandedInstanceIDs: c623000000000000d06e00001e720000426f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -957,7 +892,7 @@ MonoBehaviour: m_GridSize: 63 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &17 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -985,7 +920,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &18 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1005,7 +940,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1415 + x: -505 y: 73 width: 504 height: 918