diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Player/Player.prefab b/FallUnity/Assets/Player/Player.prefab index f316914..250744f 100644 --- a/FallUnity/Assets/Player/Player.prefab +++ b/FallUnity/Assets/Player/Player.prefab @@ -98,7 +98,7 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1127561252628422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.55, y: 2.34, z: 0.24} + m_LocalPosition: {x: -2.25, y: -0.84, z: -1.05} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4644232291033494} @@ -202,9 +202,13 @@ PixelScale: 0.01 Animations: - Sheet: {fileID: 2800000, guid: c1b50d664eb6c564ab4f8126c93ffbb3, type: 3} - Frames: 1 + Frames: 2 Offset: {x: 125, y: 300} Name: Stand + - Sheet: {fileID: 2800000, guid: dbb0ba6ffd5657e4eaa0b736846f6dad, type: 3} + Frames: 2 + Offset: {x: 200, y: 300} + Name: Rake Target: {fileID: 1369658487247200} Dir: 0 Frame: 0 @@ -219,8 +223,11 @@ m_Script: {fileID: 11500000, guid: ea63365dedf6a964a84060ee654bd095, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 5 + Speed: 4.4 Gravity: 6 + RunCycleTime: 0.3 + RunFrameTime: 0.15 + RunFrameSpeedBoost: 1.25 --- !u!114 &114917061756029764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -235,8 +242,10 @@ CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 LinkedImage: {fileID: 1369658487247200} + lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 1 + AllowMovedFlag: 0 IsoType: 0 --- !u!136 &136032829821990682 CapsuleCollider: diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Player/Player.prefab b/FallUnity/Assets/Player/Player.prefab index f316914..250744f 100644 --- a/FallUnity/Assets/Player/Player.prefab +++ b/FallUnity/Assets/Player/Player.prefab @@ -98,7 +98,7 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1127561252628422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.55, y: 2.34, z: 0.24} + m_LocalPosition: {x: -2.25, y: -0.84, z: -1.05} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4644232291033494} @@ -202,9 +202,13 @@ PixelScale: 0.01 Animations: - Sheet: {fileID: 2800000, guid: c1b50d664eb6c564ab4f8126c93ffbb3, type: 3} - Frames: 1 + Frames: 2 Offset: {x: 125, y: 300} Name: Stand + - Sheet: {fileID: 2800000, guid: dbb0ba6ffd5657e4eaa0b736846f6dad, type: 3} + Frames: 2 + Offset: {x: 200, y: 300} + Name: Rake Target: {fileID: 1369658487247200} Dir: 0 Frame: 0 @@ -219,8 +223,11 @@ m_Script: {fileID: 11500000, guid: ea63365dedf6a964a84060ee654bd095, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 5 + Speed: 4.4 Gravity: 6 + RunCycleTime: 0.3 + RunFrameTime: 0.15 + RunFrameSpeedBoost: 1.25 --- !u!114 &114917061756029764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -235,8 +242,10 @@ CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 LinkedImage: {fileID: 1369658487247200} + lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 1 + AllowMovedFlag: 0 IsoType: 0 --- !u!136 &136032829821990682 CapsuleCollider: diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index 320138b..1319cb0 100644 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -18,6 +18,13 @@ } private float velY = 0; + + public float RunCycleTime = 0.8f; + public float RunFrameTime = 0.3f; + + public float RunFrameSpeedBoost = 1.4f; + + private float runCycle = 0.0f; // Update is called once per frame void Update () { @@ -32,7 +39,12 @@ if (dir.magnitude > 0.3f) { dir.Normalize(); - dir *= Speed; + float speed = Speed; + if (runCycle < RunFrameTime) + { + speed *= RunFrameSpeedBoost; + } + dir *= speed; float angle = Mathf.Atan2(dir.z, dir.x); @@ -44,11 +56,21 @@ if (angle >= Mathf.PI * 3.0f / 2.0f) anim.SetDir(AnimationHandler.Direction.DownRight); //Debug.Log("ANGLE: " + angle); + runCycle += Time.deltaTime; + while (runCycle >= RunCycleTime) + { + runCycle -= RunCycleTime; + } + int frame = runCycle < RunFrameTime ? 1 : 0; + anim.SetFrame(frame); } else { dir.x = 0; dir.z = 0; + + anim.SetFrame(0); + runCycle = 0.0f; } } } diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Player/Player.prefab b/FallUnity/Assets/Player/Player.prefab index f316914..250744f 100644 --- a/FallUnity/Assets/Player/Player.prefab +++ b/FallUnity/Assets/Player/Player.prefab @@ -98,7 +98,7 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1127561252628422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.55, y: 2.34, z: 0.24} + m_LocalPosition: {x: -2.25, y: -0.84, z: -1.05} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4644232291033494} @@ -202,9 +202,13 @@ PixelScale: 0.01 Animations: - Sheet: {fileID: 2800000, guid: c1b50d664eb6c564ab4f8126c93ffbb3, type: 3} - Frames: 1 + Frames: 2 Offset: {x: 125, y: 300} Name: Stand + - Sheet: {fileID: 2800000, guid: dbb0ba6ffd5657e4eaa0b736846f6dad, type: 3} + Frames: 2 + Offset: {x: 200, y: 300} + Name: Rake Target: {fileID: 1369658487247200} Dir: 0 Frame: 0 @@ -219,8 +223,11 @@ m_Script: {fileID: 11500000, guid: ea63365dedf6a964a84060ee654bd095, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 5 + Speed: 4.4 Gravity: 6 + RunCycleTime: 0.3 + RunFrameTime: 0.15 + RunFrameSpeedBoost: 1.25 --- !u!114 &114917061756029764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -235,8 +242,10 @@ CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 LinkedImage: {fileID: 1369658487247200} + lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 1 + AllowMovedFlag: 0 IsoType: 0 --- !u!136 &136032829821990682 CapsuleCollider: diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index 320138b..1319cb0 100644 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -18,6 +18,13 @@ } private float velY = 0; + + public float RunCycleTime = 0.8f; + public float RunFrameTime = 0.3f; + + public float RunFrameSpeedBoost = 1.4f; + + private float runCycle = 0.0f; // Update is called once per frame void Update () { @@ -32,7 +39,12 @@ if (dir.magnitude > 0.3f) { dir.Normalize(); - dir *= Speed; + float speed = Speed; + if (runCycle < RunFrameTime) + { + speed *= RunFrameSpeedBoost; + } + dir *= speed; float angle = Mathf.Atan2(dir.z, dir.x); @@ -44,11 +56,21 @@ if (angle >= Mathf.PI * 3.0f / 2.0f) anim.SetDir(AnimationHandler.Direction.DownRight); //Debug.Log("ANGLE: " + angle); + runCycle += Time.deltaTime; + while (runCycle >= RunCycleTime) + { + runCycle -= RunCycleTime; + } + int frame = runCycle < RunFrameTime ? 1 : 0; + anim.SetFrame(frame); } else { dir.x = 0; dir.z = 0; + + anim.SetFrame(0); + runCycle = 0.0f; } } } diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png new file mode 100644 index 0000000..efd5bf2 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Player/Player.prefab b/FallUnity/Assets/Player/Player.prefab index f316914..250744f 100644 --- a/FallUnity/Assets/Player/Player.prefab +++ b/FallUnity/Assets/Player/Player.prefab @@ -98,7 +98,7 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1127561252628422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.55, y: 2.34, z: 0.24} + m_LocalPosition: {x: -2.25, y: -0.84, z: -1.05} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4644232291033494} @@ -202,9 +202,13 @@ PixelScale: 0.01 Animations: - Sheet: {fileID: 2800000, guid: c1b50d664eb6c564ab4f8126c93ffbb3, type: 3} - Frames: 1 + Frames: 2 Offset: {x: 125, y: 300} Name: Stand + - Sheet: {fileID: 2800000, guid: dbb0ba6ffd5657e4eaa0b736846f6dad, type: 3} + Frames: 2 + Offset: {x: 200, y: 300} + Name: Rake Target: {fileID: 1369658487247200} Dir: 0 Frame: 0 @@ -219,8 +223,11 @@ m_Script: {fileID: 11500000, guid: ea63365dedf6a964a84060ee654bd095, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 5 + Speed: 4.4 Gravity: 6 + RunCycleTime: 0.3 + RunFrameTime: 0.15 + RunFrameSpeedBoost: 1.25 --- !u!114 &114917061756029764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -235,8 +242,10 @@ CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 LinkedImage: {fileID: 1369658487247200} + lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 1 + AllowMovedFlag: 0 IsoType: 0 --- !u!136 &136032829821990682 CapsuleCollider: diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index 320138b..1319cb0 100644 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -18,6 +18,13 @@ } private float velY = 0; + + public float RunCycleTime = 0.8f; + public float RunFrameTime = 0.3f; + + public float RunFrameSpeedBoost = 1.4f; + + private float runCycle = 0.0f; // Update is called once per frame void Update () { @@ -32,7 +39,12 @@ if (dir.magnitude > 0.3f) { dir.Normalize(); - dir *= Speed; + float speed = Speed; + if (runCycle < RunFrameTime) + { + speed *= RunFrameSpeedBoost; + } + dir *= speed; float angle = Mathf.Atan2(dir.z, dir.x); @@ -44,11 +56,21 @@ if (angle >= Mathf.PI * 3.0f / 2.0f) anim.SetDir(AnimationHandler.Direction.DownRight); //Debug.Log("ANGLE: " + angle); + runCycle += Time.deltaTime; + while (runCycle >= RunCycleTime) + { + runCycle -= RunCycleTime; + } + int frame = runCycle < RunFrameTime ? 1 : 0; + anim.SetFrame(frame); } else { dir.x = 0; dir.z = 0; + + anim.SetFrame(0); + runCycle = 0.0f; } } } diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png new file mode 100644 index 0000000..efd5bf2 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Player/PlayerRake.png.meta b/FallUnity/Assets/Player/PlayerRake.png.meta new file mode 100644 index 0000000..0b6f090 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: dbb0ba6ffd5657e4eaa0b736846f6dad +timeCreated: 1572156423 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Player/Player.prefab b/FallUnity/Assets/Player/Player.prefab index f316914..250744f 100644 --- a/FallUnity/Assets/Player/Player.prefab +++ b/FallUnity/Assets/Player/Player.prefab @@ -98,7 +98,7 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1127561252628422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.55, y: 2.34, z: 0.24} + m_LocalPosition: {x: -2.25, y: -0.84, z: -1.05} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4644232291033494} @@ -202,9 +202,13 @@ PixelScale: 0.01 Animations: - Sheet: {fileID: 2800000, guid: c1b50d664eb6c564ab4f8126c93ffbb3, type: 3} - Frames: 1 + Frames: 2 Offset: {x: 125, y: 300} Name: Stand + - Sheet: {fileID: 2800000, guid: dbb0ba6ffd5657e4eaa0b736846f6dad, type: 3} + Frames: 2 + Offset: {x: 200, y: 300} + Name: Rake Target: {fileID: 1369658487247200} Dir: 0 Frame: 0 @@ -219,8 +223,11 @@ m_Script: {fileID: 11500000, guid: ea63365dedf6a964a84060ee654bd095, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 5 + Speed: 4.4 Gravity: 6 + RunCycleTime: 0.3 + RunFrameTime: 0.15 + RunFrameSpeedBoost: 1.25 --- !u!114 &114917061756029764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -235,8 +242,10 @@ CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 LinkedImage: {fileID: 1369658487247200} + lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 1 + AllowMovedFlag: 0 IsoType: 0 --- !u!136 &136032829821990682 CapsuleCollider: diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index 320138b..1319cb0 100644 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -18,6 +18,13 @@ } private float velY = 0; + + public float RunCycleTime = 0.8f; + public float RunFrameTime = 0.3f; + + public float RunFrameSpeedBoost = 1.4f; + + private float runCycle = 0.0f; // Update is called once per frame void Update () { @@ -32,7 +39,12 @@ if (dir.magnitude > 0.3f) { dir.Normalize(); - dir *= Speed; + float speed = Speed; + if (runCycle < RunFrameTime) + { + speed *= RunFrameSpeedBoost; + } + dir *= speed; float angle = Mathf.Atan2(dir.z, dir.x); @@ -44,11 +56,21 @@ if (angle >= Mathf.PI * 3.0f / 2.0f) anim.SetDir(AnimationHandler.Direction.DownRight); //Debug.Log("ANGLE: " + angle); + runCycle += Time.deltaTime; + while (runCycle >= RunCycleTime) + { + runCycle -= RunCycleTime; + } + int frame = runCycle < RunFrameTime ? 1 : 0; + anim.SetFrame(frame); } else { dir.x = 0; dir.z = 0; + + anim.SetFrame(0); + runCycle = 0.0f; } } } diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png new file mode 100644 index 0000000..efd5bf2 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Player/PlayerRake.png.meta b/FallUnity/Assets/Player/PlayerRake.png.meta new file mode 100644 index 0000000..0b6f090 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: dbb0ba6ffd5657e4eaa0b736846f6dad +timeCreated: 1572156423 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Player/PlayerStand.png b/FallUnity/Assets/Player/PlayerStand.png index 667bc50..9c07b17 100644 --- a/FallUnity/Assets/Player/PlayerStand.png +++ b/FallUnity/Assets/Player/PlayerStand.png Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Player/Player.prefab b/FallUnity/Assets/Player/Player.prefab index f316914..250744f 100644 --- a/FallUnity/Assets/Player/Player.prefab +++ b/FallUnity/Assets/Player/Player.prefab @@ -98,7 +98,7 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1127561252628422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.55, y: 2.34, z: 0.24} + m_LocalPosition: {x: -2.25, y: -0.84, z: -1.05} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4644232291033494} @@ -202,9 +202,13 @@ PixelScale: 0.01 Animations: - Sheet: {fileID: 2800000, guid: c1b50d664eb6c564ab4f8126c93ffbb3, type: 3} - Frames: 1 + Frames: 2 Offset: {x: 125, y: 300} Name: Stand + - Sheet: {fileID: 2800000, guid: dbb0ba6ffd5657e4eaa0b736846f6dad, type: 3} + Frames: 2 + Offset: {x: 200, y: 300} + Name: Rake Target: {fileID: 1369658487247200} Dir: 0 Frame: 0 @@ -219,8 +223,11 @@ m_Script: {fileID: 11500000, guid: ea63365dedf6a964a84060ee654bd095, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 5 + Speed: 4.4 Gravity: 6 + RunCycleTime: 0.3 + RunFrameTime: 0.15 + RunFrameSpeedBoost: 1.25 --- !u!114 &114917061756029764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -235,8 +242,10 @@ CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 LinkedImage: {fileID: 1369658487247200} + lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 1 + AllowMovedFlag: 0 IsoType: 0 --- !u!136 &136032829821990682 CapsuleCollider: diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index 320138b..1319cb0 100644 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -18,6 +18,13 @@ } private float velY = 0; + + public float RunCycleTime = 0.8f; + public float RunFrameTime = 0.3f; + + public float RunFrameSpeedBoost = 1.4f; + + private float runCycle = 0.0f; // Update is called once per frame void Update () { @@ -32,7 +39,12 @@ if (dir.magnitude > 0.3f) { dir.Normalize(); - dir *= Speed; + float speed = Speed; + if (runCycle < RunFrameTime) + { + speed *= RunFrameSpeedBoost; + } + dir *= speed; float angle = Mathf.Atan2(dir.z, dir.x); @@ -44,11 +56,21 @@ if (angle >= Mathf.PI * 3.0f / 2.0f) anim.SetDir(AnimationHandler.Direction.DownRight); //Debug.Log("ANGLE: " + angle); + runCycle += Time.deltaTime; + while (runCycle >= RunCycleTime) + { + runCycle -= RunCycleTime; + } + int frame = runCycle < RunFrameTime ? 1 : 0; + anim.SetFrame(frame); } else { dir.x = 0; dir.z = 0; + + anim.SetFrame(0); + runCycle = 0.0f; } } } diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png new file mode 100644 index 0000000..efd5bf2 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Player/PlayerRake.png.meta b/FallUnity/Assets/Player/PlayerRake.png.meta new file mode 100644 index 0000000..0b6f090 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: dbb0ba6ffd5657e4eaa0b736846f6dad +timeCreated: 1572156423 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Player/PlayerStand.png b/FallUnity/Assets/Player/PlayerStand.png index 667bc50..9c07b17 100644 --- a/FallUnity/Assets/Player/PlayerStand.png +++ b/FallUnity/Assets/Player/PlayerStand.png Binary files differ diff --git a/FallUnity/Assets/level.unity b/FallUnity/Assets/level.unity index 3bc275e..6280325 100755 --- a/FallUnity/Assets/level.unity +++ b/FallUnity/Assets/level.unity @@ -1326,6 +1326,16 @@ propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunCycleTime + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunFrameTime + value: 0.15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, type: 2} m_IsPrefabParent: 0 diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Player/Player.prefab b/FallUnity/Assets/Player/Player.prefab index f316914..250744f 100644 --- a/FallUnity/Assets/Player/Player.prefab +++ b/FallUnity/Assets/Player/Player.prefab @@ -98,7 +98,7 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1127561252628422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.55, y: 2.34, z: 0.24} + m_LocalPosition: {x: -2.25, y: -0.84, z: -1.05} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4644232291033494} @@ -202,9 +202,13 @@ PixelScale: 0.01 Animations: - Sheet: {fileID: 2800000, guid: c1b50d664eb6c564ab4f8126c93ffbb3, type: 3} - Frames: 1 + Frames: 2 Offset: {x: 125, y: 300} Name: Stand + - Sheet: {fileID: 2800000, guid: dbb0ba6ffd5657e4eaa0b736846f6dad, type: 3} + Frames: 2 + Offset: {x: 200, y: 300} + Name: Rake Target: {fileID: 1369658487247200} Dir: 0 Frame: 0 @@ -219,8 +223,11 @@ m_Script: {fileID: 11500000, guid: ea63365dedf6a964a84060ee654bd095, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 5 + Speed: 4.4 Gravity: 6 + RunCycleTime: 0.3 + RunFrameTime: 0.15 + RunFrameSpeedBoost: 1.25 --- !u!114 &114917061756029764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -235,8 +242,10 @@ CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 LinkedImage: {fileID: 1369658487247200} + lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 1 + AllowMovedFlag: 0 IsoType: 0 --- !u!136 &136032829821990682 CapsuleCollider: diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index 320138b..1319cb0 100644 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -18,6 +18,13 @@ } private float velY = 0; + + public float RunCycleTime = 0.8f; + public float RunFrameTime = 0.3f; + + public float RunFrameSpeedBoost = 1.4f; + + private float runCycle = 0.0f; // Update is called once per frame void Update () { @@ -32,7 +39,12 @@ if (dir.magnitude > 0.3f) { dir.Normalize(); - dir *= Speed; + float speed = Speed; + if (runCycle < RunFrameTime) + { + speed *= RunFrameSpeedBoost; + } + dir *= speed; float angle = Mathf.Atan2(dir.z, dir.x); @@ -44,11 +56,21 @@ if (angle >= Mathf.PI * 3.0f / 2.0f) anim.SetDir(AnimationHandler.Direction.DownRight); //Debug.Log("ANGLE: " + angle); + runCycle += Time.deltaTime; + while (runCycle >= RunCycleTime) + { + runCycle -= RunCycleTime; + } + int frame = runCycle < RunFrameTime ? 1 : 0; + anim.SetFrame(frame); } else { dir.x = 0; dir.z = 0; + + anim.SetFrame(0); + runCycle = 0.0f; } } } diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png new file mode 100644 index 0000000..efd5bf2 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Player/PlayerRake.png.meta b/FallUnity/Assets/Player/PlayerRake.png.meta new file mode 100644 index 0000000..0b6f090 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: dbb0ba6ffd5657e4eaa0b736846f6dad +timeCreated: 1572156423 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Player/PlayerStand.png b/FallUnity/Assets/Player/PlayerStand.png index 667bc50..9c07b17 100644 --- a/FallUnity/Assets/Player/PlayerStand.png +++ b/FallUnity/Assets/Player/PlayerStand.png Binary files differ diff --git a/FallUnity/Assets/level.unity b/FallUnity/Assets/level.unity index 3bc275e..6280325 100755 --- a/FallUnity/Assets/level.unity +++ b/FallUnity/Assets/level.unity @@ -1326,6 +1326,16 @@ propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunCycleTime + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunFrameTime + value: 0.15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, type: 2} m_IsPrefabParent: 0 diff --git a/FallUnity/ProjectSettings/TagManager.asset b/FallUnity/ProjectSettings/TagManager.asset index 64c03e1..4323e17 100644 --- a/FallUnity/ProjectSettings/TagManager.asset +++ b/FallUnity/ProjectSettings/TagManager.asset @@ -19,7 +19,7 @@ - iso_piece - player_controller - player_controller_no_collide - - + - no_hit - - - diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Player/Player.prefab b/FallUnity/Assets/Player/Player.prefab index f316914..250744f 100644 --- a/FallUnity/Assets/Player/Player.prefab +++ b/FallUnity/Assets/Player/Player.prefab @@ -98,7 +98,7 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1127561252628422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.55, y: 2.34, z: 0.24} + m_LocalPosition: {x: -2.25, y: -0.84, z: -1.05} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4644232291033494} @@ -202,9 +202,13 @@ PixelScale: 0.01 Animations: - Sheet: {fileID: 2800000, guid: c1b50d664eb6c564ab4f8126c93ffbb3, type: 3} - Frames: 1 + Frames: 2 Offset: {x: 125, y: 300} Name: Stand + - Sheet: {fileID: 2800000, guid: dbb0ba6ffd5657e4eaa0b736846f6dad, type: 3} + Frames: 2 + Offset: {x: 200, y: 300} + Name: Rake Target: {fileID: 1369658487247200} Dir: 0 Frame: 0 @@ -219,8 +223,11 @@ m_Script: {fileID: 11500000, guid: ea63365dedf6a964a84060ee654bd095, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 5 + Speed: 4.4 Gravity: 6 + RunCycleTime: 0.3 + RunFrameTime: 0.15 + RunFrameSpeedBoost: 1.25 --- !u!114 &114917061756029764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -235,8 +242,10 @@ CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 LinkedImage: {fileID: 1369658487247200} + lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 1 + AllowMovedFlag: 0 IsoType: 0 --- !u!136 &136032829821990682 CapsuleCollider: diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index 320138b..1319cb0 100644 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -18,6 +18,13 @@ } private float velY = 0; + + public float RunCycleTime = 0.8f; + public float RunFrameTime = 0.3f; + + public float RunFrameSpeedBoost = 1.4f; + + private float runCycle = 0.0f; // Update is called once per frame void Update () { @@ -32,7 +39,12 @@ if (dir.magnitude > 0.3f) { dir.Normalize(); - dir *= Speed; + float speed = Speed; + if (runCycle < RunFrameTime) + { + speed *= RunFrameSpeedBoost; + } + dir *= speed; float angle = Mathf.Atan2(dir.z, dir.x); @@ -44,11 +56,21 @@ if (angle >= Mathf.PI * 3.0f / 2.0f) anim.SetDir(AnimationHandler.Direction.DownRight); //Debug.Log("ANGLE: " + angle); + runCycle += Time.deltaTime; + while (runCycle >= RunCycleTime) + { + runCycle -= RunCycleTime; + } + int frame = runCycle < RunFrameTime ? 1 : 0; + anim.SetFrame(frame); } else { dir.x = 0; dir.z = 0; + + anim.SetFrame(0); + runCycle = 0.0f; } } } diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png new file mode 100644 index 0000000..efd5bf2 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Player/PlayerRake.png.meta b/FallUnity/Assets/Player/PlayerRake.png.meta new file mode 100644 index 0000000..0b6f090 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: dbb0ba6ffd5657e4eaa0b736846f6dad +timeCreated: 1572156423 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Player/PlayerStand.png b/FallUnity/Assets/Player/PlayerStand.png index 667bc50..9c07b17 100644 --- a/FallUnity/Assets/Player/PlayerStand.png +++ b/FallUnity/Assets/Player/PlayerStand.png Binary files differ diff --git a/FallUnity/Assets/level.unity b/FallUnity/Assets/level.unity index 3bc275e..6280325 100755 --- a/FallUnity/Assets/level.unity +++ b/FallUnity/Assets/level.unity @@ -1326,6 +1326,16 @@ propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunCycleTime + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunFrameTime + value: 0.15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, type: 2} m_IsPrefabParent: 0 diff --git a/FallUnity/ProjectSettings/TagManager.asset b/FallUnity/ProjectSettings/TagManager.asset index 64c03e1..4323e17 100644 --- a/FallUnity/ProjectSettings/TagManager.asset +++ b/FallUnity/ProjectSettings/TagManager.asset @@ -19,7 +19,7 @@ - iso_piece - player_controller - player_controller_no_collide - - + - no_hit - - - diff --git a/Flash/Player.fla b/Flash/Player.fla index 2642f51..fd96fa4 100644 --- a/Flash/Player.fla +++ b/Flash/Player.fla Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 870efd2..30537f3 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -88,7 +88,7 @@ float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = (Frame * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; diff --git a/FallUnity/Assets/IsoSorting/IsoHandler.cs b/FallUnity/Assets/IsoSorting/IsoHandler.cs index 13baaed..a94b53b 100644 --- a/FallUnity/Assets/IsoSorting/IsoHandler.cs +++ b/FallUnity/Assets/IsoSorting/IsoHandler.cs @@ -256,7 +256,7 @@ if (item.MarkPerm) return; if (item.MarkTemp) { - Debug.LogError("CYCLICAL RENDER GRAPH"); + //Debug.LogError("CYCLICAL RENDER GRAPH"); item.MarkTemp = false; item.MarkPerm = true; //remaining.Remove(item); diff --git a/FallUnity/Assets/Player/Player.prefab b/FallUnity/Assets/Player/Player.prefab index f316914..250744f 100644 --- a/FallUnity/Assets/Player/Player.prefab +++ b/FallUnity/Assets/Player/Player.prefab @@ -98,7 +98,7 @@ m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1127561252628422} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.55, y: 2.34, z: 0.24} + m_LocalPosition: {x: -2.25, y: -0.84, z: -1.05} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4644232291033494} @@ -202,9 +202,13 @@ PixelScale: 0.01 Animations: - Sheet: {fileID: 2800000, guid: c1b50d664eb6c564ab4f8126c93ffbb3, type: 3} - Frames: 1 + Frames: 2 Offset: {x: 125, y: 300} Name: Stand + - Sheet: {fileID: 2800000, guid: dbb0ba6ffd5657e4eaa0b736846f6dad, type: 3} + Frames: 2 + Offset: {x: 200, y: 300} + Name: Rake Target: {fileID: 1369658487247200} Dir: 0 Frame: 0 @@ -219,8 +223,11 @@ m_Script: {fileID: 11500000, guid: ea63365dedf6a964a84060ee654bd095, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 5 + Speed: 4.4 Gravity: 6 + RunCycleTime: 0.3 + RunFrameTime: 0.15 + RunFrameSpeedBoost: 1.25 --- !u!114 &114917061756029764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -235,8 +242,10 @@ CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 LinkedImage: {fileID: 1369658487247200} + lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 1 + AllowMovedFlag: 0 IsoType: 0 --- !u!136 &136032829821990682 CapsuleCollider: diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index 320138b..1319cb0 100644 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -18,6 +18,13 @@ } private float velY = 0; + + public float RunCycleTime = 0.8f; + public float RunFrameTime = 0.3f; + + public float RunFrameSpeedBoost = 1.4f; + + private float runCycle = 0.0f; // Update is called once per frame void Update () { @@ -32,7 +39,12 @@ if (dir.magnitude > 0.3f) { dir.Normalize(); - dir *= Speed; + float speed = Speed; + if (runCycle < RunFrameTime) + { + speed *= RunFrameSpeedBoost; + } + dir *= speed; float angle = Mathf.Atan2(dir.z, dir.x); @@ -44,11 +56,21 @@ if (angle >= Mathf.PI * 3.0f / 2.0f) anim.SetDir(AnimationHandler.Direction.DownRight); //Debug.Log("ANGLE: " + angle); + runCycle += Time.deltaTime; + while (runCycle >= RunCycleTime) + { + runCycle -= RunCycleTime; + } + int frame = runCycle < RunFrameTime ? 1 : 0; + anim.SetFrame(frame); } else { dir.x = 0; dir.z = 0; + + anim.SetFrame(0); + runCycle = 0.0f; } } } diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png new file mode 100644 index 0000000..efd5bf2 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Player/PlayerRake.png.meta b/FallUnity/Assets/Player/PlayerRake.png.meta new file mode 100644 index 0000000..0b6f090 --- /dev/null +++ b/FallUnity/Assets/Player/PlayerRake.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: dbb0ba6ffd5657e4eaa0b736846f6dad +timeCreated: 1572156423 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Player/PlayerStand.png b/FallUnity/Assets/Player/PlayerStand.png index 667bc50..9c07b17 100644 --- a/FallUnity/Assets/Player/PlayerStand.png +++ b/FallUnity/Assets/Player/PlayerStand.png Binary files differ diff --git a/FallUnity/Assets/level.unity b/FallUnity/Assets/level.unity index 3bc275e..6280325 100755 --- a/FallUnity/Assets/level.unity +++ b/FallUnity/Assets/level.unity @@ -1326,6 +1326,16 @@ propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunCycleTime + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunFrameTime + value: 0.15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, type: 2} m_IsPrefabParent: 0 diff --git a/FallUnity/ProjectSettings/TagManager.asset b/FallUnity/ProjectSettings/TagManager.asset index 64c03e1..4323e17 100644 --- a/FallUnity/ProjectSettings/TagManager.asset +++ b/FallUnity/ProjectSettings/TagManager.asset @@ -19,7 +19,7 @@ - iso_piece - player_controller - player_controller_no_collide - - + - no_hit - - - diff --git a/Flash/Player.fla b/Flash/Player.fla index 2642f51..fd96fa4 100644 --- a/Flash/Player.fla +++ b/Flash/Player.fla Binary files differ diff --git a/Flash/PlayerRake.fla b/Flash/PlayerRake.fla new file mode 100644 index 0000000..70d98f7 --- /dev/null +++ b/Flash/PlayerRake.fla Binary files differ