Navigation menu sélection vers scene de jeu
This commit is contained in:
parent
e6bdb274f0
commit
e2b76268e2
10
Assets/Font/typo-stratum/__MACOSX.meta
Normal file
10
Assets/Font/typo-stratum/__MACOSX.meta
Normal file
@ -0,0 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 76087783dd84b37478e6ad0446da7f2c
|
||||
folderAsset: yes
|
||||
timeCreated: 1520975305
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1531,7 +1531,7 @@ Prefab:
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -1591,7 +1591,7 @@ Prefab:
|
||||
- target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -21.579166
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -1611,7 +1611,7 @@ Prefab:
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -1631,7 +1631,7 @@ Prefab:
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -133.42084
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2}
|
||||
propertyPath: m_Name
|
||||
@ -2575,7 +2575,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1051925802
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3288,7 +3288,7 @@ Prefab:
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -3348,7 +3348,7 @@ Prefab:
|
||||
- target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -21.579166
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -3368,7 +3368,7 @@ Prefab:
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -3388,7 +3388,7 @@ Prefab:
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -133.42084
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2}
|
||||
propertyPath: m_Name
|
||||
@ -3472,7 +3472,7 @@ Prefab:
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -3532,7 +3532,7 @@ Prefab:
|
||||
- target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -21.579166
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -3552,7 +3552,7 @@ Prefab:
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -3572,7 +3572,7 @@ Prefab:
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -133.42084
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2}
|
||||
propertyPath: m_Name
|
||||
@ -3797,7 +3797,7 @@ Prefab:
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -3857,7 +3857,7 @@ Prefab:
|
||||
- target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -21.579166
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -3877,7 +3877,7 @@ Prefab:
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -3897,7 +3897,7 @@ Prefab:
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -133.42084
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2}
|
||||
propertyPath: m_Name
|
||||
@ -4652,7 +4652,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!114 &1714708927
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5232,7 +5232,7 @@ Prefab:
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -5292,7 +5292,7 @@ Prefab:
|
||||
- target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -21.579166
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -5312,7 +5312,7 @@ Prefab:
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -5332,7 +5332,7 @@ Prefab:
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -133.42084
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -5407,7 +5407,7 @@ Prefab:
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224998143105840122, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -5467,7 +5467,7 @@ Prefab:
|
||||
- target: {fileID: 224955305068670170, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -21.579166
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -5487,7 +5487,7 @@ Prefab:
|
||||
- target: {fileID: 224092313304127712, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
@ -5507,7 +5507,7 @@ Prefab:
|
||||
- target: {fileID: 224952752019128638, guid: d5df03a0612222947a30c5be4549acdb,
|
||||
type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -133.42084
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1051963178499332, guid: d5df03a0612222947a30c5be4549acdb, type: 2}
|
||||
propertyPath: m_Name
|
||||
|
@ -168,12 +168,6 @@ public class GameManager : MonoBehaviour
|
||||
// TODO: Remove once menus are ok
|
||||
void Update()
|
||||
{
|
||||
//if (Input.GetButtonDown("SubmitP1"))
|
||||
//{
|
||||
// SetSkins(0, 1);
|
||||
// LaunchRace();
|
||||
//}
|
||||
|
||||
if (_status == States.LoadingVideo)
|
||||
{
|
||||
Debug.Log(bm1.LoadingComplete() + " " + bm2.LoadingComplete());
|
||||
|
@ -43,8 +43,11 @@ public class LaunchGameScript : MonoBehaviour
|
||||
{
|
||||
GoButton.GetComponentInChildren<Text>().text = "Launching...";
|
||||
new WaitForSeconds(2);
|
||||
Launching = true;
|
||||
|
||||
GameManager.Instance.SetSkins(
|
||||
PlayerOneSelector.GetComponent<SelectorBehavior>().CurrentTransportIndex,
|
||||
PlayerTwoSelector.GetComponent<SelectorBehavior>().CurrentTransportIndex
|
||||
);
|
||||
GameManager.Instance.LaunchRace();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -18,7 +18,7 @@ public class SelectorBehavior : BaseInputBehavior
|
||||
#endregion
|
||||
|
||||
#region private properties
|
||||
int GetCurrentTransportIndex
|
||||
public int CurrentTransportIndex
|
||||
{
|
||||
get
|
||||
{
|
||||
@ -227,7 +227,7 @@ public class SelectorBehavior : BaseInputBehavior
|
||||
|
||||
private void MoveVertical(bool positive)
|
||||
{
|
||||
var value = GetCurrentTransportIndex;
|
||||
var value = CurrentTransportIndex;
|
||||
if (value - (transports.Count / 2) >= 0)
|
||||
value -= (transports.Count / 2);
|
||||
else value += (transports.Count / 2);
|
||||
@ -241,7 +241,7 @@ public class SelectorBehavior : BaseInputBehavior
|
||||
|
||||
private void MoveHorizontal(bool positive)
|
||||
{
|
||||
var value = GetCurrentTransportIndex;
|
||||
var value = CurrentTransportIndex;
|
||||
|
||||
if (positive) value++;
|
||||
else value--;
|
||||
|
@ -1 +1 @@
|
||||
{"Items":[{"pseudo":"PRENOM","transport":0,"timeStr":"0:28:20"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Tata","transport":0,"timeStr":"0:30:30"},{"pseudo":"Titi","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"}]}
|
||||
{"Items":[{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Tata","transport":0,"timeStr":"0:30:30"},{"pseudo":"Titi","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"}]}
|
||||
|
Loading…
Reference in New Issue
Block a user