111

Assets/GameFramework/Runtime/GameFramework.Runtime.asmdef

@@ -10,7 +10,8 @@
         "GUID:3de88c88fbbb8f944b9210d496af9762",
         "GUID:30817c1a0e6d646d99c048fc403f5979",
         "GUID:72872094b21c16e48b631b2224833d49",
-        "GUID:627104647b9c04b4ebb8978a92ecac63"
+        "GUID:627104647b9c04b4ebb8978a92ecac63",
+        "GUID:dc960734dc080426fa6612f1c5fe95f3"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/GameFramework/Runtime/Network/AutoStart.cs

@@ -1,65 +1,100 @@
-using UnityEngine;
+using Cysharp.Threading.Tasks;
 using Mirror;
 using Mirror.Discovery;
-using Cysharp.Threading.Tasks;
 using System.Collections.Generic;
-using System.Threading.Tasks;
+using UnityEngine;
 
 namespace Tuan.GameFramework
 {
     public class AutoStart : MonoBehaviour
     {
-        public NetworkManager networkManager;
-        public NetworkDiscovery networkDiscovery;
-
+        public bool alwaysAutoStart = false;
+        public VRNetworkDiscovery networkDiscovery;
+        readonly Dictionary<long, ServerResponse> discoveredServers = new Dictionary<long, ServerResponse>();
         public float waitForHostTimeout = 1f;
-
-        private bool hostFound = false;
         private async void Start()
         {
-            networkDiscovery.OnServerFound.AddListener(OnServerFound);
-            await Connect();
+            // skips waiting for users to press ui button
+            if (alwaysAutoStart)
+            {
+                await Waiter();
+            }
         }
 
-        private async UniTask Connect()
+        public async UniTask Waiter()
         {
-            if (networkManager == null || networkDiscovery == null)
-            {
-                Debug.LogError("请确认 NetworkManager 和 NetworkDiscovery 已设置");
-                return;
-            }
-
-            hostFound = false;
-
+            discoveredServers.Clear();
             networkDiscovery.StartDiscovery();
-
-            await UniTask.WaitForSeconds(1.1f);
-
-            if (!hostFound)
+            // we have set this as 3.1 seconds, default discovery scan is 3 seconds, allows some time if host and client are started at same time
+            await UniTask.WaitForSeconds(waitForHostTimeout);
+            if (discoveredServers == null || discoveredServers.Count <= 0)
             {
-                Debug.Log("未发现 Host，自己成为 Host");
-                networkManager.StartHost();
+                Debug.Log("No Servers found, starting as Host.");
+                await UniTask.WaitForSeconds(0.1f);
+                discoveredServers.Clear();
+                VRNetworkManager.singleton.StartHost();
                 networkDiscovery.AdvertiseServer();
             }
         }
 
-        private void OnServerFound(ServerResponse info)
+        void Connect(ServerResponse info)
         {
-            if (hostFound) return;
-
-            hostFound = true;
-            Debug.Log($"发现 Host: {info.uri.Host}");
-
+            Debug.Log($"Connecting to: {info.uri.Host}");
             networkDiscovery.StopDiscovery();
-
-            networkManager.networkAddress = info.uri.Host;
-            networkManager.StartClient();
+            VRNetworkManager.singleton.StartClient(info.uri);
         }
 
-        private void OnDestroy()
+        public void OnDiscoveredServer(ServerResponse info)
         {
-            if (networkDiscovery != null)
-                networkDiscovery.OnServerFound.RemoveListener(OnServerFound);
+            discoveredServers[info.serverId] = info;
+            Connect(info);
+        }
+
+        public void StartAsHost()
+        {
+            Debug.Log("Starting as host");
+            discoveredServers.Clear();
+            VRNetworkManager.singleton.StartHost();
+            networkDiscovery.AdvertiseServer();
+
+        }
+
+        public void StartAsServer()
+        {
+            Debug.Log("Starting as server");
+            discoveredServers.Clear();
+            // VRNetworkManager.singleton.onlineScene = SceneManager.GetActiveScene().name;
+            VRNetworkManager.singleton.StartServer();
+            networkDiscovery.AdvertiseServer();
+
+        }
+
+        public void StartAsClient()
+        {
+            Debug.Log("Starting as client.");
+            discoveredServers.Clear();
+            networkDiscovery.StartDiscovery();
+        }
+
+        public void Stop()
+        {
+            Debug.Log("Stopping");
+            // stop host if host mode
+            if (NetworkServer.active && NetworkClient.isConnected)
+            {
+                VRNetworkManager.singleton.StopHost();
+            }
+            // stop client if client-only
+            else if (NetworkClient.isConnected)
+            {
+                VRNetworkManager.singleton.StopClient();
+            }
+            // stop server if server-only
+            else if (NetworkServer.active)
+            {
+                VRNetworkManager.singleton.StopServer();
+            }
+            networkDiscovery.StopDiscovery();
         }
     }
 }

