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

Merge branch 'master' into feature/backend

Browse Source
This commit is contained in:
luying
2021-12-15 09:53:28 +08:00
parent d4722c4099 cb865ae6af
commit 2092d692df
4 changed files with 256 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/connector/handler/entryHandler.ts
+1 -1
View File
@@ -209,7 +209,7 @@ export class EntryHandler {
savePlayTime(roleInfo.userCode); savePlayTime(roleInfo.userCode);
} }
}); });
reportTAUserSet(TA_USERSET_TYPE.ADD, roleId, nowSeconds() - loginTime); reportTAUserSet(TA_USERSET_TYPE.ADD, roleId, { total_play_time: nowSeconds() - loginTime });
rmRoleFromQueue(roleId, sid, COM_BTL_QUALITY, null); // 删除redis中寻宝的匹配记录 rmRoleFromQueue(roleId, sid, COM_BTL_QUALITY, null); // 删除redis中寻宝的匹配记录
let channelService = this.app.get('channelService'); let channelService = this.app.get('channelService');
let channel = channelService.getChannel(roleId, true); let channel = channelService.getChannel(roleId, true);
game-server/app/services/actionPointService.ts
+1 -1
View File
@@ -91,7 +91,7 @@ export async function setAp(roleId: string, ip: string, lv: number, changeAp: nu
await checkTask(roleId, sid, TASK_TYPE.BATTLE_COST_AP, -1 * changeAp, true, {}); await checkTask(roleId, sid, TASK_TYPE.BATTLE_COST_AP, -1 * changeAp, true, {});
let { serverId } = await RoleModel.findByRoleId(roleId); let { serverId } = await RoleModel.findByRoleId(roleId);
await checkActivityTask(serverId, sid, roleId, TASK_TYPE.BATTLE_COST_AP, -1 * changeAp,); await checkActivityTask(serverId, sid, roleId, TASK_TYPE.BATTLE_COST_AP, -1 * changeAp,);
reportTAEvent(roleId, TA_EVENT.AP_CONSUME, { change_count: -1 * changeAp, change_after: ap, change_reason: reason }, ip) // reportTAEvent(roleId, TA_EVENT.AP_CONSUME, { change_count: -1 * changeAp, change_after: ap, change_reason: reason }, ip)
} else { } else {
reportTAEvent(roleId, TA_EVENT.AP_GET, { change_count: changeAp, change_after: ap, change_reason: reason }, ip) reportTAEvent(roleId, TA_EVENT.AP_GET, { change_count: changeAp, change_after: ap, change_reason: reason }, ip)
} }
shared/consts/constModules/sysConst.ts
+1 -1
View File
@@ -923,7 +923,7 @@ export enum TA_EVENT {
RECHARGE_SUCCESS = 'recharge_success', // 充值成功 RECHARGE_SUCCESS = 'recharge_success', // 充值成功
RECHARGE_FAIL = 'recharge_fail', // 充值失败 RECHARGE_FAIL = 'recharge_fail', // 充值失败
AP_GET = 'ap_get', // 获得体力 AP_GET = 'ap_get', // 获得体力
AP_CONSUME = 'ap_consume', // 体力消耗 // AP_CONSUME = 'ap_consume', // 体力消耗
PVP_SEASON_END = 'PVP_season_end', // pvp赛季结算 PVP_SEASON_END = 'PVP_season_end', // pvp赛季结算
GUILD_DISMISS = 'guild_dissolute', // 军团解散 GUILD_DISMISS = 'guild_dissolute', // 军团解散
GUILD_QUIT = 'guild_quit', // 军团退出 GUILD_QUIT = 'guild_quit', // 军团退出
shared/resource/jsons/dic_zyz_gk_main.json
+253 -253
View File
File diff suppressed because it is too large Load Diff