diff --git a/playable/Assets/Scenes/Menu_Scene.unity b/playable/Assets/Scenes/Menu_Scene.unity index a34413d..fb9163c 100644 Binary files a/playable/Assets/Scenes/Menu_Scene.unity and b/playable/Assets/Scenes/Menu_Scene.unity differ diff --git a/playable/Assets/Scripts/menuContrller.cs b/playable/Assets/Scripts/menuContrller.cs index 2f0b68f..ea76365 100644 --- a/playable/Assets/Scripts/menuContrller.cs +++ b/playable/Assets/Scripts/menuContrller.cs @@ -7,6 +7,8 @@ public class menuContrller : MonoBehaviour { public GameObject menu; public GameObject options; public GameObject levelSelect; + public GameObject instructions; + public GameObject xboxLayout; public GameObject btn_2player; public GameObject btn_3player; public GameObject btn_4player; @@ -31,6 +33,8 @@ public class menuContrller : MonoBehaviour { menu.SetActive (false); options.SetActive (false); levelSelect.SetActive (false); + instructions.SetActive (false); + xboxLayout.SetActive (false); alpaca.SetActive (true); goat.SetActive (true); platypuss.SetActive (true); @@ -46,7 +50,20 @@ public class menuContrller : MonoBehaviour { goat.SetActive (false); platypuss.SetActive (false); kangaroo.SetActive (false); - + } + if (panel == "instructions") { + instructions.SetActive (true); + alpaca.SetActive (false); + goat.SetActive (false); + platypuss.SetActive (false); + kangaroo.SetActive (false); + } + if (panel == "xboxLayout") { + xboxLayout.SetActive (true); + alpaca.SetActive (false); + goat.SetActive (false); + platypuss.SetActive (false); + kangaroo.SetActive (false); } } diff --git a/playable/Assets/Textures/KeyboardLayout.PNG b/playable/Assets/Textures/KeyboardLayout.PNG new file mode 100644 index 0000000..7e0be1c Binary files /dev/null and b/playable/Assets/Textures/KeyboardLayout.PNG differ diff --git a/playable/Assets/Textures/KeyboardLayout.PNG.meta b/playable/Assets/Textures/KeyboardLayout.PNG.meta new file mode 100644 index 0000000..e7ac5a8 --- /dev/null +++ b/playable/Assets/Textures/KeyboardLayout.PNG.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: 983f6b5f46bc8af43970eefc076d79fc +TextureImporter: + fileIDToRecycleName: {} + 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: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/playable/Assets/Textures/XboxLayout.PNG b/playable/Assets/Textures/XboxLayout.PNG new file mode 100644 index 0000000..f9afa88 Binary files /dev/null and b/playable/Assets/Textures/XboxLayout.PNG differ diff --git a/playable/Assets/Textures/XboxLayout.PNG.meta b/playable/Assets/Textures/XboxLayout.PNG.meta new file mode 100644 index 0000000..101bc47 --- /dev/null +++ b/playable/Assets/Textures/XboxLayout.PNG.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: b60ff12cf88e4a144acf626b45bc5774 +TextureImporter: + fileIDToRecycleName: {} + 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: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: