From 311d05bfa1016f44f503d4561d969abdb733ac64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Nu=C8=9Biu?= Date: Sun, 4 Aug 2019 22:26:58 +0300 Subject: [PATCH 1/2] Update Dumber's sprite --- Assets/Animations/Enemies.meta | 8 + Assets/Animations/Enemies/Dumber.anim | 71 ++++++++ Assets/Animations/Enemies/Dumber.anim.meta | 8 + Assets/Animations/Enemies/Dumber.controller | 72 +++++++++ .../Animations/Enemies/Dumber.controller.meta | 8 + Assets/Resources/Enemies.meta | 8 + .../Enemies}/Dumber.prefab | 22 ++- .../Enemies}/Dumber.prefab.meta | 0 Assets/Scenes/GameScene.unity | 12 +- Assets/Scripts/src/Helpers/PrefabAtlas.cs | 2 +- Assets/Sprites/Enemies.meta | 8 + Assets/Sprites/Enemies/snowenemy.png | Bin 0 -> 696 bytes Assets/Sprites/Enemies/snowenemy.png.meta | 152 ++++++++++++++++++ 13 files changed, 363 insertions(+), 8 deletions(-) create mode 100644 Assets/Animations/Enemies.meta create mode 100644 Assets/Animations/Enemies/Dumber.anim create mode 100644 Assets/Animations/Enemies/Dumber.anim.meta create mode 100644 Assets/Animations/Enemies/Dumber.controller create mode 100644 Assets/Animations/Enemies/Dumber.controller.meta create mode 100644 Assets/Resources/Enemies.meta rename Assets/{DevMocks/Resources/DevMocks => Resources/Enemies}/Dumber.prefab (84%) rename Assets/{DevMocks/Resources/DevMocks => Resources/Enemies}/Dumber.prefab.meta (100%) create mode 100644 Assets/Sprites/Enemies.meta create mode 100644 Assets/Sprites/Enemies/snowenemy.png create mode 100644 Assets/Sprites/Enemies/snowenemy.png.meta 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 0000000000000000000000000000000000000000..0a2b62caeba871e142d91c3181ab09d3aefbff05 GIT binary patch literal 696 zcmV;p0!RIcP)Px%a!Eu%RA_BpP~+?wvFyn>^$O0_r6> z#OpwcC7<|fJ<2Hh0YM_0Op9ICQC36FPolnAz_U*6OH&nG+FKNCbsC;@rX zAv6vmC8(M&)`2Q!+k*EoZ6rfTPRcEOp~lwymrs9ReErxE>BdA*NEX59K>0uT{_ zC~ls=SIheld*k&ZZ~ognryEp?VW8Dq$qEFLbt%g0_9#B?GGw_vxviiTC(N(h?(C=P zP>MSkz=~Urz#K9m6csvW91pilfPENE07Im+R2Yc>ip@*%+Zr$cY5>&KdF>VJxEnhP zViRnNV87Tu6#%$_NQH1u@CgW=0-no$ff}9X^GUS`;*jMZ0>22Y@En@0L1uL*G+4qs z)T0841+c-}l5evEp8Kf- zF90q8#{3Z#c?9UG1K{vWo4?FgeE<3xaO#K+VCq1jO5a+5iO2h2K1YoPZVmB7esy;pQ)jp0TCoTWBcd<|{x+ebBklJb- Date: Mon, 5 Aug 2019 20:46:34 +0300 Subject: [PATCH 2/2] Update SnowEnemy sprite and animations --- .../Enemies/{Dumber.anim => SnowEnemy.anim} | 6 +- .../{Dumber.anim.meta => SnowEnemy.anim.meta} | 0 ...Dumber.controller => SnowEnemy.controller} | 0 ...troller.meta => SnowEnemy.controller.meta} | 0 .../DevMocks/Resources/DevMocks/Dumb.prefab | 85 ++++++++--- Assets/Resources/Enemies/Dumber.prefab | 137 +++++++++++------- Assets/Sprites/Enemies/snowenemy.png | Bin 696 -> 944 bytes Assets/Sprites/Enemies/snowenemy.png.meta | 14 +- 8 files changed, 162 insertions(+), 80 deletions(-) rename Assets/Animations/Enemies/{Dumber.anim => SnowEnemy.anim} (96%) rename Assets/Animations/Enemies/{Dumber.anim.meta => SnowEnemy.anim.meta} (100%) rename Assets/Animations/Enemies/{Dumber.controller => SnowEnemy.controller} (100%) rename Assets/Animations/Enemies/{Dumber.controller.meta => SnowEnemy.controller.meta} (100%) 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 0a2b62caeba871e142d91c3181ab09d3aefbff05..b212f4e4885aeba019d0c2a543aab616c56b7ec2 100644 GIT binary patch delta 910 zcmV;919AMg1+WK@Fn*FPGN#haR%8wHwtjC&@A2VWm%!s*g#B1ydYjMc z;AUy9wKibuK@84>uivIY&#fwlQfkb)pu1s;(~-jS99ShO&ikE$fVy~i1@yEe%2S`Y zY-K1*5AZ8L6Q>cJQWJoHEFiKp>ZU)Zt}LBXb3|Mk z)7xb!`o1uww0>TeUsFr4d< zC&DVpQ*i>&1lek^N>b~xBkR^?{^yVC{=usbj}w4aN$OpKHf|eA0ho1*Db51eIKLA} zvo6!p{L!&JjVA!@JP}Su3j8jzO7f9sziK6^%6~dj@Czlt0(d#PPEuL{1>#LdHgC%S z*;}{=+zsDe!uo`BRL`uB`J>|w7K!S@e4W^kl z@qe!az-zv3#!OvbhZG%Z-X>l?$2TY;nODdFo`EXTs?j7m)coa{iZ0KTQHM`ZLitN4 z?q7&ZWWJ-0&;UsAhs(i1ek_FFhueD6MD7dOa5gosYw^_)%3XPZ{^{rv!Q@Stc4@I8 kl-v7a9|3I`ZySFA{gza@8HLoeE>p+SnpZIG%$|(8)K_Z*v_e1iLc7XpJsBdA* zNEX59K>0uT{_C~ls=SIheld*k&ZZ~ognryEp?VW8Dq$qEFLbt%g0_9#B?GGw_v zxviiTC(N(h?tkp3>QIV17{H2Kj=&r;AruulXB-c=On`kDO#nlrvs4&~0E*2^^4l6P z0BQi#)Oqa{>$n>`3Stv%ieSIkKNSGDfk=gLPw)u{odTZAet{aD=krOm2;z|C9|FG! zt?(S0twCmWC^T5YJk+BCi3PC1+mdgy1D^Y-1LankRDVFxix9`4MIKTF);ctr9|OgH ziy#=l)PctPR%!+4BYA)hVd|_N(RvZw0zF&q{EpCae>z6dFHY@QWOy(0)qCCq;1oLm z+PtK3F2KbIpL^BPGH@>dE&#^-5fym^=&1wX@JpM&%vXH>`WbNQhz(%sK%q+CT7Zj| zvmN8M0e`$LdXFD1U+`kHJ;~j^d7m-#mbvfEE2Bf5#}{<}Zq#v8Co)Xej08 zD?mwo(7Dk(fPJ4jFY~o(%LOk&p>KC<1nh(|8VCS>{Q6xzfC=3jFG&``Ap$b+W+A7= u;VtGY`hv2hfC`i>NwI&89VX!3_yegtP+x~cat*cs0000