2511【前端】全民冲榜达成奖励达到条件可立即领取

client_linchunjie

2018-08-15 ee993833948406d868777dc03e91eb1a71cc36cd

2511【前端】全民冲榜达成奖励达到条件可立即领取

 System/OpenServerActivity/ImpactRankModel.cs

@@ -529,7 +529,8 @@
        {

            var _redpoint = m_Redpoints[_type];

            _redpoint.state = RedPointState.None;

            if (IsMissImpactRank(_type) || !IsActivityClose(_type))

            bool _locked = IsLock(_type);

            if (IsMissImpactRank(_type) || _locked)

            {

                return;

            }

@@ -558,7 +559,7 @@
                        }

                    }

                }

                else

                else if (IsActivityClose(_type))

                {

                    var _start = (_cfg as OSCBillRankAwardConfig).RankA;

                    var _end = (_cfg as OSCBillRankAwardConfig).RankB;


 System/OpenServerActivity/ImpactRankWin.cs

@@ -315,37 +315,44 @@
            _cell.unCompleteImg.gameObject.SetActive(false);

            _cell.hasGetImg.gameObject.SetActive(false);

            _cell.effect.gameObject.SetActive(false);

            if (model.IsMissImpactRank(model.presentSelectType))

            ImpactRankModel.OpenServerPlayerData _playerData;

            var _hasData = model.TryGetOpenServerPlayerData(model.presentSelectType, out _playerData);

            if (model.IsMissImpactRank(model.presentSelectType) || model.IsLock(model.presentSelectType))

            {

                _cell.unCompleteImg.gameObject.SetActive(true);

            }

            else if (model.IsActivityClose(model.presentSelectType))

            else if (_cfg is OSCBillTagAwardConfig)

            {

                ImpactRankModel.OpenServerPlayerData _playerData;

                var _hasData = model.TryGetOpenServerPlayerData(model.presentSelectType, out _playerData);

                if (!_hasData)

                {

                    _cell.unCompleteImg.gameObject.SetActive(true);

                }

                else

                {

                    if (_cfg is OSCBillTagAwardConfig)

                    var _index = model.GetBillIndex(model.presentSelectType, _cell.index);

                    if (_playerData.IsTagGet(model.GetTagIndex(model.presentSelectType, _index)))

                    {

                        var _index = model.GetBillIndex(model.presentSelectType, _cell.index);

                        if (_playerData.IsTagGet(model.GetTagIndex(model.presentSelectType, _index)))

                        {

                            _cell.hasGetImg.gameObject.SetActive(true);

                        }

                        else

                        {

                            var _complete = _playerData.value >= (_cfg as OSCBillTagAwardConfig).Condition;

                            _cell.unCompleteImg.gameObject.SetActive(!_complete);

                            _cell.getBtn.gameObject.SetActive(_complete);

                            _cell.effect.gameObject.SetActive(_complete);

                        }

                        _cell.hasGetImg.gameObject.SetActive(true);

                    }

                    else

                    {

                        var _complete = _playerData.value >= (_cfg as OSCBillTagAwardConfig).Condition;

                        _cell.unCompleteImg.gameObject.SetActive(!_complete);

                        _cell.getBtn.gameObject.SetActive(_complete);

                        _cell.effect.gameObject.SetActive(_complete);

                    }

                }

            }

            else if (model.IsActivityClose(model.presentSelectType))

            {

                if (!_hasData)

                {

                    _cell.unCompleteImg.gameObject.SetActive(true);

                }

                else

                {

                    if (_cfg is OSCBillRankAwardConfig)

                    {

                        var _start = (_cfg as OSCBillRankAwardConfig).RankA;

                        var _end = (_cfg as OSCBillRankAwardConfig).RankB;

                        var _rank = PlayerDatas.Instance.rank.GetSelfRank((int)model.GetRankType(model.presentSelectType));