| System/Dungeon/FairyLeagueDungeonResourceBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairyAu/FairyLeagueModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairyAu/FairyLeagueRankCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairyAu/FairyLeagueWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/Dungeon/FairyLeagueDungeonResourceBehaviour.cs
@@ -61,7 +61,7 @@ _crystalDict.ContainsKey(i + 1) ? _crystalDict[i + 1].Length : 0); float _propertyUpper = 0; if (_help.fairyWarEnter.WinCount != null && _help.fairyWarEnter.WinCount[1 - i] != 0 && (model.fairyLeagueRing == 1 || model.BattleChampion())) && (model.fairyLeagueSession == 1 || model.BattleChampion())) { var _buffLv = kingFairyModel.GetWinStreakBuffLv(_help.fairyWarEnter.WinCount[1 - i]); SkillConfig _multipleWinBuff = Config.Instance.Get<SkillConfig>(kingFairyModel.multipleWinBuffTypeId + System/FairyAu/FairyLeagueModel.cs
@@ -13,8 +13,15 @@ { public event Action OnRefreshFairyLeagueEvent; FairyLeagueWeekTime currentWeekTime = new FairyLeagueWeekTime(); FairyLeagueWeekTime nextWeekTime = new FairyLeagueWeekTime(); FairyLeagueWeekTime currentWeekTime { get { return fairyLeagueWeekTime; } } FairyLeagueWeekTime nextWeekTime { get { return fairyLeagueWeekTime; } } FairyLeagueStage cacheLeagueStage = FairyLeagueStage.Prepare; @@ -26,7 +33,7 @@ } } public int fairyLeagueRing public int fairyLeagueSession { get { @@ -126,6 +133,10 @@ void ResetFairyLeagueTime() { if (OnRefreshFairyLeagueEvent != null) { OnRefreshFairyLeagueEvent(); } } private void PlayerDataRefreshInfoEvent(PlayerDataRefresh _type) @@ -173,7 +184,7 @@ public Dictionary<int, List<AwardItem>> finalWarAwardDict = new Dictionary<int, List<AwardItem>>(); public Dictionary<int, List<AwardItem>> finalWarChampionAwardDict = new Dictionary<int, List<AwardItem>>(); private Dictionary<int, float> crystalRateDict = new Dictionary<int, float>(); const int[] readonly List<int> fairyLeagueStateValues = new List<int>() { 11, 12, 13, 21, 22, 23 }; FairyLeagueWeekTime fairyLeagueWeekTime = new FairyLeagueWeekTime(); private void ParseConfig() { @@ -185,7 +196,10 @@ var configs = Config.Instance.GetAllValues<DungeonStateTimeConfig>(); for (int i = 0; i < configs.Count; i++) { fairyLeagueWeekTime.AddStage() if (fairyLeagueStateValues.Contains(configs[i].StateValue)) { fairyLeagueWeekTime.AddStage(configs[i]); } } cfg = Config.Instance.Get<FuncConfigConfig>("FamilyMatchResourcePoint"); if (cfg != null) @@ -389,12 +403,12 @@ public bool BattleChampion() { var _ring = fairyLeagueRing; if (_ring == 0 && fairyLeagueBattleDict.ContainsKey(_ring) && fairyLeagueBattleDict[_ring].ContainsKey(5)) var _session = fairyLeagueSession; if (_session == 0 && fairyLeagueBattleDict.ContainsKey(_session) && fairyLeagueBattleDict[_session].ContainsKey(5)) { var _list = fairyLeagueBattleDict[_ring][5]; var _list = fairyLeagueBattleDict[_session][5]; return _list.Count == 1; } return false; @@ -452,13 +466,13 @@ public bool SelfFairyInBattle(out int _error) { _error = 3; var _ring = fairyLeagueRing; var _session = fairyLeagueSession; var _fairyId = PlayerDatas.Instance.fairyData.fairy.FamilyID; if (!fairyLeagueBattleDict.ContainsKey(_ring)) if (!fairyLeagueBattleDict.ContainsKey(_session)) { return false; } var _dict = fairyLeagueBattleDict[_ring]; var _dict = fairyLeagueBattleDict[_session]; foreach (var _grade in _dict.Keys) { if (_dict[_grade] == null) @@ -532,9 +546,9 @@ SysNotifyMgr.Instance.ShowTip("LeagueCannotGo4"); break; case 5: var _ring = fairyLeagueRing; _ring = fairyLeagueStage == FairyLeagueStage.Fight || fairyLeagueStage == FairyLeagueStage.Over ? 1 - _ring : _ring; if (_ring == 1) var _session = fairyLeagueSession; _session = fairyLeagueStage == FairyLeagueStage.Fight || fairyLeagueStage == FairyLeagueStage.Over ? 1 - _session : _session; if (_session == 1) { //var _param = StringUtility.Contact(Language.Get(StringUtility.Contact("Weekday", groupTimes[_ring].dayOfWeek)), // fightTimes[1].startHour.ToString("D2"), ":", fightTimes[1].startMinute.ToString("D2")); @@ -650,13 +664,13 @@ public FairyLeagueBattleData GetSelfBattleInfo() { var _ring = fairyLeagueRing; var _session = fairyLeagueSession; var _fairyId = PlayerDatas.Instance.fairyData.fairy.FamilyID; if (!fairyLeagueBattleDict.ContainsKey(_ring)) if (!fairyLeagueBattleDict.ContainsKey(_session)) { return null; } var _dict = fairyLeagueBattleDict[_ring]; var _dict = fairyLeagueBattleDict[_session]; foreach (var _grade in _dict.Keys) { if (_dict[_grade] == null) @@ -676,7 +690,7 @@ public bool StepRing(int _grade = 5) { if (fairyLeagueRing == 1) if (fairyLeagueSession == 1) { if (!fairyLeagueBattleDict.ContainsKey(1)) { @@ -840,6 +854,30 @@ } } public int currentRing { get { for (int i = 0; i < rings.Count; i++) { if (rings[i].InRing(TimeUtility.ServerNow)) { return i; } } return 0; } } public int GetDayOfWeek(int _index) { if (_index >= 0 && _index < rings.Count) { return rings[_index].dayOfWeek; } return 0; } public int currentSession { get System/FairyAu/FairyLeagueRankCell.cs
@@ -70,7 +70,7 @@ m_ChampionAwardBtn.onClick.RemoveAllListeners(); if (model.fairyLeagueGroupId == 5 && _index == model.GetBattleFirstPlayer()) { var _dict = (model.fairyLeagueRing == 1 && model.fairyLeagueHelp.fairyWarEnter.IsFinalMatch == 1) ? var _dict = (model.fairyLeagueSession == 1 && model.fairyLeagueHelp.fairyWarEnter.IsFinalMatch == 1) ? model.finalWarChampionAwardDict : model.finalWarAwardDict; if (_dict != null) { System/FairyAu/FairyLeagueWin.cs
@@ -128,7 +128,7 @@ private void UpdateKingFairyEvent() { if (model.fairyLeagueRing == 1 && model.fairyLeagueStage == FairyLeagueStage.Over) if (model.fairyLeagueSession == 1 && model.fairyLeagueStage == FairyLeagueStage.Over) { m_RewardTxt.text = Language.Get("CongratulationWangZheMeng", kingFairyModel.kingFairyData.fairyName); } @@ -153,7 +153,7 @@ private void RefreshPrepare() { var _ring = model.fairyLeagueRing; var _session = model.fairyLeagueSession; if (TimeUtility.OpenWeekCnt > model.OpenServerWeek) { m_PrepareTitleTxt.text = Language.Get("FamilyMatchQualification"); @@ -176,14 +176,14 @@ switch (model.fairyLeagueStage) { case FairyLeagueStage.Grouping: m_BattleTitleTxt.text = Language.Get("FamilyMatchAboutToStart", Language.Get(StringUtility.Contact("Num_CHS_", model.fairyLeagueRing + 1))); m_BattleTitleTxt.text = Language.Get("FamilyMatchAboutToStart", Language.Get(StringUtility.Contact("Num_CHS_", model.fairyLeagueSession + 1))); break; case FairyLeagueStage.Fight: m_BattleTitleTxt.text = Language.Get("FamilyMatchDoing", Language.Get(StringUtility.Contact("Num_CHS_", model.fairyLeagueRing + 1))); m_BattleTitleTxt.text = Language.Get("FamilyMatchDoing", Language.Get(StringUtility.Contact("Num_CHS_", model.fairyLeagueSession + 1))); break; case FairyLeagueStage.Over: UpdateKingFairyEvent(); m_BattleTitleTxt.text = Language.Get("FamilyMatchEnd", Language.Get(StringUtility.Contact("Num_CHS_", model.fairyLeagueRing + 1))); m_BattleTitleTxt.text = Language.Get("FamilyMatchEnd", Language.Get(StringUtility.Contact("Num_CHS_", model.fairyLeagueSession + 1))); break; } UpdateStageTime(); @@ -191,7 +191,7 @@ } private void UpdateStageTime() { var _ring = model.fairyLeagueRing; var _session = model.fairyLeagueSession; bool _stage1Over = false; bool _stage2Over = false; //m_LeagueStartTime.text = Language.Get("FamilyMatchWeekTime", model.IsNextWeek ? Language.Get("Next") : Language.Get("ThisTime"), Language.Get(StringUtility.Contact("Weekday", model.groupTimes[_ring].dayOfWeek))); @@ -256,14 +256,14 @@ } private void UpdateFairyLeagueBattle() { var _ring = model.fairyLeagueRing; var _session = model.fairyLeagueSession; for (int i = 0; i < m_FairyClashList.Count; i++) { var fairyClash = m_FairyClashList[i]; List<FairyLeagueBattleData> list = model.GetFairyLeague(model.StepRing(fairyClash.grade) ? 0 : model.fairyLeagueRing, fairyClash.grade); fairyClash.SetActive((model.fairyLeagueStage == FairyLeagueStage.Over && _ring == 1) List<FairyLeagueBattleData> list = model.GetFairyLeague(model.StepRing(fairyClash.grade) ? 0 : model.fairyLeagueSession, fairyClash.grade); fairyClash.SetActive((model.fairyLeagueStage == FairyLeagueStage.Over && _session == 1) || model.StepRing(fairyClash.grade)); if ((model.fairyLeagueStage == FairyLeagueStage.Over && _ring == 1) || model.StepRing(fairyClash.grade)) if ((model.fairyLeagueStage == FairyLeagueStage.Over && _session == 1) || model.StepRing(fairyClash.grade)) { if (list == null || list.Count == 0) {
