少年修仙传客户端代码仓库
Client_PangDeRong
2018-08-15 f62d6b65881f778ba0bc55abf663f6de145ab105
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
47 ■■■■■ 已修改文件
System/OpenServerActivity/OpenServerActivityWin.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureSoulWin.cs 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServerActivityWin.cs
@@ -64,9 +64,10 @@
        protected override void OnActived()
        {
            if (functionOrder == 1)
            if (alreadyOpenActivitys.Count == 0)
            {
                functionOrder = 0;
                CloseImmediately();
                return;
            }
            if (functionOrder == 0 && !WindowJumpMgr.Instance.IsJumpState)
            {
@@ -79,6 +80,10 @@
            }
            else
            {
                if (!alreadyOpenActivitys.Contains(functionOrder))
                {
                    functionOrder = GetDefaultSelect();
                }
                for (int i = 0; i < m_SortArray.Count; i++)
                {
                    m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder;
System/Treasure/TreasureSoulWin.cs
@@ -403,25 +403,25 @@
        int Compare(int x, int y)
        {
            Treasure treasure_x;
            Treasure treasure_y;
            if (model.TryGetTreasure(x, out treasure_x) && model.TryGetTreasure(y, out treasure_y))
            {
                var stage_x = treasure_x.treasureStages[treasure_x.StageCount - 1];
                var stage_y = treasure_y.treasureStages[treasure_y.StageCount - 1];
                bool awaking_x = PlayerDatas.Instance.baseData.LV >= stage_x.limitLevel && !treasure_x.IsMaxStage();
                bool awaking_y = PlayerDatas.Instance.baseData.LV >= stage_y.limitLevel && !treasure_y.IsMaxStage();
                if (awaking_x != awaking_y)
                {
                    return -awaking_x.CompareTo(awaking_y);
                }
                bool awoke_x = treasure_x.IsMaxStage();
                bool awoke_y = treasure_y.IsMaxStage();
                if (awoke_x != awoke_y)
                {
                    return -awoke_x.CompareTo(awoke_y);
                }
            }
            //Treasure treasure_x;
            //Treasure treasure_y;
            //if (model.TryGetTreasure(x, out treasure_x) && model.TryGetTreasure(y, out treasure_y))
            //{
            //    var stage_x = treasure_x.treasureStages[treasure_x.StageCount - 1];
            //    var stage_y = treasure_y.treasureStages[treasure_y.StageCount - 1];
            //    bool awaking_x = PlayerDatas.Instance.baseData.LV >= stage_x.limitLevel && !treasure_x.IsMaxStage();
            //    bool awaking_y = PlayerDatas.Instance.baseData.LV >= stage_y.limitLevel && !treasure_y.IsMaxStage();
            //    if (awaking_x != awaking_y)
            //    {
            //        return -awaking_x.CompareTo(awaking_y);
            //    }
            //    bool awoke_x = treasure_x.IsMaxStage();
            //    bool awoke_y = treasure_y.IsMaxStage();
            //    if (awoke_x != awoke_y)
            //    {
            //        return -awoke_x.CompareTo(awoke_y);
            //    }
            //}
            return x.CompareTo(y);
        }