From be237408c73bacf91be590d7e1f23ead5fa66249 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Mon, 17 Aug 2020 17:56:34 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/function.go | 37 +++++++++++++++++++------------------
 src/HttpServer/logic/logic.go    |  2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 5daeac4..fa23c58 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -503,24 +503,6 @@ func (u *UserData) HandlePassDay() {
 	logger.Info("HandlePassDay lasttime=%v,lasttimestamp=%v", lasttime, lasttimestamp)
 	logger.Info("HandlePassDay2 IsResetToday=%v,nowtimestampmin=%v", u.IsResetToday, nowtime.Minute())
 
-	if u.IsResetToday == 0 && nowtime.Hour() >= 12 {
-		//if u.IsResetToday == 0 && nowtime.Minute() >= 27 {
-		u.DoubleLeftTimes = ACCGOLDRATELIMIT
-		u.GetWatchAdsGoldTime = WATCHADSGOLDLIMIT
-		u.DrawTicket += DRAWTICKETNUM
-		if u.DrawTicket > DRAWTICKETNUMLIMIT {
-			u.DrawTicket = DRAWTICKETNUM
-		}
-		u.DrawTicketTimes = DRAWTICKETGETLIMIT
-		//u.LeftTimingRewardTimes = TIMEINGREWARDLIMIT
-		//u.RandRedBagLeftTime = RANDGIFTLIMIT
-		//u.FlyBoxNumTimes = FLYBOXNUMLIMIT
-		//u.LeftTimingRewardTimes = TIMEINGREWARDLIMIT
-		//u.LeftOfflineTimes = OFFLINETIMESLIMIT
-		//u.EmptyBoxLeftTime = EMPTYBOXLIMIT
-		u.IsResetToday = 1
-		logger.Info("do12resetuid=%v", u.UserId)
-	}
 	if nowdaynum == lastdaynum {
 
 		//同一天
@@ -566,6 +548,25 @@ func (u *UserData) HandlePassDay() {
 		u.TodayZhaocai = 180 + floatval*/
 	}
 
+	if u.IsResetToday == 0 && nowtime.Hour() >= 12 {
+		//if u.IsResetToday == 0 && nowtime.Minute() >= 27 {
+		u.DoubleLeftTimes = ACCGOLDRATELIMIT
+		u.GetWatchAdsGoldTime = WATCHADSGOLDLIMIT
+		u.DrawTicket += DRAWTICKETNUM
+		if u.DrawTicket > DRAWTICKETNUMLIMIT {
+			u.DrawTicket = DRAWTICKETNUM
+		}
+		u.DrawTicketTimes = DRAWTICKETGETLIMIT
+		//u.LeftTimingRewardTimes = TIMEINGREWARDLIMIT
+		//u.RandRedBagLeftTime = RANDGIFTLIMIT
+		//u.FlyBoxNumTimes = FLYBOXNUMLIMIT
+		//u.LeftTimingRewardTimes = TIMEINGREWARDLIMIT
+		//u.LeftOfflineTimes = OFFLINETIMESLIMIT
+		//u.EmptyBoxLeftTime = EMPTYBOXLIMIT
+		u.IsResetToday = 1
+		logger.Info("do12resetuid=%v", u.UserId)
+	}
+
 	u.LastLoginTime = int(nowtime.Unix())
 
 	SaveUserInfo(u, strconv.Itoa(u.UserId))
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 2a1f3c2..59b251e 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -455,7 +455,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int, token string) {
 		resp.Data.HeadImg = uinfo.Head
 		resp.Data.LoginType = rdata.Lype
 		resp.Data.Hitcatleftcnt = uinfo.HitCatTime
-		uinfo.LastLoginTime = int(time.Now().Unix())
+		//uinfo.LastLoginTime = int(time.Now().Unix())
 
 		err = SaveUserInfo(uinfo, strconv.Itoa(rdata.UserId))
 		if err != nil {
--
libgit2 0.21.0