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

军团：补发活跃宝箱

Browse Source
This commit is contained in:
luying
2022-05-10 16:55:58 +08:00
parent 2695d7e9fb
commit 9658fd8059
9 changed files with 106 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
game-server/app/servers/guild/handler/guildHandler.ts
View File

@@ -2,12 +2,12 @@ import { Application, BackendSession, ChannelService, HandlerService, } from 'pi
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, DEBUG_MAGIC_WORD, CHANNEL_PREFIX, MSG_TYPE, MSG_SOURCE, ITEM_CHANGE_REASON, TA_EVENT, GUILD_DISMISS_WAY, GUILD_MASTER_CHANGE_WAY, GUILD_QUIT_WAY, PUSH_ROUTE } from '../../../consts';
import { UserGuildModel, UserGuildType } from '../../../db/UserGuild';
import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, refreshUserGuild, setUserGuildSession, getInvitationList, addGuildRecord, pushChangeGuildLeader, pushGuildMemberQuit, pushGuildDismiss, pushGuildInfoUpdate } from '../../../services/guildService';
import { checkAuth, joinGuild, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, refreshUserGuild, setUserGuildSession, getInvitationList, addGuildRecord, pushChangeGuildLeader, pushGuildMemberQuit, pushGuildDismiss, pushGuildInfoUpdate, getTodayGuildActive } from '../../../services/guildService';
import { GuildModel, GuildType, GuildUpdateParam } from '../../../db/Guild';
import { RoleModel, RoleType } from '../../../db/Role';
import { ARMY } from '../../../pubUtils/dicParam';
import { handleCost, addItems, getGoldObject } from '../../../services/role/rewardService';
import { nowSeconds, getTimeFun, getSeconds } from '../../../pubUtils/timeUtil';
import { nowSeconds, getTimeFun, getSeconds, getZeroPointD } from '../../../pubUtils/timeUtil';
import { GuildListInfo, GuildMemberParam } from '../../../domain/battleField/guild';
import { GuildLeader } from '../../../domain/rank';
import { UserGuildApplyModel } from '../../../db/UserGuildApply';
@@ -28,6 +28,7 @@ import * as dicParam from '../../../pubUtils/dicParam';
import { reportTAEvent } from '../../../services/sdkService';
import { changeGuildActivity, guildDismisActivity } from '../../../services/activity/guildPayService';
import { sendMessageToUserWithSuc } from '../../../services/pushService';
import { GuildActiveModel } from '../../../db/GuildActive';
export default function (app: Application) {
@@ -270,7 +271,7 @@ export class GuildHandler {
return resResult(STATUS.SUCCESS, { hasGuild: false })
};
let guild = await getGuildWithRefActive(userGuild.guildCode, serverId);
let guild = await GuildModel.findByCode(userGuild.guildCode, serverId);
if (!guild) {
return resResult(STATUS.GUILD_NOT_FOUND);
}
@@ -831,13 +832,11 @@ export class GuildHandler {
let userGuild = await refreshUserGuild(myUserGuild, roleId);
if (!userGuild) return resResult(STATUS.GUILD_NOT_FOUND);
const guild = await getGuildWithRefActive(code, serverId);
if (!guild) return resResult(STATUS.GUILD_NOT_FOUND);
let activeDayReward = gameData.guildActiveDayReward.get(id);
if (!activeDayReward) return resResult(STATUS.GUILD_ACTIVE_BOX_NOT_FOUND);
if (guild.activeDaily < activeDayReward.activeDayPoint) {
const guildActive = await getTodayGuildActive(code);
if (guildActive < activeDayReward.activeDayPoint) {
return resResult(STATUS.GUILD_ACTIVE_POINT_NOT_REACH);
}
@@ -882,10 +881,12 @@ export class GuildHandler {
const result = await addActive(roleId, serverId, id, null, active);
if (result.status == 0) return result.resResult;
const { guild, userGuild } = result;
let today = getZeroPointD();
let guildActive = await GuildActiveModel.addActive(code, today, active);
let { activeDaily, activeWeekly } = guild;
await pushGuildInfoUpdate(code, { activeDaily, activeWeekly });
return resResult(STATUS.SUCCESS, { activeDaily, activeWeekly, myInfo: userGuild });
let { activeWeekly } = guild;
await pushGuildInfoUpdate(code, { activeDaily: guildActive? guildActive.active: 0, activeWeekly });
return resResult(STATUS.SUCCESS, { activeDaily: guildActive? guildActive.active: 0, activeWeekly, myInfo: userGuild });
}
// debug接口： 调用定时任务