Browse Source

combined two start screens

combinedRaceAndNameDropper
Josh 2 years ago
parent
commit
ad563a83ef
  1. 47
      namedropper/Assets/Prefabs/ScoreStackBlue.prefab
  2. 7
      namedropper/Assets/Prefabs/ScoreStackBlue.prefab.meta
  3. 47
      namedropper/Assets/Prefabs/ScoreStackRed.prefab
  4. 7
      namedropper/Assets/Prefabs/ScoreStackRed.prefab.meta
  5. 1198
      namedropper/Assets/Scenes/OldTitle.unity
  6. 2
      namedropper/Assets/Scenes/OldTitle.unity.meta
  7. 1683
      namedropper/Assets/Scenes/PlayerSelectJoin.unity
  8. 2076
      namedropper/Assets/Scenes/Title.unity
  9. 2
      namedropper/Assets/Scenes/Title.unity.meta
  10. 2
      namedropper/Assets/Scripts/JoinPlayer.cs
  11. 2
      namedropper/Assets/Scripts/Level.cs
  12. 2
      namedropper/Assets/Scripts/Wraparound.cs
  13. 4
      namedropper/ProjectSettings/EditorBuildSettings.asset

47
namedropper/Assets/Prefabs/ScoreStackBlue.prefab

@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2980751867113818293
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2980751867113818291}
- component: {fileID: 2980751867113818290}
m_Layer: 0
m_Name: ScoreStackBlue
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2980751867113818291
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2980751867113818293}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 108, y: 28, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2980751867113818290
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2980751867113818293}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9c5b0aa924ddd144eb57c0f6dfe5f9a2, type: 3}
m_Name:
m_EditorClassIdentifier:
_lightSprite: {fileID: 21300000, guid: 7ea079f8f84c7124d88011f6f64c40fc, type: 3}
_darkSprite: {fileID: 21300000, guid: ecfdde29a283495499803a31cca63030, type: 3}

7
namedropper/Assets/Prefabs/ScoreStackBlue.prefab.meta

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 790b53bfae3a1424bb8a7aca77f1a2da
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

47
namedropper/Assets/Prefabs/ScoreStackRed.prefab

@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2286698427935817959
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2286698427935817953}
- component: {fileID: 2286698427935817958}
m_Layer: 0
m_Name: ScoreStackRed
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2286698427935817953
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2286698427935817959}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1822, y: 28, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2286698427935817958
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2286698427935817959}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9c5b0aa924ddd144eb57c0f6dfe5f9a2, type: 3}
m_Name:
m_EditorClassIdentifier:
_lightSprite: {fileID: 21300000, guid: 1cc9f56b0d7f7844e8ce5e8fc47efd80, type: 3}
_darkSprite: {fileID: 21300000, guid: 429420fbb1683174d9a56bcf00e06f6f, type: 3}

7
namedropper/Assets/Prefabs/ScoreStackRed.prefab.meta

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7c1022cdecec0fd43a849e560913a9b0
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1198
namedropper/Assets/Scenes/OldTitle.unity

File diff suppressed because it is too large

2
namedropper/Assets/Scenes/PlayerSelectJoin.unity.meta → namedropper/Assets/Scenes/OldTitle.unity.meta

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: dec16e3b1be4d704a89f82efa59198e4
guid: 6ee247bbdb0f38647998cd2523f264c7
DefaultImporter:
externalObjects: {}
userData:

1683
namedropper/Assets/Scenes/PlayerSelectJoin.unity

File diff suppressed because it is too large

2076
namedropper/Assets/Scenes/Title.unity

File diff suppressed because it is too large

2
namedropper/Assets/Scenes/Title.unity.meta

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6ee247bbdb0f38647998cd2523f264c7
guid: dec16e3b1be4d704a89f82efa59198e4
DefaultImporter:
externalObjects: {}
userData:

2
namedropper/Assets/Scripts/JoinPlayer.cs

@ -104,7 +104,7 @@ public class JoinPlayer : MonoBehaviour
void Redo()
{
SceneManager.LoadScene("PlayerSelectJoin");
SceneManager.LoadScene("Title");
}
void UpdateTitle()

2
namedropper/Assets/Scripts/Level.cs

@ -34,7 +34,7 @@ public class Level : MonoBehaviour
foreach (GameObject player in _players)
{
if (GameManager.Instance.PlayerJoined[player.GetComponent<Player>()._playerNumber] == true ||
SceneManager.GetActiveScene().name == "PlayerSelectJoin")
SceneManager.GetActiveScene().name == "Title")
{
player.SetActive(true);
}

2
namedropper/Assets/Scripts/Wraparound.cs

@ -26,7 +26,7 @@ public class Wraparound : MonoBehaviour
}
if (SceneManager.GetActiveScene().name == "TopicSelect" || SceneManager.GetActiveScene().name == "Calibration" || SceneManager.GetActiveScene().name == "PlayerSelectJoin")
if (SceneManager.GetActiveScene().name == "TopicSelect" || SceneManager.GetActiveScene().name == "Calibration" || SceneManager.GetActiveScene().name == "Title")
{
if (this.transform.position.x < 0)
{

4
namedropper/ProjectSettings/EditorBuildSettings.asset

@ -6,7 +6,7 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/Title.unity
path: Assets/Scenes/OldTitle.unity
guid: 6ee247bbdb0f38647998cd2523f264c7
- enabled: 1
path: Assets/Scenes/Calibration.unity
@ -21,7 +21,7 @@ EditorBuildSettings:
path: Assets/Scenes/RoundOutro.unity
guid: 3982c6ec82b64f343a20d6a1e9b6f32f
- enabled: 1
path: Assets/Scenes/PlayerSelectJoin.unity
path: Assets/Scenes/Title.unity
guid: dec16e3b1be4d704a89f82efa59198e4
- enabled: 0
path:

Loading…
Cancel
Save