Browse Source

Merge branch 'master' of https://bitbucket.org/JoshuaReason/pi-ata-smackdown

Conflicts:
	playable/Assets/Scenes/Menu_Scene.unity
master
Joshua Reason 9 years ago
parent
commit
42c3fe07e8
6 changed files with 112 additions and 1 deletions
  1. BIN
      playable/Assets/Scenes/Menu_Scene.unity
  2. +18
    -1
      playable/Assets/Scripts/menuContrller.cs
  3. BIN
      playable/Assets/Textures/KeyboardLayout.PNG
  4. +47
    -0
      playable/Assets/Textures/KeyboardLayout.PNG.meta
  5. BIN
      playable/Assets/Textures/XboxLayout.PNG
  6. +47
    -0
      playable/Assets/Textures/XboxLayout.PNG.meta

BIN
playable/Assets/Scenes/Menu_Scene.unity View File


+ 18
- 1
playable/Assets/Scripts/menuContrller.cs View File

@ -7,6 +7,8 @@ public class menuContrller : MonoBehaviour {
public GameObject menu; public GameObject menu;
public GameObject options; public GameObject options;
public GameObject levelSelect; public GameObject levelSelect;
public GameObject instructions;
public GameObject xboxLayout;
public GameObject btn_2player; public GameObject btn_2player;
public GameObject btn_3player; public GameObject btn_3player;
public GameObject btn_4player; public GameObject btn_4player;
@ -31,6 +33,8 @@ public class menuContrller : MonoBehaviour {
menu.SetActive (false); menu.SetActive (false);
options.SetActive (false); options.SetActive (false);
levelSelect.SetActive (false); levelSelect.SetActive (false);
instructions.SetActive (false);
xboxLayout.SetActive (false);
alpaca.SetActive (true); alpaca.SetActive (true);
goat.SetActive (true); goat.SetActive (true);
platypuss.SetActive (true); platypuss.SetActive (true);
@ -46,7 +50,20 @@ public class menuContrller : MonoBehaviour {
goat.SetActive (false); goat.SetActive (false);
platypuss.SetActive (false); platypuss.SetActive (false);
kangaroo.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);
} }
} }

BIN
playable/Assets/Textures/KeyboardLayout.PNG View File

Before After
Width: 1920  |  Height: 1080  |  Size: 200 KiB

+ 47
- 0
playable/Assets/Textures/KeyboardLayout.PNG.meta View File

@ -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:

BIN
playable/Assets/Textures/XboxLayout.PNG View File

Before After
Width: 1920  |  Height: 1080  |  Size: 131 KiB

+ 47
- 0
playable/Assets/Textures/XboxLayout.PNG.meta View File

@ -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:

Loading…
Cancel
Save