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

client_linchunjie

2018-08-18 f4f07847775c12b338d8bccedbbabc067dc1ae2c

 System/Treasure/TreasureStageTipWin.cs

@@ -26,8 +26,6 @@
        [SerializeField] Image m_Icon;

        [SerializeField] Text m_StageName;

        [SerializeField] Text m_Description;

        [SerializeField] RectTransform m_ContainerSpecial;

        [SerializeField] List<Text> m_TreasurePrivileges;



        TreasureModel m_Model;

        TreasureModel model

@@ -98,7 +96,6 @@


            m_ContainerSkill.gameObject.SetActive(false);

            m_ContainerFuncSoul.gameObject.SetActive(false);

            m_ContainerSpecial.gameObject.SetActive(false);



            switch (m_TreasureStage.unlockType)

            {

@@ -131,44 +128,12 @@
                        m_Description.text = string.Empty;

                    }

                    break;

                case TreasureStageUnlock.Privilege:

                case TreasureStageUnlock.Treasure:

                    m_ContainerFuncSoul.gameObject.SetActive(true);

                    m_ContainerSpecial.gameObject.SetActive(true);

                    var privilegeConfig = ConfigManager.Instance.GetTemplate<TreasurePrivilegeConfig>(m_TreasureStage.privilege);

                    m_Icon.SetSprite(privilegeConfig.Icon);

                    m_StageName.text = privilegeConfig.Name;

                    m_Description.text = UIHelper.ReplaceNewLine(privilegeConfig.Description);

                    DisplayTreasureSpecial();

                    break;

            }

        }



        void DisplayTreasureSpecial()

        {

            m_TreasurePrivileges[0].gameObject.SetActive(false);

            m_TreasurePrivileges[1].gameObject.SetActive(false);

            switch (m_Treasure.specialData.type)

            {

                case TreasurePrivilege.Sign:

                case TreasurePrivilege.Property:

                    break;

                case TreasurePrivilege.DemonJarAtk:

                    break;

                case TreasurePrivilege.StrengthenAdd:

                    break;

                case TreasurePrivilege.Suit:

                case TreasurePrivilege.RuneBreakExpAdd:

                case TreasurePrivilege.Boss:

                    m_TreasurePrivileges[0].gameObject.SetActive(false);

                    m_TreasurePrivileges[1].gameObject.SetActive(false);

                    break;

                case TreasurePrivilege.MountAtk:

                    break;

                case TreasurePrivilege.PetHp:

                    break;

                case TreasurePrivilege.Wing:

                    break;

                case TreasurePrivilege.Wash:

                    var treasureConfig = ConfigManager.Instance.GetTemplate<TreasureConfig>(m_TreasureStage.treasure);

                    m_Icon.SetSprite(treasureConfig.Icon);

                    m_StageName.text = treasureConfig.Name;

                    m_Description.text = UIHelper.ReplaceNewLine(treasureConfig.Verse.Length > 0 ? treasureConfig.Verse[0] : string.Empty);

                    break;

            }

        }