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

任务：完成每日刷新

Browse Source
This commit is contained in:
luying
2021-04-20 17:52:50 +08:00
parent ced80d9b94
commit 017c0b6bb1
7 changed files with 171 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/connector/handler/entryHandler.ts
+2 -2
View File
@@ -12,7 +12,7 @@ import { getAp } from '../../../services/actionPointService';
import { ItemModel } from '../../../db/Item';
import { chackFunOpenWhenLogin } from '../../../services/funcSwitchService';
import { loginRefresh } from '../../../services/playerEventService';
import { nowSeconds } from '../../../pubUtils/timeUtil';
import { nowSeconds, getCurWeekTime } from '../../../pubUtils/timeUtil';
import { rmRoleFromQueue, roleLeave, getRoleOnlineInfo, roleLogin } from '../../../services/redisService';
import { UserGuildModel } from '../../../db/UserGuild';
import { GuildModel } from '../../../db/Guild';
@@ -153,7 +153,7 @@ export class EntryHandler {
}
}
// 任务
let { mainTask, dailyTask, achievement } = await getCurTask(role.roleId);
let { mainTask, dailyTask, achievement } = await getCurTask(role.roleId, session);
role['mainTask'] = mainTask;
role['dailyTask'] = dailyTask;
role['achievement'] = achievement;
game-server/app/servers/role/handler/taskHandler.ts
+20 -4
View File
@@ -1,15 +1,14 @@
import { Application, BackendSession } from "pinus";
import { Application, BackendSession, pinus } from "pinus";
import { resResult, parseGoodStr } from "../../../pubUtils/util";
import { STATUS, TASK_FUN_TYPE } from "../../../consts";
import { gameData } from "../../../pubUtils/data";
import { UserTaskRecModel } from "../../../db/UserTaskRec";
import { addItems } from "../../../services/rewardService";
import { UserTaskModel } from "../../../db/UserTask";
import { getCurWeekDate } from "../../../pubUtils/timeUtil";
import { getCurWeekDate, nowSeconds } from "../../../pubUtils/timeUtil";
import { DicDailyTask, DicAchievement } from "../../../pubUtils/dictionary/DicTask";
import { getMainTask } from "../../../services/taskService";
import { getMainTask, refDailyTaskBox, removeHistoryTask } from "../../../services/taskService";
import { TASK } from "../../../pubUtils/dicParam";
import { RewardInter } from "../../../pubUtils/interface";
export default function(app: Application) {
return new ShopHandler(app);
@@ -179,4 +178,21 @@ export class ShopHandler {
goods
});
}
async debugDailyTaskRef(msg: { }, session: BackendSession) {
let roleId = session.get('roleId');
let sid = session.get('sid');
let uids = [{uid: roleId, sid}];
// 转移每日任务
await removeHistoryTask(roleId, new Date(nowSeconds() * 1000 + 86400000));
pinus.app.get('channelService').pushMessageByUids('onDailyTaskRefresh', resResult(STATUS.SUCCESS, { taskList: [] }), uids);
}
async debugTaskBoxRef(msg: { }, session: BackendSession) {
let roleId = session.get('roleId');
let sid = session.get('sid');
await refDailyTaskBox(roleId, sid);
}
}
game-server/app/services/refreshService.ts
+28 -2
View File
@@ -1,9 +1,12 @@
import { FrontendOrBackendSession, pinus } from "pinus";
import { refreshMails } from '../services/mailService';
import { refreshMails } from './mailService';
import { STATUS } from '../consts/statusCode';
import { resResult } from '../pubUtils/util';
import { resResult, shouldRefresh, shouldRefreshWeek } from '../pubUtils/util';
import { nowSeconds } from "../pubUtils/timeUtil";
import { RoleModel } from '../db/Role';
import { refDailyTask, refDailyTaskBox } from './taskService'
import { REFRESH_HOUR } from "../consts";
/**
* 刷新
* @param session
@@ -22,4 +25,27 @@ export async function refresh(session: FrontendOrBackendSession) {
RoleModel.updatedRoleMailAt(roleId, nowTime);
await refreshMails(roleId, sid, serverId, updatedMailAt);
}
await refreshDaily(session);
}
/**
* 每日刷新
* @param session
*/
export async function refreshDaily(session: FrontendOrBackendSession) {
let refDaily: number = session.get('refDaily'); // 10位时间戳，每天每人更新一次
let refWeekly: number = session.get('refWeekly'); // 10位时间戳，每天每人更新一次
if(!refDaily || shouldRefresh(new Date(refDaily * 1000), new Date(), REFRESH_HOUR)) {
refDaily = nowSeconds();
session.set('refDaily', refDaily);
session.push('refDaily', () => {});
await refDailyTask(session.get('roleId'), session.get('sid'));
}
if(!refWeekly || shouldRefreshWeek(new Date(refWeekly * 1000), new Date(), 1, REFRESH_HOUR)) {
refWeekly = nowSeconds();
session.set('refWeekly', refWeekly);
session.push('refWeekly', () => {});
await refDailyTaskBox(session.get('roleId'), session.get('sid'));
}
}
game-server/app/services/taskService.ts
+59 -4
View File
@@ -1,7 +1,7 @@
import * as taskUtil from '../pubUtils/taskUtil';
import { RoleType } from '../db/Role';
import { pinus } from 'pinus';
import { resResult } from '../pubUtils/util';
import { pinus, FrontendOrBackendSession } from 'pinus';
import { resResult, shouldRefresh } from '../pubUtils/util';
import { STATUS, TASK_TYPE, TASK_FUN_TYPE } from '../consts';
import { TaskParam, TaskListReturn } from '../domain/roleField/task';
import { HeroType } from '../db/Hero';
@@ -11,8 +11,9 @@ import { HeroScores } from '../db/PvpHistoryOpp';
import { ItemInter } from '../pubUtils/interface';
import { UserTaskModel, UserTaskType } from '../db/UserTask';
import { UserTaskRecModel } from '../db/UserTaskRec';
import { UserTaskHistoryModel } from '../db/UserTaskHistory';
import { gameData } from '../pubUtils/data';
import { getCurWeekDate } from '../pubUtils/timeUtil';
import { getCurWeekDate, getSeconds } from '../pubUtils/timeUtil';
export async function checkTaskWithRoles(roleId: string, sid: string, funcs: number[], taskType: number, roles: RoleType[]) {
for(let role of roles) {
@@ -114,8 +115,25 @@ export async function checkTaskInPvpEnd(roleId: string, sid: string, funcs: numb
// 获取task状态
export async function getCurTask(roleId: string) {
export async function getCurTask(roleId: string, session: FrontendOrBackendSession) {
let userTask = await UserTaskModel.findByRole(roleId);
let { dailyTaskRefWeekly, dailyTaskRef } = userTask;
let curWeekStart = getCurWeekDate(1, 5);
if(dailyTaskRefWeekly < curWeekStart) { // 刷新周宝箱
dailyTaskRefWeekly = curWeekStart;
}
session.set('refWeekly', getSeconds(dailyTaskRefWeekly));
session.push('refWeekly', ()=> {});
if(shouldRefresh(dailyTaskRef, new Date(), 5)) {
dailyTaskRef = new Date();
userTask = await UserTaskModel.setRefDaily(roleId);
await removeHistoryTask(roleId);
}
session.set('refDaily', getSeconds(dailyTaskRef));
session.push('refDaily', ()=> {});
let mainTask = await getMainTask(roleId, userTask);
let dailyTask = await getDailyTask(roleId, userTask);
let achievement = await getAchievement(roleId, userTask);
@@ -146,6 +164,7 @@ export async function getDailyTask(roleId: string, userTask: UserTaskType) {
let { dailyTaskPoint: point, dailyTaskRefWeekly, dailyTaskPointWeekly: weeklyPoint, dailyTaskBox: box } = userTask;
let curWeekStart = getCurWeekDate(1, 5);
if(dailyTaskRefWeekly < curWeekStart) { // 刷新
dailyTaskRefWeekly = curWeekStart;
weeklyPoint = 0;
box = [];
}
@@ -178,4 +197,40 @@ export async function getAchievement(roleId: string, userTask: UserTaskType) {
}
}
return { point, taskList, box }
}
// 刷新每日任务
export async function refDailyTask(roleId: string, sid: string) {
let userTask = await UserTaskModel.findByRole(roleId);
let taskList = await getDailyTask(roleId, userTask);
// 转移每日任务
await removeHistoryTask(roleId);
let uids = [{uid: roleId, sid}];
pinus.app.get('channelService').pushMessageByUids('onDailyTaskRefresh', resResult(STATUS.SUCCESS, { taskList }), uids);
}
export async function removeHistoryTask(roleId: string, today?: Date) {
// 转移每日任务
let history = await UserTaskRecModel.getHistoryRec(roleId, today);
if(history.length > 0) {
await UserTaskHistoryModel.pushUserTask(roleId, history);
await UserTaskRecModel.deleteHistory(history);
}
}
// 刷新每日宝箱数量
export async function refDailyTaskBox(roleId: string, sid: string) {
let userTask = await UserTaskModel.refreshWeekly(roleId);
if(userTask) {
let { dailyTaskPoint: point, dailyTaskPointWeekly: weeklyPoint, dailyTaskBox: box } = userTask;
let uids = [{uid: roleId, sid}];
pinus.app.get('channelService').pushMessageByUids('onTaskBoxRefresh', resResult(STATUS.SUCCESS, {
type: TASK_FUN_TYPE.DAILY,
point, weeklyPoint, box
}), uids);
}
}