活动：添加新任务统计

game-server/app/services/rewardService.ts

@@ -1,4 +1,4 @@
-import { ITID, CONSUME_TYPE, getCurNameById, ITEM_TABLE, HERO_SYSTEM_TYPE, CURRENCY_BY_TYPE, FIGURE_UNLOCK_CONDITION, REDIS_KEY } from './../consts';
+import { ITID, CONSUME_TYPE, getCurNameById, ITEM_TABLE, HERO_SYSTEM_TYPE, CURRENCY_BY_TYPE, FIGURE_UNLOCK_CONDITION, REDIS_KEY, TASK_TYPE } from './../consts';
 import { EquipModel } from './../db/Equip';
 import { resResult } from '../pubUtils/util';
 import { RoleModel, RoleType } from '../db/Role';
@@ -14,7 +14,7 @@ import { uniq, indexOf, findIndex } from 'underscore';
 import { HeroModel, HeroType } from '../db/Hero';
 import { Figure } from '../domain/dbGeneral';
 import { Rank } from './rankService';
-import { pushTaskUpdate } from './taskService';
+import { checkActivityTask, pushTaskUpdate } from './taskService';
 import { CreateHeroParam } from '../domain/roleField/hero';
 
 export async function handleCost(roleId: string, sid: string, goods: Array<ItemInter>) {
@@ -64,7 +64,7 @@ export async function handleCost(roleId: string, sid: string, goods: Array<ItemI
 
 function sortConsumes(goods: Array<ItemInter>, bags: Array<ItemInter>, currencysMap: any, equips: Array<number>) {
     for (let good of goods) {
-        if(good.count == 0) continue;
+        if (good.count == 0) continue;
         let goodInfo = gameData.goods.get(good.id);
         let { type, table } = ITID.get(goodInfo.itid);
 
@@ -120,6 +120,12 @@ export async function addItems(roleId: string, roleName: string, sid: string, go
 
     pushTaskUpdate(roleId, sid, null, taskPushMessage);
 
+    //统计装备
+    if (equipInfos.length > 0) {
+        let { serverId } = await RoleModel.findByRoleId(roleId);
+        await checkActivityTask(serverId, sid, [], roleId, TASK_TYPE.EQUIP_QUALITY_COUNT, equipInfos.length, { equips: equipInfos })
+    }
+
     //货币推送
     if (!!Object.keys(currencysMap).length) {
         let role = await RoleModel.findByRoleId(roleId);
@@ -310,7 +316,7 @@ export async function createHeroes(roleId: string, roleName: string, sid: string
 
     let newHeroInfo: CreateHeroParam[] = [], pieces: ItemInter[] = [];
     for (let h of heroInfo) {
-        let heroCount = h.count||1;
+        let heroCount = h.count || 1;
         if (userHeroesMap.has(h.hid)) {
             let { pieceId, count } = transPiece(h.hid);
             pieces.push({ id: pieceId, count: count * heroCount });

game-server/app/services/signInService.ts

@@ -71,9 +71,16 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
    */
 export async function newPlayerSignInActivity(serverId: number, roleId: string) {
     let { createTime } = await RoleModel.findByRoleId(roleId);
-    let betinTime = moment(createTime * 1000).startOf('d').toDate();
-    let endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS - 1, 'd').endOf('d').toDate()
-    let curDate = new Date()
+    let betinTime = null;
+    let endTime = null
+    let curDate = moment(createTime * 1000);
+    if (curDate.hour() < REFRESH_TIME) {
+        betinTime = moment(createTime * 1000).startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').toDate();
+        endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS, 'd').toDate()
+    } else {
+        betinTime = moment(createTime * 1000).startOf('d').add(REFRESH_TIME, 'h').toDate();
+        endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS, 'd').toDate()
+    }
     if (curDate > endTime) {
         return null;
     }

game-server/app/services/thirtyDaysService.ts

@@ -6,6 +6,7 @@ import { RoleModel } from '../db/Role';
 import moment = require('moment');
 import { deltaDays } from '../pubUtils/util';
 import { ServerlistModel } from '../db/Serverlist';
+import { HeroModel } from '../db/Hero';
 
 /**
    * 获取活动数据
@@ -41,9 +42,15 @@ export async function getPlayerThirtyDaysData(activityId: number, serverId: numb
     let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
     let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
 
+
     let playerData = new ThirtyDaysData(activityData);
     playerData.setPlayerRecords(playerRecords);
     playerData.setPlayerPointRecords(playerPointRecords);
+
+    // let playerHeroes = await HeroModel.findByRole(roleId);
+    // let colorStarHeroes = playerHeroes.filter(obj => { return obj && obj.colorStar > 0 })
+    // playerData.setColorStarCount(colorStarHeroes.length);
+
     return playerData;
 }