From 22b7bcdee6f652e9cea8f5a747e262718efffb3a Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 16 二月 2019 10:47:59 +0800
Subject: [PATCH] 6197 【前端】【1.6】跨服匹配玩法

---
 Assets/Editor/Tool/CrossServerEditorWindow.cs |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Assets/Editor/Tool/CrossServerEditorWindow.cs b/Assets/Editor/Tool/CrossServerEditorWindow.cs
index 4fefc91..816d035 100644
--- a/Assets/Editor/Tool/CrossServerEditorWindow.cs
+++ b/Assets/Editor/Tool/CrossServerEditorWindow.cs
@@ -7,7 +7,7 @@
 using System.Net.Sockets;
 using System.Threading;
 using UnityEditor;
-using TableConfig;
+
 
 public class CrossServerTest : EditorWindow
 {
@@ -113,6 +113,21 @@
 
         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>(); } }
@@ -134,7 +149,7 @@
         }
 
         var mapId = PlayerDatas.Instance.baseData.MapID;
-        var config = Config.Instance.Get<MapConfig>(mapId);
+        var config = MapConfig.Get(mapId);
         if (config == null)
         {
             return;

--
Gitblit v1.8.0