diff --git a/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1DeathAni.anim b/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1DeathAni.anim index 7466d79..1e48cc7 100644 --- a/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1DeathAni.anim @@ -37,11 +37,11 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 21300000, guid: 9c60022201e9a4a469ca7b14462918ea, type: 3} - - time: 0.1 - value: {fileID: 21300000, guid: 6b82fc690cf4459419c5f3fd5a691a61, type: 3} - - time: 0.21666667 - value: {fileID: 21300000, guid: 0cb1db5a033e47d4eba3de86b005ec7f, type: 3} + value: {fileID: 21300000, guid: 30f71fced0ba5894a91c09f887c7b1ad, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: 64fedaa3eff21e14eb1c64afca1de287, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: fe7651ee892563e4bade8ead52e1a163, type: 3} attribute: m_Sprite path: classID: 212 @@ -73,15 +73,15 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 21300000, guid: 9c60022201e9a4a469ca7b14462918ea, type: 3} - - {fileID: 21300000, guid: 6b82fc690cf4459419c5f3fd5a691a61, type: 3} - - {fileID: 21300000, guid: 0cb1db5a033e47d4eba3de86b005ec7f, type: 3} + - {fileID: 21300000, guid: 30f71fced0ba5894a91c09f887c7b1ad, type: 3} + - {fileID: 21300000, guid: 64fedaa3eff21e14eb1c64afca1de287, type: 3} + - {fileID: 21300000, guid: fe7651ee892563e4bade8ead52e1a163, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.23333333 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1StrangleAni.anim index aaeaf47..313ff06 100644 --- a/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1StrangleAni.anim @@ -37,7 +37,7 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 21300000, guid: 66152230910b9f64db23853201f5a573, type: 3} + value: {fileID: 21300000, guid: a787a7d09f5e48844bd30cf479ac0755, type: 3} attribute: m_Sprite path: classID: 212 @@ -69,7 +69,7 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 21300000, guid: 66152230910b9f64db23853201f5a573, type: 3} + - {fileID: 21300000, guid: a787a7d09f5e48844bd30cf479ac0755, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller new file mode 100644 index 0000000..f84526b --- /dev/null +++ b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-4949393410711050712 +AnimatorStateMachine: + serializedVersion: 6 + 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: -3618960495364978089} + m_Position: {x: 400, y: 250, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5449203074349302286} + m_Position: {x: 310, y: 120, 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: 5449203074349302286} +--- !u!1102 &-3618960495364978089 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Enemy1DeathAni + 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: 05d7b1c96411a774fbe519a22c47f7c2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Enemy1v2 + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Die + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4949393410711050712} + 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!1101 &148394794518211540 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Die + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3618960495364978089} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &5449203074349302286 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Enemy1v1StrangleAni + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 148394794518211540} + 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: 473aff4d1e734734a9e49c073c8b9867, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller.meta b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller.meta new file mode 100644 index 0000000..6dc9cd2 --- /dev/null +++ b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bff565a3c97e3dd458df3614bcf11729 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim new file mode 100644 index 0000000..11c9a1a --- /dev/null +++ b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim @@ -0,0 +1,166 @@ +%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: Enemy1v2DeathAni + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.9, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 9c60022201e9a4a469ca7b14462918ea, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 6b82fc690cf4459419c5f3fd5a691a61, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 0cb1db5a033e47d4eba3de86b005ec7f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 9c60022201e9a4a469ca7b14462918ea, type: 3} + - {fileID: 21300000, guid: 6b82fc690cf4459419c5f3fd5a691a61, type: 3} + - {fileID: 21300000, guid: 0cb1db5a033e47d4eba3de86b005ec7f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.23333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim.meta b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim.meta new file mode 100644 index 0000000..aaacace --- /dev/null +++ b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05d7b1c96411a774fbe519a22c47f7c2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim new file mode 100644 index 0000000..57b86eb --- /dev/null +++ b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim @@ -0,0 +1,160 @@ +%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: Enemy1v2StrangleAni + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.9, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 66152230910b9f64db23853201f5a573, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 66152230910b9f64db23853201f5a573, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim.meta b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim.meta new file mode 100644 index 0000000..19ccafc --- /dev/null +++ b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 473aff4d1e734734a9e49c073c8b9867 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/1.meta b/Assets/Resources/Enemies/1.meta new file mode 100644 index 0000000..fca9ac5 --- /dev/null +++ b/Assets/Resources/Enemies/1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e98ee1d9692c9743a3f7505ebddab89 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/Enemy1V1.prefab b/Assets/Resources/Enemies/1/Enemy1V1.prefab similarity index 89% rename from Assets/Resources/Enemies/Enemy1V1.prefab rename to Assets/Resources/Enemies/1/Enemy1V1.prefab index 2035e42..851eda4 100644 --- a/Assets/Resources/Enemies/Enemy1V1.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V1.prefab @@ -93,7 +93,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 658931473633382931} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 8c057960a463d234daf35d12e970f264, type: 2} m_CullingMode: 0 @@ -115,6 +115,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} + - component: {fileID: 1080557620588792846} m_Layer: 0 m_Name: Enemy1V1 m_TagString: Untagged @@ -131,10 +132,22 @@ Transform: m_GameObject: {fileID: 6905705041633878913} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.84, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1080557620588792846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Enemies/Enemy1V1.prefab.meta b/Assets/Resources/Enemies/1/Enemy1V1.prefab.meta similarity index 100% rename from Assets/Resources/Enemies/Enemy1V1.prefab.meta rename to Assets/Resources/Enemies/1/Enemy1V1.prefab.meta diff --git a/Assets/Resources/Enemies/1/Enemy1V2.prefab b/Assets/Resources/Enemies/1/Enemy1V2.prefab new file mode 100644 index 0000000..7746e96 --- /dev/null +++ b/Assets/Resources/Enemies/1/Enemy1V2.prefab @@ -0,0 +1,153 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &658931473633382931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3596055233112951220} + - component: {fileID: 8224209185524732719} + - component: {fileID: 7324983754635409392} + m_Layer: 0 + m_Name: Renderer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3596055233112951220 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3920219362688286786} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8224209185524732719 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_Sprite: {fileID: 21300000, guid: ac6350cb80391e44b9a6d65d52cdd548, 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.43, y: 2.19} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7324983754635409392 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8c057960a463d234daf35d12e970f264, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &6905705041633878913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3920219362688286786} + - component: {fileID: 1080557620588792846} + m_Layer: 0 + m_Name: Enemy1V2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3920219362688286786 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3596055233112951220} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1080557620588792846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Enemies/1/Enemy1V2.prefab.meta b/Assets/Resources/Enemies/1/Enemy1V2.prefab.meta new file mode 100644 index 0000000..0c0e476 --- /dev/null +++ b/Assets/Resources/Enemies/1/Enemy1V2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ee739a33f1762c142bc1ef49e6e95fa4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/1/Enemy1V3.prefab b/Assets/Resources/Enemies/1/Enemy1V3.prefab new file mode 100644 index 0000000..32ee85d --- /dev/null +++ b/Assets/Resources/Enemies/1/Enemy1V3.prefab @@ -0,0 +1,153 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &658931473633382931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3596055233112951220} + - component: {fileID: 8224209185524732719} + - component: {fileID: 7324983754635409392} + m_Layer: 0 + m_Name: Renderer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3596055233112951220 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3920219362688286786} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8224209185524732719 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_Sprite: {fileID: 21300000, guid: 6ec94328ea22672429ca48d1aa458679, 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.43, y: 2.19} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7324983754635409392 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8c057960a463d234daf35d12e970f264, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &6905705041633878913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3920219362688286786} + - component: {fileID: 1080557620588792846} + m_Layer: 0 + m_Name: Enemy1V3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3920219362688286786 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3596055233112951220} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1080557620588792846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Enemies/1/Enemy1V3.prefab.meta b/Assets/Resources/Enemies/1/Enemy1V3.prefab.meta new file mode 100644 index 0000000..dcb5468 --- /dev/null +++ b/Assets/Resources/Enemies/1/Enemy1V3.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd2055c0dcd26e4448309266b8c6f03e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/2.meta b/Assets/Resources/Enemies/2.meta new file mode 100644 index 0000000..c6978c7 --- /dev/null +++ b/Assets/Resources/Enemies/2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54c3885a423b96c4f8bdd20ec96d6b84 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/3.meta b/Assets/Resources/Enemies/3.meta new file mode 100644 index 0000000..d42dd05 --- /dev/null +++ b/Assets/Resources/Enemies/3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e1e89a6bd5d11c4789c3ab6ee993108 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/4.meta b/Assets/Resources/Enemies/4.meta new file mode 100644 index 0000000..38a7dea --- /dev/null +++ b/Assets/Resources/Enemies/4.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1840f7851b364f34788749c1554547c3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/5.meta b/Assets/Resources/Enemies/5.meta new file mode 100644 index 0000000..d227196 --- /dev/null +++ b/Assets/Resources/Enemies/5.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: add14869bc441a74f89eb285964a1335 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/6.meta b/Assets/Resources/Enemies/6.meta new file mode 100644 index 0000000..2822267 --- /dev/null +++ b/Assets/Resources/Enemies/6.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 192d3d22057fe314385cc7c3269d0081 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MovementTest.unity b/Assets/Scenes/MovementTest.unity index 281445b..cfaff81 100644 --- a/Assets/Scenes/MovementTest.unity +++ b/Assets/Scenes/MovementTest.unity @@ -1650,70 +1650,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1371458543 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalPosition.x - value: -21.35 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalPosition.y - value: -2.18 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_Name - value: Enemy1V1 - objectReference: {fileID: 0} - - target: {fileID: 7324983754635409392, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - insertIndex: -1 - addedObject: {fileID: 1642822758} - m_SourcePrefab: {fileID: 100100000, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} --- !u!1 &1420709238 GameObject: m_ObjectHideFlags: 0 @@ -1831,23 +1767,6 @@ Transform: - {fileID: 1316213926} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1642822757 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} - m_PrefabInstance: {fileID: 1371458543} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1642822758 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1642822757} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1666646756 GameObject: m_ObjectHideFlags: 0 @@ -2223,4 +2142,3 @@ SceneRoots: - {fileID: 1365819705} - {fileID: 220016284} - {fileID: 1180110923} - - {fileID: 1371458543} diff --git a/Assets/Scripts/Player/PlayerMovement1.cs b/Assets/Scripts/Player/PlayerMovement1.cs index d40128b..9c74fdb 100644 --- a/Assets/Scripts/Player/PlayerMovement1.cs +++ b/Assets/Scripts/Player/PlayerMovement1.cs @@ -29,8 +29,16 @@ public class PlayerMovement1 : MonoBehaviour void Update() { - movement.x = playerController.leftStick.x.ReadValue(); - movement.y = playerController.leftStick.y.ReadValue(); + if (playerController != null) + { + movement.x = playerController.leftStick.x.ReadValue(); + movement.y = playerController.leftStick.y.ReadValue(); + } + else + { + movement.x = Input.GetAxisRaw("Horizontal"); + movement.y = Input.GetAxisRaw("Vertical"); ; + } if (movement.x != 0 || movement.y != 0) RumbleWalk(); }