diff --git a/Guardian of Silverkeep/Assets/Test_Scene_Tianzhu.meta b/Guardian of Silverkeep/Assets/Scene_Tianzhu.meta similarity index 100% rename from Guardian of Silverkeep/Assets/Test_Scene_Tianzhu.meta rename to Guardian of Silverkeep/Assets/Scene_Tianzhu.meta diff --git a/Guardian of Silverkeep/Assets/Test_Scene_Tianzhu/AnimationExample.unity b/Guardian of Silverkeep/Assets/Scene_Tianzhu/AnimationExample.unity similarity index 100% rename from Guardian of Silverkeep/Assets/Test_Scene_Tianzhu/AnimationExample.unity rename to Guardian of Silverkeep/Assets/Scene_Tianzhu/AnimationExample.unity diff --git a/Guardian of Silverkeep/Assets/Test_Scene_Tianzhu/AnimationExample.unity.meta b/Guardian of Silverkeep/Assets/Scene_Tianzhu/AnimationExample.unity.meta similarity index 100% rename from Guardian of Silverkeep/Assets/Test_Scene_Tianzhu/AnimationExample.unity.meta rename to Guardian of Silverkeep/Assets/Scene_Tianzhu/AnimationExample.unity.meta diff --git a/Guardian of Silverkeep/Assets/Test_Scene_Tianzhu/LVL1.unity b/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity similarity index 100% rename from Guardian of Silverkeep/Assets/Test_Scene_Tianzhu/LVL1.unity rename to Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity diff --git a/Guardian of Silverkeep/Assets/Test_Scene_Tianzhu/LVL1.unity.meta b/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity.meta similarity index 100% rename from Guardian of Silverkeep/Assets/Test_Scene_Tianzhu/LVL1.unity.meta rename to Guardian of Silverkeep/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 new file mode 100644 index 0000000..4d0ff78 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Scripts/From_John.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 57044b70b0d444496a78c075fefd85a0 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Guardian of Silverkeep/Assets/Scripts/BackButton.cs b/Guardian of Silverkeep/Assets/Scripts/From_John/BackButton.cs similarity index 100% rename from Guardian of Silverkeep/Assets/Scripts/BackButton.cs rename to Guardian of Silverkeep/Assets/Scripts/From_John/BackButton.cs diff --git a/Guardian of Silverkeep/Assets/Scripts/BackButton.cs.meta b/Guardian of Silverkeep/Assets/Scripts/From_John/BackButton.cs.meta similarity index 100% rename from Guardian of Silverkeep/Assets/Scripts/BackButton.cs.meta rename to Guardian of Silverkeep/Assets/Scripts/From_John/BackButton.cs.meta diff --git a/Guardian of Silverkeep/Assets/Scripts/Button.cs b/Guardian of Silverkeep/Assets/Scripts/From_John/Button.cs similarity index 95% rename from Guardian of Silverkeep/Assets/Scripts/Button.cs rename to Guardian of Silverkeep/Assets/Scripts/From_John/Button.cs index 50b94eb..e9b5061 100755 --- a/Guardian of Silverkeep/Assets/Scripts/Button.cs +++ b/Guardian of Silverkeep/Assets/Scripts/From_John/Button.cs @@ -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"); diff --git a/Guardian of Silverkeep/Assets/Scripts/Button.cs.meta b/Guardian of Silverkeep/Assets/Scripts/From_John/Button.cs.meta similarity index 100% rename from Guardian of Silverkeep/Assets/Scripts/Button.cs.meta rename to Guardian of Silverkeep/Assets/Scripts/From_John/Button.cs.meta diff --git a/Guardian of Silverkeep/Assets/Scripts/SceneChange.cs b/Guardian of Silverkeep/Assets/Scripts/From_John/SceneChange.cs similarity index 100% rename from Guardian of Silverkeep/Assets/Scripts/SceneChange.cs rename to Guardian of Silverkeep/Assets/Scripts/From_John/SceneChange.cs diff --git a/Guardian of Silverkeep/Assets/Scripts/SceneChange.cs.meta b/Guardian of Silverkeep/Assets/Scripts/From_John/SceneChange.cs.meta similarity index 100% rename from Guardian of Silverkeep/Assets/Scripts/SceneChange.cs.meta rename to Guardian of Silverkeep/Assets/Scripts/From_John/SceneChange.cs.meta diff --git a/Guardian of Silverkeep/Assets/Scripts/Timer.cs b/Guardian of Silverkeep/Assets/Scripts/From_John/Timer.cs similarity index 100% rename from Guardian of Silverkeep/Assets/Scripts/Timer.cs rename to Guardian of Silverkeep/Assets/Scripts/From_John/Timer.cs diff --git a/Guardian of Silverkeep/Assets/Scripts/Timer.cs.meta b/Guardian of Silverkeep/Assets/Scripts/From_John/Timer.cs.meta similarity index 100% rename from Guardian of Silverkeep/Assets/Scripts/Timer.cs.meta rename to Guardian of Silverkeep/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 deleted file mode 100755 index 789417c..0000000 Binary files a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet.png and /dev/null differ diff --git a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet.png.meta b/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet.png.meta deleted file mode 100644 index 3d8518f..0000000 --- a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet.png.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: caa1fe9bc1de83348b93a9da2d753262 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - userData: diff --git a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png b/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png deleted file mode 100755 index 98eb90d..0000000 Binary files a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png and /dev/null differ diff --git a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png.meta b/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png.meta deleted file mode 100644 index b7d7675..0000000 --- a/Guardian of Silverkeep/Assets/Texture/PlayerSpriteSheet2.png.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: f04d486ff44878e4ea9f4440fc827a05 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - userData: diff --git a/Guardian of Silverkeep/ProjectSettings/EditorBuildSettings.asset b/Guardian of Silverkeep/ProjectSettings/EditorBuildSettings.asset index 6dc24f7..d715157 100644 --- 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