Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/FriendSystem/New/AddCell.cs

@@ -44,7 +44,7 @@
                lvIcon.SetActive(false);
                lvText.text = friendPlayer.LV.ToString();
            }
            RealmConfig realmModel = ConfigManager.Instance.GetTemplate<RealmConfig>(friendPlayer.RealmLV);
            RealmConfig realmModel = Config.Instance.Get<RealmConfig>(friendPlayer.RealmLV);
            if (friendPlayer.RealmLV != 0)
            {
                realmIcon.gameObject.SetActive(true);