From 26e3a57dccc8633fcd2e2ea1d3db0f08a3dd9224 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Mon, 20 Apr 2020 06:03:27 +0300 Subject: [PATCH] Add tutorial stub and fix audio bug --- Assets/Audio Mixers/MainMixer.mixer | 10 +- Assets/Prefabs/UI/Tutorial.prefab | 150 ++++++++++++++++++++++ Assets/Prefabs/UI/Tutorial.prefab.meta | 7 + Assets/Scenes/Yee.unity | 130 ++++++++++++++++++- Assets/Scripts/TutorialController.cs | 24 ++++ Assets/Scripts/TutorialController.cs.meta | 11 ++ 6 files changed, 325 insertions(+), 7 deletions(-) create mode 100644 Assets/Prefabs/UI/Tutorial.prefab create mode 100644 Assets/Prefabs/UI/Tutorial.prefab.meta create mode 100644 Assets/Scripts/TutorialController.cs create mode 100644 Assets/Scripts/TutorialController.cs.meta diff --git a/Assets/Audio Mixers/MainMixer.mixer b/Assets/Audio Mixers/MainMixer.mixer index 7ca926f..0a8294e 100644 --- a/Assets/Audio Mixers/MainMixer.mixer +++ b/Assets/Audio Mixers/MainMixer.mixer @@ -79,9 +79,9 @@ AudioMixerSnapshotController: m_AudioMixer: {fileID: 24100000} m_SnapshotID: ac9cc10b0c59e3b4682dc5089372ae81 m_FloatValues: - d3d28f4b939c15c4fb46575e1562c52b: 9.260412 + d3d28f4b939c15c4fb46575e1562c52b: 9 3b873ffd7476b574ab79c605a05a50ff: 0 - fb93bc0e4abea1d4e840f1f2832ba33d: 2.850226 + fb93bc0e4abea1d4e840f1f2832ba33d: 3 m_TransitionOverrides: {} --- !u!243 &-2967980135314984734 AudioMixerGroupController: @@ -193,7 +193,7 @@ AudioMixerController: - e98388ceee042154bb13e28dbe91c9a1 name: View m_CurrentViewIndex: 0 - m_TargetSnapshot: {fileID: 7009156351606643568} + m_TargetSnapshot: {fileID: -3105936107480203619} --- !u!243 &24300002 AudioMixerGroupController: m_ObjectHideFlags: 0 @@ -369,8 +369,8 @@ AudioMixerSnapshotController: m_AudioMixer: {fileID: 24100000} m_SnapshotID: 99acc46f1b1d7c24b861966f8835044d m_FloatValues: - d3d28f4b939c15c4fb46575e1562c52b: 8.614072 + d3d28f4b939c15c4fb46575e1562c52b: 9 fd01f6bdeaa870c4688fa6fcad7c3e41: 0 3b873ffd7476b574ab79c605a05a50ff: 0 - fb93bc0e4abea1d4e840f1f2832ba33d: 2.850226 + fb93bc0e4abea1d4e840f1f2832ba33d: 3 m_TransitionOverrides: {} diff --git a/Assets/Prefabs/UI/Tutorial.prefab b/Assets/Prefabs/UI/Tutorial.prefab new file mode 100644 index 0000000..61860c0 --- /dev/null +++ b/Assets/Prefabs/UI/Tutorial.prefab @@ -0,0 +1,150 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2701877024414929836 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1861798961185465241} + - component: {fileID: 3385698209427102485} + - component: {fileID: 8929060593442864066} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1861798961185465241 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701877024414929836} + 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: 4011034688995518088} + 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!222 &3385698209427102485 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701877024414929836} + m_CullTransparentMesh: 0 +--- !u!114 &8929060593442864066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701877024414929836} + 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.93333334, g: 0.93333334, b: 0.93333334, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: a0bb3d007c7133149bd1682bd93b776f, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Wise words, big thoughts. + + + Watch out for the wolves. + + Keep the + fire going. + + + I''ll write this tutorial tomorrow.' +--- !u!1 &6286624448002602506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4011034688995518088} + - component: {fileID: 7219523719308697115} + - component: {fileID: 5868126559231260333} + m_Layer: 5 + m_Name: Tutorial + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4011034688995518088 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6286624448002602506} + 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: + - {fileID: 1861798961185465241} + m_Father: {fileID: 0} + 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: 0, y: 170} + m_SizeDelta: {x: 800, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &7219523719308697115 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6286624448002602506} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!114 &5868126559231260333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6286624448002602506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf61d1320bf864f4aba0d74897149c6a, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/UI/Tutorial.prefab.meta b/Assets/Prefabs/UI/Tutorial.prefab.meta new file mode 100644 index 0000000..3397dc6 --- /dev/null +++ b/Assets/Prefabs/UI/Tutorial.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 206b40d520e8aba4793f8025a3f69903 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Yee.unity b/Assets/Scenes/Yee.unity index 9ce2caf..ec7fef8 100644 --- a/Assets/Scenes/Yee.unity +++ b/Assets/Scenes/Yee.unity @@ -3027,6 +3027,131 @@ CanvasGroup: type: 3} m_PrefabInstance: {fileID: 7049769128673956988} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1427206711 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1921606960} + m_Modifications: + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 170 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_SizeDelta.x + value: 800 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_SizeDelta.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6286624448002602506, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + propertyPath: m_Name + value: Tutorial + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 206b40d520e8aba4793f8025a3f69903, type: 3} +--- !u!224 &1427206712 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4011034688995518088, guid: 206b40d520e8aba4793f8025a3f69903, + type: 3} + m_PrefabInstance: {fileID: 1427206711} + m_PrefabAsset: {fileID: 0} --- !u!1 &1432870191 GameObject: m_ObjectHideFlags: 0 @@ -4858,6 +4983,7 @@ RectTransform: - {fileID: 1364366412} - {fileID: 1615087124718553244} - {fileID: 1156509021} + - {fileID: 1427206712} - {fileID: 1344354208} - {fileID: 429180126} m_Father: {fileID: 0} @@ -5494,7 +5620,7 @@ PrefabInstance: - target: {fileID: 531861614786402147, guid: 0a942b74adc03b248ac74ce8af504ca5, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 531861614786402147, guid: 0a942b74adc03b248ac74ce8af504ca5, type: 3} @@ -5789,7 +5915,7 @@ PrefabInstance: - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, type: 3} diff --git a/Assets/Scripts/TutorialController.cs b/Assets/Scripts/TutorialController.cs new file mode 100644 index 0000000..0421b3e --- /dev/null +++ b/Assets/Scripts/TutorialController.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(CanvasGroup))] +public class TutorialController : MonoBehaviour { + private CanvasGroup Canvas; + + private void Awake() { + Canvas = GetComponent(); + } + + private void Start() { + Canvas.alpha = 0; + } + + private void Update() { + if (Time.time < 5) { + Canvas.alpha = Mathf.Lerp(Canvas.alpha, 1, Time.time - 2); + } else { + Canvas.alpha = Mathf.Lerp(Canvas.alpha, 0, Time.time - 15); + } + } +} diff --git a/Assets/Scripts/TutorialController.cs.meta b/Assets/Scripts/TutorialController.cs.meta new file mode 100644 index 0000000..712b7d6 --- /dev/null +++ b/Assets/Scripts/TutorialController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cf61d1320bf864f4aba0d74897149c6a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: