活动：添加新任务统计

game-server/app/servers/order/handler/orderHandler.ts

@@ -1,6 +1,6 @@
 import { Application, BackendSession } from 'pinus';
 import { genCode, resResult } from '../../../pubUtils/util';
-import { ACTIVITY_TYPE, DEBUG_MAGIC_WORD, ORDER_STATE, PAY_TYPE, STATUS } from '../../../consts';
+import { ACTIVITY_TYPE, DEBUG_MAGIC_WORD, ORDER_STATE, PAY_TYPE, STATUS, TASK_TYPE } from '../../../consts';
 import { dicRMB } from '../../../pubUtils/dictionary/DicRMB';
 import { UserOrderModel } from '../../../db/UserOrder';
 import _ = require('underscore');
@@ -11,6 +11,7 @@ import { addRechargeMoney } from '../../../services/rechargeMoneyService';
 import { ActivityModel, ActivityModelType } from '../../../db/Activity';
 import { ServerlistModel } from '../../../db/Serverlist';
 import { addVipRechargeMoney } from '../../../services/vipRechargeMoneyService';
+import { checkActivityTask } from '../../../services/taskService';
 
 export default function (app: Application) {
     return new orderHandler(app);
@@ -190,7 +191,11 @@ export class orderHandler {
             }), [{ uid: roleId, sid: sid }]);
             //活动统计
             await addRechargeMoney(roleId, serverId, price);
-            await addVipRechargeMoney(roleId, serverId, price)
+            await addVipRechargeMoney(roleId, serverId, price);
+            //成长任务
+            await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.ACTIVITY_RMB, price)
+
+
             console.log('结算完成', localOrderID)
             return resResult(STATUS.SUCCESS, result.data);
         }
@@ -262,6 +267,8 @@ export class orderHandler {
             //活动统计
             await addRechargeMoney(roleId, serverId, price);
             await addVipRechargeMoney(roleId, serverId, price);
+            //成长任务
+            await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.ACTIVITY_RMB, price)
             console.log(`测试支付完成!!!!!!!!!!!!!  serverId:${serverId}, productID:${productID}, productType:${productType}, roleId:${roleId}, localOrderID:${localOrderID}, payType:${payType}`)
             return resResult(STATUS.SUCCESS, result.data);
         }

shared/consts/constModules/sysConst.ts

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

shared/domain/activityField/refreshTaskField.ts

@@ -14,6 +14,7 @@ export class RefreshTaskItem {
     taskParam: string;      //任务数据 dic_zyz_taskType.json
     condition: number;      //任务数据条件 dic_zyz_taskType.jsonT
     reward: string;         // 任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品
+    skip: number;      //跳转客户端用
 
     totalCount: number = 0; //完成任务累计次数
     receiveRewardCount: number = 0;          //领取奖励次数
@@ -26,6 +27,7 @@ export class RefreshTaskItem {
         this.taskParam = data.taskParam;
         this.condition = data.condition;
         this.reward = data.reward;
+        this.skip = data.skip;
         this.totalCount = 0;
         this.receiveRewardCount = 0;
     }

shared/pubUtils/taskUtil.ts

@@ -1174,6 +1174,11 @@ export function isComplete(roleId: string, taskType: TASK_TYPE, taskParam: strin
                 addCount = count;
                 break;
             }
+        case TASK_TYPE.ACTIVITY_RMB:
+            {
+                addCount = count;
+                break;
+            }
         default:
             addCount = 0;
             break;

shared/resource/jsons/dic_zyz_taskType.json

@@ -763,5 +763,14 @@
         "string": "武将数量",
         "content": "aid-1.蛮夷 2.诸侯 3.粮草，aid=0就是任意军团活动类型",
         "condition": "herocount"
+    },
+    {
+        "id": 86,
+        "name": "充值RMB",
+        "info": "某个活动充值*元",
+        "param": "activityId&RMB",
+        "string": "累计充值金额",
+        "content": 0,
+        "condition": "RMB"
     }
 ]