diff --git a/game-server/app/servers/activity/handler/dailyCoinHandler.ts b/game-server/app/servers/activity/handler/dailyCoinHandler.ts index a170700d7..63aaedeec 100644 --- a/game-server/app/servers/activity/handler/dailyCoinHandler.ts +++ b/game-server/app/servers/activity/handler/dailyCoinHandler.ts @@ -54,7 +54,7 @@ export class DailyCoinHandler { const serverId = session.get('serverId'); const sid = session.get('sid'); const roleName = session.get('roleName'); - + if(count < 0) return resResult(STATUS.WRONG_PARMS); let playerData = await getPlayerDailyCoinData(activityId, serverId, roleId) if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts index 6d4584711..1ec68c483 100644 --- a/game-server/app/servers/activity/handler/gachaHandler.ts +++ b/game-server/app/servers/activity/handler/gachaHandler.ts @@ -48,7 +48,7 @@ export class GachaHandler { */ async pull(msg: { gachaId: number, activityId: number, count: number }, session: BackendSession) { const { gachaId, activityId, count } = msg; - if (gachaId == undefined || activityId == undefined || count == undefined) return resResult(STATUS.WRONG_PARMS); + if (gachaId == undefined || activityId == undefined || count == undefined || count < 0) return resResult(STATUS.WRONG_PARMS); const roleId: string = session.get('roleId'); const roleName: string = session.get('roleName'); const sid: string = session.get('sid'); diff --git a/game-server/app/servers/activity/handler/luckyTurntableHandler.ts b/game-server/app/servers/activity/handler/luckyTurntableHandler.ts index b4d611540..e951f5e36 100644 --- a/game-server/app/servers/activity/handler/luckyTurntableHandler.ts +++ b/game-server/app/servers/activity/handler/luckyTurntableHandler.ts @@ -45,6 +45,9 @@ export class LuckyTurntableHandler { */ async pull(msg: { activityId: number, count: number }, session: BackendSession) { const { activityId, count } = msg; + if(count < 0) { + return resResult(STATUS.WRONG_PARMS); + } const roleId = session.get('roleId'); const roleName = session.get('roleName'); const sid = session.get('sid'); diff --git a/game-server/app/servers/activity/handler/newHeroGachaHandler.ts b/game-server/app/servers/activity/handler/newHeroGachaHandler.ts index 03fbacd17..6fe7dfcb7 100644 --- a/game-server/app/servers/activity/handler/newHeroGachaHandler.ts +++ b/game-server/app/servers/activity/handler/newHeroGachaHandler.ts @@ -69,6 +69,7 @@ export class NewHeroGachaHandler { const sid = session.get('sid'); const roleName = session.get('roleName'); + if(count < 0) return resResult(STATUS.WRONG_PARMS); let playerData = await getPlayerNewHeroGachaData(activityId, serverId, roleId) if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); diff --git a/game-server/app/servers/activity/handler/taskPassHandler.ts b/game-server/app/servers/activity/handler/taskPassHandler.ts index e5cab3f67..30b2f683d 100644 --- a/game-server/app/servers/activity/handler/taskPassHandler.ts +++ b/game-server/app/servers/activity/handler/taskPassHandler.ts @@ -66,7 +66,7 @@ export class TaskPassHandler { const roleName = session.get('roleName'); const sid = session.get('sid'); const serverId = session.get('serverId'); - if(count == 0 || !isNumber(count)) return resResult(STATUS.WRONG_PARMS); + if(count <= 0 || !isNumber(count)) return resResult(STATUS.WRONG_PARMS); let playerData = await getTaskPassData(activityId, serverId, roleId) if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); diff --git a/game-server/app/servers/battle/handler/normalBattleHandler.ts b/game-server/app/servers/battle/handler/normalBattleHandler.ts index 74e74345e..8f75837a8 100644 --- a/game-server/app/servers/battle/handler/normalBattleHandler.ts +++ b/game-server/app/servers/battle/handler/normalBattleHandler.ts @@ -299,6 +299,8 @@ export class NormalBattleHandler { let serverId = session.get('serverId'); let ip = session.get('ip'); + if(count < 0) return resResult(STATUS.WRONG_PARMS); + let warInfo = gameData.war.get(battleId); if (!warInfo) { return resResult(STATUS.BATTLE_MISS_INFO); diff --git a/game-server/app/servers/chat/handler/chatHandler.ts b/game-server/app/servers/chat/handler/chatHandler.ts index bcacc9a8a..a0be61f52 100644 --- a/game-server/app/servers/chat/handler/chatHandler.ts +++ b/game-server/app/servers/chat/handler/chatHandler.ts @@ -117,6 +117,7 @@ export class ChatHandler { async getPrivateMessage(msg: { targetRoleId: string, fromSeqId: number, count: number }, session: BackendSession) { const roleId = session.get('roleId'); const { targetRoleId, fromSeqId = Infinity, count = DEFAULT_MSG_PER_PAGE } = msg; + if( count < 0) return resResult(STATUS.WRONG_PARMS); const msgs = await getPrivateMessages(roleId, targetRoleId, fromSeqId, count); const targetRoleInfo = await getSimpleRoleInfo(targetRoleId); return resResult(STATUS.SUCCESS, { targetRoleId, msgs, targetRoleInfo }); diff --git a/game-server/app/servers/guild/handler/auctionHandler.ts b/game-server/app/servers/guild/handler/auctionHandler.ts index 83638d2a1..6e4509581 100644 --- a/game-server/app/servers/guild/handler/auctionHandler.ts +++ b/game-server/app/servers/guild/handler/auctionHandler.ts @@ -190,6 +190,7 @@ export class AuctionHandler { } async offerRecs(msg: { count: number }, session: BackendSession) { + if( msg.count < 0) return resResult(STATUS.WRONG_PARMS); const roleId = session.get('roleId'); const serverId = session.get('serverId'); const lotsData = await LotModel.recentBidLots(serverId, roleId, msg.count); @@ -202,6 +203,7 @@ export class AuctionHandler { } async guildLotRecs(msg: { count: number }, session: BackendSession) { + if( msg.count < 0) return resResult(STATUS.WRONG_PARMS); const guildCode = session.get('guildCode'); const dividends = await DividendModel.findDividendsByGuild(guildCode, msg.count); let lotsData = []; diff --git a/game-server/app/servers/guild/handler/guildHandler.ts b/game-server/app/servers/guild/handler/guildHandler.ts index 70f004667..4e56dee3e 100644 --- a/game-server/app/servers/guild/handler/guildHandler.ts +++ b/game-server/app/servers/guild/handler/guildHandler.ts @@ -875,9 +875,9 @@ export class GuildHandler { // debug接口: 添加公会活跃值 async debugAddActive(msg: guildInter & { magicWord: string, code: string, active: number, id: number }, session: BackendSession) { const { magicWord } = msg; - // if (magicWord !== DEBUG_MAGIC_WORD) { - // return resResult(STATUS.TOKEN_ERR); - // } + if (magicWord !== DEBUG_MAGIC_WORD) { + return resResult(STATUS.TOKEN_ERR); + } const roleId = session.get('roleId'); const serverId = session.get('serverId'); const { code, active, id } = msg; @@ -896,9 +896,9 @@ export class GuildHandler { // debug接口: 调用定时任务 async debugWeeklyRask(msg: guildInter & { magicWord: string }, session: BackendSession) { const { magicWord } = msg; - // if (magicWord !== DEBUG_MAGIC_WORD) { - // return resResult(STATUS.TOKEN_ERR); - // } + if (magicWord !== DEBUG_MAGIC_WORD) { + return resResult(STATUS.TOKEN_ERR); + } await settleGuildWeekly(); return resResult(STATUS.SUCCESS); } @@ -907,9 +907,9 @@ export class GuildHandler { async debugAdddFund(msg: guildInter & { magicWord: string, code: string, count: number }, session: BackendSession) { const { code, count, magicWord } = msg; - // if (magicWord !== DEBUG_MAGIC_WORD) { - // return resResult(STATUS.TOKEN_ERR); - // } + if (magicWord !== DEBUG_MAGIC_WORD) { + return resResult(STATUS.TOKEN_ERR); + } const guild = await GuildModel.updateInfo(code, {}, { fund: count }, 'fund'); await pushGuildInfoUpdate(code, { fund: guild.fund }); return resResult(STATUS.SUCCESS, { code, fund: guild.fund }); @@ -947,9 +947,9 @@ export class GuildHandler { // debug接口: 加入公会 async debugJoinGuild(msg: guildInter & { magicWord: string, code: string }, session: BackendSession) { const { code, magicWord } = msg; - // if (magicWord !== DEBUG_MAGIC_WORD) { - // return resResult(STATUS.TOKEN_ERR); - // } + if (magicWord !== DEBUG_MAGIC_WORD) { + return resResult(STATUS.TOKEN_ERR); + } const roleId = session.get('roleId'); const roleName = session.get('roleName'); const serverId = session.get('serverId'); diff --git a/game-server/app/servers/guild/handler/guildRefineHandler.ts b/game-server/app/servers/guild/handler/guildRefineHandler.ts index 35241c930..836e9d471 100644 --- a/game-server/app/servers/guild/handler/guildRefineHandler.ts +++ b/game-server/app/servers/guild/handler/guildRefineHandler.ts @@ -48,6 +48,7 @@ export class GuildRefineHandler { */ async refine(msg: guildInter & { id: number, count: number }, session: BackendSession) { let { id, count, myUserGuild: userGuild } = msg; + if( count < 0) return resResult(STATUS.WRONG_PARMS); const roleId: string = session.get('roleId'); const sid: string = session.get('sid'); const roleName: string = session.get('roleName'); diff --git a/game-server/app/servers/guild/handler/guildTrainHandler.ts b/game-server/app/servers/guild/handler/guildTrainHandler.ts index c73f7d470..961d146bd 100644 --- a/game-server/app/servers/guild/handler/guildTrainHandler.ts +++ b/game-server/app/servers/guild/handler/guildTrainHandler.ts @@ -352,6 +352,7 @@ export class GuildTrainHandler { //购买挑战次数 async purchaseTrainCount(msg: guildInter & { count: number }, session: BackendSession) { let { count, myUserGuild } = msg; + if( count < 0) return resResult(STATUS.WRONG_PARMS); const roleId: string = session.get('roleId'); const serverId: number = parseInt(session.get('serverId')); const sid: string = session.get('sid'); diff --git a/game-server/app/servers/role/handler/roleHandler.ts b/game-server/app/servers/role/handler/roleHandler.ts index 31399f72e..6011ce0dc 100644 --- a/game-server/app/servers/role/handler/roleHandler.ts +++ b/game-server/app/servers/role/handler/roleHandler.ts @@ -107,6 +107,7 @@ export class RoleHandler { //神像强化 async roleTeraphStrengthen(msg: { id: number, count: number }, session: BackendSession) { let { id, count } = msg; + if( count < 0) return resResult(STATUS.WRONG_PARMS); let roleId = session.get('roleId'); let sid: string = session.get('sid'); let serverId: number = session.get('serverId'); diff --git a/game-server/app/servers/role/handler/shopHandler.ts b/game-server/app/servers/role/handler/shopHandler.ts index 8299cb5ea..751c8c023 100644 --- a/game-server/app/servers/role/handler/shopHandler.ts +++ b/game-server/app/servers/role/handler/shopHandler.ts @@ -42,6 +42,7 @@ export class ShopHandler { let serverId = session.get('serverId'); let { shopItemId, count } = msg; + if( count < 0) return resResult(STATUS.WRONG_PARMS); let dicShopItem = gameData.shopItem.get(shopItemId); if(!dicShopItem) return resResult(STATUS.DIC_DATA_NOT_FOUND);