Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-09-26 9ee6fe853c33f10db9cd17312618d454609dc024

 System/Strengthening/GodBeastSlidingList.cs

@@ -334,19 +334,19 @@
            switch (Type)

            {

                case 0:

                    m_Label.text = "强化水晶";

                    m_Label.text = Language.Get("Crystal_SH");

                    break;

                case 2:

                    m_Label.text = "蓝色以下";

                    m_Label.text = Language.Get("BelowBlue_SH");

                    break;

                case 3:

                    m_Label.text = "紫色以下";

                    m_Label.text = Language.Get("BelowPurple_SH");

                    break;

                case 4:

                    m_Label.text = "橙色以下";

                    m_Label.text = Language.Get("BelowOrange_SH");

                    break;

                case 10:

                    m_Label.text = "全部";

                    m_Label.text = Language.Get("All_SH");

                    break;

                default:

                    break;