From 5bbcb15dc081ede6e6d390c81e7ec64901a1988a Mon Sep 17 00:00:00 2001
From: cehua_Czg <tingame100@163.com>
Date: 星期一, 22 四月 2019 16:30:34 +0800
Subject: [PATCH] 6666 第一章NPC配置

---
 Assets/Editor/Tool/CrossServerEditorWindow.cs |   75 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 0 deletions(-)

diff --git a/Assets/Editor/Tool/CrossServerEditorWindow.cs b/Assets/Editor/Tool/CrossServerEditorWindow.cs
index 3ab77b6..816d035 100644
--- a/Assets/Editor/Tool/CrossServerEditorWindow.cs
+++ b/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);
     }
 
 }

--
Gitblit v1.8.0