From aed6964c2e9d7d20b26b6d9ac53e99f60f00a477 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Mon, 22 Jun 2020 16:19:38 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/datadef.go |  5 +++++
 src/HttpServer/logic/logic.go   | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 530301a..ef53e9c 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -103,6 +103,7 @@ type offlineRewardDesc struct {
 
 type GetUserDataData struct {
 	TimingReward      bool              `json:"timingReward"`
+	TimingRewardNum   int64             `json:"timingRewardnum"`
 	OfflineReward     offlineRewardDesc `json:"offlineReward"`
 	Output            string            `json:"output"`
 	Coin              string            `json:"coin"`
@@ -323,6 +324,10 @@ type WatchAdsGetGoldResp struct {
 	Data    WatchAdsGetGoldData `json:"data"`
 }
 
+type RecvTimingRewardReq struct {
+	Optype int `json:"type"`
+}
+
 type RecvTimingRewardData struct {
 	Reward string `json:"reward"`
 }
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 29f6f98..1b9f7d1 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -1225,6 +1225,8 @@ func HandlerGetUserData(w http.ResponseWriter, data string, uuid int) {
 			resp.Data.TimingReward = true
 		}
 
+		resp.Data.TimingRewardNum = uinfo.Goldrate * ZHENGHOURMULT
+
 		//resp.Data.TimingReward = false
 		resp.Data.TimingRewardTimes = uinfo.LeftTimingRewardTimes
 
@@ -2021,8 +2023,16 @@ func HandlerRecvTimingReward(w http.ResponseWriter, data string, uuid int) {
 	var resp RecvTimingRewardResp
 	resp.Code = 0
 	resp.Message = "success"
+	var rdata RecvTimingRewardReq
+	err := json.Unmarshal([]byte(data), &rdata)
 
 	for {
+		if err != nil {
+			logger.Info("json decode HandlerRecvTimingReward data failed:%v", err, " for:%v", data)
+			resp.Message = "json unmarshal failed"
+			resp.Code = 1
+			break
+		}
 
 		uinfo, err := GetUserInfo(strconv.Itoa(uuid))
 		if err != nil || uinfo == nil {
@@ -2087,6 +2097,10 @@ func HandlerRecvTimingReward(w http.ResponseWriter, data string, uuid int) {
 
 		nowmin := time.Now().Hour()*60 + time.Now().Minute()
 		addgold := uinfo.Goldrate * ZHENGHOURMULT
+
+		if rdata.Optype == 2 {
+			addgold = addgold * 2
+		}
 		uinfo.Gold += addgold
 		uinfo.LastTimingRewardHour = nowmin / 30
 		uinfo.LeftTimingRewardTimes--
--
libgit2 0.21.0