少年修仙传客户端代码仓库
0312 开服七天排行榜支持分页查询显示;界面打开关闭如果报错增加后台汇报
7个文件已修改
122 ■■■■ 已修改文件
LogicProject/System/CrossServer/CrossServerBattleFieldRankCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/ImpactBillRankCell.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/ImpactBillRankWin.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/ImpactRankModel.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/ImpactRankWin.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowBase/Window.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowBase/WindowCenter.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LogicProject/System/CrossServer/CrossServerBattleFieldRankCell.cs
@@ -92,6 +92,7 @@
            Btn_Bill.SetListener(()=> {
                impactRankModel.viewRankStartIndex = keys[index - 1];
                impactRankModel.presentBillRankType = (RankType)rankType;
                rankModel.QueryRankByPage(rankType, impactRankModel.viewRankStartIndex);
                WindowCenter.Instance.Open<ImpactBillRankWin>();
            });
        }
System/OpenServerActivity/ImpactBillRankCell.cs
@@ -38,6 +38,7 @@
        public override void Refresh(CellView cell)
        {
            rankModel.ListenRankPage((int)model.presentBillRankType, cell.index);
            int index = cell.index;
            m_RankNumImg.SetActive(index < 3);
            m_RankTxt.SetActive(index >= 3);
@@ -53,25 +54,12 @@
            RankData data = null;
            if ((int)model.presentBillRankType == 151 || (int)model.presentBillRankType == 152 || (int)model.presentBillRankType == 153)
            {
                var datas = rankModel.GetRankPageDatas((int)model.presentBillRankType);
                if (datas != null && datas.ContainsKey(index))
                {
                    data = datas[index];
                }
            var datas = rankModel.GetRankPageDatas((int)model.presentBillRankType);
            if (datas != null && datas.ContainsKey(index))
            {
                data = datas[index];
            }
            else
            {
                List<RankData> rankDatas = null;
                if (rankModel.TryGetRanks((int)model.presentBillRankType, out rankDatas))
                {
                    if (index < rankDatas.Count)
                    {
                        data = rankDatas[index];
                    }
                }
            }
            m_Compare.SetActive(true);
            m_CompareImg.SetActive(false);
            if (data != null)
System/OpenServerActivity/ImpactBillRankWin.cs
@@ -83,7 +83,7 @@
            if (m_RankCtrl.GetNumberOfCells(m_RankCtrl.m_Scorller) < 1)
            {
                m_RankCtrl.Refresh();
                for (int i = 0; i < 100; i++)
                for (int i = 0; i < 500; i++)
                {
                    if (i % 2 == 0)
                    {
@@ -102,21 +102,11 @@
                m_RankCtrl.m_Scorller.RefreshActiveCellViews();
                m_RankCtrl.JumpIndex(model.viewRankStartIndex);
            }
            var rank = 0;
            if (type == 151 || type == 152 || type == 153)
            {
                var data = rankModel.GetMyRank(type);
                if (data != null)
                {
                    rank = data.index + 1;
                }
            }
            else
            {
                if (!rankModel.TryGetMyRank(type, out rank))
                {
                    rank = -1;
                }
            var rank = -1;
            var data = rankModel.GetMyRank(type);
            if (data != null)
            {
                rank = data.index + 1;
            }
            if (rank == -1)
System/OpenServerActivity/ImpactRankModel.cs
@@ -56,9 +56,13 @@
            {
                if (!IsMissImpactRank(_type) && IsActivityClose(_type) && ContainsActivity(_type))
                {
                    C1001_tagCWatchBillboard _pak = new C1001_tagCWatchBillboard();
                    _pak.Type = (byte)GetRankType(_type);
                    GameNetSystem.Instance.SendInfo(_pak);
                    //C1001_tagCWatchBillboard _pak = new C1001_tagCWatchBillboard();
                    //_pak.Type = (byte)GetRankType(_type);
                    //GameNetSystem.Instance.SendInfo(_pak);
                    int rankType = (int)GetRankType(_type);
                    rankModel.ResetQueryParam();
                    rankModel.QueryRankByPage(rankType);
                    rankModel.QueryRankByPage(rankType, watchID: (int)PlayerDatas.Instance.baseData.PlayerID, forceQuery: true);
                }
            }
            UpdateRedpoint();
@@ -376,11 +380,9 @@
            {
                return false;
            }
            var _rank = 0;
            if (!rankModel.TryGetMyRank((int)GetRankType(_type), out _rank))
            {
                _rank = -1;
            }
            RankData rankObj = rankModel.GetMyRank((int)GetRankType(_type));
            var _rank = rankObj == null ? -1 : rankObj.index + 1;
            if (_rank == -1)
            {
                return false;
@@ -513,9 +515,12 @@
                {
                    return;
                }
                C1001_tagCWatchBillboard _pak = new C1001_tagCWatchBillboard();
                _pak.Type = (byte)m_PresentBillRankType;
                GameNetSystem.Instance.SendInfo(_pak);
                //C1001_tagCWatchBillboard _pak = new C1001_tagCWatchBillboard();
                //_pak.Type = (byte)m_PresentBillRankType;
                //GameNetSystem.Instance.SendInfo(_pak);
                rankModel.ResetQueryParam();
                rankModel.QueryRankByPage((int)m_PresentBillRankType);
                rankModel.QueryRankByPage((int)m_PresentBillRankType, watchID: (int)PlayerDatas.Instance.baseData.PlayerID, forceQuery: true);
            }
        }
@@ -624,11 +629,8 @@
                    var _cfg = GetRankAwardConfig(_type, i);
                    var _start = _cfg.RankA;
                    var _end = _cfg.RankB;
                    var _rank = 0;
                    if (!rankModel.TryGetMyRank((int)GetRankType(_type), out _rank))
                    {
                        _rank = -1;
                    }
                    RankData rankObj = rankModel.GetMyRank((int)GetRankType(_type));
                    var _rank = rankObj == null ? -1 : rankObj.index + 1;
                    if (_rank != -1 && _rank >= _start
                        && _rank <= _end && !_playerData.billAwardGet)
                    {
System/OpenServerActivity/ImpactRankWin.cs
@@ -225,11 +225,13 @@
            }
            else
            {
                var _rank = 0;
                if (!rankModel.TryGetMyRank((int)model.GetRankType(model.presentSelectType), out _rank))
                {
                    _rank = -1;
                }
                //var _rank = 0;
                //if (!rankModel.TryGetMyRank((int)model.GetRankType(model.presentSelectType), out _rank))
                //{
                //    _rank = -1;
                //}
                RankData rankObj = rankModel.GetMyRank((int)model.GetRankType(model.presentSelectType));
                var _rank = rankObj == null ? -1 : rankObj.index + 1;
                if (_rank == -1)
                {
                    m_RankTxt.text = Language.Get("FamilyMatchUnBeOnList");
@@ -368,14 +370,16 @@
                    _cell.objTop3.SetActive(true);
                    _cell.rankImg.SetSprite(_billRankCfg.RankA == 1 ? "Rank_First" : _billRankCfg.RankA == 2 ? "Rank_Second" : "Rank_Third");
                    var rankInfo = rankModel.GetRankPageDatas((int)model.presentBillRankType);
                    //top3 名字和 数值
                    RankData data = null;
                    List<RankData> rankDatas = null;
                    if (rankModel.TryGetRanks((int)model.presentBillRankType, out rankDatas))
                    if (rankInfo != null)
                    {
                        if (_billRankCfg.RankA <= rankDatas.Count)
                        if (rankInfo.ContainsKey(_billRankCfg.RankA - 1))
                        {
                            data = rankDatas[_billRankCfg.RankA-1];
                            data = rankInfo[_billRankCfg.RankA - 1];
                        }
                        if (data != null)
                        {
@@ -446,6 +450,7 @@
                return;
            }
            model.viewRankStartIndex = rank;
            rankModel.QueryRankByPage((int)model.presentBillRankType, rank);
            WindowCenter.Instance.Open<ImpactBillRankWin>();
        }
        private void OnRuleBtn()
System/WindowBase/Window.cs
@@ -101,6 +101,7 @@
            }
            catch (System.Exception ex)
            {
                OperationLogCollect.Instance.BugReportSys(ex.ToString());
                Debug.LogError(ex.StackTrace);
            }
@@ -150,6 +151,7 @@
            }
            catch (System.Exception ex)
            {
                OperationLogCollect.Instance.BugReportSys(ex.ToString());
                Debug.LogError(ex.StackTrace);
            }
            finally
@@ -173,6 +175,7 @@
            }
            catch (System.Exception ex)
            {
                OperationLogCollect.Instance.BugReportSys(ex.ToString());
                Debug.LogError(ex.StackTrace);
            }
@@ -200,6 +203,7 @@
            }
            catch (System.Exception ex)
            {
                OperationLogCollect.Instance.BugReportSys(ex.ToString());
                Debug.LogError(ex.StackTrace);
            }
@@ -224,6 +228,7 @@
            }
            catch (System.Exception ex)
            {
                OperationLogCollect.Instance.BugReportSys(ex.ToString());
                Debug.LogError(ex.StackTrace);
            }
@@ -302,6 +307,7 @@
                    }
                    catch (System.Exception ex)
                    {
                        OperationLogCollect.Instance.BugReportSys(ex.ToString());
                        Debug.LogError(ex.Message);
                    }
                    finally
