From 7722994f1fda3117ddbe1506456c5f1c99d9b0ff Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 9 Mar 2021 18:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=88=90=E8=BF=B7=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=B8=B8=E5=AE=A2=E6=97=B6=E9=97=B4=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/timeTaskService.ts | 15 +++++++++------ game-server/config/clientProtos.ts | 5 ----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index e40508731..580074284 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -281,6 +281,14 @@ export async function reportOnlineSchedule() { let age = getAge(birthday); let isAdult = age >= ADULT_AGE; + if(isGuest || !hasAuthenticated) { + let lastTime = lastLoginTime > reportTime? lastLoginTime.getTime(): reportTime.getTime(); + let guestTimeInc = Math.floor((Date.now() - lastTime)/1000); + user = await UserModel.updatePlayTime(userCode, guestTimeInc, result.total); // 记录时间 + + guestTime = user.guestTime; + } + if(result.code != ADDICTION_PREVENTION_CODE.SUCCESS && result.age != -1) { // 未成年人防沉迷 pinus.app.channelService.pushMessageByUids('onPlayTime', resResult(STATUS.SUCCESS, { isGuest, @@ -291,12 +299,7 @@ export async function reportOnlineSchedule() { type: result.code } ), [{uid: roleId, sid: sid}]); } else { - let lastTime = lastLoginTime > reportTime? lastLoginTime.getTime(): reportTime.getTime(); - let guestTimeInc = Math.floor((Date.now() - lastTime)/1000); - user = await UserModel.updatePlayTime(userCode, guestTimeInc, result.total); // 记录时间 - - guestTime = user.guestTime; - if (isGuest && guestTime > GUEST_MAX_TIME) { + if ((isGuest || !hasAuthenticated) && guestTime > GUEST_MAX_TIME) { pinus.app.channelService.pushMessageByUids('onPlayTime', resResult(STATUS.SUCCESS, { isGuest, guestTime, // 游客已体验时间 diff --git a/game-server/config/clientProtos.ts b/game-server/config/clientProtos.ts index 97f449da8..a2ff2ad40 100644 --- a/game-server/config/clientProtos.ts +++ b/game-server/config/clientProtos.ts @@ -41,11 +41,6 @@ module.exports = { "required uInt32 ePlaceId": 2, "repeated Material material": 3 }, - "role.equipHandler.lockRandSe": { - "required uInt32 eid": 1, - "required uInt32 id": 2, - "required boolean lock": 3 - }, "role.equipHandler.reStrengthen": { "required uInt32 eid": 1 },