陆恒 / HappyCat

Download as
Browse Code »

Commit aed6964c2e9d7d20b26b6d9ac53e99f60f00a477

Authored by 陆恒
1 parent ebb89664
Exists in master

提交

Showing 2 changed files with 19 additions and 0 deletions   Show diff stats
src/HttpServer/logic/datadef.go
  Diff comments   View file @aed6964
... ... @@ -103,6 +103,7 @@ type offlineRewardDesc struct {
103 103  
104 104 type GetUserDataData struct {
105 105 TimingReward bool `json:"timingReward"`
  106 + TimingRewardNum int64 `json:"timingRewardnum"`
106 107 OfflineReward offlineRewardDesc `json:"offlineReward"`
107 108 Output string `json:"output"`
108 109 Coin string `json:"coin"`
... ... @@ -323,6 +324,10 @@ type WatchAdsGetGoldResp struct {
323 324 Data WatchAdsGetGoldData `json:"data"`
324 325 }
325 326  
  327 +type RecvTimingRewardReq struct {
  328 + Optype int `json:"type"`
  329 +}
  330 +
326 331 type RecvTimingRewardData struct {
327 332 Reward string `json:"reward"`
328 333 }
... ...
src/HttpServer/logic/logic.go
  Diff comments   View file @aed6964
... ... @@ -1225,6 +1225,8 @@ func HandlerGetUserData(w http.ResponseWriter, data string, uuid int) {
1225 1225 resp.Data.TimingReward = true
1226 1226 }
1227 1227  
  1228 + resp.Data.TimingRewardNum = uinfo.Goldrate * ZHENGHOURMULT
  1229 +
1228 1230 //resp.Data.TimingReward = false
1229 1231 resp.Data.TimingRewardTimes = uinfo.LeftTimingRewardTimes
1230 1232  
... ... @@ -2021,8 +2023,16 @@ func HandlerRecvTimingReward(w http.ResponseWriter, data string, uuid int) {
2021 2023 var resp RecvTimingRewardResp
2022 2024 resp.Code = 0
2023 2025 resp.Message = "success"
  2026 + var rdata RecvTimingRewardReq
  2027 + err := json.Unmarshal([]byte(data), &rdata)
2024 2028  
2025 2029 for {
  2030 + if err != nil {
  2031 + logger.Info("json decode HandlerRecvTimingReward data failed:%v", err, " for:%v", data)
  2032 + resp.Message = "json unmarshal failed"
  2033 + resp.Code = 1
  2034 + break
  2035 + }
2026 2036  
2027 2037 uinfo, err := GetUserInfo(strconv.Itoa(uuid))
2028 2038 if err != nil || uinfo == nil {
... ... @@ -2087,6 +2097,10 @@ func HandlerRecvTimingReward(w http.ResponseWriter, data string, uuid int) {
2087 2097  
2088 2098 nowmin := time.Now().Hour()*60 + time.Now().Minute()
2089 2099 addgold := uinfo.Goldrate * ZHENGHOURMULT
  2100 +
  2101 + if rdata.Optype == 2 {
  2102 + addgold = addgold * 2
  2103 + }
2090 2104 uinfo.Gold += addgold
2091 2105 uinfo.LastTimingRewardHour = nowmin / 30
2092 2106 uinfo.LeftTimingRewardTimes--
... ...