diff --git a/Assets/Prefabs/GameCanvas.prefab b/Assets/Prefabs/GameCanvas.prefab index 564f9d7..c225a1a 100644 --- a/Assets/Prefabs/GameCanvas.prefab +++ b/Assets/Prefabs/GameCanvas.prefab @@ -474,6 +474,7 @@ MonoBehaviour: - k__BackingField: InterfaceOff.TriviaWindow k__BackingField: 4 k__BackingField: {fileID: 3239915826142415764} + k__BackingField: {fileID: 3006133537337724145} k__BackingField: 0 k__BackingField: 1 --- !u!1 &2020022267469913571 @@ -1202,6 +1203,84 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3006133537337724145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7579812889699807472} + - component: {fileID: 3777857218825539212} + - component: {fileID: 6950290491576803370} + m_Layer: 5 + m_Name: LoggedOutScreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7579812889699807472 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3006133537337724145} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8648668951072647462} + - {fileID: 3072389976981451389} + - {fileID: 3798375511201913427} + m_Father: {fileID: 834552907522022778} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 824, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3777857218825539212 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3006133537337724145} + m_CullTransparentMesh: 1 +--- !u!114 &6950290491576803370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3006133537337724145} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: fe05722d1c0421046b275859905cc71e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3011965700366024637 GameObject: m_ObjectHideFlags: 0 @@ -1316,6 +1395,87 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3533627244118208966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3072389976981451389} + - component: {fileID: 1999143506008305693} + - component: {fileID: 8261609717126338231} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3072389976981451389 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3533627244118208966} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7579812889699807472} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 21} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1999143506008305693 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3533627244118208966} + m_CullTransparentMesh: 1 +--- !u!114 &8261609717126338231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3533627244118208966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 23083100b5ae4944fa609bceebf28322, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 'YOU HAVE BEEN LOGGED OUT + + PLEASE ENTER YOUR PASSWORD' --- !u!1 &4509675489510948023 GameObject: m_ObjectHideFlags: 0 @@ -1355,6 +1515,7 @@ RectTransform: - {fileID: 1389147469433647468} - {fileID: 3829510704376804164} - {fileID: 1905263355016614080} + - {fileID: 7579812889699807472} m_Father: {fileID: 3614641596273148411} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1536,6 +1697,99 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 122 m_CollisionDetection: 0 +--- !u!1 &5162269750348982945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3798375511201913427} + - component: {fileID: 8898913611939637668} + - component: {fileID: 1615029340372784444} + - component: {fileID: 17680200195135562} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3798375511201913427 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162269750348982945} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7579812889699807472} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -43} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8898913611939637668 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162269750348982945} + m_CullTransparentMesh: 1 +--- !u!114 &1615029340372784444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162269750348982945} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 842200c58a6fb22469773202c51f3f56, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +--- !u!114 &17680200195135562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162269750348982945} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4eca7ed9833dbad44b3e2e8f144ebd1a, type: 3} + m_Name: + m_EditorClassIdentifier: + PasswordText: {fileID: 1615029340372784444} --- !u!1 &5990535583955157797 GameObject: m_ObjectHideFlags: 0 @@ -1817,6 +2071,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6595568981009816699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8648668951072647462} + - component: {fileID: 4483656494981423640} + - component: {fileID: 1143663308428371892} + m_Layer: 5 + m_Name: Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8648668951072647462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6595568981009816699} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7579812889699807472} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4483656494981423640 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6595568981009816699} + m_CullTransparentMesh: 1 +--- !u!114 &1143663308428371892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6595568981009816699} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0.9813695, b: 1, a: 0.078431375} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6630605910866455705 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/WorldScene.unity b/Assets/Scenes/WorldScene.unity index 041737d..4485136 100644 --- a/Assets/Scenes/WorldScene.unity +++ b/Assets/Scenes/WorldScene.unity @@ -853,6 +853,41 @@ MonoBehaviour: type: 3} k__BackingField: {fileID: 607967473} k__BackingField: {fileID: 675660038} +--- !u!1 &910491141 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 910491142} + m_Layer: 5 + m_Name: Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &910491142 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910491141} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1480201978} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!4 &1003288350 stripped Transform: m_CorrespondingSourceObject: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7, @@ -976,6 +1011,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 42603e4f95b24efa85355a04450c20e2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &1480201978 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7579812889699807472, guid: e29ce1fe47a855c4e907d4312c9e9d6e, + type: 3} + m_PrefabInstance: {fileID: 1758685209} + m_PrefabAsset: {fileID: 0} --- !u!114 &1484681361 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 833602854707986350, guid: e29ce1fe47a855c4e907d4312c9e9d6e, @@ -1088,7 +1129,11 @@ PrefabInstance: objectReference: {fileID: 880466090} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7579812889699807472, guid: e29ce1fe47a855c4e907d4312c9e9d6e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 910491142} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3} --- !u!114 &1758685210 stripped diff --git a/Assets/Scripts/PasswordScriptThing.cs b/Assets/Scripts/PasswordScriptThing.cs new file mode 100644 index 0000000..b7bceb7 --- /dev/null +++ b/Assets/Scripts/PasswordScriptThing.cs @@ -0,0 +1,60 @@ +using System; +using UnityEngine.UI; +using UnityEngine; + +namespace InterfaceOff.WorldScene +{ + public class PasswordScriptThing : MonoBehaviour + { + [SerializeField] private Text PasswordText; + + private void OnEnable() + { + PasswordText.text = ""; + } + + private static bool IsAnyKeyPressed() + { + return Input.GetKeyDown(KeyCode.A) || + Input.GetKeyDown(KeyCode.B) || + Input.GetKeyDown(KeyCode.C) || + Input.GetKeyDown(KeyCode.D) || + Input.GetKeyDown(KeyCode.E) || + Input.GetKeyDown(KeyCode.F) || + Input.GetKeyDown(KeyCode.G) || + Input.GetKeyDown(KeyCode.H) || + Input.GetKeyDown(KeyCode.I) || + Input.GetKeyDown(KeyCode.J) || + Input.GetKeyDown(KeyCode.K) || + Input.GetKeyDown(KeyCode.L) || + Input.GetKeyDown(KeyCode.M) || + Input.GetKeyDown(KeyCode.N) || + Input.GetKeyDown(KeyCode.O) || + Input.GetKeyDown(KeyCode.P) || + Input.GetKeyDown(KeyCode.Q) || + Input.GetKeyDown(KeyCode.R) || + Input.GetKeyDown(KeyCode.S) || + Input.GetKeyDown(KeyCode.T) || + Input.GetKeyDown(KeyCode.U) || + Input.GetKeyDown(KeyCode.V) || + Input.GetKeyDown(KeyCode.W) || + Input.GetKeyDown(KeyCode.X) || + Input.GetKeyDown(KeyCode.Y) || + Input.GetKeyDown(KeyCode.Z) || + Input.GetKeyDown(KeyCode.Space); + } + + private void Update() + { + if (IsAnyKeyPressed()) + { + PasswordText.text += '*'; + } + + if (PasswordText.text.Length > 12) + { + transform.parent.gameObject.SetActive(false); + } + } + } +} diff --git a/Assets/Scripts/PasswordScriptThing.cs.meta b/Assets/Scripts/PasswordScriptThing.cs.meta new file mode 100644 index 0000000..4ef2bb3 --- /dev/null +++ b/Assets/Scripts/PasswordScriptThing.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4eca7ed9833dbad44b3e2e8f144ebd1a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/WindowSpawner.cs b/Assets/Scripts/WindowSpawner.cs index ef977e6..487c8c5 100644 --- a/Assets/Scripts/WindowSpawner.cs +++ b/Assets/Scripts/WindowSpawner.cs @@ -22,6 +22,7 @@ namespace InterfaceOff [field: SerializeField] private GameObject DeathInfo { get; set; } [field: SerializeField] private SpawnableWindowType[] WindowTypes { get; set; } [field: SerializeField] private GameObject Parent { get; set; } + [field: SerializeField] private GameObject PasswordField { get; set; } private int TotalSpawnWeight { get; set; } [field: SerializeField] public int SpawnedWindowCount { get; private set; } @@ -95,6 +96,11 @@ namespace InterfaceOff private void FixedUpdate() { + if (Random.Range(0, 1000) == 500) + { + PasswordField.SetActive(true); + } + /* Spawns new windows whilst active */ if (AutoSpawn) {