少年修仙传客户端代码仓库
Client_PangDeRong
2018-12-26 cfb5a44c43432432f3e47d752ef279e286db5ef7
5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发
3个文件已修改
40 ■■■■ 已修改文件
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -133,18 +133,24 @@
        {
            if (!crossServerModel.IsMatching) return;
            int totalSeconds = Mathf.RoundToInt((float)(DateTime.Now - crossServerModel.matchStartTime).TotalSeconds);
            if(totalSeconds < 3600)
            if(CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)
            {
                int minute = totalSeconds / 60;
                int seconds = totalSeconds % 60;
                lookTimeText.text = StringUtility.Contact(minute.ToString("D2"), ":", seconds.ToString("D2"));
                int totalSeconds = Mathf.RoundToInt((float)(DateTime.Now - crossServerModel.matchStartTime).TotalSeconds);
                if (totalSeconds < 3600)
                {
                    int minute = totalSeconds / 60;
                    int seconds = totalSeconds % 60;
                    lookTimeText.text = StringUtility.Contact(minute.ToString("D2"), ":", seconds.ToString("D2"));
                }
                else
                {
                    ClickMatch(0);
                }
            }
            else
            {
                ClickMatch(0);
            }
        }
        private void UpdateActivityState()
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -29,6 +29,7 @@
        public void OnBeforePlayerDataInitialize()
        {
            TimeMgr.Instance.OnMinuteEvent -= UpdateMinute;
            dungeonModel.updateMissionEvent -= UpdateFBHelp;
            rewardModel.CrossRealmPKAwardStateUpdate -= UpdateDayAwardState;
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdateDayAwardState;
@@ -49,11 +50,12 @@
        public void OnPlayerLoginOk()
        {
            TimeMgr.Instance.OnMinuteEvent += UpdateMinute;
            rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState;
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;
            dungeonModel.updateMissionEvent += UpdateFBHelp;
            UpdateDayAwardState();
            if(IsMatching)
            if(IsMatching && CrossServerOneVsOnePKSeason.Instance.InOpenTime())
            {
                SendCrossMatch(1);
            }
@@ -72,6 +74,18 @@
            oneVsOneHistoryDict.Clear();
        }
        private void UpdateMinute()
        {
            if (!IsMatching) return;
            if(!CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)
            {
                IsMatching = false;
                SendCrossMatch(0);
            }
        }
        public void UpdateDayAwardState()
        {
            var playerInfo = CrossServerOneVsOnePlayerInfo.Instance;
System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
@@ -21,6 +21,8 @@
        public int MatchState { get; private set; }    // 匹配状态;0-未开启;1-开启中
        public bool isSatisfyMatch { get { return InPkSeason(TimeUtility.ServerNow) && InOpenTime(); } }
        public class PkZoneInfo
        {
            public int ZoneID { get; private set; }        // 赛区ID
@@ -230,7 +232,7 @@
            };
            PkSeasonInfo seasonInfo = null;
            bool isSeason = TryGetSeasonInfo(out seasonInfo);
            if(isSeason)
            if(isSeason && SeasonState == 1)
            {
                return date >= seasonInfo.StartDate && date <= seasonInfo.EndDate;
            }
@@ -241,7 +243,7 @@
        {
            DailyQuestOpenTime _openTime = null;
            dailyQuestModel.TryGetOpenTime(dailyQuestId, out _openTime);
           return _openTime != null && _openTime.InOpenTime();
           return _openTime != null && _openTime.InOpenTime() && MatchState == 1;
        }
        public int IndexOfDays(DateTime time)