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

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

@@ -222,7 +222,8 @@ namespace GFGGame
                 case ConstTaskType.UpgradeCardSkill:
                     return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.GetTargetCount());
                 case ConstTaskType.CollectParts:
-                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.GetTargetCount());
+                    string itemType = ItemTypeCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]).name;
+                    return string.Format(activeRewardCfg.desc, itemType, taskCfg.GetTargetCount());
                 default: return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount());
             }
         }