finished build setting for john's work and hooked my test scene "LVL1…

…" with it, working on win/lose condition
GameDev · Oct 9, 2013 · 2077f72 · 2077f72
1 parent 3bb53d5
commit 2077f72
Show file tree

Hide file tree

Showing 19 changed files with 17 additions and 74 deletions.
diff --git a/...Silverkeep/Assets/Test_Scene_Tianzhu.meta → ...n of Silverkeep/Assets/Scene_Tianzhu.meta b/...Silverkeep/Assets/Test_Scene_Tianzhu.meta → ...n of Silverkeep/Assets/Scene_Tianzhu.meta
diff --git a/...Test_Scene_Tianzhu/AnimationExample.unity → ...sets/Scene_Tianzhu/AnimationExample.unity b/...Test_Scene_Tianzhu/AnimationExample.unity → ...sets/Scene_Tianzhu/AnimationExample.unity
diff --git a/...Scene_Tianzhu/AnimationExample.unity.meta → ...Scene_Tianzhu/AnimationExample.unity.meta b/...Scene_Tianzhu/AnimationExample.unity.meta → ...Scene_Tianzhu/AnimationExample.unity.meta
diff --git a/...keep/Assets/Test_Scene_Tianzhu/LVL1.unity → ...ilverkeep/Assets/Scene_Tianzhu/LVL1.unity b/...keep/Assets/Test_Scene_Tianzhu/LVL1.unity → ...ilverkeep/Assets/Scene_Tianzhu/LVL1.unity
diff --git a/...Assets/Test_Scene_Tianzhu/LVL1.unity.meta → ...keep/Assets/Scene_Tianzhu/LVL1.unity.meta b/...Assets/Test_Scene_Tianzhu/LVL1.unity.meta → ...keep/Assets/Scene_Tianzhu/LVL1.unity.meta
diff --git a/Guardian of Silverkeep/Assets/Scripts/From_John.meta b/Guardian of Silverkeep/Assets/Scripts/From_John.meta
diff --git a/...f Silverkeep/Assets/Scripts/BackButton.cs → ...ep/Assets/Scripts/From_John/BackButton.cs b/...f Silverkeep/Assets/Scripts/BackButton.cs → ...ep/Assets/Scripts/From_John/BackButton.cs
diff --git a/...verkeep/Assets/Scripts/BackButton.cs.meta → ...sets/Scripts/From_John/BackButton.cs.meta b/...verkeep/Assets/Scripts/BackButton.cs.meta → ...sets/Scripts/From_John/BackButton.cs.meta
diff --git a/...an of Silverkeep/Assets/Scripts/Button.cs → ...erkeep/Assets/Scripts/From_John/Button.cs b/...an of Silverkeep/Assets/Scripts/Button.cs → ...erkeep/Assets/Scripts/From_John/Button.cs
@@ -23,7 +23,7 @@ void OnGUI() {
 
 	// TIANZHU!!!! Put scene name here for main game! Replace TeamSplash!!! 
 
-	Application.LoadLevel ("TeamSplash");
+	Application.LoadLevel ("LVL1");
         }
         if (GUI.Button(new Rect(450, 400, 90, 90), "Credits")){
             Debug.Log("Clicked the button with text");

diff --git a/... Silverkeep/Assets/Scripts/Button.cs.meta → ...p/Assets/Scripts/From_John/Button.cs.meta b/... Silverkeep/Assets/Scripts/Button.cs.meta → ...p/Assets/Scripts/From_John/Button.cs.meta
diff --git a/... Silverkeep/Assets/Scripts/SceneChange.cs → ...p/Assets/Scripts/From_John/SceneChange.cs b/... Silverkeep/Assets/Scripts/SceneChange.cs → ...p/Assets/Scripts/From_John/SceneChange.cs
diff --git a/...erkeep/Assets/Scripts/SceneChange.cs.meta → ...ets/Scripts/From_John/SceneChange.cs.meta b/...erkeep/Assets/Scripts/SceneChange.cs.meta → ...ets/Scripts/From_John/SceneChange.cs.meta
diff --git a/...ian of Silverkeep/Assets/Scripts/Timer.cs → ...verkeep/Assets/Scripts/From_John/Timer.cs b/...ian of Silverkeep/Assets/Scripts/Timer.cs → ...verkeep/Assets/Scripts/From_John/Timer.cs
diff --git a/...f Silverkeep/Assets/Scripts/Timer.cs.meta → ...ep/Assets/Scripts/From_John/Timer.cs.meta b/...f Silverkeep/Assets/Scripts/Timer.cs.meta → ...ep/Assets/Scripts/From_John/Timer.cs.meta
diff --git a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet.png b/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet.png
diff --git a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet.png.meta b/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet.png.meta
diff --git a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png b/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png
diff --git a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png.meta b/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png.meta
diff --git a/Guardian of Silverkeep/ProjectSettings/EditorBuildSettings.asset b/Guardian of Silverkeep/ProjectSettings/EditorBuildSettings.asset
@@ -4,4 +4,14 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scene_John/TeamSplash.unity
+  - enabled: 1
+    path: Assets/Scene_John/UConnSplash.unity
+  - enabled: 1
+    path: Assets/Scene_John/MainMenu.unity
+  - enabled: 1
+    path: Assets/Scene_John/CreditsPage.unity
+  - enabled: 1
+    path: Assets/Scene_Tianzhu/LVL1.unity