From 0b22aa158e0db0fa58a7fea9fe7d8cbf6757eb50 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 11 七月 2019 12:48:43 +0800
Subject: [PATCH] 7956 【主干】【前端】跨服PVP匹配机器人规则优化
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 58 ++++++----------------------------------------------------
1 files changed, 6 insertions(+), 52 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 5547f17..c44b55a 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -21,11 +21,9 @@
public bool isClickCoolTime { get; set; }
public event Action UpdateMatchStateEvent;
private bool _isMatching;
- public bool IsMatching
- {
+ public bool IsMatching {
get { return _isMatching; }
- set
- {
+ set {
_isMatching = value;
if (UpdateMatchStateEvent != null)
{
@@ -75,12 +73,6 @@
public void OnSwitchAccount()
{
IsMatching = false;
-
- if (clientMatchClock != null)
- {
- Clock.Stop(clientMatchClock);
- clientMatchClock = null;
- }
}
public void OnPlayerLoginOk()
@@ -457,7 +449,6 @@
}
}
- Clock clientMatchClock;
BuffModel buffDatas { get { return ModelCenter.Instance.GetModel<BuffModel>(); } }
/// <summary>
///0-鍙栨秷鍖归厤; 1-杩涜鍖归厤
@@ -467,47 +458,10 @@
{
if (type == 1 && TryGetMatchTip()) return;
- if (type == 1)
- {
- var danLevel = CrossServerOneVsOnePlayerInfo.Instance.DanLV;
- if (ClientCrossServerOneVsOne.TryClientCrossServerOneVsOne(danLevel))
- {
- var onMatchPackage = new HC002_tagGCCrossRealmPKStartMatch();
- GameNetSystem.Instance.PushPackage(onMatchPackage, ServerType.Main);
- var randomWaitSeconds = UnityEngine.Random.Range(3, 8);
- clientMatchClock = Clock.AlarmAt(DateTime.Now + new TimeSpan(randomWaitSeconds * TimeSpan.TicksPerSecond), () =>
- {
- IsMatching = false;
- if (GameNetSystem.Instance.netState == GameNetSystem.NetState.Connected)
- {
- ClientCrossServerOneVsOne.FakeMatchOk();
- }
- });
- }
- else
- {
- var match = new CC101_tagCMCrossRealmPKMatch();
- match.Type = (byte)type;
- GameNetSystem.Instance.SendInfo(match);
- CrossServerOneVsOneRewardModel.PkType = buffDatas.PkType;
- }
- }
- else
- {
- if (clientMatchClock != null)
- {
- Clock.Stop(clientMatchClock);
- clientMatchClock = null;
- IsMatching = false;
- }
- else
- {
- var match = new CC101_tagCMCrossRealmPKMatch();
- match.Type = (byte)type;
- GameNetSystem.Instance.SendInfo(match);
- CrossServerOneVsOneRewardModel.PkType = buffDatas.PkType;
- }
- }
+ var match = new CC101_tagCMCrossRealmPKMatch();
+ match.Type = (byte)type;
+ GameNetSystem.Instance.SendInfo(match);
+ CrossServerOneVsOneRewardModel.PkType = buffDatas.PkType;
}
public void SendBuyMatchCount()
--
Gitblit v1.8.0