Merge branch 'master' of https://github.com/FPlane/2017-14BIT-GROUP_H…

…-Project
FPlane · Jul 29, 2017 · 718d22f · 718d22f
2 parents 76ea0b3 + 27e66d4
commit 718d22f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/Assets/Scenes/option.unity b/Assets/Scenes/option.unity
diff --git a/Assets/Scenes/option.unity.meta b/Assets/Scenes/option.unity.meta
diff --git a/Assets/Scripts/menuController.cs b/Assets/Scripts/menuController.cs
@@ -35,10 +35,6 @@ public void exitButton()
         Application.Quit();
     }
 
-
-
-
-
     void Awake()
     {
         SettingText.GetComponent<Text>().color = Color.red;
@@ -76,7 +72,15 @@ public void setting_game()
     public void backToMenu()
     {
         plane.gameObject.SetActive(true);
-        QuitButton.gameObject.SetActive(true);
+        if (Application.platform == RuntimePlatform.WindowsEditor || Application.platform == RuntimePlatform.WindowsPlayer || Application.platform == RuntimePlatform.OSXPlayer)
+        {
+            QuitText.gameObject.SetActive(true);
+        }
+        else if (Application.platform == RuntimePlatform.Android || Application.platform == RuntimePlatform.IPhonePlayer)
+        {
+            QuitText.gameObject.SetActive(false);
+        }
+
         Title.gameObject.SetActive(true);
         SettingText.gameObject.SetActive(true);
 

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 5.6.1f1
+m_EditorVersion: 2017.1.0f3
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 5.6.1f1
		m_EditorVersion: 2017.1.0f3