From f1b75fd7f640721239fbf3dd8362b3d08ddf39f9 Mon Sep 17 00:00:00 2001
From: meyerm1w <moritz.meyerhof@ruhr-uni-bochum.de>
Date: Sun, 18 Apr 2021 22:05:07 +0200
Subject: [PATCH] Fixed SceneLoader
---
Assets/Scenes/Introduction.unity | 300 ++++++++++++++++++++++++++-
Assets/Scripts/UI/StoryController.cs | 2 +
Assets/Scripts/utils/SceneLoader.cs | 9 +-
3 files changed, 302 insertions(+), 9 deletions(-)
diff --git a/Assets/Scenes/Introduction.unity b/Assets/Scenes/Introduction.unity
index 0bd89a8..c480875 100644
--- a/Assets/Scenes/Introduction.unity
+++ b/Assets/Scenes/Introduction.unity
@@ -322,7 +322,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1712659867}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -727,6 +727,17 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 63cbedde58198bc489f5906809647d41, type: 3}
+--- !u!114 &1618455182 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 7275681118348468606, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ m_PrefabInstance: {fileID: 1777534487}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f5dd123e950ff244fbfb1ec9191955a5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1683406339
GameObject:
m_ObjectHideFlags: 0
@@ -822,6 +833,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 316770847}
+ - {fileID: 1922238077}
- {fileID: 608348170}
m_Father: {fileID: 694798956}
m_RootOrder: 1
@@ -845,7 +857,293 @@ MonoBehaviour:
m_EditorClassIdentifier:
storyText: {fileID: 608348171}
buttonText: {fileID: 1051284165}
+ tutorialButton: {fileID: 1922238076}
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"
+--- !u!1001 &1777534487
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 618083152, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3799051240971953, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1805415820362754139, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5959683136170450115, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_Name
+ value: GlobalScripts
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8921619308956363977, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3}
+--- !u!1 &1803197119
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1803197120}
+ - component: {fileID: 1803197122}
+ - component: {fileID: 1803197121}
+ m_Layer: 0
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1803197120
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1803197119}
+ 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_Children: []
+ m_Father: {fileID: 1922238077}
+ m_RootOrder: 0
+ 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 &1803197121
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1803197119}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Zum Tutorial
+--- !u!222 &1803197122
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1803197119}
+ m_CullTransparentMesh: 1
+--- !u!1 &1922238076
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1922238077}
+ - component: {fileID: 1922238080}
+ - component: {fileID: 1922238079}
+ - component: {fileID: 1922238078}
+ m_Layer: 0
+ m_Name: Direct link
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1922238077
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1922238076}
+ 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_Children:
+ - {fileID: 1803197120}
+ m_Father: {fileID: 1712659867}
+ m_RootOrder: 1
+ 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: 192, y: -178}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1922238078
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1922238076}
+ 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: 1922238079}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1618455182}
+ m_TargetAssemblyTypeName: SceneLoader, Assembly-CSharp
+ m_MethodName: LoadScene
+ m_Mode: 5
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument: Tutorial
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &1922238079
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1922238076}
+ 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ 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 &1922238080
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1922238076}
+ m_CullTransparentMesh: 1
diff --git a/Assets/Scripts/UI/StoryController.cs b/Assets/Scripts/UI/StoryController.cs
index a657920..88db6b3 100644
--- a/Assets/Scripts/UI/StoryController.cs
+++ b/Assets/Scripts/UI/StoryController.cs
@@ -6,6 +6,7 @@ using UnityEngine.UI;
public class StoryController : MonoBehaviour
{
[SerializeField] Text storyText, buttonText;
+ [SerializeField] GameObject tutorialButton;
[SerializeField] List<string> mostAwesomeStoryEver;
int activeTextIndex, listLength;
@@ -22,6 +23,7 @@ public class StoryController : MonoBehaviour
if (++activeTextIndex == listLength)
{
buttonText.text = "Start the Game";
+ tutorialButton.SetActive(true);
}
else if (activeTextIndex > listLength)
{
diff --git a/Assets/Scripts/utils/SceneLoader.cs b/Assets/Scripts/utils/SceneLoader.cs
index 32f42d7..ef3a16c 100644
--- a/Assets/Scripts/utils/SceneLoader.cs
+++ b/Assets/Scripts/utils/SceneLoader.cs
@@ -24,13 +24,6 @@ public class SceneLoader : MonoBehaviour
public void LoadScene(string name)
{
- for (int i = 0; i < SceneManager.sceneCount; i++)
- {
- if (name == SceneManager.GetSceneAt(i).name)
- {
- SceneManager.LoadScene(i);
- break;
- }
- }
+ SceneManager.LoadScene(name);
}
}
--
GitLab