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

Merge branch 'master' into feature/backend

Browse Source 
# Conflicts:
#	game-server/app/servers/connector/handler/entryHandler.ts
#	game-server/app/servers/role/handler/itemHandler.ts
#	shared/consts/constModules/sysConst.ts
#	shared/pubUtils/util.ts
#	web-server/app.ts
#	web-server/app/service/Auth.ts
This commit is contained in:
luying
2021-12-14 18:08:44 +08:00
parent fbd19a5c4c dd7cf449d6
commit d4722c4099
98 changed files with 10245 additions and 4858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
import { Application, BackendSession, ChannelService, HandlerService, } 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, DEBUG_MAGIC_WORD, CHANNEL_PREFIX, MSG_TYPE, MSG_SOURCE } from '../../../consts';
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 } from '../../../consts';
import { UserGuildModel, UserGuildType } from '../../../db/UserGuild';
import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, refreshUserGuild, setUserGuildSession } from '../../../services/guildService';
import { GuildModel, GuildType, GuildUpdateParam } from '../../../db/Guild';
@@ -26,6 +26,7 @@ import { Rank } from '../../../services/rankService';
import { checkTask } from '../../../services/taskService';
import { guildInter } from '../../../pubUtils/interface';
import * as dicParam from '../../../pubUtils/dicParam';
import { reportTAEvent } from '../../../services/sdkService';
export default function (app: Application) {
@@ -63,7 +64,7 @@ export class GuildHandler {
return resResult(STATUS.GUILD_PAY_CONDITION);
}
await handleCost(roleId, sid, [getGoldObject(ARMY.ARMY_CREAT_COST)]);
await handleCost(roleId, sid, [getGoldObject(ARMY.ARMY_CREAT_COST)], ITEM_CHANGE_REASON.CREATE_GUILD);
// 创建公会
const guild = await GuildModel.createGuild({ guildCode, name, icon, notice }, role, serverId);
@@ -181,6 +182,7 @@ export class GuildHandler {
const sid = session.get('sid');
const roleName = session.get('roleName');
const serverId = session.get('serverId');
const ip = session.get('ip');
const { roleId: memberRoleId, auth, myUserGuild, hisUserGuild } = msg;
const { guildCode: code } = myUserGuild;
@@ -240,6 +242,8 @@ export class GuildHandler {
this.app.rpc.chat.guildRemote.changeLeader.toServer(chatSid, code, guild.managerCnt, role, roleId);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
await sendMailByContent(MAIL_TYPE.GUILD_BE_SET_LEADER, memberRoleId, { sendName: roleName, params: [guild.name] });
reportTAEvent(roleId, TA_EVENT.GUILD_MASTER_CHANGE, { way: GUILD_MASTER_CHANGE_WAY, change_id_after: memberRoleId }, ip);
} else {
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, { managerCnt: guild.managerCnt });
await sendMailByContent(MAIL_TYPE.GUILD_BE_SET_MEMBER, memberRoleId, { sendName: roleName, params: [guild.name] });
@@ -548,6 +552,8 @@ export class GuildHandler {
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleId = session.get('roleId');
const ip = session.get('ip');
const { code } = msg;
const guild = await GuildModel.dismiss(code, serverId);
@@ -569,6 +575,7 @@ export class GuildHandler {
await r.removeFromRank({ guildCode: code });
let r2 = new Rank(REDIS_KEY.GUILD_LV_RANK, { serverId });
await r2.removeFromRank({ guildCode: code });
reportTAEvent(roleId, TA_EVENT.GUILD_DISMISS, { name: guild.name, way: GUILD_DISMISS_WAY.GAME }, ip);
return resResult(STATUS.SUCCESS, { code, status: guild.status });
}
@@ -580,6 +587,7 @@ export class GuildHandler {
const roleName = session.get('roleName');
const serverId = session.get('serverId');
const sid = session.get('sid');
const ip = session.get('ip');
const { code } = msg;
const userGuild = await UserGuildModel.quit(code, roleId);
@@ -602,6 +610,7 @@ export class GuildHandler {
this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid, code, roleId, guild, sid);
setUserGuildSession(session, null);
reportTAEvent(roleId, TA_EVENT.GUILD_QUIT, { name: guild.name }, ip);
return resResult(STATUS.SUCCESS, { hasGuild: role.hasGuild });
}
@@ -639,6 +648,7 @@ export class GuildHandler {
await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.toServer(sid,[{ roleId: memberRoleId, userGuild }]);
await sendMailByContent(MAIL_TYPE.GUILD_BE_KICK, memberRoleId, { sendName: roleName, params: [guild.name] });
reportTAEvent(memberRoleId, TA_EVENT.GUILD_QUIT, { name: guild.name });
return resResult(STATUS.SUCCESS, { memberCnt: guild.memberCnt });
}
@@ -650,6 +660,7 @@ export class GuildHandler {
const roleName = session.get('roleName');
const sid = session.get('sid');
const serverId = session.get('serverId');
const ip = session.get('ip');
const { code, roleId: leaderRoleId } = msg;
// 离线72小时
@@ -678,7 +689,7 @@ export class GuildHandler {
if (ARMY.ARMY_IMPEACH_COST > role.gold) {
return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
}
await handleCost(roleId, sid, [getGoldObject(ARMY.ARMY_IMPEACH_COST)]);
await handleCost(roleId, sid, [getGoldObject(ARMY.ARMY_IMPEACH_COST)], ITEM_CHANGE_REASON.GUILD_IMPEACH);
const topUser = <RoleType>topUserGuild.role;
// 交换
@@ -703,6 +714,7 @@ export class GuildHandler {
await sendMailByContent(MAIL_TYPE.GUILD_BE_SET_LEADER, topUser.roleId, { sendName: roleName, params: [guild.name] });
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{ field: 'leader', value: new GuildLeader(topUser) }]);
reportTAEvent(roleId, TA_EVENT.GUILD_MASTER_CHANGE, { way: GUILD_MASTER_CHANGE_WAY.IMPEACH, change_id_after: topUser.roleId }, ip)
let isOnline = await isRoleOnline(topUser.roleId);
const leader = { ...topUser, ce: topUser.ce, isOnline }
@@ -849,7 +861,7 @@ export class GuildHandler {
}
userGuild.receivedActive.push(id);
let goods = await addItems(roleId, roleName, sid, activeDayReward.reward);
let goods = await addItems(roleId, roleName, sid, activeDayReward.reward, ITEM_CHANGE_REASON.GUILD_ACTIVE_REWARD);
userGuild = await UserGuildModel.updateInfo(roleId, { receivedActive: userGuild.receivedActive }, {}, 'receivedActive');
// 任务