From 1b059bce4aeb269bae9c04e2aefddec3197ba82f Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 24 十二月 2018 11:36:23 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/CrossServerOneVsOne/CrossServerArenaWin.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerArenaWin.cs b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
index 0c7c4af..7ecd50b 100644
--- a/System/CrossServerOneVsOne/CrossServerArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerArenaWin.cs
@@ -56,6 +56,7 @@
{
TimeMgr.Instance.OnMinuteEvent -= UpdateMinute;
GlobalTimeEvent.Instance.secondEvent -= UpdateSecond;
+ DTCC002_tagGCCrossRealmPKStartMatch.CrossServerStartMatchEvent -= OnStartMatch;
}
protected override void OnAfterClose()
{
@@ -69,8 +70,9 @@
UpdatePKInfo();
UpdateActivityState();
UpdateLookPlayerTime();
- seasonTimeText.text = CrossServerPKSeason.Instance.ToDisplaySeasonTime();
- var openTimes = CrossServerPKSeason.Instance.GetActivityTimes();
+ var pkSeason = CrossServerPKSeason.Instance;
+ seasonTimeText.text = pkSeason.ToDisplaySeasonTime();
+ var openTimes = pkSeason.GetActivityTimes();
openTimeText.gameObject.SetActive(openTimes != null && openTimes.Count > 0);
if(openTimes != null)
{
@@ -209,7 +211,6 @@
private void OnStartMatch()
{
lookPlayerObj.SetActive(true);
- crossServerModel.IsMatching = true;
crossServerModel.matchStartTime = DateTime.Now;
UpdateLookPlayerTime();
UpdateActivityState();
@@ -218,10 +219,10 @@
private void ClickMatch(int type)
{
crossServerModel.SendCrossMatch(type);
- if(type != 1)
+ if(type == 0)
{
- lookPlayerObj.SetActive(false);
crossServerModel.IsMatching = false;
+ lookPlayerObj.SetActive(false);
UpdateActivityState();
}
}
--
Gitblit v1.8.0