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

client_linchunjie

2018-08-18 f4f07847775c12b338d8bccedbbabc067dc1ae2c

 System/BlastFurnace/TreasureRefineSuccessWin.cs

@@ -45,13 +45,13 @@

        protected override void OnPreOpen()
        {
            _treasure = FurnaceModel.treasureData;
            if(_treasure != null)
            {
                _refineModel = TreasureRefineConfig.GetTreasureRefineModel(_treasure.id, _treasure.level);
                _tagTreasureModel = ConfigManager.Instance.GetTemplate<TreasureConfig>(_treasure.id);
                InitUI();
            }
            //_treasure = FurnaceModel.treasureData;

            //if(_treasure != null)

            //{

            //    _refineModel = TreasureRefineConfig.GetTreasureRefineModel(_treasure.id, _treasure.level);

            //    _tagTreasureModel = ConfigManager.Instance.GetTemplate<TreasureConfig>(_treasure.id);

            //    InitUI();

            //}

            
        }

@@ -75,32 +75,32 @@
        public void InitUI()
        {
         
            _addFightingText.text = Language.Get("BlastFurnace108",GetAddFighting());
            if(_tagTreasureModel != null)
            {
                _refineLvText.text = Language.Get("BlastFurnace109",_tagTreasureModel.Name,_treasure.level);
            }
            if(_refineModel != null)
            {
                if(_refineModel.OpenSkill != 0)
                {
                    _openSkillText.gameObject.SetActive(true);
                    tagChinSkill = ConfigManager.Instance.GetTemplate<SkillConfig>(_refineModel.OpenSkill);
                    if(tagChinSkill != null)
                    {
                        _openSkillText.text = Language.Get("BlastFurnace110",tagChinSkill.SkillName);
                    }
                }
                else
                {
                    _openSkillText.gameObject.SetActive(false);
                }
            }
            else
            {
                _openSkillText.gameObject.SetActive(false);
            }
            Invoke("CloseWin", 2);
            //_addFightingText.text = Language.Get("BlastFurnace108",GetAddFighting());

            //if(_tagTreasureModel != null)

            //{

            //    _refineLvText.text = Language.Get("BlastFurnace109",_tagTreasureModel.Name,_treasure.level);

            //}

            //if(_refineModel != null)

            //{

            //    if(_refineModel.OpenSkill != 0)

            //    {

            //        _openSkillText.gameObject.SetActive(true);

            //        tagChinSkill = ConfigManager.Instance.GetTemplate<SkillConfig>(_refineModel.OpenSkill);

            //        if(tagChinSkill != null)

            //        {

            //            _openSkillText.text = Language.Get("BlastFurnace110",tagChinSkill.SkillName);

            //        }

            //    }

            //    else

            //    {

            //        _openSkillText.gameObject.SetActive(false);

            //    }

            //}

            //else

            //{

            //    _openSkillText.gameObject.SetActive(false);

            //}

            //Invoke("CloseWin", 2);

        }

        private int[] attrIds;