Conjure/OuijaMTLGJ2016
6
0
Fork 0
mirror of https://github.com/ConjureETS/OuijaMTLGJ2016.git synced 2026-03-25 10:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

blabla

Browse Source
This commit is contained in:
Patrice Vignola 2016-01-31 15:47:59 -05:00
parent 2937472366
commit 53478b8bca
13 changed files with 324 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ControllerMapper.asset
View File

@ -15,7 +15,7 @@ MonoBehaviour:
- name: Normal
ButtonActions:
- name: Dash
XboxButtons: 02000000000000000100000003000000
XboxButtons: 020000000000000001000000030000000400000005000000
KeyboardKeys:
AxisRanges:
- name: MoveLeft

BIN
Assets/art/UI_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

56
Assets/art/UI_1.png.meta Normal file
View File

@ -0,0 +1,56 @@
fileFormatVersion: 2
guid: 6ab7274ab5aa33343bf62931411fe89a
timeCreated: 1454271472
licenseType: Free
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
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
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:
assetBundleName:
assetBundleVariant:

BIN
Assets/art/UI_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

56
Assets/art/UI_2.png.meta Normal file
View File

@ -0,0 +1,56 @@
fileFormatVersion: 2
guid: c01ca952525cc8149ae540d67c157bd9
timeCreated: 1454271472
licenseType: Free
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
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
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:
assetBundleName:
assetBundleVariant:

BIN
Assets/art/UI_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

56
Assets/art/UI_3.png.meta Normal file
View File

@ -0,0 +1,56 @@
fileFormatVersion: 2
guid: 83b462fb54e55c94aa71c8e14c31f2dc
timeCreated: 1454271472
licenseType: Free
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
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
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:
assetBundleName:
assetBundleVariant:

BIN
Assets/art/UI_GO.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

56
Assets/art/UI_GO.png.meta Normal file
View File

@ -0,0 +1,56 @@
fileFormatVersion: 2
guid: 6cca30ff48f9b0b468a56f0d1a546e99
timeCreated: 1454271472
licenseType: Free
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
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
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:
assetBundleName:
assetBundleVariant:

4
Assets/prefabs/HexSprite.prefab
View File

@ -118,7 +118,7 @@ SpriteRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 118646}
m_Enabled: 0
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_Materials:
@ -147,7 +147,7 @@ Prefab:
m_Modifications:
- target: {fileID: 0}
propertyPath: m_Enabled
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: DefaultColor.r

32
Assets/scenes/GameplayScene.unity
View File

@ -180,7 +180,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 201485588}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.5600004, y: 1.46200013, z: 9.34000015}
m_LocalPosition: {x: 12.5200005, y: 1.46200013, z: 9.34000015}
m_LocalScale: {x: .200000003, y: 6, z: 16}
m_Children: []
m_Father: {fileID: 1944057160}
@ -785,7 +785,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 4
--- !u!1001 &1229110618
Prefab:
m_ObjectHideFlags: 0
@ -795,15 +795,15 @@ Prefab:
m_Modifications:
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalPosition.x
value: 7.9699993
value: 8.13700008
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalPosition.y
value: -1.08
value: -1.08000004
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalPosition.z
value: 4.6000023
value: 4.6880002
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.x
@ -811,7 +811,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.y
value: 0.50000006
value: .50000006
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.z
@ -819,7 +819,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.w
value: 0.86602545
value: .866025448
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_RootOrder
@ -1289,7 +1289,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1374790521}
m_LocalRotation: {x: 0, y: .707106829, z: 0, w: .707106709}
m_LocalPosition: {x: 4.65999985, y: 1.46200013, z: 2.70000005}
m_LocalPosition: {x: 4.65999985, y: 1.46200013, z: 3.45000005}
m_LocalScale: {x: .200000003, y: 6, z: 18}
m_Children: []
m_Father: {fileID: 1944057160}
@ -1360,15 +1360,15 @@ Prefab:
m_Modifications:
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalPosition.x
value: -8.070001
value: -8.13700008
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalPosition.y
value: -1.08
value: -1.08000004
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalPosition.z
value: 4.6500053
value: 4.6880002
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.x
@ -1376,7 +1376,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.y
value: 0.49999985
value: .499999851
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.z
@ -1384,7 +1384,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.w
value: -0.86602557
value: -.866025567
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_RootOrder
@ -1911,11 +1911,11 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalPosition.y
value: -1.08
value: -1.08000004
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalPosition.z
value: -9.239998
value: -9.39085293
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.x
@ -1931,7 +1931,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_LocalRotation.w
value: -0.00000014901161
value: -1.49011612e-07
objectReference: {fileID: 0}
- target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2}
propertyPath: m_RootOrder

