活动：任务完成关联活动积分点数

game-server/app/servers/role/handler/taskHandler.ts

@@ -10,6 +10,7 @@ import { DicDailyTask, DicAchievement, DicMainTask } from "../../../pubUtils/dic
 import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask } from "../../../services/taskService";
 import { TASK } from "../../../pubUtils/dicParam";
 import { newHeroGiftPoint } from "../../../services/activity/newHeroGiftsService";
+import { ActivityTaskPointModel } from "../../../db/ActivityTaskPoint";
 
 export default function (app: Application) {
     return new ShopHandler(app);
@@ -58,20 +59,19 @@ export class ShopHandler {
             }
             point = userTask.dailyTaskPoint;
             weeklyPoint = userTask.dailyTaskPointWeekly;
-            let addPointActivityId = 0;//点数关联的活动id
-            if (addPointActivityId) {
-                await newHeroGiftPoint(serverId, addPointActivityId, roleId, point);
-                let uids = [{ uid: roleId, sid }];
-                this.app.get('channelService').pushMessageByUids('addPoint', resResult(STATUS.SUCCESS, { activityId: addPointActivityId, addPoint: point }), uids);
-            }
         } else if (type == TASK_FUN_TYPE.ACHIEVEMENT) {
             let dic = <DicAchievement>dicTask;
             let userTask = await UserTaskModel.incInfo(roleId, { achievementPoint: dic.point });
             point = userTask.achievementPoint;
         }
 
-
-
+        //任务完成后关联活动的积分
+        let activityTaskPoint = await ActivityTaskPointModel.findData(type, id);
+        if (activityTaskPoint) {
+            await newHeroGiftPoint(serverId, activityTaskPoint.activityId, roleId, activityTaskPoint.point);
+            let uids = [{ uid: roleId, sid }];
+            this.app.get('channelService').pushMessageByUids('addPoint', resResult(STATUS.SUCCESS, { activityId: activityTaskPoint.activityId, addPoint: point }), uids);
+        }
 
         let goods = await addItems(roleId, roleName, sid, taskReward);