diff --git a/Assets/AssetsFORELLE/Audio/prototypver4gestreckt4TakteSchlagzeugMehr.wav b/Assets/AssetsFORELLE/Audio/prototypver4gestreckt4TakteSchlagzeugMehr.wav new file mode 100644 index 0000000..8b2b25c --- /dev/null +++ b/Assets/AssetsFORELLE/Audio/prototypver4gestreckt4TakteSchlagzeugMehr.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:581468e726f9c568dbe4b82b7349bb33f770d3ffb16ff6d2bb80a231413a84cd +size 25411628 diff --git a/Assets/AssetsFORELLE/Audio/prototypver4gestreckt4TakteSchlagzeugMehr.wav.meta b/Assets/AssetsFORELLE/Audio/prototypver4gestreckt4TakteSchlagzeugMehr.wav.meta new file mode 100644 index 0000000..94798f9 --- /dev/null +++ b/Assets/AssetsFORELLE/Audio/prototypver4gestreckt4TakteSchlagzeugMehr.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ba23db2ceb808f84187d8c0a4305c959 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Prefabs/boulder.prefab b/Assets/AssetsFORELLE/Prefabs/boulder.prefab index e3693be..6204879 100644 --- a/Assets/AssetsFORELLE/Prefabs/boulder.prefab +++ b/Assets/AssetsFORELLE/Prefabs/boulder.prefab @@ -128,7 +128,7 @@ Rigidbody2D: m_LinearDrag: 5 m_AngularDrag: 0.05 m_GravityScale: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 diff --git a/Assets/AssetsFORELLE/Script/Enemy.cs b/Assets/AssetsFORELLE/Script/Enemy.cs new file mode 100644 index 0000000..efb7d49 --- /dev/null +++ b/Assets/AssetsFORELLE/Script/Enemy.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy : MonoBehaviour +{ + public float maxSpeed; + private Rigidbody2D rb; + private CapsuleCollider2D cc; + private SpriteRenderer sr; + + void Start() + { + rb = GetComponent(); + cc = GetComponent(); + sr = GetComponent(); + + } + + // Update is called once per frame + void FixedUpdate() + { + rb.velocity = new Vector2(maxSpeed, rb.velocity.y); + } + + void OnTriggerEnter2D(Collider2D cc) + { + if (!cc.gameObject.CompareTag("Player")) + { + maxSpeed = -maxSpeed; + sr.flipX = !sr.flipX; + } + } +} diff --git a/Assets/AssetsFORELLE/Script/Enemy.cs.meta b/Assets/AssetsFORELLE/Script/Enemy.cs.meta new file mode 100644 index 0000000..4377822 --- /dev/null +++ b/Assets/AssetsFORELLE/Script/Enemy.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f90e1f9169948b4499e0a5541c86d7bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 360e85b..f73a498 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -1931,12 +1931,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170098608} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -37.797333, y: 2.319295, z: -0.022044204} + m_LocalPosition: {x: 24.89, y: 2.89, z: -0.022044204} m_LocalScale: {x: 0.42547998, y: 0.3653795, z: 0.42548} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1035014977} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &170098617 MonoBehaviour: @@ -2029,7 +2029,7 @@ Transform: - {fileID: 2114933839} - {fileID: 1582341026} m_Father: {fileID: 1317111512} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &334871740 GameObject: @@ -2114,7 +2114,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1035014977} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &334871744 MonoBehaviour: @@ -2303,7 +2303,7 @@ Transform: - {fileID: 1501535135} - {fileID: 2051002549} m_Father: {fileID: 1317111512} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &897012280 PrefabInstance: @@ -3867,6 +3867,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1982712934} - {fileID: 334871743} - {fileID: 170098616} - {fileID: 2030071158} @@ -4060,9 +4061,9 @@ Transform: m_Children: - {fileID: 1642550970} - {fileID: 1362499039} - - {fileID: 1906893165} - {fileID: 828797199} - {fileID: 245296660} + - {fileID: 1434189956} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4093,7 +4094,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: b12d69df31a76da41a897f0fd22561df, type: 3} + m_audioClip: {fileID: 8300000, guid: ba23db2ceb808f84187d8c0a4305c959, type: 3} m_PlayOnAwake: 1 m_Volume: 0.2 m_Pitch: 1 @@ -4192,7 +4193,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1035014977} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1337589129 PrefabInstance: @@ -4334,6 +4335,181 @@ Transform: m_CorrespondingSourceObject: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} m_PrefabInstance: {fileID: 6161590567296525240} m_PrefabAsset: {fileID: 0} +--- !u!1 &1434189951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1434189956} + - component: {fileID: 1434189955} + - component: {fileID: 1434189952} + - component: {fileID: 1434189954} + - component: {fileID: 1434189953} + - component: {fileID: 1434189957} + - component: {fileID: 1434189958} + m_Layer: 0 + m_Name: le_fisch_draft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1434189952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434189951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f90e1f9169948b4499e0a5541c86d7bb, type: 3} + m_Name: + m_EditorClassIdentifier: + maxSpeed: -2 +--- !u!50 &1434189953 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434189951} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!70 &1434189954 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434189951} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.1, y: 0} + m_Size: {x: 1.49, y: 1.76} + m_Direction: 0 +--- !u!212 &1434189955 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434189951} + 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: 63423e7f6209b984398ff319d41fce89, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1434189956 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434189951} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 86.09533, y: -6.6714106, z: 0.11194041} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1317111512} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &1434189957 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434189951} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 0 + m_Points: + - {x: -0.67, y: 0} + - {x: 0.87, y: 0} + m_AdjacentStartPoint: {x: 0, y: 0} + m_AdjacentEndPoint: {x: 0, y: 0} + m_UseAdjacentStartPoint: 0 + m_UseAdjacentEndPoint: 0 +--- !u!114 &1434189958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1434189951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13af0af2052bc354cbdcc5815507a4fe, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 170098608} + respawnPoint: {fileID: 1982712934} --- !u!1 &1501535132 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6161590568038202171, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} @@ -20846,90 +21022,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &1906893163 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1906893165} - - component: {fileID: 1906893164} - m_Layer: 0 - m_Name: meowlin_basic - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1906893164 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1906893163} - 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: af0cf61c310ea5f4cb882f698b58781b, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.32, y: 0.48} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1906893165 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1906893163} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 87.07, y: -6.29, z: 0.11194041} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1317111512} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1977137912 PrefabInstance: m_ObjectHideFlags: 0 @@ -37522,6 +37614,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 6161590568038202173, guid: 9085c8801f3c3c74f8573cccf67a41df, type: 3} m_PrefabInstance: {fileID: 897012280} m_PrefabAsset: {fileID: 0} +--- !u!1 &1982712933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1982712934} + m_Layer: 0 + m_Name: respawnPoint2 + m_TagString: Untagged + m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1982712934 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982712933} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 38.502666, y: 2.3792949, z: -0.055970203} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1035014977} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1994359427 stripped Transform: m_CorrespondingSourceObject: {fileID: 3743697183328372275, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} @@ -37578,7 +37701,7 @@ Transform: m_Children: - {fileID: 1362156812} m_Father: {fileID: 1035014977} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!68 &2032049746 EdgeCollider2D: @@ -37690,7 +37813,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2931262115788872107, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2931262115788872107, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3} propertyPath: m_LocalPosition.x