diff --git a/Assets/Scenes/Forest.unity b/Assets/Scenes/Forest.unity index 6bf8a5c71788df3150a6c33b16cc95baf2850903..3758a99d1d61397b4ad55695bf4620437c13a240 100644 --- a/Assets/Scenes/Forest.unity +++ b/Assets/Scenes/Forest.unity @@ -573,17 +573,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3} ---- !u!114 &420412581 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7275681118348468606, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3} - m_PrefabInstance: {fileID: 420412580} - 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 &436317214 GameObject: m_ObjectHideFlags: 0 @@ -2614,6 +2603,7 @@ GameObject: - component: {fileID: 1546074016} - component: {fileID: 1546074015} - component: {fileID: 1546074014} + - component: {fileID: 1546074017} m_Layer: 5 m_Name: Tutorial m_TagString: Untagged @@ -2684,7 +2674,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 420412581} + - m_Target: {fileID: 1546074017} m_TargetAssemblyTypeName: SceneLoader, Assembly-CSharp m_MethodName: LoadScene m_Mode: 5 @@ -2734,6 +2724,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1546074012} m_CullTransparentMesh: 1 +--- !u!114 &1546074017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546074012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f5dd123e950ff244fbfb1ec9191955a5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1550984899 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Introduction.unity b/Assets/Scenes/Introduction.unity index 804b59c539ecd76e058d1585f5d1f9f53eeb2fbd..f0635e44d14efb422ddbe113c5df9913083bfe2c 100644 --- a/Assets/Scenes/Introduction.unity +++ b/Assets/Scenes/Introduction.unity @@ -942,6 +942,7 @@ GameObject: - component: {fileID: 1922238080} - component: {fileID: 1922238079} - component: {fileID: 1922238078} + - component: {fileID: 1922238081} m_Layer: 0 m_Name: Direct link m_TagString: Untagged @@ -1013,7 +1014,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 1922238081} m_TargetAssemblyTypeName: SceneLoader, Assembly-CSharp m_MethodName: LoadScene m_Mode: 5 @@ -1063,3 +1064,15 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1922238076} m_CullTransparentMesh: 1 +--- !u!114 &1922238081 +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: f5dd123e950ff244fbfb1ec9191955a5, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/Tutorial.unity b/Assets/Scenes/Tutorial.unity index bc8c09600b1056fc229e5b47997140ed9f22be15..2395733a2e1f337556c3bb1023d075adf194e39e 100644 --- a/Assets/Scenes/Tutorial.unity +++ b/Assets/Scenes/Tutorial.unity @@ -1091,7 +1091,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 586903120} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: RoundController, Assembly-CSharp m_MethodName: SetRoundSpeed m_Mode: 0 @@ -2099,25 +2099,13 @@ PrefabInstance: 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: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6628969328331147427, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3} propertyPath: m_LocalPosition.x @@ -2159,23 +2147,8 @@ PrefabInstance: 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!114 &586903120 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1805415820362754139, guid: afeb708bd829d8a4aa0310ed2cd87a74, type: 3} - m_PrefabInstance: {fileID: 586903119} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5c4ec49c158b9f94e9d068040b9bfaaa, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &588364116 GameObject: m_ObjectHideFlags: 0 @@ -6725,7 +6698,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8413529789942519730, guid: 9e615cebeff6ff041862cc173d80dee5, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8413529789942519730, guid: 9e615cebeff6ff041862cc173d80dee5, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/utils/SceneLoader.cs b/Assets/Scripts/utils/SceneLoader.cs new file mode 100644 index 0000000000000000000000000000000000000000..64dcbeb09baaed3fb4333d0d61a8fedd67919a9a --- /dev/null +++ b/Assets/Scripts/utils/SceneLoader.cs @@ -0,0 +1,12 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class SceneLoader : MonoBehaviour +{ + + public void LoadScene(string name) + { + SceneManager.LoadScene(name); + } + +} diff --git a/Assets/Scripts/utils/SceneLoader.cs.meta b/Assets/Scripts/utils/SceneLoader.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..d8a9583ddbc60c049b5eb1b0df780530e8e27d22 --- /dev/null +++ b/Assets/Scripts/utils/SceneLoader.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f5dd123e950ff244fbfb1ec9191955a5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: