Browse Source

Character being turned on on clikc

master
MB 5 years ago
parent
commit
3569ca44a0
5 changed files with 32 additions and 19 deletions
  1. +31
    -1
      Assets/Scenes/MainScene.unity
  2. +1
    -0
      Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs
  3. +0
    -2
      Assets/Scipts/UI/LobbyUIController.cs
  4. +0
    -8
      Assets/Shaders.meta
  5. +0
    -8
      Assets/WorldAssets/Models.meta

+ 31
- 1
Assets/Scenes/MainScene.unity View File

@ -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

+ 1
- 0
Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs View File

@ -64,6 +64,7 @@ namespace Multiplayer
private void StartGame(NetworkMessage msg)
{
PlayersManager.Instance.LocalPlayer.GetComponent<LocalPlayer>().enabled = true;
UnityEngine.SceneManagement.SceneManager.LoadScene(ClientManager.GameScene);
}

+ 0
- 2
Assets/Scipts/UI/LobbyUIController.cs View File

@ -4,10 +4,8 @@ using UnityEngine;
public class LobbyUIController : MonoBehaviour {
public Multiplayer.PlayersManager playerMan;
public void OnClickStartGame()
{
playerMan.LocalPlayer.GetComponent<LocalPlayer>().enabled = true;
Multiplayer.ClientManager.Instance.SendMessage(Multiplayer.PlayerMsgID.GameStart, new Multiplayer.PlayerMsg(Multiplayer.ClientManager.Instance.ID));
}
}

+ 0
- 8
Assets/Shaders.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f87a054963b01dc4c8aa2e3ffedcca21
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 8
Assets/WorldAssets/Models.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: c207356b78ec8e8499bb6047218dd104
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Loading…
Cancel
Save