3335 切换地图逻辑重构。

client_Wu Xijin

2019-02-01 c90cdd78c2bf8bcfa25cec7432a5876f6085ecfb

 Core/NetworkPackage/GameNetSystem.cs

@@ -120,7 +120,7 @@
            DebugEx.Log(ex);

        }



        mainSocket = new ClientSocket(SocketType.Main);

        mainSocket = new ClientSocket(ServerType.Main);

        mainProtocolQueue.Clear();



        mainSocket.Connect(ip, port, (bool ok) =>

@@ -147,7 +147,7 @@
            DebugEx.Log(ex);

        }



        crossServerSocket = new ClientSocket(SocketType.CrossSever);

        crossServerSocket = new ClientSocket(ServerType.CrossSever);

        crossSeverProtocolQueue.Clear();

        this.crossServerSocket.Connect(ip, port, (bool ok) =>

        {

@@ -188,13 +188,13 @@
    {

        if (crossServerSocket != null)

        {

            protocol.socketType = SocketType.CrossSever;

            protocol.socketType = ServerType.CrossSever;

            crossServerSocket.SendInfo(protocol);

            DebugPkgCache.Push(protocol);

        }

    }



    public void PushPackage(GameNetPackBasic protocol, SocketType type)

    public void PushPackage(GameNetPackBasic protocol, ServerType type)

    {

        lock (this)

        {

@@ -207,10 +207,10 @@
            {

                switch (type)

                {

                    case SocketType.Main:

                    case ServerType.Main:

                        mainProtocolQueue.Enqueue(protocol);

                        break;

                    case SocketType.CrossSever:

                    case ServerType.CrossSever:

                        crossSeverProtocolQueue.Enqueue(protocol);

                        break;

                    default:

@@ -338,7 +338,17 @@
            var loginModel = ModelCenter.Instance.GetModel<LoginModel>();

            loginModel.busy = false;

            WindowJumpMgr.Instance.ClearJumpData();

            StageManager.Instance.LoadLoginStage();



            StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand()

            {

                toMapId = 1,

                toLineId = 0,

                needEmpty = false,

                needLoadResource = true,

                serverType = ServerType.Main,

                isClientLoadMap = true

            });



            NetLinkWin.Hide();

        }

    }

@@ -388,12 +398,6 @@
        DisConnected = 6,

    }



    public enum SocketType

    {

        Main = 1,

        CrossSever = 2,

    }



    public struct CrossServerData

    {

        public string ip;

@@ -415,5 +419,10 @@
        Error = 2,

    }



}



public enum ServerType

{

    Main = 1,

    CrossSever = 2,

}