Browse Source

Very minor fixes, ie. preventing the game from blowing up everyone's ears at the start of every level.

master
Jeasonfire 5 years ago
parent
commit
abdc0ca1af
9 changed files with 85 additions and 9 deletions
  1. +12
    -0
      Assets/Prefabs/Blue/Blue Platform (Massless).prefab
  2. +12
    -0
      Assets/Prefabs/Blue/Blue Platform.prefab
  3. +12
    -0
      Assets/Prefabs/Green/Green Platform (Massless).prefab
  4. +12
    -0
      Assets/Prefabs/Green/Green Platform.prefab
  5. +12
    -0
      Assets/Prefabs/Yellow/Yellow Platform (Massless).prefab
  6. +12
    -0
      Assets/Prefabs/Yellow/Yellow Platform.prefab
  7. +4
    -5
      Assets/Scripts/GameController.cs
  8. +1
    -0
      Assets/Scripts/LevelChanger.cs
  9. +8
    -4
      ProjectSettings/ProjectSettings.asset

+ 12
- 0
Assets/Prefabs/Blue/Blue Platform (Massless).prefab View File

@@ -9,6 +9,7 @@ GameObject:
m_Component:
- 4: {fileID: 408986}
- 82: {fileID: 8247662}
- 114: {fileID: 11468088}
m_Layer: 0
m_Name: Transform
m_TagString: Untagged
@@ -185,6 +186,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
replacer: {fileID: 194712, guid: d3967017d7a0db24fb4a2252eab1178b, type: 2}
effect: {fileID: 8247662}
--- !u!114 &11468088
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 125406}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3fb59b4fea0ebd4ba57dca64286c81e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1


+ 12
- 0
Assets/Prefabs/Blue/Blue Platform.prefab View File

@@ -9,6 +9,7 @@ GameObject:
m_Component:
- 4: {fileID: 447542}
- 82: {fileID: 8206540}
- 114: {fileID: 11415792}
m_Layer: 0
m_Name: Transform
m_TagString: Untagged
@@ -172,6 +173,17 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &11415792
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 169078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3fb59b4fea0ebd4ba57dca64286c81e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &11463796
MonoBehaviour:
m_ObjectHideFlags: 1


+ 12
- 0
Assets/Prefabs/Green/Green Platform (Massless).prefab View File

@@ -9,6 +9,7 @@ GameObject:
m_Component:
- 4: {fileID: 439434}
- 82: {fileID: 8294266}
- 114: {fileID: 11409116}
m_Layer: 0
m_Name: Transform
m_TagString: Untagged
@@ -185,6 +186,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
replacer: {fileID: 194712, guid: ef2bf4b3d5048be4f98cacc0d79ed36c, type: 2}
effect: {fileID: 8294266}
--- !u!114 &11409116
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 167920}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3fb59b4fea0ebd4ba57dca64286c81e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1


+ 12
- 0
Assets/Prefabs/Green/Green Platform.prefab View File

@@ -9,6 +9,7 @@ GameObject:
m_Component:
- 4: {fileID: 487992}
- 82: {fileID: 8298586}
- 114: {fileID: 11432250}
m_Layer: 0
m_Name: Transform
m_TagString: Untagged
@@ -172,6 +173,17 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &11432250
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 101506}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3fb59b4fea0ebd4ba57dca64286c81e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &11463796
MonoBehaviour:
m_ObjectHideFlags: 1


+ 12
- 0
Assets/Prefabs/Yellow/Yellow Platform (Massless).prefab View File

@@ -9,6 +9,7 @@ GameObject:
m_Component:
- 4: {fileID: 487360}
- 82: {fileID: 8286064}
- 114: {fileID: 11426302}
m_Layer: 0
m_Name: Transform
m_TagString: Untagged
@@ -185,6 +186,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
replacer: {fileID: 194712, guid: d68fa77b1ffd06b48ab57db04657692b, type: 2}
effect: {fileID: 8286064}
--- !u!114 &11426302
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 171066}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3fb59b4fea0ebd4ba57dca64286c81e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1


+ 12
- 0
Assets/Prefabs/Yellow/Yellow Platform.prefab View File

@@ -9,6 +9,7 @@ GameObject:
m_Component:
- 4: {fileID: 471318}
- 82: {fileID: 8208562}
- 114: {fileID: 11453326}
m_Layer: 0
m_Name: Transform
m_TagString: Untagged
@@ -172,6 +173,17 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!114 &11453326
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 175060}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3fb59b4fea0ebd4ba57dca64286c81e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &11463796
MonoBehaviour:
m_ObjectHideFlags: 1


+ 4
- 5
Assets/Scripts/GameController.cs View File

@@ -10,13 +10,16 @@ public class GameController : MonoBehaviour {
private static float loading = 1;
public PlayerController player;
private float pauseTime = 0;
private static int lastLevel = -1;

void Start () {
Cursor.lockState = CursorLockMode.Locked;
Cursor.visible = false;
}

public static void SetLoading (int seconds) {
loading = seconds;
}

public static bool IsLoading () {
return loading > 0;
}
@@ -25,10 +28,6 @@ public class GameController : MonoBehaviour {
if (loading > 0) {
loading -= Time.deltaTime;
}
if (Application.loadedLevel != lastLevel) {
loading = 5;
lastLevel = Application.loadedLevel;
}

if (Camera.main.fieldOfView != fov && !player.GetPaused ()) {
Camera.main.fieldOfView = fov;


+ 1
- 0
Assets/Scripts/LevelChanger.cs View File

@@ -7,6 +7,7 @@ public class LevelChanger : MonoBehaviour {

void OnTriggerEnter (Collider other) {
if (other.gameObject.tag.Equals ("Player")) {
GameController.SetLoading (2);
Application.LoadLevel(levelToChangeTo);
}
}


+ 8
- 4
ProjectSettings/ProjectSettings.asset View File

@@ -11,7 +11,7 @@ PlayerSettings:
targetIOSGraphics: -1
targetResolution: 0
accelerometerFrequency: 60
companyName: DefaultCompany
companyName: Jeasonfire
productName: The Higgs Gun
cloudProjectId:
defaultCursor: {fileID: 0}
@@ -19,7 +19,7 @@ PlayerSettings:
m_ShowUnitySplashScreen: 1
defaultScreenWidth: 1024
defaultScreenHeight: 768
defaultScreenWidthWeb: 960
defaultScreenWidthWeb: 900
defaultScreenHeightWeb: 600
m_RenderingPath: 1
m_MobileRenderingPath: 1
@@ -134,9 +134,13 @@ PlayerSettings:
banner: {fileID: 0}
androidGamepadSupportLevel: 0
resolutionDialogBanner: {fileID: 0}
m_BuildTargetIcons: []
m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- m_Icon: {fileID: 0}
m_Size: 128
m_BuildTargetBatching: []
webPlayerTemplate: APPLICATION:Default
webPlayerTemplate: APPLICATION:Black Background
m_TemplateCustomTags: {}
actionOnDotNetUnhandledException: 1
enableInternalProfiler: 0


Loading…
Cancel
Save