From 79f3d731d06c93ae230ea8e92d8a61cc2face5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Tue, 9 Apr 2024 02:47:54 +0200 Subject: [PATCH] So jetzt aber --- 3d Prototyp/Assets/Scenes/GameJamScene.unity | 779 +++++++++++++++++- 3d Prototyp/Assets/Scripts/Developer.cs | 24 +- 3d Prototyp/Assets/Scripts/GameManager.cs | 12 +- 3d Prototyp/Assets/Scripts/MusicManager.cs | 5 + 3d Prototyp/Assets/Scripts/Text2Speech.cs | 4 +- 3d Prototyp/Assets/Scripts/UiController.cs | 5 +- 3d Prototyp/Assets/Scripts/Zeitschaltuhr.cs | 11 + .../ProjectSettings/EditorBuildSettings.asset | 5 +- .../ProjectSettings/ProjectSettings.asset | 8 +- 9 files changed, 823 insertions(+), 30 deletions(-) diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index 13165468..d47f1ada 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -4585,6 +4585,140 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.0274248, y: 1, z: 1.0274248} m_Center: {x: 0, y: 0.5, z: 0.00000047683716} +--- !u!1 &101523460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 101523461} + - component: {fileID: 101523463} + - component: {fileID: 101523462} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &101523461 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101523460} + 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: 765193883} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 85} + m_SizeDelta: {x: 384, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &101523462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101523460} + 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: Game vs Jam + 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: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 61.3 + m_fontSizeBase: 61.3 + m_fontWeight: 400 + m_enableAutoSizing: 0 + 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!222 &101523463 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101523460} + m_CullTransparentMesh: 1 --- !u!1 &101611812 GameObject: m_ObjectHideFlags: 0 @@ -12902,6 +13036,139 @@ Transform: - {fileID: 685304762} m_Father: {fileID: 316659966} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &262439740 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 262439741} + - component: {fileID: 262439744} + - component: {fileID: 262439743} + - component: {fileID: 262439742} + m_Layer: 5 + m_Name: BeendenBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &262439741 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262439740} + 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: 565147717} + m_Father: {fileID: 765193883} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 250, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &262439742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262439740} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 262439743} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1086008407} + m_TargetAssemblyTypeName: UiController, Assembly-CSharp + m_MethodName: Exit + 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 &262439743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262439740} + 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: 0.9528302, g: 0.4951411, b: 0.4269758, 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: 5 +--- !u!222 &262439744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262439740} + m_CullTransparentMesh: 1 --- !u!1 &263135501 GameObject: m_ObjectHideFlags: 0 @@ -14841,6 +15108,17 @@ MonoBehaviour: m_EditorClassIdentifier: IsOccupied: 0 Toilette: {fileID: 2051823395} +--- !u!114 &322315151 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + m_PrefabInstance: {fileID: 603450951} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 322315138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4c31bfd8f0f10f540b73de81aac6d46c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &324516778 GameObject: m_ObjectHideFlags: 0 @@ -27156,6 +27434,140 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 562559327} m_Mesh: {fileID: 6163357941915963767, guid: 99286866f8c285b45a392bf9e5b35bd7, type: 3} +--- !u!1 &565147716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 565147717} + - component: {fileID: 565147719} + - component: {fileID: 565147718} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &565147717 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565147716} + 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: 262439741} + 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!114 &565147718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565147716} + 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: "Zur\xFCck zum Desktop" + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + 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!222 &565147719 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565147716} + m_CullTransparentMesh: 1 --- !u!1 &565533260 GameObject: m_ObjectHideFlags: 0 @@ -35785,6 +36197,84 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 764068527} m_Mesh: {fileID: 5375582512751788850, guid: f47c08ee0d8c52d40bf295cd48a04da7, type: 3} +--- !u!1 &765193882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 765193883} + - component: {fileID: 765193885} + - component: {fileID: 765193884} + m_Layer: 5 + m_Name: StartScreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &765193883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765193882} + 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: 101523461} + - {fileID: 1555701392} + - {fileID: 262439741} + m_Father: {fileID: 1086008406} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 459, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &765193884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765193882} + 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: 0.96853364, b: 0.7327044, 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: bd8b00590bd896c448dbcb3744141c9a, 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: 1 +--- !u!222 &765193885 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765193882} + m_CullTransparentMesh: 1 --- !u!1 &766208560 GameObject: m_ObjectHideFlags: 0 @@ -49967,6 +50457,7 @@ RectTransform: - {fileID: 1247192165} - {fileID: 1978069901} - {fileID: 399496949} + - {fileID: 765193883} - {fileID: 880487497} - {fileID: 1570609272} m_Father: {fileID: 0} @@ -50031,6 +50522,7 @@ MonoBehaviour: m_NumAlphaKeys: 2 WinScreen: {fileID: 880487496} LoseScreen: {fileID: 1570609271} + StartScreen: {fileID: 765193882} --- !u!1001 &1086036410 PrefabInstance: m_ObjectHideFlags: 0 @@ -58378,8 +58870,9 @@ MonoBehaviour: HungerDrainFactor: 1 UrinationDrainFactor: 1 HappinessDrainFactor: 1 - CoffeePreference: 0.5 - MatePreference: 0.5 + UrinationUrgeFromCoffee: 0.2 + UrinationUrgeFromMate: 0.2 + UrinationUrgeFromPizza: 0.2 _talkRange: 2 _currentEfficiency: 1 _fingersLeft: 10 @@ -60786,6 +61279,140 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1353133798} m_Mesh: {fileID: 4300004, guid: 9bb588823d8da76499558fe774532400, type: 3} +--- !u!1 &1357482903 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1357482904} + - component: {fileID: 1357482906} + - component: {fileID: 1357482905} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1357482904 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357482903} + 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: 1555701392} + 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!114 &1357482905 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357482903} + 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: Spiel starten + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + 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!222 &1357482906 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357482903} + m_CullTransparentMesh: 1 --- !u!1 &1360515867 GameObject: m_ObjectHideFlags: 0 @@ -66961,8 +67588,9 @@ MonoBehaviour: HungerDrainFactor: 0.79 UrinationDrainFactor: 2 HappinessDrainFactor: 0.82 - CoffeePreference: 0.5 - MatePreference: 0.5 + UrinationUrgeFromCoffee: 0.2 + UrinationUrgeFromMate: 0.2 + UrinationUrgeFromPizza: 0.2 _talkRange: 2 _currentEfficiency: 1 _fingersLeft: 10 @@ -69982,6 +70610,139 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.0274248, y: 1, z: 1.0274248} m_Center: {x: 0, y: 0.5, z: 0.00000047683716} +--- !u!1 &1555701391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1555701392} + - component: {fileID: 1555701395} + - component: {fileID: 1555701394} + - component: {fileID: 1555701393} + m_Layer: 5 + m_Name: StartGameBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1555701392 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555701391} + 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: 1357482904} + m_Father: {fileID: 765193883} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1555701393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555701391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1555701394} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 322315151} + m_TargetAssemblyTypeName: GameManager, Assembly-CSharp + m_MethodName: StartGame + 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 &1555701394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555701391} + 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: 0, g: 0.8113208, b: 0.06269233, 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: 5 +--- !u!222 &1555701395 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555701391} + m_CullTransparentMesh: 1 --- !u!1 &1556748907 GameObject: m_ObjectHideFlags: 0 @@ -86669,8 +87430,9 @@ MonoBehaviour: HungerDrainFactor: 1.36 UrinationDrainFactor: 0.88 HappinessDrainFactor: 0.94 - CoffeePreference: 0.5 - MatePreference: 0.5 + UrinationUrgeFromCoffee: 0.2 + UrinationUrgeFromMate: 0.2 + UrinationUrgeFromPizza: 0.2 _talkRange: 2 _currentEfficiency: 1 _fingersLeft: 10 @@ -93229,8 +93991,9 @@ MonoBehaviour: HungerDrainFactor: 1.17 UrinationDrainFactor: 0.75 HappinessDrainFactor: 0.97 - CoffeePreference: 0.5 - MatePreference: 0.5 + UrinationUrgeFromCoffee: 0.2 + UrinationUrgeFromMate: 0.2 + UrinationUrgeFromPizza: 0.2 _talkRange: 2 _currentEfficiency: 1 _fingersLeft: 10 diff --git a/3d Prototyp/Assets/Scripts/Developer.cs b/3d Prototyp/Assets/Scripts/Developer.cs index ec47ea20..de0c14cd 100644 --- a/3d Prototyp/Assets/Scripts/Developer.cs +++ b/3d Prototyp/Assets/Scripts/Developer.cs @@ -19,12 +19,12 @@ public struct DeveloperStats public double HungerDrainFactor; public double UrinationDrainFactor; public double HappinessDrainFactor; + public double UrinationUrgeFromCoffee; + public double UrinationUrgeFromMate; + public double UrinationUrgeFromPizza; - // TODO: Not yet used - public double CoffeePreference; - public double MatePreference; - public DeveloperStats(double baseEfficiency, int fingers, double caffeineDrainFactor, double hungerDrainFactor, double urinationDrainFactor, double happinessDrainFactor, double coffeePreference, double matePreference) + public DeveloperStats(double baseEfficiency, int fingers, double caffeineDrainFactor, double hungerDrainFactor, double urinationDrainFactor, double happinessDrainFactor, double urinationUrgeFromCoffee, double urinationUrgeFromMate, double urinationUrgeFromPizza) { BaseEfficiency = baseEfficiency; Fingers = fingers; @@ -32,11 +32,12 @@ public struct DeveloperStats HungerDrainFactor = hungerDrainFactor; UrinationDrainFactor = urinationDrainFactor; HappinessDrainFactor = happinessDrainFactor; - CoffeePreference = coffeePreference; - MatePreference = matePreference; + UrinationUrgeFromCoffee = urinationUrgeFromCoffee; + UrinationUrgeFromMate = urinationUrgeFromMate; + UrinationUrgeFromPizza = urinationUrgeFromPizza; } - public static readonly DeveloperStats Default = new DeveloperStats(1.0, 10, 1, 1, 1, 1, 0.5, 0.5); + public static readonly DeveloperStats Default = new DeveloperStats(1.0, 10, 1, 1, 1, 1, 0.2, 0.2, 0.2); } public class Developer : MonoBehaviour @@ -242,7 +243,10 @@ public class Developer : MonoBehaviour _happiness += 0.2; } - _urgeToUrinateLevel -= caffeineAmount / 2.0; + if (drinkType == WantedConsumable.Coffee) + _urgeToUrinateLevel -= _baseStats.UrinationUrgeFromCoffee; + else if (drinkType == WantedConsumable.Mate) + _urgeToUrinateLevel -= _baseStats.UrinationUrgeFromMate; _wantedDrink = WantedConsumable.None; @@ -279,7 +283,7 @@ public class Developer : MonoBehaviour _happiness += 0.2; } - _urgeToUrinateLevel -= foodAmount / 2.0; + _urgeToUrinateLevel -= _baseStats.UrinationUrgeFromPizza; _wantedFood = WantedConsumable.None; } @@ -479,7 +483,7 @@ public class Developer : MonoBehaviour return 1.0; // https://easings.net/#easeOutExpo - return _urgeToUrinateLevel / GameManager.Instance.NeedNotificationThreshold; + return 1.0; //_urgeToUrinateLevel / GameManager.Instance.NeedNotificationThreshold; //Math.Abs(_urgeToUrinateLevel - 1.0) < 0.0001f ? 1.0 : 1.0 - Math.Pow(2, -10 * _urgeToUrinateLevel); } diff --git a/3d Prototyp/Assets/Scripts/GameManager.cs b/3d Prototyp/Assets/Scripts/GameManager.cs index 6c7f7bbb..fc5c6489 100644 --- a/3d Prototyp/Assets/Scripts/GameManager.cs +++ b/3d Prototyp/Assets/Scripts/GameManager.cs @@ -77,11 +77,15 @@ public partial class GameManager : MonoBehaviourSingleton /// public double ExpectedRemainingGameDuration => _remainingGameDurationSeconds / _currentEfficiency; + private bool _isStarted; + public bool IsGameRunning => _gameRunning.IsTrue; + + public bool IsStarted => _isStarted; private void Start() { - StartGame(); + //StartGame(); } @@ -89,8 +93,10 @@ public partial class GameManager : MonoBehaviourSingleton /// Startet ein neues Spiel. /// [ContextMenu("Start Game")] - private void StartGame() + public void StartGame() { + _isStarted = true; + TimeManager.Instance.Init(); _contextBuffer = new CircularBuffer(_maxContextBufferSize); @@ -103,7 +109,7 @@ public partial class GameManager : MonoBehaviourSingleton _remainingGameDurationSeconds = _totalGameDurationSeconds; - ResumeGame(); + ResumeGame(); } /// diff --git a/3d Prototyp/Assets/Scripts/MusicManager.cs b/3d Prototyp/Assets/Scripts/MusicManager.cs index 9443d5a9..60ed3ead 100644 --- a/3d Prototyp/Assets/Scripts/MusicManager.cs +++ b/3d Prototyp/Assets/Scripts/MusicManager.cs @@ -83,6 +83,11 @@ public class MusicManager : MonoBehaviourSingleton _showDown = ShowDown.NotYet; } + if (!GameManager.Instance.IsStarted) + { + _showDown = ShowDown.NotYet; + } + if (oldShowDown != _showDown) { switch (_showDown) diff --git a/3d Prototyp/Assets/Scripts/Text2Speech.cs b/3d Prototyp/Assets/Scripts/Text2Speech.cs index 54d1aad0..e07364bc 100644 --- a/3d Prototyp/Assets/Scripts/Text2Speech.cs +++ b/3d Prototyp/Assets/Scripts/Text2Speech.cs @@ -11,8 +11,6 @@ using OpenAI_API.Models; using System.Threading.Tasks; using Newtonsoft.Json.Linq; using System.Collections.Generic; -using Google.Cloud.TextToSpeech.V1; -using Palmmedia.ReportGenerator.Core; [Serializable] public class TextToSpeechResponse @@ -140,7 +138,7 @@ public class Text2Speech : MonoBehaviour if (filteredVoices.Count > 0) { - // Auswahl einer zufälligen Stimme aus den gefilterten Ergebnissen + // Auswahl einer zuf�lligen Stimme aus den gefilterten Ergebnissen var randomVoice = filteredVoices[UnityEngine.Random.Range(0, filteredVoices.Count)]; System.Random random = new System.Random(); diff --git a/3d Prototyp/Assets/Scripts/UiController.cs b/3d Prototyp/Assets/Scripts/UiController.cs index 09d2333c..4d1ad575 100644 --- a/3d Prototyp/Assets/Scripts/UiController.cs +++ b/3d Prototyp/Assets/Scripts/UiController.cs @@ -41,9 +41,12 @@ public class UiController : MonoBehaviour public GameObject WinScreen; public GameObject LoseScreen; + public GameObject StartScreen; void Update() { + StartScreen.SetActive(!GameManager.Instance.IsStarted); + UpdateActionDisplay(); UpdateProgressBar(); UpdateDeadlineDateStuffTexts(); @@ -113,7 +116,7 @@ public class UiController : MonoBehaviour public void Exit() { - UnityEditor.EditorApplication.isPlaying = false; + //UnityEditor.EditorApplication.isPlaying = false; Application.Quit(); } } diff --git a/3d Prototyp/Assets/Scripts/Zeitschaltuhr.cs b/3d Prototyp/Assets/Scripts/Zeitschaltuhr.cs index 67f43e76..8a314172 100644 --- a/3d Prototyp/Assets/Scripts/Zeitschaltuhr.cs +++ b/3d Prototyp/Assets/Scripts/Zeitschaltuhr.cs @@ -58,6 +58,17 @@ public class Zeitschaltuhr : MonoBehaviour, ISerializationCallbackReceiver void UpdateOn() { + if (!GameManager.Instance.IsStarted) + { + bool wasOn = IsOn; + IsOn = false; + if (IsOn != wasOn) + { + UpdateChildren(); + } + return; + } + if (_turnOnTimeSpan < _turnOffTimeSpan) { // beide Zeiten am selben Tag diff --git a/3d Prototyp/ProjectSettings/EditorBuildSettings.asset b/3d Prototyp/ProjectSettings/EditorBuildSettings.asset index 0147887e..f41a2939 100644 --- a/3d Prototyp/ProjectSettings/EditorBuildSettings.asset +++ b/3d Prototyp/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/GameJamScene.unity + guid: f1369b80ccf53544f914c438187da217 m_configObjects: {} diff --git a/3d Prototyp/ProjectSettings/ProjectSettings.asset b/3d Prototyp/ProjectSettings/ProjectSettings.asset index 955a4f03..d5b6e3fd 100644 --- a/3d Prototyp/ProjectSettings/ProjectSettings.asset +++ b/3d Prototyp/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: 3d Prototyp + companyName: Nackenbox GmbH + productName: Game vs Jam defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -139,7 +139,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1 + bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -161,7 +161,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Standalone: com.DefaultCompany.3d-Prototyp + Standalone: com.Nackenbox-GmbH.Game-vs-Jam buildNumber: Standalone: 0 VisionOS: 0