diff --git a/Assets/Animations/Enemies/Dumber.anim b/Assets/Animations/Enemies/SnowEnemy.anim similarity index 96% rename from Assets/Animations/Enemies/Dumber.anim rename to Assets/Animations/Enemies/SnowEnemy.anim index 716a396..2fa0ad4 100644 --- a/Assets/Animations/Enemies/Dumber.anim +++ b/Assets/Animations/Enemies/SnowEnemy.anim @@ -21,13 +21,13 @@ AnimationClip: - curve: - time: 0 value: {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} - - time: 0.083333336 + - time: 0.16666667 value: {fileID: 21300002, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 12 + m_SampleRate: 6 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -49,7 +49,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.16666667 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Enemies/Dumber.anim.meta b/Assets/Animations/Enemies/SnowEnemy.anim.meta similarity index 100% rename from Assets/Animations/Enemies/Dumber.anim.meta rename to Assets/Animations/Enemies/SnowEnemy.anim.meta diff --git a/Assets/Animations/Enemies/Dumber.controller b/Assets/Animations/Enemies/SnowEnemy.controller similarity index 100% rename from Assets/Animations/Enemies/Dumber.controller rename to Assets/Animations/Enemies/SnowEnemy.controller diff --git a/Assets/Animations/Enemies/Dumber.controller.meta b/Assets/Animations/Enemies/SnowEnemy.controller.meta similarity index 100% rename from Assets/Animations/Enemies/Dumber.controller.meta rename to Assets/Animations/Enemies/SnowEnemy.controller.meta diff --git a/Assets/DevMocks/Resources/DevMocks/Dumb.prefab b/Assets/DevMocks/Resources/DevMocks/Dumb.prefab index c03a378..a229924 100644 --- a/Assets/DevMocks/Resources/DevMocks/Dumb.prefab +++ b/Assets/DevMocks/Resources/DevMocks/Dumb.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7795087027144463245 +--- !u!1 &4856950859484961908 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3746656334748574901} - - component: {fileID: 8735042184812970439} - - component: {fileID: 1330784298487411849} - - component: {fileID: 3670963333241729696} - - component: {fileID: 7110750718968962680} - m_Layer: 14 - m_Name: Dumb - m_TagString: Enemy + - component: {fileID: 6722900131501402390} + - component: {fileID: 2266323546987514088} + - component: {fileID: 3292981110550370494} + m_Layer: 0 + m_Name: Sprite + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3746656334748574901 +--- !u!4 &6722900131501402390 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7795087027144463245} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 4856950859484961908} + 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: 0} + m_Father: {fileID: 3746656334748574901} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8735042184812970439 +--- !u!212 &2266323546987514088 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7795087027144463245} + m_GameObject: {fileID: 4856950859484961908} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -71,8 +69,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 55fee6a02b8d5bc4e993261a717e89cc, type: 3} - m_Color: {r: 1, g: 0.14877324, b: 0, a: 1} + m_Sprite: {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -82,6 +80,59 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &3292981110550370494 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4856950859484961908} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: dbb7035aa109e43a4a97189e96301b35, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7795087027144463245 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3746656334748574901} + - component: {fileID: 1330784298487411849} + - component: {fileID: 3670963333241729696} + - component: {fileID: 7110750718968962680} + m_Layer: 14 + m_Name: Dumb + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3746656334748574901 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7795087027144463245} + 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: 6722900131501402390} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1330784298487411849 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/Dumber.prefab b/Assets/Resources/Enemies/Dumber.prefab index d041c39..9205bff 100644 --- a/Assets/Resources/Enemies/Dumber.prefab +++ b/Assets/Resources/Enemies/Dumber.prefab @@ -9,11 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 644191348100887617} - - component: {fileID: 2013141934724497034} - component: {fileID: 2122485943191788385} - component: {fileID: 3292464784200894759} - component: {fileID: 2823282795561844331} - - component: {fileID: 5715818016172532055} m_Layer: 14 m_Name: Dumber m_TagString: Enemy @@ -31,58 +29,11 @@ Transform: 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_Children: + - {fileID: 2701739128104260157} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2013141934724497034 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346602752014574748} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 94a7a03963703409f9655596584ce0b1, 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!114 &2122485943191788385 MonoBehaviour: m_ObjectHideFlags: 0 @@ -142,14 +93,46 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.9, y: 0.9} m_EdgeRadius: 0 ---- !u!95 &5715818016172532055 +--- !u!1 &8088243686725364094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2701739128104260157} + - component: {fileID: 2852184845347715540} + - component: {fileID: 3924072477127272701} + m_Layer: 0 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2701739128104260157 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8088243686725364094} + 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: 644191348100887617} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2852184845347715540 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346602752014574748} + m_GameObject: {fileID: 8088243686725364094} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: dbb7035aa109e43a4a97189e96301b35, type: 2} @@ -161,3 +144,51 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &3924072477127272701 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8088243686725364094} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, 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 diff --git a/Assets/Sprites/Enemies/snowenemy.png b/Assets/Sprites/Enemies/snowenemy.png index 0a2b62c..b212f4e 100644 Binary files a/Assets/Sprites/Enemies/snowenemy.png and b/Assets/Sprites/Enemies/snowenemy.png differ diff --git a/Assets/Sprites/Enemies/snowenemy.png.meta b/Assets/Sprites/Enemies/snowenemy.png.meta index 34e2454..50b0729 100644 --- a/Assets/Sprites/Enemies/snowenemy.png.meta +++ b/Assets/Sprites/Enemies/snowenemy.png.meta @@ -2,8 +2,8 @@ fileFormatVersion: 2 guid: 7fe20d448d7a54c2a8c561fb5736f00b TextureImporter: fileIDToRecycleName: - 21300000: snowenemy 1_0 - 21300002: snowenemy 1_1 + 21300000: snowenemy_0 + 21300002: snowenemy_1 externalObjects: {} serializedVersion: 9 mipmaps: @@ -97,7 +97,7 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: snowenemy 1_0 + name: snowenemy_0 rect: serializedVersion: 2 x: 0 @@ -111,13 +111,13 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: c77270926b4ac466ebfb0afa8656a51f + spriteID: 71374260380794020bf4eda4762fc79d vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: snowenemy 1_1 + name: snowenemy_1 rect: serializedVersion: 2 x: 32 @@ -131,7 +131,7 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: f973475f1678c41e0927b4169e0da54f + spriteID: 9bbeafb8682044fa5a9e69c3848e6cb0 vertices: [] indices: edges: [] @@ -139,7 +139,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: c567af95119f542ee9839eb0424bc159 + spriteID: 789bcfca2d35c4486b7507cacfabd2a2 vertices: [] indices: edges: []