diff --git a/3d Prototyp/Assets/Animations/NPCAnimationController.cs b/3d Prototyp/Assets/Animations/NPCAnimationController.cs index 0d6fff3d..349cf98d 100644 --- a/3d Prototyp/Assets/Animations/NPCAnimationController.cs +++ b/3d Prototyp/Assets/Animations/NPCAnimationController.cs @@ -134,6 +134,8 @@ public class NPCAnimationController : MonoBehaviour Developer.Pee(1.0, true); + ToiletManager.Instance.Toilette.Flush(); + // Stehe auf und gehe zur�ck zum Ausgangspunkt. transform.LookAt(new Vector3(toiletLookAtTransform.position.x, toiletLookAtTransform.position.y, toiletLookAtTransform.position.z)); animator.ResetTrigger("SitDown"); // Setze den Sitzen-Trigger zur�ck diff --git a/3d Prototyp/Assets/CoffeeMachine.cs b/3d Prototyp/Assets/CoffeeMachine.cs index de0de5a2..44a87676 100644 --- a/3d Prototyp/Assets/CoffeeMachine.cs +++ b/3d Prototyp/Assets/CoffeeMachine.cs @@ -11,6 +11,12 @@ public class CoffeeMachine : MonoBehaviour [SerializeField] private AudioClip _buttonClick; + [SerializeField] + private AudioClip _deny; + + [SerializeField] + private AudioClip _coffeeMachine; + [SerializeField] private AudioSource _audioSource; @@ -37,32 +43,26 @@ public class CoffeeMachine : MonoBehaviour private IEnumerator CookCoffeeRoutine() { - // TODO: Start blinking - - Debug.Log("Blinky"); - - yield return new WaitForSeconds(2); - - // SPiele kaffeemaschinen sound - Debug.Log("Brrrrr"); + yield return new WaitForSeconds(0.5f); - yield return new WaitForSeconds(5); + _audioSource.PlayOneShot(_coffeeMachine); + + yield return new WaitForSeconds(7); - CoffeePlace coffeePlace = _coffeePlaces.Where(c => c.IsFree()).ToList().GetRandomElement(); - - if (coffeePlace == null) + for (int i = 0; i < 2; i++) { - // TODO: Spill coffee - Debug.Log("misty kaki"); - } - else - { - Instantiate(_coffeItemPrefabs.GetRandomElement(), coffeePlace.transform.position, Quaternion.Euler(0, Random.Range(0.0f, 360.0f), 0)); - } + CoffeePlace coffeePlace = _coffeePlaces.Where(c => c.IsFree()).ToList().GetRandomElement(); - yield return new WaitForSeconds(1); - - // todo: Play pling sound + if (coffeePlace == null) + { + // TODO: Spill coffee + Debug.Log("misty kaki"); + } + else + { + Instantiate(_coffeItemPrefabs.GetRandomElement(), coffeePlace.transform.position, Quaternion.Euler(0, Random.Range(0.0f, 360.0f), 0)); + } + } _isCooking = false; } diff --git a/3d Prototyp/Assets/Data/GottfriedData.asset b/3d Prototyp/Assets/Data/GottfriedData.asset index 41bf87cb..f96cdd72 100644 --- a/3d Prototyp/Assets/Data/GottfriedData.asset +++ b/3d Prototyp/Assets/Data/GottfriedData.asset @@ -12,9 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62867debe01c41d89e01687ef2722fcd, type: 3} m_Name: GottfriedData m_EditorClassIdentifier: - Say_Impossible: + VoiceSayItsImpossible: - {fileID: 8300000, guid: 9d82386c43ce7944ab7a78305ae045c5, type: 3} - {fileID: 8300000, guid: e169dd8360db2cd4dadd12d44c50beab, type: 3} - {fileID: 8300000, guid: dcc846c8a9b316547bf051a016e49fa0, type: 3} - {fileID: 8300000, guid: 32384529849285849a7aa370e502046f, type: 3} - {fileID: 8300000, guid: 1cd31e4d8fd50b6448f51db8abe18403, type: 3} + DrinkMate: {fileID: 8300000, guid: d647b03d56624144da03357426647bb1, type: 3} + DrinkCoffe: {fileID: 8300000, guid: 73998fb8d43efca4085260ce6a1e7834, type: 3} + EatPizza: {fileID: 8300000, guid: 1a7a3de12f9df6f4c9799fe341d5de28, type: 3} + Hurt: {fileID: 8300000, guid: 91d676f74045c8541ad059fd4a429bfe, type: 3} diff --git a/3d Prototyp/Assets/DeveloperInfoUi.cs b/3d Prototyp/Assets/DeveloperInfoUi.cs index 7c52f5eb..f1f4de9c 100644 --- a/3d Prototyp/Assets/DeveloperInfoUi.cs +++ b/3d Prototyp/Assets/DeveloperInfoUi.cs @@ -28,7 +28,7 @@ public class DeveloperInfoUi : MonoBehaviour [SerializeField] private Gradient _statusGradient; - [SerializeField] private TextMeshProUGUI _fingerText; + //[SerializeField] private TextMeshProUGUI _fingerText; void Start() { @@ -43,6 +43,6 @@ public class DeveloperInfoUi : MonoBehaviour _hungerImage.color = _statusGradient.Evaluate((float)_developer.CurrentHunger); _toiletImage.color = _statusGradient.Evaluate((float)_developer.CurrentUrgeToUrinate); - _fingerText.text = _developer.FingersLeft.ToString(); + //_fingerText.text = _developer.FingersLeft.ToString(); } } diff --git a/3d Prototyp/Assets/GUI/Prefabs/Developer Info.prefab b/3d Prototyp/Assets/GUI/Prefabs/Developer Info.prefab index 82c687b6..9d5cbbaf 100644 --- a/3d Prototyp/Assets/GUI/Prefabs/Developer Info.prefab +++ b/3d Prototyp/Assets/GUI/Prefabs/Developer Info.prefab @@ -30,7 +30,6 @@ RectTransform: m_Children: - {fileID: 7348932977815531936} - {fileID: 7237506617705304074} - - {fileID: 3459356244821462305} m_Father: {fileID: 4482679136646759840} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -334,140 +333,6 @@ RectTransform: m_AnchoredPosition: {x: 76.6666, y: 40.000015} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0, y: 1} ---- !u!1 &2314064033459549897 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8941386673390654853} - - component: {fileID: 1995026191122220802} - - component: {fileID: 7121868304386565151} - m_Layer: 5 - m_Name: FingerCount - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8941386673390654853 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2314064033459549897} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3459356244821462305} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2.5, y: 0} - m_SizeDelta: {x: 30, y: 0} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &1995026191122220802 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2314064033459549897} - m_CullTransparentMesh: 1 ---- !u!114 &7121868304386565151 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2314064033459549897} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 10 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 26.85 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2849365363638711399 GameObject: m_ObjectHideFlags: 0 @@ -622,81 +487,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2995753045284691605 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4347443903973851185} - - component: {fileID: 6377756472018854795} - - component: {fileID: 7433428973329617304} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4347443903973851185 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2995753045284691605} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.88, y: 0.88, z: 0.88} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3459356244821462305} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 15, y: 0} - m_SizeDelta: {x: -30, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6377756472018854795 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2995753045284691605} - m_CullTransparentMesh: 1 ---- !u!114 &7433428973329617304 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2995753045284691605} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4a850894428b5974397bae4c296931b0, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &4248618897055490281 GameObject: m_ObjectHideFlags: 0 @@ -997,44 +787,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6233693193687452351 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3459356244821462305} - m_Layer: 5 - m_Name: FingerDIsplay - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3459356244821462305 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6233693193687452351} - 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: 5222451139235444303} - - {fileID: 4347443903973851185} - - {fileID: 8941386673390654853} - m_Father: {fileID: 5539324385314307754} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 75, y: 45} - m_SizeDelta: {x: 60, y: 30} - m_Pivot: {x: 0, y: 1} --- !u!1 &6360783030994205330 GameObject: m_ObjectHideFlags: 0 @@ -1147,81 +899,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6839716292997047274 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5222451139235444303} - - component: {fileID: 3491041736553925409} - - component: {fileID: 999342893168278251} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5222451139235444303 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6839716292997047274} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3459356244821462305} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3491041736553925409 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6839716292997047274} - m_CullTransparentMesh: 1 ---- !u!114 &999342893168278251 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6839716292997047274} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b687c8dd77019954e99988f126963f3d, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 10 --- !u!1 &6876908832845842189 GameObject: m_ObjectHideFlags: 0 @@ -1473,7 +1150,7 @@ MonoBehaviour: m_ColorSpace: -1 m_NumColorKeys: 3 m_NumAlphaKeys: 2 - _fingerText: {fileID: 7121868304386565151} + _fingerText: {fileID: 0} --- !u!1 &7516305664795462652 GameObject: m_ObjectHideFlags: 0 diff --git a/3d Prototyp/Assets/Models/Consumables/Pizza/PizzaPlastik.mat b/3d Prototyp/Assets/Models/Consumables/Pizza/PizzaPlastik.mat new file mode 100644 index 00000000..522a6990 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Pizza/PizzaPlastik.mat @@ -0,0 +1,88 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PizzaPlastik + m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: fa774bc8c6a879b44962145aad21fef9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: fa774bc8c6a879b44962145aad21fef9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 1 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/3d Prototyp/Assets/Models/Consumables/Pizza/PizzaPlastik.mat.meta b/3d Prototyp/Assets/Models/Consumables/Pizza/PizzaPlastik.mat.meta new file mode 100644 index 00000000..f1656ea5 --- /dev/null +++ b/3d Prototyp/Assets/Models/Consumables/Pizza/PizzaPlastik.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e92aa5e8229dfdf419b5c3a0dca39b8f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/Prefabs/Zombie/Zombie.prefab b/3d Prototyp/Assets/Prefabs/Zombie/Zombie.prefab index 52dc3e37..62ddf1b1 100644 --- a/3d Prototyp/Assets/Prefabs/Zombie/Zombie.prefab +++ b/3d Prototyp/Assets/Prefabs/Zombie/Zombie.prefab @@ -254,7 +254,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 diff --git a/3d Prototyp/Assets/Prefabs/ZombieDisableDeathEffect.prefab b/3d Prototyp/Assets/Prefabs/ZombieDisableDeathEffect.prefab index 86246a03..3e3844d3 100644 --- a/3d Prototyp/Assets/Prefabs/ZombieDisableDeathEffect.prefab +++ b/3d Prototyp/Assets/Prefabs/ZombieDisableDeathEffect.prefab @@ -14219,7 +14219,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index 02a8eb6c..f272df03 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.14514297, g: 0.16106007, b: 0.16197146, a: 1} + m_IndirectSpecularColor: {r: 0.17276844, g: 0.21589246, b: 0.2978263, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1197,6 +1197,67 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &27787964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 27787965} + - component: {fileID: 27787966} + m_Layer: 0 + m_Name: ZombieSpawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &27787965 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 27787964} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2146049822} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &27787966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 27787964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a61873b0f5608a44982d48387f34f682, type: 3} + m_Name: + m_EditorClassIdentifier: + SpawnPoints: + - {fileID: 388891506} + - {fileID: 388946666} + - {fileID: 1178016143} + - {fileID: 766208561} + - {fileID: 1868426151} + ZombieDeathByDisableSoundeffects: + - {fileID: 8300000, guid: c792fd61575228d49bb4b4059f892a3c, type: 3} + - {fileID: 8300000, guid: 6919de8a1f2d3af43a02cf95a9ba0bd8, type: 3} + - {fileID: 8300000, guid: 78685af74d6fa4c46b006ae779d17129, type: 3} + - {fileID: 8300000, guid: 1896a757f58c7514fac60f967cb55901, type: 3} + - {fileID: 8300000, guid: e541b41adf0d8e542baa93445dca7816, type: 3} + ZombiePrefab: {fileID: 856601670117699726, guid: a34b2d22562c7214f9daf0d3dea8d85c, type: 3} + _spawnRate: 5 + _dontSpawnForLastSeconds: 3 + _spawnTimer: 0 + _enabledTimer: 0 --- !u!1 &28131910 GameObject: m_ObjectHideFlags: 0 @@ -2169,6 +2230,101 @@ Transform: - {fileID: 408224511} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &43263421 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1950804951} + m_Modifications: + - target: {fileID: 6070418075575626771, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_Name + value: toon_office_vase (4) + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalPosition.x + value: -0.37 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalPosition.z + value: 13.81 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071069 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6070418075575626771, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + insertIndex: -1 + addedObject: {fileID: 43263424} + m_SourcePrefab: {fileID: 100100000, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} +--- !u!4 &43263422 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + m_PrefabInstance: {fileID: 43263421} + m_PrefabAsset: {fileID: 0} +--- !u!1 &43263423 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6070418075575626771, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + m_PrefabInstance: {fileID: 43263421} + m_PrefabAsset: {fileID: 0} +--- !u!65 &43263424 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 43263423} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.287588, y: 0.2572016, z: 0.287588} + m_Center: {x: -0.0000009611249, y: 0.1298858, z: 0.0000004693866} --- !u!1 &46573622 GameObject: m_ObjectHideFlags: 0 @@ -2938,6 +3094,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} insertIndex: -1 addedObject: {fileID: 1887081993} + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1887081999} + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1887081998} m_SourcePrefab: {fileID: 100100000, guid: 39686e9e6d2c7854982560e582f96338, type: 3} --- !u!4 &70121952 stripped Transform: @@ -5673,13 +5835,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 124226106} serializedVersion: 2 - m_LocalRotation: {x: 0.021814892, y: 0, z: 0, w: 0.999762} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 2.5, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &127907486 GameObject: m_ObjectHideFlags: 0 @@ -14665,22 +14827,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2703668081068178613, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} m_PrefabInstance: {fileID: 603450951} m_PrefabAsset: {fileID: 0} ---- !u!114 &322315144 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 322315138} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c18f377723b64fd8a8d0261b85b3ba48, type: 3} - m_Name: - m_EditorClassIdentifier: - _daysUntilRelease: 7 - _secondsPerDay: 120 - _totalTime: 0 - _sun: {fileID: 124226107} --- !u!114 &322315147 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14694,6 +14840,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsOccupied: 0 + Toilette: {fileID: 2051823395} --- !u!1 &324516778 GameObject: m_ObjectHideFlags: 0 @@ -18110,6 +18257,68 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 388442915} m_Mesh: {fileID: 4300010, guid: 9bb588823d8da76499558fe774532400, type: 3} +--- !u!1 &388891505 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 388891506} + m_Layer: 0 + m_Name: SpawnPunkt1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &388891506 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 388891505} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 15.57, y: 0.2, z: -8.56} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &388946665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 388946666} + m_Layer: 0 + m_Name: SpawnPunkt1 (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &388946666 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 388946665} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 32.8, y: 0.2, z: 8} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &390064466 stripped Transform: m_CorrespondingSourceObject: {fileID: 8598406062819889265, guid: 7252986ba0be83a429542cd62984b62b, type: 3} @@ -19014,6 +19223,105 @@ Transform: m_CorrespondingSourceObject: {fileID: 486570, guid: b8c83c417104d75459226dd80248bfe2, type: 3} m_PrefabInstance: {fileID: 1588876846} m_PrefabAsset: {fileID: 0} +--- !u!1001 &409484524 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1950804951} + m_Modifications: + - target: {fileID: 2799242785918641492, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_Name + value: toon_office_cabinet (10) + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_RootOrder + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalPosition.x + value: -0.38 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalPosition.z + value: 12.91 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4456333871451915393, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2aabd3b1368fb624c8428bef2d2382bd, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2799242785918641492, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + insertIndex: -1 + addedObject: {fileID: 409484527} + m_SourcePrefab: {fileID: 100100000, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} +--- !u!4 &409484525 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3284031049561096174, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + m_PrefabInstance: {fileID: 409484524} + m_PrefabAsset: {fileID: 0} +--- !u!1 &409484526 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2799242785918641492, guid: 436d6c6ad13444243927518c3405f6ea, type: 3} + m_PrefabInstance: {fileID: 409484524} + m_PrefabAsset: {fileID: 0} +--- !u!65 &409484527 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 409484526} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.5451591, y: 0.773684, z: 0.6160698} + m_Center: {x: 0, y: 0.386842, z: 0.03545537} --- !u!1 &410464247 GameObject: m_ObjectHideFlags: 0 @@ -20362,6 +20670,101 @@ Transform: - {fileID: 1296223979} m_Father: {fileID: 151396269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &434269933 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1950804951} + m_Modifications: + - target: {fileID: 6070418075575626771, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_Name + value: toon_office_vase (2) + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalPosition.x + value: 1.71 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalPosition.z + value: 3.22 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071069 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6070418075575626771, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + insertIndex: -1 + addedObject: {fileID: 434269936} + m_SourcePrefab: {fileID: 100100000, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} +--- !u!4 &434269934 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6878586247019493033, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + m_PrefabInstance: {fileID: 434269933} + m_PrefabAsset: {fileID: 0} +--- !u!1 &434269935 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6070418075575626771, guid: 74da833b5bb7c425390b7e2f8e7dbbe8, type: 3} + m_PrefabInstance: {fileID: 434269933} + m_PrefabAsset: {fileID: 0} +--- !u!65 &434269936 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 434269935} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.287588, y: 0.2572016, z: 0.287588} + m_Center: {x: -0.0000009611249, y: 0.1298858, z: 0.0000004693866} --- !u!1 &434955085 GameObject: m_ObjectHideFlags: 0 @@ -24409,7 +24812,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.x - value: 0.841 + value: 0.009 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.y @@ -24417,7 +24820,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.z - value: -0.772 + value: 0.636 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalRotation.w @@ -26300,6 +26703,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} insertIndex: -1 addedObject: {fileID: 1865690044} + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1865690050} + - targetCorrespondingSourceObject: {fileID: 7432460832681161358, guid: 39686e9e6d2c7854982560e582f96338, type: 3} + insertIndex: -1 + addedObject: {fileID: 1865690049} m_SourcePrefab: {fileID: 100100000, guid: 39686e9e6d2c7854982560e582f96338, type: 3} --- !u!4 &557324031 stripped Transform: @@ -28582,13 +28991,22 @@ PrefabInstance: propertyPath: NeedFullfilledParticleEffect value: objectReference: {fileID: 1620116211597326, guid: 094c049ae10f1c3419c96c4bce41cf8c, type: 3} + - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + propertyPath: ZombieDeathByDisableParticleEffect + value: + objectReference: {fileID: 1655205912634366, guid: 022ee083930cfe04ba477ff4f4933734, type: 3} + - target: {fileID: 7372041109052800040, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + propertyPath: _sun + value: + objectReference: {fileID: 124226107} + - target: {fileID: 7759656673043564915, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + propertyPath: _losingMusic + value: + objectReference: {fileID: 8300000, guid: 127dfea0247c28040a5242a06821ad96, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2703668081068178613, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} - insertIndex: -1 - addedObject: {fileID: 322315144} - targetCorrespondingSourceObject: {fileID: 2703668081068178613, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} insertIndex: -1 addedObject: {fileID: 322315147} @@ -35367,6 +35785,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 764068527} m_Mesh: {fileID: 5375582512751788850, guid: f47c08ee0d8c52d40bf295cd48a04da7, type: 3} +--- !u!1 &766208560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 766208561} + m_Layer: 0 + m_Name: SpawnPunkt1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &766208561 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 766208560} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 42.1, y: 0.2, z: -8.56} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &767073070 GameObject: m_ObjectHideFlags: 0 @@ -37301,6 +37750,112 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ff5a917ee05d4e27a188b977e58d326, type: 3} +--- !u!1 &819143117 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4442944900773098291, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + m_PrefabInstance: {fileID: 1067027570} + m_PrefabAsset: {fileID: 0} +--- !u!4 &819143122 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + m_PrefabInstance: {fileID: 1067027570} + m_PrefabAsset: {fileID: 0} +--- !u!82 &819143123 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 819143117} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &820614989 GameObject: m_ObjectHideFlags: 0 @@ -48556,6 +49111,26 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3729268794274366362, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: _isReady + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3729268794274366362, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: _errorSound + value: + objectReference: {fileID: 8300000, guid: 27e183cf8a3d7ec4b9fbb4671441b7aa, type: 3} + - target: {fileID: 3729268794274366362, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: _shootForce + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3729268794274366362, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: _audioSource + value: + objectReference: {fileID: 819143123} + - target: {fileID: 3729268794274366362, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: _vendingMachineSound + value: + objectReference: {fileID: 8300000, guid: e126bd25cd99e1a46881dafc0b19ebcb, type: 3} - target: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} propertyPath: m_LocalPosition.x value: 44.270943 @@ -48600,10 +49175,20 @@ PrefabInstance: propertyPath: m_Name value: Pizza_Vending_Machine objectReference: {fileID: 0} + - target: {fileID: 5603870002621075361, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e92aa5e8229dfdf419b5c3a0dca39b8f, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3955095557768669577, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + insertIndex: -1 + addedObject: {fileID: 2031804437} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4442944900773098291, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} + insertIndex: -1 + addedObject: {fileID: 819143123} m_SourcePrefab: {fileID: 100100000, guid: b3aebd61e2d9c7b40be99fed0c18841d, type: 3} --- !u!1 &1067713142 GameObject: @@ -51059,7 +51644,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.x - value: 1.449 + value: -0.824 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.y @@ -51067,7 +51652,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalPosition.z - value: -0.773 + value: 0.402 objectReference: {fileID: 0} - target: {fileID: 2946670842961469382, guid: 3a0359364728e2e4ca1ec9dfe4cebfb7, type: 3} propertyPath: m_LocalRotation.w @@ -52986,6 +53571,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1173664055} m_Mesh: {fileID: 2137208523138566550, guid: c66ae5d8378321a4d8d6876b0dfbd9eb, type: 3} +--- !u!1 &1178016142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1178016143} + m_Layer: 0 + m_Name: SpawnPunkt1 (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1178016143 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178016142} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 52.17, y: 0.2, z: 6.51} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1179348334 GameObject: m_ObjectHideFlags: 0 @@ -57502,6 +58118,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4152728632070289523, guid: 88a0819a59da0804681860f567cef10f, type: 3} insertIndex: -1 addedObject: {fileID: 2051823389} + - targetCorrespondingSourceObject: {fileID: 4152728632070289523, guid: 88a0819a59da0804681860f567cef10f, type: 3} + insertIndex: -1 + addedObject: {fileID: 2051823395} + - targetCorrespondingSourceObject: {fileID: 4152728632070289523, guid: 88a0819a59da0804681860f567cef10f, type: 3} + insertIndex: -1 + addedObject: {fileID: 2051823394} m_SourcePrefab: {fileID: 100100000, guid: 88a0819a59da0804681860f567cef10f, type: 3} --- !u!4 &1286457055 stripped Transform: @@ -81651,7 +82273,19 @@ MonoBehaviour: UseText: "Sp\xFChlung benutzen" OnUse: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1865690050} + m_TargetAssemblyTypeName: Toilette, Assembly-CSharp + m_MethodName: Flush + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1865690046 MonoBehaviour: m_ObjectHideFlags: 0 @@ -81670,6 +82304,115 @@ MonoBehaviour: precomputeOutline: 0 bakeKeys: [] bakeValues: [] +--- !u!82 &1865690049 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1865690041} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: dbf8cf0bf773b7b44ba3d53d05a2b3bc, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1865690050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1865690041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2aba106a2b6a544b8cf8c12c021528c, type: 3} + m_Name: + m_EditorClassIdentifier: + AudioSource: {fileID: 1865690049} --- !u!1 &1866071394 GameObject: m_ObjectHideFlags: 0 @@ -81836,6 +82579,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1867790062} m_Mesh: {fileID: 6610835467892664265, guid: c609758a60f3baa48b0710a1fa89c048, type: 3} +--- !u!1 &1868426150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1868426151} + m_Layer: 0 + m_Name: SpawnPunkt1 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1868426151 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868426150} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 50.671, y: 0.2, z: -6.59} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1869841607 GameObject: m_ObjectHideFlags: 0 @@ -82536,7 +83310,19 @@ MonoBehaviour: UseText: "Sp\xFChlung benutzen" OnUse: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1887081998} + m_TargetAssemblyTypeName: Toilette, Assembly-CSharp + m_MethodName: Flush + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1887081994 MonoBehaviour: m_ObjectHideFlags: 0 @@ -82576,6 +83362,115 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.2815973, y: 0.7670686, z: 0.19303007} m_Center: {x: -0.0000009562189, y: 0.82699513, z: 0.08538111} +--- !u!114 &1887081998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887081990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2aba106a2b6a544b8cf8c12c021528c, type: 3} + m_Name: + m_EditorClassIdentifier: + AudioSource: {fileID: 1887081999} +--- !u!82 &1887081999 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887081990} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: dbf8cf0bf773b7b44ba3d53d05a2b3bc, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1887126947 GameObject: m_ObjectHideFlags: 0 @@ -84449,7 +85344,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4103267665437288, guid: 79a5b937093a5864d91d9a3a836ff1d7, type: 3} propertyPath: m_LocalPosition.x - value: 1.559864 + value: 1.169 objectReference: {fileID: 0} - target: {fileID: 4103267665437288, guid: 79a5b937093a5864d91d9a3a836ff1d7, type: 3} propertyPath: m_LocalPosition.y @@ -84457,7 +85352,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4103267665437288, guid: 79a5b937093a5864d91d9a3a836ff1d7, type: 3} propertyPath: m_LocalPosition.z - value: 3.4069583 + value: 3.407 objectReference: {fileID: 0} - target: {fileID: 4103267665437288, guid: 79a5b937093a5864d91d9a3a836ff1d7, type: 3} propertyPath: m_LocalRotation.w @@ -85090,6 +85985,8 @@ Transform: - {fileID: 1338363830} - {fileID: 6637553} - {fileID: 1350297312} + - {fileID: 434269934} + - {fileID: 43263422} - {fileID: 343684803} - {fileID: 1689990509} - {fileID: 850930203} @@ -85103,6 +86000,7 @@ Transform: - {fileID: 2002294331} - {fileID: 1269674423} - {fileID: 1725920340} + - {fileID: 409484525} - {fileID: 224129695} - {fileID: 676167184} - {fileID: 1131000737} @@ -89841,6 +90739,100 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2030591197} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1 &2031804436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2031804437} + - component: {fileID: 2031804438} + m_Layer: 0 + m_Name: Spot Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2031804437 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031804436} + serializedVersion: 2 + m_LocalRotation: {x: 0.37136775, y: 0, z: 0, w: 0.9284859} + m_LocalPosition: {x: 0, y: 0.16, z: 0.0316} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 819143122} + m_LocalEulerAnglesHint: {x: 43.6, y: 0, z: 0} +--- !u!108 &2031804438 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031804436} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 0 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 3.7 + m_SpotAngle: 116.5 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!1 &2032339111 GameObject: m_ObjectHideFlags: 0 @@ -90578,7 +91570,19 @@ MonoBehaviour: UseText: "Sp\xFChlung bet\xE4tigen" OnUse: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 2051823395} + m_TargetAssemblyTypeName: Toilette, Assembly-CSharp + m_MethodName: Flush + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &2051823391 MonoBehaviour: m_ObjectHideFlags: 0 @@ -90597,6 +91601,115 @@ MonoBehaviour: precomputeOutline: 0 bakeKeys: [] bakeValues: [] +--- !u!82 &2051823394 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051823386} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: dbf8cf0bf773b7b44ba3d53d05a2b3bc, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &2051823395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051823386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2aba106a2b6a544b8cf8c12c021528c, type: 3} + m_Name: + m_EditorClassIdentifier: + AudioSource: {fileID: 2051823394} --- !u!1 &2052217872 GameObject: m_ObjectHideFlags: 0 @@ -94556,6 +95669,58 @@ Transform: m_CorrespondingSourceObject: {fileID: 486570, guid: b8c83c417104d75459226dd80248bfe2, type: 3} m_PrefabInstance: {fileID: 1954828350} m_PrefabAsset: {fileID: 0} +--- !u!1 &2146049820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2146049822} + - component: {fileID: 2146049821} + m_Layer: 0 + m_Name: Zombie Zeitschaltuhr + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2146049821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146049820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1627adb53b4429346a7b0a984867d9d2, type: 3} + m_Name: + m_EditorClassIdentifier: + IsOn: 0 + _turnOnTime: + _hour: 20 + _minutes: 0 + _turnOffTime: + _hour: 6 + _minutes: 0 +--- !u!4 &2146049822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146049820} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 27787965} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2927123558797061 GameObject: m_ObjectHideFlags: 0 @@ -113222,6 +114387,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _buttonClick: {fileID: 8300000, guid: 2892c69694b7d7a41b996417f274c16f, type: 3} + _deny: {fileID: 0} + _coffeeMachine: {fileID: 8300000, guid: 031f65c7c47ad2d43a955c40683880ad, type: 3} _audioSource: {fileID: 8946472412181576326} _coffeePlaces: - {fileID: 1129287357} @@ -113996,3 +115163,9 @@ SceneRoots: - {fileID: 1984025893} - {fileID: 2101986003} - {fileID: 41389689} + - {fileID: 2146049822} + - {fileID: 388946666} + - {fileID: 388891506} + - {fileID: 1178016143} + - {fileID: 766208561} + - {fileID: 1868426151} diff --git a/3d Prototyp/Assets/Scripts/Character.cs b/3d Prototyp/Assets/Scripts/Character.cs index ff5d5e2e..f8a67bbe 100644 --- a/3d Prototyp/Assets/Scripts/Character.cs +++ b/3d Prototyp/Assets/Scripts/Character.cs @@ -213,13 +213,16 @@ public class Character : MonoBehaviour switch (item.ItemType) { case ItemType.Coffee: - developer.GiveDrink(0.4, WantedConsumable.Drink); + developer.GiveDrink(0.45, WantedConsumable.Coffee); + _audioSource.PlayOneShot(_data.DrinkCoffe); break; case ItemType.Mate: - developer.GiveDrink(0.4, WantedConsumable.Mate); + developer.GiveDrink(0.35, WantedConsumable.Mate); + _audioSource.PlayOneShot(_data.DrinkMate); break; case ItemType.Pizza: - developer.GiveFood(0.25, WantedConsumable.Pizza); + developer.GiveFood(0.4, WantedConsumable.Pizza); + _audioSource.PlayOneShot(_data.EatPizza); break; default: SayItsImpossible(); @@ -240,4 +243,25 @@ public class Character : MonoBehaviour { _audioSource.PlayOneShot(_data.VoiceSayItsImpossible.GetRandomElement()); } + + [SerializeField] + private bool _canHurt = true; + + public void Hurt() + { + if (_canHurt) + StartCoroutine(HurtRoutine()); + } + + private IEnumerator HurtRoutine() + { + _canHurt = false; + + _audioSource.PlayOneShot(_data.Hurt); + PickupItem(null); + + yield return new WaitForSeconds(1); + + _canHurt = true; + } } diff --git a/3d Prototyp/Assets/Scripts/Data/GottfriedData.cs b/3d Prototyp/Assets/Scripts/Data/GottfriedData.cs index 41b546a5..b42616f9 100644 --- a/3d Prototyp/Assets/Scripts/Data/GottfriedData.cs +++ b/3d Prototyp/Assets/Scripts/Data/GottfriedData.cs @@ -7,5 +7,9 @@ namespace Data public class GottfriedData : ScriptableObject { [FormerlySerializedAs("Say_Impossible")] public AudioClip[] VoiceSayItsImpossible; + public AudioClip DrinkMate; + public AudioClip DrinkCoffe; + public AudioClip EatPizza; + public AudioClip Hurt; } } \ No newline at end of file diff --git a/3d Prototyp/Assets/Scripts/Interaction/VendingMachine.cs b/3d Prototyp/Assets/Scripts/Interaction/VendingMachine.cs index 67ade726..e86539e3 100644 --- a/3d Prototyp/Assets/Scripts/Interaction/VendingMachine.cs +++ b/3d Prototyp/Assets/Scripts/Interaction/VendingMachine.cs @@ -13,11 +13,34 @@ public class VendingMachine : MonoBehaviour [SerializeField] private float _shootForce; + + [SerializeField] + private bool _isReady; + + [SerializeField] private AudioSource _audioSource; + + [SerializeField] private AudioClip _vendingMachineSound; + [SerializeField] private AudioClip _errorSound; public void DropPiza() { - PickupInteractible pizza = Instantiate(_pizzaPrefab, _pizzaChute.position, _pizzaChute.rotation); + if (_isReady) + StartCoroutine(DropPizzaRoutine()); + else + _audioSource.PlayOneShot(_errorSound); + } + private IEnumerator DropPizzaRoutine() + { + _isReady = false; + + _audioSource.PlayOneShot(_vendingMachineSound); + + yield return new WaitForSeconds(2.7f); + + PickupInteractible pizza = Instantiate(_pizzaPrefab, _pizzaChute.position, _pizzaChute.rotation); pizza.GetComponent().AddForce(new Vector3(0, 0, _shootForce), ForceMode.Impulse); + + _isReady = true; } } diff --git a/3d Prototyp/Assets/Scripts/MusicManager.cs b/3d Prototyp/Assets/Scripts/MusicManager.cs index 80109896..9443d5a9 100644 --- a/3d Prototyp/Assets/Scripts/MusicManager.cs +++ b/3d Prototyp/Assets/Scripts/MusicManager.cs @@ -3,14 +3,17 @@ using System.Collections; using System.Collections.Generic; using Unity.VisualScripting; using UnityEngine; +using UnityEngine.Serialization; using Utility; public class MusicManager : MonoBehaviourSingleton { [SerializeField] private List _ambientMusic; + [FormerlySerializedAs("_showDownMusic")] [SerializeField] + private AudioClip _winningMusic; [SerializeField] - private AudioClip _showDownMusic; + private AudioClip _losingMusic; [SerializeField, ShowOnly] private float _musicTimer = 5f; @@ -18,9 +21,16 @@ public class MusicManager : MonoBehaviourSingleton private AudioSource _audioSource; private AudioClip _currentlyPlaying; private float _defaultVolume; - private bool _showDownTime = false; + private ShowDown _showDown = ShowDown.NotYet; private bool _doneFading = false; private bool _showDownIsPlaying = false; + + private enum ShowDown + { + NotYet, + AlmostFinished, + TimesRunningOut + } // Start is called before the first frame update void Start() @@ -34,10 +44,10 @@ public class MusicManager : MonoBehaviourSingleton { CheckForFinalMusic(); - if (!_showDownTime) + if (_showDown == ShowDown.NotYet) { _musicTimer -= Time.deltaTime; - + if (_musicTimer <= 0) { _musicTimer = _musicCheckInterval; @@ -47,18 +57,6 @@ public class MusicManager : MonoBehaviourSingleton } } } - else - { - if (_doneFading) - { - if (!_showDownIsPlaying) - PlayShowDownMusic(); - } - else - { - FadeOutMusic(); - } - } } private void FadeOutMusic() @@ -70,10 +68,64 @@ public class MusicManager : MonoBehaviourSingleton private void CheckForFinalMusic() { - float timeLeft = (float)GameManager.Instance.ExpectedRemainingGameDuration; - _showDownTime = timeLeft < 0.9 * _showDownMusic.length; + ShowDown oldShowDown = _showDown; + + if (TimeManager.Instance.RealLifeSecondsUntilDeadline < 100) + { + _showDown = ShowDown.TimesRunningOut; + } + else if (GameManager.Instance.GameProgress > 0.85) + { + _showDown = ShowDown.AlmostFinished; + } + else + { + _showDown = ShowDown.NotYet; + } + + if (oldShowDown != _showDown) + { + switch (_showDown) + { + case ShowDown.NotYet: + FadeToClip(_ambientMusic.GetRandomElement()); + break; + case ShowDown.AlmostFinished: + FadeToClip(_winningMusic); + break; + case ShowDown.TimesRunningOut: + FadeToClip(_losingMusic); + break; + } + } } + private void FadeToClip(AudioClip audioClip) + { + StartCoroutine(FadeToClipRoutine(audioClip)); + } + + [SerializeField] + private float _fadeDuration = 1.0f; + + private IEnumerator FadeToClipRoutine(AudioClip audioClip) + { + float currentTime = 0; + float start = _audioSource.volume; + while (currentTime < _fadeDuration) + { + currentTime += Time.deltaTime; + _audioSource.volume = Mathf.Lerp(start, 0.0f, currentTime / _fadeDuration); + yield return null; + } + + _audioSource.Stop(); + _audioSource.volume = _defaultVolume; + _audioSource.clip = audioClip; + _audioSource.loop = true; + _audioSource.Play(); + } + private void PlayNewMusic() { if (_currentlyPlaying == null) @@ -90,14 +142,4 @@ public class MusicManager : MonoBehaviourSingleton _audioSource.Play(); } } - - private void PlayShowDownMusic() - { - _showDownIsPlaying = true; - _audioSource.Stop(); - _audioSource.volume = _defaultVolume; - _audioSource.clip = _showDownMusic; - _audioSource.loop = true; - _audioSource.Play(); - } } diff --git a/3d Prototyp/Assets/Scripts/TimeManager.cs b/3d Prototyp/Assets/Scripts/TimeManager.cs index 3f04c28b..4ebc0271 100644 --- a/3d Prototyp/Assets/Scripts/TimeManager.cs +++ b/3d Prototyp/Assets/Scripts/TimeManager.cs @@ -34,6 +34,8 @@ public class TimeManager : MonoBehaviourSingleton /// Das aktuelle Datum und Uhrzeit im Spiel. /// public DateTime CurrentDate => _startDate.AddDays(_totalTime); + + public double RealLifeSecondsUntilDeadline => (Deadline - CurrentDate).TotalDays * _secondsPerDay; /// /// Die Deadline des Spiels. diff --git a/3d Prototyp/Assets/Scripts/Utility/Difficulty.cs b/3d Prototyp/Assets/Scripts/Utility/Difficulty.cs index 19423308..28ce39f6 100644 --- a/3d Prototyp/Assets/Scripts/Utility/Difficulty.cs +++ b/3d Prototyp/Assets/Scripts/Utility/Difficulty.cs @@ -39,7 +39,7 @@ namespace Utility public MediumDifficulty() { Difficulty = Difficulty.Medium; - DaysUntilReleaseFactor = 1.5; + DaysUntilReleaseFactor = 1.75; CaffeineDrainScaling = 1.5; HungerDrainScaling = 1.5; UrinationDrainScaling = 1.5; diff --git a/3d Prototyp/Assets/Scripts/Zombie.cs b/3d Prototyp/Assets/Scripts/Zombie.cs index fb3db86e..0075f3f4 100644 --- a/3d Prototyp/Assets/Scripts/Zombie.cs +++ b/3d Prototyp/Assets/Scripts/Zombie.cs @@ -118,7 +118,7 @@ void Update() float diff = direction.magnitude; if (diff <= _attackRange + 0.6f) { - GameManager.Instance.Player.GetComponent().PickupItem(null); + GameManager.Instance.Player.GetComponent().Hurt(); } _isAttacking = false; } diff --git a/3d Prototyp/Assets/SoundEffects/CoffeeMachine.wav b/3d Prototyp/Assets/SoundEffects/CoffeeMachine.wav new file mode 100644 index 00000000..ee14ea83 Binary files /dev/null and b/3d Prototyp/Assets/SoundEffects/CoffeeMachine.wav differ diff --git a/3d Prototyp/Assets/SoundEffects/CoffeeMachine.wav.meta b/3d Prototyp/Assets/SoundEffects/CoffeeMachine.wav.meta new file mode 100644 index 00000000..a8f5f889 --- /dev/null +++ b/3d Prototyp/Assets/SoundEffects/CoffeeMachine.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 031f65c7c47ad2d43a955c40683880ad +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/SoundEffects/Deny.wav b/3d Prototyp/Assets/SoundEffects/Deny.wav new file mode 100644 index 00000000..4a7aa1be Binary files /dev/null and b/3d Prototyp/Assets/SoundEffects/Deny.wav differ diff --git a/3d Prototyp/Assets/SoundEffects/Deny.wav.meta b/3d Prototyp/Assets/SoundEffects/Deny.wav.meta new file mode 100644 index 00000000..35cfcf7b --- /dev/null +++ b/3d Prototyp/Assets/SoundEffects/Deny.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 27e183cf8a3d7ec4b9fbb4671441b7aa +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/SoundEffects/Eat.wav b/3d Prototyp/Assets/SoundEffects/Eat.wav new file mode 100644 index 00000000..dfe75f8c Binary files /dev/null and b/3d Prototyp/Assets/SoundEffects/Eat.wav differ diff --git a/3d Prototyp/Assets/SoundEffects/Eat.wav.meta b/3d Prototyp/Assets/SoundEffects/Eat.wav.meta new file mode 100644 index 00000000..6af73745 --- /dev/null +++ b/3d Prototyp/Assets/SoundEffects/Eat.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1a7a3de12f9df6f4c9799fe341d5de28 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/SoundEffects/Flush.wav b/3d Prototyp/Assets/SoundEffects/Flush.wav new file mode 100644 index 00000000..20788ceb Binary files /dev/null and b/3d Prototyp/Assets/SoundEffects/Flush.wav differ diff --git a/3d Prototyp/Assets/SoundEffects/Flush.wav.meta b/3d Prototyp/Assets/SoundEffects/Flush.wav.meta new file mode 100644 index 00000000..0c1761d4 --- /dev/null +++ b/3d Prototyp/Assets/SoundEffects/Flush.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: dbf8cf0bf773b7b44ba3d53d05a2b3bc +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/SoundEffects/Music/Sands of Time.mp3 b/3d Prototyp/Assets/SoundEffects/Music/Sands of Time.mp3 new file mode 100644 index 00000000..4e968b2e Binary files /dev/null and b/3d Prototyp/Assets/SoundEffects/Music/Sands of Time.mp3 differ diff --git a/3d Prototyp/Assets/SoundEffects/Music/Sands of Time.mp3.meta b/3d Prototyp/Assets/SoundEffects/Music/Sands of Time.mp3.meta new file mode 100644 index 00000000..d4c9dff8 --- /dev/null +++ b/3d Prototyp/Assets/SoundEffects/Music/Sands of Time.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 127dfea0247c28040a5242a06821ad96 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/SoundEffects/VendingMachine.wav b/3d Prototyp/Assets/SoundEffects/VendingMachine.wav new file mode 100644 index 00000000..0f834bcb Binary files /dev/null and b/3d Prototyp/Assets/SoundEffects/VendingMachine.wav differ diff --git a/3d Prototyp/Assets/SoundEffects/VendingMachine.wav.meta b/3d Prototyp/Assets/SoundEffects/VendingMachine.wav.meta new file mode 100644 index 00000000..706d2339 --- /dev/null +++ b/3d Prototyp/Assets/SoundEffects/VendingMachine.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e126bd25cd99e1a46881dafc0b19ebcb +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/SoundEffects/hurt2.wav b/3d Prototyp/Assets/SoundEffects/hurt2.wav new file mode 100644 index 00000000..62e7a678 Binary files /dev/null and b/3d Prototyp/Assets/SoundEffects/hurt2.wav differ diff --git a/3d Prototyp/Assets/SoundEffects/hurt2.wav.meta b/3d Prototyp/Assets/SoundEffects/hurt2.wav.meta new file mode 100644 index 00000000..d9dc6c04 --- /dev/null +++ b/3d Prototyp/Assets/SoundEffects/hurt2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 91d676f74045c8541ad059fd4a429bfe +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/SoundEffects/openBottle.wav b/3d Prototyp/Assets/SoundEffects/openBottle.wav new file mode 100644 index 00000000..332c9742 Binary files /dev/null and b/3d Prototyp/Assets/SoundEffects/openBottle.wav differ diff --git a/3d Prototyp/Assets/SoundEffects/openBottle.wav.meta b/3d Prototyp/Assets/SoundEffects/openBottle.wav.meta new file mode 100644 index 00000000..b56abb25 --- /dev/null +++ b/3d Prototyp/Assets/SoundEffects/openBottle.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d647b03d56624144da03357426647bb1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/SoundEffects/sip.wav b/3d Prototyp/Assets/SoundEffects/sip.wav new file mode 100644 index 00000000..debb6b0a Binary files /dev/null and b/3d Prototyp/Assets/SoundEffects/sip.wav differ diff --git a/3d Prototyp/Assets/SoundEffects/sip.wav.meta b/3d Prototyp/Assets/SoundEffects/sip.wav.meta new file mode 100644 index 00000000..6695d096 --- /dev/null +++ b/3d Prototyp/Assets/SoundEffects/sip.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 73998fb8d43efca4085260ce6a1e7834 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/Assets/ToiletManager.cs b/3d Prototyp/Assets/ToiletManager.cs index 7063f47e..08d5cf0d 100644 --- a/3d Prototyp/Assets/ToiletManager.cs +++ b/3d Prototyp/Assets/ToiletManager.cs @@ -6,4 +6,6 @@ using Utility; public class ToiletManager : MonoBehaviourSingleton { public bool IsOccupied; + + public Toilette Toilette; } diff --git a/3d Prototyp/Assets/Toilette.cs b/3d Prototyp/Assets/Toilette.cs new file mode 100644 index 00000000..8fea380d --- /dev/null +++ b/3d Prototyp/Assets/Toilette.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Toilette : MonoBehaviour +{ + public AudioSource AudioSource; + + private bool _canFlush = true; + + public void Flush() + { + if (_canFlush) + StartCoroutine(FlushRoutine()); + + } + + private IEnumerator FlushRoutine() + { + _canFlush = false; + + AudioSource.Play(); + + yield return new WaitForSeconds(5); + + _canFlush = true; + } +} diff --git a/3d Prototyp/Assets/Toilette.cs.meta b/3d Prototyp/Assets/Toilette.cs.meta new file mode 100644 index 00000000..9373a4b8 --- /dev/null +++ b/3d Prototyp/Assets/Toilette.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b2aba106a2b6a544b8cf8c12c021528c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/3d Prototyp/License.txt b/3d Prototyp/License.txt index 2e2273ca..37de665a 100644 --- a/3d Prototyp/License.txt +++ b/3d Prototyp/License.txt @@ -4,4 +4,17 @@ TODO: Zu erwähnende Credits: Vending Machine by Marcel van Duijn: https://sketchfab.com/3d-models/empty-vending-machine-5839da52996147cbb3a4a2364b1bf894 Sounds: -Button click microswitch by michaelkoehler: https://freesound.org/people/michaelkoehler/sounds/219015/ \ No newline at end of file +Button click microswitch by michaelkoehler: https://freesound.org/people/michaelkoehler/sounds/219015/ + +Klospühlung by tosha73: https://freesound.org/people/tosha73/sounds/545577/ +Vending Machine by rjonander6: https://freesound.org/people/rjonander6/sounds/250962/ +Coffee Machine by ReyDros: https://freesound.org/people/ReyDros/sounds/327050/ +Open Bottle by michaelkoehler: https://freesound.org/people/michaelkoehler/sounds/207191/ +Eat Sound by TheDragonsSpark: https://freesound.org/people/TheDragonsSpark/sounds/543386/ +Drink Coffee by EverydayEldritch.com: https://freesound.org/people/EverydayEldritch.com/sounds/627922/ + +hurt2.wav by thecheeseman: https://freesound.org/people/thecheeseman/sounds/44429/ + +https://assetstore.unity.com/packages/3d/environments/barrier-traffic-cone-pack-82549 +https://assetstore.unity.com/packages/3d/vehicles/ukraine-free-cars-191822 +https://assetstore.unity.com/packages/3d/vehicles/land/low-poly-playable-vehicles-154577 \ No newline at end of file