From: KG0104 <76601263+KG0104@users.noreply.github.com> Date: Mon, 4 Oct 2021 17:29:05 +0000 (+0200) Subject: improved movement v0.1 X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=772b200327b1d84646614c00b271316dd2722dc5;p=SuperMouseAdventure.git improved movement v0.1 --- diff --git a/2DGame/Assets/Animations/Enemies/Owl/owl.controller b/2DGame/Assets/Animations/Enemies/Owl/owl.controller new file mode 100644 index 0000000..5fcb228 --- /dev/null +++ b/2DGame/Assets/Animations/Enemies/Owl/owl.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-5436550135484767183 +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: -5262760624680692595} + m_Position: {x: 290, y: 50, 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: -5262760624680692595} +--- !u!1102 &-5262760624680692595 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: walking + 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: 294b02e39765e3c4f8aaf891e7bc720b, 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: owl + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5436550135484767183} + 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} diff --git a/2DGame/Assets/Animations/Enemies/Owl/owl.controller.meta b/2DGame/Assets/Animations/Enemies/Owl/owl.controller.meta new file mode 100644 index 0000000..d32c48f --- /dev/null +++ b/2DGame/Assets/Animations/Enemies/Owl/owl.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b0abcd0a9d5d244da681f8ffeca88e6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Animations/Enemies/Owl/walking.anim b/2DGame/Assets/Animations/Enemies/Owl/walking.anim new file mode 100644 index 0000000..a43af62 --- /dev/null +++ b/2DGame/Assets/Animations/Enemies/Owl/walking.anim @@ -0,0 +1,381 @@ +%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: walking + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -33.345} + 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} + - serializedVersion: 3 + time: 0.2 + value: {x: 0, y: 0, z: 2.774} + 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: bone_1/bone_2 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -2.501} + 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} + - serializedVersion: 3 + time: 0.1 + value: {x: 0, y: 0, z: 29.435} + 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} + - serializedVersion: 3 + time: 0.3 + value: {x: 0, y: 0, z: -2.401} + 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: bone_3/bone_4 + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 20 + 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: 3980913656 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1174489520 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.3 + 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: + - 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 + - serializedVersion: 3 + time: 0.2 + 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: localEulerAnglesRaw.x + path: bone_1/bone_2 + classID: 4 + script: {fileID: 0} + - 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 + - serializedVersion: 3 + time: 0.2 + 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: localEulerAnglesRaw.y + path: bone_1/bone_2 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -33.345 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 2.774 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: bone_1/bone_2 + classID: 4 + script: {fileID: 0} + - 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 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + 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: localEulerAnglesRaw.x + path: bone_3/bone_4 + classID: 4 + script: {fileID: 0} + - 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 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + 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: localEulerAnglesRaw.y + path: bone_3/bone_4 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.501 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 29.435 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: -2.401 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: bone_3/bone_4 + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: bone_1/bone_2 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: bone_1/bone_2 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: bone_1/bone_2 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: bone_3/bone_4 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: bone_3/bone_4 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: bone_3/bone_4 + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/2DGame/Assets/Animations/Enemies/Owl/walking.anim.meta b/2DGame/Assets/Animations/Enemies/Owl/walking.anim.meta new file mode 100644 index 0000000..b68253e --- /dev/null +++ b/2DGame/Assets/Animations/Enemies/Owl/walking.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 294b02e39765e3c4f8aaf891e7bc720b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Animations/Enemies/owl.controller b/2DGame/Assets/Animations/Enemies/owl.controller deleted file mode 100644 index 5fcb228..0000000 --- a/2DGame/Assets/Animations/Enemies/owl.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-5436550135484767183 -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: -5262760624680692595} - m_Position: {x: 290, y: 50, 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: -5262760624680692595} ---- !u!1102 &-5262760624680692595 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: walking - 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: 294b02e39765e3c4f8aaf891e7bc720b, 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: owl - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -5436550135484767183} - 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} diff --git a/2DGame/Assets/Animations/Enemies/owl.controller.meta b/2DGame/Assets/Animations/Enemies/owl.controller.meta deleted file mode 100644 index d32c48f..0000000 --- a/2DGame/Assets/Animations/Enemies/owl.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0b0abcd0a9d5d244da681f8ffeca88e6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Animations/Enemies/walking.anim b/2DGame/Assets/Animations/Enemies/walking.anim deleted file mode 100644 index a43af62..0000000 --- a/2DGame/Assets/Animations/Enemies/walking.anim +++ /dev/null @@ -1,381 +0,0 @@ -%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: walking - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: -33.345} - 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} - - serializedVersion: 3 - time: 0.2 - value: {x: 0, y: 0, z: 2.774} - 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: bone_1/bone_2 - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: -2.501} - 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} - - serializedVersion: 3 - time: 0.1 - value: {x: 0, y: 0, z: 29.435} - 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} - - serializedVersion: 3 - time: 0.3 - value: {x: 0, y: 0, z: -2.401} - 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: bone_3/bone_4 - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 20 - 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: 3980913656 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1174489520 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.3 - 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: - - 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 - - serializedVersion: 3 - time: 0.2 - 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: localEulerAnglesRaw.x - path: bone_1/bone_2 - classID: 4 - script: {fileID: 0} - - 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 - - serializedVersion: 3 - time: 0.2 - 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: localEulerAnglesRaw.y - path: bone_1/bone_2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -33.345 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 2.774 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: bone_1/bone_2 - classID: 4 - script: {fileID: 0} - - 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 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - 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: localEulerAnglesRaw.x - path: bone_3/bone_4 - classID: 4 - script: {fileID: 0} - - 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 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - 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: localEulerAnglesRaw.y - path: bone_3/bone_4 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -2.501 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 29.435 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: -2.401 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: bone_3/bone_4 - classID: 4 - script: {fileID: 0} - m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: bone_1/bone_2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: bone_1/bone_2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: bone_1/bone_2 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: bone_3/bone_4 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: bone_3/bone_4 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: bone_3/bone_4 - classID: 4 - script: {fileID: 0} - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/2DGame/Assets/Animations/Enemies/walking.anim.meta b/2DGame/Assets/Animations/Enemies/walking.anim.meta deleted file mode 100644 index b68253e..0000000 --- a/2DGame/Assets/Animations/Enemies/walking.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 294b02e39765e3c4f8aaf891e7bc720b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity index 00547b6..1c50fc8 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity @@ -1643,13 +1643,13 @@ GameObject: - component: {fileID: 243225408} - component: {fileID: 243225407} - component: {fileID: 243225406} - - component: {fileID: 243225405} - component: {fileID: 243225411} - component: {fileID: 243225410} - component: {fileID: 243225409} - component: {fileID: 243225414} - component: {fileID: 243225413} - component: {fileID: 243225412} + - component: {fileID: 243225405} m_Layer: 8 m_Name: snail m_TagString: Boss @@ -1657,8 +1657,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!60 &243225405 -PolygonCollider2D: +--- !u!61 &243225405 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1680,421 +1680,9 @@ PolygonCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: 8.03, y: -5.85} - - {x: 8.139999, y: -5.7799997} - - {x: 8.22, y: -5.71} - - {x: 8.37, y: -5.56} - - {x: 8.48, y: -5.42} - - {x: 8.599999, y: -5.2} - - {x: 8.62, y: -5.1} - - {x: 8.65, y: -4.97} - - {x: 8.65, y: -4.5} - - {x: 8.639999, y: -4.45} - - {x: 8.62, y: -4.37} - - {x: 8.57, y: -4.24} - - {x: 8.48, y: -4.06} - - {x: 8.41, y: -3.9599998} - - {x: 8.23, y: -3.77} - - {x: 8.08, y: -3.6499999} - - {x: 8.059999, y: -3.5} - - {x: 8.03, y: -3.3999999} - - {x: 8, y: -3.33} - - {x: 7.96, y: -3.26} - - {x: 7.85, y: -3.1499999} - - {x: 7.79, y: -3.1} - - {x: 7.68, y: -3.05} - - {x: 7.6099997, y: -3.03} - - {x: 7.5699997, y: -3.02} - - {x: 6.1, y: -2.97} - - {x: 6.2, y: -2.8899999} - - {x: 6.33, y: -2.77} - - {x: 6.45, y: -2.6599998} - - {x: 6.6499996, y: -2.46} - - {x: 6.7599998, y: -2.34} - - {x: 6.8799996, y: -2.2} - - {x: 7, y: -2.07} - - {x: 7.1299996, y: -1.88} - - {x: 7.2799997, y: -1.65} - - {x: 7.3399997, y: -1.55} - - {x: 7.4199996, y: -1.41} - - {x: 7.5699997, y: -1.1} - - {x: 7.64, y: -0.94} - - {x: 7.71, y: -0.76} - - {x: 7.7599998, y: -0.65} - - {x: 7.8199997, y: -0.42999998} - - {x: 7.91, y: -0.08} - - {x: 7.97, y: 0.25} - - {x: 7.99, y: 0.39999998} - - {x: 8, y: 0.48999998} - - {x: 8.01, y: 0.59999996} - - {x: 8.0199995, y: 0.77} - - {x: 8.0199995, y: 1.2099999} - - {x: 8.01, y: 1.37} - - {x: 8, y: 1.49} - - {x: 7.98, y: 1.66} - - {x: 7.94, y: 1.91} - - {x: 7.89, y: 2.1499999} - - {x: 7.87, y: 2.23} - - {x: 7.8199997, y: 2.4199998} - - {x: 7.77, y: 2.57} - - {x: 7.75, y: 2.62} - - {x: 7.69, y: 2.8} - - {x: 7.6499996, y: 2.8899999} - - {x: 7.6, y: 3.01} - - {x: 7.3799996, y: 3.46} - - {x: 7.31, y: 3.58} - - {x: 7.2599998, y: 3.6499999} - - {x: 7.17, y: 3.8} - - {x: 7.0499997, y: 3.97} - - {x: 6.87, y: 4.19} - - {x: 6.74, y: 4.3399997} - - {x: 6.5699997, y: 4.52} - - {x: 6.3599997, y: 4.73} - - {x: 6.21, y: 4.85} - - {x: 5.8799996, y: 5.12} - - {x: 5.67, y: 5.25} - - {x: 5.5699997, y: 5.31} - - {x: 5.45, y: 5.38} - - {x: 5.15, y: 5.5299997} - - {x: 5.04, y: 5.58} - - {x: 4.9, y: 5.64} - - {x: 4.72, y: 5.71} - - {x: 4.64, y: 5.75} - - {x: 4.38, y: 5.8199997} - - {x: 4.27, y: 5.85} - - {x: 4.19, y: 5.87} - - {x: 3.9099998, y: 5.93} - - {x: 3.79, y: 5.95} - - {x: 3.57, y: 5.98} - - {x: 3.47, y: 5.99} - - {x: 2.54, y: 5.99} - - {x: 2.44, y: 5.98} - - {x: 2.28, y: 5.96} - - {x: 2.05, y: 5.92} - - {x: 1.8199999, y: 5.87} - - {x: 1.55, y: 5.7999997} - - {x: 1.29, y: 5.71} - - {x: 1.1999999, y: 5.68} - - {x: 1.11, y: 5.64} - - {x: 0.88, y: 5.54} - - {x: 0.53999996, y: 5.37} - - {x: 0.29, y: 5.22} - - {x: 0.07, y: 5.0699997} - - {x: -0.19, y: 4.87} - - {x: -0.32, y: 4.75} - - {x: -0.44, y: 4.64} - - {x: -0.65, y: 4.43} - - {x: -0.75, y: 4.3199997} - - {x: -0.87, y: 4.19} - - {x: -0.98999995, y: 4.04} - - {x: -1.17, y: 3.79} - - {x: -1.3199999, y: 3.55} - - {x: -1.39, y: 3.4299998} - - {x: -1.48, y: 3.26} - - {x: -1.5, y: 3.21} - - {x: -1.5799999, y: 3.04} - - {x: -1.64, y: 2.8999999} - - {x: -1.73, y: 2.7} - - {x: -1.81, y: 2.4199998} - - {x: -1.88, y: 2.1599998} - - {x: -1.92, y: 1.9799999} - - {x: -1.9599999, y: 1.75} - - {x: -1.99, y: 1.52} - - {x: -2, y: 1.41} - - {x: -2.01, y: 1.27} - - {x: -2.01, y: 0.71} - - {x: -2, y: 0.57} - - {x: -1.9799999, y: 0.37} - - {x: -1.9499999, y: 0.17} - - {x: -1.92, y: 0} - - {x: -1.88, y: -0.17999999} - - {x: -1.8499999, y: -0.29999998} - - {x: -1.78, y: -0.53999996} - - {x: -1.74, y: -0.65999997} - - {x: -1.66, y: -0.87} - - {x: -1.5899999, y: -1.04} - - {x: -1.54, y: -1.15} - - {x: -1.4399999, y: -1.36} - - {x: -1.3399999, y: -1.54} - - {x: -1.23, y: -1.7199999} - - {x: -1.11, y: -1.9} - - {x: -1.03, y: -2.01} - - {x: -0.89, y: -2.19} - - {x: -0.77, y: -2.32} - - {x: -0.68, y: -2.4199998} - - {x: -0.39999998, y: -2.7} - - {x: -0.29999998, y: -2.79} - - {x: -0.13, y: -2.9399998} - - {x: -0.02, y: -3.02} - - {x: -1.15, y: -3.02} - - {x: -1.24, y: -3.04} - - {x: -1.3, y: -3.05} - - {x: -1.42, y: -3.1299999} - - {x: -1.49, y: -3.1899998} - - {x: -1.54, y: -3.25} - - {x: -1.61, y: -3.3799999} - - {x: -1.64, y: -3.47} - - {x: -3.82, y: -3.47} - - {x: -3.75, y: -3.21} - - {x: -3.74, y: -3.1699998} - - {x: -3.7099998, y: -3.06} - - {x: -3.6899998, y: -2.95} - - {x: -3.62, y: -2.8} - - {x: -3.32, y: -2.59} - - {x: -3.23, y: -2.52} - - {x: -3.23, y: -2.5} - - {x: -3.25, y: -2.47} - - {x: -3.53, y: -2.45} - - {x: -3.52, y: -2.35} - - {x: -3.49, y: -2.24} - - {x: -3.48, y: -2.2} - - {x: -3.4499998, y: -2.09} - - {x: -3.4399998, y: -2.05} - - {x: -3.4099998, y: -1.9399999} - - {x: -3.37, y: -1.79} - - {x: -3.34, y: -1.68} - - {x: -3.29, y: -1.5699999} - - {x: -3.1299999, y: -1.66} - - {x: -2.96, y: -1.7199999} - - {x: -2.9399998, y: -1.6999999} - - {x: -2.9399998, y: -1.68} - - {x: -3.05, y: -1.43} - - {x: -3.1699998, y: -1.16} - - {x: -3.1899998, y: -1.13} - - {x: -3.11, y: -0.82} - - {x: -3.07, y: -0.66999996} - - {x: -3, y: -0.41} - - {x: -2.96, y: -0.26} - - {x: -2.95, y: -0.19} - - {x: -2.8899999, y: -0.17} - - {x: -2.61, y: -0.06} - - {x: -2.48, y: -0.01} - - {x: -2.4199998, y: 0} - - {x: -2.3799999, y: 0.06} - - {x: -2.48, y: 0.11} - - {x: -2.62, y: 0.14999999} - - {x: -2.75, y: 0.19999999} - - {x: -2.83, y: 0.24} - - {x: -2.8, y: 0.34} - - {x: -2.73, y: 0.59999996} - - {x: -2.69, y: 0.71} - - {x: -2.47, y: 0.82} - - {x: -2.3, y: 0.98999995} - - {x: -2.2, y: 1.13} - - {x: -2.11, y: 1.31} - - {x: -2.08, y: 1.4499999} - - {x: -2.06, y: 1.63} - - {x: -2.06, y: 1.68} - - {x: -2.07, y: 1.8} - - {x: -2.08, y: 1.86} - - {x: -2.12, y: 2.01} - - {x: -2.2, y: 2.18} - - {x: -2.26, y: 2.27} - - {x: -2.4199998, y: 2.4299998} - - {x: -2.51, y: 2.53} - - {x: -2.46, y: 2.55} - - {x: -2.08, y: 2.77} - - {x: -1.75, y: 2.96} - - {x: -1.63, y: 3.03} - - {x: -1.5799999, y: 3.08} - - {x: -1.5999999, y: 3.1399999} - - {x: -1.9, y: 3.6599998} - - {x: -1.9499999, y: 3.74} - - {x: -1.99, y: 3.74} - - {x: -2.09, y: 3.6899998} - - {x: -2.47, y: 3.47} - - {x: -2.6799998, y: 3.35} - - {x: -2.9399998, y: 3.1999998} - - {x: -3.25, y: 3.02} - - {x: -3.3899999, y: 2.9399998} - - {x: -3.51, y: 2.87} - - {x: -3.9599998, y: 2.61} - - {x: -4.29, y: 2.4199998} - - {x: -4.5499997, y: 2.27} - - {x: -4.58, y: 2.23} - - {x: -4.58, y: 2.21} - - {x: -4.54, y: 2.1299999} - - {x: -4.46, y: 1.99} - - {x: -4.43, y: 1.9399999} - - {x: -4.2799997, y: 1.68} - - {x: -4.21, y: 1.5699999} - - {x: -4.0899997, y: 1.5699999} - - {x: -4.1, y: 1.48} - - {x: -4.0699997, y: 1.35} - - {x: -4.02, y: 1.22} - - {x: -3.9499998, y: 1.11} - - {x: -3.9099998, y: 1.05} - - {x: -3.87, y: 1.01} - - {x: -3.74, y: 0.85999995} - - {x: -3.83, y: 0.53} - - {x: -3.87, y: 0.38} - - {x: -3.8799999, y: 0.34} - - {x: -3.9099998, y: 0.22999999} - - {x: -3.9499998, y: 0.08} - - {x: -4.0099998, y: -0.14} - - {x: -4.0499997, y: -0.25} - - {x: -4.23, y: -0.26} - - {x: -4.3199997, y: -0.26999998} - - {x: -4.42, y: -0.28} - - {x: -4.61, y: -0.29} - - {x: -4.63, y: -0.34} - - {x: -4.54, y: -0.41} - - {x: -4.3199997, y: -0.57} - - {x: -4.2, y: -0.65} - - {x: -4.15, y: -0.68} - - {x: -4.17, y: -0.74} - - {x: -4.25, y: -1.04} - - {x: -4.2799997, y: -1.15} - - {x: -4.31, y: -1.27} - - {x: -4.31, y: -1.29} - - {x: -4.4, y: -1.35} - - {x: -4.73, y: -1.5899999} - - {x: -4.7599998, y: -1.62} - - {x: -4.89, y: -1.7199999} - - {x: -4.88, y: -1.75} - - {x: -4.68, y: -1.77} - - {x: -4.5, y: -1.79} - - {x: -4.45, y: -1.8199999} - - {x: -4.47, y: -1.86} - - {x: -4.5, y: -1.9699999} - - {x: -4.52, y: -2.04} - - {x: -4.5899997, y: -2.31} - - {x: -4.74, y: -2.87} - - {x: -4.88, y: -3.3899999} - - {x: -4.9, y: -3.47} - - {x: -5.18, y: -3.47} - - {x: -5.2799997, y: -3.48} - - {x: -5.3599997, y: -3.46} - - {x: -5.42, y: -3.23} - - {x: -5.56, y: -2.71} - - {x: -5.58, y: -2.6399999} - - {x: -5.38, y: -2.62} - - {x: -5.19, y: -2.6} - - {x: -5.16, y: -2.57} - - {x: -5.16, y: -2.55} - - {x: -5.21, y: -2.51} - - {x: -5.66, y: -2.19} - - {x: -5.71, y: -2.1499999} - - {x: -5.72, y: -2.11} - - {x: -5.94, y: -1.29} - - {x: -5.96, y: -1.17} - - {x: -5.8799996, y: -1.09} - - {x: -5.7599998, y: -0.91999996} - - {x: -5.5899997, y: -0.71999997} - - {x: -5.5699997, y: -0.66999996} - - {x: -5.5899997, y: -0.65} - - {x: -5.64, y: -0.65} - - {x: -5.77, y: -0.66999996} - - {x: -6.1, y: -0.71999997} - - {x: -6.1099997, y: -0.65999997} - - {x: -6.17, y: -0.42999998} - - {x: -6.47, y: 0.69} - - {x: -6.49, y: 0.77} - - {x: -6.33, y: 0.93} - - {x: -6.22, y: 1.15} - - {x: -6.17, y: 1.3} - - {x: -6.15, y: 1.41} - - {x: -6.15, y: 1.5} - - {x: -6.0499997, y: 1.4499999} - - {x: -6.02, y: 1.4699999} - - {x: -5.94, y: 1.61} - - {x: -5.87, y: 1.73} - - {x: -5.72, y: 1.99} - - {x: -5.66, y: 2.12} - - {x: -5.7, y: 2.1599998} - - {x: -5.8399997, y: 2.24} - - {x: -6.1, y: 2.3899999} - - {x: -6.22, y: 2.46} - - {x: -6.5499997, y: 2.6499999} - - {x: -6.67, y: 2.72} - - {x: -6.81, y: 2.8} - - {x: -6.93, y: 2.87} - - {x: -7.2599998, y: 3.06} - - {x: -7.3799996, y: 3.1299999} - - {x: -7.52, y: 3.21} - - {x: -7.64, y: 3.28} - - {x: -7.7799997, y: 3.36} - - {x: -7.95, y: 3.4499998} - - {x: -7.97, y: 3.47} - - {x: -8.09, y: 3.54} - - {x: -8.24, y: 3.62} - - {x: -8.28, y: 3.6299999} - - {x: -8.32, y: 3.59} - - {x: -8.429999, y: 3.3999999} - - {x: -8.51, y: 3.26} - - {x: -8.58, y: 3.1399999} - - {x: -8.65, y: 3.01} - - {x: -8.65, y: 2.95} - - {x: -8.62, y: 2.9199998} - - {x: -8.5, y: 2.85} - - {x: -8.36, y: 2.77} - - {x: -8.24, y: 2.7} - - {x: -8.099999, y: 2.62} - - {x: -7.98, y: 2.55} - - {x: -7.8399997, y: 2.47} - - {x: -7.71, y: 2.3999999} - - {x: -7.7799997, y: 2.36} - - {x: -7.95, y: 2.2} - - {x: -8.059999, y: 2.04} - - {x: -8.12, y: 1.9} - - {x: -8.15, y: 1.81} - - {x: -8.17, y: 1.7199999} - - {x: -8.179999, y: 1.65} - - {x: -8.179999, y: 1.43} - - {x: -8.16, y: 1.3199999} - - {x: -8.12, y: 1.18} - - {x: -8.07, y: 1.06} - - {x: -7.98, y: 0.91999996} - - {x: -7.83, y: 0.77} - - {x: -7.74, y: 0.7} - - {x: -7.69, y: 0.65999997} - - {x: -7.52, y: 0.58} - - {x: -7.5, y: 0.45999998} - - {x: -7.45, y: 0.31} - - {x: -7.35, y: -0.08} - - {x: -7.46, y: -0.19999999} - - {x: -7.62, y: -0.41} - - {x: -7.7, y: -0.51} - - {x: -7.75, y: -0.57} - - {x: -7.77, y: -0.62} - - {x: -7.7599998, y: -0.65} - - {x: -7.6299996, y: -0.64} - - {x: -7.39, y: -0.59} - - {x: -7.22, y: -0.56} - - {x: -7.1499996, y: -0.81} - - {x: -7, y: -1.37} - - {x: -7.06, y: -1.43} - - {x: -7.39, y: -1.67} - - {x: -7.49, y: -1.76} - - {x: -7.48, y: -1.79} - - {x: -7.31, y: -1.8199999} - - {x: -7.02, y: -1.8399999} - - {x: -6.8799996, y: -1.8499999} - - {x: -6.83, y: -2} - - {x: -6.5099998, y: -3.1999998} - - {x: -6.33, y: -3.87} - - {x: -6.25, y: -4.17} - - {x: -6.2999997, y: -4.3199997} - - {x: -6.3399997, y: -4.45} - - {x: -6.37, y: -4.58} - - {x: -6.37, y: -4.7599998} - - {x: -6.35, y: -4.97} - - {x: -6.31, y: -5.13} - - {x: -6.2799997, y: -5.21} - - {x: -6.22, y: -5.35} - - {x: -6.16, y: -5.45} - - {x: -6.06, y: -5.58} - - {x: -5.89, y: -5.74} - - {x: -5.7799997, y: -5.8199997} - - {x: -5.62, y: -5.9} - - {x: -5.52, y: -5.94} - - {x: -5.42, y: -5.97} - - {x: -5.33, y: -5.99} - - {x: 7.6299996, y: -5.99} - - {x: 7.77, y: -5.96} - - {x: 7.8999996, y: -5.91} + serializedVersion: 2 + m_Size: {x: 17.3, y: 11.98} + m_EdgeRadius: 0 --- !u!50 &243225406 Rigidbody2D: serializedVersion: 4 @@ -2462,7 +2050,7 @@ MonoBehaviour: source: {fileID: 0} - name: flowers clip: {fileID: 8300000, guid: e2a660c310e818f4287449f652a628c7, type: 3} - volume: 1 + volume: 0 pitch: 1 source: {fileID: 0} - name: snail_fight @@ -4611,8 +4199,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5, y: 3, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 799096932} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5431,7 +5018,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 678625800} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -39.3, y: 3.8, z: 0} + m_LocalPosition: {x: -72.22, y: 3.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -11220,88 +10807,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 797428370} m_CullTransparentMesh: 1 ---- !u!1 &799096931 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 799096932} - - component: {fileID: 799096933} - m_Layer: 0 - m_Name: hintergrund_green_idyll - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &799096932 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 799096931} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 10} - m_LocalScale: {x: 3, y: 3, z: 1} - m_Children: [] - m_Father: {fileID: 519420032} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &799096933 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 799096931} - 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: 1907257087 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 841cca72229f1534ebd5207c37650992, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 38.399998, y: 21.599998} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &799193055 GameObject: m_ObjectHideFlags: 0 @@ -11717,10 +11222,10 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 10 + m_Mass: 1 m_LinearDrag: 0 m_AngularDrag: 0.05 - m_GravityScale: 18 + m_GravityScale: 10 m_Material: {fileID: 6200000, guid: a0e76db9e40770140a1212c57564ee2a, type: 2} m_Interpolate: 0 m_SleepingMode: 1 @@ -11981,9 +11486,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 36 - jumpForce: 50 - jumptime: 0.5 - coyoteTime: 0.1 + jumpForce: 80 + jumptime: 0.4 + coyoteTime: 0.3 + jumpBufferLength: 0.3 isGrounded: 0 groundcheck: {fileID: 972365582} checkRadius: 0.5 @@ -12222,6 +11728,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stampingSpeed: 100 + groundCheck: {fileID: 972365581} + dustEffect: {fileID: 723835315} --- !u!95 &936765983 Animator: serializedVersion: 3 @@ -13393,7 +12901,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1016078926} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 156.5, y: -1.7, z: 0} + m_LocalPosition: {x: 156.5, y: -12.3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -24206,8 +23714,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bc2cf8de166e6c04fba789ac331ec852, type: 3} m_Name: m_EditorClassIdentifier: - groundCheck: {fileID: 972365581} - dustEffect: {fileID: 723835315} --- !u!1 &1198571354 GameObject: m_ObjectHideFlags: 0 @@ -25571,7 +25077,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1359769958} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 438.6, y: -12.9, z: 0} + m_LocalPosition: {x: 438.6, y: -23.3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/2DGame/Assets/Scripts/Audio/LandingSound.cs b/2DGame/Assets/Scripts/Audio/LandingSound.cs index 866abf7..db69653 100644 --- a/2DGame/Assets/Scripts/Audio/LandingSound.cs +++ b/2DGame/Assets/Scripts/Audio/LandingSound.cs @@ -4,19 +4,11 @@ using UnityEngine; public class LandingSound : MonoBehaviour { - [SerializeField] - GameObject groundCheck; - - [SerializeField] - GameObject dustEffect; - private void OnCollisionEnter2D(Collision2D collision) { if(collision.gameObject.CompareTag("Player")) { FindObjectOfType().Play("landung"); - Vector3 spawnPos = new Vector3(groundCheck.transform.position.x, groundCheck.transform.position.y + 1, groundCheck.transform.position.z); - Instantiate(dustEffect, spawnPos, Quaternion.identity); } } -} +} \ No newline at end of file diff --git a/2DGame/Assets/Scripts/Enemies/Boss/BossCollision.cs b/2DGame/Assets/Scripts/Enemies/Boss/BossCollision.cs index 1f7addd..0722273 100644 --- a/2DGame/Assets/Scripts/Enemies/Boss/BossCollision.cs +++ b/2DGame/Assets/Scripts/Enemies/Boss/BossCollision.cs @@ -9,6 +9,7 @@ public class BossCollision : MonoBehaviour SpriteRenderer spriteRenderer; public float flashingTime; + [HideInInspector] public bool invulnerable; @@ -28,24 +29,7 @@ public class BossCollision : MonoBehaviour boss.bossHealth--; Destroy(collision.gameObject); invulnerable = true; - //StartCoroutine("GetInvincible"); } } } - - /**IEnumerator GetInvincible() - { - invulnerable = true; - Physics2D.IgnoreLayerCollision(7, 8, true); - for (int i = 0; i < 4; i++) - { - spriteRenderer.enabled = false; - yield return new WaitForSeconds(flashingTime); - spriteRenderer.enabled = true; - yield return new WaitForSeconds(flashingTime); - } - Physics2D.IgnoreLayerCollision(7, 8, false); - spriteRenderer.enabled = true; - invulnerable = false; - }*/ -} +} \ No newline at end of file diff --git a/2DGame/Assets/Scripts/Mouse/MouseController.cs b/2DGame/Assets/Scripts/Mouse/MouseController.cs index 122ae84..b672289 100644 --- a/2DGame/Assets/Scripts/Mouse/MouseController.cs +++ b/2DGame/Assets/Scripts/Mouse/MouseController.cs @@ -11,10 +11,13 @@ public class MouseController : MonoBehaviour public float jumpForce; private float jumpTimeCounter; public float jumptime; - private bool isJumping; private float moveInput; + public float coyoteTime; - private bool jumpAllowed; + private float coyoteTimeCounter; + + public float jumpBufferLength; + private float jumpBufferCounter; [HideInInspector] public bool isGrounded; @@ -30,12 +33,13 @@ public class MouseController : MonoBehaviour [SerializeField] GameObject bullet; + [SerializeField] Transform bulletSpawnPos; + [SerializeField] private float shootDelay = 0.5f; - // Start is called before the first frame update void Start() { //Hier wird der Rigidbody initialisiert @@ -44,38 +48,39 @@ public class MouseController : MonoBehaviour powerUps = GetComponent(); } - // Update is called once per frame void Update() { - if (!isGrounded) + //manage coyote time + if (isGrounded) { - StartCoroutine(CoyoteTime()); - } - else + coyoteTimeCounter = coyoteTime; + } else { - jumpAllowed = true; + coyoteTimeCounter -= Time.deltaTime; } - if (jumpAllowed && Input.GetButtonDown("Jump")) + //manage jump buffering + if (Input.GetButtonDown("Jump")) { - isJumping = true; - jumpTimeCounter = jumptime; - rb.velocity = new Vector2(rb.velocity.x, jumpForce); + jumpBufferCounter = jumpBufferLength; + } else + { + jumpBufferCounter -= Time.deltaTime; } - if (Input.GetButton("Jump") && isJumping) + //jump + if (jumpBufferCounter >= 0 && coyoteTimeCounter > 0) { - if (jumpTimeCounter > 0) - { - rb.velocity = new Vector2(rb.velocity.x, jumpForce); - jumpTimeCounter -= Time.deltaTime; - FindObjectOfType().Play("sprung"); - } + isGrounded = false; + rb.velocity = new Vector2(rb.velocity.x, jumpForce); + jumpBufferCounter = 0; + coyoteTimeCounter = 0; } - - if (Input.GetButtonUp("Jump")) + + //jumping with different height + if (Input.GetButtonUp("Jump") && rb.velocity.y > 0) { - isJumping = false; + rb.velocity = new Vector2(rb.velocity.x, jumpForce * 0.5f); } if (rb.velocity.x < 0) @@ -133,7 +138,7 @@ public class MouseController : MonoBehaviour if (moveInput != 0) { - acceleration *= moveInput * 4; + acceleration *= moveInput * 3; } else if (isGrounded) { @@ -156,12 +161,6 @@ public class MouseController : MonoBehaviour } } - IEnumerator CoyoteTime() - { - yield return new WaitForSeconds(coyoteTime); - jumpAllowed = false; - } - void ResetShoot() { isShooting = false; diff --git a/2DGame/Assets/Scripts/Mouse/Stamping.cs b/2DGame/Assets/Scripts/Mouse/Stamping.cs index 0f1160b..76dff76 100644 --- a/2DGame/Assets/Scripts/Mouse/Stamping.cs +++ b/2DGame/Assets/Scripts/Mouse/Stamping.cs @@ -12,6 +12,12 @@ public class Stamping : MonoBehaviour [SerializeField] private float stampingSpeed = 40; + [SerializeField] + GameObject groundCheck; + + [SerializeField] + GameObject dustEffect; + private bool isStamping = false; // Start is called before the first frame update @@ -32,9 +38,12 @@ public class Stamping : MonoBehaviour rb.velocity = Vector2.down * stampingSpeed; } } - else if (mouseController.isGrounded) + else if (mouseController.isGrounded && isStamping) { isStamping = false; + Vector3 spawnPos = new Vector3(groundCheck.transform.position.x, groundCheck.transform.position.y + 1, groundCheck.transform.position.z); + Instantiate(dustEffect, spawnPos, Quaternion.identity); + } } diff --git a/2DGame/Assets/Sprites/hintergrund_green_idyll.png b/2DGame/Assets/Sprites/hintergrund_green_idyll.png deleted file mode 100644 index 702c55b..0000000 Binary files a/2DGame/Assets/Sprites/hintergrund_green_idyll.png and /dev/null differ diff --git a/2DGame/Assets/Sprites/hintergrund_green_idyll.png.meta b/2DGame/Assets/Sprites/hintergrund_green_idyll.png.meta deleted file mode 100644 index 7fae6ad..0000000 --- a/2DGame/Assets/Sprites/hintergrund_green_idyll.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 841cca72229f1534ebd5207c37650992 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - 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 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Sprites/landscape.png b/2DGame/Assets/Sprites/landscape.png deleted file mode 100644 index 323bbc6..0000000 Binary files a/2DGame/Assets/Sprites/landscape.png and /dev/null differ diff --git a/2DGame/Assets/Sprites/landscape.png.meta b/2DGame/Assets/Sprites/landscape.png.meta deleted file mode 100644 index 2d6f755..0000000 --- a/2DGame/Assets/Sprites/landscape.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 985bb52a96892ce408438f84b074de8a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - 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 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Sprites/maus/maus_jump_1.png b/2DGame/Assets/Sprites/maus/maus_jump_1.png deleted file mode 100644 index 80b144d..0000000 Binary files a/2DGame/Assets/Sprites/maus/maus_jump_1.png and /dev/null differ diff --git a/2DGame/Assets/Sprites/maus/maus_jump_1.png.meta b/2DGame/Assets/Sprites/maus/maus_jump_1.png.meta deleted file mode 100644 index 4f00c08..0000000 --- a/2DGame/Assets/Sprites/maus/maus_jump_1.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 11b814d0d35182c46a04953d5635c8a1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - 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 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Sprites/maus/maus_jump_2.png b/2DGame/Assets/Sprites/maus/maus_jump_2.png deleted file mode 100644 index 4dd5cb2..0000000 Binary files a/2DGame/Assets/Sprites/maus/maus_jump_2.png and /dev/null differ diff --git a/2DGame/Assets/Sprites/maus/maus_jump_2.png.meta b/2DGame/Assets/Sprites/maus/maus_jump_2.png.meta deleted file mode 100644 index f2ea2a4..0000000 --- a/2DGame/Assets/Sprites/maus/maus_jump_2.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 36b2247881d08d94d972e9b1464a0e32 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - 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 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Sprites/maus/maus_jump_3.png b/2DGame/Assets/Sprites/maus/maus_jump_3.png deleted file mode 100644 index 0d9497c..0000000 Binary files a/2DGame/Assets/Sprites/maus/maus_jump_3.png and /dev/null differ diff --git a/2DGame/Assets/Sprites/maus/maus_jump_3.png.meta b/2DGame/Assets/Sprites/maus/maus_jump_3.png.meta deleted file mode 100644 index 9f0b762..0000000 --- a/2DGame/Assets/Sprites/maus/maus_jump_3.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: eb8e0d43f4bda5e45b1289498ff28685 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - 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 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Sprites/maus/maus_jump_4.png b/2DGame/Assets/Sprites/maus/maus_jump_4.png deleted file mode 100644 index 02b56ec..0000000 Binary files a/2DGame/Assets/Sprites/maus/maus_jump_4.png and /dev/null differ diff --git a/2DGame/Assets/Sprites/maus/maus_jump_4.png.meta b/2DGame/Assets/Sprites/maus/maus_jump_4.png.meta deleted file mode 100644 index 1931224..0000000 --- a/2DGame/Assets/Sprites/maus/maus_jump_4.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: ed5a454afcc15f0488cc58ad8c1c2b38 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - 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 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: