Merge branch 'Cross_Server'

client_Wu Xijin

2018-12-26 ac62d3ed146acbe0fbc196cc6b1226a52fe5b3cf

Merge branch 'Cross_Server'

 Assets/Editor/Tool/CrossServerEditorWindow.cs

New file
@@ -0,0 +1,110 @@
using UnityEngine;
using System;
using System.Collections;
using System.Collections.Generic;
using Snxxz.UI;
using System.Net;
using System.Net.Sockets;
using System.Threading;
using UnityEditor;

public class CrossServerTest : EditorWindow
{

    public static string crossServerAccount {
        get { return LocalSave.GetString("CrossServerAccount"); }
        set { LocalSave.SetString("CrossServerAccount", value); }
    }

    public static int crossServerId {
        get { return LocalSave.GetInt("CrossServerId", 23); }
        set { LocalSave.SetInt("CrossServerId", value); }
    }

    public static string crossServerIp {
        get { return LocalSave.GetString("CrossServerIp"); }
        set { LocalSave.SetString("CrossServerIp", value); }
    }

    [MenuItem("程序/跨服")]
    public static void Open()
    {
        var window = GetWindow<CrossServerTest>(false, "跨服");
        window.Show();
        window.autoRepaintOnSceneChange = true;
    }

    public static void ConnectCrossServer()
    {
        CrossServerLogin.Instance.AccountLogin(crossServerAccount, crossServerIp, 19006);
    }

    public static void DisconnectCrossServer()
    {
        GameNetSystem.Instance.DisconnectCrossServer();
    }

    private void OnGUI()
    {
        EditorGUILayout.Space();

        if (EditorApplication.isPlaying)
        {
            EditorGUILayout.BeginHorizontal();
            EditorGUILayout.Toggle("主服链接状态", GameNetSystem.Instance.mainSocketConnected);
            EditorGUILayout.Toggle("跨服链接状态", GameNetSystem.Instance.crossServerSocketConnected);
            EditorGUILayout.EndHorizontal();
        }

        EditorGUILayout.Space();
        crossServerAccount = EditorGUILayout.TextField("跨服账号：", crossServerAccount);
        crossServerId = EditorGUILayout.IntField("跨服服务器id：", crossServerId);
        crossServerIp = EditorGUILayout.TextField("跨服ip：", crossServerIp);

        EditorGUILayout.Space();
        EditorGUILayout.Space();
        EditorGUILayout.BeginHorizontal();

        if (GUILayout.Button("链接"))
        {
            ConnectCrossServer();
        }

        if (GUILayout.Button("断开"))
        {
            DisconnectCrossServer();
        }

        EditorGUILayout.EndHorizontal();

        EditorGUILayout.Space();

        EditorGUILayout.BeginHorizontal();
        if (GUILayout.Button("匹配"))
        {
            var match = new CC101_tagCMCrossRealmPKMatch();
            match.Type = 1;
            GameNetSystem.Instance.SendInfo(match);
        }

        if (GUILayout.Button("取消"))
        {
            var match = new CC101_tagCMCrossRealmPKMatch();
            match.Type = 0;
            GameNetSystem.Instance.SendInfo(match);
        }

        EditorGUILayout.EndHorizontal();

        EditorGUILayout.Space();
        EditorGUILayout.BeginHorizontal();
        if (GUILayout.Button("退出跨服"))
        {
            var match = new CC104_tagCMExitCrossRealm();
            GameNetSystem.Instance.SendToCrossServer(match);
        }

        EditorGUILayout.EndHorizontal();
    }

}

 Assets/Editor/Tool/CrossServerEditorWindow.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: c70256d8379f60c478d17e71d84fddc2
timeCreated: 1544603498
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Editor/Tool/NetPkgTool.cs

@@ -49,6 +49,20 @@
        }

    }



    bool showMainServerPackage {

        get { return LocalSave.GetBool("MainServerPackage", true); }

        set {

            LocalSave.SetBool("MainServerPackage", value);

        }

    }



    bool showCrossServerPackage {

        get { return LocalSave.GetBool("CrossServerPackage", true); }

        set {

            LocalSave.SetBool("CrossServerPackage", value);

        }

    }



    static int maxShowPackageCount {

        get { return LocalSave.GetInt("NetPackageShowMaxCount", 100); }

        set { LocalSave.SetInt("NetPackageShowMaxCount", value); }

@@ -76,6 +90,8 @@
        GUILayout.BeginHorizontal();

        maxShowPackageCount = EditorGUILayout.IntField("最大显示封包数：", maxShowPackageCount);

        showHeartPackage = GUILayout.Toggle(showHeartPackage, "心跳包");

        showMainServerPackage = GUILayout.Toggle(showMainServerPackage, "主服");

        showCrossServerPackage = GUILayout.Toggle(showCrossServerPackage, "跨服");



        m_CurNetPkgType = GUILayout.Toggle(m_CurNetPkgType == NetPkgType.All, "全部") ? NetPkgType.All : m_CurNetPkgType;

        m_CurNetPkgType = GUILayout.Toggle(m_CurNetPkgType == NetPkgType.Server, "收包") ? NetPkgType.Server : m_CurNetPkgType;

@@ -115,6 +131,16 @@
                    continue;

                }



                if (!showMainServerPackage && NetPkgLst[i].socketType == GameNetSystem.SocketType.Main)

                {

                    continue;

                }



                if (!showCrossServerPackage && NetPkgLst[i].socketType == GameNetSystem.SocketType.CrossSever)

                {

                    continue;

                }



                if (!showHeartPackage &&

                    (NetPkgLst[i].GameNetName.Contains("OnlineReturn")

                    || NetPkgLst[i].GameNetName.Contains("ServerHeart")