aboutsummaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
authorAlee <Alee14498@gmail.com>2019-06-02 14:15:13 -0400
committerAlee <Alee14498@gmail.com>2019-06-02 14:15:13 -0400
commit7887e44bea38ca52d196bba62317e26f8d244c7b (patch)
tree698a5f9414a6003ed0ae8a8f2b15866d87aacb18 /Assets
parenta24e6a8485ef6d4404f5fb557d8f37a4485f5415 (diff)
downloadUnicity-7887e44bea38ca52d196bba62317e26f8d244c7b.tar.gz
Unicity-7887e44bea38ca52d196bba62317e26f8d244c7b.tar.bz2
Unicity-7887e44bea38ca52d196bba62317e26f8d244c7b.zip
cylex's stuff again
Diffstat (limited to 'Assets')
-rw-r--r--Assets/Scenes/Main Menu/MainMenu.unity60
-rw-r--r--Assets/Scenes/Simulation/SimulationScene.unity8
-rw-r--r--Assets/Scripts/UI/ExitApplication.cs6
-rw-r--r--Assets/Scripts/UI/LoadScene.cs38
4 files changed, 50 insertions, 62 deletions
diff --git a/Assets/Scenes/Main Menu/MainMenu.unity b/Assets/Scenes/Main Menu/MainMenu.unity
index ff2eb1d..2759fbe 100644
--- a/Assets/Scenes/Main Menu/MainMenu.unity
+++ b/Assets/Scenes/Main Menu/MainMenu.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1}
+ m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -520,42 +520,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1030991977
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1030991978}
- m_Layer: 5
- m_Name: GameObject
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1030991978
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1030991977}
- 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: 1430528654}
- m_Father: {fileID: 1115240055}
- m_RootOrder: 0
- 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: -959.8, y: -462.4}
- m_SizeDelta: {x: 100, y: 100}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1115240051
GameObject:
m_ObjectHideFlags: 0
@@ -646,7 +610,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- - {fileID: 1030991978}
+ - {fileID: 1430528654}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -695,7 +659,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 226.38, y: -111}
+ m_AnchoredPosition: {x: 225.34, y: -64}
m_SizeDelta: {x: 452.76, y: 67.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1244813970
@@ -914,17 +878,17 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1244813969}
- - {fileID: 1242155459}
- {fileID: 2084687741}
+ - {fileID: 1242155459}
- {fileID: 604245001}
- m_Father: {fileID: 1030991978}
+ m_Father: {fileID: 1115240055}
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: 124.61751, y: 462.34}
- m_SizeDelta: {x: 352.765, y: 913.68}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -1992.3, y: 0}
+ m_Pivot: {x: 0, y: 0}
--- !u!114 &1430528655
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -993,11 +957,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1430528654}
- m_RootOrder: 2
+ 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: -0.0017586, y: 357.6}
+ m_AnchoredPosition: {x: -0.52608, y: 342.64}
m_SizeDelta: {x: 452.76, y: 46.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2084687742
@@ -1170,7 +1134,7 @@ PrefabInstance:
- target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6,
type: 3}
@@ -1245,7 +1209,7 @@ PrefabInstance:
- 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
+ value: MainMenuPlayButton
objectReference: {fileID: 0}
- target: {fileID: 8754154740269184903, guid: 83359716712d3c04293cf99088933eb6,
type: 3}
diff --git a/Assets/Scenes/Simulation/SimulationScene.unity b/Assets/Scenes/Simulation/SimulationScene.unity
index 16985d8..31ee4ab 100644
--- a/Assets/Scenes/Simulation/SimulationScene.unity
+++ b/Assets/Scenes/Simulation/SimulationScene.unity
@@ -211,9 +211,9 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 617386311}
- - {fileID: 1687973897}
- {fileID: 629937291}
- {fileID: 1187805769}
+ - {fileID: 1687973897}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1063,7 +1063,7 @@ RectTransform:
- {fileID: 950227355}
- {fileID: 1571661886}
m_Father: {fileID: 17926560}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -1705,7 +1705,7 @@ PrefabInstance:
- target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6,
type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6,
type: 3}
@@ -2393,7 +2393,7 @@ PrefabInstance:
- target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6,
type: 3}
diff --git a/Assets/Scripts/UI/ExitApplication.cs b/Assets/Scripts/UI/ExitApplication.cs
index 272cec1..475aae7 100644
--- a/Assets/Scripts/UI/ExitApplication.cs
+++ b/Assets/Scripts/UI/ExitApplication.cs
@@ -21,10 +21,8 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
-public class ExitApplication : MonoBehaviour
-{
- public void ExitGame()
- {
+public class ExitApplication : MonoBehaviour {
+ public void ExitGame() {
Debug.Log("Game has closed.");
Application.Quit();
}
diff --git a/Assets/Scripts/UI/LoadScene.cs b/Assets/Scripts/UI/LoadScene.cs
index abab27d..95b7278 100644
--- a/Assets/Scripts/UI/LoadScene.cs
+++ b/Assets/Scripts/UI/LoadScene.cs
@@ -22,10 +22,36 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
-public class LoadScene : MonoBehaviour
-{
- public void SceneLoader(int SceneIndex)
- {
- SceneManager.LoadScene(SceneIndex);
- }
+public class LoadScene : MonoBehaviour {
+ bool doMenuRotate;
+ int _SceneIndex;
+ GameObject MainPanel;
+
+ public void MainMenuPlayButton(int SceneIndex) {
+ doMenuRotate = true;
+ _SceneIndex = SceneIndex;
+ }
+
+ public void SceneLoader(int SceneIndex) {
+ SceneManager.LoadScene(SceneIndex);
+ }
+
+ public void Start() {
+ doMenuRotate = false;
+ MainPanel = GameObject.Find("MainPanel");
+ }
+
+ public void Update() {
+ if (doMenuRotate) {
+ if (MainPanel.transform.eulerAngles.z < 90) {
+ MainPanel.transform.Rotate(0, 0, MainPanel.transform.rotation.eulerAngles.z + 0.01f);
+ } else {
+ doMenuRotate = false;
+ }
+ }
+
+ if (MainPanel.transform.eulerAngles.z > 90) {
+ SceneLoader(_SceneIndex);
+ }
+ }
}