| System/Activity/ActivityModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/SeasonRewardWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/EnumHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/Activity/ActivityModel.cs
@@ -273,7 +273,8 @@ break; case DailyQuestType.CrossServerPk: { if(TimeUtility.OpenDay < ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>().afterOpenDayOpenCross) bool isStatify = CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch; if (!isStatify) { return true; } System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -41,6 +41,7 @@ public void OnBeforePlayerDataInitialize() { CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfo; CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent -= UpdateSeason; TimeMgr.Instance.OnMinuteEvent -= UpdateMinute; dungeonModel.updateMissionEvent -= UpdateFBHelp; @@ -63,6 +64,7 @@ public void OnPlayerLoginOk() { CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo; CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent += UpdateSeason; TimeMgr.Instance.OnMinuteEvent += UpdateMinute; rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState; @@ -90,7 +92,6 @@ pkResultInfo = new CrossServerOneVsOnePkResult(); oneVsOneHistoryDict.Clear(); } private void UpdateMinute() { @@ -134,6 +135,12 @@ private void UpdateSeason() { UpdateCrossMatchRedpoint(); } private void UpdatePlayerInfo() { UpdateCrossDayAwardsRedpoint(); UpdateCrossMatchRedpoint(); } @@ -532,8 +539,7 @@ var playerInfo = CrossServerOneVsOnePlayerInfo.Instance; var pkSeason = CrossServerOneVsOnePKSeason.Instance; if (pkSeason.InPkSeason(TimeUtility.ServerNow) && pkSeason.InOpenTime() if (pkSeason.isSatisfyMatch && playerInfo.GetDayRemainNum() > 0) { crossMatchRedpoint.state = RedPointState.Simple; System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
@@ -21,7 +21,16 @@ public int MatchState { get; private set; } // 匹配状态；0-未开启；1-开启中 public bool isSatisfyMatch { get { return InPkSeason(TimeUtility.ServerNow) && InOpenTime(); } } public bool isSatisfyMatch { get { return FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.CrossServer) && TimeUtility.OpenDay >= crossServerModel.afterOpenDayOpenCross && InPkSeason(TimeUtility.ServerNow) && InOpenTime(); } } public class PkZoneInfo { System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs
@@ -50,7 +50,6 @@ this.DayPKCount = playerInfo.DayPKCount; this.DayBuyCount = playerInfo.DayBuyCount; this.DayWinCount = playerInfo.DayWinCount; crossServerModel.UpdateCrossDayAwardsRedpoint(); if (UpdatePlayerInfoEvent != null) { UpdatePlayerInfoEvent(); System/CrossServerOneVsOne/SeasonRewardWin.cs
@@ -11,7 +11,8 @@ using TableConfig; using EnhancedUI.EnhancedScroller; namespace Snxxz.UI { namespace Snxxz.UI { //赛季奖励 [XLua.Hotfix] public class SeasonRewardWin : Window @@ -39,6 +40,7 @@ { IsInquireReward(); OnCreateGridLineCell(m_ScrollerController); m_ScrollerController.JumpIndex(JumpIndex()); } protected override void OnAfterOpen() @@ -53,7 +55,7 @@ CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfoEvent; } protected override void OnAfterClose() { } @@ -75,7 +77,7 @@ gridCtrl.AddCell(ScrollerDataType.Header, key); } for (int i = SortList.Count - 1; i >= 0; i--) { { gridCtrl.AddCell(ScrollerDataType.Normal, SortList[i]); } gridCtrl.Restart(); @@ -84,17 +86,51 @@ { int Index = cell.index; SeasonRewardCell seasonRewardCell = cell.GetComponent<SeasonRewardCell>(); seasonRewardCell.ScrollerDataTypAndId(type, Index); seasonRewardCell.ScrollerDataTypAndId(type, Index); } private void IsInquireReward() { bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState,-1); bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1); if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2 && !isbool) { crossServerRewardModel.ViewCrossPKBillboard(CrossServerOneVsOnePKSeason.Instance.ZoneID, CrossServerOneVsOnePKSeason.Instance.SeasonID); } } private int JumpIndex() { int Index = 0; if (CrossServerOneVsOnePKSeason.Instance.SeasonState != 2) { return Index; } if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)//存在世界排名 { int Type = 0; foreach (var key in crossServerRewardModel.SeasonRewardDic.AwardDic.Keys) { if (crossServerRewardModel.MyRank < key) { Index = Type; return Index; } Type += 1; } } int Type1 = 3; for (int i = SortList.Count - 1; i >= 0; i--) { if (CrossServerOneVsOnePlayerInfo.Instance.DanLV == SortList[i]) { Index = Type1; return Index; } Type1 += 1; } return Index; } } } Utility/EnumHelper.cs
@@ -898,6 +898,7 @@ TreasureFindHost = 124, //法宝认主 Dogz = 138, //神兽 AddPoint = 145,//加点 CrossServer = 157, //跨服天梯赛 } //属性类型 public enum AttrEnum
