From 3590f3a09eda34854ff19ea17eb111d23a9eadb5 Mon Sep 17 00:00:00 2001 From: MarcUs7i <96580944+MarcUs7i@users.noreply.github.com> Date: Fri, 4 Oct 2024 11:11:37 +0200 Subject: [PATCH] Refactored & removed bugs in "Bonus" scene Refactored Bonus & Ambulance code Renamed everything in "Bonus" scene, so it's english. Deleted unused GameObjects Merged single-purpose GameObjects --- Assets/game/Scenes/bonus.unity | 764 ++---------------- Assets/game/Scripts/Endlevel.cs | 5 + .../bonus/{Rettung.meta => Ambulance.meta} | 0 Assets/game/bonus/Ambulance/Ambulance.cs | 53 ++ .../Ambulance.cs.meta} | 0 .../Ambulance.prefab} | 80 +- .../Ambulance.prefab.meta} | 0 .../{Rettung => Ambulance}/Animation.meta | 0 .../Animation/Ambulance.controller} | 46 +- .../Animation/Ambulance.controller.meta} | 0 .../{Rettung => Ambulance}/Animation/GFX.meta | 0 .../Animation/GFX/Drive.anim} | 2 +- .../Animation/GFX/Drive.anim.meta} | 0 .../Animation/GFX/GFX.controller | 12 +- .../Animation/GFX/GFX.controller.meta | 0 .../Animation/GFX/Idle.anim | 0 .../Animation/GFX/Idle.anim.meta | 0 .../Animation/GoToPickUpLocation.anim} | 2 +- .../Animation/GoToPickUpLocation.anim.meta} | 0 .../Animation/GoToStation.anim} | 2 +- .../Animation/GoToStation.anim.meta} | 0 .../Animation/PickUpLocationPos.anim} | 2 +- .../Animation/PickUpLocationPos.anim.meta} | 0 .../Animation/StartPos.anim} | 2 +- .../Animation/StartPos.anim.meta} | 0 .../Animation/StationPos.anim} | 2 +- .../Animation/StationPos.anim.meta} | 0 .../bonus/{Rettung => Ambulance}/Sprites.meta | 0 .../{Rettung => Ambulance}/Sprites/Idle.meta | 0 .../Sprites/Idle/BusIdle1.png | Bin .../Sprites/Idle/BusIdle1.png.meta | 0 .../Sprites/Idle/BusIdle2.png | Bin .../Sprites/Idle/BusIdle2.png.meta | 0 .../{Rettung => Ambulance}/Sprites/Run.meta | 0 .../Sprites/Run/BusRun1.png | Bin .../Sprites/Run/BusRun1.png.meta | 0 .../Sprites/Run/BusRun2.png | Bin .../Sprites/Run/BusRun2.png.meta | 0 .../Sprites/Run/Rad.png | Bin .../Sprites/Run/Rad.png.meta | 0 Assets/game/bonus/Bonus.cs | 104 +-- Assets/game/bonus/{Bücher.png => Books.png} | Bin .../bonus/{Bücher.png.meta => Books.png.meta} | 0 .../bonus/Hauer/Animation/Hauer.controller | 14 +- ...topAfter.anim => HauerLayOnTheGround.anim} | 2 +- ...nim.meta => HauerLayOnTheGround.anim.meta} | 0 .../Animation/HauerRun/HauerGFX.controller | 12 +- ...{HauerRun.anim => HauerWalkAnimation.anim} | 2 +- ...anim.meta => HauerWalkAnimation.anim.meta} | 0 ...HauerWalk.anim => HauerWalkTransform.anim} | 2 +- ...anim.meta => HauerWalkTransform.anim.meta} | 0 Assets/game/bonus/Hauer/Hauer.prefab | 35 +- .../bonus/Materials/{Bücher.mat => Books.mat} | 2 +- .../{Bücher.mat.meta => Books.mat.meta} | 0 Assets/game/bonus/Rettung/Rettung.cs | 54 -- UserSettings/Layouts/default-2021.dwlt | 30 +- 56 files changed, 273 insertions(+), 956 deletions(-) rename Assets/game/bonus/{Rettung.meta => Ambulance.meta} (100%) create mode 100644 Assets/game/bonus/Ambulance/Ambulance.cs rename Assets/game/bonus/{Rettung/Rettung.cs.meta => Ambulance/Ambulance.cs.meta} (100%) rename Assets/game/bonus/{Rettung/Rettung.prefab => Ambulance/Ambulance.prefab} (73%) rename Assets/game/bonus/{Rettung/Rettung.prefab.meta => Ambulance/Ambulance.prefab.meta} (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Animation.meta (100%) rename Assets/game/bonus/{Rettung/Animation/Rettung.controller => Ambulance/Animation/Ambulance.controller} (92%) rename Assets/game/bonus/{Rettung/Animation/Rettung.controller.meta => Ambulance/Animation/Ambulance.controller.meta} (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Animation/GFX.meta (100%) rename Assets/game/bonus/{Rettung/Animation/GFX/Run.anim => Ambulance/Animation/GFX/Drive.anim} (99%) rename Assets/game/bonus/{Rettung/Animation/GFX/Run.anim.meta => Ambulance/Animation/GFX/Drive.anim.meta} (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Animation/GFX/GFX.controller (97%) rename Assets/game/bonus/{Rettung => Ambulance}/Animation/GFX/GFX.controller.meta (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Animation/GFX/Idle.anim (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Animation/GFX/Idle.anim.meta (100%) rename Assets/game/bonus/{Rettung/Animation/Run.anim => Ambulance/Animation/GoToPickUpLocation.anim} (99%) rename Assets/game/bonus/{Rettung/Animation/Run.anim.meta => Ambulance/Animation/GoToPickUpLocation.anim.meta} (100%) rename Assets/game/bonus/{Rettung/Animation/RunAfter.anim => Ambulance/Animation/GoToStation.anim} (99%) rename Assets/game/bonus/{Rettung/Animation/RunAfter.anim.meta => Ambulance/Animation/GoToStation.anim.meta} (100%) rename Assets/game/bonus/{Rettung/Animation/IdleAfter.anim => Ambulance/Animation/PickUpLocationPos.anim} (99%) rename Assets/game/bonus/{Rettung/Animation/IdleAfter.anim.meta => Ambulance/Animation/PickUpLocationPos.anim.meta} (100%) rename Assets/game/bonus/{Rettung/Animation/Idle.anim => Ambulance/Animation/StartPos.anim} (99%) rename Assets/game/bonus/{Rettung/Animation/Idle.anim.meta => Ambulance/Animation/StartPos.anim.meta} (100%) rename Assets/game/bonus/{Rettung/Animation/IdleAfterAfter.anim => Ambulance/Animation/StationPos.anim} (99%) rename Assets/game/bonus/{Rettung/Animation/IdleAfterAfter.anim.meta => Ambulance/Animation/StationPos.anim.meta} (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites.meta (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Idle.meta (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Idle/BusIdle1.png (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Idle/BusIdle1.png.meta (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Idle/BusIdle2.png (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Idle/BusIdle2.png.meta (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Run.meta (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Run/BusRun1.png (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Run/BusRun1.png.meta (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Run/BusRun2.png (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Run/BusRun2.png.meta (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Run/Rad.png (100%) rename Assets/game/bonus/{Rettung => Ambulance}/Sprites/Run/Rad.png.meta (100%) rename Assets/game/bonus/{Bücher.png => Books.png} (100%) rename Assets/game/bonus/{Bücher.png.meta => Books.png.meta} (100%) rename Assets/game/bonus/Hauer/Animation/{HauerStopAfter.anim => HauerLayOnTheGround.anim} (99%) rename Assets/game/bonus/Hauer/Animation/{HauerStopAfter.anim.meta => HauerLayOnTheGround.anim.meta} (100%) rename Assets/game/bonus/Hauer/Animation/HauerRun/{HauerRun.anim => HauerWalkAnimation.anim} (98%) rename Assets/game/bonus/Hauer/Animation/HauerRun/{HauerRun.anim.meta => HauerWalkAnimation.anim.meta} (100%) rename Assets/game/bonus/Hauer/Animation/{HauerWalk.anim => HauerWalkTransform.anim} (99%) rename Assets/game/bonus/Hauer/Animation/{HauerWalk.anim.meta => HauerWalkTransform.anim.meta} (100%) rename Assets/game/bonus/Materials/{Bücher.mat => Books.mat} (97%) rename Assets/game/bonus/Materials/{Bücher.mat.meta => Books.mat.meta} (100%) delete mode 100644 Assets/game/bonus/Rettung/Rettung.cs diff --git a/Assets/game/Scenes/bonus.unity b/Assets/game/Scenes/bonus.unity index c7205a8..4cb2ca3 100644 --- a/Assets/game/Scenes/bonus.unity +++ b/Assets/game/Scenes/bonus.unity @@ -186,97 +186,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 40152486} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.0599995, y: 2.6100001, z: -10} + m_LocalPosition: {x: 1.0599992, y: 2.6100001, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1072766135} m_Father: {fileID: 0} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &45610584 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 45610586} - - component: {fileID: 45610585} - m_Layer: 0 - m_Name: tree - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &45610585 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 45610584} - 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: 4294967295 - 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: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1514542333 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 6.5625, y: 5.8125} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &45610586 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 45610584} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.86, y: 0.9, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 981602204} - m_RootOrder: 1 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &73692857 GameObject: @@ -1522,32 +1438,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4d790f502f90764bb3d4c02870b98a7, type: 3} m_Name: m_EditorClassIdentifier: - scenes: - - Start - - LevelSelect - - levelTutorial - - level1 - - level2 - - level3 - - level4 - - level5 - - level6 - - level7 - - level8 - - level9 - - level10 - - level11 - - level12 - - level13 - - level14 - - level15 - - level16 - - level17 - - level18 - - level19 - - level20 - - bonus - - About standardUI: [] secondUI: [] changeWhenEnabledUI: [] @@ -1874,64 +1764,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &558505202 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 558505204} - - component: {fileID: 558505203} - m_Layer: 0 - m_Name: LeftCorner (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &558505203 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558505202} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 4.92172} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 13.528014} - m_EdgeRadius: 0 ---- !u!4 &558505204 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558505202} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 11.37, y: -26.26, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 16 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &603438398 PrefabInstance: m_ObjectHideFlags: 0 @@ -2139,92 +1971,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &645211060 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 645211061} - - component: {fileID: 645211062} - m_Layer: 0 - m_Name: middle (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &645211061 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645211060} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5.79, y: -10.41, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 981602204} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &645211062 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645211060} - 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: 4294967295 - 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: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1514542333 - m_SortingLayer: -1 - m_SortingOrder: -2 - m_Sprite: {fileID: 21300000, guid: de41d366c687a46beb6a9acaa88c12db, 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.76, y: 3.68} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &676821073 GameObject: m_ObjectHideFlags: 0 @@ -2235,8 +1983,9 @@ GameObject: m_Component: - component: {fileID: 676821075} - component: {fileID: 676821074} + - component: {fileID: 676821076} m_Layer: 0 - m_Name: LeftCorner (3) + m_Name: Barrier m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2281,8 +2030,34 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &676821076 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676821073} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -3.38, y: 4.92172} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 13.528014} + m_EdgeRadius: 0 --- !u!1 &685855898 GameObject: m_ObjectHideFlags: 0 @@ -2474,7 +2249,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &716075350 GameObject: @@ -2518,7 +2293,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &753311475 GameObject: @@ -2966,7 +2741,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &800220548 MonoBehaviour: @@ -3988,43 +3763,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 978472721} m_CullTransparentMesh: 1 ---- !u!1 &981602203 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 981602204} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &981602204 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 981602203} - 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: 1530690153} - - {fileID: 45610586} - - {fileID: 1094785914} - - {fileID: 1628621310} - - {fileID: 1650943673} - - {fileID: 645211061} - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &982140081 PrefabInstance: m_ObjectHideFlags: 0 @@ -4181,7 +3919,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000398609} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.0599995, y: 2.6100001, z: -10} + m_LocalPosition: {x: 1.0599992, y: 2.6100001, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4192,7 +3930,7 @@ Transform: - {fileID: 774511787} - {fileID: 1330716230} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1000398613 MonoBehaviour: @@ -4983,91 +4721,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1094785912 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1094785914} - - component: {fileID: 1094785913} - m_Layer: 0 - m_Name: middle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1094785913 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094785912} - 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: 4294967295 - 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: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1514542333 - m_SortingLayer: -1 - m_SortingOrder: -2 - m_Sprite: {fileID: 21300000, guid: de41d366c687a46beb6a9acaa88c12db, 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.76, y: 3.68} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1094785914 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094785912} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.73, y: -8.61, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 981602204} - m_RootOrder: 2 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1119173788 GameObject: @@ -10661,7 +10315,7 @@ GameObject: - component: {fileID: 1511595344} - component: {fileID: 1511595345} m_Layer: 0 - m_Name: "B\xFCcher" + m_Name: Books m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10732,7 +10386,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!70 &1511595344 CapsuleCollider2D: @@ -10870,90 +10524,6 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_IsOn: 1 ---- !u!1 &1530690151 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1530690153} - - component: {fileID: 1530690152} - m_Layer: 0 - m_Name: house - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1530690152 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1530690151} - 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: 4294967295 - 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: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1514542333 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 52422ada2db954026a3ae1f1ba6b4486, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.4375, y: 6.75} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1530690153 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1530690151} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 12.67, y: 1.32, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 981602204} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1544174294 GameObject: m_ObjectHideFlags: 0 @@ -11213,7 +10783,6 @@ MonoBehaviour: m_EditorClassIdentifier: levelToLoad: About sceneFader: {fileID: 301995584} - SetLevel: 21 --- !u!61 &1587070610 BoxCollider2D: m_ObjectHideFlags: 0 @@ -11253,7 +10822,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1591751032 GameObject: @@ -11426,90 +10995,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 ---- !u!1 &1628621308 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1628621310} - - component: {fileID: 1628621309} - m_Layer: 0 - m_Name: middle (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1628621309 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1628621308} - 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: 4294967295 - 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: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1514542333 - m_SortingLayer: -1 - m_SortingOrder: -2 - m_Sprite: {fileID: 21300000, guid: de41d366c687a46beb6a9acaa88c12db, 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.76, y: 3.68} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1628621310 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1628621308} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 10.4, y: -7.42, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 981602204} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1644123156 GameObject: m_ObjectHideFlags: 0 @@ -11645,90 +11130,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1644123156} m_CullTransparentMesh: 1 ---- !u!1 &1650943671 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1650943673} - - component: {fileID: 1650943672} - m_Layer: 0 - m_Name: bush - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1650943672 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1650943671} - 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: 4294967295 - 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: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1514542333 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: ecc204495234d40f091d828790c56287, 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.875, y: 1.75} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1650943673 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1650943671} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 7.04, y: -1.2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 981602204} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1726973743 GameObject: m_ObjectHideFlags: 0 @@ -11935,7 +11336,7 @@ Transform: m_Children: - {fileID: 1553115759} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!850595691 &1784006811 LightingSettings: @@ -26276,7 +25677,7 @@ RectTransform: - {fileID: 978472722} - {fileID: 1170870014} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -26513,7 +25914,7 @@ GameObject: - component: {fileID: 2070528550} - component: {fileID: 2070528549} m_Layer: 0 - m_Name: 'Clouds Note: 15.841 space between' + m_Name: Clouds m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -26553,7 +25954,7 @@ Transform: - {fileID: 261715621} - {fileID: 771662342} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2122740555 GameObject: @@ -26678,36 +26079,32 @@ PrefabInstance: m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} - propertyPath: FireButton - value: - objectReference: {fileID: 978472721} - - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} - propertyPath: JumpButton - value: - objectReference: {fileID: 230786308} - - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} - propertyPath: LeftButton - value: - objectReference: {fileID: 73692857} - - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} - propertyPath: sceneFader - value: - objectReference: {fileID: 301995584} - - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} - propertyPath: PauseButton + propertyPath: disableObjects.Array.data[0] value: objectReference: {fileID: 188445219} - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} - propertyPath: RightButton + propertyPath: disableObjects.Array.data[1] + value: + objectReference: {fileID: 73692857} + - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} + propertyPath: disableObjects.Array.data[2] value: objectReference: {fileID: 753311475} - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} - propertyPath: CrouchButton + propertyPath: disableObjects.Array.data[3] + value: + objectReference: {fileID: 230786308} + - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} + propertyPath: disableObjects.Array.data[4] value: objectReference: {fileID: 1082662665} + - target: {fileID: 4976842300819991897, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} + propertyPath: disableObjects.Array.data[5] + value: + objectReference: {fileID: 978472721} - target: {fileID: 5947294273481416654, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} propertyPath: m_RootOrder - value: 19 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5947294273481416654, guid: 992ff14f8425b36498d0cb7fd3bf5474, type: 3} propertyPath: m_LocalPosition.x @@ -26762,41 +26159,9 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2336882788098066888, guid: b92ade8210d0041498ed6095031f9d98, type: 3} - propertyPath: m_Size.x - value: 8.9 - objectReference: {fileID: 0} - - target: {fileID: 2336882788098066888, guid: b92ade8210d0041498ed6095031f9d98, type: 3} - propertyPath: m_Size.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2336882788098066888, guid: b92ade8210d0041498ed6095031f9d98, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 224db5a7eb11e0e44b1a68f3bfa73a3b, type: 3} - - target: {fileID: 2336882788098066888, guid: b92ade8210d0041498ed6095031f9d98, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2336882788098066888, guid: b92ade8210d0041498ed6095031f9d98, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3060036587874450206, guid: b92ade8210d0041498ed6095031f9d98, type: 3} - propertyPath: m_SortingOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4765247112495655858, guid: b92ade8210d0041498ed6095031f9d98, type: 3} - propertyPath: wait1 - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4765247112495655858, guid: b92ade8210d0041498ed6095031f9d98, type: 3} - propertyPath: wait3 - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5550679522902189044, guid: b92ade8210d0041498ed6095031f9d98, type: 3} propertyPath: m_RootOrder - value: 18 + value: 17 objectReference: {fileID: 0} - target: {fileID: 5550679522902189044, guid: b92ade8210d0041498ed6095031f9d98, type: 3} propertyPath: m_LocalPosition.x @@ -26840,8 +26205,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5708917856631153393, guid: b92ade8210d0041498ed6095031f9d98, type: 3} propertyPath: m_Name - value: Rettung + value: Ambulance objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 3060036587874450206, guid: b92ade8210d0041498ed6095031f9d98, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b92ade8210d0041498ed6095031f9d98, type: 3} diff --git a/Assets/game/Scripts/Endlevel.cs b/Assets/game/Scripts/Endlevel.cs index 65591ec..48c9d8d 100644 --- a/Assets/game/Scripts/Endlevel.cs +++ b/Assets/game/Scripts/Endlevel.cs @@ -52,6 +52,11 @@ public class Endlevel : MonoBehaviour public int GetValueForSetLevel() { + if(!levelToLoad.StartsWith("level")) + { + return 0; + } + string levelInString = ""; for(int i = 0; i < levelToLoad.Length; i++) { diff --git a/Assets/game/bonus/Rettung.meta b/Assets/game/bonus/Ambulance.meta similarity index 100% rename from Assets/game/bonus/Rettung.meta rename to Assets/game/bonus/Ambulance.meta diff --git a/Assets/game/bonus/Ambulance/Ambulance.cs b/Assets/game/bonus/Ambulance/Ambulance.cs new file mode 100644 index 0000000..610ceb3 --- /dev/null +++ b/Assets/game/bonus/Ambulance/Ambulance.cs @@ -0,0 +1,53 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Ambulance : MonoBehaviour +{ + private Animator animator; + private Animator GFX; + public bool allowedToKillHauer = false; + + [Header("Timings")] + public float timeToDriveToPickUpLocation = 1.0f; + public float timeToWaitAtPickUp = 2.0f; + public float timeToDriveToStation = 1.0f; + public float timeout = 1.1f; + + void Start() + { + animator = GetComponent(); + GFX = transform.GetChild(0).GetComponent(); + } + + public IEnumerator Script() + { + yield return new WaitForSeconds(timeout); + + animator.SetBool("GoToPickUpLocation", true); + GFX.SetBool("Drive", true); + + yield return new WaitForSeconds(timeToDriveToPickUpLocation); + + animator.SetBool("GoToPickUpLocation", false); + GFX.SetBool("Drive", false); + + animator.SetBool("StayAtPickUpLocation", true); + + allowedToKillHauer = true; + + yield return new WaitForSeconds(timeToWaitAtPickUp); + + animator.SetBool("StayAtPickUpLocation", false); + GFX.SetBool("Drive", true); + animator.SetBool("GoToStation", true); + + yield return new WaitForSeconds(timeToDriveToStation); + + animator.SetBool("GoToStation", false); + GFX.SetBool("Drive", false); + animator.SetBool("StayAtStation", true); + + } +} diff --git a/Assets/game/bonus/Rettung/Rettung.cs.meta b/Assets/game/bonus/Ambulance/Ambulance.cs.meta similarity index 100% rename from Assets/game/bonus/Rettung/Rettung.cs.meta rename to Assets/game/bonus/Ambulance/Ambulance.cs.meta diff --git a/Assets/game/bonus/Rettung/Rettung.prefab b/Assets/game/bonus/Ambulance/Ambulance.prefab similarity index 73% rename from Assets/game/bonus/Rettung/Rettung.prefab rename to Assets/game/bonus/Ambulance/Ambulance.prefab index a2e851e..5187e20 100644 --- a/Assets/game/bonus/Rettung/Rettung.prefab +++ b/Assets/game/bonus/Ambulance/Ambulance.prefab @@ -35,7 +35,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &3834402009896968556 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -52,7 +52,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!212 &2336882788098066888 SpriteRenderer: m_ObjectHideFlags: 0 @@ -93,16 +94,16 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 0} + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: 224db5a7eb11e0e44b1a68f3bfa73a3b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 8.9, y: 5} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &5708917856631153393 @@ -114,11 +115,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5550679522902189044} - - component: {fileID: 3060036587874450206} - component: {fileID: 1820480247221061975} - component: {fileID: 4765247112495655858} m_Layer: 0 - m_Name: Rettung + m_Name: Ambulance m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -140,61 +140,9 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3060036587874450206 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5708917856631153393} - 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: 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: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 1038dbc91c011524db063adea2de7982, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 8.9, y: 5} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!95 &1820480247221061975 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -211,7 +159,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &4765247112495655858 MonoBehaviour: m_ObjectHideFlags: 0 @@ -224,5 +173,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb136f9d0e025c6408eb953014fd2e42, type: 3} m_Name: m_EditorClassIdentifier: - animator: {fileID: 1820480247221061975} - GFX: {fileID: 3834402009896968556} + allowedToKillHauer: 0 + timeToDriveToPickUpLocation: 1 + timeToWaitAtPickUp: 2 + timeToDriveToStation: 1 + timeout: 1.1 diff --git a/Assets/game/bonus/Rettung/Rettung.prefab.meta b/Assets/game/bonus/Ambulance/Ambulance.prefab.meta similarity index 100% rename from Assets/game/bonus/Rettung/Rettung.prefab.meta rename to Assets/game/bonus/Ambulance/Ambulance.prefab.meta diff --git a/Assets/game/bonus/Rettung/Animation.meta b/Assets/game/bonus/Ambulance/Animation.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation.meta rename to Assets/game/bonus/Ambulance/Animation.meta diff --git a/Assets/game/bonus/Rettung/Animation/Rettung.controller b/Assets/game/bonus/Ambulance/Animation/Ambulance.controller similarity index 92% rename from Assets/game/bonus/Rettung/Animation/Rettung.controller rename to Assets/game/bonus/Ambulance/Animation/Ambulance.controller index 4d31bef..fd4db40 100644 --- a/Assets/game/bonus/Rettung/Animation/Rettung.controller +++ b/Assets/game/bonus/Ambulance/Animation/Ambulance.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Run + m_Name: GoToPickUpLocation m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -36,10 +36,10 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: RunAfter + m_ConditionEvent: GoToStation m_EventTreshold: 0 - m_ConditionMode: 2 - m_ConditionEvent: IdleAfter + m_ConditionEvent: StayAtPickUpLocation m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 39560242735867865} @@ -62,7 +62,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle + m_Name: StartPos m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -87,33 +87,33 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Rettung + m_Name: Ambulance serializedVersion: 5 m_AnimatorParameters: - - m_Name: Run + - m_Name: GoToPickUpLocation m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: IdleAfter + m_Controller: {fileID: 0} + - m_Name: StayAtPickUpLocation m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: RunAfter + m_Controller: {fileID: 0} + - m_Name: GoToStation m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: IdleAfterAfter + m_Controller: {fileID: 0} + - m_Name: StayAtStation m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -134,7 +134,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RunAfter + m_Name: GoToStation m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -163,7 +163,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Run + m_ConditionEvent: GoToPickUpLocation m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -3818453853444625711} @@ -223,10 +223,10 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: IdleAfter + m_ConditionEvent: StayAtPickUpLocation m_EventTreshold: 0 - m_ConditionMode: 2 - m_ConditionEvent: Run + m_ConditionEvent: GoToPickUpLocation m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3577931333472580055} @@ -249,7 +249,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: IdleAfter + m_Name: PickUpLocationPos m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -278,10 +278,10 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: Run + m_ConditionEvent: GoToPickUpLocation m_EventTreshold: 0 - m_ConditionMode: 2 - m_ConditionEvent: IdleAfterAfter + m_ConditionEvent: StayAtStation m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -1563684429154557748} @@ -306,10 +306,10 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: IdleAfterAfter + m_ConditionEvent: StayAtStation m_EventTreshold: 0 - m_ConditionMode: 2 - m_ConditionEvent: RunAfter + m_ConditionEvent: GoToStation m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 9146907305561845000} @@ -332,7 +332,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: IdleAfterAfter + m_Name: StationPos m_Speed: 1 m_CycleOffset: 0 m_Transitions: diff --git a/Assets/game/bonus/Rettung/Animation/Rettung.controller.meta b/Assets/game/bonus/Ambulance/Animation/Ambulance.controller.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/Rettung.controller.meta rename to Assets/game/bonus/Ambulance/Animation/Ambulance.controller.meta diff --git a/Assets/game/bonus/Rettung/Animation/GFX.meta b/Assets/game/bonus/Ambulance/Animation/GFX.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/GFX.meta rename to Assets/game/bonus/Ambulance/Animation/GFX.meta diff --git a/Assets/game/bonus/Rettung/Animation/GFX/Run.anim b/Assets/game/bonus/Ambulance/Animation/GFX/Drive.anim similarity index 99% rename from Assets/game/bonus/Rettung/Animation/GFX/Run.anim rename to Assets/game/bonus/Ambulance/Animation/GFX/Drive.anim index 1ce27d5..929419b 100644 --- a/Assets/game/bonus/Rettung/Animation/GFX/Run.anim +++ b/Assets/game/bonus/Ambulance/Animation/GFX/Drive.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Run + m_Name: Drive serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/game/bonus/Rettung/Animation/GFX/Run.anim.meta b/Assets/game/bonus/Ambulance/Animation/GFX/Drive.anim.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/GFX/Run.anim.meta rename to Assets/game/bonus/Ambulance/Animation/GFX/Drive.anim.meta diff --git a/Assets/game/bonus/Rettung/Animation/GFX/GFX.controller b/Assets/game/bonus/Ambulance/Animation/GFX/GFX.controller similarity index 97% rename from Assets/game/bonus/Rettung/Animation/GFX/GFX.controller rename to Assets/game/bonus/Ambulance/Animation/GFX/GFX.controller index d29e136..f02e287 100644 --- a/Assets/game/bonus/Rettung/Animation/GFX/GFX.controller +++ b/Assets/game/bonus/Ambulance/Animation/GFX/GFX.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Run + m_Name: Drive m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -35,8 +35,8 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: Stop + - m_ConditionMode: 1 + m_ConditionEvent: Drive m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -9162389566719547218} @@ -61,7 +61,7 @@ AnimatorController: m_Name: GFX serializedVersion: 5 m_AnimatorParameters: - - m_Name: Stop + - m_Name: Drive m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 @@ -114,8 +114,8 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Stop + - m_ConditionMode: 2 + m_ConditionEvent: Drive m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 8449029228399072143} diff --git a/Assets/game/bonus/Rettung/Animation/GFX/GFX.controller.meta b/Assets/game/bonus/Ambulance/Animation/GFX/GFX.controller.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/GFX/GFX.controller.meta rename to Assets/game/bonus/Ambulance/Animation/GFX/GFX.controller.meta diff --git a/Assets/game/bonus/Rettung/Animation/GFX/Idle.anim b/Assets/game/bonus/Ambulance/Animation/GFX/Idle.anim similarity index 100% rename from Assets/game/bonus/Rettung/Animation/GFX/Idle.anim rename to Assets/game/bonus/Ambulance/Animation/GFX/Idle.anim diff --git a/Assets/game/bonus/Rettung/Animation/GFX/Idle.anim.meta b/Assets/game/bonus/Ambulance/Animation/GFX/Idle.anim.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/GFX/Idle.anim.meta rename to Assets/game/bonus/Ambulance/Animation/GFX/Idle.anim.meta diff --git a/Assets/game/bonus/Rettung/Animation/Run.anim b/Assets/game/bonus/Ambulance/Animation/GoToPickUpLocation.anim similarity index 99% rename from Assets/game/bonus/Rettung/Animation/Run.anim rename to Assets/game/bonus/Ambulance/Animation/GoToPickUpLocation.anim index 9f40773..6e126c3 100644 --- a/Assets/game/bonus/Rettung/Animation/Run.anim +++ b/Assets/game/bonus/Ambulance/Animation/GoToPickUpLocation.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Run + m_Name: GoToPickUpLocation serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/game/bonus/Rettung/Animation/Run.anim.meta b/Assets/game/bonus/Ambulance/Animation/GoToPickUpLocation.anim.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/Run.anim.meta rename to Assets/game/bonus/Ambulance/Animation/GoToPickUpLocation.anim.meta diff --git a/Assets/game/bonus/Rettung/Animation/RunAfter.anim b/Assets/game/bonus/Ambulance/Animation/GoToStation.anim similarity index 99% rename from Assets/game/bonus/Rettung/Animation/RunAfter.anim rename to Assets/game/bonus/Ambulance/Animation/GoToStation.anim index fa22fb4..4bde16e 100644 --- a/Assets/game/bonus/Rettung/Animation/RunAfter.anim +++ b/Assets/game/bonus/Ambulance/Animation/GoToStation.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RunAfter + m_Name: GoToStation serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/game/bonus/Rettung/Animation/RunAfter.anim.meta b/Assets/game/bonus/Ambulance/Animation/GoToStation.anim.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/RunAfter.anim.meta rename to Assets/game/bonus/Ambulance/Animation/GoToStation.anim.meta diff --git a/Assets/game/bonus/Rettung/Animation/IdleAfter.anim b/Assets/game/bonus/Ambulance/Animation/PickUpLocationPos.anim similarity index 99% rename from Assets/game/bonus/Rettung/Animation/IdleAfter.anim rename to Assets/game/bonus/Ambulance/Animation/PickUpLocationPos.anim index 84abd30..685c642 100644 --- a/Assets/game/bonus/Rettung/Animation/IdleAfter.anim +++ b/Assets/game/bonus/Ambulance/Animation/PickUpLocationPos.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: IdleAfter + m_Name: PickUpLocationPos serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/game/bonus/Rettung/Animation/IdleAfter.anim.meta b/Assets/game/bonus/Ambulance/Animation/PickUpLocationPos.anim.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/IdleAfter.anim.meta rename to Assets/game/bonus/Ambulance/Animation/PickUpLocationPos.anim.meta diff --git a/Assets/game/bonus/Rettung/Animation/Idle.anim b/Assets/game/bonus/Ambulance/Animation/StartPos.anim similarity index 99% rename from Assets/game/bonus/Rettung/Animation/Idle.anim rename to Assets/game/bonus/Ambulance/Animation/StartPos.anim index 96c9edd..0dd094a 100644 --- a/Assets/game/bonus/Rettung/Animation/Idle.anim +++ b/Assets/game/bonus/Ambulance/Animation/StartPos.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle + m_Name: StartPos serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/game/bonus/Rettung/Animation/Idle.anim.meta b/Assets/game/bonus/Ambulance/Animation/StartPos.anim.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/Idle.anim.meta rename to Assets/game/bonus/Ambulance/Animation/StartPos.anim.meta diff --git a/Assets/game/bonus/Rettung/Animation/IdleAfterAfter.anim b/Assets/game/bonus/Ambulance/Animation/StationPos.anim similarity index 99% rename from Assets/game/bonus/Rettung/Animation/IdleAfterAfter.anim rename to Assets/game/bonus/Ambulance/Animation/StationPos.anim index 22b649c..a47963c 100644 --- a/Assets/game/bonus/Rettung/Animation/IdleAfterAfter.anim +++ b/Assets/game/bonus/Ambulance/Animation/StationPos.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: IdleAfterAfter + m_Name: StationPos serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/game/bonus/Rettung/Animation/IdleAfterAfter.anim.meta b/Assets/game/bonus/Ambulance/Animation/StationPos.anim.meta similarity index 100% rename from Assets/game/bonus/Rettung/Animation/IdleAfterAfter.anim.meta rename to Assets/game/bonus/Ambulance/Animation/StationPos.anim.meta diff --git a/Assets/game/bonus/Rettung/Sprites.meta b/Assets/game/bonus/Ambulance/Sprites.meta similarity index 100% rename from Assets/game/bonus/Rettung/Sprites.meta rename to Assets/game/bonus/Ambulance/Sprites.meta diff --git a/Assets/game/bonus/Rettung/Sprites/Idle.meta b/Assets/game/bonus/Ambulance/Sprites/Idle.meta similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Idle.meta rename to Assets/game/bonus/Ambulance/Sprites/Idle.meta diff --git a/Assets/game/bonus/Rettung/Sprites/Idle/BusIdle1.png b/Assets/game/bonus/Ambulance/Sprites/Idle/BusIdle1.png similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Idle/BusIdle1.png rename to Assets/game/bonus/Ambulance/Sprites/Idle/BusIdle1.png diff --git a/Assets/game/bonus/Rettung/Sprites/Idle/BusIdle1.png.meta b/Assets/game/bonus/Ambulance/Sprites/Idle/BusIdle1.png.meta similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Idle/BusIdle1.png.meta rename to Assets/game/bonus/Ambulance/Sprites/Idle/BusIdle1.png.meta diff --git a/Assets/game/bonus/Rettung/Sprites/Idle/BusIdle2.png b/Assets/game/bonus/Ambulance/Sprites/Idle/BusIdle2.png similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Idle/BusIdle2.png rename to Assets/game/bonus/Ambulance/Sprites/Idle/BusIdle2.png diff --git a/Assets/game/bonus/Rettung/Sprites/Idle/BusIdle2.png.meta b/Assets/game/bonus/Ambulance/Sprites/Idle/BusIdle2.png.meta similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Idle/BusIdle2.png.meta rename to Assets/game/bonus/Ambulance/Sprites/Idle/BusIdle2.png.meta diff --git a/Assets/game/bonus/Rettung/Sprites/Run.meta b/Assets/game/bonus/Ambulance/Sprites/Run.meta similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Run.meta rename to Assets/game/bonus/Ambulance/Sprites/Run.meta diff --git a/Assets/game/bonus/Rettung/Sprites/Run/BusRun1.png b/Assets/game/bonus/Ambulance/Sprites/Run/BusRun1.png similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Run/BusRun1.png rename to Assets/game/bonus/Ambulance/Sprites/Run/BusRun1.png diff --git a/Assets/game/bonus/Rettung/Sprites/Run/BusRun1.png.meta b/Assets/game/bonus/Ambulance/Sprites/Run/BusRun1.png.meta similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Run/BusRun1.png.meta rename to Assets/game/bonus/Ambulance/Sprites/Run/BusRun1.png.meta diff --git a/Assets/game/bonus/Rettung/Sprites/Run/BusRun2.png b/Assets/game/bonus/Ambulance/Sprites/Run/BusRun2.png similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Run/BusRun2.png rename to Assets/game/bonus/Ambulance/Sprites/Run/BusRun2.png diff --git a/Assets/game/bonus/Rettung/Sprites/Run/BusRun2.png.meta b/Assets/game/bonus/Ambulance/Sprites/Run/BusRun2.png.meta similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Run/BusRun2.png.meta rename to Assets/game/bonus/Ambulance/Sprites/Run/BusRun2.png.meta diff --git a/Assets/game/bonus/Rettung/Sprites/Run/Rad.png b/Assets/game/bonus/Ambulance/Sprites/Run/Rad.png similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Run/Rad.png rename to Assets/game/bonus/Ambulance/Sprites/Run/Rad.png diff --git a/Assets/game/bonus/Rettung/Sprites/Run/Rad.png.meta b/Assets/game/bonus/Ambulance/Sprites/Run/Rad.png.meta similarity index 100% rename from Assets/game/bonus/Rettung/Sprites/Run/Rad.png.meta rename to Assets/game/bonus/Ambulance/Sprites/Run/Rad.png.meta diff --git a/Assets/game/bonus/Bonus.cs b/Assets/game/bonus/Bonus.cs index 704d5b7..b243360 100644 --- a/Assets/game/bonus/Bonus.cs +++ b/Assets/game/bonus/Bonus.cs @@ -5,44 +5,46 @@ using UnityEngine.UI; public class Bonus : MonoBehaviour { - public Transform Hauer; - public GameObject PauseButton; - public GameObject LeftButton; - public GameObject RightButton; - public GameObject JumpButton; - public GameObject CrouchButton; - public GameObject FireButton; + private Transform Hauer; + public GameObject[] disableObjects; private Transform player; - private Rigidbody2D rb; + private Animator animator; + private Animator GFX; + private Transform childTransform; + private MainMenu mainMenu; + private Ambulance ambulance; + + public static bool BonusForJump = false; + + [Header("Settings")] public float range = 15f; public float speed = 5f; - public static bool BonusForJump = false; - public Animator animator; - public Animator GFX; - bool walk = true; - bool start = true; - public float wait1 = 3f; - public float wait2 = 1f; - public float waitAfter = 5.0f; - public Transform childTransform; - public SceneFader sceneFader; - public string levelToLoad = "About"; + [Header("Timings")] + public float secondsToWalk = 3f; + public float secondsToFall = 0.5f; + public float timeout = 7.0f; + + bool walk = true; + bool isCoroutineRunning = false; - // Start is called before the first frame update void Start() { player = GameObject.FindGameObjectWithTag("Player").transform; + Hauer = this.GetComponent(); + childTransform = Hauer.GetChild(0); + mainMenu = GameObject.FindObjectOfType().GetComponent(); + + animator = GetComponent(); + GFX = childTransform.GetComponent(); + + ambulance = GameObject.FindObjectOfType().GetComponent(); - // get the enemy's Rigidbody2D component - rb = GetComponent(); BonusForJump = false; walk = false; - start = true; - GFX.SetBool("Stop", false); + GFX.SetBool("WalkAnimation", walk); } - // Update is called once per frame void Update() { float distance = Vector2.Distance(transform.position, player.position); @@ -50,28 +52,21 @@ public class Bonus : MonoBehaviour { Vector3 newPosition = new Vector3(12.60997f, -20.81544f, 0f); player.transform.position = newPosition; - PauseButton.SetActive(false); - LeftButton.SetActive(false); - RightButton.SetActive(false); - JumpButton.SetActive(false); - CrouchButton.SetActive(false); - FireButton.SetActive(false); + foreach (GameObject disableObject in disableObjects) + { + disableObject.SetActive(false); + } BonusForJump = true; - if (walk) - { - animator.SetBool("Walk", true); - } - if (!walk) - { - animator.SetBool("Walk", false); - } - if (start) + + animator.SetBool("WalkTransform", walk); + + if (!isCoroutineRunning) { StartCoroutine(StartWalk()); } - if (Rettung.finished) + if (ambulance.allowedToKillHauer) { - Rettung.finished = false; + ambulance.allowedToKillHauer = false; Destroy(childTransform.gameObject); } @@ -80,21 +75,26 @@ public class Bonus : MonoBehaviour IEnumerator StartWalk() { - GFX.SetBool("Stop", false); - start = false; + isCoroutineRunning = true; walk = true; - yield return new WaitForSeconds(wait1); + GFX.SetBool("WalkAnimation", walk); + + yield return new WaitForSeconds(secondsToWalk); + walk = false; - GFX.SetBool("Stop", true); + GFX.SetBool("WalkAnimation", walk); animator.SetBool("Fall", true); - yield return new WaitForSeconds(wait2); + + yield return new WaitForSeconds(secondsToFall); + animator.SetBool("Fall", false); - animator.SetBool("After", true); - Rettung.runScript = true; - yield return new WaitForSeconds(waitAfter); + animator.SetBool("LayOnTheGround", true); + StartCoroutine(ambulance.Script()); + + yield return new WaitForSeconds(timeout); + BonusForJump = false; - sceneFader.FadeTo(levelToLoad); - MainMenu.ExitLevel = true; + mainMenu.About(); } } diff --git a/Assets/game/bonus/Bücher.png b/Assets/game/bonus/Books.png similarity index 100% rename from Assets/game/bonus/Bücher.png rename to Assets/game/bonus/Books.png diff --git a/Assets/game/bonus/Bücher.png.meta b/Assets/game/bonus/Books.png.meta similarity index 100% rename from Assets/game/bonus/Bücher.png.meta rename to Assets/game/bonus/Books.png.meta diff --git a/Assets/game/bonus/Hauer/Animation/Hauer.controller b/Assets/game/bonus/Hauer/Animation/Hauer.controller index c71378d..5915e39 100644 --- a/Assets/game/bonus/Hauer/Animation/Hauer.controller +++ b/Assets/game/bonus/Hauer/Animation/Hauer.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HauerWalk + m_Name: HauerWalkTransform m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -36,7 +36,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Walk + m_ConditionEvent: WalkTransform m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -8024368682105591918} @@ -61,7 +61,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: After + m_ConditionEvent: LayOnTheGround m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 2855621616197946300} @@ -145,13 +145,13 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} - - m_Name: Walk + - m_Name: WalkTransform m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} - - m_Name: After + - m_Name: LayOnTheGround m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 @@ -177,7 +177,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HauerStopAfter + m_Name: HauerLayOnTheGround m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -208,7 +208,7 @@ AnimatorStateTransition: m_ConditionEvent: Fall m_EventTreshold: 0 - m_ConditionMode: 2 - m_ConditionEvent: Walk + m_ConditionEvent: WalkTransform m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -1556760932064216971} diff --git a/Assets/game/bonus/Hauer/Animation/HauerStopAfter.anim b/Assets/game/bonus/Hauer/Animation/HauerLayOnTheGround.anim similarity index 99% rename from Assets/game/bonus/Hauer/Animation/HauerStopAfter.anim rename to Assets/game/bonus/Hauer/Animation/HauerLayOnTheGround.anim index d65058e..fe110e3 100644 --- a/Assets/game/bonus/Hauer/Animation/HauerStopAfter.anim +++ b/Assets/game/bonus/Hauer/Animation/HauerLayOnTheGround.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HauerStopAfter + m_Name: HauerLayOnTheGround serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/game/bonus/Hauer/Animation/HauerStopAfter.anim.meta b/Assets/game/bonus/Hauer/Animation/HauerLayOnTheGround.anim.meta similarity index 100% rename from Assets/game/bonus/Hauer/Animation/HauerStopAfter.anim.meta rename to Assets/game/bonus/Hauer/Animation/HauerLayOnTheGround.anim.meta diff --git a/Assets/game/bonus/Hauer/Animation/HauerRun/HauerGFX.controller b/Assets/game/bonus/Hauer/Animation/HauerRun/HauerGFX.controller index 4053070..2b00ab3 100644 --- a/Assets/game/bonus/Hauer/Animation/HauerRun/HauerGFX.controller +++ b/Assets/game/bonus/Hauer/Animation/HauerRun/HauerGFX.controller @@ -8,8 +8,8 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: Stop + - m_ConditionMode: 1 + m_ConditionEvent: WalkAnimation m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -2411028032507391722} @@ -85,7 +85,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HauerRun + m_Name: HauerWalkAnimation m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -113,7 +113,7 @@ AnimatorController: m_Name: HauerGFX serializedVersion: 5 m_AnimatorParameters: - - m_Name: Stop + - m_Name: WalkAnimation m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 @@ -140,8 +140,8 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Stop + - m_ConditionMode: 2 + m_ConditionEvent: WalkAnimation m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -3977504924038202129} diff --git a/Assets/game/bonus/Hauer/Animation/HauerRun/HauerRun.anim b/Assets/game/bonus/Hauer/Animation/HauerRun/HauerWalkAnimation.anim similarity index 98% rename from Assets/game/bonus/Hauer/Animation/HauerRun/HauerRun.anim rename to Assets/game/bonus/Hauer/Animation/HauerRun/HauerWalkAnimation.anim index 95751e0..e34c194 100644 --- a/Assets/game/bonus/Hauer/Animation/HauerRun/HauerRun.anim +++ b/Assets/game/bonus/Hauer/Animation/HauerRun/HauerWalkAnimation.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HauerRun + m_Name: HauerWalkAnimation serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/game/bonus/Hauer/Animation/HauerRun/HauerRun.anim.meta b/Assets/game/bonus/Hauer/Animation/HauerRun/HauerWalkAnimation.anim.meta similarity index 100% rename from Assets/game/bonus/Hauer/Animation/HauerRun/HauerRun.anim.meta rename to Assets/game/bonus/Hauer/Animation/HauerRun/HauerWalkAnimation.anim.meta diff --git a/Assets/game/bonus/Hauer/Animation/HauerWalk.anim b/Assets/game/bonus/Hauer/Animation/HauerWalkTransform.anim similarity index 99% rename from Assets/game/bonus/Hauer/Animation/HauerWalk.anim rename to Assets/game/bonus/Hauer/Animation/HauerWalkTransform.anim index 245d854..ed6d4e7 100644 --- a/Assets/game/bonus/Hauer/Animation/HauerWalk.anim +++ b/Assets/game/bonus/Hauer/Animation/HauerWalkTransform.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HauerWalk + m_Name: HauerWalkTransform serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/game/bonus/Hauer/Animation/HauerWalk.anim.meta b/Assets/game/bonus/Hauer/Animation/HauerWalkTransform.anim.meta similarity index 100% rename from Assets/game/bonus/Hauer/Animation/HauerWalk.anim.meta rename to Assets/game/bonus/Hauer/Animation/HauerWalkTransform.anim.meta diff --git a/Assets/game/bonus/Hauer/Hauer.prefab b/Assets/game/bonus/Hauer/Hauer.prefab index e9ed60f..7a4f90c 100644 --- a/Assets/game/bonus/Hauer/Hauer.prefab +++ b/Assets/game/bonus/Hauer/Hauer.prefab @@ -35,7 +35,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1829792180 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -52,7 +52,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!212 &1829792179 SpriteRenderer: m_ObjectHideFlags: 0 @@ -141,7 +142,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2235643186762485068 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -158,7 +159,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &4976842300819991897 MonoBehaviour: m_ObjectHideFlags: 0 @@ -171,20 +173,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c2e21abc31bd534793a01f7afb61b5a, type: 3} m_Name: m_EditorClassIdentifier: - Hauer: {fileID: 5947294273481416654} - PauseButton: {fileID: 0} - LeftButton: {fileID: 0} - RightButton: {fileID: 0} - JumpButton: {fileID: 0} - CrouchButton: {fileID: 0} - FireButton: {fileID: 0} + disableObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} range: 15 speed: 5 - animator: {fileID: 2235643186762485068} - GFX: {fileID: 1829792180} - wait1: 3 - wait2: 0.5 - waitAfter: 7 - childTransform: {fileID: 1829792178} - sceneFader: {fileID: 0} - levelToLoad: About + secondsToWalk: 3 + secondsToFall: 0.5 + timeout: 7 diff --git a/Assets/game/bonus/Materials/Bücher.mat b/Assets/game/bonus/Materials/Books.mat similarity index 97% rename from Assets/game/bonus/Materials/Bücher.mat rename to Assets/game/bonus/Materials/Books.mat index c2a7f18..ff1c545 100644 --- a/Assets/game/bonus/Materials/Bücher.mat +++ b/Assets/game/bonus/Materials/Books.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "B\xFCcher" + m_Name: Books m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] m_InvalidKeywords: [] diff --git a/Assets/game/bonus/Materials/Bücher.mat.meta b/Assets/game/bonus/Materials/Books.mat.meta similarity index 100% rename from Assets/game/bonus/Materials/Bücher.mat.meta rename to Assets/game/bonus/Materials/Books.mat.meta diff --git a/Assets/game/bonus/Rettung/Rettung.cs b/Assets/game/bonus/Rettung/Rettung.cs deleted file mode 100644 index 76701a8..0000000 --- a/Assets/game/bonus/Rettung/Rettung.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class Rettung : MonoBehaviour -{ - public Animator animator; - public Animator GFX; - public static bool runScript = false; - public static bool finished = false; - public float wait1 = 2.0f; - public float wait2 = 2.0f; - public float wait3 = 2.0f; - public float waitBefore = 1.1f; - - // Start is called before the first frame update - void Start() - { - runScript = false; - finished = false; - } - - // Update is called once per frame - void Update() - { - if (runScript) - { - runScript = false; - StartCoroutine(Script()); - } - } - - IEnumerator Script() - { - yield return new WaitForSeconds(waitBefore); - animator.SetBool("Run", true); - GFX.SetBool("Stop", false); - yield return new WaitForSeconds(wait1); - animator.SetBool("Run", false); - GFX.SetBool("Stop", true); - animator.SetBool("IdleAfter", true); - finished = true; - yield return new WaitForSeconds(wait2); - animator.SetBool("IdleAfter", false); - GFX.SetBool("Stop", false); - animator.SetBool("RunAfter", true); - yield return new WaitForSeconds(wait3); - animator.SetBool("RunAfter", false); - GFX.SetBool("Stop", true); - animator.SetBool("IdleAfterAfter", true); - - } -} diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index b43be1f..0d7f2b7 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 780.8 m_ShowMode: 4 - m_Title: Game + m_Title: Console m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 154 + controlID: 36 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 88 + controlID: 81 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -183,7 +183,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -192,15 +192,15 @@ MonoBehaviour: y: 374.4 width: 644 height: 356.4 - m_MinSize: {x: 201, y: 221} + m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 13} - {fileID: 16} - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -225,7 +225,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 41 + controlID: 37 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1085,23 +1085,23 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/game/Scripts/UI + - Assets/game m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/game/Scripts/UI + - Assets/game m_LastFoldersGridSize: 64 m_LastProjectPath: C:\Users\MarcUs7\unity\ShantiManti m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 172.6} - m_SelectedIDs: 2c6d0000 - m_LastClickedID: 27948 - m_ExpandedIDs: 00000000cc6c0000e06c00002e6d000000ca9a3bffffff7f + scrollPos: {x: 0, y: 127} + m_SelectedIDs: e06c0000 + m_LastClickedID: 27872 + m_ExpandedIDs: 00000000cc6c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: