xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：添加军团活动任务

Browse Source
This commit is contained in:
qiaoxin
2021-06-09 20:59:56 +08:00
parent b70af1606b
commit f37a29d2b2
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
game-server/app/servers/activity/handler/popUpShopHandler.ts
View File

@@ -40,19 +40,19 @@ export class PopUpShopHandler {
/** /**
* @description 购买礼包 * @description 购买礼包
* @param {{ activityId: number, id: number, beginTime: Date}} msg * @param {{ activityId: number, id: number, beginTimeStamp: number}} msg
* @param {BackendSession} session * @param {BackendSession} session
* @memberof PopUpShopHandler * @memberof PopUpShopHandler
*/ */
async buyGift(msg: { activityId: number, id: number, beginTime: Date }, session: BackendSession) { async buyGift(msg: { activityId: number, id: number, beginTimeStamp: number }, session: BackendSession) {
const { activityId, id, beginTime } = msg; const { activityId, id, beginTimeStamp } = msg;
const roleId = session.get('roleId'); const roleId = session.get('roleId');
const serverId = session.get('serverId'); const serverId = session.get('serverId');
const sid = session.get('sid'); const sid = session.get('sid');
const roleName = session.get('roleName'); const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs'); const funcs: number[] = session.get('funcs');
let beginTime = moment(beginTimeStamp).toDate();
let beginDate = moment(beginTime).toDate();
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId); let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (!activityData) { if (!activityData) {
return resResult(STATUS.ACTIVITY_MISSING); return resResult(STATUS.ACTIVITY_MISSING);
@@ -74,7 +74,7 @@ export class PopUpShopHandler {
return resResult(STATUS.ACTIVITY_NEED_PAY); return resResult(STATUS.ACTIVITY_NEED_PAY);
} }
let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findDataByBeginTime(serverId, activityId, roleId, id, playerData.taskType, beginDate); let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.findDataByBeginTime(serverId, activityId, roleId, id, playerData.taskType, beginTime);
if (!playerRecords) { if (!playerRecords) {
return resResult(STATUS.ACTIVITY_POP_UP_SHOP_EXPIRE); return resResult(STATUS.ACTIVITY_POP_UP_SHOP_EXPIRE);
} }
@@ -98,7 +98,7 @@ export class PopUpShopHandler {
let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward); let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr) let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, id, playerData.taskType, 1, beginDate); await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, id, playerData.taskType, 1, beginTime);
playerData.buyCount += 1; playerData.buyCount += 1;
return resResult(STATUS.SUCCESS, Object.assign(result, { return resResult(STATUS.SUCCESS, Object.assign(result, {

2
game-server/app/services/popUpShopService.ts
View File

@@ -72,7 +72,7 @@ export async function makePopUpShopReward(roleId: string, roleName: string, sid:
return STATUS.ORDER_PARAM_ERROR; return STATUS.ORDER_PARAM_ERROR;
} }
let paramObj = JSON.parse(paramStr); let paramObj = JSON.parse(paramStr);
let beginTime = moment(paramObj.beginTime).toDate(); let beginTime = moment(paramObj.beginTimeStamp).toDate();
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId); let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (!activityData) { if (!activityData) {

13
shared/pubUtils/taskUtil.ts
View File

@@ -750,13 +750,13 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
let playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(serverId, activity.activityId, roleId, task.id, task.taskType, count, beginTime, endTime); let playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(serverId, activity.activityId, roleId, task.id, task.taskType, count, beginTime, endTime);
popShopData.setPlayerRecords(playerRecord) popShopData.setPlayerRecords(playerRecord)
pushMessage = pushMessage.concat(popShopData); pushMessage = pushMessage.concat(popShopData);
} else if (taskType == TASK_TYPE.EQUIP_QUALITY_COUNT || taskType == TASK_TYPE.GACHA_QUALITY_COUNT) {//每天统计 } else if (taskType == TASK_TYPE.EQUIP_QUALITY_COUNT || taskType == TASK_TYPE.GACHA_QUALITY_COUNT || taskType == TASK_TYPE.GUILD_ACTIVITY) {//每天统计
let recordDate = moment(new Date()).startOf('d').toDate() let recordDate = moment(new Date()).startOf('d').toDate()
let recordData: ActivityPopUpShopRecordModelType = await ActivityPopUpShopRecordModel.findRecordData(serverId, activity.activityId, roleId, task.id, task.taskType, recordDate) let recordData: ActivityPopUpShopRecordModelType = await ActivityPopUpShopRecordModel.findRecordData(serverId, activity.activityId, roleId, task.id, task.taskType, recordDate)
let { addCount } = isComplete(roleId, task.taskType, task.taskParam, count, parma, null); let { addCount } = isComplete(roleId, task.taskType, task.taskParam, count, parma, null);
let oldCount = (recordData && recordData.count) ? recordData.count : 0; let oldCount = (recordData && recordData.count) ? recordData.count : 0;
if (oldCount < task.condition && (oldCount + addCount >= task.condition)) {//完成当天任务 if (oldCount < task.condition && (oldCount + addCount >= task.condition)) {//完成当天任务
let playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(serverId, activity.activityId, roleId, task.id, task.taskType, addCount, beginTime, endTime); let playerRecord = await ActivityPopUpShopModel.addTaskPushMessage(serverId, activity.activityId, roleId, task.id, task.taskType, oldCount + addCount, beginTime, endTime);
popShopData.setPlayerRecords(playerRecord) popShopData.setPlayerRecords(playerRecord)
pushMessage = pushMessage.concat(popShopData); pushMessage = pushMessage.concat(popShopData);
} }
@@ -947,8 +947,13 @@ export function isComplete(roleId: string, taskType: TASK_TYPE, taskParam: strin
addCount = count; addCount = count;
break; break;
case TASK_TYPE.GUILD_ACTIVITY: case TASK_TYPE.GUILD_ACTIVITY:
addCount = count; {
break; let aid = paramObj.aid;
if (param[0] == 0 || aid == param[0]) {
addCount = count;
}
break;
}
case TASK_TYPE.EQUIP_SUM: case TASK_TYPE.EQUIP_SUM:
addCount = count; addCount = count;
break; break;