From 630e9d96de3a9191a0e256cea53bb72cfc3bf4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Mon, 8 Apr 2024 19:19:16 +0200 Subject: [PATCH 1/4] Gayjam --- 3d Prototyp/Assets/Scenes/GameJamScene.unity | 4 ++++ 3d Prototyp/Assets/Scripts/Developer.cs | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index 8f064fcb..22148481 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -27898,6 +27898,10 @@ PrefabInstance: propertyPath: _player value: objectReference: {fileID: 1573807344} + - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + propertyPath: Needs.Array.size + value: 4 + objectReference: {fileID: 0} - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} propertyPath: _developers.Array.size value: 4 diff --git a/3d Prototyp/Assets/Scripts/Developer.cs b/3d Prototyp/Assets/Scripts/Developer.cs index bcfb5bd2..a43e9414 100644 --- a/3d Prototyp/Assets/Scripts/Developer.cs +++ b/3d Prototyp/Assets/Scripts/Developer.cs @@ -237,7 +237,7 @@ public class Developer : MonoBehaviour _happiness += 0.2; } - _urgeToUrinateLevel -= caffeineAmount / 0.5f; + _urgeToUrinateLevel -= caffeineAmount / 2.0; _wantedDrink = WantedConsumable.None; } @@ -272,7 +272,7 @@ public class Developer : MonoBehaviour _happiness += 0.2; } - _urgeToUrinateLevel -= foodAmount / 0.5f; + _urgeToUrinateLevel -= foodAmount / 2.0; _wantedFood = WantedConsumable.None; } From defd3598522d26c67477bb71cb65ef80a3cbed1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Mon, 8 Apr 2024 20:33:29 +0200 Subject: [PATCH 2/4] Entwickler machen ein paar Sachen --- .../Animations/NPCAnimationController.cs | 93 ++++++++---- ...P Upgrade (2019.4 LTS +).unitypackage.meta | 7 - 3d Prototyp/Assets/DeveloperInfoUi.cs | 2 +- 3d Prototyp/Assets/Scenes/GameJamScene.unity | 141 +++++++++++++++--- 3d Prototyp/Assets/Scripts/Developer.cs | 27 +++- 3d Prototyp/Assets/Scripts/TimeManager.cs | 9 +- 3d Prototyp/Assets/Scripts/UiController.cs | 2 +- 3d Prototyp/Assets/ToiletManager.cs | 9 ++ 3d Prototyp/Assets/ToiletManager.cs.meta | 11 ++ 9 files changed, 236 insertions(+), 65 deletions(-) delete mode 100644 3d Prototyp/Assets/Confetti FX/Upgrade/Confetti FX URP Upgrade (2019.4 LTS +).unitypackage.meta create mode 100644 3d Prototyp/Assets/ToiletManager.cs create mode 100644 3d Prototyp/Assets/ToiletManager.cs.meta diff --git a/3d Prototyp/Assets/Animations/NPCAnimationController.cs b/3d Prototyp/Assets/Animations/NPCAnimationController.cs index 2e131175..0d6fff3d 100644 --- a/3d Prototyp/Assets/Animations/NPCAnimationController.cs +++ b/3d Prototyp/Assets/Animations/NPCAnimationController.cs @@ -16,6 +16,11 @@ public class NPCAnimationController : MonoBehaviour private NavMeshAgent agent; private Animator animator; + public Developer Developer; + + [SerializeField] + private bool _canTakeNewJob; + private void Awake() { agent = GetComponent(); @@ -25,21 +30,23 @@ public class NPCAnimationController : MonoBehaviour } private IEnumerator GetToWorkRoutine() { + yield return TakeLock(); + animator.SetLayerWeight(animator.GetLayerIndex("Typing"), 0); animator.SetTrigger("Walk"); yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("WalkBack")); MoveTo(workPosition.position); yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance); - animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zurück + animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zur�ck animator.SetTrigger("SitDown"); yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Sit")); transform.rotation = workPosition.rotation; yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 1, 1f)); + + ReleaseLock(); } - - - private IEnumerator FadeLayerWeight(int layerIndex, float targetWeight, float duration) + private IEnumerator FadeLayerWeight(int layerIndex, float targetWeight, float duration) { float time = 0; float startWeight = animator.GetLayerWeight(layerIndex); @@ -56,15 +63,25 @@ public class NPCAnimationController : MonoBehaviour public void DrinkCoffee() { - - StartCoroutine(DrinkCoffeeRoutine()); - } + private IEnumerator TakeLock() + { + yield return new WaitUntil(() => _canTakeNewJob); + + _canTakeNewJob = false; + } + + private void ReleaseLock() + { + _canTakeNewJob = true; + } + private IEnumerator DrinkCoffeeRoutine() { - + yield return TakeLock(); + yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Coffee"), 1, 1f)); // 1 Sekunde zum Einblenden animator.SetTrigger("DrinkCoffee"); yield return new WaitForSeconds(1.5f); @@ -78,7 +95,7 @@ public class NPCAnimationController : MonoBehaviour animator.ResetTrigger("DrinkCoffee"); Cup.SetActive(true); - + ReleaseLock(); } public void GoToToilet() @@ -88,7 +105,17 @@ public class NPCAnimationController : MonoBehaviour private IEnumerator GoToToiletRoutine() { + yield return TakeLock(); + yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 0, 1f)); + + while (ToiletManager.Instance.IsOccupied) + { + yield return new WaitForSeconds(2); + } + + ToiletManager.Instance.IsOccupied = true; + // Beginne mit dem Laufen zur Toilette. animator.SetTrigger("Walk"); yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Walk")); @@ -97,24 +124,33 @@ public class NPCAnimationController : MonoBehaviour yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance); - // Hört auf zu laufen und beginnt zu sitzen. - animator.ResetTrigger("Walk"); // Es ist wichtig, den vorherigen Trigger zurückzusetzen + // H�rt auf zu laufen und beginnt zu sitzen. + animator.ResetTrigger("Walk"); // Es ist wichtig, den vorherigen Trigger zur�ckzusetzen transform.LookAt(new Vector3(toiletLookAtTransform.position.x, toiletLookAtTransform.position.y, toiletLookAtTransform.position.z)); animator.SetTrigger("SitDown"); + transform.LookAt(new Vector3(toiletLookAtTransform.position.x, toiletLookAtTransform.position.y, toiletLookAtTransform.position.z)); yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Ready")); - // Stehe auf und gehe zurück zum Ausgangspunkt. + + Developer.Pee(1.0, true); + + // 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 + animator.ResetTrigger("SitDown"); // Setze den Sitzen-Trigger zur�ck + + ToiletManager.Instance.IsOccupied = false; + animator.SetTrigger("Walk"); yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("WalkBack")); MoveTo(workPosition.position); yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance); - animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zurück + animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zur�ck animator.SetTrigger("SitDown"); yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Sit")); transform.rotation = workPosition.rotation; yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 1, 1f)); + + ReleaseLock(); } // Hier kannst du entscheiden, ob der Charakter wieder sitzt oder steht. // Beispiel: Setze IsSitting oder IsStanding entsprechend. @@ -126,12 +162,15 @@ public class NPCAnimationController : MonoBehaviour private IEnumerator GettingMadRoutine() { + yield return TakeLock(); + animator.SetTrigger("GetMad"); yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Coffee"), 1, 2f)); // 1 Sekunde zum Einblenden yield return new WaitForSeconds(8f); yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Coffee"), 0, 1f)); // 1 Sekunde zum Ausblenden animator.ResetTrigger("GetMad"); - + + ReleaseLock(); } public void CaffeinOverdose() @@ -141,6 +180,8 @@ public class NPCAnimationController : MonoBehaviour private IEnumerator CaffeinRoutine() { + yield return TakeLock(); + yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 0, 1f)); // Beginne mit dem Laufen zur Toilette. animator.SetTrigger("Walk"); @@ -149,24 +190,23 @@ public class NPCAnimationController : MonoBehaviour yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance); animator.ResetTrigger("Walk"); animator.SetTrigger("TooMuchCaffein"); - yield return new WaitForSeconds(8f); + + yield return new WaitWhile(() => Developer.IsOvercaffeinated); + animator.ResetTrigger("TooMuchCaffein"); animator.SetTrigger("Walk"); yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("WalkBack")); MoveTo(workPosition.position); yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance); transform.rotation = workPosition.rotation; - animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zurück + animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zur�ck animator.SetTrigger("SitDown"); yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Sit")); yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 1, 1f)); - - - + + ReleaseLock(); } - - private void MoveTo(Vector3 destination) { agent.destination = destination; @@ -175,28 +215,27 @@ public class NPCAnimationController : MonoBehaviour private void Update() { - // Prüft, ob der Buchstabe 'C' gedrückt wurde + // Pr�ft, ob der Buchstabe 'C' gedr�ckt wurde if (Input.GetKeyDown(KeyCode.C)) { DrinkCoffee(); } - // Prüft, ob der Buchstabe 'T' gedrückt wurde + // Pr�ft, ob der Buchstabe 'T' gedr�ckt wurde if (Input.GetKeyDown(KeyCode.T)) { GoToToilet(); } - // Prüft, ob der Buchstabe 'M' gedrückt wurde + // Pr�ft, ob der Buchstabe 'M' gedr�ckt wurde if (Input.GetKeyDown(KeyCode.M)) { GettingMad(); } - // Prüft, ob der Buchstabe 'C' gedrückt wurde + // Pr�ft, ob der Buchstabe 'C' gedr�ckt wurde if (Input.GetKeyDown(KeyCode.O)) { CaffeinOverdose(); } } - } diff --git a/3d Prototyp/Assets/Confetti FX/Upgrade/Confetti FX URP Upgrade (2019.4 LTS +).unitypackage.meta b/3d Prototyp/Assets/Confetti FX/Upgrade/Confetti FX URP Upgrade (2019.4 LTS +).unitypackage.meta deleted file mode 100644 index 51cb9f68..00000000 --- a/3d Prototyp/Assets/Confetti FX/Upgrade/Confetti FX URP Upgrade (2019.4 LTS +).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 73951a4b66414d24999d439134425a40 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/3d Prototyp/Assets/DeveloperInfoUi.cs b/3d Prototyp/Assets/DeveloperInfoUi.cs index 994e7e9d..7c52f5eb 100644 --- a/3d Prototyp/Assets/DeveloperInfoUi.cs +++ b/3d Prototyp/Assets/DeveloperInfoUi.cs @@ -38,7 +38,7 @@ public class DeveloperInfoUi : MonoBehaviour // Update is called once per frame void Update() { - _happinessImage.color = _statusGradient.Evaluate((float)_developer.CurrentUrgeToUrinate); + _happinessImage.color = _statusGradient.Evaluate((float)_developer.CurrentHappiness); _caffeineImage.color = _statusGradient.Evaluate((float)_developer.CurrentCaffeination); _hungerImage.color = _statusGradient.Evaluate((float)_developer.CurrentHunger); _toiletImage.color = _statusGradient.Evaluate((float)_developer.CurrentUrgeToUrinate); diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index 22148481..c639bb1f 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -1606,6 +1606,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 6540681369557983152, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} insertIndex: -1 addedObject: {fileID: 1961302941} + - targetCorrespondingSourceObject: {fileID: 6540681369557983152, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} + insertIndex: -1 + addedObject: {fileID: 1961302943} m_SourcePrefab: {fileID: 100100000, guid: d77999c19b7f3294599d4029e5b08ace, type: 3} --- !u!4 &30470408 stripped Transform: @@ -12085,7 +12088,7 @@ Transform: m_GameObject: {fileID: 249942517} serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.88022256, z: -0, w: 0.47456104} - m_LocalPosition: {x: -0.085, y: 0.155, z: -0.13} + m_LocalPosition: {x: -0.22, y: 0.155, z: -0.365} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -14328,6 +14331,19 @@ MonoBehaviour: _secondsPerDay: 120 _totalTime: 0 _sun: {fileID: 124226107} +--- !u!114 &322315147 +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: 459a8de1571412a44927af6c9cc4ef5e, type: 3} + m_Name: + m_EditorClassIdentifier: + IsOccupied: 0 --- !u!1 &324516778 GameObject: m_ObjectHideFlags: 0 @@ -24016,6 +24032,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 6839065564630337043, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} insertIndex: -1 addedObject: {fileID: 1295157960} + - targetCorrespondingSourceObject: {fileID: 6839065564630337043, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1295157962} m_SourcePrefab: {fileID: 100100000, guid: 950f64c9c1d51e14b84b4e4d4a7b775a, type: 3} --- !u!4 &523081034 stripped Transform: @@ -27902,10 +27921,30 @@ PrefabInstance: propertyPath: Needs.Array.size value: 4 objectReference: {fileID: 0} + - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + propertyPath: Needs.Array.data[0] + value: + objectReference: {fileID: 2907046783514947559, guid: 92b71cfc6a2687d44b165ead746233f0, type: 3} + - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + propertyPath: Needs.Array.data[1] + value: + objectReference: {fileID: 3355435593704932208, guid: b31fb59d198e53b459943bf898293618, type: 3} + - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + propertyPath: Needs.Array.data[2] + value: + objectReference: {fileID: 7697340910557049827, guid: 5d809e3a343d45f4185615db92384dc7, type: 3} + - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + propertyPath: Needs.Array.data[3] + value: + objectReference: {fileID: 2350437210533342175, guid: 2122156ae265fcc4da01213f31a64901, type: 3} - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} propertyPath: _developers.Array.size value: 4 objectReference: {fileID: 0} + - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + propertyPath: _generalNeedDrainScaling + value: 0.01 + objectReference: {fileID: 0} - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} propertyPath: _developers.Array.data[0] value: @@ -27933,6 +27972,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 2703668081068178613, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} insertIndex: -1 addedObject: {fileID: 322315144} + - targetCorrespondingSourceObject: {fileID: 2703668081068178613, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} + insertIndex: -1 + addedObject: {fileID: 322315147} m_SourcePrefab: {fileID: 100100000, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} --- !u!1 &604851636 GameObject: @@ -56397,16 +56439,17 @@ MonoBehaviour: _caffeineLevel: 1 _hungerLevel: 1 _urgeToUrinateLevel: 1 - _happiness: 0.75 + _happiness: 1 _isSleeping: 0 _isHyperactive: 0 _isOvercaffeinated: 0 - _developerNeeds: {fileID: 1502578694} + _developerNeeds: {fileID: 1295157962} _caffeineNeed: {fileID: 0} _wantedDrink: 0 _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _npcAnimation: {fileID: 1295157958} _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!82 &1295157950 @@ -56595,7 +56638,7 @@ NavMeshAgent: m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 - m_StoppingDistance: 0 + m_StoppingDistance: 0.2 m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 m_AutoRepath: 1 @@ -56621,6 +56664,8 @@ MonoBehaviour: toiletTransform: {fileID: 249942518} dancePlace: {fileID: 677901836} toiletLookAtTransform: {fileID: 2024028214} + Developer: {fileID: 1295157948} + _canTakeNewJob: 1 --- !u!114 &1295157960 MonoBehaviour: m_ObjectHideFlags: 0 @@ -56640,6 +56685,18 @@ MonoBehaviour: m_IgnoreFromBuild: 1 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff +--- !u!114 &1295157962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295157946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f7e417f330c4dd845a8f3dc744dff25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1295976273 GameObject: m_ObjectHideFlags: 0 @@ -64953,10 +65010,10 @@ MonoBehaviour: _baseStats: BaseEfficiency: 1 Fingers: 10 - CaffeineDrainFactor: 1 - HungerDrainFactor: 1 - UrinationDrainFactor: 1 - HappinessDrainFactor: 1 + CaffeineDrainFactor: 1.21 + HungerDrainFactor: 0.79 + UrinationDrainFactor: 2 + HappinessDrainFactor: 0.82 CoffeePreference: 0.5 MatePreference: 0.5 _talkRange: 2 @@ -64965,7 +65022,7 @@ MonoBehaviour: _caffeineLevel: 1 _hungerLevel: 1 _urgeToUrinateLevel: 1 - _happiness: 0.75 + _happiness: 1 _isSleeping: 0 _isHyperactive: 0 _isOvercaffeinated: 0 @@ -64975,6 +65032,7 @@ MonoBehaviour: _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _npcAnimation: {fileID: 1502578698} _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!114 &1502578688 @@ -65179,6 +65237,8 @@ MonoBehaviour: toiletTransform: {fileID: 249942518} dancePlace: {fileID: 677901836} toiletLookAtTransform: {fileID: 2024028214} + Developer: {fileID: 1502578686} + _canTakeNewJob: 1 --- !u!195 &1502578699 NavMeshAgent: m_ObjectHideFlags: 0 @@ -65193,7 +65253,7 @@ NavMeshAgent: m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 - m_StoppingDistance: 0 + m_StoppingDistance: 0.2 m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 m_AutoRepath: 1 @@ -83920,10 +83980,10 @@ MonoBehaviour: _baseStats: BaseEfficiency: 1 Fingers: 10 - CaffeineDrainFactor: 1 - HungerDrainFactor: 1 - UrinationDrainFactor: 1 - HappinessDrainFactor: 1 + CaffeineDrainFactor: 0.82 + HungerDrainFactor: 1.36 + UrinationDrainFactor: 0.88 + HappinessDrainFactor: 0.94 CoffeePreference: 0.5 MatePreference: 0.5 _talkRange: 2 @@ -83932,16 +83992,17 @@ MonoBehaviour: _caffeineLevel: 1 _hungerLevel: 1 _urgeToUrinateLevel: 1 - _happiness: 0.75 + _happiness: 1 _isSleeping: 0 _isHyperactive: 0 _isOvercaffeinated: 0 - _developerNeeds: {fileID: 1502578694} + _developerNeeds: {fileID: 1961302943} _caffeineNeed: {fileID: 0} _wantedDrink: 0 _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _npcAnimation: {fileID: 1961302939} _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!82 &1961302931 @@ -84130,7 +84191,7 @@ NavMeshAgent: m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 - m_StoppingDistance: 0 + m_StoppingDistance: 0.2 m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 m_AutoRepath: 1 @@ -84156,6 +84217,8 @@ MonoBehaviour: toiletTransform: {fileID: 249942518} dancePlace: {fileID: 677901836} toiletLookAtTransform: {fileID: 2024028214} + Developer: {fileID: 1961302929} + _canTakeNewJob: 1 --- !u!114 &1961302941 MonoBehaviour: m_ObjectHideFlags: 0 @@ -84175,6 +84238,18 @@ MonoBehaviour: m_IgnoreFromBuild: 1 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff +--- !u!114 &1961302943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961302927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f7e417f330c4dd845a8f3dc744dff25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1961564159 GameObject: m_ObjectHideFlags: 0 @@ -90091,6 +90166,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 360020996318003118, guid: c161c997c07308740af96a685231f764, type: 3} insertIndex: -1 addedObject: {fileID: 2100999012} + - targetCorrespondingSourceObject: {fileID: 360020996318003118, guid: c161c997c07308740af96a685231f764, type: 3} + insertIndex: -1 + addedObject: {fileID: 2100999014} m_SourcePrefab: {fileID: 100100000, guid: c161c997c07308740af96a685231f764, type: 3} --- !u!4 &2100998998 stripped Transform: @@ -90113,10 +90191,10 @@ MonoBehaviour: _baseStats: BaseEfficiency: 1 Fingers: 10 - CaffeineDrainFactor: 1 - HungerDrainFactor: 1 - UrinationDrainFactor: 1 - HappinessDrainFactor: 1 + CaffeineDrainFactor: 1.18 + HungerDrainFactor: 1.17 + UrinationDrainFactor: 0.75 + HappinessDrainFactor: 0.97 CoffeePreference: 0.5 MatePreference: 0.5 _talkRange: 2 @@ -90125,16 +90203,17 @@ MonoBehaviour: _caffeineLevel: 1 _hungerLevel: 1 _urgeToUrinateLevel: 1 - _happiness: 0.75 + _happiness: 1 _isSleeping: 0 _isHyperactive: 0 _isOvercaffeinated: 0 - _developerNeeds: {fileID: 1502578694} + _developerNeeds: {fileID: 2100999014} _caffeineNeed: {fileID: 0} _wantedDrink: 0 _hungerNeed: {fileID: 0} _wantedFood: 0 _toiletNeed: {fileID: 0} + _npcAnimation: {fileID: 2100999010} _maxPrivateContextBufferSize: 2 _talkTimer: 0 --- !u!82 &2100999002 @@ -90323,7 +90402,7 @@ NavMeshAgent: m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 - m_StoppingDistance: 0 + m_StoppingDistance: 0.2 m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 m_AutoRepath: 1 @@ -90349,6 +90428,8 @@ MonoBehaviour: toiletTransform: {fileID: 249942518} dancePlace: {fileID: 677901836} toiletLookAtTransform: {fileID: 2024028214} + Developer: {fileID: 2100999000} + _canTakeNewJob: 1 --- !u!114 &2100999012 MonoBehaviour: m_ObjectHideFlags: 0 @@ -90368,6 +90449,18 @@ MonoBehaviour: m_IgnoreFromBuild: 1 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff +--- !u!114 &2100999014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640532114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f7e417f330c4dd845a8f3dc744dff25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2101986002 GameObject: m_ObjectHideFlags: 0 diff --git a/3d Prototyp/Assets/Scripts/Developer.cs b/3d Prototyp/Assets/Scripts/Developer.cs index a43e9414..efc2b35f 100644 --- a/3d Prototyp/Assets/Scripts/Developer.cs +++ b/3d Prototyp/Assets/Scripts/Developer.cs @@ -122,6 +122,8 @@ public class Developer : MonoBehaviour private List _needList = new List(); private bool _isDead = false; + [SerializeField] private NPCAnimationController _npcAnimation; + /// /// indicates wether the Dev is dead or not /// @@ -146,6 +148,9 @@ public class Developer : MonoBehaviour private bool _hasTalkedWhileOvercaffeinated = false; private bool _hasTalkedBeforeSleeping = false; + public bool IsOvercaffeinated => _isOvercaffeinated; + public bool IsHyperactive => _isHyperactive; + void Start() { _developerNeeds = gameObject.GetComponent(); @@ -240,6 +245,8 @@ public class Developer : MonoBehaviour _urgeToUrinateLevel -= caffeineAmount / 2.0; _wantedDrink = WantedConsumable.None; + + _npcAnimation.DrinkCoffee(); } public void GiveFood(double foodAmount, WantedConsumable foodType) @@ -307,15 +314,23 @@ public class Developer : MonoBehaviour _caffeineLevel -= caffeineDrain * _baseStats.CaffeineDrainFactor; _hungerLevel -= hungerDrain * _baseStats.HungerDrainFactor; _urgeToUrinateLevel -= urinationDrain * _baseStats.UrinationDrainFactor; - _happiness -= happinessDrain * _baseStats.UrinationDrainFactor; + _happiness -= happinessDrain * _baseStats.HappinessDrainFactor; _caffeineLevel = Math.Max(_caffeineLevel, 0.0); _hungerLevel = Math.Max(_hungerLevel, 0.0); _urgeToUrinateLevel = Math.Max(_urgeToUrinateLevel, 0.0); _happiness = Math.Max(_happiness, 0.0); - + _isHyperactive = _caffeineLevel > 1.0 && _caffeineLevel <= 1.5; + + bool wasOvercaffeinated = _isOvercaffeinated; _isOvercaffeinated = _caffeineLevel > 1.5; + + if (!wasOvercaffeinated && _isOvercaffeinated) + { + _npcAnimation.CaffeinOverdose(); + } + _isSleeping = _caffeineLevel <= 0.0; if (_caffeineLevel < GameManager.Instance.NeedNotificationThreshold && _caffeineNeed == null) @@ -351,6 +366,8 @@ public class Developer : MonoBehaviour _toiletNeed = _developerNeeds.SpawnToiletNeed(_needList.Count); _needList.Add(_toiletNeed); + + _npcAnimation.GoToToilet(); } if (_hungerLevel <= 0.0) @@ -458,11 +475,13 @@ public class Developer : MonoBehaviour private double CalculateUrinationEfficiency() { - if (_urgeToUrinateLevel > 1.0) + if (_urgeToUrinateLevel > GameManager.Instance.NeedNotificationThreshold) return 1.0; // https://easings.net/#easeOutExpo - return Math.Abs(_urgeToUrinateLevel - 1.0) < 0.0001f ? 1.0 : 1.0 - Math.Pow(2, -10 * _urgeToUrinateLevel); + return _urgeToUrinateLevel / GameManager.Instance.NeedNotificationThreshold; + + //Math.Abs(_urgeToUrinateLevel - 1.0) < 0.0001f ? 1.0 : 1.0 - Math.Pow(2, -10 * _urgeToUrinateLevel); } private double CalculateHappinessEfficiency() diff --git a/3d Prototyp/Assets/Scripts/TimeManager.cs b/3d Prototyp/Assets/Scripts/TimeManager.cs index 3aefa1a9..3f04c28b 100644 --- a/3d Prototyp/Assets/Scripts/TimeManager.cs +++ b/3d Prototyp/Assets/Scripts/TimeManager.cs @@ -47,7 +47,14 @@ public class TimeManager : MonoBehaviourSingleton double realSeconds = GameManager.Instance.ExpectedRemainingGameDuration; double gameDays = realSeconds / _secondsPerDay; - return CurrentDate.AddDays(gameDays); + if (double.IsFinite(gameDays)) + { + return CurrentDate.AddDays(gameDays); + } + else + { + return DateTime.MaxValue; + } } } diff --git a/3d Prototyp/Assets/Scripts/UiController.cs b/3d Prototyp/Assets/Scripts/UiController.cs index 7b916c68..512e378b 100644 --- a/3d Prototyp/Assets/Scripts/UiController.cs +++ b/3d Prototyp/Assets/Scripts/UiController.cs @@ -59,7 +59,7 @@ public class UiController : MonoBehaviour { _currentDateText.text = $"Aktuelle Zeit: {TimeManager.Instance.CurrentDate: dddd dd.MM.yy hh U\\hr}"; _deadlineText.text = $"Deadline: {TimeManager.Instance.Deadline: dddd dd.MM.yy hh U\\hr}"; - _predictedEndText.text = $"Vorraussichtlich fertig: {TimeManager.Instance.PredictedEndDate: dddd dd.MM.yy hh U\\hr}"; + _predictedEndText.text = $"Vorraussichtlich fertig: {(TimeManager.Instance.PredictedEndDate == DateTime.MaxValue ? "Nie" : TimeManager.Instance.PredictedEndDate.ToString("dddd dd.MM.yy hh U\\hr"))}"; _predictedEndText.color = _deadlineTextColors.Evaluate(TimeManager.Instance.PredictedMissesDeadline ? 0.0f : 1.0f); } diff --git a/3d Prototyp/Assets/ToiletManager.cs b/3d Prototyp/Assets/ToiletManager.cs new file mode 100644 index 00000000..7063f47e --- /dev/null +++ b/3d Prototyp/Assets/ToiletManager.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Utility; + +public class ToiletManager : MonoBehaviourSingleton +{ + public bool IsOccupied; +} diff --git a/3d Prototyp/Assets/ToiletManager.cs.meta b/3d Prototyp/Assets/ToiletManager.cs.meta new file mode 100644 index 00000000..95e5ff71 --- /dev/null +++ b/3d Prototyp/Assets/ToiletManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 459a8de1571412a44927af6c9cc4ef5e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 9e59e1980cbcf0bf5f4300158019b44925415333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Mon, 8 Apr 2024 21:24:13 +0200 Subject: [PATCH 3/4] Verlieren und Gewinnen Screen --- .../GUI/BoxesBanners/Box_Rounded.png.meta | 24 +- 3d Prototyp/Assets/Scenes/GameJamScene.unity | 1500 ++++++++++++++++- 3d Prototyp/Assets/Scripts/GameManager.cs | 12 + 3d Prototyp/Assets/Scripts/UiController.cs | 19 + 4 files changed, 1541 insertions(+), 14 deletions(-) diff --git a/3d Prototyp/Assets/GUI/BoxesBanners/Box_Rounded.png.meta b/3d Prototyp/Assets/GUI/BoxesBanners/Box_Rounded.png.meta index e23adb5d..4f669aa1 100644 --- a/3d Prototyp/Assets/GUI/BoxesBanners/Box_Rounded.png.meta +++ b/3d Prototyp/Assets/GUI/BoxesBanners/Box_Rounded.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,24 +37,24 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1000 + spriteBorder: {x: 300, y: 300, z: 300, w: 300} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,8 +112,8 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: - internalID: 0 + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index c639bb1f..bb7a1f99 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -5680,6 +5680,140 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 2.5, y: 0, z: 0} +--- !u!1 &127907486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 127907487} + - component: {fileID: 127907489} + - component: {fileID: 127907488} + 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 &127907487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 127907486} + 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: 880487497} + 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: 86} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &127907488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 127907486} + 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: Gewonnen! + 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: 36 + m_fontSizeBase: 36 + 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 &127907489 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 127907486} + m_CullTransparentMesh: 1 --- !u!1 &128378054 GameObject: m_ObjectHideFlags: 0 @@ -6553,6 +6687,139 @@ Transform: - {fileID: 466205925} m_Father: {fileID: 412768063} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &142802509 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 142802510} + - component: {fileID: 142802513} + - component: {fileID: 142802512} + - component: {fileID: 142802511} + m_Layer: 5 + m_Name: NochmalBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &142802510 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 142802509} + 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: 2001887186} + m_Father: {fileID: 1570609272} + 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 &142802511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 142802509} + 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: 142802512} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1086008407} + m_TargetAssemblyTypeName: UiController, Assembly-CSharp + m_MethodName: Replay + 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 &142802512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 142802509} + 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 &142802513 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 142802509} + m_CullTransparentMesh: 1 --- !u!1001 &144134079 PrefabInstance: m_ObjectHideFlags: 0 @@ -14328,7 +14595,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _daysUntilRelease: 7 - _secondsPerDay: 120 + _secondsPerDay: 5 _totalTime: 0 _sun: {fileID: 124226107} --- !u!114 &322315147 @@ -16287,6 +16554,139 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 360192000} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1 &360522563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 360522564} + - component: {fileID: 360522567} + - component: {fileID: 360522566} + - component: {fileID: 360522565} + m_Layer: 5 + m_Name: BeendenBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &360522564 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360522563} + 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: 605336534} + m_Father: {fileID: 880487497} + 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 &360522565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360522563} + 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: 360522566} + 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 &360522566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360522563} + 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 &360522567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360522563} + m_CullTransparentMesh: 1 --- !u!1 &363480631 GameObject: m_ObjectHideFlags: 0 @@ -16432,6 +16832,140 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8b405645f944e0042afcad997d3a5866, type: 3} +--- !u!1 &364405134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 364405135} + - component: {fileID: 364405137} + - component: {fileID: 364405136} + 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 &364405135 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364405134} + 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: 1570609272} + 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: 86} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &364405136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364405134} + 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: Verloren + 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: 36 + m_fontSizeBase: 36 + 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 &364405137 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364405134} + m_CullTransparentMesh: 1 --- !u!1 &365565147 GameObject: m_ObjectHideFlags: 0 @@ -27943,7 +28477,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} propertyPath: _generalNeedDrainScaling - value: 0.01 + value: 0.005 objectReference: {fileID: 0} - target: {fileID: 3650884189301972455, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3} propertyPath: _developers.Array.data[0] @@ -28059,6 +28593,140 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 604851636} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1 &605336533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 605336534} + - component: {fileID: 605336536} + - component: {fileID: 605336535} + 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 &605336534 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605336533} + 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: 360522564} + 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 &605336535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605336533} + 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 &605336536 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605336533} + m_CullTransparentMesh: 1 --- !u!1 &606639816 GameObject: m_ObjectHideFlags: 0 @@ -34690,6 +35358,140 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 767073070} m_Mesh: {fileID: 4300000, guid: 9bb588823d8da76499558fe774532400, type: 3} +--- !u!1 &767565487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 767565488} + - component: {fileID: 767565490} + - component: {fileID: 767565489} + 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 &767565488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767565487} + 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: 1155480512} + 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 &767565489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767565487} + 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: Nochmal spielen + 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 &767565490 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767565487} + m_CullTransparentMesh: 1 --- !u!1 &770718931 GameObject: m_ObjectHideFlags: 0 @@ -39445,6 +40247,84 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8b405645f944e0042afcad997d3a5866, type: 3} +--- !u!1 &880487496 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 880487497} + - component: {fileID: 880487499} + - component: {fileID: 880487498} + m_Layer: 5 + m_Name: WinScreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &880487497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880487496} + 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: 127907487} + - {fileID: 1155480512} + - {fileID: 360522564} + 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: 500, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &880487498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880487496} + 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: 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 &880487499 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880487496} + m_CullTransparentMesh: 1 --- !u!1 &883823909 GameObject: m_ObjectHideFlags: 0 @@ -40308,6 +41188,139 @@ Transform: - {fileID: 345760023} m_Father: {fileID: 933724165} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &912250456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 912250457} + - component: {fileID: 912250460} + - component: {fileID: 912250459} + - component: {fileID: 912250458} + m_Layer: 5 + m_Name: BeendenBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &912250457 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912250456} + 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: 1516829179} + m_Father: {fileID: 1570609272} + 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 &912250458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912250456} + 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: 912250459} + 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 &912250459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912250456} + 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 &912250460 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912250456} + m_CullTransparentMesh: 1 --- !u!1 &914005096 GameObject: m_ObjectHideFlags: 0 @@ -48277,6 +49290,8 @@ RectTransform: - {fileID: 1247192165} - {fileID: 1978069901} - {fileID: 399496949} + - {fileID: 880487497} + - {fileID: 1570609272} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -48337,6 +49352,8 @@ MonoBehaviour: m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 + WinScreen: {fileID: 880487496} + LoseScreen: {fileID: 1570609271} --- !u!1001 &1086036410 PrefabInstance: m_ObjectHideFlags: 0 @@ -51096,6 +52113,139 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1154810982} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1 &1155480511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1155480512} + - component: {fileID: 1155480515} + - component: {fileID: 1155480514} + - component: {fileID: 1155480513} + m_Layer: 5 + m_Name: NochmalBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1155480512 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155480511} + 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: 767565488} + m_Father: {fileID: 880487497} + 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 &1155480513 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155480511} + 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: 1155480514} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1086008407} + m_TargetAssemblyTypeName: UiController, Assembly-CSharp + m_MethodName: Replay + 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 &1155480514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155480511} + 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 &1155480515 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155480511} + m_CullTransparentMesh: 1 --- !u!1 &1156087639 GameObject: m_ObjectHideFlags: 0 @@ -65977,6 +67127,140 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1516432462} m_Mesh: {fileID: -2303692350411030431, guid: 0b1e524bf5adb2f4e8e617ee4e2a1878, type: 3} +--- !u!1 &1516829178 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1516829179} + - component: {fileID: 1516829181} + - component: {fileID: 1516829180} + 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 &1516829179 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516829178} + 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: 912250457} + 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 &1516829180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516829178} + 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 &1516829181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516829178} + m_CullTransparentMesh: 1 --- !u!4 &1519103306 stripped Transform: m_CorrespondingSourceObject: {fileID: 8094231234423756603, guid: c7a42191588ac434e9b5b79a90c53a02, type: 3} @@ -68348,6 +69632,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 8962783884462150239, guid: 2ac7e6eb682174e7f8af567817914142, type: 3} m_PrefabInstance: {fileID: 1569712489} m_PrefabAsset: {fileID: 0} +--- !u!1 &1570609271 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1570609272} + - component: {fileID: 1570609274} + - component: {fileID: 1570609273} + m_Layer: 5 + m_Name: LoseScreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1570609272 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570609271} + 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: 364405135} + - {fileID: 142802510} + - {fileID: 912250457} + 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: 500, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1570609273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570609271} + 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: 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 &1570609274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570609271} + m_CullTransparentMesh: 1 --- !u!1 &1572060562 GameObject: m_ObjectHideFlags: 0 @@ -86708,6 +88070,140 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2001876342} m_Mesh: {fileID: 4300010, guid: 9bb588823d8da76499558fe774532400, type: 3} +--- !u!1 &2001887185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2001887186} + - component: {fileID: 2001887188} + - component: {fileID: 2001887187} + 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 &2001887186 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2001887185} + 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: 142802510} + 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 &2001887187 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2001887185} + 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: Nochmal spielen + 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 &2001887188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2001887185} + m_CullTransparentMesh: 1 --- !u!4 &2002021958 stripped Transform: m_CorrespondingSourceObject: {fileID: 8094231234423756603, guid: c7a42191588ac434e9b5b79a90c53a02, type: 3} diff --git a/3d Prototyp/Assets/Scripts/GameManager.cs b/3d Prototyp/Assets/Scripts/GameManager.cs index 80a62de0..6c7f7bbb 100644 --- a/3d Prototyp/Assets/Scripts/GameManager.cs +++ b/3d Prototyp/Assets/Scripts/GameManager.cs @@ -153,15 +153,27 @@ public partial class GameManager : MonoBehaviourSingleton } } + [SerializeField] + private bool _won; + + public bool Won => _won; + + [SerializeField] + private bool _lost; + + public bool Lost => _lost; + private void EndGame(EndGameCondition endGameCondition) { if (endGameCondition.IsWin()) { Debug.Log("You won!"); + _won = true; } else if (endGameCondition.IsLose()) { Debug.Log("You lost!"); + _lost = true; } Debug.Log(endGameCondition.GetEndGameMessage()); diff --git a/3d Prototyp/Assets/Scripts/UiController.cs b/3d Prototyp/Assets/Scripts/UiController.cs index 512e378b..09d2333c 100644 --- a/3d Prototyp/Assets/Scripts/UiController.cs +++ b/3d Prototyp/Assets/Scripts/UiController.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using Interaction; using TMPro; using UnityEngine; +using UnityEngine.SceneManagement; using UnityEngine.Serialization; using UnityEngine.UI; @@ -37,12 +38,18 @@ public class UiController : MonoBehaviour [SerializeField] private TextMeshProUGUI _predictedEndText; [SerializeField] private Gradient _deadlineTextColors; + + public GameObject WinScreen; + public GameObject LoseScreen; void Update() { UpdateActionDisplay(); UpdateProgressBar(); UpdateDeadlineDateStuffTexts(); + + WinScreen.SetActive(GameManager.Instance.Won); + LoseScreen.SetActive(GameManager.Instance.Lost); } private void UpdateProgressBar() @@ -97,4 +104,16 @@ public class UiController : MonoBehaviour //_prevActionButton.interactable = _pickupper.CanSelectPrevious; //_nextActionButton.interactable = _pickupper.CanSelectNext; } + + public void Replay() + { + string currentSceneName = SceneManager.GetActiveScene().name; + SceneManager.LoadScene(currentSceneName); + } + + public void Exit() + { + UnityEditor.EditorApplication.isPlaying = false; + Application.Quit(); + } } From 0aabeff96e0d4f4ed82f0bbb344c02ea6990a272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Mon, 8 Apr 2024 21:28:00 +0200 Subject: [PATCH 4/4] Kleine Sache --- 3d Prototyp/Assets/Scenes/GameJamScene.unity | 333 ++++++++++++++++++- 1 file changed, 329 insertions(+), 4 deletions(-) diff --git a/3d Prototyp/Assets/Scenes/GameJamScene.unity b/3d Prototyp/Assets/Scenes/GameJamScene.unity index bb7a1f99..02a8eb6c 100644 --- a/3d Prototyp/Assets/Scenes/GameJamScene.unity +++ b/3d Prototyp/Assets/Scenes/GameJamScene.unity @@ -6564,6 +6564,89 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 139911298} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1 &140090574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 140090575} + - component: {fileID: 140090577} + - component: {fileID: 140090576} + m_Layer: 0 + m_Name: model (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &140090575 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140090574} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.00027927756, y: 0, z: 9.6} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 193829788} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &140090576 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140090574} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 3e31a8ab873b7044ba742a371f670e65, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &140090577 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 140090574} + m_Mesh: {fileID: 4300000, guid: 0dfa9ce445a7abf429c372804d327d6a, type: 3} --- !u!1 &140144836 GameObject: m_ObjectHideFlags: 0 @@ -14595,7 +14678,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _daysUntilRelease: 7 - _secondsPerDay: 5 + _secondsPerDay: 120 _totalTime: 0 _sun: {fileID: 124226107} --- !u!114 &322315147 @@ -34070,7 +34153,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 486570, guid: b8c83c417104d75459226dd80248bfe2, type: 3} + insertIndex: 1 + addedObject: {fileID: 1701580269} + - targetCorrespondingSourceObject: {fileID: 486570, guid: b8c83c417104d75459226dd80248bfe2, type: 3} + insertIndex: 2 + addedObject: {fileID: 140090575} + - targetCorrespondingSourceObject: {fileID: 486570, guid: b8c83c417104d75459226dd80248bfe2, type: 3} + insertIndex: 3 + addedObject: {fileID: 1211780081} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8c83c417104d75459226dd80248bfe2, type: 3} --- !u!1001 &734057454 @@ -53842,6 +53934,89 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5436741564957258347, guid: 6c7f06c6a702d4d41bba4b5576adc82c, type: 3} m_PrefabInstance: {fileID: 1502578683} m_PrefabAsset: {fileID: 0} +--- !u!1 &1211780080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1211780081} + - component: {fileID: 1211780083} + - component: {fileID: 1211780082} + m_Layer: 0 + m_Name: model (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1211780081 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211780080} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.0034591258, y: 0, z: -57.600006} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 193829788} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1211780082 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211780080} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 3e31a8ab873b7044ba742a371f670e65, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1211780083 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211780080} + m_Mesh: {fileID: 4300000, guid: 0dfa9ce445a7abf429c372804d327d6a, type: 3} --- !u!1 &1212610327 GameObject: m_ObjectHideFlags: 0 @@ -75550,6 +75725,89 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1700736687} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1 &1701580268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1701580269} + - component: {fileID: 1701580271} + - component: {fileID: 1701580270} + m_Layer: 0 + m_Name: model (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1701580269 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1701580268} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.0000122487545, y: 0, z: 4.800005} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 193829788} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1701580270 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1701580268} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 3e31a8ab873b7044ba742a371f670e65, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1701580271 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1701580268} + m_Mesh: {fileID: 4300000, guid: 0dfa9ce445a7abf429c372804d327d6a, type: 3} --- !u!1 &1707308533 GameObject: m_ObjectHideFlags: 0 @@ -82009,6 +82267,72 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1882014930} m_Mesh: {fileID: 3284317394355905387, guid: 7292cbbcd062e3440b9895a64d229825, type: 3} +--- !u!1001 &1883722903 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5588973279469818311} + m_Modifications: + - target: {fileID: 1442634774802397690, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_Name + value: Tile_Edge (1) + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalScale.x + value: 33.494877 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalPosition.x + value: -19.989697 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalPosition.y + value: -0.96000004 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalPosition.z + value: 21.16 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} +--- !u!4 &1883722904 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} + m_PrefabInstance: {fileID: 1883722903} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1886021222 PrefabInstance: m_ObjectHideFlags: 0 @@ -93427,11 +93751,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} propertyPath: m_LocalScale.x - value: 27.249516 + value: 33.494877 objectReference: {fileID: 0} - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} propertyPath: m_LocalPosition.x - value: -16.595009 + value: -19.9897 objectReference: {fileID: 0} - target: {fileID: 5112677001295238996, guid: 352695bbfe21cc044a37d42b6d7ff681, type: 3} propertyPath: m_LocalPosition.y @@ -105999,6 +106323,7 @@ Transform: - {fileID: 1577567637} - {fileID: 1922375979} - {fileID: 2125697561} + - {fileID: 1883722904} - {fileID: 2078135706} - {fileID: 1956316329} - {fileID: 1620936435}