From 267fdba368ece867730bec0de99a9075c7724626 Mon Sep 17 00:00:00 2001 From: Claire Peta Date: Thu, 2 May 2019 16:36:14 +1000 Subject: [PATCH] final push pre-beta presentation --- Assets/Prefabs/UI/MainScoreboard.prefab | 12 +-- Assets/Prefabs/UI/levelScoreboard.prefab | 2 +- Assets/Scenes/Client Scenes/ClientScene.unity | 2 +- Assets/Scenes/ColourCollide_Smaller.unity | 98 +++++++++++++------ .../Server Scenes/ServerTestScene.unity | 2 +- .../GameMode/ColorGameMode/ColorGameMode.cs | 2 +- .../GameMode/ColorGameMode/ScoreDisplay.cs | 2 +- Assets/Scripts/GameMode/GameMode.cs | 4 + Assets/Scripts/Managers/GameManager.cs | 12 ++- .../Networking/Server/ServerManager.cs.meta | 2 +- .../Scripts/Networking/Server/ServerObject.cs | 4 +- Assets/Scripts/UI/ScoreBoard.cs | 4 +- .../KUBIKOS - World/Materials/Fog_Mat.mat | 4 +- Logs/Packages-Update.log | 43 ++++++++ ProjectSettings/EditorBuildSettings.asset | 4 +- 15 files changed, 144 insertions(+), 53 deletions(-) diff --git a/Assets/Prefabs/UI/MainScoreboard.prefab b/Assets/Prefabs/UI/MainScoreboard.prefab index 2b188e4..fa7eacf 100644 --- a/Assets/Prefabs/UI/MainScoreboard.prefab +++ b/Assets/Prefabs/UI/MainScoreboard.prefab @@ -34,7 +34,7 @@ RectTransform: 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: 264, y: -215} + m_AnchoredPosition: {x: 264, y: -301.99997} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5370225792356624807 @@ -268,7 +268,7 @@ RectTransform: 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: 264.00006, y: -73} + m_AnchoredPosition: {x: 264.00006, y: -103} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &763696200295960340 @@ -428,7 +428,7 @@ RectTransform: 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: 264.00006, y: -146} + m_AnchoredPosition: {x: 264.00006, y: -196.00002} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5530482550460664304 @@ -748,7 +748,7 @@ RectTransform: 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: -130, y: -72.99999} + m_AnchoredPosition: {x: -130, y: -103} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6715947278990241992 @@ -908,7 +908,7 @@ RectTransform: 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: -130, y: -215.00002} + m_AnchoredPosition: {x: -130, y: -302} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6715947279057449064 @@ -1068,7 +1068,7 @@ RectTransform: 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: -130, y: -146} + m_AnchoredPosition: {x: -130, y: -196} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6715947279265788346 diff --git a/Assets/Prefabs/UI/levelScoreboard.prefab b/Assets/Prefabs/UI/levelScoreboard.prefab index cf79819..d1bea82 100644 --- a/Assets/Prefabs/UI/levelScoreboard.prefab +++ b/Assets/Prefabs/UI/levelScoreboard.prefab @@ -856,7 +856,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 7, y: -200} + m_AnchoredPosition: {x: 7, y: -272} m_SizeDelta: {x: 0, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4166744806708482471 diff --git a/Assets/Scenes/Client Scenes/ClientScene.unity b/Assets/Scenes/Client Scenes/ClientScene.unity index 0d88799..134dfba 100644 --- a/Assets/Scenes/Client Scenes/ClientScene.unity +++ b/Assets/Scenes/Client Scenes/ClientScene.unity @@ -665,7 +665,7 @@ PrefabInstance: - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015258789 + value: -0.000022888184 objectReference: {fileID: 0} - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} diff --git a/Assets/Scenes/ColourCollide_Smaller.unity b/Assets/Scenes/ColourCollide_Smaller.unity index 2b2664b..d4c6ecb 100644 --- a/Assets/Scenes/ColourCollide_Smaller.unity +++ b/Assets/Scenes/ColourCollide_Smaller.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.4465785, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -2842,7 +2842,6 @@ GameObject: - component: {fileID: 952972661} - component: {fileID: 952972660} - component: {fileID: 952972659} - - component: {fileID: 952972658} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -2850,32 +2849,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &952972658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 952972657} - 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: MainMenu - MainScoreboard: {fileID: 0} --- !u!114 &952972659 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5928,6 +5901,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1863302646} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1908527879 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1698745550996942700, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_Name + value: GameManager + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.0356328 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.4375196 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.7047038 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3} --- !u!1 &1958555746 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Server Scenes/ServerTestScene.unity b/Assets/Scenes/Server Scenes/ServerTestScene.unity index cd2492b..29eab10 100644 --- a/Assets/Scenes/Server Scenes/ServerTestScene.unity +++ b/Assets/Scenes/Server Scenes/ServerTestScene.unity @@ -2587,7 +2587,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!64 &2085069967 MeshCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs b/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs index 8c93013..9f02624 100644 --- a/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs +++ b/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs @@ -10,7 +10,7 @@ public class ColorGameMode : GameMode { public int MaxRound = 5; - public string nextScene = "ColourCollideOne"; + public string nextScene = "ServerTestScene"; List ConnectedClients; public Material OverlayMaterial; diff --git a/Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs b/Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs index 540f35b..36b017c 100644 --- a/Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs +++ b/Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs @@ -49,7 +49,7 @@ public class ScoreDisplay : MonoBehaviour assignedPoints--; } - StartCoroutine(displayforSeconds(levelScoreboard, 10.0f)); + StartCoroutine(displayforSeconds(levelScoreboard, 5.0f)); } public void Start() diff --git a/Assets/Scripts/GameMode/GameMode.cs b/Assets/Scripts/GameMode/GameMode.cs index 99c1f13..5c1c22f 100644 --- a/Assets/Scripts/GameMode/GameMode.cs +++ b/Assets/Scripts/GameMode/GameMode.cs @@ -49,6 +49,10 @@ public abstract class GameMode : ScriptableObject if (!String.IsNullOrEmpty(GameModeScene)) UnityEngine.SceneManagement.SceneManager.LoadScene(GameModeScene,UnityEngine.SceneManagement.LoadSceneMode.Additive); + for(int i = 0; i < allPlayers.Length; i++) + { + allPlayers[i].client.SceneScore = 0; + } OnGameStart(allPlayers); } diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 480581a..60ed755 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -114,11 +114,13 @@ public class GameManager : MonoBehaviour Debug.Log("Finished one move"); } - if (gamemode.isGameOver(playerArray.ToArray())) - { - Debug.Log("Game Over"); - SceneManager.LoadScene("ScoreBoards"); - } + + } + + if (gamemode.isGameOver(playerArray.ToArray())) + { + Debug.Log("Game Over"); + SceneManager.LoadScene("ScoreBoards"); } gamemode.RoundEnd(playerArray.ToArray()); diff --git a/Assets/Scripts/Networking/Server/ServerManager.cs.meta b/Assets/Scripts/Networking/Server/ServerManager.cs.meta index 29ecf9f..4a6a71e 100644 --- a/Assets/Scripts/Networking/Server/ServerManager.cs.meta +++ b/Assets/Scripts/Networking/Server/ServerManager.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -50 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Networking/Server/ServerObject.cs b/Assets/Scripts/Networking/Server/ServerObject.cs index 818746f..ad39fe6 100644 --- a/Assets/Scripts/Networking/Server/ServerObject.cs +++ b/Assets/Scripts/Networking/Server/ServerObject.cs @@ -29,8 +29,8 @@ namespace Networking.Server { public void StartServer(int port) { - LoginHandler.ConnectedClients.Clear(); - LoginHandler.DisconnectedClients.Clear(); + LoginHandler.ConnectedClients = new List(); + LoginHandler.DisconnectedClients = new List(); Debug.Log("Starting Server on " + port); server = new NetworkServerSimple(); diff --git a/Assets/Scripts/UI/ScoreBoard.cs b/Assets/Scripts/UI/ScoreBoard.cs index 4549498..f0d7114 100644 --- a/Assets/Scripts/UI/ScoreBoard.cs +++ b/Assets/Scripts/UI/ScoreBoard.cs @@ -27,7 +27,7 @@ public class ScoreBoard : MonoBehaviour { display.SetActive (true); yield return new WaitForSeconds(time); - SceneManager.LoadScene("ColourCollideOne"); + SceneManager.LoadScene("ServerTestScene"); } public void endGame() @@ -40,6 +40,6 @@ public class ScoreBoard : MonoBehaviour players[i].GetComponent().text = ConnectedClients[i].Name; scores[i].GetComponent().text = ConnectedClients[i].Score.ToString(); } - StartCoroutine(displayforSeconds(MainScoreboard, 10.0f)); + StartCoroutine(displayforSeconds(MainScoreboard, 5.0f)); } } diff --git a/Assets/Third Party Assets/KUBIKOS - World/Materials/Fog_Mat.mat b/Assets/Third Party Assets/KUBIKOS - World/Materials/Fog_Mat.mat index 8b11106..554f5f8 100644 --- a/Assets/Third Party Assets/KUBIKOS - World/Materials/Fog_Mat.mat +++ b/Assets/Third Party Assets/KUBIKOS - World/Materials/Fog_Mat.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 4800000, guid: dc4a231338e15834faad19cdcaff9a6d, type: 3} m_ShaderKeywords: m_LightmapFlags: 0 - m_EnableInstancingVariants: 1 + m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} @@ -39,4 +39,4 @@ Material: - __dirty: 0 m_Colors: - _Color0: {r: 0.07136677, g: 0.44117647, b: 0.41057152, a: 0} - - _FogColor: {r: 0.40757385, g: 0.55138147, b: 0.6698113, a: 0} + - _FogColor: {r: 0.40784314, g: 0.55138147, b: 0.6698113, a: 0} diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log index 0bf4ddf..3dc21a3 100644 --- a/Logs/Packages-Update.log +++ b/Logs/Packages-Update.log @@ -84,3 +84,46 @@ The following packages were added: com.unity.modules.vr@1.0.0 com.unity.modules.wind@1.0.0 com.unity.modules.xr@1.0.0 + +=== Thu May 2 15:12:06 2019 + +Packages were changed. +Update Mode: resetToDefaultDependencies + +The following packages were added: + com.unity.analytics@3.2.2 + com.unity.purchasing@2.0.3 + com.unity.ads@2.0.8 + com.unity.textmeshpro@1.3.0 + com.unity.package-manager-ui@2.0.3 + com.unity.collab-proxy@1.2.15 + com.unity.modules.ai@1.0.0 + com.unity.modules.animation@1.0.0 + com.unity.modules.assetbundle@1.0.0 + com.unity.modules.audio@1.0.0 + com.unity.modules.cloth@1.0.0 + com.unity.modules.director@1.0.0 + com.unity.modules.imageconversion@1.0.0 + com.unity.modules.imgui@1.0.0 + com.unity.modules.jsonserialize@1.0.0 + com.unity.modules.particlesystem@1.0.0 + com.unity.modules.physics@1.0.0 + com.unity.modules.physics2d@1.0.0 + com.unity.modules.screencapture@1.0.0 + com.unity.modules.terrain@1.0.0 + com.unity.modules.terrainphysics@1.0.0 + com.unity.modules.tilemap@1.0.0 + com.unity.modules.ui@1.0.0 + com.unity.modules.uielements@1.0.0 + com.unity.modules.umbra@1.0.0 + com.unity.modules.unityanalytics@1.0.0 + com.unity.modules.unitywebrequest@1.0.0 + com.unity.modules.unitywebrequestassetbundle@1.0.0 + com.unity.modules.unitywebrequestaudio@1.0.0 + com.unity.modules.unitywebrequesttexture@1.0.0 + com.unity.modules.unitywebrequestwww@1.0.0 + com.unity.modules.vehicles@1.0.0 + com.unity.modules.video@1.0.0 + com.unity.modules.vr@1.0.0 + com.unity.modules.wind@1.0.0 + com.unity.modules.xr@1.0.0 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index dd5c6f1..73eb4cc 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd4d395cb9e19688d6fc571157ae8ff28afcd911ab9e63e2af8cec8a67868e51 -size 1546 +oid sha256:31e748f0f30e04bb9cedd521dcad9abd362c27f80c32e5f81a69d9c250c2ccad +size 1654