From 156dcc2235315164b8f3c81f2996cbef323dd110 Mon Sep 17 00:00:00 2001 From: Claire Peta Date: Tue, 21 May 2019 12:18:33 +1000 Subject: [PATCH] Added global variables for settings limit plays to min of two and max of four remove player moves text from tutorial levels --- .../Server/Realtime/ClientList.asset | 4 +- Assets/Plugins/IngameDebugConsole.meta | 8 - Assets/Scenes/Client Scenes/LoginScreen.unity | 388 +++++++++++++++--- Assets/Scenes/TuteLevelFive.unity | 85 ++-- Assets/Scenes/TuteLevelFour.unity | 69 ++-- Assets/Scenes/TuteLevelOne.unity | 83 ++-- Assets/Scenes/TuteLevelThree.unity | 9 +- Assets/Scenes/TuteLevelTwo.unity | 55 +-- Assets/Scripts/Character.cs | 17 +- Assets/Scripts/GlobalVariables.cs | 12 + Assets/Scripts/GlobalVariables.cs.meta | 11 + Assets/Scripts/Logic/Blocks/LogicBlock.cs | 4 +- Assets/Scripts/MainMenuControllerServer.cs | 33 +- Assets/Scripts/Managers/GameManager.cs | 1 + Assets/Scripts/UI/Lobby/LobbyUIController.cs | 11 +- 15 files changed, 549 insertions(+), 241 deletions(-) delete mode 100644 Assets/Plugins/IngameDebugConsole.meta create mode 100644 Assets/Scripts/GlobalVariables.cs create mode 100644 Assets/Scripts/GlobalVariables.cs.meta diff --git a/Assets/Data/Networking/Server/Realtime/ClientList.asset b/Assets/Data/Networking/Server/Realtime/ClientList.asset index 9f307b9..4dc7715 100644 --- a/Assets/Data/Networking/Server/Realtime/ClientList.asset +++ b/Assets/Data/Networking/Server/Realtime/ClientList.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3841da06902843ac539419eada2ceba17e04e66d858edf200e41da10dd6ed967 -size 585 +oid sha256:ad3462c6f94c1dd783ef1b25cdb98524845edaa36a879324db1ff597811de687 +size 776 diff --git a/Assets/Plugins/IngameDebugConsole.meta b/Assets/Plugins/IngameDebugConsole.meta deleted file mode 100644 index 36375af..0000000 --- a/Assets/Plugins/IngameDebugConsole.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5f8eae876be4b03438375a82d2c69b4d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Client Scenes/LoginScreen.unity b/Assets/Scenes/Client Scenes/LoginScreen.unity index 3e0a7a8..24c4ad2 100644 --- a/Assets/Scenes/Client Scenes/LoginScreen.unity +++ b/Assets/Scenes/Client Scenes/LoginScreen.unity @@ -920,10 +920,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -148.95001} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &195337270 MonoBehaviour: @@ -1053,10 +1053,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 383.95, y: -378.95} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &240721845 MonoBehaviour: @@ -1385,7 +1385,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &425791971 RectTransform: m_ObjectHideFlags: 0 @@ -1446,6 +1446,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 425791970} m_CullTransparentMesh: 0 +--- !u!1 &495082931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 495082932} + m_Layer: 0 + m_Name: Block Collection + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &495082932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495082931} + 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: 1471272514} + - {fileID: 2091636050} + m_Father: {fileID: 649403256} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.0018920898, y: 73.92697} + m_SizeDelta: {x: 0.19995117, y: 147.85999} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &560892411 GameObject: m_ObjectHideFlags: 0 @@ -1480,10 +1517,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 830, y: -378.95} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &560892413 MonoBehaviour: @@ -1760,6 +1797,7 @@ RectTransform: - {fileID: 1584683394} - {fileID: 425791971} - {fileID: 867460041} + - {fileID: 495082932} m_Father: {fileID: 872212415} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1802,10 +1840,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 1 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 383.95, y: -148.95001} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &666970021 MonoBehaviour: @@ -2829,10 +2867,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 830, y: -148.95001} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &855649912 MonoBehaviour: @@ -3233,10 +3271,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 1 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 370, y: -148.95001} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &898002912 MonoBehaviour: @@ -4623,10 +4661,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 613.95, y: -148.95001} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1239738594 MonoBehaviour: @@ -4865,10 +4903,10 @@ RectTransform: m_Father: {fileID: 1490570091} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 613.95, y: -378.95} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1298967953 MonoBehaviour: @@ -5230,10 +5268,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 600, y: -148.95001} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1377053472 MonoBehaviour: @@ -5834,6 +5872,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1439280286} m_CullTransparentMesh: 0 +--- !u!1 &1471272513 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1471272514} + - component: {fileID: 1471272516} + - component: {fileID: 1471272515} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1471272514 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471272513} + 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: 0} + m_Children: [] + m_Father: {fileID: 495082932} + 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 &1471272515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471272513} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.13207549, g: 0.13207549, b: 0.13207549, a: 0.8509804} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 4f0ccff308fa1304cb38a1c665f1216c, 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 +--- !u!222 &1471272516 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471272513} + m_CullTransparentMesh: 0 --- !u!1 &1475480727 GameObject: m_ObjectHideFlags: 0 @@ -6389,7 +6501,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1584683394 RectTransform: m_ObjectHideFlags: 0 @@ -6483,10 +6595,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 6 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 600, y: -378.95} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1611512230 MonoBehaviour: @@ -6760,10 +6872,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 153.95001, y: -378.95} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1639010721 MonoBehaviour: @@ -7200,10 +7312,10 @@ RectTransform: m_Father: {fileID: 1065132349} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 370, y: -378.95} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1802975491 MonoBehaviour: @@ -7333,10 +7445,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 153.95001, y: -148.95001} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1885492954 MonoBehaviour: @@ -7675,6 +7787,166 @@ MonoBehaviour: Type: 1 Key: LastUsedPort DefaultValue: 2222 +--- !u!1 &2091636049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2091636050} + - component: {fileID: 2091636052} + - component: {fileID: 2091636051} + m_Layer: 5 + m_Name: you colelcted a new logic block + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2091636050 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091636049} + 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: 495082932} + 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: 0, y: 0} + m_SizeDelta: {x: 900, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2091636051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091636049} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_text: "We are sorry!\n Only four players can be connected and play at a time" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 60 + m_fontSizeBase: 60 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 514 + m_isAlignmentEnumConverted: 1 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 2091636051} + characterCount: 68 + spriteCount: 0 + spaceCount: 14 + wordCount: 14 + linkCount: 0 + lineCount: 3 + pageCount: 1 + materialCount: 1 + m_havePropertiesChanged: 0 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_isInputParsingRequired: 0 + m_inputSource: 0 + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2091636052 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091636049} + m_CullTransparentMesh: 0 --- !u!1 &2094861234 GameObject: m_ObjectHideFlags: 0 @@ -7709,10 +7981,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -378.95} + m_SizeDelta: {x: 220, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2094861236 MonoBehaviour: diff --git a/Assets/Scenes/TuteLevelFive.unity b/Assets/Scenes/TuteLevelFive.unity index ca2926a..6700618 100644 --- a/Assets/Scenes/TuteLevelFive.unity +++ b/Assets/Scenes/TuteLevelFive.unity @@ -3023,6 +3023,11 @@ PrefabInstance: propertyPath: nextScene value: MainMenu Client objectReference: {fileID: 0} + - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: isTuteLevel + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_LocalPosition.x @@ -8277,11 +8282,6 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnPlayClick objectReference: {fileID: 0} - - target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -8307,6 +8307,11 @@ PrefabInstance: Level Five' objectReference: {fileID: 0} + - target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} --- !u!1 &1117427231 stripped @@ -13197,41 +13202,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_text - value: - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_textInfo.characterCount - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_textInfo.wordCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_textInfo.lineCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_LocalPosition.x @@ -13372,6 +13342,41 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnContinueClick objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_textInfo.characterCount + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_textInfo.wordCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} --- !u!1 &1792455936 stripped diff --git a/Assets/Scenes/TuteLevelFour.unity b/Assets/Scenes/TuteLevelFour.unity index 8e922f7..d4afa97 100644 --- a/Assets/Scenes/TuteLevelFour.unity +++ b/Assets/Scenes/TuteLevelFour.unity @@ -677,16 +677,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_LocalPosition.x @@ -817,6 +807,26 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnContinueClick objectReference: {fileID: 0} + - target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1290702247} + - target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnContinueClick + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_havePropertiesChanged @@ -837,16 +847,6 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} - - target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1290702247} - - target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnContinueClick - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} --- !u!114 &84034262 stripped @@ -2921,11 +2921,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015463927 + value: -0.00000051192166 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.00007484176 + value: -0.000056790712 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_SizeDelta.y @@ -3806,6 +3806,11 @@ PrefabInstance: propertyPath: CloneInventoryOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: isTuteLevel + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_LocalPosition.x @@ -3861,16 +3866,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2631002120179805110, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: characterSpeed value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5970776295824438666, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_IsActive @@ -12157,11 +12162,6 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnPlayClick objectReference: {fileID: 0} - - target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -15 - objectReference: {fileID: 0} - target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -12187,6 +12187,11 @@ PrefabInstance: Level Four' objectReference: {fileID: 0} + - target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} --- !u!114 &1698327107 stripped diff --git a/Assets/Scenes/TuteLevelOne.unity b/Assets/Scenes/TuteLevelOne.unity index 336a347..f3ec65b 100644 --- a/Assets/Scenes/TuteLevelOne.unity +++ b/Assets/Scenes/TuteLevelOne.unity @@ -266,7 +266,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000013677857 + value: 0.000019548917 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_SizeDelta.y @@ -2653,6 +2653,11 @@ PrefabInstance: propertyPath: CloneInventoryOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: isTuteLevel + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_LocalPosition.x @@ -3702,6 +3707,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 869170613, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1030375178, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1445301355, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1630298526, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1247869959898408, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} propertyPath: m_IsActive value: 1 @@ -3721,22 +3742,6 @@ PrefabInstance: propertyPath: InitialModule.startColor.maxColor.b value: 0.92156863 objectReference: {fileID: 0} - - target: {fileID: 869170613, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1030375178, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1445301355, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1630298526, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: afd6305e706fd444eaeb68953a8475e9, type: 3} --- !u!1001 &2011542510 @@ -4116,6 +4121,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1425704337} + - target: {fileID: 8682979901053099699, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -4.434082 + objectReference: {fileID: 0} - target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_AnchoredPosition.y @@ -4156,11 +4166,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 672ae95e18ccfc14cba3e9ddcef36fab, type: 2} - - target: {fileID: 8682979901053099699, guid: 80a26ed87f729434abe07a722ef15e7c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -4.434082 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} --- !u!1001 &6541614960476850314 @@ -4180,16 +4185,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_isInputParsingRequired - value: 1 - objectReference: {fileID: 0} - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_LocalPosition.x @@ -4320,20 +4315,35 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1425704337} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6379596649083080723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_MatchWidthOrHeight value: 0 objectReference: {fileID: 0} + - target: {fileID: 7589238259672119554, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 111 + objectReference: {fileID: 0} - target: {fileID: 6379596649530639660, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_AnchoredPosition.y value: -39 objectReference: {fileID: 0} - - target: {fileID: 7589238259672119554, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + - target: {fileID: 6379596650567274008, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_AnchoredPosition.y - value: 111 + value: 11.000008 objectReference: {fileID: 0} - target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} @@ -4345,11 +4355,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -169 objectReference: {fileID: 0} - - target: {fileID: 6379596650567274008, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 11.000008 - objectReference: {fileID: 0} - target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_havePropertiesChanged diff --git a/Assets/Scenes/TuteLevelThree.unity b/Assets/Scenes/TuteLevelThree.unity index 407c16b..a7ce6fe 100644 --- a/Assets/Scenes/TuteLevelThree.unity +++ b/Assets/Scenes/TuteLevelThree.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1848,6 +1848,11 @@ PrefabInstance: propertyPath: CloneInventoryOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: isTuteLevel + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_LocalPosition.x @@ -4138,7 +4143,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000026692482 + value: 0.000045776367 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.x diff --git a/Assets/Scenes/TuteLevelTwo.unity b/Assets/Scenes/TuteLevelTwo.unity index 1a60b7c..288b430 100644 --- a/Assets/Scenes/TuteLevelTwo.unity +++ b/Assets/Scenes/TuteLevelTwo.unity @@ -367,7 +367,7 @@ PrefabInstance: - target: {fileID: 5195354181466942482, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} @@ -506,15 +506,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000091552734 + value: 0.00001533499 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.00016220834 + value: -0.00008177165 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_SizeDelta.y - value: -101.69998 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: inventory @@ -1311,7 +1311,7 @@ PrefabInstance: - target: {fileID: 7103365430685043221, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} @@ -1512,11 +1512,6 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnPlayClick objectReference: {fileID: 0} - - target: {fileID: 3718319460935249726, guid: 80a26ed87f729434abe07a722ef15e7c, - type: 3} - propertyPath: m_Name - value: Play - objectReference: {fileID: 0} - target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -1536,6 +1531,11 @@ PrefabInstance: Level Two' objectReference: {fileID: 0} + - target: {fileID: 3718319460935249726, guid: 80a26ed87f729434abe07a722ef15e7c, + type: 3} + propertyPath: m_Name + value: Play + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} --- !u!114 &722747776 stripped @@ -3486,16 +3486,6 @@ PrefabInstance: - target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_havePropertiesChanged - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, @@ -3633,6 +3623,21 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnContinueClick objectReference: {fileID: 0} + - target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1826484083} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_havePropertiesChanged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_isInputParsingRequired + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_havePropertiesChanged @@ -3653,11 +3658,6 @@ PrefabInstance: propertyPath: m_isInputParsingRequired value: 1 objectReference: {fileID: 0} - - target: {fileID: 6379596650414839108, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1826484083} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} --- !u!114 &1530669372 stripped @@ -4409,6 +4409,11 @@ PrefabInstance: propertyPath: CloneInventoryOnStart value: 1 objectReference: {fileID: 0} + - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: isTuteLevel + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7426725930156175971, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index af9b46a..654cc76 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -8,6 +8,7 @@ public class Character : MonoBehaviour { public string nextScene; Animator characterAnimator; + public bool isTuteLevel = false; #region Inspector Fields @@ -72,15 +73,17 @@ public class Character : MonoBehaviour public void DisplayBlock(LogicBlock block) { - if (BlockTitlePrefab == null) - return; + if(isTuteLevel == false){ + if (BlockTitlePrefab == null) + return; - TMPro.TextMeshPro temp = Instantiate(BlockTitlePrefab.gameObject).GetComponent(); - temp.text = block.DisplayName; - temp.color = block.Color; + TMPro.TextMeshPro temp = Instantiate(BlockTitlePrefab.gameObject).GetComponent(); + temp.text = block.DisplayName; + temp.color = block.Color; - temp.transform.position = transform.position + (Vector3.one * 0.25f); - temp.transform.rotation = Quaternion.LookRotation(temp.transform.position - Camera.main.transform.position); + temp.transform.position = transform.position + (Vector3.one * 0.25f); + temp.transform.rotation = Quaternion.LookRotation(temp.transform.position - Camera.main.transform.position); + } } public Vector3 yValue(float time, float heightMultiplier) diff --git a/Assets/Scripts/GlobalVariables.cs b/Assets/Scripts/GlobalVariables.cs new file mode 100644 index 0000000..ad5c467 --- /dev/null +++ b/Assets/Scripts/GlobalVariables.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public static class GlobalVariables +{ + public static bool soundVolume = true; + public static bool musicVolume = true; + public static bool playerMoves = true; + public static int difficulty = 1; + +} diff --git a/Assets/Scripts/GlobalVariables.cs.meta b/Assets/Scripts/GlobalVariables.cs.meta new file mode 100644 index 0000000..8019411 --- /dev/null +++ b/Assets/Scripts/GlobalVariables.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 187d6be71d9e5e34a98608b8e761ba8c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Logic/Blocks/LogicBlock.cs b/Assets/Scripts/Logic/Blocks/LogicBlock.cs index 895cbc6..232c323 100644 --- a/Assets/Scripts/Logic/Blocks/LogicBlock.cs +++ b/Assets/Scripts/Logic/Blocks/LogicBlock.cs @@ -57,7 +57,9 @@ public abstract class LogicBlock : ScriptableObject RepeatCount++; BlockLogic(player, animationTime); - player.DisplayBlock(this); + if(GlobalVariables.playerMoves == true){ + player.DisplayBlock(this); + } return isFinished(); } diff --git a/Assets/Scripts/MainMenuControllerServer.cs b/Assets/Scripts/MainMenuControllerServer.cs index a3f2c01..33972c1 100644 --- a/Assets/Scripts/MainMenuControllerServer.cs +++ b/Assets/Scripts/MainMenuControllerServer.cs @@ -15,11 +15,6 @@ public class MainMenuControllerServer : MonoBehaviour public Button DifficultyButton; public Button playerMovesButton; - bool soundVolume = true; - bool musicVolume = true; - bool playerMoves = true; - int difficulty = 1; - //On Awake private void Awake() { @@ -85,62 +80,62 @@ public class MainMenuControllerServer : MonoBehaviour //Settings menu public void OnMusicVolumeClick() { - if (musicVolume == true) + if (GlobalVariables.musicVolume == true) { //backgroundMusic.Stop(); MusicButton.GetComponentInChildren().text = "Music Volume: OFF"; - musicVolume = false; + GlobalVariables.musicVolume = false; } else { //backgroundMusic.Play(); MusicButton.GetComponentInChildren().text = "Music Volume: ON"; - musicVolume = true; + GlobalVariables.musicVolume = true; } } //Settings menu public void OnSoundVolumeClick () { - if (soundVolume == true) { + if (GlobalVariables.soundVolume == true) { SoundButton.GetComponentInChildren ().text = "Sound Volume: OFF"; - soundVolume = false; + GlobalVariables.soundVolume = false; } else { SoundButton.GetComponentInChildren ().text = "Sound Volume: ON"; - soundVolume = true; + GlobalVariables.soundVolume = true; } } public void OnDifficultyClick() { - if (difficulty == 1) + if (GlobalVariables.difficulty == 1) { DifficultyButton.GetComponentInChildren().text = "Difficulty: MEDIUM"; - difficulty = 2; + GlobalVariables.difficulty = 2; } - else if (difficulty == 2) + else if (GlobalVariables.difficulty == 2) { DifficultyButton.GetComponentInChildren().text = "Difficulty: HARD"; - difficulty = 3; + GlobalVariables.difficulty = 3; } else { DifficultyButton.GetComponentInChildren().text = "Difficulty: EASY"; - difficulty = 1; + GlobalVariables.difficulty = 1; } } public void OnDisplayPlayerMoves() { - if (playerMoves == true) + if (GlobalVariables.playerMoves == true) { playerMovesButton.GetComponentInChildren().text = "Display Player Moves: OFF"; - playerMoves = false; + GlobalVariables.playerMoves = false; } else { playerMovesButton.GetComponentInChildren().text = "Display Player Moves: ON"; - playerMoves = true; + GlobalVariables.playerMoves = true; } } } diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 990f397..b60d0c8 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -163,6 +163,7 @@ public class GameManager : MonoBehaviour newChar.Initialise(startingBlock, client.Inventory, client.characterAnimal); newChar.transform.forward = startingBlock.SpawnDirection.ToVector(); playerData.Add(client.ID, new PlayerData(newChar,client)); + client.playerCharacter = newChar; } } diff --git a/Assets/Scripts/UI/Lobby/LobbyUIController.cs b/Assets/Scripts/UI/Lobby/LobbyUIController.cs index ccff153..767d811 100644 --- a/Assets/Scripts/UI/Lobby/LobbyUIController.cs +++ b/Assets/Scripts/UI/Lobby/LobbyUIController.cs @@ -23,12 +23,6 @@ public class LobbyUIController : MonoBehaviour [SerializeField] private GameObject ClientTag; - [SerializeField] - private Color[] PlayerColors; - - [SerializeField] - private string[] PlayerAnimals; - // Start is called before the first frame update void Start() { @@ -67,7 +61,8 @@ public class LobbyUIController : MonoBehaviour public void OnClick_StartGame() { - UnityEngine.SceneManagement.SceneManager.LoadScene(SceneToStart); + if(Clients.ConnectedClients.Count >= 2 && Clients.ConnectedClients.Count <= 4){ + UnityEngine.SceneManagement.SceneManager.LoadScene(SceneToStart); + } } - }