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-05-08 19:13:44 +08:00
parent 6f03a96c51
commit 78e3c26a7a
51 changed files with 662 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/gachaHandler.ts
+7 -6
View File
@@ -1,6 +1,6 @@
import { Application, BackendSession } from "pinus";
import { resResult, getRandEelmWithWeight, shouldRefresh, getRandSingleEelm } from "../../../pubUtils/util";
import { STATUS, GACHA_ID, HERO_QUALITY_TYPE, TASK_TYPE, REFRESH_HOUR } from "../../../consts";
import { STATUS, GACHA_ID, HERO_QUALITY_TYPE, TASK_TYPE, REFRESH_TIME, TIME_OUTPUT_TYPE } from "../../../consts";
import { gameData } from "../../../pubUtils/data";
import { GachaListReturn, GachaResult, GachaData } from "../../../domain/activityField/gachaField";
import { UserGachaModel } from "../../../db/UserGacha";
@@ -9,7 +9,7 @@ import { RoleModel } from "../../../db/Role";
import { HeroModel } from "../../../db/Hero";
import { RewardInter } from "../../../pubUtils/interface";
import { handleCost, createHeroes, addItems } from "../../../services/rewardService";
import { getAfterDateByDay, getTodayZeroDate } from "../../../pubUtils/timeUtil";
import { getZeroPointD, getTimeFun } from "../../../pubUtils/timeUtil";
import { UserGachaRecModel } from "../../../db/UserGachaRec";
import { ActivityModel } from "../../../db/Activity";
import { checkTask } from "../../../services/taskService";
@@ -133,7 +133,8 @@ export class GachaHandler {
let resultRefFreeTime = 0;
if (dicGacha.free.count > 0) {
resultRefFreeTime = getAfterDateByDay(refFreeTime, dicGacha.free.day);
let f = getTimeFun(userGacha.refFreeTime);
resultRefFreeTime = <number>f.getAfterDayWithHour(dicGacha.free.day);
}
return resResult(STATUS.SUCCESS, {
gachaId, activityId,
@@ -290,7 +291,7 @@ export class GachaHandler {
const roleId: string = session.get('roleId');
let { visitedHero, refVisitedTime } = await UserGachaModel.findByRole(roleId, GACHA_ID.NORMAL, 0);
if (shouldRefresh(refVisitedTime, new Date(), REFRESH_HOUR)) {
if (shouldRefresh(refVisitedTime, new Date())) {
visitedHero = [];
}
@@ -317,9 +318,9 @@ export class GachaHandler {
let { pieceId } = dicHero;
let { visitedHero, refVisitedTime } = await UserGachaModel.findByRole(roleId, GACHA_ID.NORMAL, 0);
if (shouldRefresh(refVisitedTime, new Date(), REFRESH_HOUR)) {
if (shouldRefresh(refVisitedTime, new Date())) {
visitedHero = [];
refVisitedTime = getTodayZeroDate(REFRESH_HOUR);
refVisitedTime = getZeroPointD();
}
if (visitedHero.includes(hid)) {
return resResult(STATUS.GACHA_HAS_VISITED);
game-server/app/servers/battle/handler/comBattleHandler.ts
+4 -3
View File
@@ -22,7 +22,7 @@ import { addUserToChannel, getSimpleRoleInfo } from '../../../services/roleServi
import { ChannelUser } from '../../../domain/ChannelUser';
import { pushComBtlTeamMsg, pushFriendTeamInviteMsg, pushNormalItemMsg, pushTeamInviteMsg } from '../../../services/chatService';
import { EXTERIOR } from '../../../pubUtils/dicParam';
import { getTodayZeroDate } from '../../../pubUtils/timeUtil';
import { getZeroPointD, getTimeFunD } from '../../../pubUtils/timeUtil';
import { FriendParams } from '../../../domain/roleField/friend';
import { checkTask, checkTaskWithGoods } from '../../../services/taskService';
import { gameData, getWarByBlueprtId } from '../../../pubUtils/data';
@@ -595,7 +595,8 @@ export class ComBattleHandler {
*/
async getTeamRec(msg: {}, session: BackendSession) {
let roleId = session.get('roleId');
let teams = await ComBattleTeamModel.getTeamByRoleAndTime(roleId, null, new Date(new Date().setHours(0, 0, 0, 0) - 2 * 24 * 60 * 60 * 1000));
let timef = getTimeFunD();
let teams = await ComBattleTeamModel.getTeamByRoleAndTime(roleId, null, <Date>timef.getBeforeDayWithHour(2));
if (!teams) return resResult(STATUS.COM_BATTLE_NO_RECENT_REC);
return resResult(STATUS.SUCCESS, {teamInfos: teams});
@@ -707,7 +708,7 @@ export class ComBattleHandler {
async getRecentTeammates(msg: { }, session: BackendSession) {
let roleId = session.get('roleId');
const teams = await ComBattleTeamModel.getTeamByRoleAndTime(roleId, null, getTodayZeroDate());
const teams = await ComBattleTeamModel.getTeamByRoleAndTime(roleId, null, getZeroPointD());
let roleIdList = new Array<string>();
for(let { roleIds } of teams) {
for(let r of roleIds) {
game-server/app/servers/battle/handler/dungeonBattleHandler.ts
+2 -2
View File
@@ -19,7 +19,7 @@ export class DungeonBattleHandler {
let roleId = session.get('roleId');
let { dungeonCnt = 0, dungeonBuyCnt = 0, dungeonRefTime, dungeonHeroes=[] } = await RoleModel.findByRoleId(roleId);
let curTime = new Date();
if(shouldRefresh(dungeonRefTime, curTime, DUNGEON_CONST.REFRESH_TIME)) {
if(shouldRefresh(dungeonRefTime, curTime)) {
dungeonCnt = 0; dungeonBuyCnt = 0;
}
@@ -41,7 +41,7 @@ export class DungeonBattleHandler {
let { dungeonCnt = 0, dungeonBuyCnt = 0, dungeonRefTime } = await RoleModel.findByRoleId(roleId);
let curTime = new Date();
let needRefresh = shouldRefresh(dungeonRefTime, curTime, DUNGEON_CONST.REFRESH_TIME);
let needRefresh = shouldRefresh(dungeonRefTime, curTime);
if(needRefresh) {
dungeonCnt = 0; dungeonBuyCnt = 0;
}
game-server/app/servers/battle/handler/guildBossHandler.ts
+4 -5
View File
@@ -1,9 +1,9 @@
import { Application, BackendSession } from 'pinus';
import { resResult, genCode, getRandSingleEelm } from '../../../pubUtils/util';
import { STATUS, TASK_TYPE, AUCTION_SOURCE } from '../../../consts';
import { STATUS, TASK_TYPE } from '../../../consts';
import { BossInstanceModel } from '../../../db/BossInstance';
import { BattleRecordModel } from '../../../db/BattleRecord';
import { nowSeconds, getTodayZeroPoint } from '../../../pubUtils/timeUtil';
import { nowSeconds, getZeroPoint } from '../../../pubUtils/timeUtil';
import { getBossInstanceInfo, bossResult, checkBossBattleMemberExists, pushBossHpMessage, getBossInstanceWhenEnd, addBossInstance } from '../../../services/guildBossService';
import { findWhere } from 'underscore'
import { GUILD_STRUCTURE, GUILD_BOSS_STATUS, GUILD_POINT_WAYS } from '../../../consts/constModules/guildConst';
@@ -16,7 +16,6 @@ import { getBossByLv } from '../../../pubUtils/data';
import { lockData } from '../../../services/redLockService';
import { pushGuildBossSucMsg } from '../../../services/chatService';
import { checkTask } from '../../../services/taskService';
import { genAuction } from '../../../services/auctionService';
export default function (app: Application) {
return new GuildHandler(app);
@@ -75,7 +74,7 @@ export class GuildHandler {
if (!!res.err)
return resResult(STATUS.REDLOCK_ERR);
let bossInstance = await BossInstanceModel.findBossInstance(code);
if (!!bossInstance && ( bossInstance.bossHp > 0 || bossInstance.startTime >= getTodayZeroPoint() )) {
if (!!bossInstance && ( bossInstance.bossHp > 0 || bossInstance.startTime >= getZeroPoint() )) {
res.releaseCallback();
return resResult(STATUS.GUILD_SCRIPT_IS_OPENED_TODAY);
}
@@ -116,7 +115,7 @@ export class GuildHandler {
if (bossInstance.bossHp <= 0)
return resResult(STATUS.GUILD_SCRIPT_IS_COMPLETE);
let myRank = findWhere(bossInstance.ranks, {roleId});
if (!!myRank && myRank.time > getTodayZeroPoint())
if (!!myRank && myRank.time > getZeroPoint())
return resResult(STATUS.GUILD_SCRIPT_IS_BATTLED);
let { warId, ranks } = bossInstance;
const battleCode = genCode(8); // 关卡唯一值
game-server/app/servers/battle/handler/guildHandler.ts
+10 -11
View File
@@ -1,5 +1,5 @@
import { Application, BackendSession, pinus, ChannelService } from 'pinus';
import { resResult, getRandEelm, getRefTime, shouldRefresh, sortArrRandom } from '../../../pubUtils/util';
import { Application, BackendSession, ChannelService } from 'pinus';
import { resResult, getRandEelm, shouldRefresh, sortArrRandom } from '../../../pubUtils/util';
import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY, GUILD_SELECT, USER_GUILD_SELECT, TASK_TYPE } from '../../../consts';
import { UserGuildModel } from '../../../db/UserGuild';
import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, addActive, settleGuildWeekly } from '../../../services/guildService';
@@ -8,9 +8,9 @@ import { RoleModel, RoleType } from '../../../db/Role';
import { ARMY } from '../../../pubUtils/dicParam';
import { handleCost, addItems } from '../../../services/rewardService';
import { getGoldObject } from '../../../pubUtils/itemUtils';
import { nowSeconds, getBeforeDaySeconds, getSeconds } from '../../../pubUtils/timeUtil';
import { nowSeconds, getTimeFun } from '../../../pubUtils/timeUtil';
import { GuildListInfo } from '../../../domain/battleField/guild';
import { GuildRankParam, GuildLeader } from '../../../domain/rank';
import { GuildLeader } from '../../../domain/rank';
import { UserGuildApplyModel } from '../../../db/UserGuildApply';
import { hasStructureConsume, getStructureConsume, gameData } from '../../../pubUtils/data';
import { GuildRecModel } from '../../../db/GuildRec';
@@ -420,13 +420,13 @@ export class GuildHandler {
let guild = await GuildModel.findByCode(myGuild.guildCode, serverId, GUILD_SELECT.INVITED_MEMBER);
let invitedMembers = guild.invitedMembers;
if(shouldRefresh(guild.inviteTime, new Date(), 0)) {
if(shouldRefresh(guild.inviteTime, new Date())) {
invitedMembers = [];
}
// 离线时间，三天内在线且尚未加入军团。按以下规则排序 离线时间 玩家等级 玩家战力
const day = getBeforeDaySeconds(3);
const day = <number>getTimeFun().getBeforeDay(3);
const { quitGuildTime: quitTime = 0 } = await RoleModel.findByRoleId(roleId);
let allList = await RoleModel.getInviteList(day, serverId);
@@ -472,7 +472,7 @@ export class GuildHandler {
}
}
}
await GuildModel.recordInvitedMember(code, serverId, roleIds, shouldRefresh(guild.inviteTime, new Date(), 0));
await GuildModel.recordInvitedMember(code, serverId, roleIds, shouldRefresh(guild.inviteTime, new Date()));
this.channelService.pushMessageByUids('onGuildInvite', resResult(STATUS.SUCCESS, { code }), uids);
return resResult(STATUS.SUCCESS, { roleIds: result });
@@ -717,7 +717,7 @@ export class GuildHandler {
// 离线72小时
const { roleName: oldRoleName, quitTime } = await RoleModel.findByRoleId(leaderRoleId);
if (quitTime > getBeforeDaySeconds(3)) {
if (quitTime > <number>getTimeFun().getBeforeDay(3)) {
return resResult(STATUS.GUILD_LEADER_LOGIN);
}
// 上周周功勋最高的人
@@ -830,9 +830,8 @@ export class GuildHandler {
const checkResult = await checkAuth(GUILD_OPERATE.GET_REC, roleId, code);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let startTime = getRefTime(new Date(), 0, -3);
// console.log(startTime)
const list = await GuildRecModel.getGuildRec(code, getSeconds(startTime));
const list = await GuildRecModel.getGuildRec(code, <number>getTimeFun().getBeforeDayWithHour(3));
return resResult(STATUS.SUCCESS, { list });
}
@@ -987,7 +986,7 @@ export class GuildHandler {
const serverId = session.get('serverId');
const guild = await GuildModel.findByCode(code, serverId);
const leader = <RoleType>guild.leader;
let threeDaysBefore = getBeforeDaySeconds(3);
let threeDaysBefore = <number>getTimeFun().getBeforeDay(3);
await RoleModel.updateRoleInfo(leader.roleId, { quitTime: threeDaysBefore } );
return resResult(STATUS.SUCCESS, { code });
game-server/app/servers/battle/handler/guildTrainHandler.ts
+5 -4
View File
@@ -3,11 +3,11 @@ import { resResult, genCode, getRandSingleEelm } from '../../../pubUtils/util';
import { STATUS, TASK_TYPE } from '../../../consts';
import { GuildTrainModel } from '../../../db/GuildTrain';
import { BattleRecordModel } from '../../../db/BattleRecord';
import { nowSeconds, getHourPoint, getCurHourPoint } from '../../../pubUtils/timeUtil';
import { nowSeconds, getTimeFun, getZeroPoint } from '../../../pubUtils/timeUtil';
import { getUserGuild, getGuildTrainInfo, unlockTrain, getGuildTrainRewards } from '../../../services/guildTrainService';
import { findIndex, findWhere } from 'underscore'
import { lockData } from '../../../services/redLockService';
import { REFRESH_HOUR, GUILD_REPORT_NUM, GUILD_POINT_WAYS } from '../../../consts/constModules/guildConst';
import { GUILD_REPORT_NUM, GUILD_POINT_WAYS } from '../../../consts/constModules/guildConst';
import { UserGuildModel } from '../../../db/UserGuild';
import { GuildModel } from '../../../db/Guild';
import { getArmyTrainJuDian, getTrainSoloReward, getTrainBaseByLv } from '../../../pubUtils/data';
@@ -171,10 +171,11 @@ export class GuildTrainHandler {
return resResult(STATUS.WRONG_PARMS);
}
if (time < getCurHourPoint(REFRESH_HOUR) && nowSeconds() > getCurHourPoint(REFRESH_HOUR)) {
let todayRef = <number>getTimeFun().getTimeWithHour(); // 今天的5点
if (time < todayRef && nowSeconds() > todayRef) {
return resResult(STATUS.GUILD_TRAIN_IS_RESETED);//重置前进入战斗，重置后回调该接口
}
if (time > getHourPoint(REFRESH_HOUR)) {
if (time > getZeroPoint()) { // 刷新时间，如果是4点算前一天的5点
userGuild = await UserGuildModel.updateInfo(roleId, {}, { trainCount: -1 });//扣除一次挑战次数
}
await BattleRecordModel.updateBattleRecordByCode(battleCode, {
game-server/app/servers/battle/handler/towerBattleHandler.ts
+2 -2
View File
@@ -86,7 +86,7 @@ export class TowerBattleHandler {
let {timeReward, startTime, deltaTime} = result.data;
let {hangUpSpdUpCnt, lastSpdUpTime} = await RoleModel.findByRoleId(roleId);
let curTime = new Date();
if (!lastSpdUpTime || (shouldRefresh(lastSpdUpTime, curTime, HANG_UP_CONSTS.REFRESH_TIME, 1) && hangUpSpdUpCnt <= HANG_UP_CONSTS.MAX_SPD_UP_CNT)) {
if (!lastSpdUpTime || (shouldRefresh(lastSpdUpTime, curTime) && hangUpSpdUpCnt <= HANG_UP_CONSTS.MAX_SPD_UP_CNT)) {
hangUpSpdUpCnt = HANG_UP_CONSTS.MAX_SPD_UP_CNT;
}
let num = HANG_UP_CONSTS.MAX_SPD_UP_CNT - hangUpSpdUpCnt + 1;
@@ -167,7 +167,7 @@ export class TowerBattleHandler {
let { towerLv, towerTaskRefTime, towerTaskReCnt = 0 } = await RoleModel.findByRoleId(roleId);
let curTasks = await TowerTaskRecModel.getCurTasks(roleId); // 当前显示中的任务
const needRefresh = shouldRefresh(towerTaskRefTime, curTime, TOWER_TASK_CONST.REFRESH_TIME);
const needRefresh = shouldRefresh(towerTaskRefTime, curTime);
if(needRefresh) {
const batchCode = genCode(8);
game-server/app/servers/connector/handler/entryHandler.ts
+1 -1
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, getCurWeekTime } from '../../../pubUtils/timeUtil';
import { nowSeconds } from '../../../pubUtils/timeUtil';
import { rmRoleFromQueue, roleLeave, getRoleOnlineInfo, roleLogin } from '../../../services/redisService';
import { UserGuildModel } from '../../../db/UserGuild';
import { GuildModel } from '../../../db/Guild';
game-server/app/servers/guild/handler/cityActivityHandler.ts
+5 -4
View File
@@ -8,7 +8,7 @@ import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
import { leaveCityChannel, addRoleToCityChannel, getCityChannelSid } from "../../../services/chatService";
import { UserGuildModel } from "../../../db/UserGuild";
import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
import { nowSeconds, getBeforeSeconds, getNextHourPoint } from "../../../pubUtils/timeUtil";
import { nowSeconds, getTimeFun } from "../../../pubUtils/timeUtil";
import { getGoldObject } from "../../../pubUtils/itemUtils";
import { GUILDACTIVITY } from "../../../pubUtils/dicParam";
import { handleCost } from "../../../services/rewardService";
@@ -233,14 +233,15 @@ export class CityActivityHandler {
let pushResult = await UserGuildActivityRecModel.pushCityRecord(code, { round, hid, damage });
if (!pushResult) return resResult(STATUS.WRONG_PARMS);
let tomorrow = <number>getTimeFun().getAfterDayWithHour();
// 更新redis数据
let myR = new Rank(REDIS_KEY.USER_CITY_ACTIVITY, { serverId, guildCode });
let myScore = await myR.setRankWithRoleInfo(roleId, damage, Date.now(), null, true);
await myR.setExpire(getNextHourPoint(5));
await myR.setExpire(tomorrow);
let r = new Rank(REDIS_KEY.CITY_ACTIVITY, { serverId, cityId }, true);
let guildScore = await r.setRankWithGuildInfo(guildCode, damage, Date.now(), null, true);
await r.setExpire(getNextHourPoint(5));
await r.setExpire(tomorrow);
gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp, -1 * damage);
if (gateHp <= 0) {
@@ -278,7 +279,7 @@ export class CityActivityHandler {
if (!dicCity) return resResult(STATUS.DIC_DATA_NOT_FOUND);
// 更新userGuildActivityRecord
let challengeTime = getBeforeSeconds(-1 * GUILDACTIVITY.CITYACTIVITY_CHALLENGE_CD);
let challengeTime = <number>getTimeFun().getBeforeSeconds(-1 * GUILDACTIVITY.CITYACTIVITY_CHALLENGE_CD);
let myGuildActivityRec = await UserGuildActivityRecModel.updateInfo(code, { isSuccess, isCompleted: true, cityId, challengeTime });
if (!myGuildActivityRec) return resResult(STATUS.INTERNAL_ERR);
game-server/app/servers/guild/handler/gateActivityHandler.ts
+4 -3
View File
@@ -13,7 +13,7 @@ import { getGuildChannelSid } from "../../../services/chatService";
import { UserGuildModel } from "../../../db/UserGuild";
import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
import { Rank } from "../../../services/rankService";
import { getNextHourPoint } from "../../../pubUtils/timeUtil";
import { getTimeFun } from "../../../pubUtils/timeUtil";
import { checkTask } from "../../../services/taskService";
import { accomplishTask } from "../../../pubUtils/taskUtil";
@@ -139,14 +139,15 @@ export class GateActivityHandler {
let { score, newRecords, memberRecord: newMemberRecord } = scoreResult;
obj.setMemberRecord(code, newMemberRecord);
let tomorrow = <number>getTimeFun().getAfterDayWithHour();
// 更新redis数据
let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode }, false);
let myScore = await myR.setRankWithRoleInfo(roleId, score, Date.now(), null, true);
await myR.setExpire(getNextHourPoint(5));
await myR.setExpire(tomorrow);
let r = new Rank(REDIS_KEY.GATE_ACTIVITY, { serverId }, true);
let guildScore = await r.setRankWithGuildInfo(guildCode, score, Date.now(), null, true);
await r.setExpire(getNextHourPoint(5));
await r.setExpire(tomorrow);
// 更新数据库
let rec = await UserGuildActivityRecModel.pushRecord(code, newRecords, round);
game-server/app/servers/role/handler/friendHandler.ts
+8 -8
View File
@@ -1,8 +1,8 @@
import { Application, BackendSession, ChannelService } from "pinus";
import { resResult, getRandEelm, getResStr, shouldRefresh, getRefTime, sortArrRandom } from "../../../pubUtils/util";
import { resResult, getRandEelm, getResStr, shouldRefresh, sortArrRandom } from "../../../pubUtils/util";
import { STATUS, ROLE_SELECT, FRIEND_DROP_TYPE, FRIEND_RELATION_TYPE, POPULATE_TYPE, BLOCK_OPEATE, CONSUME_TYPE, ITID, HERO_SELECT, EQUIP_SELECT, REDIS_KEY, MSG_SOURCE, MSG_TYPE, TASK_TYPE } from "../../../consts";
import Role, { RoleModel, RoleType } from "../../../db/Role";
import { getBeforeHourSeconds } from "../../../pubUtils/timeUtil";
import { RoleModel, RoleType } from "../../../db/Role";
import { getTimeFun, getZeroPointD } from "../../../pubUtils/timeUtil";
import { FriendApplyModel } from "../../../db/FriendApply";
import { FriendApplyParams, FriendListParam, FriendRecommendParams, BlackListParam, FriendValueListParam } from "../../../domain/roleField/friend";
import { FriendShipModel, FriendShipType } from "../../../db/FriendShip";
@@ -40,13 +40,13 @@ export class FriendHandler {
public async getRecommend(msg: { }, session: BackendSession) {
let roleId: string = session.get('roleId');
const day = getBeforeHourSeconds(FRIEND.FRIEND_RECONMMEND_ACTIVETIME);
const day = <number>getTimeFun().getBeforeHour(FRIEND.FRIEND_RECONMMEND_ACTIVETIME);
const { lv, serverId: myServerId, userInfo: { serverType: myServerType } } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_MY_SERVER);
let allList = await RoleModel.getRecommedList(lv - FRIEND.FRIEND_RECONMMEND_LEVEL, lv + FRIEND.FRIEND_RECONMMEND_LEVEL, day);
// 筛掉自己今天申请过的人
let applyList = await FriendApplyModel.getSentApplyList(roleId, getRefTime(new Date(), 0));
let applyList = await FriendApplyModel.getSentApplyList(roleId, getZeroPointD());
allList = allList.filter(cur => {
return !applyList.find(ccur => ccur.roleId == cur.roleId);
});
@@ -294,7 +294,7 @@ export class FriendHandler {
if(!friendRole || !friendShip) continue;
let fs = <FriendShipType>friend.friendShip;
let ref = shouldRefresh(fs.refTime, new Date(), 0);
let ref = shouldRefresh(fs.refTime, new Date());
if(ref) {
friendShip = await FriendShipModel.refreshSendAndReceive(roleId, friendRole.roleId);
}
@@ -525,7 +525,7 @@ export class FriendHandler {
if(todaySendCnt + FRIEND.FRIEND_FRIENDPOINT_ADD > max) break;
let fs = <FriendShipType>relation.friendShip;
let ref = shouldRefresh(fs.refTime, new Date(), 0);
let ref = shouldRefresh(fs.refTime, new Date());
let sendHeartRec = await FriendShipModel.sendHeart(roleId, relation.roleId, 1, FRIEND.FRIEND_RECEIVE_SINGLE, ref);
if(!sendHeartRec) continue;
@@ -592,7 +592,7 @@ export class FriendHandler {
// 收取爱心
let fs = <FriendShipType>relation.friendShip;
let ref = shouldRefresh(fs.refTime, new Date(), 0);
let ref = shouldRefresh(fs.refTime, new Date());
let receiveHeartRec = await FriendShipModel.receiveHeart(roleId, relation.roleId, 1, relation.beSentHeart, ref);
if(!receiveHeartRec) continue;
game-server/app/servers/role/handler/taskHandler.ts
+5 -5
View File
@@ -1,11 +1,11 @@
import { Application, BackendSession, pinus } from "pinus";
import { resResult, parseGoodStr, getRandSingleEelm } from "../../../pubUtils/util";
import { STATUS, TASK_FUN_TYPE } from "../../../consts";
import { STATUS, TASK_FUN_TYPE, SHOP_REFRESH_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, nowSeconds } from "../../../pubUtils/timeUtil";
import { nowSeconds, getZeroPointD } from "../../../pubUtils/timeUtil";
import { DicDailyTask, DicAchievement, DicMainTask } from "../../../pubUtils/dictionary/DicTask";
import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask } from "../../../services/taskService";
import { TASK } from "../../../pubUtils/dicParam";
@@ -41,7 +41,7 @@ export class ShopHandler {
if(type == TASK_FUN_TYPE.DAILY) { // 增加积分
let userTask = await UserTaskModel.findByRole(roleId);
let dic = <DicDailyTask>dicTask;
let curWeek = getCurWeekDate(1, 5);
let curWeek = getZeroPointD(SHOP_REFRESH_TYPE.WEEKLY);
if(curWeek > userTask.dailyTaskRefWeekly) {
userTask = await UserTaskModel.resetDailyScore(roleId, dic.point, curWeek);
} else {
@@ -139,7 +139,7 @@ export class ShopHandler {
let point = 0, weeklyPoint = 0, box: number[] = [];
// 每日、成就增加积分
if(type == TASK_FUN_TYPE.DAILY) { // 增加积分
let curWeek = getCurWeekDate(1, 5);
let curWeek = getZeroPointD(SHOP_REFRESH_TYPE.WEEKLY);
let shouldRefresh = false;
let { dailyTaskPointWeekly, dailyTaskBox, dailyTaskRefWeekly } = userTask;
@@ -263,7 +263,7 @@ export class ShopHandler {
let point = 0, weeklyPoint = 0;
if(type == TASK_FUN_TYPE.DAILY) { // 增加积分
let userTask = await UserTaskModel.findByRole(roleId);
let curWeek = getCurWeekDate(1, 5);
let curWeek = getZeroPointD(SHOP_REFRESH_TYPE.WEEKLY);
if(curWeek > userTask.dailyTaskRefWeekly) {
userTask = await UserTaskModel.resetDailyScore(roleId, incPoint, curWeek);
} else {