Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-12-03 3ad8237a1631be487f39ac3fdf6015acc9b0631f

 System/OpenServerActivity/ImpactRankModel.cs

@@ -73,7 +73,7 @@
        private void OnRefreshRank(int type)

        {

            if (type >= (int)PlayerRankData.RankType.OpenServerStrengthen

                && type <= (int)PlayerRankData.RankType.OpenServerRune)

                && type <= (int)PlayerRankData.RankType.OpenServerRecharge)

            {

                foreach (var _type in m_Redpoints.Keys)

                {

@@ -93,6 +93,7 @@
        public Dictionary<int, int[]> billRankPromotePathDict { get; private set; }

        public Dictionary<int, OSCbillBoardCondition> impactRankTypeOpenDict { get; private set; }

        public Dictionary<int, List<OSCBillTagAwardConfig>> billTagSortCfgDict { get; private set; }

        public List<int> impactRankSorts = new List<int>();

        public int openServerActivityDays { get; private set; }

        public int openServerRankDays { get; private set; }

        public int gotoImpactRankType { get; set; }

@@ -218,6 +219,7 @@
                }

                impactRankTypeOpenDict.Add(_type, _condition);

                m_Redpoints.Add(_type, new Redpoint(Redpoint_Key_ImpactRank, Redpoint_Key_ImpactRank * 100 + _type));

                impactRankSorts.Add(_type);

            }

        }



@@ -368,6 +370,10 @@
                    return PlayerRankData.RankType.OpenServerFightPower;

                case 7:

                    return PlayerRankData.RankType.OpenServerRune;

                case 8:

                    return PlayerRankData.RankType.OpenServerGodWeapon;

                case 9:

                    return PlayerRankData.RankType.OpenServerRecharge;

            }

            return PlayerRankData.RankType.OpenServerMount;

        }

@@ -613,28 +619,30 @@
        /// <returns></returns>

        public int GetDefaultSelectType()

        {

            if (gotoImpactRankType != 0 && billRankCfgDict.ContainsKey(gotoImpactRankType))

            if (gotoImpactRankType != 0 && impactRankSorts.Contains(gotoImpactRankType))

            {

                var _tyep = gotoImpactRankType;

                gotoImpactRankType = 0;

                return _tyep;

            }

            foreach (var _key in m_Redpoints.Keys)

            for (int i = 0; i < impactRankSorts.Count; i++)

            {

                if (m_Redpoints[_key].state == RedPointState.GetReward

                    || m_Redpoints[_key].state == RedPointState.Simple)

                var _type = impactRankSorts[i];

                if (m_Redpoints[_type].state == RedPointState.GetReward

                    || m_Redpoints[_type].state == RedPointState.Simple)

                {

                    return _key;

                    return _type;

                }

            }

            foreach (var _key in billRankCfgDict.Keys)

            for (int i = 0; i < impactRankSorts.Count; i++)

            {

                if (!IsActivityClose(_key) && !IsMissImpactRank(_key))

                var _type = impactRankSorts[i];

                if (!IsActivityClose(_type) && !IsMissImpactRank(_type))

                {

                    return _key;

                    return _type;

                }

            }

            return billRankCfgDict.Keys.First();

            return impactRankSorts[0];

        }



        public bool HasRedpoint()