From 77a4ed277c8d33cc748f57b91fb23f0dc54b63ed Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 19 二月 2019 11:28:32 +0800
Subject: [PATCH] 3335 整理ui资源。
---
Assets/Editor/Tool/CrossServerEditorWindow.cs | 93 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 82 insertions(+), 11 deletions(-)
diff --git a/Assets/Editor/Tool/CrossServerEditorWindow.cs b/Assets/Editor/Tool/CrossServerEditorWindow.cs
index ecaf895..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()
{
@@ -34,14 +37,17 @@
window.autoRepaintOnSceneChange = true;
}
- public static void ConnectCrossServer()
- {
- CrossServerLogin.Instance.AccountLogin(crossServerAccount, crossServerIp, 19006);
- }
-
public static void DisconnectCrossServer()
{
GameNetSystem.Instance.DisconnectCrossServer();
+ }
+
+ private void Update()
+ {
+ if (autoOneVsOneMatch)
+ {
+ AutoCrossServerOneVsOneMatching();
+ }
}
private void OnGUI()
@@ -64,11 +70,6 @@
EditorGUILayout.Space();
EditorGUILayout.Space();
EditorGUILayout.BeginHorizontal();
-
- if (GUILayout.Button("閾炬帴"))
- {
- ConnectCrossServer();
- }
if (GUILayout.Button("鏂紑"))
{
@@ -101,10 +102,80 @@
if (GUILayout.Button("閫�鍑鸿法鏈�"))
{
var match = new CC104_tagCMExitCrossRealm();
- GameNetSystem.Instance.SendInfo(match);
+ GameNetSystem.Instance.SendToCrossServer(match);
+ }
+
+ if (GUILayout.Button("寮哄埗閫�鍑鸿法鏈�"))
+ {
+ var sendInfo = new CC003_tagCGForceQuitCrossState();
+ GameNetSystem.Instance.SendInfo(sendInfo);
}
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