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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/InformationTipsWin.cs

@@ -102,7 +102,7 @@
        void  DoubleToReceive()//是否能够领取双倍奖励
        {
          
            string _requireNumberStr = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TaskExpend").Numerical1;
            string _requireNumberStr = Config.Instance.Get<FuncConfigConfig>("TaskExpend").Numerical1;
            int _requireNumber = int.Parse(_requireNumberStr);
            _Text_Extend.text = string.Format(Language.Get("Z1070"), _requireNumberStr);