Assets/GameFramework/Runtime/Network/VRNetworkDiscovery.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Net;
+using UnityEngine;
+using UnityEngine.Events;
+using Mirror.Discovery;
+using Tuan.GameFramework;
+
+
+//[Serializable]
+//public class ServerFoundUnityEvent<TResponseType> : UnityEvent<TResponseType> { };
+
+[DisallowMultipleComponent]
+[AddComponentMenu("Network/Network Discovery")]
+public class VRNetworkDiscovery : NetworkDiscoveryBase<ServerRequest, ServerResponse>
+{
+    #region Server
+    public AutoStart autoStart;
+
+    /// <summary>
+    /// Process the request from a client
+    /// </summary>
+    /// <remarks>
+    /// Override if you wish to provide more information to the clients
+    /// such as the name of the host player
+    /// </remarks>
+    /// <param name="request">Request coming from client</param>
+    /// <param name="endpoint">Address of the client that sent the request</param>
+    /// <returns>The message to be sent back to the client or null</returns>
+    protected override ServerResponse ProcessRequest(ServerRequest request, IPEndPoint endpoint)
+    {
+        // In this case we don't do anything with the request
+        // but other discovery implementations might want to use the data
+        // in there,  This way the client can ask for
+        // specific game mode or something
+
+        try
+        {
+            // this is an example reply message,  return your own
+            // to include whatever is relevant for your game
+            return new ServerResponse
+            {
+                serverId = ServerId,
+                uri = transport.ServerUri()
+            };
+        }
+        catch (NotImplementedException)
+        {
+            Debug.LogError($"Transport {transport} does not support network discovery");
+            throw;
+        }
+    }
+
+    #endregion
+
+    #region Client
+
+    /// <summary>
+    /// Create a message that will be broadcasted on the network to discover servers
+    /// </summary>
+    /// <remarks>
+    /// Override if you wish to include additional data in the discovery message
+    /// such as desired game mode, language, difficulty, etc... </remarks>
+    /// <returns>An instance of ServerRequest with data to be broadcasted</returns>
+    protected override ServerRequest GetRequest() => new ServerRequest();
+
+    /// <summary>
+    /// Process the answer from a server
+    /// </summary>
+    /// <remarks>
+    /// A client receives a reply from a server, this method processes the
+    /// reply and raises an event
+    /// </remarks>
+    /// <param name="response">Response that came from the server</param>
+    /// <param name="endpoint">Address of the server that replied</param>
+    protected override void ProcessResponse(ServerResponse response, IPEndPoint endpoint)
+    {
+        // we received a message from the remote endpoint
+        response.EndPoint = endpoint;
+
+        // although we got a supposedly valid url, we may not be able to resolve
+        // the provided host
+        // However we know the real ip address of the server because we just
+        // received a packet from it,  so use that as host.
+        UriBuilder realUri = new UriBuilder(response.uri)
+        {
+            Host = response.EndPoint.Address.ToString()
+        };
+        response.uri = realUri.Uri;
+
+        //OnServerFound.Invoke(response);
+        if (autoStart == null)
+        { autoStart = GameObject.FindAnyObjectByType<AutoStart>(); }
+        autoStart.OnDiscoveredServer(response);
+    }
+
+    #endregion
+}

