From 964b07f93709d0082ce38db312559aef60311f92 Mon Sep 17 00:00:00 2001 From: AlexKochnev Date: Sun, 3 Apr 2022 12:48:10 +0300 Subject: [PATCH] New mobs fix mob and character CS and add fix controllers --- ldjam50/Assets/Prefabs/Abilities/Radio.prefab | 4 +- .../Prefabs/Abilities/Ultraviolet.prefab | 2 +- ldjam50/Assets/Prefabs/GroupMob.prefab | 280 ++++++++++++++++++ ldjam50/Assets/Prefabs/GroupMob.prefab.meta | 7 + ldjam50/Assets/Prefabs/HeavyMob.prefab | 280 ++++++++++++++++++ ldjam50/Assets/Prefabs/HeavyMob.prefab.meta | 7 + ldjam50/Assets/Prefabs/LightMob.prefab | 280 ++++++++++++++++++ ldjam50/Assets/Prefabs/LightMob.prefab.meta | 7 + ldjam50/Assets/Prefabs/character.prefab | 2 +- .../{mob.prefab => standartMob.prefab} | 4 +- ...ob.prefab.meta => standartMob.prefab.meta} | 0 ldjam50/Assets/Scripts/Character.cs | 1 + ldjam50/Assets/Scripts/Mob.cs | 5 + .../CharacterAnimController.controller | 16 +- .../Sprites/Character/HeroIdle-Sheet.png.meta | 156 +++++++++- .../Sprites/Character/HeroRun-Sheet.png.meta | 204 ++++++++++++- .../Assets/Sprites/Effects/ExplAnimation.anim | 9 +- .../Group/GroupEnemyAnimController.controller | 8 +- .../Heavy/HeavyEnemyAnimController.controller | 10 +- .../Light/LightEnemyAnimController.controller | 10 +- .../StandartEnemyAnimController.controller | 18 +- 21 files changed, 1253 insertions(+), 57 deletions(-) create mode 100644 ldjam50/Assets/Prefabs/GroupMob.prefab create mode 100644 ldjam50/Assets/Prefabs/GroupMob.prefab.meta create mode 100644 ldjam50/Assets/Prefabs/HeavyMob.prefab create mode 100644 ldjam50/Assets/Prefabs/HeavyMob.prefab.meta create mode 100644 ldjam50/Assets/Prefabs/LightMob.prefab create mode 100644 ldjam50/Assets/Prefabs/LightMob.prefab.meta rename ldjam50/Assets/Prefabs/{mob.prefab => standartMob.prefab} (99%) rename ldjam50/Assets/Prefabs/{mob.prefab.meta => standartMob.prefab.meta} (100%) diff --git a/ldjam50/Assets/Prefabs/Abilities/Radio.prefab b/ldjam50/Assets/Prefabs/Abilities/Radio.prefab index 00d616d..8d34ddb 100644 --- a/ldjam50/Assets/Prefabs/Abilities/Radio.prefab +++ b/ldjam50/Assets/Prefabs/Abilities/Radio.prefab @@ -75,7 +75,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 4993684613595874357, guid: b5b46665b8f01e042acadce1308ce629, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -133,7 +133,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ScaleSpeed: 2 - damage: 12.55 + damage: 5.01 timeToDamage: 0 circleRadiusStart: 0.5 circleRadiusEnd: 2.5 diff --git a/ldjam50/Assets/Prefabs/Abilities/Ultraviolet.prefab b/ldjam50/Assets/Prefabs/Abilities/Ultraviolet.prefab index 6f5bdd4..5423b42 100644 --- a/ldjam50/Assets/Prefabs/Abilities/Ultraviolet.prefab +++ b/ldjam50/Assets/Prefabs/Abilities/Ultraviolet.prefab @@ -75,7 +75,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: -1579431903302429440, guid: 54d8518ccde9e0f4fa81bb1d15a2b1c8, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/ldjam50/Assets/Prefabs/GroupMob.prefab b/ldjam50/Assets/Prefabs/GroupMob.prefab new file mode 100644 index 0000000..156b945 --- /dev/null +++ b/ldjam50/Assets/Prefabs/GroupMob.prefab @@ -0,0 +1,280 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4086673825482164031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5020074052172004519} + - component: {fileID: 2721128460309875567} + - component: {fileID: 6002007055176810599} + m_Layer: 0 + m_Name: GroupMob + m_TagString: Mob + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5020074052172004519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086673825482164031} + 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: 2700851981640547900} + - {fileID: 2000198170162216571} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2721128460309875567 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086673825482164031} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0049001575, y: -0.026252389} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.0190314, y: 1.2182705} + m_EdgeRadius: 0 +--- !u!114 &6002007055176810599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086673825482164031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7dc89d6f20b8bd496a76c3dad9b1b832, type: 3} + m_Name: + m_EditorClassIdentifier: + characterObject: {fileID: 0} + overMind: {fileID: 0} + mobSprite: {fileID: 6540482753690656168} + moveSpeed: 0 + health: 0 + damage: 0 + minDist: 0 + maxDist: 0 + healthText: {fileID: 137025635224367671} +--- !u!1 &6229468810324473755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000198170162216571} + - component: {fileID: 3384844912060217320} + - component: {fileID: 137025635224367671} + m_Layer: 0 + m_Name: New Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2000198170162216571 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229468810324473755} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.92, z: 0} + m_LocalScale: {x: 0.12094, y: 0.12094, z: 0.12094} + m_Children: [] + m_Father: {fileID: 5020074052172004519} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &3384844912060217320 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229468810324473755} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!102 &137025635224367671 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229468810324473755} + m_Text: Hello World + m_OffsetZ: 0 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 4 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 0 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!1 &6540482753690656168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2700851981640547900} + - component: {fileID: 30704178796185813} + - component: {fileID: 7756698449991561138} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2700851981640547900 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540482753690656168} + 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: 5020074052172004519} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &30704178796185813 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540482753690656168} + 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: 100 + m_Sprite: {fileID: 21300000, guid: 282f9e8d302f846d89dd70ec9121248a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7756698449991561138 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540482753690656168} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 07c593f2231ac914487545f42aa200c0, 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 diff --git a/ldjam50/Assets/Prefabs/GroupMob.prefab.meta b/ldjam50/Assets/Prefabs/GroupMob.prefab.meta new file mode 100644 index 0000000..74d8307 --- /dev/null +++ b/ldjam50/Assets/Prefabs/GroupMob.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 53d9961ce38c02649b6133c1e458a9ca +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ldjam50/Assets/Prefabs/HeavyMob.prefab b/ldjam50/Assets/Prefabs/HeavyMob.prefab new file mode 100644 index 0000000..af11e93 --- /dev/null +++ b/ldjam50/Assets/Prefabs/HeavyMob.prefab @@ -0,0 +1,280 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4086673825482164031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5020074052172004519} + - component: {fileID: 2721128460309875567} + - component: {fileID: 6002007055176810599} + m_Layer: 0 + m_Name: HeavyMob + m_TagString: Mob + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5020074052172004519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086673825482164031} + 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: 2700851981640547900} + - {fileID: 2000198170162216571} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2721128460309875567 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086673825482164031} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0049001575, y: -0.026252389} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.0190314, y: 1.2182705} + m_EdgeRadius: 0 +--- !u!114 &6002007055176810599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086673825482164031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7dc89d6f20b8bd496a76c3dad9b1b832, type: 3} + m_Name: + m_EditorClassIdentifier: + characterObject: {fileID: 0} + overMind: {fileID: 0} + mobSprite: {fileID: 6540482753690656168} + moveSpeed: 0 + health: 0 + damage: 0 + minDist: 0 + maxDist: 0 + healthText: {fileID: 137025635224367671} +--- !u!1 &6229468810324473755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000198170162216571} + - component: {fileID: 3384844912060217320} + - component: {fileID: 137025635224367671} + m_Layer: 0 + m_Name: New Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2000198170162216571 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229468810324473755} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.92, z: 0} + m_LocalScale: {x: 0.12094, y: 0.12094, z: 0.12094} + m_Children: [] + m_Father: {fileID: 5020074052172004519} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &3384844912060217320 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229468810324473755} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!102 &137025635224367671 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229468810324473755} + m_Text: Hello World + m_OffsetZ: 0 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 4 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 0 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!1 &6540482753690656168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2700851981640547900} + - component: {fileID: 30704178796185813} + - component: {fileID: 7756698449991561138} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2700851981640547900 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540482753690656168} + 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: 5020074052172004519} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &30704178796185813 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540482753690656168} + 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: 100 + m_Sprite: {fileID: 21300000, guid: 282f9e8d302f846d89dd70ec9121248a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7756698449991561138 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540482753690656168} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 07c593f2231ac914487545f42aa200c0, 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 diff --git a/ldjam50/Assets/Prefabs/HeavyMob.prefab.meta b/ldjam50/Assets/Prefabs/HeavyMob.prefab.meta new file mode 100644 index 0000000..d2159fb --- /dev/null +++ b/ldjam50/Assets/Prefabs/HeavyMob.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 37bef46f055218d44b86d7f8b60a36c0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ldjam50/Assets/Prefabs/LightMob.prefab b/ldjam50/Assets/Prefabs/LightMob.prefab new file mode 100644 index 0000000..a809cb9 --- /dev/null +++ b/ldjam50/Assets/Prefabs/LightMob.prefab @@ -0,0 +1,280 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4086673825482164031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5020074052172004519} + - component: {fileID: 2721128460309875567} + - component: {fileID: 6002007055176810599} + m_Layer: 0 + m_Name: LightMob + m_TagString: Mob + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5020074052172004519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086673825482164031} + 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: 2700851981640547900} + - {fileID: 2000198170162216571} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2721128460309875567 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086673825482164031} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0049001575, y: -0.026252389} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.0190314, y: 1.2182705} + m_EdgeRadius: 0 +--- !u!114 &6002007055176810599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086673825482164031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7dc89d6f20b8bd496a76c3dad9b1b832, type: 3} + m_Name: + m_EditorClassIdentifier: + characterObject: {fileID: 0} + overMind: {fileID: 0} + mobSprite: {fileID: 6540482753690656168} + moveSpeed: 0 + health: 0 + damage: 0 + minDist: 0 + maxDist: 0 + healthText: {fileID: 137025635224367671} +--- !u!1 &6229468810324473755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000198170162216571} + - component: {fileID: 3384844912060217320} + - component: {fileID: 137025635224367671} + m_Layer: 0 + m_Name: New Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2000198170162216571 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229468810324473755} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.92, z: 0} + m_LocalScale: {x: 0.12094, y: 0.12094, z: 0.12094} + m_Children: [] + m_Father: {fileID: 5020074052172004519} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &3384844912060217320 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229468810324473755} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!102 &137025635224367671 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229468810324473755} + m_Text: Hello World + m_OffsetZ: 0 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 4 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 0 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!1 &6540482753690656168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2700851981640547900} + - component: {fileID: 30704178796185813} + - component: {fileID: 7756698449991561138} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2700851981640547900 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540482753690656168} + 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: 5020074052172004519} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &30704178796185813 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540482753690656168} + 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: 100 + m_Sprite: {fileID: 21300000, guid: 282f9e8d302f846d89dd70ec9121248a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7756698449991561138 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540482753690656168} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 283439fbc32fc4b48a92c60d64d8a225, 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 diff --git a/ldjam50/Assets/Prefabs/LightMob.prefab.meta b/ldjam50/Assets/Prefabs/LightMob.prefab.meta new file mode 100644 index 0000000..876bd7d --- /dev/null +++ b/ldjam50/Assets/Prefabs/LightMob.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e47f2ab6a956303489216ae0d9df9599 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ldjam50/Assets/Prefabs/character.prefab b/ldjam50/Assets/Prefabs/character.prefab index a9cb871..1b91b1b 100644 --- a/ldjam50/Assets/Prefabs/character.prefab +++ b/ldjam50/Assets/Prefabs/character.prefab @@ -71,7 +71,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 32767 m_Sprite: {fileID: 21300000, guid: 1ea3e1dc227afc0768a58ae84d17e6c5, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/ldjam50/Assets/Prefabs/mob.prefab b/ldjam50/Assets/Prefabs/standartMob.prefab similarity index 99% rename from ldjam50/Assets/Prefabs/mob.prefab rename to ldjam50/Assets/Prefabs/standartMob.prefab index bdab34b..602dcaa 100644 --- a/ldjam50/Assets/Prefabs/mob.prefab +++ b/ldjam50/Assets/Prefabs/standartMob.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 2721128460309875567} - component: {fileID: 6002007055176810599} m_Layer: 0 - m_Name: mob + m_Name: standartMob m_TagString: Mob m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -247,7 +247,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 100 m_Sprite: {fileID: 21300000, guid: 282f9e8d302f846d89dd70ec9121248a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/ldjam50/Assets/Prefabs/mob.prefab.meta b/ldjam50/Assets/Prefabs/standartMob.prefab.meta similarity index 100% rename from ldjam50/Assets/Prefabs/mob.prefab.meta rename to ldjam50/Assets/Prefabs/standartMob.prefab.meta diff --git a/ldjam50/Assets/Scripts/Character.cs b/ldjam50/Assets/Scripts/Character.cs index 80728c5..f0615dd 100644 --- a/ldjam50/Assets/Scripts/Character.cs +++ b/ldjam50/Assets/Scripts/Character.cs @@ -51,6 +51,7 @@ void Update() } if (-0.1f > verInpt || verInpt > 0.1f) { + characterAnimator.SetBool("IsRun", true); transform.position += new Vector3(0,verInpt * moveSpeed,0); } } diff --git a/ldjam50/Assets/Scripts/Mob.cs b/ldjam50/Assets/Scripts/Mob.cs index 6c082ac..38a97f6 100644 --- a/ldjam50/Assets/Scripts/Mob.cs +++ b/ldjam50/Assets/Scripts/Mob.cs @@ -83,6 +83,11 @@ void Update() //print("badabooom"); } } + mobSprite.transform.localScale = new Vector3(-1, 1, 1); + if (transform.position.x < characterObject.transform.position.x) + { + mobSprite.transform.localScale = new Vector3(1, 1, 1); + } } void OnTriggerEnter2D(Collider2D col) { diff --git a/ldjam50/Assets/Sprites/Character/CharacterAnimController.controller b/ldjam50/Assets/Sprites/Character/CharacterAnimController.controller index b230a5c..51b9c1d 100644 --- a/ldjam50/Assets/Sprites/Character/CharacterAnimController.controller +++ b/ldjam50/Assets/Sprites/Character/CharacterAnimController.controller @@ -78,10 +78,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.63414633 - m_HasExitTime: 1 + m_TransitionDuration: 0 + m_TransitionOffset: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -199,10 +199,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.63414633 - m_HasExitTime: 1 + m_TransitionDuration: 0 + m_TransitionOffset: 1 + m_ExitTime: 0.009159374 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/ldjam50/Assets/Sprites/Character/HeroIdle-Sheet.png.meta b/ldjam50/Assets/Sprites/Character/HeroIdle-Sheet.png.meta index aebc1ec..d638a48 100644 --- a/ldjam50/Assets/Sprites/Character/HeroIdle-Sheet.png.meta +++ b/ldjam50/Assets/Sprites/Character/HeroIdle-Sheet.png.meta @@ -1,7 +1,25 @@ fileFormatVersion: 2 guid: fc9a004f37844d541878fe6e00978d9e TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: -1807468758588214948 + second: HeroIdle-Sheet_0 + - first: + 213: -5636805903851064224 + second: HeroIdle-Sheet_1 + - first: + 213: 346304155453734737 + second: HeroIdle-Sheet_2 + - first: + 213: -462364649685249861 + second: HeroIdle-Sheet_3 + - first: + 213: -8216647635674845090 + second: HeroIdle-Sheet_4 + - first: + 213: -5332755284735770466 + second: HeroIdle-Sheet_5 externalObjects: {} serializedVersion: 11 mipmaps: @@ -32,7 +50,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -41,7 +59,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -68,7 +86,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -80,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -89,7 +107,133 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: HeroIdle-Sheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c51bbbd8db49ae6e0800000000000000 + internalID: -1807468758588214948 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroIdle-Sheet_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 064f12145ea06c1b0800000000000000 + internalID: -5636805903851064224 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroIdle-Sheet_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 15fbf0a6bc15ec400800000000000000 + internalID: 346304155453734737 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroIdle-Sheet_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bb010d20dc95599f0800000000000000 + internalID: -462364649685249861 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroIdle-Sheet_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e503c0f428a98fd80800000000000000 + internalID: -8216647635674845090 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroIdle-Sheet_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e90cc3b925f3ef5b0800000000000000 + internalID: -5332755284735770466 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/ldjam50/Assets/Sprites/Character/HeroRun-Sheet.png.meta b/ldjam50/Assets/Sprites/Character/HeroRun-Sheet.png.meta index 51ce25d..6e69c18 100644 --- a/ldjam50/Assets/Sprites/Character/HeroRun-Sheet.png.meta +++ b/ldjam50/Assets/Sprites/Character/HeroRun-Sheet.png.meta @@ -1,7 +1,31 @@ fileFormatVersion: 2 guid: 0dc3413337e3df14f8dbf190e226c2d7 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: -3908570954395783668 + second: HeroRun-Sheet_0 + - first: + 213: -8409440076043084856 + second: HeroRun-Sheet_1 + - first: + 213: 3935099282280036558 + second: HeroRun-Sheet_2 + - first: + 213: 5762779979397876585 + second: HeroRun-Sheet_3 + - first: + 213: 7639092083384628833 + second: HeroRun-Sheet_4 + - first: + 213: 1144915135187328517 + second: HeroRun-Sheet_5 + - first: + 213: 2107433104725103169 + second: HeroRun-Sheet_6 + - first: + 213: -7056562468747527946 + second: HeroRun-Sheet_7 externalObjects: {} serializedVersion: 11 mipmaps: @@ -32,7 +56,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -41,7 +65,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -68,7 +92,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -80,7 +104,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -89,7 +113,175 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: HeroRun-Sheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c0e64dbec67f1c9c0800000000000000 + internalID: -3908570954395783668 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroRun-Sheet_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8cb94835ecaab4b80800000000000000 + internalID: -8409440076043084856 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroRun-Sheet_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ec8323cb2f74c9630800000000000000 + internalID: 3935099282280036558 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroRun-Sheet_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 96b4eb6dbd189ff40800000000000000 + internalID: 5762779979397876585 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroRun-Sheet_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 166b3a4b6c1830a60800000000000000 + internalID: 7639092083384628833 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroRun-Sheet_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 50e1fcadf3e83ef00800000000000000 + internalID: 1144915135187328517 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroRun-Sheet_6 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 142d90b3e3b1f3d10800000000000000 + internalID: 2107433104725103169 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: HeroRun-Sheet_7 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6f833fa62dd021e90800000000000000 + internalID: -7056562468747527946 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/ldjam50/Assets/Sprites/Effects/ExplAnimation.anim b/ldjam50/Assets/Sprites/Effects/ExplAnimation.anim index 158a9ce..e763043 100644 --- a/ldjam50/Assets/Sprites/Effects/ExplAnimation.anim +++ b/ldjam50/Assets/Sprites/Effects/ExplAnimation.anim @@ -86,11 +86,4 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: - - time: 0.5 - functionName: - data: Delete - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + m_Events: [] diff --git a/ldjam50/Assets/Sprites/Enemies/Group/GroupEnemyAnimController.controller b/ldjam50/Assets/Sprites/Enemies/Group/GroupEnemyAnimController.controller index 3e14fd4..ebda690 100644 --- a/ldjam50/Assets/Sprites/Enemies/Group/GroupEnemyAnimController.controller +++ b/ldjam50/Assets/Sprites/Enemies/Group/GroupEnemyAnimController.controller @@ -17,10 +17,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 1 + m_TransitionDuration: 0 + m_TransitionOffset: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/ldjam50/Assets/Sprites/Enemies/Heavy/HeavyEnemyAnimController.controller b/ldjam50/Assets/Sprites/Enemies/Heavy/HeavyEnemyAnimController.controller index 9979e7f..03dcfa4 100644 --- a/ldjam50/Assets/Sprites/Enemies/Heavy/HeavyEnemyAnimController.controller +++ b/ldjam50/Assets/Sprites/Enemies/Heavy/HeavyEnemyAnimController.controller @@ -67,7 +67,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -148,10 +148,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.625 - m_HasExitTime: 1 + m_TransitionDuration: 0 + m_TransitionOffset: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/ldjam50/Assets/Sprites/Enemies/Light/LightEnemyAnimController.controller b/ldjam50/Assets/Sprites/Enemies/Light/LightEnemyAnimController.controller index cb16b16..0d92b56 100644 --- a/ldjam50/Assets/Sprites/Enemies/Light/LightEnemyAnimController.controller +++ b/ldjam50/Assets/Sprites/Enemies/Light/LightEnemyAnimController.controller @@ -17,10 +17,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 1 + m_TransitionDuration: 0 + m_TransitionOffset: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -92,7 +92,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/ldjam50/Assets/Sprites/Enemies/Standart/StandartEnemyAnimController.controller b/ldjam50/Assets/Sprites/Enemies/Standart/StandartEnemyAnimController.controller index 82cc5c1..615373c 100644 --- a/ldjam50/Assets/Sprites/Enemies/Standart/StandartEnemyAnimController.controller +++ b/ldjam50/Assets/Sprites/Enemies/Standart/StandartEnemyAnimController.controller @@ -11,7 +11,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 319439843011162356} + - {fileID: 1040490305007608977} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -41,7 +41,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -55,7 +55,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &319439843011162356 +--- !u!1101 &1040490305007608977 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -72,10 +72,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.01 m_TransitionOffset: 0 m_ExitTime: 0.5 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -94,16 +94,16 @@ AnimatorState: m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 - m_WriteDefaultValues: 1 + m_WriteDefaultValues: 0 m_Mirror: 0 m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: f4b517d0e48d6aaa5ae0b063c62202e7, type: 2} + m_Motion: {fileID: 7400000, guid: 018dfa02ebcb58d419897a8eac83ea34, type: 2} m_Tag: m_SpeedParameter: - m_MirrorParameter: + m_MirrorParameter: IsDeath m_CycleOffsetParameter: m_TimeParameter: --- !u!1107 &8214928845230017319 @@ -120,7 +120,7 @@ AnimatorStateMachine: m_Position: {x: 280, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: 1633349003487912558} - m_Position: {x: 280, y: -40, z: 0} + m_Position: {x: 280, y: -30, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: []