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

全局：清理部分console

Browse Source
This commit is contained in:
luying
2021-04-13 17:30:51 +08:00
parent 4d14bc2676
commit 95adc48d2a
20 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/servers/battle/handler/guildHandler.ts
View File

@@ -830,7 +830,7 @@ export class GuildHandler {
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let startTime = getRefTime(new Date(), 0, -3);
console.log(startTime)
// console.log(startTime)
const list = await GuildRecModel.getGuildRec(code, getSeconds(startTime));
return resResult(STATUS.SUCCESS, { list });

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

@@ -265,7 +265,7 @@ export class GateActivityHandler {
// ! 测试接口
async debugGetPrivate(msg: { }, session: BackendSession) {
let guildCode = session.get('guildCode');
console.log(guildCode);
// console.log(guildCode);
let serverId = session.get('serverId');
let res = getGateActivityObj().getObj(guildCode, serverId);
return resResult(STATUS.SUCCESS, res)

2
game-server/app/servers/role/handler/shopHandler.ts
View File

@@ -32,7 +32,7 @@ export class ShopHandler {
let shopItemList = new Array<ShopItemListParam>(); // 返回
let dbDicShop = await DicShopListModel.findByShopId(shopId);
let userShopRecs = await UserShopModel.findMapByShopId(roleId, shopId);
console.log(JSON.stringify([...userShopRecs]))
// console.log(JSON.stringify([...userShopRecs]))
if(!dbDicShop || dbDicShop.useJson) { // 完全使用json中配置的商品，数据库只做排序用，数据库内没有的排到最后

2
game-server/app/services/dungeonService.ts
View File

@@ -46,7 +46,7 @@ export async function checkDungeonAndIncrease(roleId: string, inc: number, isRef
if(dungeonCnt + inc > DUNGEON_CONST.MAX_CNT + dungeonBuyCnt ) {
return { status: -1, resResult: resResult(STATUS.DUNGEON_TIMES_LACK) }
}
console.log('needRefresh', needRefresh);
// console.log('needRefresh', needRefresh);
await RoleModel.increaseDungeonCnt(roleId, needRefresh, inc, curTime);
return {status: 1, data: {
battleCount: DUNGEON_CONST.MAX_CNT + dungeonBuyCnt - dungeonCnt - inc,

2
game-server/app/services/guildActivityObjService.ts
View File

@@ -21,7 +21,7 @@ export class GateActivityObject {
private guilds: Map<number, string[]> = new Map(); // 参加的所有军团 server => [guildCode]
public getObj(guildCode: string, serverId: number) {
console.log(guildCode, serverId)
// console.log(guildCode, serverId)
return {
gateHp: this.getGateHpAndInc(guildCode),
members: this.members.get(guildCode)||[],

4
game-server/app/services/guildActivityService.ts
View File

@@ -470,7 +470,7 @@ export async function autoDeclare(serverId: number) {
guardList.push({ cityId, guardGuildCode });
await GuildActivityCityModel.clearGuard(serverId, cityId);
}
console.log(JSON.stringify(guardList));
// console.log(JSON.stringify(guardList));
for (let { cityId, guardGuildCode } of guardList) {
let dicCity = gameData.cityActivity.get(cityId);
if (guardGuildCode && dicCity.nextCity) {
@@ -613,7 +613,7 @@ export async function calWoodenHorseAndSend(serverId: number) {
let len = map.get(rank).length;
if( len >= limit) {
// 发送
console.log('send', woodenHorseList.length);
// console.log('send', woodenHorseList.length);
let curRank = ranks[rank];
let wh = await obj.getWoodenHorse(curRank.code, serverId);
let myGuildRank = new SimpleGuildRankWithTimeParam(curRank.rank, curRank.code, curRank.name, wh);

4
game-server/app/services/guildService.ts
View File

@@ -29,7 +29,7 @@ import { Rank } from "./rankService";
export async function checkAuth(func: number, roleId: string, code?: string, userGuild?: UserGuildType) {
const auth = await UserGuildModel.getMyAuth(roleId, code, userGuild);
const dicGuildAuth = gameData.guildAuth.get(func);
console.log('*checkAuth*', auth, dicGuildAuth)
// console.log('*checkAuth*', auth, dicGuildAuth)
if(!dicGuildAuth) return false;
return dicGuildAuth.includes(auth);
@@ -188,7 +188,7 @@ export async function addActive(roleId: string, serverId: number, id: number, ty
*/
export async function getUserGuildWithRefActive(roleId: string, select: string, notPush?: boolean) {
let userGuild = await UserGuildModel.getMyGuild(roleId, select? select + ' wishGoods +refTimeDaily': '+refTimeDaily');
console.log(JSON.stringify(userGuild))
// console.log(JSON.stringify(userGuild))
if(!userGuild) return false;
let { receivedActive, refTimeDaily, activeDaily, activeRecord, wishGoods } = userGuild;

2
game-server/app/services/playerCeService.ts
View File

@@ -19,7 +19,7 @@ import { updateUserInfo } from './redisService';
export async function calPlayerCeAndSave(type: number, sid: string, roleId: string, originHero: HeroType, update: HeroUpdate, args?: Array<number>) {
let {role, pushHeros, topLineupCe, hero, guild, serverId} = await pubCalPlayerCeAndSave(type, roleId, originHero, update, args);
console.log(JSON.stringify(pushHeros))
// console.log(JSON.stringify(pushHeros))
//下发战力
let uids = [{ uid: roleId, sid }];
pinus.app.get('channelService').pushMessageByUids('onPlayerCeUpdate', resResult(STATUS.SUCCESS, { ce: reduceCe(role.ce) , heros: pushHeros, topLineupCe: reduceCe(topLineupCe) }), uids);

6
game-server/app/services/pvpService.ts
View File

@@ -111,7 +111,7 @@ export async function refreshEnemies(role: RoleType, score: number, pLv: number)
}
export async function matchPlayerByRank(seasonNum: number, oppPlayers: OppPlayers[], mapWarJson: DicWarJson[], roleId: string, pos: number) {
console.log('matchPlayerByRank', JSON.stringify(oppPlayers))
// console.log('matchPlayerByRank', JSON.stringify(oppPlayers))
let r = new Rank(REDIS_KEY.PVP_RANK, {});
let ridRanks = new Array<number>(); // 已经被使用了的排名
for(let { roleId: curRoleId } of oppPlayers) {
@@ -173,7 +173,7 @@ export async function matchPlayerByRank(seasonNum: number, oppPlayers: OppPlayer
}
async function matchPlayer(seasonNum: number, oppPlayers: OppPlayers[], mapWarJson: DicWarJson[], roleId: string, pLv: number, dicOpp: DicPvpOpponent ) {
console.log('matchPlayer', JSON.stringify(oppPlayers))
// console.log('matchPlayer', JSON.stringify(oppPlayers))
let { id: pos, minLv, maxLv } = dicOpp
let range = await PvpDefenseModel.findByTeamLv(seasonNum, pLv + minLv, pLv + maxLv);
@@ -247,7 +247,7 @@ async function generPlayerOppHis(pvpdefense: PvpDefenseType, mapWarJson: DicWarJ
}
async function matchRobot(oppPlayers: OppPlayers[], mapWarJson: DicWarJson[], role: RoleType, pLv: number, dicOpp: DicPvpOpponent) {
console.log('matchRobot', JSON.stringify(oppPlayers))
// console.log('matchRobot', JSON.stringify(oppPlayers))
let { lv: myLv, topLineupCe: myCe, roleId } = role;
let { id: pos, minLv, maxLv, ratio } = dicOpp;

2
game-server/app/services/rankService.ts
View File

@@ -606,7 +606,7 @@ export class Rank {
if (this.isUnion) {
key = await this.generateUnionRank();
}
console.log('**getMyRank',key, this.composeFields(this.key, myId), this.key, myId)
// console.log('**getMyRank',key, this.composeFields(this.key, myId), this.key, myId)
let myRank = await redisClient().zrevrankAsync(key, this.composeFields(this.key, myId));
if(!myRank && myRank != 0) {
return 0;

2
game-server/app/services/timeTaskService.ts
View File

@@ -217,7 +217,7 @@ export async function setPvpDefResult(pvpDefense: PvpDefenseType, seasonNum: num
* 每周重置地图
*/
export async function resetPvpWarId() {
console.log('resetPvpWarId');
// console.log('resetPvpWarId');
let systemConfig = await SystemConfigModel.findSystemConfig();
let warIds = deepCopy(getPvpGkWarIds());
let index = indexOf(warIds, systemConfig.warId);

2
game-server/app/services/warRewardService.ts
View File

@@ -190,7 +190,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, this.fixReward);
if(this.conditionReward) this.handleConditionReward(num, this.conditionReward);
if(this.randomReward) await this.handleRandomReward(num, this.randomReward);

2
shared/db/FriendRelation.ts
View File

@@ -61,7 +61,7 @@ export default class FriendRelation extends BaseModel {
let result: FriendRelationType = await document.lean({ getters: true, virtuals: true });;
console.log(JSON.stringify(result));
// console.log(JSON.stringify(result));
return result;
}

2
shared/db/Sms.ts
View File

@@ -65,7 +65,7 @@ export default class Sms extends BaseModel {
}
public hasSendToday() {
console.log(moment(this.updateTime).format('YYYY-MM-DD'), moment(Date.now()).format('YYYY-MM-DD'));
// console.log(moment(this.updateTime).format('YYYY-MM-DD'), moment(Date.now()).format('YYYY-MM-DD'));
return moment(this.updateTime).format('YYYY-MM-DD') === moment(Date.now()).format('YYYY-MM-DD');
}

2
shared/db/User.ts
View File

@@ -131,7 +131,7 @@ export default class User extends BaseModel {
}
public static async createOrUpdate(isGuest: boolean, tel: string, token: string, platform: string, pkgName: string, serverType: string, deviceId: string) {
console.log(tel);
// console.log(tel);
let user: UserType = await UserModel.findOne({ tel }).lean({ getters: true });
if (!user) {

2
shared/domain/battleField/guildActivity.ts
View File

@@ -68,7 +68,6 @@ export class WoodenHorse {
* @returns {boolean} needSendEnd 是否跑到终点发送结束新号
*/
public calCurWoodenHorse(events: Event[]): boolean {
console.log('**', this.guildName, this.status, this.distance, Date.now(), this.speed, JSON.stringify(events))
if(this.status == 2) return false; // TODO 写进const表
if(this.status == 0 && this.stopContinueTime && Date.now() > this.stopContinueTime) {
this.status = 1; this.stopContinueTime = 0;
@@ -121,7 +120,6 @@ export class WoodenHorse {
this.status = 0; // TODO 写进const表
this.speed = 0;
}
console.log('**effect', this.speed, JSON.stringify(effectiveEvents));
return false;
}

3
shared/domain/rank.ts
View File

@@ -95,7 +95,6 @@ export class GuildRankParam {
this.name = guild.name;
this.lv = guild.lv;
let leader = <RoleType>guild.leader;
console.log('**', JSON.stringify(leader))
let _leader = new GuildLeader(leader);
this.leader = _leader;
this.memberCnt = guild.memberCnt;
@@ -179,7 +178,7 @@ export class SimpleGuildRankWithTimeParam extends SimpleGuildRankParam {
constructor(rank: number, code: string, name: string, obj: WoodenHorse|{distance: number, time: number, startTime: number, durability: number}|false) {
super(rank, code, name, obj?obj.distance:0);
console.log(JSON.stringify(obj));
// console.log(JSON.stringify(obj));
if(obj) {
this.num = obj.distance;
this.time = Math.floor((obj.time - obj.startTime)/1000);

4
shared/pubUtils/httpUtil.ts
View File

@@ -64,8 +64,8 @@ export async function vidHttpRequest(addr: string, body: any) {
let res = await request(options);
let check = checkSign(res);
if(!check) return false;
console.log('*****request result*****');
console.log(JSON.stringify(res));
// console.log('*****request result*****');
// console.log(JSON.stringify(res));
return res;
} catch(e) {
console.error(e);

4
shared/pubUtils/playerCe.ts
View File

@@ -289,7 +289,7 @@ export function calHeroStarIncAttr(originHero: HeroType, update: HeroUpdate, typ
const isWake = colorStar > 0; // 是否觉醒，只要激活了觉醒，彩星就会 > 1
const isFirstWake = colorStar > 0 && originColorStar <= 0; // 是否是初次觉醒
const isUpStar = originStar != star || originColorStar != colorStar; // 是否有升星
console.log('*isUpstar', isUpStar, originStar, star, originColorStar, colorStar)
// console.log('*isUpstar', isUpStar, originStar, star, originColorStar, colorStar)
const dicStar = isWake ? getHeroWakeByQuality(dicHero.quality, originColorStar) : getHeroStarByQuality(quality, originStar); // 星级表
@@ -738,7 +738,7 @@ export function calHeroEquipIncAttr(hero: HeroType) {
let attr = (value1 + lv * valueup) * (HERO_CE_RATIO + valueRefine) + valueJewel * HERO_CE_RATIO;
if(attr > 0) {
console.log('装备战力：', i, attr);
// console.log('装备战力：', i, attr);
updateHeroAttr(heroAttrs, i, { set: { equipUp: attr } })
}
}

2
shared/pubUtils/util.ts
View File

@@ -30,7 +30,7 @@ export function aesEncryptcfb(data, key, iv) {
const cipher = crypto.createCipheriv('aes-192-cfb', key, iv);
let crypted = cipher.update(data, 'utf8', 'hex');
crypted += cipher.final('hex');
console.log('****aesEncryptcfb', data, crypted)
// console.log('****aesEncryptcfb', data, crypted)
return crypted;
}