2
Assets/scenes/MainMenu.unity
View File

@ -170,7 +170,7 @@ MonoBehaviour:
- {fileID: 1385875579}
- {fileID: 1992441096}
- {fileID: 162809795}
levelIndex: 0
levelIndex: 2
--- !u!1 &73358719
GameObject:
m_ObjectHideFlags: 0

88
Assets/scripts/LevelManager.cs
View File

@ -2,7 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Collections;
using InputHandler;
using InputHandler;
using UnityEngine.UI;
public class LevelManager : MonoBehaviour {
@ -23,12 +24,83 @@ public class LevelManager : MonoBehaviour {
private SelectorWithBolts Selector;
private GameObject PhysicsContainer;
private int playerId;
private int playerId;
public Image Icon1;
public Image Icon2;
public Image Icon3;
public Image IconGo;
private IEnumerator CountDown()
{
yield return new WaitForSeconds(0.5f);
yield return StartCoroutine(FadeOutNumber(Icon3));
yield return StartCoroutine(FadeOutNumber(Icon2));
yield return StartCoroutine(FadeOutNumber(Icon1));
yield return StartCoroutine(FadeOutNumber(IconGo));
for (int i = 0; i < 3; i++)
{
InputManager.Instance.PushActiveContext("Normal", i);
}
}
private IEnumerator FadeOutNumber(Image number)
{
number.gameObject.SetActive(true);
number.rectTransform.offsetMax = Vector2.zero;
number.rectTransform.offsetMin = Vector2.zero;
Vector2 initialAnchorMin = new Vector2(0.4f, 0.3f);
Vector2 initialAnchorMax = new Vector2(0.6f, 0.7f);
Vector2 finalAnchor = new Vector2(0.5f, 0.5f);
float ratio = 0f;
Color initialColor = number.color;
Color finalColor = new Color(initialColor.r, initialColor.g, initialColor.b, 0f);
while (ratio < 1f)
{
ratio += Time.deltaTime / 1f;
number.rectTransform.anchorMin = Vector2.Lerp(initialAnchorMin, finalAnchor, ratio);
number.rectTransform.anchorMax = Vector2.Lerp(initialAnchorMax, finalAnchor, ratio);
number.color = Color.Lerp(initialColor, finalColor, ratio);
yield return null;
}
number.gameObject.SetActive(false);
}
// Use this for initialization
void Start()
{
state = GameState.Instance;
void Start()
{
for (int i = 0; i < 3; i++)
{
InputManager.Instance.PushActiveContext("CinematicEvent", i);
}
Icon1.gameObject.SetActive(false);
Icon2.gameObject.SetActive(false);
Icon3.gameObject.SetActive(false);
IconGo.gameObject.SetActive(false);
StartCoroutine(CountDown());
state = GameState.Instance;
state.currentLevel = this;
int numColumns = state.numColumns;
int numRows = state.numRows;
@ -83,14 +155,14 @@ public class LevelManager : MonoBehaviour {
SoundManager.Instance.PlayShortHorn();
}
/*void Update()
void Update()
{
if (Input.GetKeyDown(KeyCode.Space))
{
StartCoroutine(SendWinnerToTheSky(state.players[1]));
StartCoroutine(FadeToDark());
}
}*/
}
public void PressTile(int letterNum, RuneBehaviour tile)
{
@ -280,7 +352,7 @@ public class LevelManager : MonoBehaviour {
yield return null;
}
Application.LoadLevel(0); //TODO Check this
Application.LoadLevel(1); //TODO Check this
}
private void EnableKinematics(bool state)