From 3569ca44a06848715b838f45960480c2b1a41404 Mon Sep 17 00:00:00 2001 From: MB Date: Sun, 27 Jan 2019 12:12:41 +1100 Subject: [PATCH] Character being turned on on clikc --- Assets/Scenes/MainScene.unity | 32 ++++++++++++++++++- .../Multiplayer/Client/ClientLoginManager.cs | 1 + Assets/Scipts/UI/LobbyUIController.cs | 2 -- Assets/Shaders.meta | 8 ----- Assets/WorldAssets/Models.meta | 8 ----- 5 files changed, 32 insertions(+), 19 deletions(-) delete mode 100644 Assets/Shaders.meta delete mode 100644 Assets/WorldAssets/Models.meta diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 6749d19..c28c946 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -379,6 +379,34 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 105326697} m_CullTransparentMesh: 0 +--- !u!1 &167278085 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 167278086} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &167278086 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 167278085} + 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: 340012150} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &252633541 GameObject: m_ObjectHideFlags: 0 @@ -842,7 +870,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 167278086} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -962,6 +991,7 @@ MonoBehaviour: Players: [] Nearby: DistanceToWin: 10 + Cheer: {fileID: 0} --- !u!114 &340012156 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs b/Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs index 26144e2..3bfb234 100644 --- a/Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs +++ b/Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs @@ -64,6 +64,7 @@ namespace Multiplayer private void StartGame(NetworkMessage msg) { + PlayersManager.Instance.LocalPlayer.GetComponent().enabled = true; UnityEngine.SceneManagement.SceneManager.LoadScene(ClientManager.GameScene); } diff --git a/Assets/Scipts/UI/LobbyUIController.cs b/Assets/Scipts/UI/LobbyUIController.cs index 44bfbb3..f2488f9 100644 --- a/Assets/Scipts/UI/LobbyUIController.cs +++ b/Assets/Scipts/UI/LobbyUIController.cs @@ -4,10 +4,8 @@ using UnityEngine; public class LobbyUIController : MonoBehaviour { - public Multiplayer.PlayersManager playerMan; public void OnClickStartGame() { - playerMan.LocalPlayer.GetComponent().enabled = true; Multiplayer.ClientManager.Instance.SendMessage(Multiplayer.PlayerMsgID.GameStart, new Multiplayer.PlayerMsg(Multiplayer.ClientManager.Instance.ID)); } } diff --git a/Assets/Shaders.meta b/Assets/Shaders.meta deleted file mode 100644 index 472bf46..0000000 --- a/Assets/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f87a054963b01dc4c8aa2e3ffedcca21 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/WorldAssets/Models.meta b/Assets/WorldAssets/Models.meta deleted file mode 100644 index a4d7756..0000000 --- a/Assets/WorldAssets/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c207356b78ec8e8499bb6047218dd104 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: