Conjure/PillowFight
6
0
Fork 0
mirror of https://github.com/ConjureETS/PillowFight.git synced 2026-03-24 00:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

add splashscree & instruction screen to build settings

Browse Source
This commit is contained in:
jparent 2015-08-23 15:05:20 -04:00
parent efa3f6a7b0
commit 85318e2c73
3 changed files with 17 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Scenes/Menu/Instructions.unity
View File

@ -133,6 +133,7 @@ MonoBehaviour:
m_SubmitButton: Submit m_SubmitButton: Submit
m_CancelButton: Cancel m_CancelButton: Cancel
m_InputActionsPerSecond: 10 m_InputActionsPerSecond: 10
m_RepeatDelay: .5
m_AllowActivationOnMobileDevice: 0 m_AllowActivationOnMobileDevice: 0
--- !u!114 &767368739 --- !u!114 &767368739
MonoBehaviour: MonoBehaviour:
@ -232,6 +233,7 @@ Camera:
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
m_StereoSeparation: .0219999999 m_StereoSeparation: .0219999999
m_StereoMirrorMode: 0
--- !u!4 &1194318904 --- !u!4 &1194318904
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -509,3 +511,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 769d2d55a9b6b104baa54b6081fbe205, type: 3} m_Script: {fileID: 11500000, guid: 769d2d55a9b6b104baa54b6081fbe205, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
NextLevel: 2

44
Assets/Scenes/Menu/SplashScreen.unity
View File

@ -87,48 +87,6 @@ NavMeshSettings:
cellSize: .166666672 cellSize: .166666672
manualCellSize: 0 manualCellSize: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &233906027
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 127118, guid: 158e745881137e04ca2086294f44d74c, type: 2}
m_PrefabInternal: {fileID: 1476560725}
serializedVersion: 4
m_Component:
- 4: {fileID: 233906029}
- 114: {fileID: 233906028}
m_Layer: 0
m_Name: InputManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &233906028
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 11450178, guid: 158e745881137e04ca2086294f44d74c,
type: 2}
m_PrefabInternal: {fileID: 1476560725}
m_GameObject: {fileID: 233906027}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6e33ba5066fe01747b2722e6f089a2ba, type: 3}
m_Name:
m_EditorClassIdentifier:
MAX_PLAYER_COUNT: 4
InputMapperAsset: {fileID: 11400000, guid: f4e69a787b1338846b2293e50d7cc92e, type: 2}
--- !u!4 &233906029
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 498212, guid: 158e745881137e04ca2086294f44d74c, type: 2}
m_PrefabInternal: {fileID: 1476560725}
m_GameObject: {fileID: 233906027}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!1 &767368736 --- !u!1 &767368736
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -450,7 +408,6 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 158e745881137e04ca2086294f44d74c, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 158e745881137e04ca2086294f44d74c, type: 2}
m_RootGameObject: {fileID: 233906027}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
--- !u!1 &1520914590 --- !u!1 &1520914590
GameObject: GameObject:
@ -554,3 +511,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 769d2d55a9b6b104baa54b6081fbe205, type: 3} m_Script: {fileID: 11500000, guid: 769d2d55a9b6b104baa54b6081fbe205, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
NextLevel: 1

20
Assets/Scripts/Menus/SimpleMenu.cs
View File

@ -3,18 +3,24 @@ using System.Collections;
public class SimpleMenu : MonoBehaviour public class SimpleMenu : MonoBehaviour
{ {
public int NextLevel; public int NextLevel;
private float countdown = 1f;
// Use this for initialization // Use this for initialization
void Start () { void Start () {
//TODO Use XInput to StartCoroutine(AutoSkip());
} }
// Update is called once per frame // Update is called once per frame
void Update () { void Update () {
countdown -= Time.deltaTime; if (Input.anyKeyDown) {
if (countdown < 0) Application.LoadLevel(NextLevel);
Application.LoadLevel(NextLevel); }
} }
IEnumerator AutoSkip() {
yield return new WaitForSeconds(5);
Application.LoadLevel(NextLevel);
}
} }