Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs

@@ -166,7 +166,7 @@ namespace GFGGame
                     return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), cfg.name);
                 case ConstTaskType.Suitsynthesis:
                     var suitCfg = SuitCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
-                    return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), suitCfg.name);
+                    return string.Format(activeRewardCfg.desc, suitCfg.name);
                 case ConstTaskType.UpgradeCardLvl:
                 case ConstTaskType.UpgradeCardStar:
                     return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);