diff --git a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts index 457d62e54..8173490aa 100644 --- a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts +++ b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts @@ -62,7 +62,7 @@ export class RechargeMoneyHandler { } let notGetRecord = playerData.recordArr[0]; - console.log('notGetRecord', JSON.stringify(notGetRecord)); + // console.log('notGetRecord', JSON.stringify(notGetRecord)); await ActivityRechargeMoneyModel.addRecord(notGetRecord._id, item.id, `${item.gid}&${item.count}`); let goods = await addItems(roleId, roleName, sid, [{ id: item.gid, count: item.count }], ITEM_CHANGE_REASON.RECHARGE_REWARD) diff --git a/game-server/app/servers/battle/handler/normalBattleHandler.ts b/game-server/app/servers/battle/handler/normalBattleHandler.ts index 1c33f4d9a..d59fad12f 100644 --- a/game-server/app/servers/battle/handler/normalBattleHandler.ts +++ b/game-server/app/servers/battle/handler/normalBattleHandler.ts @@ -157,7 +157,7 @@ export class NormalBattleHandler { if (warInfo.warType == WAR_TYPE.COM_BATTLE) { return resResult(STATUS.BATTLE_END_WRONG_TYPE); } - console.log('####### warInfo.warType', warInfo.warType) + // console.log('####### warInfo.warType', warInfo.warType) const BattleRecord = await BattleRecordModel.getBattleRecordByCode(battleCode, true); if (!BattleRecord || BattleRecord.status != 0) { @@ -255,7 +255,7 @@ export class NormalBattleHandler { await challengeDailyGK(serverId, roleId, activityId, battleId) } } else if (warInfo.warType == WAR_TYPE.ACT_NEW_HERO_GK) { - console.log('##### warInfo.warType', warInfo.warType, isSuccess) + // console.log('##### warInfo.warType', warInfo.warType, isSuccess) if (isSuccess) { isFirst = await challengeNewHeroGK(serverId, roleId, activityId, battleId) } diff --git a/game-server/app/servers/guild/handler/gateActivityHandler.ts b/game-server/app/servers/guild/handler/gateActivityHandler.ts index ca00c976d..c39487a60 100644 --- a/game-server/app/servers/guild/handler/gateActivityHandler.ts +++ b/game-server/app/servers/guild/handler/gateActivityHandler.ts @@ -133,7 +133,7 @@ export class GateActivityHandler { obj.setMemberRecord(code, newMemberRecord); let nextWeek = getTimeFun().getAfterDayWithHour(7); - console.log('####### nextWeek', nextWeek) + // console.log('####### nextWeek', nextWeek) let index = getGAIndexInPinus(this.aid); // 更新redis数据 let myR = new Rank(REDIS_KEY.USER_GATE_ACTIVITY, { serverId, guildCode, index }, true); diff --git a/game-server/app/servers/guild/handler/guildTrainHandler.ts b/game-server/app/servers/guild/handler/guildTrainHandler.ts index c73f7d470..4667f99f2 100644 --- a/game-server/app/servers/guild/handler/guildTrainHandler.ts +++ b/game-server/app/servers/guild/handler/guildTrainHandler.ts @@ -283,7 +283,7 @@ export class GuildTrainHandler { let { trainInstances } = getArmyTrainJuDian(trainId); let trainInfo = getGuildTrainGkInfo(trainId, hid); let { progress } = findWhere(trainInstances, { hid }); - console.log('progress = ' + progress); + // console.log('progress = ' + progress); let guildTrain = await GuildTrainModel.findTrainInstanceBoxByIndex(code, trainId, hid, progress); if (!guildTrain) { res.releaseCallback();//解锁 diff --git a/game-server/app/services/activity/selfServiceShopActivityService.ts b/game-server/app/services/activity/selfServiceShopActivityService.ts index 5da428b84..b7030306e 100644 --- a/game-server/app/services/activity/selfServiceShopActivityService.ts +++ b/game-server/app/services/activity/selfServiceShopActivityService.ts @@ -65,7 +65,7 @@ export async function getPlayerActivityData(activityId: number, serverId: number } let records = (playerSelfServerData && playerSelfServerData.challengeRecords) ? playerSelfServerData.challengeRecords : []; for (let record of records) { - console.log(challengeBeginTime, challengeEndTime, record.time) + // console.log(challengeBeginTime, challengeEndTime, record.time) if (record.time >= challengeBeginTime && record.time <= challengeEndTime) { playerData.challengeCount++; } diff --git a/game-server/app/services/activity/timeLimitRankService.ts b/game-server/app/services/activity/timeLimitRankService.ts index ec0e9c932..69b5bbf4e 100644 --- a/game-server/app/services/activity/timeLimitRankService.ts +++ b/game-server/app/services/activity/timeLimitRankService.ts @@ -75,7 +75,7 @@ export async function sendRankMail(data: TimeLimitRankData, serverId: number) { let reward = data.getRewardByRank(rank); if(reward) { let guild = await GuildModel.findByCode(code, serverId, '+members'); - console.log(guild.members) + // console.log(guild.members) for(let roleId of guild.members) { await sendMailByContent(MAIL_TYPE.TIME_LIMIT_RANK, roleId, { params: [data.tabName,`${rank}`], diff --git a/game-server/app/services/equipService.ts b/game-server/app/services/equipService.ts index 917da8a33..41a5a01aa 100644 --- a/game-server/app/services/equipService.ts +++ b/game-server/app/services/equipService.ts @@ -39,7 +39,7 @@ export function getRandSeResult(id: number, randSe: RandSe[], originSe: RandSe[] randomResult.push(...allRandom); } - console.log('##### getRandSeResult', startId, effectCount) + // console.log('##### getRandSeResult', startId, effectCount) for (let i = startId; i < effectCount; i++) { if(randSe[i]) { diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts index 6b9670c15..380bebc11 100644 --- a/game-server/app/services/guildActivity/guildActivityService.ts +++ b/game-server/app/services/guildActivity/guildActivityService.ts @@ -620,7 +620,7 @@ export async function sendGuildCityDeclare(cityId: number, declareGuildCode: str * @param serverId 区id */ export async function calWoodenHorseAndSend(serverId: number) { - console.log('calWoodenHorseAndSend'); + // console.log('calWoodenHorseAndSend'); let obj = getRaceActivityObj(); return await obj.calServerHorses(serverId); } diff --git a/game-server/app/services/warRewardService.ts b/game-server/app/services/warRewardService.ts index 02a9829bb..f1d4ed489 100644 --- a/game-server/app/services/warRewardService.ts +++ b/game-server/app/services/warRewardService.ts @@ -143,7 +143,7 @@ export class WarReward { // let warType = this.warInfo.warType; if(this.isSuccess) { // 成功了才给固定奖励 - console.log(this.fixReward) + // console.log(this.fixReward) if(this.fixReward) this.handleFixReward(num); if(this.conditionReward) this.handleConditionReward(num); if(this.randomReward) await this.handleRandomReward(num); diff --git a/shared/db/ActivityRechargeMoney.ts b/shared/db/ActivityRechargeMoney.ts index a9976113f..728e8635b 100644 --- a/shared/db/ActivityRechargeMoney.ts +++ b/shared/db/ActivityRechargeMoney.ts @@ -27,7 +27,7 @@ export default class Activity_Recharge_Money extends BaseModel { //添加领取记录 public static async addRecord(_id: string, poolId: number, reward: string) { - console.log(_id, poolId, reward) + // console.log(_id, poolId, reward) let result: ActivityRechargeMoneyModelType = await ActivityRechargeMoneyModel.findOneAndUpdate({ _id }, { $set: { poolId, reward, rewardTime: new Date() } }, { upsert: true, new: true }).lean(true); diff --git a/shared/db/ActivityTaskPass.ts b/shared/db/ActivityTaskPass.ts index 4cd6d667c..93bacd425 100644 --- a/shared/db/ActivityTaskPass.ts +++ b/shared/db/ActivityTaskPass.ts @@ -63,7 +63,7 @@ export default class Activity_Task_Pass extends BaseModel { } public static async receiveItems(serverId: number, activityId: number, roleId: string, roundIndex: number, receivedReward: ReceivedReward[]) { - console.log(receivedReward) + // console.log(receivedReward) let result: ActivityTaskPassModelType = await ActivityTaskPassModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex}, { $push: { receivedReward: { $each: receivedReward } }}, { upsert: true, new: true }).lean(true); return result; diff --git a/shared/domain/activityField/firstGiftField.ts b/shared/domain/activityField/firstGiftField.ts index a4e6d6443..2ec92b5d4 100644 --- a/shared/domain/activityField/firstGiftField.ts +++ b/shared/domain/activityField/firstGiftField.ts @@ -57,7 +57,7 @@ export class FirstGiftPage { items: FirstGiftItem[] = []; //奖励 constructor(data: FirstGiftDataInDb) { - console.log(data) + // console.log(data) this.pageIndex = data.pageIndex; this.targetMoney = data.targetMoney; for (let obj of data.rewards) { diff --git a/shared/domain/activityField/popUpShopField.ts b/shared/domain/activityField/popUpShopField.ts index 6f5f911f9..cd5302e09 100644 --- a/shared/domain/activityField/popUpShopField.ts +++ b/shared/domain/activityField/popUpShopField.ts @@ -255,16 +255,16 @@ export class PopUpShopPackage { // 检查这个礼包是否可以推送 public checkPackageCanPush(conditionType: POP_UP_SHOP_CONDITION_TYPE) { // 1. 达成条件类型是否符合 - console.log('######### 3.5.1', this.conditionType, conditionType, this.conditionType != conditionType) + // console.log('######### 3.5.1', this.conditionType, conditionType, this.conditionType != conditionType) if(this.conditionType != conditionType) return false; // 2. 判断同类型是否是已经有在持续中的 - console.log('######### 3.5.2', this.checkPushingItem, this.isPushing); + // console.log('######### 3.5.2', this.checkPushingItem, this.isPushing); if(this.checkPushingItem && this.isPushing) return false; // 3. 自然日内推送次数 - console.log('######### 3.5.3', this.canLvUp, this.pushCnt, this.hasPushCnt, this.pushCnt != -1, this.hasPushCnt >= this.pushCnt) + // console.log('######### 3.5.3', this.canLvUp, this.pushCnt, this.hasPushCnt, this.pushCnt != -1, this.hasPushCnt >= this.pushCnt) if(this.canLvUp == 1 && this.pushCnt != -1 && this.hasPushCnt >= this.pushCnt) return false; // 4. 连续无视次数 - console.log('######### 3.5.4', this.hasPassCnt, this.passCnt, this.passCnt > 0 && this.hasPassCnt >= this.passCnt) + // console.log('######### 3.5.4', this.hasPassCnt, this.passCnt, this.passCnt > 0 && this.hasPassCnt >= this.passCnt) if(this.passCnt > 0 && this.hasPassCnt >= this.passCnt) return false; return true; @@ -408,18 +408,18 @@ export class PopShopItem { } public checkItemCanPush(conditionType: POP_UP_SHOP_CONDITION_TYPE, param: PopUpConditionParamInter) { - console.log('##### xyz?1', this.hasBoughtCnt >= this.buyCnt) + // console.log('##### xyz?1', this.hasBoughtCnt >= this.buyCnt) if(this.hasBoughtCnt >= this.buyCnt) return false; - console.log('##### xyz?2', this.parent.getVipLv(), this.vipLv, this.parent.getVipLv() < this.vipLv) + // console.log('##### xyz?2', this.parent.getVipLv(), this.vipLv, this.parent.getVipLv() < this.vipLv) if(this.parent.getVipLv() < this.vipLv || this.parent.getLv() < this.lv) return false; - console.log('##### xyz?3', this.parent.getLv(), this.lv, this.parent.getLv() < this.lv) + // console.log('##### xyz?3', this.parent.getLv(), this.lv, this.parent.getLv() < this.lv) if(this.parent.getLv() < this.lv) return false; - console.log('##### xyz?4', this.checkKeyTime()) + // console.log('##### xyz?4', this.checkKeyTime()) if(!this.checkKeyTime()) return false - console.log('##### xyz?5', this.canLvUp, this.hasPushCnt, this.pushCnt, this.pushCnt != -1, this.hasPushCnt >= this.pushCnt) + // console.log('##### xyz?5', this.canLvUp, this.hasPushCnt, this.pushCnt, this.pushCnt != -1, this.hasPushCnt >= this.pushCnt) if(this.canLvUp == 0 && this.pushCnt != -1 && this.hasPushCnt >= this.pushCnt) return false - console.log('##### xyz?6', conditionType, this.conditionParam, param) + // console.log('##### xyz?6', conditionType, this.conditionParam, param) switch(conditionType) { case POP_UP_SHOP_CONDITION_TYPE.LV_TO: return param.oldLv < this.conditionParam[0] && param.newLv >= this.conditionParam[0]; diff --git a/shared/domain/activityField/rechargeMoneyField.ts b/shared/domain/activityField/rechargeMoneyField.ts index d75fa9da5..2c7f04531 100644 --- a/shared/domain/activityField/rechargeMoneyField.ts +++ b/shared/domain/activityField/rechargeMoneyField.ts @@ -150,7 +150,7 @@ export class RechargeMoneyData extends ActivityBase { public initData(data: string) { let dataObj: RechargeMoneyInDb = JSON.parse(data); - console.log(dataObj); + // console.log(dataObj); for(let pool of dataObj.pool) { let obj = new RechargeMoneyPool(pool); this.pool.push(obj); diff --git a/shared/domain/activityField/refreshShopField.ts b/shared/domain/activityField/refreshShopField.ts index e330f2ed4..47312b8e9 100644 --- a/shared/domain/activityField/refreshShopField.ts +++ b/shared/domain/activityField/refreshShopField.ts @@ -75,7 +75,7 @@ export class RefreshShopItem { let records = data.records ? data.records : []; let buyRecords = records.filter(obj => { let curRefTime = getZeroPointOfTime(obj.time, this.refreshType); - console.log(curRefTime, refZeroPoint) + // console.log(curRefTime, refZeroPoint) return obj && obj.id === this.id && obj.pageIndex == this.pageIndex && curRefTime == refZeroPoint }); this.buyCount = buyRecords.length; diff --git a/shared/domain/activityField/signInField.ts b/shared/domain/activityField/signInField.ts index ffc9534d5..3f424198c 100644 --- a/shared/domain/activityField/signInField.ts +++ b/shared/domain/activityField/signInField.ts @@ -65,7 +65,7 @@ export class SignInData extends ActivityBase { if(this.type == ACTIVITY_TYPE.SIGN_IN || this.type == ACTIVITY_TYPE.SIGN_IN_VIP) { let time = getZeroPointOfTime(obj.time, SHOP_REFRESH_TYPE.DAILY, 0) let today = getZeroPoint(SHOP_REFRESH_TYPE.DAILY, 0); - console.log('setPlayerRecords', time, today) + // console.log('setPlayerRecords', time, today) if(day.indexOf(time) == -1 && time < today) { this.todayIndex++; day.push(time); diff --git a/shared/domain/backEndField/params.ts b/shared/domain/backEndField/params.ts index 67e8922ce..5c6e28f75 100644 --- a/shared/domain/backEndField/params.ts +++ b/shared/domain/backEndField/params.ts @@ -100,11 +100,11 @@ export class UpdateRegionParams { checkParams() { if(!this.id || !this.name || !this.prefix || !isString(this.versionCode) || !isString(this.curVersion) || !isString(this.updateResUrl)) { - console.log('1111', !this.id, !this.name, !this.prefix, !isString(this.versionCode),!isString(this.curVersion), !isString(this.updateResUrl)) + // console.log('1111', !this.id, !this.name, !this.prefix, !isString(this.versionCode),!isString(this.curVersion), !isString(this.updateResUrl)) return false } if(this.isOpen && (!this.maxPlayerCnt || !isArray(this.timers) || this.timers.length <= 0 || !isArray(this.activityGroupId) || this.activityGroupId.length <= 0 )) { - console.log('2222') + // console.log('2222') return false } return true; @@ -200,7 +200,7 @@ export class CreateServerParam { } checkParams() { - console.log('##### createNew', this.env, this.openTime, this.stopRegisterTime, this.hasOpenMail, this.hasCircleMail) + // console.log('##### createNew', this.env, this.openTime, this.stopRegisterTime, this.hasOpenMail, this.hasCircleMail) if(!this.env || !this.openTime || !this.stopRegisterTime ) { return false }