Assets/GameFramework/Runtime/Network/VRNetworkDiscovery.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 98ee6d92ccd0b0945bfcee6c94394c5b

Assets/GameFramework/Runtime/Network/VRNetworkManager.cs

@@ -0,0 +1,317 @@
+using UnityEngine;
+using Mirror;
+using System.Linq;
+
+/*
+	Documentation: https://mirror-networking.gitbook.io/docs/components/network-manager
+	API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkManager.html
+*/
+
+public class VRNetworkManager : NetworkManager
+{
+    // Overrides the base singleton so we don't
+    // have to cast to this type everywhere.
+    public static new VRNetworkManager singleton { get; private set; }
+
+    private NetworkIdentity[] copyOfOwnedObjects;
+
+    /// <summary>
+    /// Runs on both Server and Client
+    /// Networking is NOT initialized when this fires
+    /// </summary>
+    public override void Awake()
+    {
+        base.Awake();
+        singleton = this;
+    }
+
+    #region Unity Callbacks
+
+    public override void OnValidate()
+    {
+        base.OnValidate();
+    }
+
+    /// <summary>
+    /// Runs on both Server and Client
+    /// Networking is NOT initialized when this fires
+    /// </summary>
+    public override void Start()
+    {
+        base.Start();
+    }
+
+    /// <summary>
+    /// Runs on both Server and Client
+    /// </summary>
+    public override void LateUpdate()
+    {
+        base.LateUpdate();
+    }
+
+    /// <summary>
+    /// Runs on both Server and Client
+    /// </summary>
+    public override void OnDestroy()
+    {
+        base.OnDestroy();
+        //UnityEngine.Debug.Log("OnDestroy");
+    }
+
+    #endregion
+
+    #region Start & Stop
+
+    /// <summary>
+    /// Set the frame rate for a headless server.
+    /// <para>Override if you wish to disable the behavior or set your own tick rate.</para>
+    /// </summary>
+    public override void ConfigureHeadlessFrameRate()
+    {
+        base.ConfigureHeadlessFrameRate();
+    }
+
+    /// <summary>
+    /// called when quitting the application by closing the window / pressing stop in the editor
+    /// </summary>
+    public override void OnApplicationQuit()
+    {
+        base.OnApplicationQuit();
+        //UnityEngine.Debug.Log("OnApplicationQuit");
+    }
+
+    #endregion
+
+    #region Scene Management
+
+    /// <summary>
+    /// This causes the server to switch scenes and sets the networkSceneName.
+    /// <para>Clients that connect to this server will automatically switch to this scene. This is called automatically if onlineScene or offlineScene are set, but it can be called from user code to switch scenes again while the game is in progress. This automatically sets clients to be not-ready. The clients must call NetworkClient.Ready() again to participate in the new scene.</para>
+    /// </summary>
+    /// <param name="newSceneName"></param>
+    public override void ServerChangeScene(string newSceneName)
+    {
+        base.ServerChangeScene(newSceneName);
+        //UnityEngine.Debug.Log("ServerChangeScene");
+    }
+
+    /// <summary>
+    /// Called from ServerChangeScene immediately before SceneManager.LoadSceneAsync is executed
+    /// <para>This allows server to do work / cleanup / prep before the scene changes.</para>
+    /// </summary>
+    /// <param name="newSceneName">Name of the scene that's about to be loaded</param>
+    public override void OnServerChangeScene(string newSceneName)
+    {
+        //UnityEngine.Debug.Log("OnServerChangeScene");
+    }
+
+    /// <summary>
+    /// Called on the server when a scene is completed loaded, when the scene load was initiated by the server with ServerChangeScene().
+    /// </summary>
+    /// <param name="sceneName">The name of the new scene.</param>
+    public override void OnServerSceneChanged(string sceneName)
+    {
+        //UnityEngine.Debug.Log("OnServerSceneChanged");
+    }
+
+    /// <summary>
+    /// Called from ClientChangeScene immediately before SceneManager.LoadSceneAsync is executed
+    /// <para>This allows client to do work / cleanup / prep before the scene changes.</para>
+    /// </summary>
+    /// <param name="newSceneName">Name of the scene that's about to be loaded</param>
+    /// <param name="sceneOperation">Scene operation that's about to happen</param>
+    /// <param name="customHandling">true to indicate that scene loading will be handled through overrides</param>
+    public override void OnClientChangeScene(string newSceneName, SceneOperation sceneOperation, bool customHandling)
+    {
+        //UnityEngine.Debug.Log("OnClientChangeScene");
+    }
+
+    /// <summary>
+    /// Called on clients when a scene has completed loaded, when the scene load was initiated by the server.
+    /// <para>Scene changes can cause player objects to be destroyed. The default implementation of OnClientSceneChanged in the NetworkManager is to add a player object for the connection if no player object exists.</para>
+    /// </summary>
+    public override void OnClientSceneChanged()
+    {
+        base.OnClientSceneChanged();
+        // UnityEngine.Debug.Log("OnClientSceneChanged");
+    }
+
+    #endregion
+
+    #region Server System Callbacks
+
+    /// <summary>
+    /// Called on the server when a new client connects.
+    /// <para>Unity calls this on the Server when a Client connects to the Server. Use an override to tell the NetworkManager what to do when a client connects to the server.</para>
+    /// </summary>
+    /// <param name="conn">Connection from client.</param>
+    public override void OnServerConnect(NetworkConnectionToClient conn)
+    {
+        Debug.Log($"OnServerConnect{conn.address}");
+    }
+
+    /// <summary>
+    /// Called on the server when a client is ready.
+    /// <para>The default implementation of this function calls NetworkServer.SetClientReady() to continue the network setup process.</para>
+    /// </summary>
+    /// <param name="conn">Connection from client.</param>
+    public override void OnServerReady(NetworkConnectionToClient conn)
+    {
+        base.OnServerReady(conn);
+        //UnityEngine.Debug.Log("OnServerReady");
+    }
+
+    /// <summary>
+    /// Called on the server when a client adds a new player with ClientScene.AddPlayer.
+    /// <para>The default implementation for this function creates a new player object from the playerPrefab.</para>
+    /// </summary>
+    /// <param name="conn">Connection from client.</param>
+    public override void OnServerAddPlayer(NetworkConnectionToClient conn)
+    {
+        base.OnServerAddPlayer(conn);
+        //UnityEngine.Debug.Log("OnServerAddPlayer");
+    }
+
+    /// <summary>
+    /// Called on the server when a client disconnects.
+    /// <para>This is called on the Server when a Client disconnects from the Server. Use an override to decide what should happen when a disconnection is detected.</para>
+    /// </summary>
+    /// <param name="conn">Connection from client.</param>
+    public override void OnServerDisconnect(NetworkConnectionToClient conn)
+    {
+        // this code is to reset any objects belonging to disconnected clients
+        // make a copy because the original collection will change in the loop
+        copyOfOwnedObjects = conn.owned.ToArray();
+        // Loop the copy, skipping the player object.
+        // RemoveClientAuthority on everything else
+        foreach (NetworkIdentity identity in copyOfOwnedObjects)
+        {
+            if (identity != conn.identity)
+                identity.RemoveClientAuthority();
+        }
+
+        base.OnServerDisconnect(conn);
+    }
+
+    /// <summary>
+    /// Called on server when transport raises an error.
+    /// <para>NetworkConnection may be null.</para>
+    /// </summary>
+    /// <param name="conn">Connection of the client...may be null</param>
+    /// <param name="transportError">TransportError enum</param>
+    /// <param name="message">String message of the error.</param>
+    public override void OnServerError(NetworkConnectionToClient conn, TransportError transportError, string message)
+    {
+        Debug.Log($"OnServerError {transportError} {message}");
+    }
+
+    #endregion
+
+    #region Client System Callbacks
+
+    /// <summary>
+    /// Called on the client when connected to a server.
+    /// <para>The default implementation of this function sets the client as ready and adds a player. Override the function to dictate what happens when the client connects.</para>
+    /// </summary>
+    public override void OnClientConnect()
+    {
+        base.OnClientConnect();
+        //UnityEngine.Debug.Log("OnClientConnect");
+        Debug.Log("Connected to server.");
+    }
+
+    /// <summary>
+    /// Called on clients when disconnected from a server.
+    /// <para>This is called on the client when it disconnects from the server. Override this function to decide what happens when the client disconnects.</para>
+    /// </summary>
+    public override void OnClientDisconnect()
+    {
+        //UnityEngine.Debug.Log("OnClientDisconnect");
+        Debug.Log("Disconnected from server.");
+    }
+
+    /// <summary>
+    /// Called on clients when a servers tells the client it is no longer ready.
+    /// <para>This is commonly used when switching scenes.</para>
+    /// </summary>
+    public override void OnClientNotReady()
+    {
+        //UnityEngine.Debug.Log("OnClientNotReady");
+    }
+
+    /// <summary>
+    /// Called on client when transport raises an error.</summary>
+    /// </summary>
+    /// <param name="transportError">TransportError enum.</param>
+    /// <param name="message">String message of the error.</param>
+    public override void OnClientError(TransportError transportError, string message)
+    {
+        Debug.Log("OnClientError: " + message);
+    }
+
+    #endregion
+
+    #region Start & Stop Callbacks
+
+    // Since there are multiple versions of StartServer, StartClient and StartHost, to reliably customize
+    // their functionality, users would need override all the versions. Instead these callbacks are invoked
+    // from all versions, so users only need to implement this one case.
+
+    /// <summary>
+    /// This is invoked when a host is started.
+    /// <para>StartHost has multiple signatures, but they all cause this hook to be called.</para>
+    /// </summary>
+    public override void OnStartHost()
+    {
+        //UnityEngine.Debug.Log("OnStartHost");
+        //vrCanvasHUD.SetupInfoText("Started Hosting.");
+    }
+
+    /// <summary>
+    /// This is invoked when a server is started - including when a host is started.
+    /// <para>StartServer has multiple signatures, but they all cause this hook to be called.</para>
+    /// </summary>
+    public override void OnStartServer()
+    {
+        //UnityEngine.Debug.Log("OnStartServer");
+        Debug.Log("Started server.");
+    }
+
+    /// <summary>
+    /// This is invoked when the client is started.
+    /// </summary>
+    public override void OnStartClient()
+    {
+        //UnityEngine.Debug.Log("OnStartClient");
+        Debug.Log("Client started.");
+    }
+
+    /// <summary>
+    /// This is called when a host is stopped.
+    /// </summary>
+    public override void OnStopHost()
+    {
+        //UnityEngine.Debug.Log("OnStopHost");
+        // vrCanvasHUD.SetupInfoText("Started Hosting.");
+    }
+
+    /// <summary>
+    /// This is called when a server is stopped - including when a host is stopped.
+    /// </summary>
+    public override void OnStopServer()
+    {
+        //UnityEngine.Debug.Log("OnStopServer");
+        Debug.Log("Server stopped.");
+    }
+
+    /// <summary>
+    /// This is called when a client is stopped.
+    /// </summary>
+    public override void OnStopClient()
+    {
+        //UnityEngine.Debug.Log("OnStopClient");
+        Debug.Log("Client stopped.");
+    }
+
+    #endregion
+}

Assets/GameFramework/Runtime/Network/VRNetworkManager.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 65f8bd151f9b7f049b29549f495d4b97

Assets/GameRes/Main/Prefab/TestPlayer.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 9035792211773973726}
   - component: {fileID: 7686240253380416189}
   - component: {fileID: 2887128474451739717}
-  - component: {fileID: 3932613711437579904}
   m_Layer: 0
   m_Name: Mesh
   m_TagString: Untagged
@@ -87,29 +86,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!136 &3932613711437579904
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2628753435532376408}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &8689222817812204944
 GameObject:
   m_ObjectHideFlags: 0
@@ -158,7 +134,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   sceneId: 0
-  _assetId: 0
+  _assetId: 960210788
   serverOnly: 0
   visibility: 0
   hasSpawned: 0