From 3fc1fcb9d448bb51dd433671c310e28443e0ccef Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Tue, 28 Jul 2020 10:36:05 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/datadef.go  | 11 ++++++-----
 src/HttpServer/logic/function.go |  1 +
 src/HttpServer/logic/logic.go    |  2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 4330486..e437602 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -78,11 +78,12 @@ type UserLoginReq struct {
 }
 
 type UserLoginData struct {
-	UserId      string `json:"userId"`
-	AccessToken string `json:"accessToken"`
-	LoginType   int    `json:"loginType"`
-	Nickname    string `json:"nickname"`
-	HeadImg     string `json:"headImg"`
+	UserId        string `json:"userId"`
+	AccessToken   string `json:"accessToken"`
+	LoginType     int    `json:"loginType"`
+	Nickname      string `json:"nickname"`
+	HeadImg       string `json:"headImg"`
+	Hitcatleftcnt int    `json:"hitcatleftcnt"`
 }
 
 type UserLoginResp struct {
diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 770a19b..79cda6a 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -725,6 +725,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int) {
 	resp.Data.AccessToken = ""
 	resp.Data.HeadImg = udata.Head
 	resp.Data.LoginType = data.Lype
+	resp.Data.Hitcatleftcnt = udata.HitCatTime
 
 	//保存redis
 	SaveUserInfo(udata, strconv.Itoa(uuid))
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 939c05a..d8e2ba3 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -450,6 +450,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int, token string) {
 		resp.Data.AccessToken = token
 		resp.Data.HeadImg = uinfo.Head
 		resp.Data.LoginType = rdata.Lype
+		resp.Data.Hitcatleftcnt = uinfo.HitCatTime
 		uinfo.LastLoginTime = int(time.Now().Unix())
 
 		err = SaveUserInfo(uinfo, strconv.Itoa(uuid))
@@ -1502,6 +1503,7 @@ func HandlerGetUserData(w http.ResponseWriter, data string, uuid int) {
 		//resp.Data.TimingReward = false
 		resp.Data.TimingRewardTimes = uinfo.LeftTimingRewardTimes
 		resp.Data.Shakeleftcnt = uinfo.ShakeTime
+		resp.Data.Hitcatleftcnt = uinfo.HitCatTime
 
 		//保存此次计算时间
 		nowtimestr := strconv.FormatInt(nowtime, 10)
--
libgit2 0.21.0