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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Activity/ActivityNotifyBehaviour.cs

@@ -67,7 +67,7 @@
                }

            }

         

            var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>((int)m_NotifyType);

            var config = Config.Instance.Get<DailyQuestConfig>((int)m_NotifyType);

            if (config != null)

            {

                switch ((DailyQuestType)m_NotifyType)

@@ -140,7 +140,7 @@
        {

            m_NotifyWin = _notifyWin;

            m_NotifyType = type;

            DailyQuestConfig cfg = ConfigManager.Instance.GetTemplate<DailyQuestConfig>((int)type);

            DailyQuestConfig cfg = Config.Instance.Get<DailyQuestConfig>((int)type);

            confirmBtnText.text = Language.Get("Z1074");

            if (cfg != null)

            {