Merge branch '法宝、法宝魂修改'

client_linchunjie

2018-08-18 f4f07847775c12b338d8bccedbbabc067dc1ae2c

 System/Treasure/FairyTreasureCollectPanelPattern4.cs

@@ -24,6 +24,8 @@
            }

        }



        TreasureSoulModel treasureSoulModel { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } }



        public override void Display(int _treasureId, bool _tween = false)

        {

            base.Display(_treasureId, _tween);

@@ -80,28 +82,24 @@


        private void OnSignRefresh()

        {

            if (treasure.treasureStages[0].unlockType == TreasureStageUnlock.Privilege)

            if(treasure.id== treasureSoulModel.signAddTreasure)

            {

                var _specialData = treasure.treasureStages[0].specialData;

                if (_specialData.type == TreasurePrivilege.Sign)

                var _property = treasureSoulModel.signAddProperty.First();

                var _propertyCfg = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_property.Key);

                m_SignPropertyEffect.text = Language.Get("FairyTreasure_5",

                    _property.Value, _propertyCfg.Name);

                m_SignInTotalDays.text = Language.Get("FairyTreasure_6", signInModel.SumSignNum);

                if (treasure.state != TreasureState.Collected)

                {

                    var _property = _specialData.propertyDict.First();

                    var _propertyCfg = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_property.Key);

                    m_SignPropertyEffect.text = Language.Get("FairyTreasure_5",

                        _property.Value, _propertyCfg.Name);

                    m_SignInTotalDays.text = Language.Get("FairyTreasure_6", signInModel.SumSignNum);

                    if (treasure.state != TreasureState.Collected)

                    {

                        m_ProerptyValue.text = Language.Get("FairyTreasure_7",

                            _propertyCfg.Name, signInModel.SumSignNum * _property.Value);

                        m_SignInTip.text = Language.Get("SignInTreasureTip1");

                    }

                    else

                    {

                        m_ProerptyValue.text = Language.Get("FairyTreasure_8",

                           _propertyCfg.Name, signInModel.SumSignNum * _property.Value);

                        m_SignInTip.text = Language.Get("SignInTreasureTip2");

                    }

                    m_ProerptyValue.text = Language.Get("FairyTreasure_7",

                        _propertyCfg.Name, signInModel.SumSignNum * _property.Value);

                    m_SignInTip.text = Language.Get("SignInTreasureTip1");

                }

                else

                {

                    m_ProerptyValue.text = Language.Get("FairyTreasure_8",

                       _propertyCfg.Name, signInModel.SumSignNum * _property.Value);

                    m_SignInTip.text = Language.Get("SignInTreasureTip2");

                }

            }

        }