9527 新版sdk交互相关修改

lwb

2020-11-20 523a8c5b8de799aeaeaa7287f0b4f9e2edf339ee

 Assets/Editor/Tool/CrossServerEditorWindow.cs

@@ -8,6 +8,7 @@
using System.Threading;
using UnityEditor;


public class CrossServerTest : EditorWindow
{

@@ -26,6 +27,8 @@
        set { LocalSave.SetString("CrossServerIp", value); }
    }

    public bool autoOneVsOneMatch = false;

    [MenuItem("程序/跨服")]
    public static void Open()
    {
@@ -37,6 +40,14 @@
    public static void DisconnectCrossServer()
    {
        GameNetSystem.Instance.DisconnectCrossServer();
    }

    private void Update()
    {
        if (autoOneVsOneMatch)
        {
            AutoCrossServerOneVsOneMatching();
        }
    }

    private void OnGUI()
@@ -101,6 +112,70 @@
        }

        EditorGUILayout.EndHorizontal();
        autoOneVsOneMatch = EditorGUILayout.Toggle("自动匹配", autoOneVsOneMatch);

        EditorGUILayout.Space();
        EditorGUILayout.BeginHorizontal();
        if (GUILayout.Button("开始客户端PK"))
        {
            ClientCrossServerOneVsOne.FakeMatchOk();
            ClientCrossServerOneVsOne.StartClientCrossServerOneVsOne();
        }

        if (GUILayout.Button("退出客户端PK"))
        {
            ClientCrossServerOneVsOne.StopClientCrossServerOneVsOne();
        }

        EditorGUILayout.EndHorizontal();
    }

    CrossServerOneVsOneModel oneVsOneModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
    float timer = 0f;

    private void AutoCrossServerOneVsOneMatching()
    {
        timer += Time.deltaTime;
        if (timer < 5f)
        {
            return;
        }

        timer = 0f;

        if (StageLoad.Instance.isLoading)
        {
            return;
        }

        var mapId = PlayerDatas.Instance.baseData.MapID;
        var config = MapConfig.Get(mapId);
        if (config == null)
        {
            return;
        }

        if (config.MapFBType != (int)MapType.OpenCountry)
        {
            return;
        }

        if (oneVsOneModel.IsMatching)
        {
            return;
        }

        if (CrossServerLogin.Instance.IsEnterCrossServerPreparing())
        {
            return;
        }

        if (CrossServerLogin.Instance.busy)
        {
            return;
        }

        oneVsOneModel.SendCrossMatch(1);
    }

}