@@ -320,6 +326,7 @@
                }
                catch (System.Exception ex)
                {
                    OperationLogCollect.Instance.BugReportSys(ex.ToString());
                    Debug.LogError(ex.StackTrace);
                }
                finally
@@ -343,6 +350,7 @@
                    }
                    catch (System.Exception ex)
                    {
                        OperationLogCollect.Instance.BugReportSys(ex.ToString());
                        Debug.LogError(ex.StackTrace);
                    }
                    finally
@@ -376,6 +384,7 @@
                    }
                    catch (System.Exception ex)
                    {
                        OperationLogCollect.Instance.BugReportSys(ex.ToString());
                        Debug.LogError(ex.StackTrace);
                    }
                }
@@ -388,6 +397,7 @@
                }
                catch (System.Exception ex)
                {
                    OperationLogCollect.Instance.BugReportSys(ex.ToString());
                    Debug.LogError(ex.StackTrace);
                }
                finally
@@ -421,6 +431,7 @@
                }
                catch (System.Exception ex)
                {
                    OperationLogCollect.Instance.BugReportSys(ex.ToString());
                    Debug.LogError(ex.StackTrace);
                }
            }
System/WindowBase/WindowCenter.cs
@@ -496,6 +496,9 @@
        internal void NotifyBeforeOpen<T>(T window) where T : Window
        {
            if (window is not MainInterfaceWin)
                CalcMainInterfaceWin();
            if (windowBeforeOpenEvent != null)
            {
                windowBeforeOpenEvent(window);
@@ -504,7 +507,6 @@
        internal void NotifyAfterOpen<T>(T window) where T : Window
        {
            CalcMainInterfaceWin();
            if (windowAfterOpenEvent != null)
            {
                windowAfterOpenEvent(window);
@@ -529,7 +531,8 @@
        internal void JumpNotifyAfterClose<T>(T window) where T : Window
        {
            CalcMainInterfaceWin();
            if (window is not MainInterfaceWin)
                CalcMainInterfaceWin();
            if (jumpWindowCloseEvent != null)
            {
                jumpWindowCloseEvent(window);