diff --git a/Assets/Animations/Enemies.meta b/Assets/Animations/Enemies.meta new file mode 100644 index 0000000..d7e470f --- /dev/null +++ b/Assets/Animations/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d563af0d3ae1497d9f8e89cb2e06300 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Dumber.anim b/Assets/Animations/Enemies/Dumber.anim new file mode 100644 index 0000000..716a396 --- /dev/null +++ b/Assets/Animations/Enemies/Dumber.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dumber + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} + - time: 0.083333336 + value: {fileID: 21300002, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} + - {fileID: 21300002, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Enemies/Dumber.anim.meta b/Assets/Animations/Enemies/Dumber.anim.meta new file mode 100644 index 0000000..5b62e7b --- /dev/null +++ b/Assets/Animations/Enemies/Dumber.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d32d6d8d922234eafb6c5669dc7a1cc6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemies/Dumber.controller b/Assets/Animations/Enemies/Dumber.controller new file mode 100644 index 0000000..c9c1773 --- /dev/null +++ b/Assets/Animations/Enemies/Dumber.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dumber + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107282762442604108} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102746068587636566 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dumber + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d32d6d8d922234eafb6c5669dc7a1cc6, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107282762442604108 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102746068587636566} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102746068587636566} diff --git a/Assets/Animations/Enemies/Dumber.controller.meta b/Assets/Animations/Enemies/Dumber.controller.meta new file mode 100644 index 0000000..2c57b99 --- /dev/null +++ b/Assets/Animations/Enemies/Dumber.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbb7035aa109e43a4a97189e96301b35 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies.meta b/Assets/Resources/Enemies.meta new file mode 100644 index 0000000..25c0c06 --- /dev/null +++ b/Assets/Resources/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84f244b4aadc1468eacbe756633be4a5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DevMocks/Resources/DevMocks/Dumber.prefab b/Assets/Resources/Enemies/Dumber.prefab similarity index 84% rename from Assets/DevMocks/Resources/DevMocks/Dumber.prefab rename to Assets/Resources/Enemies/Dumber.prefab index 7585381..d041c39 100644 --- a/Assets/DevMocks/Resources/DevMocks/Dumber.prefab +++ b/Assets/Resources/Enemies/Dumber.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 2122485943191788385} - component: {fileID: 3292464784200894759} - component: {fileID: 2823282795561844331} + - component: {fileID: 5715818016172532055} m_Layer: 14 m_Name: Dumber m_TagString: Enemy @@ -71,7 +72,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 55fee6a02b8d5bc4e993261a717e89cc, type: 3} + m_Sprite: {fileID: 21300000, guid: 94a7a03963703409f9655596584ce0b1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -141,3 +142,22 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.9, y: 0.9} m_EdgeRadius: 0 +--- !u!95 &5715818016172532055 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4346602752014574748} + 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 diff --git a/Assets/DevMocks/Resources/DevMocks/Dumber.prefab.meta b/Assets/Resources/Enemies/Dumber.prefab.meta similarity index 100% rename from Assets/DevMocks/Resources/DevMocks/Dumber.prefab.meta rename to Assets/Resources/Enemies/Dumber.prefab.meta diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 567581e..a201ec9 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -299,7 +299,7 @@ PrefabInstance: - target: {fileID: 485484359815032853, guid: a977eab75b5324ec4b659c2e2a0e9cfd, type: 3} propertyPath: m_LocalPosition.x - value: 12.251911 + value: 10.969402 objectReference: {fileID: 0} - target: {fileID: 485484359815032853, guid: a977eab75b5324ec4b659c2e2a0e9cfd, type: 3} @@ -472,27 +472,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 311312839, guid: 4ca131020414f4b1597dac2e1d292d7f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8007755715420797612, guid: 4ca131020414f4b1597dac2e1d292d7f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2219516564249810540, guid: 4ca131020414f4b1597dac2e1d292d7f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1533625511004221075, guid: 4ca131020414f4b1597dac2e1d292d7f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7551096532728223647, guid: 4ca131020414f4b1597dac2e1d292d7f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ca131020414f4b1597dac2e1d292d7f, type: 3} diff --git a/Assets/Scripts/src/Helpers/PrefabAtlas.cs b/Assets/Scripts/src/Helpers/PrefabAtlas.cs index 2ad035c..b161db5 100644 --- a/Assets/Scripts/src/Helpers/PrefabAtlas.cs +++ b/Assets/Scripts/src/Helpers/PrefabAtlas.cs @@ -21,7 +21,7 @@ namespace src.Helpers Resources.Load("DevMocks/FlameUpgrade"); /* Enemies */ - public static readonly GameObject GreenEnemy = Resources.Load("DevMocks/Dumber"); + public static readonly GameObject GreenEnemy = Resources.Load("Enemies/Dumber"); public static readonly GameObject RedEnemy = Resources.Load("DevMocks/Dumb"); } } \ No newline at end of file diff --git a/Assets/Sprites/Enemies.meta b/Assets/Sprites/Enemies.meta new file mode 100644 index 0000000..4ccb700 --- /dev/null +++ b/Assets/Sprites/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7532761f807da4f9d802c5ee1d03f9b3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemies/snowenemy.png b/Assets/Sprites/Enemies/snowenemy.png new file mode 100644 index 0000000..0a2b62c Binary files /dev/null and b/Assets/Sprites/Enemies/snowenemy.png differ diff --git a/Assets/Sprites/Enemies/snowenemy.png.meta b/Assets/Sprites/Enemies/snowenemy.png.meta new file mode 100644 index 0000000..34e2454 --- /dev/null +++ b/Assets/Sprites/Enemies/snowenemy.png.meta @@ -0,0 +1,152 @@ +fileFormatVersion: 2 +guid: 7fe20d448d7a54c2a8c561fb5736f00b +TextureImporter: + fileIDToRecycleName: + 21300000: snowenemy 1_0 + 21300002: snowenemy 1_1 + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: snowenemy 1_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 6 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c77270926b4ac466ebfb0afa8656a51f + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: snowenemy 1_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 6 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f973475f1678c41e0927b4169e0da54f + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c567af95119f542ee9839eb0424bc159 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: