From 6177a2d0711bed4d9dbace9c36d2377538061dd3 Mon Sep 17 00:00:00 2001 From: Claire Peta Date: Sat, 18 May 2019 20:58:07 +1000 Subject: [PATCH] Client login cant continue without name, colour and animal selected/entered Game info display for five seconds before multiplayer game Created new combination blocks --- Assets/Data/Logic Blocks/Diagonal_Left.asset | 3 + .../Logic Blocks/Diagonal_Left.asset.meta} | 6 +- Assets/Data/Logic Blocks/Diagonal_Right.asset | 3 + .../Logic Blocks/Diagonal_Right.asset.meta} | 6 +- Assets/Data/Logic Blocks/Horse_Left.asset | 3 + .../Logic Blocks/Horse_Left.asset.meta} | 6 +- Assets/Data/Logic Blocks/Horse_Right.asset | 3 + .../Logic Blocks/Horse_Right.asset.meta} | 6 +- .../Plugins/IngameDebugConsole/Sprites.meta | 2 +- .../IngameDebugConsole/Sprites/Unused.meta | 8 - Assets/Scenes/Client Scenes/ClientScene.unity | 4 +- Assets/Scenes/Client Scenes/LoginScreen.unity | 140 ++-- Assets/Scenes/ColourCollideOne.unity | 29 +- Assets/Scenes/ColourCollide_Smaller.unity | 679 +----------------- Assets/Scenes/MainMenu Client.unity | 10 +- Assets/Scenes/MainMenu Server.unity | 13 +- Assets/Scenes/Scoreboards.unity | 2 +- Assets/Scenes/Server Scenes/Lobby.unity | 4 +- Assets/Scripts/LogicBlocks.meta | 8 - Assets/Scripts/MainMenuControllerClient.cs | 85 +++ .../Scripts/MainMenuControllerClient.cs.meta | 11 + Assets/Scripts/MainMenuControllerServer.cs | 78 ++ .../Scripts/MainMenuControllerServer.cs.meta | 11 + Assets/Scripts/Managers/GameManager.cs | 19 +- Assets/Scripts/UI/Client/LoginUIManager.cs | 15 +- 25 files changed, 356 insertions(+), 798 deletions(-) create mode 100644 Assets/Data/Logic Blocks/Diagonal_Left.asset rename Assets/{Models.meta => Data/Logic Blocks/Diagonal_Left.asset.meta} (52%) create mode 100644 Assets/Data/Logic Blocks/Diagonal_Right.asset rename Assets/{Plugins/IngameDebugConsole/Android.meta => Data/Logic Blocks/Diagonal_Right.asset.meta} (52%) create mode 100644 Assets/Data/Logic Blocks/Horse_Left.asset rename Assets/{Plugins/IngameDebugConsole/Prefabs.meta => Data/Logic Blocks/Horse_Left.asset.meta} (52%) create mode 100644 Assets/Data/Logic Blocks/Horse_Right.asset rename Assets/{Plugins/IngameDebugConsole/Scripts.meta => Data/Logic Blocks/Horse_Right.asset.meta} (52%) delete mode 100644 Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta delete mode 100644 Assets/Scripts/LogicBlocks.meta create mode 100644 Assets/Scripts/MainMenuControllerClient.cs create mode 100644 Assets/Scripts/MainMenuControllerClient.cs.meta create mode 100644 Assets/Scripts/MainMenuControllerServer.cs create mode 100644 Assets/Scripts/MainMenuControllerServer.cs.meta diff --git a/Assets/Data/Logic Blocks/Diagonal_Left.asset b/Assets/Data/Logic Blocks/Diagonal_Left.asset new file mode 100644 index 0000000..03c6a00 --- /dev/null +++ b/Assets/Data/Logic Blocks/Diagonal_Left.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fd6e4063f4ba1a00cad339b06a6d55c6e94624b51ac066151a6b196011f7ec8 +size 866 diff --git a/Assets/Models.meta b/Assets/Data/Logic Blocks/Diagonal_Left.asset.meta similarity index 52% rename from Assets/Models.meta rename to Assets/Data/Logic Blocks/Diagonal_Left.asset.meta index 5346456..87aa9b3 100644 --- a/Assets/Models.meta +++ b/Assets/Data/Logic Blocks/Diagonal_Left.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 296bd90e667df1f4697823a0aa45acf0 -folderAsset: yes -DefaultImporter: +guid: ba4f7785390953441913d0e6f419d9b7 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Data/Logic Blocks/Diagonal_Right.asset b/Assets/Data/Logic Blocks/Diagonal_Right.asset new file mode 100644 index 0000000..e7ca488 --- /dev/null +++ b/Assets/Data/Logic Blocks/Diagonal_Right.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87d0bde3575ffee00f6091f0953fae35d10bfc19cf69cb200a48340ab91fad03 +size 867 diff --git a/Assets/Plugins/IngameDebugConsole/Android.meta b/Assets/Data/Logic Blocks/Diagonal_Right.asset.meta similarity index 52% rename from Assets/Plugins/IngameDebugConsole/Android.meta rename to Assets/Data/Logic Blocks/Diagonal_Right.asset.meta index 12049b6..727e0dc 100644 --- a/Assets/Plugins/IngameDebugConsole/Android.meta +++ b/Assets/Data/Logic Blocks/Diagonal_Right.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 3d7d7a61a5341904eb3c65af025b1d86 -folderAsset: yes -DefaultImporter: +guid: 0086f005a63e8404aaee25e4ae4734d7 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Data/Logic Blocks/Horse_Left.asset b/Assets/Data/Logic Blocks/Horse_Left.asset new file mode 100644 index 0000000..c378f4c --- /dev/null +++ b/Assets/Data/Logic Blocks/Horse_Left.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eee3ed3568097e1a75aa06ff39d7b10bf138950ecdb5be4d4fb9839d1ddd776a +size 937 diff --git a/Assets/Plugins/IngameDebugConsole/Prefabs.meta b/Assets/Data/Logic Blocks/Horse_Left.asset.meta similarity index 52% rename from Assets/Plugins/IngameDebugConsole/Prefabs.meta rename to Assets/Data/Logic Blocks/Horse_Left.asset.meta index 6aa8bf2..2443346 100644 --- a/Assets/Plugins/IngameDebugConsole/Prefabs.meta +++ b/Assets/Data/Logic Blocks/Horse_Left.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 7dbc36665bc0d684db9a4447e27a7a4b -folderAsset: yes -DefaultImporter: +guid: 478ec601e0a1c854984276a192a52666 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Data/Logic Blocks/Horse_Right.asset b/Assets/Data/Logic Blocks/Horse_Right.asset new file mode 100644 index 0000000..bdbe45d --- /dev/null +++ b/Assets/Data/Logic Blocks/Horse_Right.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3dc4770101e834b8855eda337bec0b3301863bb381d806efe607c4e5a5a57db +size 938 diff --git a/Assets/Plugins/IngameDebugConsole/Scripts.meta b/Assets/Data/Logic Blocks/Horse_Right.asset.meta similarity index 52% rename from Assets/Plugins/IngameDebugConsole/Scripts.meta rename to Assets/Data/Logic Blocks/Horse_Right.asset.meta index 72dcaac..6dd5359 100644 --- a/Assets/Plugins/IngameDebugConsole/Scripts.meta +++ b/Assets/Data/Logic Blocks/Horse_Right.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 860c08388401a6d4e858fe4910ea9337 -folderAsset: yes -DefaultImporter: +guid: 86adbb7231bac86469daf8668e55025f +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/IngameDebugConsole/Sprites.meta b/Assets/Plugins/IngameDebugConsole/Sprites.meta index 504a23d..9353d41 100644 --- a/Assets/Plugins/IngameDebugConsole/Sprites.meta +++ b/Assets/Plugins/IngameDebugConsole/Sprites.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cb5d7b23a9e684a41a6a5d4f300eb1e6 +guid: 236e63e61281abf43b31a363bd1dbb3d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta b/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta deleted file mode 100644 index f3769b1..0000000 --- a/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f6caae32d463529478f2186f47c2e3fe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Client Scenes/ClientScene.unity b/Assets/Scenes/Client Scenes/ClientScene.unity index 765cb3d..815c8b9 100644 --- a/Assets/Scenes/Client Scenes/ClientScene.unity +++ b/Assets/Scenes/Client Scenes/ClientScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -674,7 +674,7 @@ PrefabInstance: - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00002249782 + value: 0.000008220466 objectReference: {fileID: 0} - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} diff --git a/Assets/Scenes/Client Scenes/LoginScreen.unity b/Assets/Scenes/Client Scenes/LoginScreen.unity index ccc1986..3e0a7a8 100644 --- a/Assets/Scenes/Client Scenes/LoginScreen.unity +++ b/Assets/Scenes/Client Scenes/LoginScreen.unity @@ -860,11 +860,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 140, y: -148.95001} - m_SizeDelta: {x: 220, y: 220} + 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.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: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 383.95, y: -378.95} - m_SizeDelta: {x: 220, y: 220} + 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.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: 0 + m_IsActive: 1 --- !u!224 &425791971 RectTransform: m_ObjectHideFlags: 0 @@ -1480,10 +1480,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &560892413 MonoBehaviour: @@ -1802,10 +1802,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &666970021 MonoBehaviour: @@ -2425,11 +2425,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -2829,10 +2829,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &855649912 MonoBehaviour: @@ -3233,10 +3233,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &898002912 MonoBehaviour: @@ -3948,11 +3948,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -4493,7 +4493,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: 1325, y: -463} + m_AnchoredPosition: {x: 1325, y: -450} m_SizeDelta: {x: 970, y: 579} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1157788718 @@ -4623,10 +4623,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &1239738594 MonoBehaviour: @@ -4865,10 +4865,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &1298967953 MonoBehaviour: @@ -5230,10 +5230,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &1377053472 MonoBehaviour: @@ -5808,11 +5808,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -6389,7 +6389,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1584683394 RectTransform: m_ObjectHideFlags: 0 @@ -6483,10 +6483,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &1611512230 MonoBehaviour: @@ -6760,10 +6760,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &1639010721 MonoBehaviour: @@ -7140,11 +7140,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -7200,10 +7200,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &1802975491 MonoBehaviour: @@ -7333,10 +7333,10 @@ RectTransform: m_Father: {fileID: 1490570091} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &1885492954 MonoBehaviour: @@ -7709,10 +7709,10 @@ RectTransform: m_Father: {fileID: 1065132349} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_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.5, y: 0.5} --- !u!114 &2094861236 MonoBehaviour: @@ -7844,7 +7844,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: 417.51, y: -463} + m_AnchoredPosition: {x: 417.51, y: -450} m_SizeDelta: {x: 765, y: 579} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2121972509 diff --git a/Assets/Scenes/ColourCollideOne.unity b/Assets/Scenes/ColourCollideOne.unity index 3d54a91..62a630b 100644 --- a/Assets/Scenes/ColourCollideOne.unity +++ b/Assets/Scenes/ColourCollideOne.unity @@ -3700,7 +3700,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &752624502 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4053,7 +4053,6 @@ GameObject: - component: {fileID: 806506837} - component: {fileID: 806506836} - component: {fileID: 806506835} - - component: {fileID: 806506838} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -4109,32 +4108,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &806506838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 806506834} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f3481b961a4a56046b973a51de723523, type: 3} - m_Name: - m_EditorClassIdentifier: - clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2} - ConnectedClients: [] - players: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - scores: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - nextScene: ChickenRunOne - MainScoreboard: {fileID: 0} --- !u!1001 &807071115 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ColourCollide_Smaller.unity b/Assets/Scenes/ColourCollide_Smaller.unity index c56325c..30102a4 100644 --- a/Assets/Scenes/ColourCollide_Smaller.unity +++ b/Assets/Scenes/ColourCollide_Smaller.unity @@ -795,7 +795,7 @@ Transform: m_LocalScale: {x: 3, y: 1, z: 3} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &207131013 GameObject: @@ -1774,7 +1774,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &460731874 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1850,108 +1850,7 @@ RectTransform: - {fileID: 266582950} - {fileID: 542142941} m_Father: {fileID: 0} - 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 &475826609 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 475826613} - - component: {fileID: 475826612} - - component: {fileID: 475826611} - - component: {fileID: 475826610} - m_Layer: 5 - m_Name: Level info - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &475826610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475826609} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &475826611 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475826609} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!223 &475826612 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475826609} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 1439763348} - m_PlaneDistance: 10 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &475826613 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475826609} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 699816232} - - {fileID: 1958555747} - - {fileID: 1797878738} - m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2095,7 +1994,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_text: In this level you must attempt to colour as many blocks as you can before - you run out of time/moves + you moves. When you land on a block it will change to your colour. Have the most + blocks your colour at the end to win m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2123,8 +2023,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2164,12 +2064,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 542142942} - characterCount: 99 + characterCount: 191 spriteCount: 0 - spaceCount: 19 - wordCount: 21 + spaceCount: 39 + wordCount: 40 linkCount: 0 - lineCount: 3 + lineCount: 5 pageCount: 1 materialCount: 1 m_havePropertiesChanged: 0 @@ -2407,98 +2307,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 693079556} m_PrefabAsset: {fileID: 0} ---- !u!1 &699816231 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 699816232} - - component: {fileID: 699816235} - - component: {fileID: 699816234} - - component: {fileID: 699816233} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &699816232 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 699816231} - m_LocalRotation: {x: -0.0000000018626448, y: 0.7071068, z: -0.7071068, w: -0.0000000149011585} - m_LocalPosition: {x: 0, y: 0, z: -5} - m_LocalScale: {x: 90.0002, y: 1, z: 50.000107} - m_Children: [] - m_Father: {fileID: 475826613} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0} ---- !u!64 &699816233 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 699816231} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Convex: 0 - m_CookingOptions: 14 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &699816234 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 699816231} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 672ae95e18ccfc14cba3e9ddcef36fab, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &699816235 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 699816231} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &738315310 PrefabInstance: m_ObjectHideFlags: 0 @@ -2651,116 +2459,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 742803852} m_PrefabAsset: {fileID: 0} ---- !u!1 &866901954 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 866901959} - - component: {fileID: 866901958} - - component: {fileID: 866901957} - - component: {fileID: 866901956} - - component: {fileID: 866901955} - m_Layer: 0 - m_Name: Jump - m_TagString: New Block - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &866901955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866901954} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3de8ea85fe104ee46819ac1ff5e87159, type: 3} - m_Name: - m_EditorClassIdentifier: - Collectable: - element: {fileID: 11400000, guid: 8f19e10be0ee35345a97f600791a8747, type: 2} - Count: 2 - isInfinit: 0 - BlockMenu: {fileID: 0} - popUpText: {fileID: 0} ---- !u!65 &866901956 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866901954} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &866901957 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866901954} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &866901958 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866901954} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &866901959 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866901954} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6, y: 1, z: -3} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &883752935 PrefabInstance: m_ObjectHideFlags: 0 @@ -2949,7 +2647,7 @@ Transform: - {fileID: 1305485801} - {fileID: 1863302647} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &952972657 GameObject: @@ -3015,7 +2713,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &955180180 PrefabInstance: @@ -4589,6 +4287,7 @@ GameObject: - component: {fileID: 1439763349} - component: {fileID: 1439763348} - component: {fileID: 1439763347} + - component: {fileID: 1439763350} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -4658,8 +4357,20 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 42.359, y: 47.166, z: 0} +--- !u!114 &1439763350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1439763346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: abf5da9a46ec58f41839c0daa0a6da4f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1472137905 PrefabInstance: m_ObjectHideFlags: 0 @@ -4947,14 +4658,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, 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: 52b85bb704579c34fb70d5487162efcb, type: 3} + m_Sprite: {fileID: 21300000, guid: 4f0ccff308fa1304cb38a1c665f1216c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5417,169 +5128,8 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1794993696} m_PrefabAsset: {fileID: 0} ---- !u!1 &1797878737 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1797878738} - - component: {fileID: 1797878740} - - component: {fileID: 1797878739} - m_Layer: 5 - m_Name: What - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1797878738 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1797878737} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 475826613} - 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: 0, y: -25} - m_SizeDelta: {x: 500, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1797878739 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1797878737} - 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: In this level you must attempt to colour as many blocks as you can before - you run out of time/moves - 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: 4278190080 - m_fontColor: {r: 0, 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: 25 - m_fontSizeBase: 25 - 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: 1797878739} - characterCount: 99 - spriteCount: 0 - spaceCount: 19 - wordCount: 21 - 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 &1797878740 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1797878737} - m_CullTransparentMesh: 0 ---- !u!1001 &1798975358 -PrefabInstance: +--- !u!1001 &1798975358 +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -6076,7 +5626,7 @@ PrefabInstance: - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3} @@ -6093,168 +5643,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1698745550996942698, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: levelInfo + value: + objectReference: {fileID: 460731873} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3} ---- !u!1 &1958555746 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1958555747} - - component: {fileID: 1958555749} - - component: {fileID: 1958555748} - m_Layer: 5 - m_Name: Level - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1958555747 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1958555746} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 475826613} - 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: 100} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1958555748 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1958555746} - 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: Colour Collide - 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: 4278190080 - m_fontColor: {r: 0, 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: 36 - m_fontSizeBase: 36 - 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: 1958555748} - characterCount: 14 - spriteCount: 0 - spaceCount: 1 - wordCount: 2 - linkCount: 0 - lineCount: 1 - 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 &1958555749 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1958555746} - m_CullTransparentMesh: 0 --- !u!1001 &2067209576 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainMenu Client.unity b/Assets/Scenes/MainMenu Client.unity index 84babfc..dcff749 100644 --- a/Assets/Scenes/MainMenu Client.unity +++ b/Assets/Scenes/MainMenu Client.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 170076734} - 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: @@ -757,7 +757,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1646428055} + - m_Target: {fileID: 0} m_MethodName: OnTutorialClick m_Mode: 1 m_Arguments: @@ -1209,7 +1209,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1646428055} + - m_Target: {fileID: 0} m_MethodName: OnPlayClick m_Mode: 1 m_Arguments: @@ -1467,7 +1467,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1646428055} + - m_Target: {fileID: 0} m_MethodName: OnTutorialContinueClick m_Mode: 1 m_Arguments: @@ -2923,7 +2923,7 @@ MonoBehaviour: m_GameObject: {fileID: 1646428051} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2708d630b8dffe849986ea6fcc82efee, type: 3} + m_Script: {fileID: 11500000, guid: e3f107c772965524db7d9ca141f356e9, type: 3} m_Name: m_EditorClassIdentifier: SettingsMenu: {fileID: 1537787424} diff --git a/Assets/Scenes/MainMenu Server.unity b/Assets/Scenes/MainMenu Server.unity index 3150a5e..41f1315 100644 --- a/Assets/Scenes/MainMenu Server.unity +++ b/Assets/Scenes/MainMenu Server.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: @@ -379,13 +379,10 @@ MonoBehaviour: m_GameObject: {fileID: 388508893} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 79f931ffabc64d343a31879d406419e0, type: 3} + m_Script: {fileID: 11500000, guid: 0dd73aec0094bf145aac8a5db83842a4, type: 3} m_Name: m_EditorClassIdentifier: MainMenu: {fileID: 1470057391} - SoundButton: {fileID: 0} - MusicButton: {fileID: 0} - DifficultyButton: {fileID: 0} --- !u!114 &388508895 MonoBehaviour: m_ObjectHideFlags: 0 @@ -594,12 +591,12 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_MethodName: + - m_Target: {fileID: 388508894} + m_MethodName: OnSettingsClick m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: diff --git a/Assets/Scenes/Scoreboards.unity b/Assets/Scenes/Scoreboards.unity index c2311b7..e2222e4 100644 --- a/Assets/Scenes/Scoreboards.unity +++ b/Assets/Scenes/Scoreboards.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: diff --git a/Assets/Scenes/Server Scenes/Lobby.unity b/Assets/Scenes/Server Scenes/Lobby.unity index 185d914..dd339b7 100644 --- a/Assets/Scenes/Server Scenes/Lobby.unity +++ b/Assets/Scenes/Server Scenes/Lobby.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: @@ -291,7 +291,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.882353, g: 0.8862746, b: 0.882353, a: 0.6862745} + m_Color: {r: 0.882353, g: 0.8862746, b: 0.882353, a: 0.6901961} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/Scripts/LogicBlocks.meta b/Assets/Scripts/LogicBlocks.meta deleted file mode 100644 index 98af9d1..0000000 --- a/Assets/Scripts/LogicBlocks.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8936b441d7647f74884c94f97bfb8931 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/MainMenuControllerClient.cs b/Assets/Scripts/MainMenuControllerClient.cs new file mode 100644 index 0000000..9fa2251 --- /dev/null +++ b/Assets/Scripts/MainMenuControllerClient.cs @@ -0,0 +1,85 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine.UI; +using UnityEngine; + +public class MainMenuControllerClient : MonoBehaviour +{ + public GameObject SettingsMenu; + public GameObject MainMenu; + public GameObject HowToPlayMenu; + + public Button SoundButton; + public Button MusicButton; + public Button DifficultyButton; + + bool soundVolume = true; + bool musicVolume = true; + + int difficulty = 1; + + //On Awake + private void Awake () + { + MainMenu.SetActive (true); + SettingsMenu.SetActive (false); + HowToPlayMenu.SetActive (false); + } + + //Main Menu Options + public void OnPlayClick () + { + UnityEngine.SceneManagement.SceneManager.LoadScene ("LoginScreen"); + } + + public void OnSettingsClick () + { + //toggle which menu displays + MainMenu.SetActive (false); + SettingsMenu.SetActive (true); + } + + public void OnTutorialClick () + { + MainMenu.SetActive (false); + HowToPlayMenu.SetActive (true); + } + + public void OnTutorialContinueClick () + { + UnityEngine.SceneManagement.SceneManager.LoadScene ("TuteLevelOne"); + } + + //Settings Menu + public void OnBackClick () + { + //Settings menu + SettingsMenu.SetActive (false); + MainMenu.SetActive (true); + } + + //Settings menu + public void OnSoundVolumeClick () + { + if (soundVolume == true) { + SoundButton.GetComponentInChildren ().text = "Sound Volume: OFF"; + soundVolume = false; + } else { + SoundButton.GetComponentInChildren ().text = "Sound Volume: ON"; + soundVolume = true; + } + } + + public void OnMusicVolumeClick () + { + if (musicVolume == true) { + //backgroundMusic.Stop(); + MusicButton.GetComponentInChildren ().text = "Music Volume: OFF"; + musicVolume = false; + } else { + //backgroundMusic.Play(); + MusicButton.GetComponentInChildren ().text = "Music Volume: ON"; + musicVolume = true; + } + } +} diff --git a/Assets/Scripts/MainMenuControllerClient.cs.meta b/Assets/Scripts/MainMenuControllerClient.cs.meta new file mode 100644 index 0000000..a4225bd --- /dev/null +++ b/Assets/Scripts/MainMenuControllerClient.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e3f107c772965524db7d9ca141f356e9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MainMenuControllerServer.cs b/Assets/Scripts/MainMenuControllerServer.cs new file mode 100644 index 0000000..3bc1fd6 --- /dev/null +++ b/Assets/Scripts/MainMenuControllerServer.cs @@ -0,0 +1,78 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine.UI; +using UnityEngine; + +public class MainMenuControllerServer : MonoBehaviour +{ + // public GameObject SettingsMenu; + public GameObject MainMenu; + + //public Button SoundButton; + //public Button MusicButton; + //public Button DifficultyButton; + + bool soundVolume = true; + bool musicVolume = true; + int difficulty = 1; + + //On Awake + private void Awake() + { + MainMenu.SetActive(true); + //SettingsMenu.SetActive(false); + } + + //Main Menu Options + public void OnPlayClick() + { + UnityEngine.SceneManagement.SceneManager.LoadScene("Lobby"); + } + public void OnQuitClick() + { + Application.Quit(); + } + + public void OnSettingsClick() + { + //toggle which menu displays + MainMenu.SetActive(false); + //SettingsMenu.SetActive(true); + } + + //Settings menu + public void OnMusicVolumeClick() + { + if (musicVolume == true) + { + //backgroundMusic.Stop(); + //MusicButton.GetComponentInChildren().text = "Music Volume: OFF"; + musicVolume = false; + } + else + { + //backgroundMusic.Play(); + //MusicButton.GetComponentInChildren().text = "Music Volume: ON"; + musicVolume = true; + } + } + + public void OnDifficultyClick() + { + if (difficulty == 1) + { + //DifficultyButton.GetComponentInChildren().text = "Difficulty: MEDIUM"; + difficulty = 2; + } + else if (difficulty == 2) + { + //DifficultyButton.GetComponentInChildren().text = "Difficulty: HARD"; + difficulty = 3; + } + else + { + //DifficultyButton.GetComponentInChildren().text = "Difficulty: EASY"; + difficulty = 1; + } + } +} diff --git a/Assets/Scripts/MainMenuControllerServer.cs.meta b/Assets/Scripts/MainMenuControllerServer.cs.meta new file mode 100644 index 0000000..3552893 --- /dev/null +++ b/Assets/Scripts/MainMenuControllerServer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0dd73aec0094bf145aac8a5db83842a4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 7d8d437..67be028 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -41,6 +41,8 @@ public class GameManager : MonoBehaviour private IEnumerable playerArray { get { return playerData.Values; } } #endregion Read Only + public GameObject levelInfo; + public void Awake() { gamemode = CurrentGameMode.Value; @@ -51,6 +53,7 @@ public class GameManager : MonoBehaviour private void Start() { + StartCoroutine(displayforSeconds(levelInfo, 5.0f)); gamemode.GameStart(playerArray.ToArray()); StartRound(); } @@ -60,6 +63,13 @@ public class GameManager : MonoBehaviour server.ServerUpdate(); } + IEnumerator displayforSeconds(GameObject display, float time) + { + display.SetActive (true); + yield return new WaitForSeconds(time); + display.SetActive (false); + } + private void RecieveLogicList(NetworkMessage msg) { LogicProtocols.LogicMsg logicMsg; @@ -88,12 +98,10 @@ public class GameManager : MonoBehaviour private IEnumerator RoundRoutine() { - playerArray.ForEach(p => p.recievedList = false); while (playerArray.Any(p => !p.blockReader.Finished)) { - foreach (PlayerData player in playerArray) { if (!player.waiting) @@ -116,9 +124,7 @@ public class GameManager : MonoBehaviour { playerArray.ForEach(p => p.waiting = false); Debug.Log("Finished one move"); - } - - + } } if (gamemode.isGameOver(playerArray.ToArray())) @@ -140,14 +146,11 @@ public class GameManager : MonoBehaviour StartRound(); } - - private void SpawnCharacters() { playerData = new Dictionary(); Block[] SpawnBlocks = FindObjectsOfType().Where(p => p.isSpawnable).ToArray(); - int spawnIndex = 0; foreach (ClientData client in ClientList) { diff --git a/Assets/Scripts/UI/Client/LoginUIManager.cs b/Assets/Scripts/UI/Client/LoginUIManager.cs index 8a35166..f052c41 100644 --- a/Assets/Scripts/UI/Client/LoginUIManager.cs +++ b/Assets/Scripts/UI/Client/LoginUIManager.cs @@ -41,6 +41,9 @@ public class LoginUIManager : MonoBehaviour private string playerAnimal; private Color playerColor; + bool animalSelected = false; + bool colorSelected = false; + #region Unity Functions private void OnEnable() @@ -121,8 +124,10 @@ public class LoginUIManager : MonoBehaviour public void OnClick_Done() { - clientManager.SendPlayerDetails(playerName, playerColor, playerAnimal); - PlayerPrefs.SetString("LastUsedName", playerName); + if(colorSelected == true && animalSelected == true && playerName != ""){ + clientManager.SendPlayerDetails(playerName, playerColor, playerAnimal); + PlayerPrefs.SetString("LastUsedName", playerName); + } } public void OnClick_Color(Color playerColor) @@ -133,14 +138,18 @@ public class LoginUIManager : MonoBehaviour public void OnClick_Colour(string hex) { Color newColor = new Color(); - if (ColorUtility.TryParseHtmlString(hex, out newColor)) + if (ColorUtility.TryParseHtmlString(hex, out newColor)){ this.playerColor = newColor; + colorSelected = true; + } + clientManager.SendPlayerCDetails(playerColor); } public void OnClick_Animal(string playerAnimal) { this.playerAnimal = playerAnimal; + animalSelected = true; clientManager.SendPlayerADetails(playerAnimal); }