Fixed small issues found in playtesting
This commit is contained in:
@@ -72,7 +72,7 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1807660236798938897}
|
- component: {fileID: 1807660236798938897}
|
||||||
- component: {fileID: 1013965729963872153}
|
- component: {fileID: 1013965729963872153}
|
||||||
- component: {fileID: 1783748808844086845}
|
- component: {fileID: 4207089029311380441}
|
||||||
- component: {fileID: 7220179918976106526}
|
- component: {fileID: 7220179918976106526}
|
||||||
- component: {fileID: 7410036744236083586}
|
- component: {fileID: 7410036744236083586}
|
||||||
- component: {fileID: 9011244016352067911}
|
- component: {fileID: 9011244016352067911}
|
||||||
@@ -134,7 +134,8 @@ MonoBehaviour:
|
|||||||
- {fileID: 8300000, guid: 413764415f5bf42429d26861fc5e82cf, type: 3}
|
- {fileID: 8300000, guid: 413764415f5bf42429d26861fc5e82cf, type: 3}
|
||||||
- {fileID: 8300000, guid: 21713b7ac8710bf4fb3b949bbbebb67a, type: 3}
|
- {fileID: 8300000, guid: 21713b7ac8710bf4fb3b949bbbebb67a, type: 3}
|
||||||
PlayerAudioSource: {fileID: 3380663186425371797}
|
PlayerAudioSource: {fileID: 3380663186425371797}
|
||||||
--- !u!114 &1783748808844086845
|
HealthTracker: {fileID: 0}
|
||||||
|
--- !u!114 &4207089029311380441
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -143,7 +144,7 @@ MonoBehaviour:
|
|||||||
m_GameObject: {fileID: 5082956827802089079}
|
m_GameObject: {fileID: 5082956827802089079}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: ab982c94ab064b944947c4792e623299, type: 3}
|
m_Script: {fileID: 11500000, guid: 3d33e1862ff5809499d3187e38cf80a7, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
cam: {fileID: 7220179918976106526}
|
cam: {fileID: 7220179918976106526}
|
||||||
|
|||||||
@@ -340,6 +340,11 @@ PrefabInstance:
|
|||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: HealthTracker
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1003288351}
|
||||||
- target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000,
|
- target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: ExternalCamera
|
propertyPath: ExternalCamera
|
||||||
@@ -991,6 +996,18 @@ Transform:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 739366992}
|
m_PrefabInstance: {fileID: 739366992}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &1003288351 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 739366992}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 260819a4950a1f54d921ee3d6b3da010, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!4 &1004516925 stripped
|
--- !u!4 &1004516925 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
m_CorrespondingSourceObject: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||||
@@ -1265,6 +1282,11 @@ PrefabInstance:
|
|||||||
propertyPath: HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely
|
propertyPath: HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 112955761}
|
objectReference: {fileID: 112955761}
|
||||||
|
- target: {fileID: 6630605910866455705, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class tmp : MonoBehaviour
|
public class CamRatioFixer : MonoBehaviour
|
||||||
{
|
{
|
||||||
public Camera cam;
|
public Camera cam;
|
||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: ab982c94ab064b944947c4792e623299
|
guid: 3d33e1862ff5809499d3187e38cf80a7
|
||||||
MonoImporter:
|
MonoImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
@@ -8,10 +8,12 @@ namespace InterfaceOff.WorldScene
|
|||||||
public WindowSpawner Spawner;
|
public WindowSpawner Spawner;
|
||||||
public LifeThingTrackerThing Thing;
|
public LifeThingTrackerThing Thing;
|
||||||
|
|
||||||
|
public int Health { get; private set; }
|
||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
float scale = ((20 - Thing.HitsTaken) - Spawner.SpawnedWindowCount) * 5f;
|
Health = ((20 - Thing.HitsTaken) - Spawner.SpawnedWindowCount);
|
||||||
scale = Mathf.Clamp(scale, 0f, Mathf.Infinity);
|
float scale = Mathf.Clamp(Health * 5f, 0f, Mathf.Infinity);
|
||||||
|
|
||||||
if (!Spawner.AutoSpawn)
|
if (!Spawner.AutoSpawn)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ namespace InterfaceOff.WorldScene
|
|||||||
[SerializeField] private GameObject MovingObject;
|
[SerializeField] private GameObject MovingObject;
|
||||||
[SerializeField] private AudioClip[] AudioClips;
|
[SerializeField] private AudioClip[] AudioClips;
|
||||||
[SerializeField] private AudioSource PlayerAudioSource;
|
[SerializeField] private AudioSource PlayerAudioSource;
|
||||||
|
[SerializeField] private HealthBar HealthTracker;
|
||||||
|
|
||||||
public static void PlayRandomErrorSound()
|
public static void PlayRandomErrorSound()
|
||||||
{
|
{
|
||||||
@@ -61,7 +62,7 @@ namespace InterfaceOff.WorldScene
|
|||||||
/* Iterates the frame index */
|
/* Iterates the frame index */
|
||||||
FrameIndex = (FrameIndex + 1) % (Frames.Length - 2);
|
FrameIndex = (FrameIndex + 1) % (Frames.Length - 2);
|
||||||
|
|
||||||
if (DeathIndices.Contains(FrameIndex) && ActiveWindowSpawner.SpawnedWindowCount > MAX_WINDOWS)
|
if (DeathIndices.Contains(FrameIndex) && HealthTracker.Health <= 0)
|
||||||
{
|
{
|
||||||
ActiveWindowSpawner.StartEndSequence();
|
ActiveWindowSpawner.StartEndSequence();
|
||||||
PlayerAlive = false;
|
PlayerAlive = false;
|
||||||
|
|||||||
@@ -66,8 +66,8 @@ namespace InterfaceOff
|
|||||||
|
|
||||||
public void DestroyWindow()
|
public void DestroyWindow()
|
||||||
{
|
{
|
||||||
StartCoroutine(routine: DeathSequence());
|
|
||||||
Creator.AlertOfDespawnedWindow();
|
Creator.AlertOfDespawnedWindow();
|
||||||
|
StartCoroutine(routine: DeathSequence());
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerator DeathSequence()
|
private IEnumerator DeathSequence()
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ namespace InterfaceOff
|
|||||||
|
|
||||||
public void AlertOfDespawnedWindow() => SpawnedWindowCount--;
|
public void AlertOfDespawnedWindow() => SpawnedWindowCount--;
|
||||||
|
|
||||||
private int SpawnyThingyMajig = 9000; // Sky chose dis
|
private int SpawnyThingyMajig = 40 * 25; // Sky chose dis
|
||||||
|
|
||||||
private void FixedUpdate()
|
private void FixedUpdate()
|
||||||
{
|
{
|
||||||
@@ -106,7 +106,8 @@ namespace InterfaceOff
|
|||||||
if (SpawnyThingyMajig == 0)
|
if (SpawnyThingyMajig == 0)
|
||||||
{
|
{
|
||||||
PasswordField.SetActive(true);
|
PasswordField.SetActive(true);
|
||||||
SpawnyThingyMajig = Random.Range(2000, 10000);
|
SpawnyThingyMajig = Random.Range(40 * 15, 40 * 20);
|
||||||
|
Debug.Log($"[{Time.timeSinceLevelLoad}]");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user