diff --git a/unity/Assets/Scenes/SampleScene.unity b/unity/Assets/Scenes/SampleScene.unity index ddaf480..3b93b6e 100644 --- a/unity/Assets/Scenes/SampleScene.unity +++ b/unity/Assets/Scenes/SampleScene.unity @@ -205,143 +205,64 @@ Transform: m_Father: {fileID: 1588360798} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &477056225 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Color.a - value: 0.654902 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_SortingOrder - value: 26 - objectReference: {fileID: 0} - - 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: 988 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.y - value: 182 - 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.x - value: 195.02 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Size.y - value: 51.1 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Offset.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Offset.y - value: -5.1 - 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 &477056226 stripped +--- !u!1 &238045609 GameObject: - m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 477056225} - m_PrefabAsset: {fileID: 0} ---- !u!114 &477056227 -MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 477056226} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!61 &477056228 + serializedVersion: 6 + m_Component: + - component: {fileID: 238045611} + - component: {fileID: 238045610} + m_Layer: 0 + m_Name: lightning + m_TagString: Lightning + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &238045610 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 477056226} + m_GameObject: {fileID: 238045609} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -12.1, y: 28.8} + m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 238.66667, y: 90.666664} - newSize: {x: 763, y: 328} + oldSize: {x: 38, y: 94.666664} + newSize: {x: 1.14, y: 6.37} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 111.25, y: 28.93} + m_Size: {x: 7.09, y: 94.666664} m_EdgeRadius: 0 +--- !u!4 &238045611 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 238045609} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -65.62, z: 0.86} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2095791120} + m_Father: {fileID: 2100695105} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &480143053 GameObject: m_ObjectHideFlags: 0 @@ -433,7 +354,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &480143056 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -446,10 +367,11 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 --- !u!50 &480143057 Rigidbody2D: serializedVersion: 4 @@ -520,6 +442,88 @@ CircleCollider2D: m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 31.1 +--- !u!1 &506037713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 506037714} + - component: {fileID: 506037715} + m_Layer: 0 + m_Name: graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &506037714 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506037713} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.33, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1489738447} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &506037715 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506037713} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d76eaebf0ab92f444837a89b760938ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 38, y: 94.666664} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -603,172 +607,93 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &519450578 -PrefabInstance: +--- !u!1 &577405911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 577405912} + m_Layer: 0 + m_Name: ConeSpawnPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &577405912 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 577405911} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 37.3, y: -5.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1588360798} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &605188686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 605188688} + - component: {fileID: 605188687} + m_Layer: 0 + m_Name: lightning + m_TagString: Lightning + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &605188687 +BoxCollider2D: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605188686} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 38, y: 94.666664} + newSize: {x: 1.14, y: 6.37} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Color.a - value: 0.654902 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_SortingOrder - value: 26 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_RootOrder - value: 10 - 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: 1796 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.y - value: 809 - 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.x - value: 195.02 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Size.y - value: 51.1 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Offset.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Offset.y - value: -5.1 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Name - value: Cloud (13) - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} ---- !u!1 &519450579 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 519450578} - m_PrefabAsset: {fileID: 0} ---- !u!114 &519450580 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519450579} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!61 &519450581 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519450579} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -12.1, y: 28.8} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 238.66667, y: 90.666664} - newSize: {x: 763, y: 328} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 111.25, y: 28.93} + m_Size: {x: 7.09, y: 94.666664} m_EdgeRadius: 0 ---- !u!1 &577405911 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 577405912} - m_Layer: 0 - m_Name: ConeSpawnPoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &577405912 +--- !u!4 &605188688 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 577405911} + m_GameObject: {fileID: 605188686} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 37.3, y: -5.3, z: 0} + m_LocalPosition: {x: 0, y: -65.62, z: 0.86} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1588360798} - m_RootOrder: 2 + m_Children: + - {fileID: 1403655733} + m_Father: {fileID: 752135908} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &629347643 GameObject: @@ -864,7 +789,7 @@ MonoBehaviour: _attackType: 1 --- !u!95 &629347648 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -877,10 +802,11 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 --- !u!212 &629347649 SpriteRenderer: m_ObjectHideFlags: 0 @@ -949,13 +875,17 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &654025763 +--- !u!1001 &675326173 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 8093627333698608785, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: _lightning + value: + objectReference: {fileID: 1285275487} - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Color.a value: 0.654902 @@ -966,7 +896,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_RootOrder - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalScale.x @@ -982,11 +912,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalPosition.x - value: 1088 + value: 1939 objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalPosition.y - value: 514 + value: 784 objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalPosition.z @@ -1022,11 +952,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Size.x - value: 195.02 + value: 134.6 objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Size.y - value: 51.1 + value: 81.7 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Enabled + value: 1 objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Offset.x @@ -1034,58 +968,41 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Offset.y - value: -5.1 + value: -71.1 objectReference: {fileID: 0} - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Name - value: Cloud (12) + value: Cloud (11) + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_TagString + value: Cloud objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} ---- !u!1 &654025764 stripped +--- !u!1 &675326174 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 654025763} + m_PrefabInstance: {fileID: 675326173} + m_PrefabAsset: {fileID: 0} +--- !u!4 &675326175 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 675326173} m_PrefabAsset: {fileID: 0} ---- !u!114 &654025765 +--- !u!114 &675326176 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 654025764} + m_GameObject: {fileID: 675326174} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!61 &654025766 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 654025764} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -12.1, y: 28.8} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 238.66667, y: 90.666664} - newSize: {x: 763, y: 328} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 111.25, y: 28.93} - m_EdgeRadius: 0 --- !u!1 &702048807 GameObject: m_ObjectHideFlags: 0 @@ -1116,168 +1033,175 @@ Transform: m_Father: {fileID: 629347650} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &833231468 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 833231469} - m_Layer: 0 - m_Name: FireballSpawnPoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &833231469 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 833231468} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 66.2, y: -12.7, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1208042752} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !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: - 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: ---- !u!61 &950892131 -BoxCollider2D: +--- !u!1001 &752135906 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 950892129} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -12.1, y: 28.8} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 238.66667, y: 90.666664} - newSize: {x: 763, y: 328} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 111.25, y: 28.93} - m_EdgeRadius: 0 ---- !u!1 &1001794173 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1001794175} - - component: {fileID: 1001794174} - m_Layer: 0 - m_Name: Flash - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!212 &1001794174 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001794173} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 986ea2d4c47b62e4486f856920e2bac5, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 200, y: 200} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1001794175 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8093627333698608785, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: _lightning + value: + objectReference: {fileID: 605188686} + - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Color.a + value: 0.654902 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_RootOrder + value: 10 + 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: 2193 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.y + value: 317 + 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.x + value: 134.6 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Size.y + value: 81.7 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Offset.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Offset.y + value: -71.1 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Name + value: Cloud (12) + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_TagString + value: Cloud + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} +--- !u!1 &752135907 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 752135906} + m_PrefabAsset: {fileID: 0} +--- !u!4 &752135908 stripped Transform: + m_CorrespondingSourceObject: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 752135906} + m_PrefabAsset: {fileID: 0} +--- !u!114 &752135909 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001794173} + m_GameObject: {fileID: 752135907} + 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 833231469} + m_Layer: 0 + m_Name: FireballSpawnPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &833231469 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833231468} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.13, y: -10.88, z: 0} + m_LocalPosition: {x: 66.2, y: -12.7, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 480143055} - m_RootOrder: 1 + m_Father: {fileID: 1208042752} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1060111564 +--- !u!1001 &877144076 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 8093627333698608785, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: _lightning + value: + objectReference: {fileID: 1489738445} - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Color.a value: 0.654902 @@ -1288,7 +1212,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalScale.x @@ -1304,11 +1228,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalPosition.x - value: 2514 + value: 1604 objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalPosition.y - value: 477 + value: 445 objectReference: {fileID: 0} - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_LocalPosition.z @@ -1344,11 +1268,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Size.x - value: 195.02 + value: 134.6 objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Size.y - value: 51.1 + value: 81.7 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Enabled + value: 1 objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Offset.x @@ -1356,57 +1284,202 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Offset.y - value: -5.1 + value: -71.1 objectReference: {fileID: 0} - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Name - value: Cloud (11) + value: Cloud (10) + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_TagString + value: Cloud objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} ---- !u!1 &1060111565 stripped +--- !u!1 &877144077 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 1060111564} + m_PrefabInstance: {fileID: 877144076} + m_PrefabAsset: {fileID: 0} +--- !u!4 &877144078 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 877144076} m_PrefabAsset: {fileID: 0} ---- !u!114 &1060111566 +--- !u!114 &877144079 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1060111565} + m_GameObject: {fileID: 877144077} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!61 &1060111567 +--- !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: + 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: +--- !u!4 &950892135 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 1900653967} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1001794173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1001794175} + - component: {fileID: 1001794174} + m_Layer: 0 + m_Name: Flash + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!212 &1001794174 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001794173} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 986ea2d4c47b62e4486f856920e2bac5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 200, y: 200} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1001794175 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001794173} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.13, y: -10.88, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 480143055} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1043090684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1043090685} + - component: {fileID: 1043090686} + m_Layer: 0 + m_Name: lightning + m_TagString: Lightning + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1043090685 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043090684} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -65.62, z: 0.86} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1880512418} + m_Father: {fileID: 950892135} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1043090686 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1060111565} + m_GameObject: {fileID: 1043090684} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -12.1, y: 28.8} + m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 238.66667, y: 90.666664} - newSize: {x: 763, y: 328} + oldSize: {x: 38, y: 94.666664} + newSize: {x: 1.14, y: 6.37} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 111.25, y: 28.93} + m_Size: {x: 7.09, y: 94.666664} m_EdgeRadius: 0 --- !u!1 &1094877703 GameObject: @@ -1516,46 +1589,285 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1208042745} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 215fa8664178e8d409e5d9e40cc77cf2, type: 3} - m_Name: - m_EditorClassIdentifier: - FlapKey: 305 - FlapForce: 3000 - FlapLength: 0.1 - _fireballPrefab: {fileID: 3013654646655086450, guid: a0ff208e909d8cd469c02ed1f8eda034, type: 3} - _fireballSpawnPoint: {fileID: 833231468} - _coneSpawnPoint: {fileID: 0} - _flash: {fileID: 2065535042} - _attackType: 0 ---- !u!95 &1208042750 -Animator: - serializedVersion: 3 + m_GameObject: {fileID: 1208042745} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 215fa8664178e8d409e5d9e40cc77cf2, type: 3} + m_Name: + m_EditorClassIdentifier: + FlapKey: 305 + FlapForce: 3000 + FlapLength: 0.1 + _fireballPrefab: {fileID: 3013654646655086450, guid: a0ff208e909d8cd469c02ed1f8eda034, type: 3} + _fireballSpawnPoint: {fileID: 833231468} + _coneSpawnPoint: {fileID: 0} + _flash: {fileID: 2065535042} + _attackType: 0 +--- !u!95 &1208042750 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208042745} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7d855c691504bea4e850c697155d2570, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 +--- !u!212 &1208042751 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208042745} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 5817231778664938184, guid: ffd02a844a873414d975517da88b67e9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 96, y: 96} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1208042752 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208042745} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 180, y: 396.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 833231469} + - {fileID: 2065535044} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1285275487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1285275489} + - component: {fileID: 1285275488} + m_Layer: 0 + m_Name: lightning + m_TagString: Lightning + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1285275488 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285275487} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 38, y: 94.666664} + newSize: {x: 1.14, y: 6.37} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 7.09, y: 94.666664} + m_EdgeRadius: 0 +--- !u!4 &1285275489 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285275487} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -65.62, z: 0.86} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1402897014} + m_Father: {fileID: 675326175} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1402897013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1402897014} + - component: {fileID: 1402897015} + m_Layer: 0 + m_Name: graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1402897014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402897013} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.33, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1285275489} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1402897015 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402897013} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d76eaebf0ab92f444837a89b760938ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 38, y: 94.666664} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1403655732 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1403655733} + - component: {fileID: 1403655734} + m_Layer: 0 + m_Name: graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1403655733 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1208042745} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 7d855c691504bea4e850c697155d2570, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &1208042751 + m_GameObject: {fileID: 1403655732} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.33, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 605188688} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1403655734 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1208042745} + m_GameObject: {fileID: 1403655732} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1588,33 +1900,75 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: 5817231778664938184, guid: ffd02a844a873414d975517da88b67e9, type: 3} + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d76eaebf0ab92f444837a89b760938ba, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 96, y: 96} + m_Size: {x: 38, y: 94.666664} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1208042752 +--- !u!1 &1489738445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1489738447} + - component: {fileID: 1489738446} + m_Layer: 0 + m_Name: lightning + m_TagString: Lightning + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1489738446 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1489738445} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 38, y: 94.666664} + newSize: {x: 1.14, y: 6.37} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 7.09, y: 94.666664} + m_EdgeRadius: 0 +--- !u!4 &1489738447 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1208042745} + m_GameObject: {fileID: 1489738445} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 180, y: 396.3, z: 0} + m_LocalPosition: {x: 0, y: -65.62, z: 0.86} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 833231469} - - {fileID: 2065535044} - m_Father: {fileID: 0} - m_RootOrder: 4 + - {fileID: 506037714} + m_Father: {fileID: 877144078} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1588360791 GameObject: @@ -1710,7 +2064,7 @@ MonoBehaviour: _attackType: 1 --- !u!95 &1588360796 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1723,10 +2077,11 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 --- !u!212 &1588360797 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1904,146 +2259,9 @@ Transform: m_LocalPosition: {x: 66.2, y: -12.7, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1588360798} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1817051803 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Color.a - value: 0.654902 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_SortingOrder - value: 26 - objectReference: {fileID: 0} - - 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: 2119 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_LocalPosition.y - value: 721 - 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.x - value: 195.02 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Size.y - value: 51.1 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Offset.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - propertyPath: m_Offset.y - value: -5.1 - 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 &1817051804 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} - m_PrefabInstance: {fileID: 1817051803} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1817051805 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817051804} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!61 &1817051806 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817051804} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -12.1, y: 28.8} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 238.66667, y: 90.666664} - newSize: {x: 763, y: 328} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 111.25, y: 28.93} - m_EdgeRadius: 0 + m_Father: {fileID: 1588360798} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1850103814 GameObject: m_ObjectHideFlags: 0 @@ -2074,6 +2292,88 @@ Transform: m_Father: {fileID: 480143055} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1880512417 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1880512418} + - component: {fileID: 1880512419} + m_Layer: 0 + m_Name: graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1880512418 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1880512417} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.33, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1043090685} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1880512419 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1880512417} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d76eaebf0ab92f444837a89b760938ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 38, y: 94.666664} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1900653967 PrefabInstance: m_ObjectHideFlags: 0 @@ -2081,6 +2381,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 8093627333698608785, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: _lightning + value: + objectReference: {fileID: 1043090684} - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Color.a value: 0.654902 @@ -2147,11 +2451,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Size.x - value: 195.02 + value: 134.6 objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Size.y - value: 51.1 + value: 81.7 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Enabled + value: 1 objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Offset.x @@ -2159,12 +2467,16 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Offset.y - value: -5.1 + value: -71.1 objectReference: {fileID: 0} - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} propertyPath: m_Name value: Cloud (8) objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_TagString + value: Cloud + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} @@ -2345,3 +2657,213 @@ Transform: m_Father: {fileID: 1208042752} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2095791119 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2095791120} + - component: {fileID: 2095791121} + m_Layer: 0 + m_Name: graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2095791120 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095791119} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.33, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 238045611} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2095791121 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095791119} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d76eaebf0ab92f444837a89b760938ba, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 38, y: 94.666664} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1001 &2100695103 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8093627333698608785, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: _lightning + value: + objectReference: {fileID: 238045609} + - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Color.a + value: 0.654902 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608786, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} + - 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: 1139 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_LocalPosition.y + value: 666 + 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.x + value: 134.6 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Size.y + value: 81.7 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Offset.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608788, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Offset.y + value: -71.1 + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_Name + value: Cloud (9) + objectReference: {fileID: 0} + - target: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + propertyPath: m_TagString + value: Cloud + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8093627333698608784, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} +--- !u!1 &2100695104 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8093627333698608799, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 2100695103} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2100695105 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8093627333698608787, guid: 222963b5f45b20141bf7dd413f3342cd, type: 3} + m_PrefabInstance: {fileID: 2100695103} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2100695106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2100695104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0688d5c8286e7bf46981061fd36ed817, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/unity/Assets/Scripts/Cloud.cs b/unity/Assets/Scripts/Cloud.cs index 631c854..12f0212 100644 --- a/unity/Assets/Scripts/Cloud.cs +++ b/unity/Assets/Scripts/Cloud.cs @@ -4,10 +4,19 @@ using UnityEngine; public class Cloud : MonoBehaviour { + [SerializeField] GameObject _lightning; + float _timeToHideLightning = 0f; + float _lightningTimeout = 0f; + float _timeToRandomStrike; + + const bool DO_RANDOM_STRIKES = true; + // Start is called before the first frame update void Start() { ReInit(); + HideLightning(); + SetTimeForNextRandomStrike(); } // Update is called once per frame @@ -15,6 +24,32 @@ public class Cloud : MonoBehaviour { const float SPEED = 1f; this.transform.position = new Vector3(transform.position.x - SPEED, transform.position.y, transform.position.z); + + _lightningTimeout -= Time.deltaTime; + _timeToHideLightning -= Time.deltaTime; + _timeToRandomStrike -= Time.deltaTime; + + if (_timeToHideLightning < 0f) + { + HideLightning(); + } + + if (_timeToRandomStrike < 0f && DO_RANDOM_STRIKES) + { + TriggerLighting(_lightning.transform.position.x); + SetTimeForNextRandomStrike(); + } + } + + void SetTimeForNextRandomStrike() + { + _timeToRandomStrike = Random.Range(4f, 10f); + } + + private void HideLightning() + { + _lightning.SetActive(false); + _timeToHideLightning = float.MaxValue; } public void ReInit() @@ -25,4 +60,15 @@ public class Cloud : MonoBehaviour transform.localScale = new Vector3(scale, scale, 2f); transform.position = new Vector3(transform.position.x + x, y, transform.position.z); } + + public void TriggerLighting(float x) + { + if (_lightningTimeout > 0) + return; + + _lightning.SetActive(true); + _lightning.transform.position = new Vector3(x, _lightning.transform.position.y, _lightning.transform.position.z); + _timeToHideLightning = .2f; + _lightningTimeout = 2.0f; + } } diff --git a/unity/Assets/Scripts/DragonMovement.cs b/unity/Assets/Scripts/DragonMovement.cs index 3a33b9d..697210a 100644 --- a/unity/Assets/Scripts/DragonMovement.cs +++ b/unity/Assets/Scripts/DragonMovement.cs @@ -29,31 +29,55 @@ public class DragonMovement : MonoBehaviour const string CONE_NAME = "cone"; private void OnTriggerEnter2D(Collider2D collision) { - //Debug.Log("ontriggerenter"); - _inCloud = true; - Flash(); + GameObject cone = transform.Find(CONE_NAME)?.gameObject; if (cone) { GameObject.Destroy(cone); } + CheckCloudCollision(collision); + + if (collision.CompareTag("Lightning")) + { + Stun(.2f); + } + if (collision.CompareTag("Fireball")) { Fireball fireball = collision.GetComponent(); if (fireball.AttackType == AttackType.CONE) { - _stunTime = .4f; + Stun(.4f); } else { - _stunTime = .2f; + Stun(.2f); } - _animator.Play("fall"); } } + private void OnTriggerStay2D(Collider2D collision) + { + CheckCloudCollision(collision); + } + + private void CheckCloudCollision(Collider2D collision) + { + if (collision.CompareTag("Cloud")) + { + Cloud cloud = collision.GetComponent(); + cloud.TriggerLighting(transform.position.x); + } + } + + void Stun(float length) + { + _stunTime = length; + _animator.Play("fall"); + } + private void OnTriggerExit2D(Collider2D collision) { _inCloud = false; @@ -128,6 +152,7 @@ public class DragonMovement : MonoBehaviour } + /* //old cloud behavior if (_inCloud) { if (_flapTime < 0) @@ -145,6 +170,7 @@ public class DragonMovement : MonoBehaviour else if (_rigidbody.velocity.y < 0) verticalSpeed = 2f; } + */ if (_stunTime > 0f) diff --git a/unity/Assets/Sprites/lightning.jpg b/unity/Assets/Sprites/lightning.jpg new file mode 100644 index 0000000..9faa37b Binary files /dev/null and b/unity/Assets/Sprites/lightning.jpg differ diff --git a/unity/Assets/Sprites/lightning.jpg.meta b/unity/Assets/Sprites/lightning.jpg.meta new file mode 100644 index 0000000..fc10509 --- /dev/null +++ b/unity/Assets/Sprites/lightning.jpg.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: e7f3ea0bc9989cc438fe6b577abf3293 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Sprites/lightning1.png b/unity/Assets/Sprites/lightning1.png new file mode 100644 index 0000000..62745a8 Binary files /dev/null and b/unity/Assets/Sprites/lightning1.png differ diff --git a/unity/Assets/Sprites/lightning1.png.meta b/unity/Assets/Sprites/lightning1.png.meta new file mode 100644 index 0000000..7b19042 --- /dev/null +++ b/unity/Assets/Sprites/lightning1.png.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 77ec464a9c0255e4a8c76a61850a04ca +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Sprites/lightning1_short.png b/unity/Assets/Sprites/lightning1_short.png new file mode 100644 index 0000000..583ae0b Binary files /dev/null and b/unity/Assets/Sprites/lightning1_short.png differ diff --git a/unity/Assets/Sprites/lightning1_short.png.meta b/unity/Assets/Sprites/lightning1_short.png.meta new file mode 100644 index 0000000..e0b4f78 --- /dev/null +++ b/unity/Assets/Sprites/lightning1_short.png.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: d76eaebf0ab92f444837a89b760938ba +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 3 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Sprites/lightning2.png b/unity/Assets/Sprites/lightning2.png new file mode 100644 index 0000000..deffec3 Binary files /dev/null and b/unity/Assets/Sprites/lightning2.png differ diff --git a/unity/Assets/Sprites/lightning2.png.meta b/unity/Assets/Sprites/lightning2.png.meta new file mode 100644 index 0000000..a0597a8 --- /dev/null +++ b/unity/Assets/Sprites/lightning2.png.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: b44d1ba12dfc2224eb29be051f80fea1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Sprites/lightning2_short.png b/unity/Assets/Sprites/lightning2_short.png new file mode 100644 index 0000000..886121d Binary files /dev/null and b/unity/Assets/Sprites/lightning2_short.png differ diff --git a/unity/Packages/manifest.json b/unity/Packages/manifest.json index 89ebb8f..81cfddf 100644 --- a/unity/Packages/manifest.json +++ b/unity/Packages/manifest.json @@ -1,16 +1,16 @@ { "dependencies": { - "com.unity.2d.animation": "5.0.10", + "com.unity.2d.animation": "5.2.0", "com.unity.2d.pixel-perfect": "4.0.1", - "com.unity.2d.psdimporter": "4.1.3", + "com.unity.2d.psdimporter": "4.3.0", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "5.1.7", + "com.unity.2d.spriteshape": "5.3.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.collab-proxy": "1.15.7", - "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.12", - "com.unity.ide.vscode": "1.2.4", - "com.unity.test-framework": "1.1.29", + "com.unity.collab-proxy": "1.17.7", + "com.unity.ide.rider": "3.0.17", + "com.unity.ide.visualstudio": "2.0.17", + "com.unity.ide.vscode": "1.2.5", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", diff --git a/unity/Packages/packages-lock.json b/unity/Packages/packages-lock.json index 9c31022..a963bb4 100644 --- a/unity/Packages/packages-lock.json +++ b/unity/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "5.0.10", + "version": "5.2.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "4.0.4", + "com.unity.2d.common": "4.2.0", "com.unity.mathematics": "1.1.0", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -14,7 +14,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "4.0.4", + "version": "4.2.0", "depth": 1, "source": "registry", "dependencies": { @@ -38,12 +38,12 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "4.1.3", + "version": "4.3.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "4.0.4", - "com.unity.2d.animation": "5.0.10", + "com.unity.2d.common": "4.2.0", + "com.unity.2d.animation": "5.2.0", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -55,12 +55,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "5.1.7", + "version": "5.3.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "4.0.4", + "com.unity.2d.common": "4.2.0", "com.unity.2d.path": "4.0.2", "com.unity.modules.physics2d": "1.0.0" }, @@ -73,11 +73,10 @@ "dependencies": {} }, "com.unity.collab-proxy": { - "version": "1.15.7", + "version": "1.17.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0", "com.unity.services.core": "1.0.1" }, "url": "https://packages.unity.com" @@ -90,16 +89,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.17", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.12", + "version": "2.0.17", "depth": 0, "source": "registry", "dependencies": { @@ -108,7 +107,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.4", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, @@ -121,13 +120,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.services.core": { "version": "1.0.1", "depth": 1, @@ -138,7 +130,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { diff --git a/unity/ProjectSettings/TagManager.asset b/unity/ProjectSettings/TagManager.asset index fba58f8..1647b43 100644 --- a/unity/ProjectSettings/TagManager.asset +++ b/unity/ProjectSettings/TagManager.asset @@ -5,6 +5,8 @@ TagManager: serializedVersion: 2 tags: - Fireball + - Lightning + - Cloud layers: - Default - TransparentFX