活动：礼包添加批量参数

shared/consts/constModules/sysConst.ts

@@ -646,7 +646,7 @@ export enum TASK_TYPE {
     EQUIP_QUALITY_COUNT = 83,           // 获得*件品质的*装备
     HERO_WAKE_UP_COUNT = 84,            // *名武将觉醒
     GUILD_JOIN_ACTIVITY_END = 85,       // 参与*军团活动到结束
-    ACTIVITY_RMB = 86,                  // 某个活动累计充值*元
+    ACTIVITY_RMB = 86,                  // 累计充值*元
 }
 
 // 卡池类型

shared/consts/statusCode.ts

@@ -367,6 +367,7 @@ export const STATUS = {
     MONOPOLY_BANK: { code: 50030, simStr: '已经存过' },
     MONOPOLY_BANK_COUNT_ERROR: { code: 50031, simStr: '数量错误' },
     MONOPOLY_BANK_SAVE_MAX: { code: 50032, simStr: '超过最大限制数量' },
+    NOT_GIFTPACKAGE: { code: 50033, simStr: '非礼包类型' },
     // GM后台相关状态 60000 - 69999
     GM_ERR_PASSWORD: { code: 60001, simStr: '账号或密码错误' },
     GM_MISS_API: { code: 60002, simStr: '未找到该接口' },

shared/pubUtils/taskUtil.ts

@@ -1176,11 +1176,28 @@ export function isComplete(roleId: string, taskType: TASK_TYPE, taskParam: strin
             }
         case TASK_TYPE.ACTIVITY_RMB:
             {
-                if (paramObj.activityId == param[0]) {
+                addCount = count;
+                break;
+            }
+        case TASK_TYPE.BATTLE_EVENT:
+            {
+                if (param[0] == paramObj.eventType) {
                     addCount = count;
                 }
                 break;
             }
+        case TASK_TYPE.GUILD_DONATE:
+            {
+                addCount = count;
+                break;
+            }
+        case TASK_TYPE.CHAT:
+            {
+                if (param[0] == paramObj.chatType) {
+                    addCount = count;
+                    break;
+                }
+            }
         default:
             addCount = 0;
             break;

shared/resource/jsons/dic_zyz_taskType.json

@@ -767,8 +767,8 @@
     {
         "id": 86,
         "name": "充值RMB",
-        "info": "某个活动充值*元",
-        "param": "activityId&RMB",
+        "info": "累计充值*元",
+        "param": "RMB",
         "string": "累计充值金额",
         "content": 0,
         "condition": "RMB"