From c8fdc430cfbd6603f6b6c9db9e1148ab3358a390 Mon Sep 17 00:00:00 2001
From: meyerm1w <moritz.meyerhof@ruhr-uni-bochum.de>
Date: Sun, 18 Apr 2021 18:29:17 +0200
Subject: [PATCH] Added Story and fixed Bugs in StoryController
---
Assets/Scenes/Introduction.unity | 18 ++++++++++++++++--
Assets/Scripts/UI/StoryController.cs | 5 +++--
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/Assets/Scenes/Introduction.unity b/Assets/Scenes/Introduction.unity
index 71f44a0..0bd89a8 100644
--- a/Assets/Scenes/Introduction.unity
+++ b/Assets/Scenes/Introduction.unity
@@ -205,7 +205,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 316770849}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 1712659868}
+ m_TargetAssemblyTypeName: StoryController, Assembly-CSharp
+ m_MethodName: OnButtonClick
+ 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 &316770849
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -834,4 +846,6 @@ MonoBehaviour:
storyText: {fileID: 608348171}
buttonText: {fileID: 1051284165}
mostAwesomeStoryEver:
- - ' '
+ - "[Hier guten Namen einf\xFCgen]"
+ - "Wieder und wieder hat uns der Held gedem\xFCtigt und get\xF6tet."
+ - "Doch damit ist jetzt schluss! Wir werden zur\xFCckschlagen und ihn vernichten"
diff --git a/Assets/Scripts/UI/StoryController.cs b/Assets/Scripts/UI/StoryController.cs
index adb849f..a657920 100644
--- a/Assets/Scripts/UI/StoryController.cs
+++ b/Assets/Scripts/UI/StoryController.cs
@@ -13,7 +13,7 @@ public class StoryController : MonoBehaviour
void Start()
{
activeTextIndex = 0;
- listLength = mostAwesomeStoryEver.Count;
+ listLength = mostAwesomeStoryEver.Count -1;
storyText.text = mostAwesomeStoryEver[0];
}
@@ -23,9 +23,10 @@ public class StoryController : MonoBehaviour
{
buttonText.text = "Start the Game";
}
- else if (++activeTextIndex > listLength)
+ else if (activeTextIndex > listLength)
{
SceneLoader.instance.LoadScene("Forest");
+ return;
}
storyText.text = mostAwesomeStoryEver[activeTextIndex];
--
GitLab