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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/OpenServerActivity/OpenServerRedEnvelopeWin.cs

@@ -209,7 +209,7 @@
                model.m_OSRedAchieves.Sort(model.CompareAchievement);

                for (int i = 0; i < model.m_OSRedAchieves.Count; i++)

                {

                    var _cfg = ConfigManager.Instance.GetTemplate<OSRedAchieveConfig>(model.m_OSRedAchieves[i]);

                    var _cfg = Config.Instance.Get<OSRedAchieveConfig>(model.m_OSRedAchieves[i]);

                    if (_cfg.func == 0 || FuncOpen.Instance.IsFuncOpen(_cfg.func))

                    {

                        m_RedAchieveControl.AddCell(ScrollerDataType.Header, i);