diff --git a/game-server/app/servers/activity/handler/dailyCoinHandler.ts b/game-server/app/servers/activity/handler/dailyCoinHandler.ts index 0066fa10c..045832c62 100644 --- a/game-server/app/servers/activity/handler/dailyCoinHandler.ts +++ b/game-server/app/servers/activity/handler/dailyCoinHandler.ts @@ -84,10 +84,10 @@ export class DailyCoinHandler { return resResult(STATUS.ACTIVITY_DATA_ERROR); } let coinRewardCount = eval(rewardItem.rewardFormula); - console.log('******** coinReward', lv, rewardItem.rewardFormula, coinRewardCount) + // console.log('******** coinReward', lv, rewardItem.rewardFormula, coinRewardCount) let baseRewardParamArr: Array = [{ id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.COIN), count: coinRewardCount, type: ACTIVITY_RESOURCES_TYPE.GOODS }]; - console.log('第几次抽奖:', index, ' 基础奖励翻倍:', rate, JSON.stringify(baseRewardParamArr),) + // console.log('第几次抽奖:', index, ' 基础奖励翻倍:', rate, JSON.stringify(baseRewardParamArr),) for (let reward of baseRewardParamArr) { reward.count = reward.count * rate; } @@ -96,15 +96,15 @@ export class DailyCoinHandler { if (extraIndex != -1) {//额外奖励 let extraRewardParamArr: Array = stringToRewardParam(playerData.extraReward); let extraReward = extraRewardParamArr[extraIndex]; - console.log('额外奖励', JSON.stringify(extraReward)) + // console.log('额外奖励', JSON.stringify(extraReward)) allReward.push(extraReward); } } let newConsume = mergeData(allConsume); let newReward = mergeData(allReward); - console.log('所有消耗', JSON.stringify(newConsume)) - console.log('所有奖励', JSON.stringify(newReward)) + // console.log('所有消耗', JSON.stringify(newConsume)) + // console.log('所有奖励', JSON.stringify(newReward)) //检查资源 let consumeResult = await handleCost(roleId, sid, newConsume, ITEM_CHANGE_REASON.DAILY_COIN_EXCHANGE); diff --git a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts index 5661b988f..c9fa5aeba 100644 --- a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts +++ b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts @@ -63,7 +63,7 @@ export class RechargeMoneyHandler { let recordArray = playerData.recordArray.filter(obj => { return obj && !obj.rewardTime }) let rechargeItem = recordArray[0]; - console.log('recordArray', JSON.stringify(recordArray)); + // console.log('recordArray', JSON.stringify(recordArray)); await ActivityRechargeMoneyModel.addRecord(rechargeItem._id, item.id, item.reward) let rewardParamArr: Array = stringToRewardParam(item.reward); let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr, ITEM_CHANGE_REASON.RECHARGE_REWARD) diff --git a/game-server/app/servers/activity/handler/thirtyDaysHandler.ts b/game-server/app/servers/activity/handler/thirtyDaysHandler.ts index bfae86bc4..c5c18ea16 100644 --- a/game-server/app/servers/activity/handler/thirtyDaysHandler.ts +++ b/game-server/app/servers/activity/handler/thirtyDaysHandler.ts @@ -93,7 +93,7 @@ export class ThirtyDaysHandler { if (activityDays < todayIndex && todayIndex <= (activityDays + playerData.days)) {//时间正常范围内 } else if (todayIndex > (activityDays + playerData.days)) {//活动已经过期 - console.log('过期奖励') + // console.log('过期奖励') let expiredItems: Array = playerData.needMark(); let cells = expiredItems.map(obj => obj.cellIndex) await ActivityThirtyDaysPointRewardModel.setExpired(activityId, roleId, cells); diff --git a/game-server/app/servers/activity/remote/activityRemote.ts b/game-server/app/servers/activity/remote/activityRemote.ts index f28902fcc..7f98a2564 100644 --- a/game-server/app/servers/activity/remote/activityRemote.ts +++ b/game-server/app/servers/activity/remote/activityRemote.ts @@ -55,7 +55,7 @@ export class ActivityRemote { this.app.set('activityByType', this.activityByType); this.app.set('activities', this.activities); this.app.set('groupToServer', this.groupToServer); - console.log('****** loadActivities') + // console.log('****** loadActivities') } private setActivityTypeAndServer() { diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index dd7a65567..e070cc6fe 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -54,7 +54,7 @@ export class ComBattleHandler { let teamCode = session.get('teamCode'); const { blueprtId, pub, ceLimit } = msg; - console.log('createTeam msg: ', msg); + // console.log('createTeam msg: ', msg); // 检查藏宝图Id是否合法 if (!blueprtIdValid(blueprtId)) return resResult(STATUS.COM_BATTLE_BLUEPRT_INVALID); const enoughBlueprt = await hasEnoughBlueprt(roleId, sid, blueprtId); diff --git a/game-server/app/servers/connector/filter/global.ts b/game-server/app/servers/connector/filter/global.ts index 188c216eb..f5ef4c030 100644 --- a/game-server/app/servers/connector/filter/global.ts +++ b/game-server/app/servers/connector/filter/global.ts @@ -62,7 +62,7 @@ Filter.prototype.before = async function (routeRecord: RouteRecord, msg: any, se const roleId: string = session.get('roleId'); const uid: number = session.get('userid'); const ip: string = session.get('ip'); - console.log('*********** global before ip', ip) + // console.log('*********** global before ip', ip) let guildCode = session.get('guildCode'); let blockType = session.get('blockType'); // 访问频率控制 diff --git a/game-server/app/servers/gm/filter/tokenFilter.ts b/game-server/app/servers/gm/filter/tokenFilter.ts index 0cfa29fd9..b2ea47015 100644 --- a/game-server/app/servers/gm/filter/tokenFilter.ts +++ b/game-server/app/servers/gm/filter/tokenFilter.ts @@ -18,7 +18,7 @@ Filter.prototype.before = async function (routeRecord: RouteRecord, msg: any, se const groupId = session.get('groupId'); let route = routeRecord.route; - console.log('********uid', uid, route); + // console.log('********uid', uid, route); let dicApi = gameData.apiByUrl.get(route); if(!dicApi) { return next(new Error(), resResult(STATUS.GM_MISS_API)); diff --git a/game-server/app/servers/role/handler/rankHandler.ts b/game-server/app/servers/role/handler/rankHandler.ts index b8ffcd8cf..3cb661e93 100644 --- a/game-server/app/servers/role/handler/rankHandler.ts +++ b/game-server/app/servers/role/handler/rankHandler.ts @@ -172,7 +172,7 @@ export class RoleHandler { if (!dicReward || dicReward.rankId != type) continue; let rankFirst: RankFirstType = pinus.app.get('rankFirstRewards').get(serverId)?.get(id); - console.log('*******', pinus.app.get('rankFirstRewards'), rankFirst); + // console.log('*******', pinus.app.get('rankFirstRewards'), rankFirst); if (!rankFirst) continue; if (role.rankReceived.includes(id)) continue; diff --git a/game-server/app/servers/role/remote/roleRemote.ts b/game-server/app/servers/role/remote/roleRemote.ts index a73d22a7a..48cd4da72 100644 --- a/game-server/app/servers/role/remote/roleRemote.ts +++ b/game-server/app/servers/role/remote/roleRemote.ts @@ -46,7 +46,7 @@ export class RoleRemote { } public setRankFirst(rank: RankFirstType) { - console.log('****** setRankFirst', rank.serverId, rank.id, rank) + // console.log('****** setRankFirst', rank.serverId, rank.id, rank) if(!this.rankFirstRewards.has(rank.serverId)) { this.rankFirstRewards.set(rank.serverId, new Map()); } diff --git a/game-server/app/services/actionPointService.ts b/game-server/app/services/actionPointService.ts index 7c49adb7a..4f8dc7a41 100644 --- a/game-server/app/services/actionPointService.ts +++ b/game-server/app/services/actionPointService.ts @@ -69,7 +69,7 @@ function getApWithDataAp(roleId: string, ip: string, lv: number, dataAp: ActionP * @param sid */ export async function setAp(roleId: string, ip: string, lv: number, changeAp: number, sid: string, reason: ITEM_CHANGE_REASON) { - console.log('***** setAp', roleId, ip, lv, changeAp) + // console.log('***** setAp', roleId, ip, lv, changeAp) const now = Date.now(); const dicAp = getDicApByLv(lv); let ApResult = await getAp(roleId, ip, lv, true); diff --git a/game-server/app/services/activity/activityService.ts b/game-server/app/services/activity/activityService.ts index 567008b9e..5ff4daee8 100644 --- a/game-server/app/services/activity/activityService.ts +++ b/game-server/app/services/activity/activityService.ts @@ -252,12 +252,17 @@ export function _getActivitiesByType(serverId: number, type: number) { } export function _getActivities() { - let activities = pinus.app.get('activities'); - let result: ActivityInRemote[] = []; - for(let [_, activity] of activities) { - result.push(activity); + try { + let activities = pinus.app.get('activities'); + // console.log('***** activities', activities); + let result: ActivityInRemote[] = []; + for(let [_, activity] of activities) { + result.push(activity); + } + return result; + } catch(e) { + console.log('******** activity e', e) } - return result; } diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts index 81c3463e8..a87525377 100644 --- a/game-server/app/services/comBattleService.ts +++ b/game-server/app/services/comBattleService.ts @@ -41,7 +41,7 @@ export function getRandBlueprtId(qualityArr: number[], lvRange: number, cnt = 1) if (blueprtIdArr.length === 0) return null; const res = getRandEelm(blueprtIdArr, cnt); - console.log('******** getRandBlueprtId', blueprtIdArr, cnt, res) + // console.log('******** getRandBlueprtId', blueprtIdArr, cnt, res) return res; } diff --git a/game-server/app/services/eventSercive.ts b/game-server/app/services/eventSercive.ts index b2d6cf938..bee388c1a 100644 --- a/game-server/app/services/eventSercive.ts +++ b/game-server/app/services/eventSercive.ts @@ -281,7 +281,7 @@ function pushEventMsg(sid: string, roleId: string, msg: any ) { * @param status 状态id */ export function checkEventStatus(type: number, status: number) { - console.log('type = '+ type + ' status = '+status); + // console.log('type = '+ type + ' status = '+status); let flag: boolean; // 检查状态是否正确 if(type == EVENT_TYPE.BATTLE||type ==EVENT_TYPE.QUIZ) { if(status == EVENT_RECORD_STATUS.BATTLE_SUCCESS) { diff --git a/game-server/app/services/guildActivityService.ts b/game-server/app/services/guildActivityService.ts index 77bb268ac..f4adbbeb2 100644 --- a/game-server/app/services/guildActivityService.ts +++ b/game-server/app/services/guildActivityService.ts @@ -104,7 +104,7 @@ export function getAllGuildActivityStatus() { export function getGuildActivityByDic(dicGuildActivity: DicGuildActivity) { let t = getTimeFun(); - console.log('*********', dicGuildActivity.startTime, dicGuildActivity.startMinute, dicGuildActivity.startSeconds) + // console.log('*********', dicGuildActivity.startTime, dicGuildActivity.startMinute, dicGuildActivity.startSeconds) let startTime = t.getTimeWithHour(dicGuildActivity.startTime, dicGuildActivity.startMinute, dicGuildActivity.startSeconds); let countdownTime = t.getTimeWithHour(dicGuildActivity.countDown); let { duringTime, openDay } = dicGuildActivity; @@ -305,7 +305,7 @@ export async function sendGuildActEndMsg(aid: number) { let guilds = obj.getGuilds(); console.log('******** guilds', guilds); for (let [serverId, guildCodes] of guilds) { - console.log('***** serverId', serverId, 'guildCodes', guildCodes); + // console.log('***** serverId', serverId, 'guildCodes', guildCodes); for (let guildCode of guildCodes) { await gateActivitySettleReward(guildCode, serverId); } @@ -387,15 +387,15 @@ export async function gateActivitySettleReward(guildCode: string, serverId: numb console.log('gateActivitySettleReward', guildCode, serverId); let obj = getGateActivityObj(); let { gateHp, members } = obj.getObj(guildCode, serverId); - console.log('***** gateHp', gateHp, 'members', members); + // console.log('***** gateHp', gateHp, 'members', members); let r = new Rank(REDIS_KEY.GATE_ACTIVITY, { serverId }, true); let rank = await r.getMyRank({ guildCode }); let guildScore = await r.getMyScore({ guildCode }); - console.log('****** ranks', rank, 'guildScore', guildScore); + // console.log('****** ranks', rank, 'guildScore', guildScore); let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, rank); - console.log('***** rewards', JSON.stringify(rewards)); + // console.log('***** rewards', JSON.stringify(rewards)); let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, { isSuccess: gateHp > 0, @@ -762,14 +762,14 @@ export async function setDicGuildActivity(now: number, aid: number, startSeconds export async function setDicAuctionTime(startTime: number, endActivity: number, startGuild: number, endGuild: number, startWorld: number, endWorld: number) { - console.log('********* setDicAuctionTime', startTime, endActivity, startGuild, endGuild, startWorld, endWorld); + // console.log('********* setDicAuctionTime', startTime, endActivity, startGuild, endGuild, startWorld, endWorld); let startGuildDate = new Date(startTime + endActivity * 1000 + startGuild * 1000); let endGuildDate = new Date(startGuildDate.getTime() + endGuild * 1000); let startWorldDate = new Date(endGuildDate.getTime() + startWorld * 1000); let endWorldDate = new Date(startWorldDate.getTime() + endWorld * 1000); - console.log('********* setDicAuctionTime', startGuildDate, endGuildDate, startWorldDate, endWorldDate); + // console.log('********* setDicAuctionTime', startGuildDate, endGuildDate, startWorldDate, endWorldDate); gameData.auctionTime.set(AUCTION_TIME.GUILD_PREVIEW, formatTime(new Date(startTime))); gameData.auctionTime.set(AUCTION_TIME.GUILD_OPEN, formatTime(startGuildDate)); @@ -778,7 +778,7 @@ export async function setDicAuctionTime(startTime: number, endActivity: number, gameData.auctionTime.set(AUCTION_TIME.WORLD_OPEN, formatTime(startWorldDate)); gameData.auctionTime.set(AUCTION_TIME.WORLD_CLOSE, formatTime(endWorldDate)); - console.log('*********** setDicAuctionTime', gameData.auctionTime) + // console.log('*********** setDicAuctionTime', gameData.auctionTime) } function formatTime(date: Date) { diff --git a/game-server/app/services/guildService.ts b/game-server/app/services/guildService.ts index ee35317a6..eccfaca97 100644 --- a/game-server/app/services/guildService.ts +++ b/game-server/app/services/guildService.ts @@ -54,7 +54,7 @@ export async function checkAuth(func: number, targetCode: string, guildAuth: num guildAuth = GUILD_AUTH.OTHERS; } const dicGuildAuth = gameData.guildAuth.get(func); - console.log('*checkAuth*', func, guildAuth, dicGuildAuth) + // console.log('*checkAuth*', func, guildAuth, dicGuildAuth) if (!dicGuildAuth) return false; return dicGuildAuth.includes(guildAuth); diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts index 81abb9ccc..31805a464 100644 --- a/game-server/app/services/pvpService.ts +++ b/game-server/app/services/pvpService.ts @@ -528,7 +528,7 @@ export async function generPVPOppRecInfo(isSuccess: boolean, curOpp: OppPlayer, let resultMaxRank = gameData.pvpRankMax.max;//根据排行榜的奖励表，获得最大排名挡位的最小值，其余不在结算中结算的玩家按照最大排名挡位在登录或进入pvp时结算 let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum: pvpConfig.seasonNum }, false, resultMaxRank.min - 1); let allRank = (await r.getRankByRange()); - console.log('******** allRank', 0, resultMaxRank.min - 2, allRank) + // console.log('******** allRank', 0, resultMaxRank.min - 2, allRank) for(let { rank, roleId } of allRank) { console.log('******** pvpSeasonEnd: ', rank, roleId); let pvpDefense = await PvpDefenseModel.findByRoleId(roleId); diff --git a/game-server/app/services/taskService.ts b/game-server/app/services/taskService.ts index 98e6370df..3d919c452 100644 --- a/game-server/app/services/taskService.ts +++ b/game-server/app/services/taskService.ts @@ -81,7 +81,7 @@ export async function checkActivityTask(serverId: number, sid: string, roleId: s } export async function pushActivityUpdate(roleId: string, sid: string, pushMessage: any[]) { - console.log('pushActivityUpdate', JSON.stringify(pushMessage)) + // console.log('pushActivityUpdate', JSON.stringify(pushMessage)) if (pushMessage.length > 0) { if (!sid) { let onlineUser = await getRoleOnlineInfo(roleId); @@ -161,7 +161,7 @@ export async function checkTaskInBattleSweep(serverId: number, roleId: string, s } export async function checkTaskInComBattleEnd(roleStatus: RoleStatus[], capId: string, quality: number) { - console.log('********', JSON.stringify(roleStatus), capId, quality) + // console.log('********', JSON.stringify(roleStatus), capId, quality) for (let { roleId, isRobot } of roleStatus) { if (!isRobot) { diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index 326df08c5..8feefc6d9 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -31,6 +31,7 @@ import { getWorldChannelSid } from './chatService'; import { createMarqueeMsg, pushMarqueeMsg } from './sysChatService'; import { RegionModel, RegionType } from '../db/Region'; import { CreateServerParam } from '../domain/backEndField/params'; +import { infologger } from '../util/logger'; const PER_SECOND = 1 * 1000; const PER_DAY = 24 * 60 * 60; @@ -193,6 +194,7 @@ export async function resetPvpSeasonTime(minute: number) { export async function reportOnlineSchedule() { let allRoles = await getAllOnlineRoles(); + infologger.info('reportOnlineSchedule all roles count: ', allRoles.length); console.log('reportOnlineSchedule all roles count: ', allRoles.length) for (let { roleId, userCode, sid } of allRoles) { let result = reportOneOnline(roleId, userCode, sid, false); @@ -364,9 +366,9 @@ export function auctionSchedule() { let worldOpen = gameData.auctionTime.get(AUCTION_TIME.WORLD_OPEN); let worldClose = gameData.auctionTime.get(AUCTION_TIME.WORLD_CLOSE); - console.log('***** auctionSchedule', guildOpen.hour, guildOpen.minute, guildOpen.seconds); - console.log('***** auctionSchedule', worldOpen.hour, worldOpen.minute, worldOpen.seconds); - console.log('***** auctionSchedule', worldClose.hour, worldClose.minute, worldClose.seconds); + // console.log('***** auctionSchedule', guildOpen.hour, guildOpen.minute, guildOpen.seconds); + // console.log('***** auctionSchedule', worldOpen.hour, worldOpen.minute, worldOpen.seconds); + // console.log('***** auctionSchedule', worldClose.hour, worldClose.minute, worldClose.seconds); startGuildAuctionJobId = scheduleJob('startGuildAuction', `${guildOpen.seconds} ${guildOpen.minute} ${guildOpen.hour} * * ?`, startGuildAuction); startWorldAuctionJobId = scheduleJob('startWorldAuction', `${worldOpen.seconds} ${worldOpen.minute} ${worldOpen.hour} * * ?`, startWorldAuction); stopAuctionJobId = scheduleJob('stopAuction', `${worldClose.seconds} ${worldClose.minute} ${worldClose.hour} * * ?`, stopAuction); @@ -446,8 +448,8 @@ async function setMaintenance(batchCode: string) { if(now > maintenance.startTime - 5 * 60) { maintenanceNotifySchedule(batchCode); } else { + if(scheduledJobs[`maintenNotify${batchCode}`]) scheduledJobs[`maintenNotify${batchCode}`].cancel(); scheduleJob(`maintenNotify${batchCode}`, (maintenance.startTime - 5 * 60) * 1000, () => { - console.log('******* 通知') maintenanceNotifySchedule(batchCode); }) } diff --git a/game-server/config/servers.ts b/game-server/config/servers.ts index f0e4d9a86..9f54af2c2 100644 --- a/game-server/config/servers.ts +++ b/game-server/config/servers.ts @@ -250,6 +250,7 @@ module.exports = { { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3050, 'frontend': true }, { 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3051, 'frontend': true }, { 'id': 'connector-server-3', 'port': 4052, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3052, 'frontend': true }, + { 'id': 'connector-server-5', 'port': 4054, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3054, 'frontend': true }, ], 'chat': [ { 'id': 'chat-server-1', 'host': '172.16.4.108', 'port': 6050 }, @@ -272,7 +273,8 @@ module.exports = { { 'id': 'guild-server-2', 'host': '172.16.4.108', 'port': 6058, "args": " --inspect=9240" } ], 'activity': [ - { 'id': 'activity-server-1', 'host': '172.16.4.108', 'port': 6059, "args": " --inspect=9241" }, + { 'id': 'activity-server-1', 'host': '172.16.4.108', 'port': 6059 }, + { 'id': 'activity-server-2', 'host': '172.16.4.108', 'port': 6068 }, ], 'order': [ { 'id': 'order-server-1', 'host': '172.16.4.108', 'port': 6060, "args": " --inspect=9242" }, @@ -293,5 +295,14 @@ module.exports = { 'role': [ { 'id': 'role-server-4', 'host': '172.16.4.106', 'port': 6063 }, ], + 'chat': [ + { 'id': 'chat-server-2', 'host': '172.16.4.106', 'port': 6069 }, + ], + 'battle': [ + { 'id': 'battle-server-3', 'host': '172.16.4.106', 'port': 6070 }, + ], + 'guild': [ + { 'id': 'guild-server-3', 'host': '172.16.4.106', 'port': 6071 }, + ], }, }; diff --git a/game-server/config/sq1/log4js.ts b/game-server/config/sq1/log4js.ts index 33f3a5881..c04a569d4 100644 --- a/game-server/config/sq1/log4js.ts +++ b/game-server/config/sq1/log4js.ts @@ -7,7 +7,7 @@ module.exports = { 'type': 'file', 'filename': '/zyz_logs/log4js/con-log-${opts:serverId}.log', 'pattern': 'connector', - 'maxLogSize': 1048576, + 'maxLogSize': 104857600, 'layout': { 'type': 'basic' }, @@ -16,7 +16,7 @@ module.exports = { 'rpc-log': { 'type': 'file', 'filename': '/zyz_logs/log4js/rpc-log-${opts:serverId}.log', - 'maxLogSize': 1048576, + 'maxLogSize': 104857600, 'layout': { 'type': 'basic' }, @@ -25,7 +25,7 @@ module.exports = { 'forward-log': { 'type': 'file', 'filename': '/zyz_logs/log4js/forward-log-${opts:serverId}.log', - 'maxLogSize': 1048576, + 'maxLogSize': 104857600, 'layout': { 'type': 'basic' }, @@ -34,7 +34,7 @@ module.exports = { 'rpc-debug': { 'type': 'file', 'filename': '/zyz_logs/log4js/rpc-debug-${opts:serverId}.log', - 'maxLogSize': 1048576, + 'maxLogSize': 104857600, 'layout': { 'type': 'basic' }, @@ -43,7 +43,7 @@ module.exports = { 'crash-log': { 'type': 'file', 'filename': '/zyz_logs/log4js/crash.log', - 'maxLogSize': 1048576, + 'maxLogSize': 104857600, 'layout': { 'type': 'basic' }, @@ -52,7 +52,7 @@ module.exports = { 'admin-log': { 'type': 'file', 'filename': '/zyz_logs/log4js/admin.log', - 'maxLogSize': 1048576, + 'maxLogSize': 104857600, 'layout': { 'type': 'basic' }, @@ -70,7 +70,7 @@ module.exports = { 'pinus-admin': { 'type': 'file', 'filename': '/zyz_logs/log4js/pinus-admin.log', - 'maxLogSize': 1048576, + 'maxLogSize': 104857600, 'layout': { 'type': 'basic' }, @@ -79,7 +79,7 @@ module.exports = { 'pinus-rpc': { 'type': 'file', 'filename': '/zyz_logs/log4js/pinus-rpc-${opts:serverId}.log', - 'maxLogSize': 1048576, + 'maxLogSize': 104857600, 'layout': { 'type': 'basic' }, diff --git a/shared/db/HangUpRecord.ts b/shared/db/HangUpRecord.ts index b9f3bdcfe..0a38263ab 100644 --- a/shared/db/HangUpRecord.ts +++ b/shared/db/HangUpRecord.ts @@ -39,13 +39,13 @@ export default class HangUpRecord extends BaseModel { received: boolean; // 是否已经领取，true-领取，false-未领取 public static async initRecord(roleId: string, roleName: string, lean = true) { - console.log('****** initRecord before') + // console.log('****** initRecord before') const curTime = new Date(); const recDoc = new HangUpRecordModel(); const update = Object.assign(recDoc.toJSON(), {roleId, roleName, startTime: curTime, startLv: dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV + 1}); const rec: HangUpRecordType = await HangUpRecordModel.findOneAndUpdate({roleId, startLv: dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV + 1}, { $setOnInsert: update }, {upsert: true, new: true}).lean(lean); - console.log('****** initRecord after') + // console.log('****** initRecord after') return rec; } diff --git a/shared/domain/activityField/activityField.ts b/shared/domain/activityField/activityField.ts index bee743f60..c91778a67 100644 --- a/shared/domain/activityField/activityField.ts +++ b/shared/domain/activityField/activityField.ts @@ -33,7 +33,7 @@ export abstract class ActivityBase { this.type = activityData.type; // console.log('今天是活动第几天', activityData.beginTime, new Date, this.todayIndex) - console.log('***** activityData', activityData.timeType) + // console.log('***** activityData', activityData.timeType) switch (activityData.timeType) { case ACTIVITY_TIME_TYPE.SERVER_OPEN_TIME: { this.beginTime = moment(SERVER_OPEN_TIME).add(this.delayDay, 'd').startOf('d').add(REFRESH_TIME, 'h').valueOf(); @@ -43,7 +43,7 @@ export abstract class ActivityBase { this.endTime = moment(this.beginTime).add(1, 'd').valueOf(); } this.todayIndex = deltaDays(moment(this.beginTime).toDate(), new Date) + 1; - console.log('活动时间数据11...', activityData.timeType, this.beginTime, this.endTime, this.todayIndex, this.roundIndex, this.nextRefreshTime) + // console.log('活动时间数据11...', activityData.timeType, this.beginTime, this.endTime, this.todayIndex, this.roundIndex, this.nextRefreshTime) break; } case ACTIVITY_TIME_TYPE.ROLE_REGISTER_TIME: { @@ -55,11 +55,11 @@ export abstract class ActivityBase { } this.todayIndex = deltaDays(moment(this.beginTime).toDate(), new Date) + 1; - console.log('活动时间数据22...', activityData.timeType, this.beginTime, this.endTime, this.todayIndex, this.roundIndex, this.nextRefreshTime) + // console.log('活动时间数据22...', activityData.timeType, this.beginTime, this.endTime, this.todayIndex, this.roundIndex, this.nextRefreshTime) break; } case ACTIVITY_TIME_TYPE.DATE_TIME: { - console.log('活动时间数据33...', activityData.timeType, this.beginTime, this.endTime, this.todayIndex, this.roundIndex, this.nextRefreshTime) + // console.log('活动时间数据33...', activityData.timeType, this.beginTime, this.endTime, this.todayIndex, this.roundIndex, this.nextRefreshTime) break; } default: { @@ -71,9 +71,9 @@ export abstract class ActivityBase { this.nextRefreshTime = moment(this.beginTime).add(activityData.interval * this.roundIndex, 'second').valueOf(); this.todayIndex = Math.ceil(((moment(new Date).valueOf() - this.beginTime) / (24 * 60 * 60 * 1000))); } - console.log('活动时间数据...', '活动id:', activityData.activityId, '类型:', activityData.timeType, '开始时间:', this.beginTime, moment(this.beginTime).toDate(), - '结束:', this.endTime, moment(this.endTime).toDate(), - '今天第几天:', this.todayIndex, '回合:', this.roundIndex, '下次刷新:', this.nextRefreshTime, moment(this.nextRefreshTime).toDate()) + // console.log('活动时间数据...', '活动id:', activityData.activityId, '类型:', activityData.timeType, '开始时间:', this.beginTime, moment(this.beginTime).toDate(), + // '结束:', this.endTime, moment(this.endTime).toDate(), + // '今天第几天:', this.todayIndex, '回合:', this.roundIndex, '下次刷新:', this.nextRefreshTime, moment(this.nextRefreshTime).toDate()) } } diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts index 6a9e6a5d3..6aad89c32 100644 --- a/shared/pubUtils/data.ts +++ b/shared/pubUtils/data.ts @@ -773,7 +773,7 @@ export function getWishPoolReward(id: number) { if(dicItid.type == CONSUME_TYPE.PIECE) { starLevel = dicGoods.equipLvl; } - console.log('*****', dicGoods.itid, starLevel, dicGoods.quality) + // console.log('*****', dicGoods.itid, starLevel, dicGoods.quality) return gameData.guildWishReward.get(`${dicGoods.itid}_${starLevel}_${dicGoods.quality}`); } diff --git a/shared/pubUtils/playerCe.ts b/shared/pubUtils/playerCe.ts index e8f722c57..aab78c4b0 100644 --- a/shared/pubUtils/playerCe.ts +++ b/shared/pubUtils/playerCe.ts @@ -95,7 +95,7 @@ export async function reCalAllHeroCe(type: number, roleId: string, update: RoleU update.topLineupCe = topLineupCe; } - console.log('************ roleAttr', update.attr) + // console.log('************ roleAttr', update.attr) role = await RoleModel.incRoleInfo(roleId, { ce: allIncCe },update); let guild = await GuildModel.updateCe(roleId, allIncCe); // 公会更新战力 @@ -959,28 +959,28 @@ async function calSchoolStarIncAttr(role: RoleType, heros: HeroType[], type: num */ function calScrollAddAttr(role: RoleType,heros: HeroType[], hid: number) { let { attr: roleAttrs } = role; - console.log('********** calScrollAddAttr', hid) + // console.log('********** calScrollAddAttr', hid) let curHero = heros.find(cur => cur.hid == hid); let dicHero = gameData.hero.get(hid); if (!curHero || !dicHero) return roleAttrs; let { quality } = dicHero; let { star, quality: curQuality, colorStar } = curHero; - console.log('********** calScrollAddAttr curHero', star, curQuality, colorStar); + // console.log('********** calScrollAddAttr curHero', star, curQuality, colorStar); let heroScroll = getScollByStar(quality, star, curQuality, colorStar); if (!heroScroll) return roleAttrs; - console.log('********** heroScroll', heroScroll); + // console.log('********** heroScroll', heroScroll); let isInit = star == dicHero.initialStars && curQuality == dicHero.quality && colorStar == 0; let preScroll = isInit? null: gameData.preHeroScroll.get(heroScroll.id); - console.log('********** preScroll', preScroll); + // console.log('********** preScroll', preScroll); heroScroll.ceAttr.forEach((add, attrId) => { let preAdd = preScroll ? preScroll.ceAttr.get(attrId) : 0; let fixUp = (add - preAdd) * HERO_CE_RATIO; - console.log('********** preAdd', attrId, preAdd, fixUp); + // console.log('********** preAdd', attrId, preAdd, fixUp); updateRoleAttr(roleAttrs, attrId, { inc: { fixUp } }); }); return roleAttrs; diff --git a/shared/pubUtils/roleUtil.ts b/shared/pubUtils/roleUtil.ts index bb5f703d5..01fb3cecc 100644 --- a/shared/pubUtils/roleUtil.ts +++ b/shared/pubUtils/roleUtil.ts @@ -325,18 +325,18 @@ export class CreateHeroes extends UpdateHeroes { public async clearTask(activitiesTypeMap: ActivityInRemote[]) { // 任务 - console.log('****** checkTask before', Date.now()) + // console.log('****** checkTask before', Date.now()) let m1 = await checkTask(this.roleId, TASK_TYPE.HERO_NUM, this.heroNum, true, {}); let m2 = await checkTaskWithHeroes(this.roleId, TASK_TYPE.HERO_QUALITY, this.resultHeroes); let m3 = await checkTaskWithHeroes(this.roleId, TASK_TYPE.HERO_QUALITY_STAR_UP, this.resultHeroes); let m4 = await checkTaskWithHeroes(this.roleId, TASK_TYPE.HERO_LV, this.resultHeroes); this.taskPushMessage.push(...m1, ...m2, ...m3, ...m4); - console.log('****** checkTask after', Date.now()) + // console.log('****** checkTask after', Date.now()) //成长任务 - console.log('****** accomplishTask before', Date.now()) + // console.log('****** accomplishTask before', Date.now()) let mm1 = await accomplishTask(this.serverId, this.roleId, TASK_TYPE.HERO_NUM, this.heroNum, null, activitiesTypeMap) let mm2 = await accomplishTask(this.serverId, this.roleId, TASK_TYPE.HERO_QUALITY, this.heroNum, { heroes: this.resultHeroes }, activitiesTypeMap); - console.log('****** accomplishTask after', Date.now()) + // console.log('****** accomplishTask after', Date.now()) this.activityTaskPushMessage.push(...mm1, ...mm2); } diff --git a/shared/pubUtils/sdkUtil.ts b/shared/pubUtils/sdkUtil.ts index f86ea7fc9..83f7b011f 100644 --- a/shared/pubUtils/sdkUtil.ts +++ b/shared/pubUtils/sdkUtil.ts @@ -8,7 +8,7 @@ import * as crypto from 'crypto' export function md5(str: string, treatStr?: (str: string) => string) { if(treatStr) str = treatStr(str); - console.log('*****str', str) + // console.log('*****str', str) return crypto.createHash('md5').update(str, 'utf8').digest("hex"); }; diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts index 7ae3972a6..4b9e18956 100644 --- a/shared/pubUtils/taskUtil.ts +++ b/shared/pubUtils/taskUtil.ts @@ -557,7 +557,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: let taskRecord = await ActivityDailyChallengesModel.findDataByCellIndex(serverId, activity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType) let recordData = taskRecord && taskRecord.data ? JSON.parse(taskRecord.data) : null let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, activity.activityId, parma, recordData); - console.log('******* dailyChallenge', addCount, record) + // console.log('******* dailyChallenge', addCount, record) if (addCount) { if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE || taskType == TASK_TYPE.BATTLE_TOWER_LV || taskType == TASK_TYPE.FRIEND_NUM) { let playerRecord = await ActivityDailyChallengesModel.setTaskCount(serverId, activity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType, addCount);