浏览代码

taking develop merge

/main
David Woodruff 4 年前
当前提交
ccbe1020
共有 8 个文件被更改,包括 76 次插入4 次删除
  1. 2
      Assets/Scripts.meta
  2. 2
      Packages/manifest.json
  3. 12
      Packages/packages-lock.json
  4. 8
      Assets/Scripts/Development.meta
  5. 7
      Packages/com.unity.multiplayer.transport.litenet/Runtime/LiteNetLib/LiteNetLib.csproj.meta
  6. 38
      Assets/Scripts/Development/NetworkingManagerHUD.cs
  7. 11
      Assets/Scripts/Development/NetworkingManagerHUD.cs.meta

2
Assets/Scripts.meta


fileFormatVersion: 2
guid: 80a81ca71ce40254895c31e98f7f8e3a
guid: 8e8389b584b3f314a916cbb2dcfe78a9
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
Packages/manifest.json


"com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.2",
"com.unity.ide.vscode": "1.2.1",
"com.unity.multiplayer.mlapi": "https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi.git?path=/com.unity.multiplayer.mlapi",
"com.unity.multiplayer.mlapi": "https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi.git?path=/com.unity.multiplayer.mlapi#develop",
"com.unity.test-framework": "1.1.16",
"com.unity.textmeshpro": "3.0.1",
"com.unity.timeline": "1.4.3",

12
Packages/packages-lock.json


"url": "https://packages.unity.com"
},
"com.unity.multiplayer.mlapi": {
"version": "https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi.git?path=/com.unity.multiplayer.mlapi",
"version": "https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi.git?path=/com.unity.multiplayer.mlapi#develop",
"hash": "c4a9ab0da78e366f6f7fdf2d337455cc1d94dbb0"
"hash": "8e7e3ca556843794618ab91c6b8334b291ff4e3d"
},
"com.unity.multiplayer.transport.litenet": {
"version": "file:com.unity.multiplayer.transport.litenet",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.unity.multiplayer.mlapi": "0.0.1-preview.1"
}
},
"com.unity.multiplayer.transport.litenet": {
"version": "file:com.unity.multiplayer.transport.litenet",

8
Assets/Scripts/Development.meta


fileFormatVersion: 2
guid: 815bb3e9674d0a4419862e600a4d9536
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Packages/com.unity.multiplayer.transport.litenet/Runtime/LiteNetLib/LiteNetLib.csproj.meta


fileFormatVersion: 2
guid: 11c9a199da28e0144b82a7c9dbd440be
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

38
Assets/Scripts/Development/NetworkingManagerHUD.cs


using UnityEngine;
using MLAPI;
[RequireComponent(typeof(NetworkingManager))]
public class NetworkingManagerHUD : MonoBehaviour
{
void OnGUI()
{
GUILayout.BeginArea(new Rect(10, 10, 300, 300));
if (!NetworkingManager.Singleton.IsClient && !NetworkingManager.Singleton.IsServer)
{
StartButtons();
}
else
{
StatusLabels();
}
GUILayout.EndArea();
}
void StartButtons()
{
if (GUILayout.Button("Host")) NetworkingManager.Singleton.StartHost();
if (GUILayout.Button("Client")) NetworkingManager.Singleton.StartClient();
if (GUILayout.Button("Server")) NetworkingManager.Singleton.StartServer();
}
void StatusLabels()
{
string mode = NetworkingManager.Singleton.IsHost ? "Host" : NetworkingManager.Singleton.IsServer ? "Server" : "Client";
GUILayout.Label("Transport: " + NetworkingManager.Singleton.NetworkConfig.NetworkTransport.GetType().Name);
GUILayout.Label("Mode: " + mode);
}
}

11
Assets/Scripts/Development/NetworkingManagerHUD.cs.meta


fileFormatVersion: 2
guid: e26f82009f8f36d45a99adae79eab7b9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存