From 5580ea196da772be47d3751dd177a412e3d3c329 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Jan 2023 00:29:35 -0500 Subject: [PATCH] better movement -- speed up when you start gliding, and flapping doesn't slow you --- unity/Assets/Scenes/SampleScene.unity | 878 +++++++++++------- unity/Assets/Scripts/DragonMovement.cs | 23 +- .../blue/Dragon_Green.controller | 29 + .../babydragon_sheets/blue/speedup.anim | 71 ++ .../babydragon_sheets/blue/speedup.anim.meta | 8 + .../green/Dragon_Green.controller | 29 + .../babydragon_sheets/green/speedup.anim | 71 ++ .../babydragon_sheets/green/speedup.anim.meta | 8 + .../red/Dragon_Red.controller | 29 + .../babydragon_sheets/red/speedup.anim | 71 ++ .../babydragon_sheets/red/speedup.anim.meta | 8 + 11 files changed, 865 insertions(+), 360 deletions(-) create mode 100644 unity/Assets/Sprites/babydragon_sheets/blue/speedup.anim create mode 100644 unity/Assets/Sprites/babydragon_sheets/blue/speedup.anim.meta create mode 100644 unity/Assets/Sprites/babydragon_sheets/green/speedup.anim create mode 100644 unity/Assets/Sprites/babydragon_sheets/green/speedup.anim.meta create mode 100644 unity/Assets/Sprites/babydragon_sheets/red/speedup.anim create mode 100644 unity/Assets/Sprites/babydragon_sheets/red/speedup.anim.meta diff --git a/unity/Assets/Scenes/SampleScene.unity b/unity/Assets/Scenes/SampleScene.unity index 90994b4..6986e9c 100644 --- a/unity/Assets/Scenes/SampleScene.unity +++ b/unity/Assets/Scenes/SampleScene.unity @@ -123,163 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &198401002 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.x - value: 2.0108 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.y - value: 2.0108 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.z - value: 2.0108 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.x - value: 2111 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.y - value: 555 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Name - value: Cloud (4) - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} ---- !u!1 &198401003 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 198401002} - m_PrefabAsset: {fileID: 0} ---- !u!114 &198401004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 198401003} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &315244710 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.x - value: 1.4981 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.y - value: 1.4981 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.z - value: 1.4981 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.x - value: 606.658 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.y - value: 112 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Name - value: Cloud (6) - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} --- !u!1 &480143053 GameObject: m_ObjectHideFlags: 0 @@ -342,7 +185,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 4601113484269595429, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} + m_Sprite: {fileID: 6278745784159507077, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -539,6 +382,127 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &551529386 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.x + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.y + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.z + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.x + value: 929 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.y + value: 844 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Size.y + value: 67.3 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Offset.y + value: -18.5 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Name + value: Cloud (9) + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} +--- !u!1 &551529387 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 551529386} + m_PrefabAsset: {fileID: 0} +--- !u!61 &551529388 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551529387} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -9.1, y: 28.8} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 254.33333, y: 109.333336} + newSize: {x: 763, y: 328} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 97.31, y: 48.83} + m_EdgeRadius: 0 +--- !u!114 &551529389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 551529387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &629347643 GameObject: m_ObjectHideFlags: 0 @@ -714,97 +678,10 @@ Transform: - {fileID: 702048808} - {fileID: 1094877704} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &634183952 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.x - value: 2.0108 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.y - value: 2.0108 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.z - value: 2.0108 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.x - value: 1484.4617 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.y - value: 273.2563 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Name - value: Cloud (3) - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} ---- !u!1 &638081260 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 315244710} - m_PrefabAsset: {fileID: 0} ---- !u!114 &638081261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 638081260} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &702048807 -GameObject: +--- !u!1 &702048807 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -833,23 +710,6 @@ Transform: m_Father: {fileID: 629347650} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &813645990 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 634183952} - m_PrefabAsset: {fileID: 0} ---- !u!114 &813645991 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 813645990} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &833231468 GameObject: m_ObjectHideFlags: 0 @@ -880,40 +740,49 @@ Transform: m_Father: {fileID: 1208042752} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &864714669 stripped +--- !u!1 &950892129 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 8093627334746431000} + m_PrefabInstance: {fileID: 1900653967} m_PrefabAsset: {fileID: 0} ---- !u!114 &864714670 +--- !u!114 &950892130 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 864714669} + m_GameObject: {fileID: 950892129} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &950892129 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 1900653967} - m_PrefabAsset: {fileID: 0} ---- !u!114 &950892130 -MonoBehaviour: +--- !u!61 &950892131 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 950892129} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -9.1, y: 28.8} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 254.33333, y: 109.333336} + newSize: {x: 763, y: 328} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 97.31, y: 48.83} + m_EdgeRadius: 0 --- !u!1 &1094877703 GameObject: m_ObjectHideFlags: 0 @@ -944,6 +813,127 @@ Transform: m_Father: {fileID: 629347650} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1183140413 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.x + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.y + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.z + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.x + value: 1936 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.y + value: 244 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Size.y + value: 67.3 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Offset.y + value: -18.5 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Name + value: Cloud (12) + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} +--- !u!1 &1183140414 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 1183140413} + m_PrefabAsset: {fileID: 0} +--- !u!61 &1183140415 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1183140414} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -9.1, y: 28.8} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 254.33333, y: 109.333336} + newSize: {x: 763, y: 328} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 97.31, y: 48.83} + m_EdgeRadius: 0 +--- !u!114 &1183140416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1183140414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1208042745 GameObject: m_ObjectHideFlags: 0 @@ -1118,8 +1108,250 @@ Transform: m_Children: - {fileID: 833231469} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1481847789 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.x + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.y + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.z + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.x + value: 1170 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.y + value: 394 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Size.y + value: 67.3 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Offset.y + value: -18.5 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Name + value: Cloud (10) + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} +--- !u!1 &1481847790 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 1481847789} + m_PrefabAsset: {fileID: 0} +--- !u!61 &1481847791 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1481847790} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -9.1, y: 28.8} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 254.33333, y: 109.333336} + newSize: {x: 763, y: 328} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 97.31, y: 48.83} + m_EdgeRadius: 0 +--- !u!114 &1481847792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1481847790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1543138277 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.x + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.y + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalScale.z + value: 1.5063 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.x + value: 1506 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.y + value: 694 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Size.y + value: 67.3 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Offset.y + value: -18.5 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Name + value: Cloud (11) + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} +--- !u!1 &1543138278 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 1543138277} + m_PrefabAsset: {fileID: 0} +--- !u!61 &1543138279 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1543138278} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -9.1, y: 28.8} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 254.33333, y: 109.333336} + newSize: {x: 763, y: 328} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 97.31, y: 48.83} + m_EdgeRadius: 0 +--- !u!114 &1543138280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1543138278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1850103814 GameObject: m_ObjectHideFlags: 0 @@ -1159,7 +1391,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalScale.x @@ -1175,11 +1407,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalPosition.x - value: 1421.616 + value: 593 objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalPosition.y - value: 773.3224 + value: 426 objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalPosition.z @@ -1213,6 +1445,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Size.y + value: 67.3 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Offset.y + value: -18.5 + objectReference: {fileID: 0} - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Name value: Cloud (8) @@ -1302,73 +1542,3 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &8093627334746431000 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.x - value: 2.2305 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.y - value: 2.2305 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalScale.z - value: 2.2305 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.x - value: 547.526 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.y - value: 903 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Name - value: Cloud - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} diff --git a/unity/Assets/Scripts/DragonMovement.cs b/unity/Assets/Scripts/DragonMovement.cs index 706aad3..caa5eb3 100644 --- a/unity/Assets/Scripts/DragonMovement.cs +++ b/unity/Assets/Scripts/DragonMovement.cs @@ -97,12 +97,27 @@ public class DragonMovement : MonoBehaviour _flapTime -= Time.deltaTime; _stunTime -= Time.deltaTime; - float horizontalSpeed = .8f; + float horizontalSpeed = .4f; float verticalSpeed = 0f; + const float GLIDE_TIME = 2f; + if (_flapTime < - GLIDE_TIME) + { + _animator.Play("speedup"); + horizontalSpeed += (_flapTime + GLIDE_TIME) * -1f; + } + if (_inCloud) { + if (_flapTime < 0) + _flapTime = 0; + + if (_animator.GetCurrentAnimatorStateInfo(0).IsName("speedup")) + { + _animator.Play("glide"); + } + horizontalSpeed = -2f; if (_rigidbody.velocity.y > 0) @@ -111,11 +126,7 @@ public class DragonMovement : MonoBehaviour verticalSpeed = 2f; } - if (_flapTime > 0f) - { - horizontalSpeed = -1.5f; - } - + if (_stunTime > 0f) { horizontalSpeed = -2f; diff --git a/unity/Assets/Sprites/babydragon_sheets/blue/Dragon_Green.controller b/unity/Assets/Sprites/babydragon_sheets/blue/Dragon_Green.controller index 1eb1214..1a61b63 100644 --- a/unity/Assets/Sprites/babydragon_sheets/blue/Dragon_Green.controller +++ b/unity/Assets/Sprites/babydragon_sheets/blue/Dragon_Green.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5444656180054264238 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: speedup + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 4b20b4c2ea6475b4ca3190dbff50411c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-4560172163980586792 AnimatorState: serializedVersion: 6 @@ -118,6 +144,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 9110519029787187049} m_Position: {x: 740, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5444656180054264238} + m_Position: {x: 1140, y: 240, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/unity/Assets/Sprites/babydragon_sheets/blue/speedup.anim b/unity/Assets/Sprites/babydragon_sheets/blue/speedup.anim new file mode 100644 index 0000000..06c62c9 --- /dev/null +++ b/unity/Assets/Sprites/babydragon_sheets/blue/speedup.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: speedup + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 6278745784159507077, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} + - time: 1 + value: {fileID: 6278745784159507077, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 6278745784159507077, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} + - {fileID: 6278745784159507077, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/unity/Assets/Sprites/babydragon_sheets/blue/speedup.anim.meta b/unity/Assets/Sprites/babydragon_sheets/blue/speedup.anim.meta new file mode 100644 index 0000000..f82c404 --- /dev/null +++ b/unity/Assets/Sprites/babydragon_sheets/blue/speedup.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98aa2576c95bed042933dc73215d8302 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Sprites/babydragon_sheets/green/Dragon_Green.controller b/unity/Assets/Sprites/babydragon_sheets/green/Dragon_Green.controller index 41192ac..fbaa100 100644 --- a/unity/Assets/Sprites/babydragon_sheets/green/Dragon_Green.controller +++ b/unity/Assets/Sprites/babydragon_sheets/green/Dragon_Green.controller @@ -70,6 +70,32 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-496789946934697439 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: speedup + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 9a63a30cf45819a40948ccdfdb5cb529, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-465064992474642624 AnimatorState: serializedVersion: 6 @@ -118,6 +144,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 9110519029787187049} m_Position: {x: 740, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: -496789946934697439} + m_Position: {x: 884.81226, y: 278.91522, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/unity/Assets/Sprites/babydragon_sheets/green/speedup.anim b/unity/Assets/Sprites/babydragon_sheets/green/speedup.anim new file mode 100644 index 0000000..f41e529 --- /dev/null +++ b/unity/Assets/Sprites/babydragon_sheets/green/speedup.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: speedup + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -9138000820624713200, guid: f1f52452aedff1d49a96e61902445920, type: 3} + - time: 1 + value: {fileID: 6278745784159507077, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -9138000820624713200, guid: f1f52452aedff1d49a96e61902445920, type: 3} + - {fileID: 6278745784159507077, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/unity/Assets/Sprites/babydragon_sheets/green/speedup.anim.meta b/unity/Assets/Sprites/babydragon_sheets/green/speedup.anim.meta new file mode 100644 index 0000000..12f1c75 --- /dev/null +++ b/unity/Assets/Sprites/babydragon_sheets/green/speedup.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a63a30cf45819a40948ccdfdb5cb529 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Sprites/babydragon_sheets/red/Dragon_Red.controller b/unity/Assets/Sprites/babydragon_sheets/red/Dragon_Red.controller index 4a8f1d8..5819872 100644 --- a/unity/Assets/Sprites/babydragon_sheets/red/Dragon_Red.controller +++ b/unity/Assets/Sprites/babydragon_sheets/red/Dragon_Red.controller @@ -48,6 +48,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-4106520831095978074 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: speedup + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 315239c64017b184f9fe6f5a6b8aba91, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-3812328723082327589 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -118,6 +144,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 2202888483903257212} m_Position: {x: 650, y: 80, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4106520831095978074} + m_Position: {x: 720, y: 220, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/unity/Assets/Sprites/babydragon_sheets/red/speedup.anim b/unity/Assets/Sprites/babydragon_sheets/red/speedup.anim new file mode 100644 index 0000000..27cbfc3 --- /dev/null +++ b/unity/Assets/Sprites/babydragon_sheets/red/speedup.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: speedup + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 5050621076385859653, guid: ffd02a844a873414d975517da88b67e9, type: 3} + - time: 1 + value: {fileID: 6278745784159507077, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 5050621076385859653, guid: ffd02a844a873414d975517da88b67e9, type: 3} + - {fileID: 6278745784159507077, guid: a0e17cad4342ba34eb84f9fd99fad50a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/unity/Assets/Sprites/babydragon_sheets/red/speedup.anim.meta b/unity/Assets/Sprites/babydragon_sheets/red/speedup.anim.meta new file mode 100644 index 0000000..6ac943a --- /dev/null +++ b/unity/Assets/Sprites/babydragon_sheets/red/speedup.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b20b4c2ea6475b4ca3190dbff50411c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: