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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/FriendSystem/New/AddFriendTips.cs

@@ -172,7 +172,7 @@
        }


        RealmConfig realmModel = ConfigManager.Instance.GetTemplate<RealmConfig>(data.RealmLV);
        RealmConfig realmModel = Config.Instance.Get<RealmConfig>(data.RealmLV);
        if (data.RealmLV != 0)
        {
            titleIcon.gameObject.SetActive(true);