Merge branch 'master' into feature/backend

game-server/app/servers/connector/handler/entryHandler.ts

@@ -209,7 +209,7 @@ export class EntryHandler {
                 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中寻宝的匹配记录
         let channelService = this.app.get('channelService');
         let channel = channelService.getChannel(roleId, true);

game-server/app/services/actionPointService.ts

@@ -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, {});
         let { serverId } = await RoleModel.findByRoleId(roleId);
         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 {
         reportTAEvent(roleId, TA_EVENT.AP_GET, { change_count: changeAp, change_after: ap, change_reason: reason }, ip)
     }

shared/consts/constModules/sysConst.ts

@@ -923,7 +923,7 @@ export enum TA_EVENT {
     RECHARGE_SUCCESS = 'recharge_success',   // 充值成功
     RECHARGE_FAIL = 'recharge_fail',         // 充值失败
     AP_GET = 'ap_get',                       // 获得体力
-    AP_CONSUME = 'ap_consume',               // 体力消耗
+    // AP_CONSUME = 'ap_consume',               // 体力消耗
     PVP_SEASON_END = 'PVP_season_end',       // pvp赛季结算
     GUILD_DISMISS = 'guild_dissolute',       // 军团解散
     GUILD_QUIT = 'guild_quit',               // 军团退出