From 2222b3645d34f029744dfc0a48704be07806ee4c Mon Sep 17 00:00:00 2001 From: amm266 Date: Wed, 24 Mar 2021 01:29:16 +0430 Subject: [PATCH] Update Scene --- Assets/Prefabs/base1.prefab | 356 +++--------------- Assets/Prefabs/base2.prefab | 211 +++++------ Assets/Prefabs/cell1.prefab | 4 +- Assets/Prefabs/cell2.prefab | 4 +- Assets/Scenes/MapScene.unity | 34 +- Assets/Scripts/UIManager.cs | 2 +- .../Sprites/Ants/Animations/BlackAntDie.anim | 2 +- .../Sprites/Ants/Animations/BlackAntIdle.anim | 2 +- .../Animations/BlackScorpionDead.anim | 102 ++++- .../Animations/BlackScorpionIdle.anim | 86 ++++- .../Animations/BlackScorptionAttack.anim | 50 ++- .../Scorpions/Animations/RedScorpionDead.anim | 102 ++++- .../Scorpions/Animations/RedScorpionIdle.anim | 95 ++++- .../Scorpions/Animations/RedScorpionWalk.anim | 68 +++- .../Animations/RedScorptionAttack.anim | 50 ++- .../Animations/blackFighter.controller | 25 +- .../Animations/redFighter.controller | 25 +- 17 files changed, 744 insertions(+), 474 deletions(-) diff --git a/Assets/Prefabs/base1.prefab b/Assets/Prefabs/base1.prefab index 1e0038e..166c03e 100644 --- a/Assets/Prefabs/base1.prefab +++ b/Assets/Prefabs/base1.prefab @@ -1,104 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2500068157388433113 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8472080786041574143} - - component: {fileID: 3665635130287151830} - - component: {fileID: 3026846721727596251} - - component: {fileID: 3686029746126628830} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8472080786041574143 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2500068157388433113} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 138358282192917419} - m_Father: {fileID: 6046186819930365853} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 2, y: 2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &3665635130287151830 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2500068157388433113} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 58588113 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &3026846721727596251 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2500068157388433113} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 100 ---- !u!114 &3686029746126628830 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2500068157388433113} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!1 &6046186819930365855 GameObject: m_ObjectHideFlags: 0 @@ -128,8 +29,7 @@ Transform: m_LocalPosition: {x: -1.48, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8472080786041574143} - - {fileID: 6205538577221030233} + - {fileID: 7531302611914159803} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -171,9 +71,9 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 58588113 - m_SortingLayer: -1 + m_SortingLayer: -2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 5e035115c749d284abd7119ef1ec65b3, type: 3} + m_Sprite: {fileID: 21300000, guid: d60426435b3a0564b9f27a644aa86683, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -196,9 +96,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9755f7a1657cab24483a52326105ed1d, type: 3} m_Name: m_EditorClassIdentifier: - healthText: {fileID: 605628675441041534} - healthBar: {fileID: 6205538578689328538} ---- !u!1 &8640561645862561521 + healthText: {fileID: 0} + healthBar: {fileID: 0} +--- !u!1 &6058784487369808900 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -206,211 +106,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 138358282192917419} - - component: {fileID: 6416177159453361631} - - component: {fileID: 605628675441041534} - m_Layer: 5 - m_Name: Text + - component: {fileID: 7531302611914159803} + - component: {fileID: 5942021436840990837} + m_Layer: 0 + m_Name: back ground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &138358282192917419 -RectTransform: +--- !u!4 &7531302611914159803 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8640561645862561521} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6058784487369808900} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8472080786041574143} + m_Father: {fileID: 6046186819930365853} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.03, y: 0.23} - m_SizeDelta: {x: 2.8555298, y: 2.1664786} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6416177159453361631 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8640561645862561521} - m_CullTransparentMesh: 1 ---- !u!114 &605628675441041534 -MonoBehaviour: +--- !u!212 &5942021436840990837 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8640561645862561521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 1 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 5 ---- !u!1001 &6515944441883170206 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6046186819930365853} - m_Modifications: - - target: {fileID: 897281233264971779, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_Value - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0.049 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchoredPosition.y - value: 1.77 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_SizeDelta.x - value: 2.803617 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_SizeDelta.y - value: 0.9755292 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalScale.x - value: 3.3099 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalScale.y - value: 3.3099 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalScale.z - value: 3.3099 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235147, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_Name - value: Canvas (1) - objectReference: {fileID: 0} - - target: {fileID: 897281234643472476, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234643472476, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} ---- !u!224 &6205538577221030233 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - m_PrefabInstance: {fileID: 6515944441883170206} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6205538578689328538 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 897281233264971780, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - m_PrefabInstance: {fileID: 6515944441883170206} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 6058784487369808900} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a4540f867562901408a044fb736cd4c6, type: 3} - m_Name: - m_EditorClassIdentifier: + 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: -2073736493 + m_SortingLayer: -3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: e26b8dd5db729264e9bfa881cfaa8952, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 2, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/base2.prefab b/Assets/Prefabs/base2.prefab index 88594e0..7b64de5 100644 --- a/Assets/Prefabs/base2.prefab +++ b/Assets/Prefabs/base2.prefab @@ -1,5 +1,87 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2962017138873694443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2345218041912017139} + - component: {fileID: 5006974352682027201} + m_Layer: 0 + m_Name: back ground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2345218041912017139 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2962017138873694443} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6046186819930365853} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5006974352682027201 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2962017138873694443} + 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: -2073736493 + m_SortingLayer: -3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: e26b8dd5db729264e9bfa881cfaa8952, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 2, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6046186819930365855 GameObject: m_ObjectHideFlags: 0 @@ -29,7 +111,7 @@ Transform: m_LocalPosition: {x: -1.48, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 401278956855049317} + - {fileID: 2345218041912017139} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -71,9 +153,9 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 58588113 - m_SortingLayer: -1 + m_SortingLayer: -2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 736ac6e87f195e74cbd11ed11438868b, type: 3} + m_Sprite: {fileID: 21300000, guid: b15b7f4e91129354a8fb6805e8b21a00, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -97,125 +179,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: healthText: {fileID: 0} - healthBar: {fileID: 401278955909523622} ---- !u!1001 &712247769056786594 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6046186819930365853} - m_Modifications: - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0.039008856 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.7713395 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_SizeDelta.x - value: 3.7581062 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_SizeDelta.y - value: 1.5348687 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 897281234225235147, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_Name - value: Canvas (1) - objectReference: {fileID: 0} - - target: {fileID: 897281234643472476, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 897281234643472476, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} ---- !u!224 &401278956855049317 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 897281234225235143, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - m_PrefabInstance: {fileID: 712247769056786594} - m_PrefabAsset: {fileID: 0} ---- !u!114 &401278955909523622 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 897281233264971780, guid: 7a7b86b3505bf8b49a1f5b34cdf6a6d1, type: 3} - m_PrefabInstance: {fileID: 712247769056786594} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a4540f867562901408a044fb736cd4c6, type: 3} - m_Name: - m_EditorClassIdentifier: + healthBar: {fileID: 0} diff --git a/Assets/Prefabs/cell1.prefab b/Assets/Prefabs/cell1.prefab index 8bf709c..3895f1a 100644 --- a/Assets/Prefabs/cell1.prefab +++ b/Assets/Prefabs/cell1.prefab @@ -69,9 +69,9 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -2073736493 - m_SortingLayer: -1 + m_SortingLayer: -3 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 41214eef8b908b24c83afa2d29b2dd1f, type: 3} + m_Sprite: {fileID: 21300000, guid: 38739bcc7a6a85941bd3c98ea2738451, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Prefabs/cell2.prefab b/Assets/Prefabs/cell2.prefab index a76b4c3..3837fe3 100644 --- a/Assets/Prefabs/cell2.prefab +++ b/Assets/Prefabs/cell2.prefab @@ -69,9 +69,9 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -2073736493 - m_SortingLayer: -1 + m_SortingLayer: -2 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: d231ce93753a52e42aa842b4dbe65aa6, type: 3} + m_Sprite: {fileID: 21300000, guid: e26b8dd5db729264e9bfa881cfaa8952, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Scenes/MapScene.unity b/Assets/Scenes/MapScene.unity index 25f2472..3efaa69 100644 --- a/Assets/Scenes/MapScene.unity +++ b/Assets/Scenes/MapScene.unity @@ -526,11 +526,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1236313013, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1236313013, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1294904145, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.x @@ -542,11 +542,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 232345013196691562, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.y - value: -65 + value: -65.00005 objectReference: {fileID: 0} - target: {fileID: 232345013196691562, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.x - value: -5 + value: -27 + objectReference: {fileID: 0} + - target: {fileID: 232345013196691562, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_Pivot.y + value: 0.4999992 + objectReference: {fileID: 0} + - target: {fileID: 232345013196691562, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_Pivot.x + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 380209097684486977, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.x @@ -606,11 +614,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 897281234955408375, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 897281234955408375, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 899166943726102645, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_ChildControlHeight @@ -1496,8 +1504,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -56.4, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -80, y: 0} + m_SizeDelta: {x: 147.20824, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &902179365 MonoBehaviour: @@ -1631,7 +1639,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1003224826 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1912,7 +1920,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 1.67 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -2479,7 +2487,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2069621863 Transform: m_ObjectHideFlags: 0 @@ -2529,8 +2537,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 34, y: -8.7} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 57.82, y: -8.7} + m_SizeDelta: {x: 147.63759, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2119158208 MonoBehaviour: diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index 49989d0..9b6a325 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; diff --git a/Assets/Sprites/Ants/Animations/BlackAntDie.anim b/Assets/Sprites/Ants/Animations/BlackAntDie.anim index fa4974b..479d45b 100644 --- a/Assets/Sprites/Ants/Animations/BlackAntDie.anim +++ b/Assets/Sprites/Ants/Animations/BlackAntDie.anim @@ -191,7 +191,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Sprites/Ants/Animations/BlackAntIdle.anim b/Assets/Sprites/Ants/Animations/BlackAntIdle.anim index 15b0aae..83a0a29 100644 --- a/Assets/Sprites/Ants/Animations/BlackAntIdle.anim +++ b/Assets/Sprites/Ants/Animations/BlackAntIdle.anim @@ -108,7 +108,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Sprites/Scorpions/Animations/BlackScorpionDead.anim b/Assets/Sprites/Scorpions/Animations/BlackScorpionDead.anim index 9e57350..56ee541 100644 --- a/Assets/Sprites/Scorpions/Animations/BlackScorpionDead.anim +++ b/Assets/Sprites/Scorpions/Animations/BlackScorpionDead.anim @@ -16,22 +16,84 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.35 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 7815332555e9a9441b1539d4cffa27e4, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: ee58ff6e638f5e94ea5b4db8018b8a97, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 2c5ab4d2cf2b7914c91ac9ddcaac7618, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: a63499cb93657a6408237db23ae3767a, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 51a206a1b8c38394889bf7cf96d2aca2, 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 7815332555e9a9441b1539d4cffa27e4, type: 3} + - {fileID: 21300000, guid: ee58ff6e638f5e94ea5b4db8018b8a97, type: 3} + - {fileID: 21300000, guid: 2c5ab4d2cf2b7914c91ac9ddcaac7618, type: 3} + - {fileID: 21300000, guid: a63499cb93657a6408237db23ae3767a, type: 3} + - {fileID: 21300000, guid: 51a206a1b8c38394889bf7cf96d2aca2, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.35000002 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -46,7 +108,35 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.35 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Sprites/Scorpions/Animations/BlackScorpionIdle.anim b/Assets/Sprites/Scorpions/Animations/BlackScorpionIdle.anim index 0bceb5d..de11486 100644 --- a/Assets/Sprites/Scorpions/Animations/BlackScorpionIdle.anim +++ b/Assets/Sprites/Scorpions/Animations/BlackScorpionIdle.anim @@ -17,21 +17,99 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 9f0d160b5a59e0f4ebc5414ce714be9f, type: 3} + - time: 0.016666668 + value: {fileID: 21300000, guid: b56e574e335357b4f9e4426a3ef5adb4, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 9671e3bfb4082504c9533670bdca50ee, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 5de17df72ccac6e42b531b521ba73e0b, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: a96cc5279a9ef5c48a8bb13f8e40c9ca, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: 4b4bb9a322f604d4c956c1f078b5aded, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 51a4bfc82c2d0324c8991e5252eba048, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 23cab32c267179c48974416aed2330d2, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: 8b85a24ad252dfa428743b8e61fa7bca, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 88abf6b14691b02429b06b5874435639, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: 43b0d5a602e8d9b4590362757416a28d, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 5802a08814c766641a359b4c9fc7f4c2, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: 815476bada0e0b1418cca3408bfeced5, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 1787c896bf6dfd046892a64acd1e3a82, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: da58253aab86d694b9ee484f27bd1f2d, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: 9364a29f20f062348a06f0c45c22a539, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 9ea3869e37735d045aa8d003b964415c, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: 453da2b34266f2f48a4562ab43c83216, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: 4f340dbc2a7182d418c389d45da9a655, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: 431f0eed7c59eb04eba04a765e98594c, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: ca6c94ea341b2a340aae0c6232ae0dc6, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: de30424b6fd1e124f9d6111e16a6a45b, 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 9f0d160b5a59e0f4ebc5414ce714be9f, type: 3} + - {fileID: 21300000, guid: b56e574e335357b4f9e4426a3ef5adb4, type: 3} + - {fileID: 21300000, guid: 9671e3bfb4082504c9533670bdca50ee, type: 3} + - {fileID: 21300000, guid: 5de17df72ccac6e42b531b521ba73e0b, type: 3} + - {fileID: 21300000, guid: a96cc5279a9ef5c48a8bb13f8e40c9ca, type: 3} + - {fileID: 21300000, guid: 4b4bb9a322f604d4c956c1f078b5aded, type: 3} + - {fileID: 21300000, guid: 51a4bfc82c2d0324c8991e5252eba048, type: 3} + - {fileID: 21300000, guid: 23cab32c267179c48974416aed2330d2, type: 3} + - {fileID: 21300000, guid: 8b85a24ad252dfa428743b8e61fa7bca, type: 3} + - {fileID: 21300000, guid: 88abf6b14691b02429b06b5874435639, type: 3} + - {fileID: 21300000, guid: 43b0d5a602e8d9b4590362757416a28d, type: 3} + - {fileID: 21300000, guid: 5802a08814c766641a359b4c9fc7f4c2, type: 3} + - {fileID: 21300000, guid: 815476bada0e0b1418cca3408bfeced5, type: 3} + - {fileID: 21300000, guid: 1787c896bf6dfd046892a64acd1e3a82, type: 3} + - {fileID: 21300000, guid: da58253aab86d694b9ee484f27bd1f2d, type: 3} + - {fileID: 21300000, guid: 9364a29f20f062348a06f0c45c22a539, type: 3} + - {fileID: 21300000, guid: 9ea3869e37735d045aa8d003b964415c, type: 3} + - {fileID: 21300000, guid: 453da2b34266f2f48a4562ab43c83216, type: 3} + - {fileID: 21300000, guid: 4f340dbc2a7182d418c389d45da9a655, type: 3} + - {fileID: 21300000, guid: 431f0eed7c59eb04eba04a765e98594c, type: 3} + - {fileID: 21300000, guid: ca6c94ea341b2a340aae0c6232ae0dc6, type: 3} + - {fileID: 21300000, guid: de30424b6fd1e124f9d6111e16a6a45b, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Sprites/Scorpions/Animations/BlackScorptionAttack.anim b/Assets/Sprites/Scorpions/Animations/BlackScorptionAttack.anim index 01129ec..8324def 100644 --- a/Assets/Sprites/Scorpions/Animations/BlackScorptionAttack.anim +++ b/Assets/Sprites/Scorpions/Animations/BlackScorptionAttack.anim @@ -17,21 +17,63 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 57ae88536a6cb37478b17fc708eb408f, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 75725be18d6c052459e525b060d018f3, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: dd0b3202fde9bef4e9190ccea741cff9, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: 5919bd2f908f8eb41b5feb18cae94065, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 2d0648e0f5ae24645ae6d65ec393073d, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: e92effde77863f94d9fb0d247e4522b9, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 0e986a1caa519e444aa426b7a5337d96, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 72d97946e68aeeb49856ddc270d2406a, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: f00fd53a9384080418c85f0a32a2e218, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 78287e14ecf01d0428dbf8ab0fb9dedc, 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 57ae88536a6cb37478b17fc708eb408f, type: 3} + - {fileID: 21300000, guid: 75725be18d6c052459e525b060d018f3, type: 3} + - {fileID: 21300000, guid: dd0b3202fde9bef4e9190ccea741cff9, type: 3} + - {fileID: 21300000, guid: 5919bd2f908f8eb41b5feb18cae94065, type: 3} + - {fileID: 21300000, guid: 2d0648e0f5ae24645ae6d65ec393073d, type: 3} + - {fileID: 21300000, guid: e92effde77863f94d9fb0d247e4522b9, type: 3} + - {fileID: 21300000, guid: 0e986a1caa519e444aa426b7a5337d96, type: 3} + - {fileID: 21300000, guid: 72d97946e68aeeb49856ddc270d2406a, type: 3} + - {fileID: 21300000, guid: f00fd53a9384080418c85f0a32a2e218, type: 3} + - {fileID: 21300000, guid: 78287e14ecf01d0428dbf8ab0fb9dedc, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.35000002 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Sprites/Scorpions/Animations/RedScorpionDead.anim b/Assets/Sprites/Scorpions/Animations/RedScorpionDead.anim index 4416ff8..1cb1a71 100644 --- a/Assets/Sprites/Scorpions/Animations/RedScorpionDead.anim +++ b/Assets/Sprites/Scorpions/Animations/RedScorpionDead.anim @@ -16,22 +16,84 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 018de0f0647fee44daefbeba5eddeff2, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 17557b2cc95beea4cbde0e4fb97300c2, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: ef4aa4631669c2b45bec44437e44b248, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 1886cd448d06e3c4ea5e96bf7ba14151, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 67eecd24c2f71ce4eabafadfa44eadac, 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 018de0f0647fee44daefbeba5eddeff2, type: 3} + - {fileID: 21300000, guid: 17557b2cc95beea4cbde0e4fb97300c2, type: 3} + - {fileID: 21300000, guid: ef4aa4631669c2b45bec44437e44b248, type: 3} + - {fileID: 21300000, guid: 1886cd448d06e3c4ea5e96bf7ba14151, type: 3} + - {fileID: 21300000, guid: 67eecd24c2f71ce4eabafadfa44eadac, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.35000002 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -46,7 +108,35 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Sprites/Scorpions/Animations/RedScorpionIdle.anim b/Assets/Sprites/Scorpions/Animations/RedScorpionIdle.anim index b56371b..7fed18c 100644 --- a/Assets/Sprites/Scorpions/Animations/RedScorpionIdle.anim +++ b/Assets/Sprites/Scorpions/Animations/RedScorpionIdle.anim @@ -17,21 +17,108 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 6a848196cadfec844aadda3dce193ed4, type: 3} + - time: 0.016666668 + value: {fileID: 21300000, guid: feb86e3a1b25d8a4d905368c0ecf1dd8, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 8801083764a47724b8a0ad479d80f180, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 96c5f0acc9509604798a0d3a80e2b34f, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 3d3e8bba2b038d5418a44ae5908b6fd0, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: fe6c364cf191cdb40ab54cce71f0112b, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: e02117b2b07854146846026571a7a488, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 92e6a08ab163dcf4f9dec6cd46eada70, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 8078c954f2ffa1a4b9dbc162ce59b659, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: cc58d1af9bbe2a344ba1b449c3e044f0, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 8dd2e6ef36e22f64d89b04ab997ba96b, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: daa27ae1cfc56a24285ac6351e80c316, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: de7c528244b57bb489b954b75e5d6442, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: defced1d8b6b1034caa1d5e8c898491e, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: bf56034bfce0f1443935ea7f9dd20ab3, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 63356bb26881a8741970f149f5379e90, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: cf0de4741a278d34590df1f46d06a1d7, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: 164d7ae5ef9eeb046b2252427b6de330, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: 7049de6f1ff046e499e98701a1153607, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: 00e82cd0ac353bc4596e52f94503a4e3, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: dfa0bace1d6207b4d8d6934f92622dc7, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: 0d4ea108546c3ec4a99244a0adead6b4, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: 69b7dcb8fa61cba4a92bfabee64a9e46, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: e29c65b72ccd7804789939f739027c7a, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 975b9c6fbcb50a3498b37276895c8450, 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 6a848196cadfec844aadda3dce193ed4, type: 3} + - {fileID: 21300000, guid: feb86e3a1b25d8a4d905368c0ecf1dd8, type: 3} + - {fileID: 21300000, guid: 8801083764a47724b8a0ad479d80f180, type: 3} + - {fileID: 21300000, guid: 96c5f0acc9509604798a0d3a80e2b34f, type: 3} + - {fileID: 21300000, guid: 3d3e8bba2b038d5418a44ae5908b6fd0, type: 3} + - {fileID: 21300000, guid: fe6c364cf191cdb40ab54cce71f0112b, type: 3} + - {fileID: 21300000, guid: e02117b2b07854146846026571a7a488, type: 3} + - {fileID: 21300000, guid: 92e6a08ab163dcf4f9dec6cd46eada70, type: 3} + - {fileID: 21300000, guid: 8078c954f2ffa1a4b9dbc162ce59b659, type: 3} + - {fileID: 21300000, guid: cc58d1af9bbe2a344ba1b449c3e044f0, type: 3} + - {fileID: 21300000, guid: 8dd2e6ef36e22f64d89b04ab997ba96b, type: 3} + - {fileID: 21300000, guid: daa27ae1cfc56a24285ac6351e80c316, type: 3} + - {fileID: 21300000, guid: de7c528244b57bb489b954b75e5d6442, type: 3} + - {fileID: 21300000, guid: defced1d8b6b1034caa1d5e8c898491e, type: 3} + - {fileID: 21300000, guid: bf56034bfce0f1443935ea7f9dd20ab3, type: 3} + - {fileID: 21300000, guid: 63356bb26881a8741970f149f5379e90, type: 3} + - {fileID: 21300000, guid: cf0de4741a278d34590df1f46d06a1d7, type: 3} + - {fileID: 21300000, guid: 164d7ae5ef9eeb046b2252427b6de330, type: 3} + - {fileID: 21300000, guid: 7049de6f1ff046e499e98701a1153607, type: 3} + - {fileID: 21300000, guid: 00e82cd0ac353bc4596e52f94503a4e3, type: 3} + - {fileID: 21300000, guid: dfa0bace1d6207b4d8d6934f92622dc7, type: 3} + - {fileID: 21300000, guid: 0d4ea108546c3ec4a99244a0adead6b4, type: 3} + - {fileID: 21300000, guid: 69b7dcb8fa61cba4a92bfabee64a9e46, type: 3} + - {fileID: 21300000, guid: e29c65b72ccd7804789939f739027c7a, type: 3} + - {fileID: 21300000, guid: 975b9c6fbcb50a3498b37276895c8450, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Sprites/Scorpions/Animations/RedScorpionWalk.anim b/Assets/Sprites/Scorpions/Animations/RedScorpionWalk.anim index 0f1a912..29f66ba 100644 --- a/Assets/Sprites/Scorpions/Animations/RedScorpionWalk.anim +++ b/Assets/Sprites/Scorpions/Animations/RedScorpionWalk.anim @@ -17,21 +17,81 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 8478e350fb1c71d4689bac69c41d5925, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 26a574f8b60e52f4687429cd6c9c827e, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 2a93627dbf575c743b4c86206fea561f, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: ae2ffdabce4176b4ba8e178beab79c90, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: f7bfb5e0422797f4d94412bcd2549d91, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 079dd47078f987f4d90e1ad385c93f4e, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: f8d37f44705556a4ea4d5eecfdb6d607, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: d6870d4346887e1478439e0f99f3442b, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: f28859a074dfcbb499e0739c5151e725, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 029dd397dc2695a468c58cdc9b510caa, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 7fcdef47bd50d7b42a175b7ca601e23e, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: 289168007e15a7247b82311e9587e247, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: b9f1a64a1207a56458697e4e22ece116, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: 4b52516832c148b489f2bf83d10d0bab, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: ef85439f783dcf04f854cda11bde1ece, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 0b525069f179b9c47ba950c83f367437, 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 8478e350fb1c71d4689bac69c41d5925, type: 3} + - {fileID: 21300000, guid: 26a574f8b60e52f4687429cd6c9c827e, type: 3} + - {fileID: 21300000, guid: 2a93627dbf575c743b4c86206fea561f, type: 3} + - {fileID: 21300000, guid: ae2ffdabce4176b4ba8e178beab79c90, type: 3} + - {fileID: 21300000, guid: f7bfb5e0422797f4d94412bcd2549d91, type: 3} + - {fileID: 21300000, guid: 079dd47078f987f4d90e1ad385c93f4e, type: 3} + - {fileID: 21300000, guid: f8d37f44705556a4ea4d5eecfdb6d607, type: 3} + - {fileID: 21300000, guid: d6870d4346887e1478439e0f99f3442b, type: 3} + - {fileID: 21300000, guid: f28859a074dfcbb499e0739c5151e725, type: 3} + - {fileID: 21300000, guid: 029dd397dc2695a468c58cdc9b510caa, type: 3} + - {fileID: 21300000, guid: 7fcdef47bd50d7b42a175b7ca601e23e, type: 3} + - {fileID: 21300000, guid: 289168007e15a7247b82311e9587e247, type: 3} + - {fileID: 21300000, guid: b9f1a64a1207a56458697e4e22ece116, type: 3} + - {fileID: 21300000, guid: 4b52516832c148b489f2bf83d10d0bab, type: 3} + - {fileID: 21300000, guid: ef85439f783dcf04f854cda11bde1ece, type: 3} + - {fileID: 21300000, guid: 0b525069f179b9c47ba950c83f367437, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Sprites/Scorpions/Animations/RedScorptionAttack.anim b/Assets/Sprites/Scorpions/Animations/RedScorptionAttack.anim index 113dc20..1489732 100644 --- a/Assets/Sprites/Scorpions/Animations/RedScorptionAttack.anim +++ b/Assets/Sprites/Scorpions/Animations/RedScorptionAttack.anim @@ -17,21 +17,63 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: ec74ef577b9ee004085295e928ae77ed, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: b84c4bff607da6848a1c33df47f895c8, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: bfd709c03347dda448a487200a6e0db0, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 6dfa2738ded41494d9920db466d069df, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 023bc77fe3e65284caef45e24f33254a, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: ed07a9b3ffc681e48b5bb94da2074a6b, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 114bd2ba469f4774e8efa0653a7a709d, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: c3fca025888e7b64caff8f42a01dbf25, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: ad277f4fda3a54844a07c0d17dd1f67d, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: be49f272402e9d34e806f508ea9f9832, 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: ec74ef577b9ee004085295e928ae77ed, type: 3} + - {fileID: 21300000, guid: b84c4bff607da6848a1c33df47f895c8, type: 3} + - {fileID: 21300000, guid: bfd709c03347dda448a487200a6e0db0, type: 3} + - {fileID: 21300000, guid: 6dfa2738ded41494d9920db466d069df, type: 3} + - {fileID: 21300000, guid: 023bc77fe3e65284caef45e24f33254a, type: 3} + - {fileID: 21300000, guid: ed07a9b3ffc681e48b5bb94da2074a6b, type: 3} + - {fileID: 21300000, guid: 114bd2ba469f4774e8efa0653a7a709d, type: 3} + - {fileID: 21300000, guid: c3fca025888e7b64caff8f42a01dbf25, type: 3} + - {fileID: 21300000, guid: ad277f4fda3a54844a07c0d17dd1f67d, type: 3} + - {fileID: 21300000, guid: be49f272402e9d34e806f508ea9f9832, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Sprites/Scorpions/Animations/blackFighter.controller b/Assets/Sprites/Scorpions/Animations/blackFighter.controller index c6b072f..0dd951e 100644 --- a/Assets/Sprites/Scorpions/Animations/blackFighter.controller +++ b/Assets/Sprites/Scorpions/Animations/blackFighter.controller @@ -105,6 +105,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &6718460389228170551 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1241657711478241339} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &6846725848042373769 AnimatorState: serializedVersion: 5 @@ -115,7 +137,8 @@ AnimatorState: m_Name: Attack m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 6718460389228170551} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Sprites/Scorpions/Animations/redFighter.controller b/Assets/Sprites/Scorpions/Animations/redFighter.controller index f568d33..d63339c 100644 --- a/Assets/Sprites/Scorpions/Animations/redFighter.controller +++ b/Assets/Sprites/Scorpions/Animations/redFighter.controller @@ -31,6 +31,28 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -1241657711478241339} +--- !u!1101 &-1545346913072377069 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1241657711478241339} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1241657711478241339 AnimatorState: serializedVersion: 5 @@ -115,7 +137,8 @@ AnimatorState: m_Name: Attack m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -1545346913072377069} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0