Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
finished build setting for john's work and hooked my test scene "LVL1…
…" with it, working on win/lose condition
  • Loading branch information
Tianzhu Zhang authored and Tianzhu Zhang committed Oct 9, 2013
1 parent 3bb53d5 commit 2077f72
Show file tree
Hide file tree
Showing 19 changed files with 17 additions and 74 deletions.
5 changes: 5 additions & 0 deletions Guardian of Silverkeep/Assets/Scripts/From_John.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -23,7 +23,7 @@ public Texture btnTexture;

// 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");
Expand Down
Binary file not shown.
36 changes: 0 additions & 36 deletions Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet.png.meta

This file was deleted.

Binary file not shown.
36 changes: 0 additions & 36 deletions Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png.meta

This file was deleted.

12 changes: 11 additions & 1 deletion Guardian of Silverkeep/ProjectSettings/EditorBuildSettings.asset
Expand Up @@ -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

0 comments on commit 2077f72

Please sign in to comment.