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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -262,7 +262,7 @@


        private void OnNewBieGuideBegin()

        {

            var guideConfig = ConfigManager.Instance.GetTemplate<GuideConfig>(NewBieCenter.Instance.currentGuide);

            var guideConfig = Config.Instance.Get<GuideConfig>(NewBieCenter.Instance.currentGuide);

            switch ((GuideTriggerType)guideConfig.TriggerType)

            {

                case GuideTriggerType.EquipQuality: