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

日志：修改日志信息

Browse Source
This commit is contained in:
luying
2022-01-08 14:42:27 +08:00
parent 4bb71ea650
commit f2c4be6443
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app.ts
View File

@@ -1,5 +1,5 @@
require('xprofiler').start({
log_dir: '/root/zyz/game-server/logs',
log_dir: '/zyz_logs/xprofiler',
});
import { COM_TEAM_STATUS, STATUS } from './app/consts';
import {

3
game-server/app/servers/battle/handler/comBattleHandler.ts
View File

@@ -182,7 +182,8 @@ export class ComBattleHandler {
let sid = session.get('sid');
let { teamCode, isFrd } = msg;
let teamStatus = this.teamMap.get(teamCode);
if (!teamStatus || teamStatus.status !== COM_TEAM_STATUS.DEFAULT) return resResult(STATUS.COM_BATTLE_TEAM_INVALID);
if (!teamStatus) return resResult(STATUS.COM_BATTLE_TEAM_INVALID);
if(teamStatus.status !== COM_TEAM_STATUS.DEFAULT) return resResult(STATUS.COM_BATTLE_TEAM_NOT_DEFAULT);
if (teamIsFullToStart(teamStatus)) return resResult(STATUS.COM_BATTLE_MEMBER_LIMIT);
if (teamStatus.roleIds.indexOf(roleId) !== -1) return resResult(STATUS.COM_BATTLE_DUP_ENTER);
if (teamStatus.blacklist.indexOf(roleId) != -1) return resResult(STATUS.COM_BATTLE_BE_KICKED);

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

@@ -260,11 +260,8 @@ module.exports = {
{ 'id': 'role-server-3', 'host': '172.16.4.108', 'port': 6062 },
],
'battle': [
{ 'id': 'battle-server-1', 'host': '172.16.4.108', 'port': 6054 }
],
'gate': [
{ 'id': 'gate-server-1', 'host': '172.16.4.108', 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'clientPort': 3014, 'frontend': true },
{ 'id': 'gate-server-2', 'host': '172.16.4.108', 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'clientPort': 3015, 'frontend': true }
{ 'id': 'battle-server-1', 'host': '172.16.4.108', 'port': 6054 },
{ 'id': 'battle-server-2', 'host': '172.16.4.108', 'port': 6067 },
],
'gm': [],
'systimer': [

2
game-server/xtransitConfig/sq.js
View File

@@ -12,7 +12,7 @@ module.exports = {
packages: [], // 数组，配置需要监控的项目依赖文件全路径
// III. 不是很重要的可选的配置
logDir: './game-server/logs', // xprofiler 插件生成性能日志文件的目录，默认两者均为 os.tmpdir()
logDir: '/zyz_logs/xprofiler', // xprofiler 插件生成性能日志文件的目录，默认两者均为 os.tmpdir()
docker: false, // 默认 false, 系统数据采集会依赖当前是否是 docker 环境而进行一些特殊处理，可以手动强制指定当前实例是否为 docker 环境
ipMode: false, // 默认 false，此时仅使用 hostname 作为 agentId；设置为 true 后 agentId 组装形式为 ${ip}_${hostname}
libMode: false, // 默认 false，此时采集如果收到 shutdown 事件会退出当前进程；如果是以第三方库的形式引用接入应用内，请将此属性设置为 true

1
shared/consts/statusCode.ts
View File

@@ -134,6 +134,7 @@ export const STATUS = {
COM_BATTLE_BLACKLIST: { code: 20633, simStr: '队伍中存在黑名单玩家' },
COM_BATTLE_BE_KICKED: { code: 20634, simStr: '您已被队伍踢出，无法加入'},
COM_BATTLE_CREATE_CE_LIMIT: { code: 20635, simStr: '你的战力不足，不可设置该级别限制' },
COM_BATTLE_TEAM_NOT_DEFAULT: { code: 20636, simStr: '队伍已过期' },
// 共斗藏宝图合成
COM_BLUEPRT_QUALITY_CANNOT_COMPOSE: { code: 20650, simStr: '该品质藏宝图不可合成' },
COM_BLUEPRT_COUNT_ERROR: { code: 20651, simStr: '材料数量不足' },