From d1c6d296e85646853f7aaa5a07e6d5718fce0072 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 24 Aug 2020 17:18:52 -0400 Subject: Pause menu; Dialogue; New font --- Assets/Animations.meta | 8 + Assets/Animations/DialogueBox.controller | 159 +++++ Assets/Animations/DialogueBox.controller.meta | 8 + Assets/Animations/DialogueBox_Close.anim | 98 +++ Assets/Animations/DialogueBox_Close.anim.meta | 8 + Assets/Animations/DialogueBox_Open.anim | 98 +++ Assets/Animations/DialogueBox_Open.anim.meta | 8 + Assets/Fonts.meta | 8 + Assets/Fonts/Open Sans.meta | 8 + Assets/Fonts/Open Sans/LICENSE.txt | 202 ++++++ Assets/Fonts/Open Sans/LICENSE.txt.meta | 7 + Assets/Fonts/Open Sans/OpenSans-Bold.ttf | Bin 0 -> 104120 bytes Assets/Fonts/Open Sans/OpenSans-Bold.ttf.meta | 29 + Assets/Fonts/Open Sans/OpenSans-BoldItalic.ttf | Bin 0 -> 92628 bytes .../Fonts/Open Sans/OpenSans-BoldItalic.ttf.meta | 30 + Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf | Bin 0 -> 102076 bytes Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf.meta | 26 + .../Fonts/Open Sans/OpenSans-ExtraBoldItalic.ttf | Bin 0 -> 92772 bytes .../Open Sans/OpenSans-ExtraBoldItalic.ttf.meta | 23 + Assets/Fonts/Open Sans/OpenSans-Italic.ttf | Bin 0 -> 92240 bytes Assets/Fonts/Open Sans/OpenSans-Italic.ttf.meta | 27 + Assets/Fonts/Open Sans/OpenSans-Light.ttf | Bin 0 -> 101696 bytes Assets/Fonts/Open Sans/OpenSans-Light.ttf.meta | 22 + Assets/Fonts/Open Sans/OpenSans-LightItalic.ttf | Bin 0 -> 92488 bytes .../Fonts/Open Sans/OpenSans-LightItalic.ttf.meta | 28 + Assets/Fonts/Open Sans/OpenSans-Regular.ttf | Bin 0 -> 96932 bytes Assets/Fonts/Open Sans/OpenSans-Regular.ttf.meta | 25 + Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf | Bin 0 -> 100820 bytes Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf.meta | 31 + Assets/Fonts/Open Sans/OpenSans-SemiBoldItalic.ttf | Bin 0 -> 92180 bytes .../Open Sans/OpenSans-SemiBoldItalic.ttf.meta | 24 + Assets/Samples.meta | 8 - Assets/Scenes/MainMenu.unity | 23 +- Assets/Scenes/SampleScene.unity | 761 +++++++++++++++++++-- Assets/Scripts/Dialogue/DialogueManager.cs | 47 ++ Assets/Scripts/PauseMenu.cs | 38 + Assets/Scripts/PauseMenu.cs.meta | 11 + Assets/Scripts/Quit.cs | 3 +- 38 files changed, 1698 insertions(+), 70 deletions(-) create mode 100644 Assets/Animations.meta create mode 100644 Assets/Animations/DialogueBox.controller create mode 100644 Assets/Animations/DialogueBox.controller.meta create mode 100644 Assets/Animations/DialogueBox_Close.anim create mode 100644 Assets/Animations/DialogueBox_Close.anim.meta create mode 100644 Assets/Animations/DialogueBox_Open.anim create mode 100644 Assets/Animations/DialogueBox_Open.anim.meta create mode 100644 Assets/Fonts.meta create mode 100644 Assets/Fonts/Open Sans.meta create mode 100644 Assets/Fonts/Open Sans/LICENSE.txt create mode 100644 Assets/Fonts/Open Sans/LICENSE.txt.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-Bold.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-Bold.ttf.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-BoldItalic.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-BoldItalic.ttf.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-ExtraBoldItalic.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-ExtraBoldItalic.ttf.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-Italic.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-Italic.ttf.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-Light.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-Light.ttf.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-LightItalic.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-LightItalic.ttf.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-Regular.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-Regular.ttf.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf.meta create mode 100644 Assets/Fonts/Open Sans/OpenSans-SemiBoldItalic.ttf create mode 100644 Assets/Fonts/Open Sans/OpenSans-SemiBoldItalic.ttf.meta delete mode 100644 Assets/Samples.meta create mode 100644 Assets/Scripts/PauseMenu.cs create mode 100644 Assets/Scripts/PauseMenu.cs.meta (limited to 'Assets') diff --git a/Assets/Animations.meta b/Assets/Animations.meta new file mode 100644 index 0000000..86ad55e --- /dev/null +++ b/Assets/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94963d20e1f3c8a218c95d3f552d3c32 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/DialogueBox.controller b/Assets/Animations/DialogueBox.controller new file mode 100644 index 0000000..91230b2 --- /dev/null +++ b/Assets/Animations/DialogueBox.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6411618240543039464 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DialogueBox_Open + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4835367687509006780} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 8e8dc007ed4ffcd2fb735d1f2b5e94f5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-4835367687509006780 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsOpen + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3396116342284032778} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DialogueBox + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: IsOpen + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7843065287394096330} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &3396116342284032778 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DialogueBox_Close + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8082748963515351374} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e877180ee96e3e7f4984c61932747a5d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &7843065287394096330 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6411618240543039464} + m_Position: {x: 300, y: 40, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3396116342284032778} + m_Position: {x: 300, y: 130, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 3396116342284032778} +--- !u!1101 &8082748963515351374 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsOpen + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6411618240543039464} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/DialogueBox.controller.meta b/Assets/Animations/DialogueBox.controller.meta new file mode 100644 index 0000000..478b255 --- /dev/null +++ b/Assets/Animations/DialogueBox.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62d46fced455c141bad5e6536f823e7d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/DialogueBox_Close.anim b/Assets/Animations/DialogueBox_Close.anim new file mode 100644 index 0000000..f05c6cc --- /dev/null +++ b/Assets/Animations/DialogueBox_Close.anim @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DialogueBox_Close + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -98 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -98 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/DialogueBox_Close.anim.meta b/Assets/Animations/DialogueBox_Close.anim.meta new file mode 100644 index 0000000..5b24962 --- /dev/null +++ b/Assets/Animations/DialogueBox_Close.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e877180ee96e3e7f4984c61932747a5d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/DialogueBox_Open.anim b/Assets/Animations/DialogueBox_Open.anim new file mode 100644 index 0000000..687565a --- /dev/null +++ b/Assets/Animations/DialogueBox_Open.anim @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DialogueBox_Open + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 89.07 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 89.07 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/DialogueBox_Open.anim.meta b/Assets/Animations/DialogueBox_Open.anim.meta new file mode 100644 index 0000000..272c79e --- /dev/null +++ b/Assets/Animations/DialogueBox_Open.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e8dc007ed4ffcd2fb735d1f2b5e94f5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts.meta b/Assets/Fonts.meta new file mode 100644 index 0000000..f8d7f24 --- /dev/null +++ b/Assets/Fonts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6813083a6fcea4d1a90ddc99ed7d95c1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans.meta b/Assets/Fonts/Open Sans.meta new file mode 100644 index 0000000..31cfdf7 --- /dev/null +++ b/Assets/Fonts/Open Sans.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75b3121d35144fb77a49b3024b9d9055 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/LICENSE.txt b/Assets/Fonts/Open Sans/LICENSE.txt new file mode 100644 index 0000000..75b5248 --- /dev/null +++ b/Assets/Fonts/Open Sans/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/Assets/Fonts/Open Sans/LICENSE.txt.meta b/Assets/Fonts/Open Sans/LICENSE.txt.meta new file mode 100644 index 0000000..7716bc8 --- /dev/null +++ b/Assets/Fonts/Open Sans/LICENSE.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a680a375fc0a4a738849fd21d5aa8350 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-Bold.ttf b/Assets/Fonts/Open Sans/OpenSans-Bold.ttf new file mode 100644 index 0000000..efdd5e8 Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-Bold.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-Bold.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-Bold.ttf.meta new file mode 100644 index 0000000..699aff0 --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-Bold.ttf.meta @@ -0,0 +1,29 @@ +fileFormatVersion: 2 +guid: 8cb86c28781e670959c53ee761b794eb +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: + - {fileID: 12800000, guid: a22e0aa5579cfd0d8a8244d4c09f17ca, type: 3} + - {fileID: 12800000, guid: 33febfe7dfe166a7791fdc8d5b3a328b, type: 3} + - {fileID: 12800000, guid: 61425778e400fadb28f6547b50ec139f, type: 3} + - {fileID: 12800000, guid: a3b679f8ba14ab47d977b34eee94493a, type: 3} + - {fileID: 12800000, guid: d182e6792449f713fac81ce00af6b1f0, type: 3} + - {fileID: 12800000, guid: 1a01a47d677d2221f81958e8cb723b9f, type: 3} + - {fileID: 12800000, guid: e9083d9e264c3c421a0956622ad97d2f, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-BoldItalic.ttf b/Assets/Fonts/Open Sans/OpenSans-BoldItalic.ttf new file mode 100644 index 0000000..9bf9b4e Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-BoldItalic.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-BoldItalic.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-BoldItalic.ttf.meta new file mode 100644 index 0000000..7b40ecc --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-BoldItalic.ttf.meta @@ -0,0 +1,30 @@ +fileFormatVersion: 2 +guid: cdf37680e8d9a3f28896b5b4efa3f3eb +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: + - {fileID: 12800000, guid: a22e0aa5579cfd0d8a8244d4c09f17ca, type: 3} + - {fileID: 12800000, guid: 33febfe7dfe166a7791fdc8d5b3a328b, type: 3} + - {fileID: 12800000, guid: 8cb86c28781e670959c53ee761b794eb, type: 3} + - {fileID: 12800000, guid: 61425778e400fadb28f6547b50ec139f, type: 3} + - {fileID: 12800000, guid: a3b679f8ba14ab47d977b34eee94493a, type: 3} + - {fileID: 12800000, guid: d182e6792449f713fac81ce00af6b1f0, type: 3} + - {fileID: 12800000, guid: 1a01a47d677d2221f81958e8cb723b9f, type: 3} + - {fileID: 12800000, guid: e9083d9e264c3c421a0956622ad97d2f, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf b/Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf new file mode 100644 index 0000000..67fcf0f Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf.meta new file mode 100644 index 0000000..e6f246c --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-ExtraBold.ttf.meta @@ -0,0 +1,26 @@ +fileFormatVersion: 2 +guid: a3b679f8ba14ab47d977b34eee94493a +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: + - {fileID: 12800000, guid: a22e0aa5579cfd0d8a8244d4c09f17ca, type: 3} + - {fileID: 12800000, guid: 33febfe7dfe166a7791fdc8d5b3a328b, type: 3} + - {fileID: 12800000, guid: 61425778e400fadb28f6547b50ec139f, type: 3} + - {fileID: 12800000, guid: d182e6792449f713fac81ce00af6b1f0, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-ExtraBoldItalic.ttf b/Assets/Fonts/Open Sans/OpenSans-ExtraBoldItalic.ttf new file mode 100644 index 0000000..0867228 Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-ExtraBoldItalic.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-ExtraBoldItalic.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-ExtraBoldItalic.ttf.meta new file mode 100644 index 0000000..c248f60 --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-ExtraBoldItalic.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d182e6792449f713fac81ce00af6b1f0 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: + - {fileID: 12800000, guid: 61425778e400fadb28f6547b50ec139f, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-Italic.ttf b/Assets/Fonts/Open Sans/OpenSans-Italic.ttf new file mode 100644 index 0000000..1178567 Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-Italic.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-Italic.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-Italic.ttf.meta new file mode 100644 index 0000000..c20fec3 --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-Italic.ttf.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: e9083d9e264c3c421a0956622ad97d2f +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: + - {fileID: 12800000, guid: a22e0aa5579cfd0d8a8244d4c09f17ca, type: 3} + - {fileID: 12800000, guid: 33febfe7dfe166a7791fdc8d5b3a328b, type: 3} + - {fileID: 12800000, guid: 61425778e400fadb28f6547b50ec139f, type: 3} + - {fileID: 12800000, guid: a3b679f8ba14ab47d977b34eee94493a, type: 3} + - {fileID: 12800000, guid: d182e6792449f713fac81ce00af6b1f0, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-Light.ttf b/Assets/Fonts/Open Sans/OpenSans-Light.ttf new file mode 100644 index 0000000..6580d3a Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-Light.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-Light.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-Light.ttf.meta new file mode 100644 index 0000000..6076861 --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-Light.ttf.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 61425778e400fadb28f6547b50ec139f +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-LightItalic.ttf b/Assets/Fonts/Open Sans/OpenSans-LightItalic.ttf new file mode 100644 index 0000000..1e0c331 Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-LightItalic.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-LightItalic.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-LightItalic.ttf.meta new file mode 100644 index 0000000..afd1651 --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-LightItalic.ttf.meta @@ -0,0 +1,28 @@ +fileFormatVersion: 2 +guid: 1a01a47d677d2221f81958e8cb723b9f +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: + - {fileID: 12800000, guid: a22e0aa5579cfd0d8a8244d4c09f17ca, type: 3} + - {fileID: 12800000, guid: 33febfe7dfe166a7791fdc8d5b3a328b, type: 3} + - {fileID: 12800000, guid: 61425778e400fadb28f6547b50ec139f, type: 3} + - {fileID: 12800000, guid: a3b679f8ba14ab47d977b34eee94493a, type: 3} + - {fileID: 12800000, guid: d182e6792449f713fac81ce00af6b1f0, type: 3} + - {fileID: 12800000, guid: e9083d9e264c3c421a0956622ad97d2f, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-Regular.ttf b/Assets/Fonts/Open Sans/OpenSans-Regular.ttf new file mode 100644 index 0000000..29bfd35 Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-Regular.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-Regular.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-Regular.ttf.meta new file mode 100644 index 0000000..55bc1c4 --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-Regular.ttf.meta @@ -0,0 +1,25 @@ +fileFormatVersion: 2 +guid: 33febfe7dfe166a7791fdc8d5b3a328b +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: + - {fileID: 12800000, guid: a22e0aa5579cfd0d8a8244d4c09f17ca, type: 3} + - {fileID: 12800000, guid: 61425778e400fadb28f6547b50ec139f, type: 3} + - {fileID: 12800000, guid: d182e6792449f713fac81ce00af6b1f0, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf b/Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf new file mode 100644 index 0000000..54e7059 Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf.meta new file mode 100644 index 0000000..8ef1689 --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-SemiBold.ttf.meta @@ -0,0 +1,31 @@ +fileFormatVersion: 2 +guid: 5f140091ed52bd35bb52f24e00c04b14 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: + - {fileID: 12800000, guid: cdf37680e8d9a3f28896b5b4efa3f3eb, type: 3} + - {fileID: 12800000, guid: a22e0aa5579cfd0d8a8244d4c09f17ca, type: 3} + - {fileID: 12800000, guid: 33febfe7dfe166a7791fdc8d5b3a328b, type: 3} + - {fileID: 12800000, guid: 8cb86c28781e670959c53ee761b794eb, type: 3} + - {fileID: 12800000, guid: 61425778e400fadb28f6547b50ec139f, type: 3} + - {fileID: 12800000, guid: a3b679f8ba14ab47d977b34eee94493a, type: 3} + - {fileID: 12800000, guid: d182e6792449f713fac81ce00af6b1f0, type: 3} + - {fileID: 12800000, guid: 1a01a47d677d2221f81958e8cb723b9f, type: 3} + - {fileID: 12800000, guid: e9083d9e264c3c421a0956622ad97d2f, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Open Sans/OpenSans-SemiBoldItalic.ttf b/Assets/Fonts/Open Sans/OpenSans-SemiBoldItalic.ttf new file mode 100644 index 0000000..aebcf14 Binary files /dev/null and b/Assets/Fonts/Open Sans/OpenSans-SemiBoldItalic.ttf differ diff --git a/Assets/Fonts/Open Sans/OpenSans-SemiBoldItalic.ttf.meta b/Assets/Fonts/Open Sans/OpenSans-SemiBoldItalic.ttf.meta new file mode 100644 index 0000000..6680100 --- /dev/null +++ b/Assets/Fonts/Open Sans/OpenSans-SemiBoldItalic.ttf.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: a22e0aa5579cfd0d8a8244d4c09f17ca +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Open Sans + fontNames: + - Open Sans + fallbackFontReferences: + - {fileID: 12800000, guid: 61425778e400fadb28f6547b50ec139f, type: 3} + - {fileID: 12800000, guid: d182e6792449f713fac81ce00af6b1f0, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples.meta b/Assets/Samples.meta deleted file mode 100644 index 69002bf..0000000 --- a/Assets/Samples.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 84ac9aa34f27c48c99c4115a7782ed08 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index ab0ed56..ab6e009 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -387,8 +387,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 505, y: -85} - m_SizeDelta: {x: 550.24243, y: 125.44623} + m_AnchoredPosition: {x: 535.4, y: -251.3} + m_SizeDelta: {x: 585.13855, y: 449.98065} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &458945988 MonoBehaviour: @@ -424,7 +424,8 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "Welcome to Project Sandbox! \nPlease note that this game is in early development and things aren't always working.\n\nIf you're experiencing some issues. Email - support@alee-productions.xyz." + support@alee-productions.xyz.\n\nControls:\n\nEscape: Quitting the game\nF1: + Unlocking mouse\nWASD: Moving\nSpace: Jumping" --- !u!222 &458945989 CanvasRenderer: m_ObjectHideFlags: 0 @@ -567,7 +568,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 97.3, y: 25} + m_AnchoredPosition: {x: 107.75, y: 26} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &767293138 @@ -741,8 +742,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 102.53, y: 0} - m_SizeDelta: {x: 205.05109, y: 0} + m_AnchoredPosition: {x: 107.8, y: 0} + m_SizeDelta: {x: 215.50616, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &963859623 MonoBehaviour: @@ -815,7 +816,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 102.53, y: -31.399994} + m_AnchoredPosition: {x: 107.75, y: -33.7} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1517148424 @@ -896,8 +897,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 103.004456, y: -83} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 112, y: -83} + m_SizeDelta: {x: 178.05066, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1757849153 MonoBehaviour: @@ -1039,8 +1040,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 103.47891, y: -129} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 112.25, y: -129} + m_SizeDelta: {x: 177.54642, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1968663860 MonoBehaviour: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index c132b9f..7f0a58e 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -237,7 +237,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -52} + m_AnchoredPosition: {x: 241, y: -30.405} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &138210411 @@ -360,8 +360,9 @@ GameObject: - component: {fileID: 192977405} - component: {fileID: 192977407} - component: {fileID: 192977406} + - component: {fileID: 192977408} m_Layer: 5 - m_Name: Dialogue + m_Name: DialogueBox m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -377,14 +378,17 @@ RectTransform: 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_Children: + - {fileID: 421821322} + - {fileID: 557179452} + - {fileID: 1986888938} m_Father: {fileID: 1343977746} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.2999878, y: -169.48999} - m_SizeDelta: {x: -504.12933, y: -338.98358} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 36, y: 88.786} + m_SizeDelta: {x: 497.58554, y: 177.57178} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &192977406 MonoBehaviour: @@ -423,6 +427,103 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192977404} m_CullTransparentMesh: 0 +--- !u!95 &192977408 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192977404} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 62d46fced455c141bad5e6536f823e7d, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &421821321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 421821322} + - component: {fileID: 421821324} + - component: {fileID: 421821323} + m_Layer: 5 + m_Name: DialogueNameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &421821322 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 421821321} + 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: 192977405} + m_RootOrder: 0 + 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: -159, y: 63} + m_SizeDelta: {x: 138.02106, y: 20.783035} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &421821323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 421821321} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 33febfe7dfe166a7791fdc8d5b3a328b, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Name +--- !u!222 &421821324 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 421821321} + m_CullTransparentMesh: 0 --- !u!1 &519581754 GameObject: m_ObjectHideFlags: 0 @@ -466,6 +567,171 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0c8e9050d46a64b3a833517e2db4a78b, type: 3} m_Name: m_EditorClassIdentifier: + nameText: {fileID: 421821323} + dialogueText: {fileID: 557179453} + animator: {fileID: 192977408} +--- !u!1 &557179451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 557179452} + - component: {fileID: 557179454} + - component: {fileID: 557179453} + m_Layer: 5 + m_Name: DialogueBodyText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &557179452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557179451} + 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: 192977405} + m_RootOrder: 1 + 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: -13.300003, y: 0.9299965} + m_SizeDelta: {x: 429.41895, y: 71.12184} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &557179453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557179451} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 33febfe7dfe166a7791fdc8d5b3a328b, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Body Text +--- !u!222 &557179454 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557179451} + m_CullTransparentMesh: 0 +--- !u!1 &617939552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 617939553} + - component: {fileID: 617939555} + - component: {fileID: 617939554} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &617939553 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617939552} + 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: 1986888938} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &617939554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617939552} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Continue +--- !u!222 &617939555 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617939552} + m_CullTransparentMesh: 0 +--- !u!4 &693450786 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, + type: 3} + m_PrefabInstance: {fileID: 990268100329211355} + m_PrefabAsset: {fileID: 0} --- !u!1 &701464655 GameObject: m_ObjectHideFlags: 0 @@ -569,12 +835,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 701464655} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8.24, y: 4.6, z: 7.38} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -504.42743, y: -92.83664, z: 31.749832} m_LocalScale: {x: 3, y: 3, z: 3} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 12 + m_Father: {fileID: 963240276} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &705507993 GameObject: @@ -666,7 +932,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &832029363 GameObject: @@ -680,7 +946,7 @@ GameObject: - component: {fileID: 832029366} - component: {fileID: 832029365} m_Layer: 5 - m_Name: Panel + m_Name: PausePanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -697,6 +963,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1361389540} - {fileID: 895538663} m_Father: {fileID: 1343977746} m_RootOrder: 1 @@ -719,7 +986,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 0, g: 0, b: 0, a: 0.392} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -846,12 +1113,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 863153742} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.18, y: 0.711, z: 13.4} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -511.48743, y: -96.72564, z: 37.76983} m_LocalScale: {x: 1, y: 0.3609, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 10 + m_Father: {fileID: 963240276} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &895538662 GameObject: @@ -885,11 +1152,11 @@ RectTransform: m_Children: - {fileID: 73638134} m_Father: {fileID: 832029364} - m_RootOrder: 0 + m_RootOrder: 1 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: 291, y: -201} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -111} m_SizeDelta: {x: 97.27722, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &895538664 @@ -934,7 +1201,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 895538665} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1430636221} + m_MethodName: ExitGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &895538665 MonoBehaviour: m_ObjectHideFlags: 0 @@ -972,6 +1250,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 895538662} m_CullTransparentMesh: 0 +--- !u!1 &963240275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963240276} + m_Layer: 0 + m_Name: Platform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &963240276 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963240275} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 512.6674, y: 97.43664, z: -24.369831} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1173749948717242880} + - {fileID: 1704194736} + - {fileID: 693450786} + - {fileID: 863153747} + - {fileID: 1180920473} + - {fileID: 701464660} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1010888048 GameObject: m_ObjectHideFlags: 0 @@ -1051,8 +1365,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.9, y: -53} - m_SizeDelta: {x: 386.51218, y: 75.18996} + m_AnchoredPosition: {x: 222.4, y: -62} + m_SizeDelta: {x: 415.48343, y: 93.12456} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1133956159 MonoBehaviour: @@ -1074,11 +1388,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 9568ece128856a54cbc1060379ab498d, type: 3} + m_Font: {fileID: 12800000, guid: 8cb86c28781e670959c53ee761b794eb, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 2 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 @@ -1183,7 +1497,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1374,13 +1688,63 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1180920468} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.18, y: 0.79, z: 14.397} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -511.48743, y: -96.64664, z: 38.76683} m_LocalScale: {x: 1, y: 0.5, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 11 + m_Father: {fileID: 963240276} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1302777224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1302777225} + - component: {fileID: 1302777226} + m_Layer: 5 + m_Name: TogglePause + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1302777225 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302777224} + 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: 1343977746} + m_RootOrder: 5 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!114 &1302777226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302777224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6640e7209a07e8c3957684c4915e6ee, type: 3} + m_Name: + m_EditorClassIdentifier: + lockCursor: 1 + panel: {fileID: 832029363} --- !u!1 &1343977742 GameObject: m_ObjectHideFlags: 0 @@ -1475,14 +1839,110 @@ RectTransform: - {fileID: 832029364} - {fileID: 192977405} - {fileID: 138210410} + - {fileID: 2143030780} + - {fileID: 1302777225} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1361389539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1361389540} + - component: {fileID: 1361389543} + - component: {fileID: 1361389542} + - component: {fileID: 1361389541} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1361389540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361389539} + 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: 832029364} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0, y: -50.300003} + m_SizeDelta: {x: 172.13599, y: 50.53784} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1361389541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361389539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &1361389542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361389539} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 8cb86c28781e670959c53ee761b794eb, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Paused +--- !u!222 &1361389543 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361389539} + m_CullTransparentMesh: 0 --- !u!1 &1430636220 GameObject: m_ObjectHideFlags: 0 @@ -1524,7 +1984,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1603614687 GameObject: @@ -1595,7 +2055,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Test Button + m_Text: DialogueTest --- !u!222 &1603614690 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1690,12 +2150,208 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1704194732} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -512.6674, y: -97.43664, z: 24.369831} + m_LocalScale: {x: 100, y: 1, z: 100} + m_Children: [] + m_Father: {fileID: 963240276} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1986888937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1986888938} + - component: {fileID: 1986888941} + - component: {fileID: 1986888940} + - component: {fileID: 1986888939} + m_Layer: 5 + m_Name: ContinueButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1986888938 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1986888937} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 100, y: 1, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 617939553} + m_Father: {fileID: 192977405} + m_RootOrder: 2 + 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: 173.2, y: -62.4} + m_SizeDelta: {x: 118.48511, y: 28.371979} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1986888939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1986888937} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1986888940} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 519581756} + m_MethodName: DisplayNextSentences + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1986888940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1986888937} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1986888941 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1986888937} + m_CullTransparentMesh: 0 +--- !u!1 &2143030777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2143030780} + - component: {fileID: 2143030779} + - component: {fileID: 2143030778} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2143030778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143030777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &2143030779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143030777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &2143030780 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143030777} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -491.5, y: -253, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 + m_Father: {fileID: 1343977746} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &423103507109781297 MeshRenderer: @@ -1759,7 +2415,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 963240276} m_Modifications: - target: {fileID: 990268099681790120, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} @@ -1799,32 +2455,32 @@ PrefabInstance: - target: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} propertyPath: m_LocalPosition.x - value: 2.08 + value: -510.58743 objectReference: {fileID: 0} - target: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} propertyPath: m_LocalPosition.y - value: 19.75 + value: -77.68664 objectReference: {fileID: 0} - target: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 24.369831 objectReference: {fileID: 0} - target: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} @@ -1834,7 +2490,7 @@ PrefabInstance: - target: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} propertyPath: m_RootOrder - value: 9 + value: 2 objectReference: {fileID: 0} - target: {fileID: 990268100192312561, guid: 61c68b207aaeb438fa625409d4c9247e, type: 3} @@ -1885,14 +2541,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1946170699347181754} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -11.790384, y: 0.5, z: 13.813756} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -524.4578, y: -96.93664, z: 38.183586} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2609934725419204965} - {fileID: 6029319940320598495} - m_Father: {fileID: 0} - m_RootOrder: 6 + m_Father: {fileID: 963240276} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1946170699347181754 GameObject: @@ -2137,5 +2793,10 @@ PrefabInstance: propertyPath: sounds.Array.data[0].name value: Inkoming! objectReference: {fileID: 0} + - target: {fileID: 8450095133606623985, guid: 8489462a89be80c6e91509d42a08b050, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8489462a89be80c6e91509d42a08b050, type: 3} diff --git a/Assets/Scripts/Dialogue/DialogueManager.cs b/Assets/Scripts/Dialogue/DialogueManager.cs index 056e7d9..4a7b540 100644 --- a/Assets/Scripts/Dialogue/DialogueManager.cs +++ b/Assets/Scripts/Dialogue/DialogueManager.cs @@ -1,9 +1,14 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class DialogueManager : MonoBehaviour { + public Text nameText; + public Text dialogueText; + + public Animator animator; private Queue sentences; @@ -15,7 +20,49 @@ public class DialogueManager : MonoBehaviour public void StartDialogue(Dialogue dialogue) { + animator.SetBool("IsOpen", true); + Debug.Log("Starting conversation with " + dialogue.name); + + nameText.text = dialogue.name; + + sentences.Clear(); + + foreach (string sentence in dialogue.sentences) + { + sentences.Enqueue(sentence); + } + + DisplayNextSentences(); + } + + public void DisplayNextSentences() + { + if (sentences.Count == 0) + { + EndDialogue(); + return; + } + + string sentence = sentences.Dequeue(); + StopAllCoroutines(); + StartCoroutine(TypeSentence(sentence)); + } + + IEnumerator TypeSentence(string sentence) + { + dialogueText.text = ""; + foreach (char letter in sentence.ToCharArray()) + { + dialogueText.text += letter; + yield return null; + } + } + + void EndDialogue() + { + Debug.Log("End of conversation."); + animator.SetBool("IsOpen", false); } } diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs new file mode 100644 index 0000000..284756f --- /dev/null +++ b/Assets/Scripts/PauseMenu.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class PauseMenu : MonoBehaviour +{ + public bool lockCursor = true; + + public GameObject panel; + private int counter; + // Update is called once per frame + public void showhidePanel() + { + counter++; + if (counter % 2 == 1) + { + panel.gameObject.SetActive(true); + } + else + { + panel.gameObject.SetActive(false); + } + + } + void Update() + { + if (Input.GetKeyDown(KeyCode.Escape)) + { + lockCursor = !lockCursor; + showhidePanel(); + + } + + Cursor.lockState = lockCursor ? CursorLockMode.Locked : CursorLockMode.None; + Cursor.visible = !lockCursor; + } +} diff --git a/Assets/Scripts/PauseMenu.cs.meta b/Assets/Scripts/PauseMenu.cs.meta new file mode 100644 index 0000000..a95562a --- /dev/null +++ b/Assets/Scripts/PauseMenu.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b6640e7209a07e8c3957684c4915e6ee +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Quit.cs b/Assets/Scripts/Quit.cs index 40cfc85..089458e 100644 --- a/Assets/Scripts/Quit.cs +++ b/Assets/Scripts/Quit.cs @@ -9,10 +9,11 @@ public class Quit : MonoBehaviour // Update is called once per frame void Update() { + /* if (Input.GetKey("escape")) { Application.Quit(); } - + */ } } -- cgit v1.2.3