Browse Source

full game flow

combinedRaceAndNameDropper
Josh 1 year ago
parent
commit
051c0912e1
  1. 118
      namedropper/Assets/Scenes/RaceGame.unity
  2. 4
      namedropper/Assets/Scripts/ChallengingStage.cs
  3. 2
      namedropper/Assets/Scripts/GameManager.cs
  4. 2
      namedropper/Assets/Scripts/JoinPlayer.cs
  5. 5
      namedropper/Assets/Scripts/Level.cs
  6. 4
      namedropper/Assets/Scripts/TopicSelect.cs
  7. BIN
      namedropper/Assets/Sprites/racetrack.png

118
namedropper/Assets/Scenes/RaceGame.unity

@ -578,6 +578,64 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} m_CorrespondingSourceObject: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
m_PrefabInstance: {fileID: 76032778} m_PrefabInstance: {fileID: 76032778}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &90769405
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 90769406}
- component: {fileID: 90769407}
m_Layer: 0
m_Name: Box Collider (11)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &90769406
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 90769405}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -329, y: -294, z: 9.580622}
m_LocalScale: {x: 7.329005, y: 0.8026563, z: 0.8026563}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1160808108}
m_RootOrder: 48
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &90769407
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 90769405}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 285.4, y: 25.6}
m_EdgeRadius: 0
--- !u!1 &91912126 stripped --- !u!1 &91912126 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 9049015333349338381, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} m_CorrespondingSourceObject: {fileID: 9049015333349338381, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
@ -4907,6 +4965,8 @@ Transform:
- {fileID: 1088415254} - {fileID: 1088415254}
- {fileID: 1374418290} - {fileID: 1374418290}
- {fileID: 1434856735} - {fileID: 1434856735}
- {fileID: 90769406}
- {fileID: 1562272326}
m_Father: {fileID: 680360959} m_Father: {fileID: 680360959}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -6577,6 +6637,64 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1559740737} m_GameObject: {fileID: 1559740737}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1562272325
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1562272326}
- component: {fileID: 1562272327}
m_Layer: 0
m_Name: Box Collider (12)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1562272326
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1562272325}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -329, y: 768, z: 9.580622}
m_LocalScale: {x: 7.329005, y: 0.8026563, z: 0.8026563}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1160808108}
m_RootOrder: 49
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1562272327
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1562272325}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 285.4, y: 25.6}
m_EdgeRadius: 0
--- !u!1 &1583941662 --- !u!1 &1583941662
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

4
namedropper/Assets/Scripts/ChallengingStage.cs

@ -53,7 +53,7 @@ public class ChallengingStage : Level
{ {
if (Input.GetKeyDown(KeyCode.F12)) if (Input.GetKeyDown(KeyCode.F12))
{ {
SceneManager.LoadScene("TopicSelect"); SceneManager.LoadScene("RaceGame");
} }
} }
IEnumerator Countdown() IEnumerator Countdown()
@ -75,7 +75,7 @@ public class ChallengingStage : Level
Game.Paused = true; Game.Paused = true;
yield return new WaitForSeconds(2.5f); yield return new WaitForSeconds(2.5f);
Game.Paused = false; Game.Paused = false;
SceneManager.LoadScene("TopicSelect"); SceneManager.LoadScene("RaceGame");
} }

2
namedropper/Assets/Scripts/GameManager.cs

@ -19,7 +19,7 @@ public class GameManager
int _round = 1; int _round = 1;
public bool[] PlayerJoined = new bool[4]; public bool[] PlayerJoined = new bool[4];
public static bool MINIGAMES = true; public static bool MINIGAMES = false;
public static int PLAYER_SKIN = 5; //0 == puck, 1 == pancake, 2 == gummybear, 3==pig, 4==ball w/ bear, 5==pop public static int PLAYER_SKIN = 5; //0 == puck, 1 == pancake, 2 == gummybear, 3==pig, 4==ball w/ bear, 5==pop
public static int MAX_PLAYER_SKIN = 5; public static int MAX_PLAYER_SKIN = 5;
public static int MVP = -1; public static int MVP = -1;

2
namedropper/Assets/Scripts/JoinPlayer.cs

@ -103,7 +103,7 @@ public class JoinPlayer : MonoBehaviour
if (GameManager.MINIGAMES) if (GameManager.MINIGAMES)
SceneManager.LoadScene("Wheel Scene"); SceneManager.LoadScene("Wheel Scene");
else else
SceneManager.LoadScene("TopicSelect"); SceneManager.LoadScene("RaceGame");
} }
void Redo() void Redo()

5
namedropper/Assets/Scripts/Level.cs

@ -187,16 +187,17 @@ public class Level : MonoBehaviour
{ {
SceneManager.LoadScene("GameOver"); SceneManager.LoadScene("GameOver");
} }
else if (GameManager.Instance.Round == 3 && GameManager.MINIGAMES == false) /* else if (GameManager.Instance.Round == 3 && GameManager.MINIGAMES == false)
{ {
SceneManager.LoadScene("ChallengingStage"); SceneManager.LoadScene("ChallengingStage");
} }
*/
else else
{ {
if (GameManager.MINIGAMES) if (GameManager.MINIGAMES)
SceneManager.LoadScene("Wheel Scene"); SceneManager.LoadScene("Wheel Scene");
else else
SceneManager.LoadScene("TopicSelect"); SceneManager.LoadScene("RaceGame");
} }
} }
} }

4
namedropper/Assets/Scripts/TopicSelect.cs

@ -17,7 +17,7 @@ public class TopicSelect : Level
public const bool WORST_PLAYER_PICKS = false; public const bool WORST_PLAYER_PICKS = false;
public const bool WORST_TEAM_PICKS = true; public const bool WORST_TEAM_PICKS = false;
public const bool VOTE_ON_TOPIC = false; public const bool VOTE_ON_TOPIC = false;
@ -244,7 +244,7 @@ public class TopicSelect : Level
} }
} }
_topic1Box.TopicData = GameDataManager.Instance.GetRandomTopicData(); _topic1Box.TopicData = GameDataManager.Instance.GetRandomTopicData();
_topic2Box.TopicData = GameDataManager.Instance.GetRandomTopicData(); _topic2Box.TopicData = GameDataManager.Instance.GetRandomTopicData();
_topic3Box.TopicData = GameDataManager.Instance.GetRandomTopicData(); _topic3Box.TopicData = GameDataManager.Instance.GetRandomTopicData();
_topic1Box.Name = _topic1Box.TopicData.Topic; _topic1Box.Name = _topic1Box.TopicData.Topic;

BIN
namedropper/Assets/Sprites/racetrack.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 95 KiB

Loading…
Cancel
Save