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

军团活动：修改debug接口

Browse Source
This commit is contained in:
luying
2021-10-13 17:58:41 +08:00
parent c2585609c6
commit e088c86a67
7 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
game-server/app/servers/connector/filter/global.ts
View File

@@ -31,12 +31,14 @@ Filter.prototype.before = async function (routeRecord: RouteRecord, msg: any, se
}
let hasBlockWords = false;
if(routeRecord.route == 'guild.guildHandler.createGuild') {
hasBlockWords = await checkFilterWords(msg.name);
} else if (routeRecord.route == 'role.roleHandler.initRole') {
hasBlockWords = await checkFilterWords(msg.roleName);
} else if (routeRecord.route == 'role.roleHandler.rename') {
hasBlockWords = await checkFilterWords(msg.roleName);
if(pinus.app.get('env') == 'production') {
if(routeRecord.route == 'guild.guildHandler.createGuild') {
hasBlockWords = await checkFilterWords(msg.name);
} else if (routeRecord.route == 'role.roleHandler.initRole') {
hasBlockWords = await checkFilterWords(msg.roleName);
} else if (routeRecord.route == 'role.roleHandler.rename') {
hasBlockWords = await checkFilterWords(msg.roleName);
}
}
if(hasBlockWords) return next(new Error(), resResult(STATUS.BLOCK_WORDS));

1
game-server/app/servers/guild/handler/gateActivityHandler.ts
View File

@@ -318,6 +318,7 @@ export class GateActivityHandler {
for (let server of guildServers) {
pinus.app.rpc.guild.guildActivityRemote.updateGuildActivityData.toServer(server.id, aid, true);
}
await GuildActivityRecordModel.updateTodayInfo({ status: 2 });
return resResult(STATUS.SUCCESS);
}

10
game-server/app/servers/guild/handler/raceActivityHandler.ts
View File

@@ -106,9 +106,9 @@ export class RaceActivityHandler {
let statusResult = getGuildActivityStatus(this.aid);
if (!statusResult) return resResult(STATUS.DIC_DATA_NOT_FOUND);
if (statusResult.status != GUILD_ACTIVITY_STATUS.START) {
return resResult(STATUS.GUILD_ACTIVITY_NOT_OPEN);
}
// if (statusResult.status != GUILD_ACTIVITY_STATUS.START) {
// return resResult(STATUS.GUILD_ACTIVITY_NOT_OPEN);
// }
let obj = getRaceActivityObj();
let woodenHorse = await obj.getWoodenHorse(guildCode, serverId);
@@ -170,9 +170,9 @@ export class RaceActivityHandler {
let myGuildActivityRec = await UserGuildActivityRecModel.updateInfo(code, { isSuccess, isCompleted: true });
if (!guildActivityRec || !myGuildActivityRec) return resResult(STATUS.INTERNAL_ERR);
let hasShow = !!guildActivityRec.hasShow;
let hasShow = !!myGuildActivityRec.hasShow;
if(!hasShow) {
await GuildActivityRecordModel.updateInfo(guildCode, { hasShow: true });
await UserGuildActivityRecModel.updateInfo(guildCode, { hasShow: true });
}
// 返回当前军团总军功

17
game-server/app/servers/role/handler/roleHandler.ts
View File

@@ -557,14 +557,14 @@ export class RoleHandler {
let roleId = session.get('roleId');
let role = await RoleModel.findByRoleId(roleId);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
if(role?.hasInit) {
if(role.hasInit) {
let userInfo = role.userInfo;
let newRoleId = genCode(10);
const seqId = await Counter.getNewCounter(COUNTER.ROLE) || -1;
await RoleModel.findOneAndUpdate({ roleId }, { $set: { 'userInfo.uid': 0, roleName: 'deletedRole' } });
role = await RoleModel.createRole(userInfo.uid, role.serverId, { roleId: newRoleId, code: role.code, roleName: newRoleId, seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 });
session.set('roleId', role.roleId);
session.set('roleId', newRoleId);
session.push('roleId', () => {});
}
@@ -583,4 +583,17 @@ export class RoleHandler {
return resResult(STATUS.SUCCESS, { lv: role.lv });
}
public async debugSetRole(msg: { magicWord: string, params: RoleUpdate }, session: BackendSession) {
let roleId: string = session.get('roleId');
let { magicWord, params } = msg;
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
let role = await RoleModel.updateRoleInfo(roleId, params);
return resResult(STATUS.SUCCESS, { role });
}
}

5
game-server/config/servers.ts
View File

@@ -227,9 +227,6 @@ module.exports = {
{ 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true },
{ 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3051, 'frontend': true },
{ 'id': 'connector-server-3', 'port': 4052, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3052, 'frontend': true },
{ 'id': 'connector-server-4', 'port': 4053, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3053, 'frontend': true },
{ 'id': 'connector-server-5', 'port': 4054, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3054, 'frontend': true }
],
'chat': [
{ 'id': 'chat-server-1', 'host': '127.0.0.1', 'port': 6050 },
@@ -237,7 +234,7 @@ module.exports = {
'role': [
{ 'id': 'role-server-1', 'host': '127.0.0.1', 'port': 6053 },
{ 'id': 'role-server-2', 'host': '127.0.0.1', 'port': 6061 },
{ 'id': 'role-server-3', 'host': '127.0.0.1', 'port': 6062 }
{ 'id': 'role-server-3', 'host': '127.0.0.1', 'port': 6062 },
],
'battle': [
{ 'id': 'battle-server-1', 'host': '127.0.0.1', 'port': 6054 }

16
shared/db/GuildActivityRec.ts
View File

@@ -18,6 +18,9 @@ export default class GuildActivityRecord extends BaseModel {
@prop({ required: true })
serverId: number; // 分服
@prop({ required: true, default: 1 })
status: number; // 分服
@prop({ required: true })
aid: number; // 军团活动id
@@ -60,9 +63,6 @@ export default class GuildActivityRecord extends BaseModel {
@prop({ required: true, type: () => Event, _id: false })
events: Event[]; // 粮草先行木马
@prop({ required: true, default: false })
hasShow: boolean; // 是否胜利
// 每天一条记录
public static async getRecord(guildCode: string, serverId: number, aid: number, events?: Event[]) {
let today = getZeroPointD();
@@ -71,7 +71,7 @@ export default class GuildActivityRecord extends BaseModel {
let update = Object.assign(docs, { code, guildCode, serverId, aid, createdAt: new Date() });
if(events) update = Object.assign(update, { events });
let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate(
{ guildCode, createdAt: { $gte: today }},
{ guildCode, createdAt: { $gte: today }, status: 1},
{ $setOnInsert: update },
{new: true, upsert: true}).lean();
return rec;
@@ -86,6 +86,14 @@ export default class GuildActivityRecord extends BaseModel {
return rec;
}
public static async updateTodayInfo(update: GuildActivityRecordUpdateParam) {
let today = getZeroPointD();
let rec = await GuildActivityRecordModel.updateMany(
{ createdAt: { $gte: today } },
{ $set: update }, { new: true }).lean();
return rec;
}
public static async pushEvent(guildCode: string, event: Event) {
let today = getZeroPointD();

2
shared/db/UserGuildActivityRec.ts
View File

@@ -86,6 +86,8 @@ export default class UserGuildActivityRec extends BaseModel {
@prop({ required: true, default: 0 })
cityId: number; // 挑战城池
@prop({ required: true, default: false })
hasShow: boolean; // 是否显示了胜利
// 每天一条记录
public static async getRecord(roleId: string, roleName: string, guildCode: string, serverId: number, sourceCode: string, aid: number) {