diff --git a/docs/uaw.md b/docs/uaw.md index 13836c4..68e2999 100644 --- a/docs/uaw.md +++ b/docs/uaw.md @@ -65,7 +65,7 @@ 2. 增加两种任务类型: GoogleConnect, GameAchievement #### 20240514 -1. 用户状态(10) 增加返回emailId, email +1. 用户状态(10) 增加返回emailId, email, gameId, gameMail 2. 增加接口: 发送邮件验证码(33), 验证邮件地址(34) ### 1. 钱包预登录 @@ -373,6 +373,8 @@ body: "mapopen": 0, // 地图开启状态, 0: 未开启, 1: 已开启 "enhanceCount": 1, // 当日剩余助力次数 "inWhiteList": 1, // 是否得到白名单 + "gameId": '111', // 游戏帐号绑定的id, 优先取googleId + "gameMail": '', // 游戏帐号绑定的email, 优先取gmail } ``` diff --git a/src/controllers/sign.controller.ts b/src/controllers/sign.controller.ts index 6f546c3..460ffe6 100644 --- a/src/controllers/sign.controller.ts +++ b/src/controllers/sign.controller.ts @@ -169,6 +169,8 @@ class SignController extends BaseController { gameTicket: ingameStat.ticket, emailId: user.emailId, email: user.email, + gameId: user.gameId(), + gameMail: user.gameMail(), } return result } diff --git a/src/models/ActivityUser.ts b/src/models/ActivityUser.ts index 64edd6c..920d600 100644 --- a/src/models/ActivityUser.ts +++ b/src/models/ActivityUser.ts @@ -152,6 +152,13 @@ export class ActivityUserClass extends BaseModule { public gameAccountBinded() { return this.googleId || this.emailId } + + public gameId() { + return this.googleId || this.emailId + } + public gameMail() { + return this.googleEmail || this.email + } } export const ActivityUser = getModelForClass(ActivityUserClass, { existingConnection: ActivityUserClass.db })