aboutsummaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
authorAlee <Alee14498@gmail.com>2019-06-02 10:32:16 -0400
committerAlee <Alee14498@gmail.com>2019-06-02 10:32:16 -0400
commit32043ab0e2052fd2b287c65614f477fa0127e86f (patch)
tree1e9fe313dac0ca39849b169af1321db1c0c1385e /Assets
parent2b9de1c6b8179b74402595c67c0e60f5b7c67c9d (diff)
downloadUnicity-32043ab0e2052fd2b287c65614f477fa0127e86f.tar.gz
Unicity-32043ab0e2052fd2b287c65614f477fa0127e86f.tar.bz2
Unicity-32043ab0e2052fd2b287c65614f477fa0127e86f.zip
Fixed the exit button
Diffstat (limited to 'Assets')
-rw-r--r--Assets/Prefabs/UI/Button.prefab19
-rw-r--r--Assets/Scenes/Main Menu/MainMenu.unity14
-rw-r--r--Assets/Scenes/Simulation/SimulationScene.unity27
3 files changed, 55 insertions, 5 deletions
diff --git a/Assets/Prefabs/UI/Button.prefab b/Assets/Prefabs/UI/Button.prefab
index e71fead..cbe1d8c 100644
--- a/Assets/Prefabs/UI/Button.prefab
+++ b/Assets/Prefabs/UI/Button.prefab
@@ -170,8 +170,9 @@ GameObject:
- component: {fileID: 8754154740269184901}
- component: {fileID: 8754154740269184900}
- component: {fileID: 8754154740269184903}
+ - component: {fileID: 2929411588243878699}
m_Layer: 5
- m_Name: Play
+ m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -298,8 +299,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
- m_MethodName: SceneLoader
- m_Mode: 3
+ m_MethodName:
+ m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -310,3 +311,15 @@ MonoBehaviour:
m_CallState: 2
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, Unity.ugui,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+--- !u!114 &2929411588243878699
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8754154740269184898}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: eb5fd4aa07251794aaa5c0194e617eb8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/Scenes/Main Menu/MainMenu.unity b/Assets/Scenes/Main Menu/MainMenu.unity
index 509260b..6faa00b 100644
--- a/Assets/Scenes/Main Menu/MainMenu.unity
+++ b/Assets/Scenes/Main Menu/MainMenu.unity
@@ -1075,8 +1075,8 @@ RectTransform:
- {fileID: 1244813969}
- {fileID: 1242155459}
- {fileID: 471477667}
- - {fileID: 604245001}
- {fileID: 2084687741}
+ - {fileID: 604245001}
m_Father: {fileID: 1030991978}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1153,7 +1153,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1430528654}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1402,5 +1402,15 @@ PrefabInstance:
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 917041443}
+ - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6,
+ type: 3}
+ propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: SceneLoader
+ objectReference: {fileID: 0}
+ - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6,
+ type: 3}
+ propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 3
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3}
diff --git a/Assets/Scenes/Simulation/SimulationScene.unity b/Assets/Scenes/Simulation/SimulationScene.unity
index 79136ac..c34ee14 100644
--- a/Assets/Scenes/Simulation/SimulationScene.unity
+++ b/Assets/Scenes/Simulation/SimulationScene.unity
@@ -2304,6 +2304,21 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
+ - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6,
+ type: 3}
+ propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1687973898}
+ - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6,
+ type: 3}
+ propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: ExitGame
+ objectReference: {fileID: 0}
+ - target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6,
+ type: 3}
+ propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6,
type: 3}
propertyPath: m_textInfo.characterCount
@@ -2344,6 +2359,18 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1687973896}
m_PrefabAsset: {fileID: 0}
+--- !u!114 &1687973898 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 2929411588243878699, guid: 83359716712d3c04293cf99088933eb6,
+ type: 3}
+ m_PrefabInstance: {fileID: 1687973896}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: eb5fd4aa07251794aaa5c0194e617eb8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1742123687
GameObject:
m_ObjectHideFlags: 0