Commit d476d4c0ebb8e204070091c7131c542c0f678fed
1 parent
6d178237
Exists in
master
提交一波
Showing
3 changed files
with
16 additions
and
23 deletions
Show diff stats
src/HttpServer/logic/constdef.go
| @@ -29,7 +29,7 @@ const ( | @@ -29,7 +29,7 @@ const ( | ||
| 29 | 29 | ||
| 30 | //奖励类型枚举 | 30 | //奖励类型枚举 |
| 31 | const ( | 31 | const ( |
| 32 | - REWARDTYPE_STAR = 1 //星星 | 32 | + REWARDTYPE_STAR = 1 //金币 |
| 33 | REWARDTYPE_CHUI = 2 | 33 | REWARDTYPE_CHUI = 2 |
| 34 | REWARDTYPE_SHUA = 3 | 34 | REWARDTYPE_SHUA = 3 |
| 35 | REWARDTYPE_SWAP = 4 | 35 | REWARDTYPE_SWAP = 4 |
src/HttpServer/logic/datadef.go
| @@ -195,15 +195,9 @@ type GettaskrewardReq struct { | @@ -195,15 +195,9 @@ type GettaskrewardReq struct { | ||
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | type GettaskrewardData struct { | 197 | type GettaskrewardData struct { |
| 198 | - Lv int `json:"lv"` | ||
| 199 | - Costtime int `json:"costtime"` | ||
| 200 | - Rewardstar int `json:"rewardstar"` | ||
| 201 | - Chuiitem int `json:"chuiitem"` | ||
| 202 | - Shuaitem int `json:"shuaitem"` | ||
| 203 | - Swapitem int `json:"swapitem"` | ||
| 204 | - Eliminitem int `json:"eliminitem"` | ||
| 205 | - Goldnum int `json:"goldnum"` | ||
| 206 | - Addgold int `json:"addgold"` | 198 | + |
| 199 | + Totalrednum int `json:"totalrednum"` | ||
| 200 | + Getrednum int `json:"getrednum"` | ||
| 207 | } | 201 | } |
| 208 | type GettaskrewardResp struct { | 202 | type GettaskrewardResp struct { |
| 209 | Code int `json:"code"` | 203 | Code int `json:"code"` |
src/HttpServer/logic/function.go
| @@ -442,18 +442,10 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr | @@ -442,18 +442,10 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr | ||
| 442 | for i := 0; i < sub; i++ { | 442 | for i := 0; i < sub; i++ { |
| 443 | rtype := cfg.Reward[i*2] | 443 | rtype := cfg.Reward[i*2] |
| 444 | rnum := cfg.Reward[i*2+1] | 444 | rnum := cfg.Reward[i*2+1] |
| 445 | - r1, r2, r3, r4, r5, r6, r7, r8 := uinfo.RewardUser(rtype, rnum, req.Gameid, req.Channel, uuid) | ||
| 446 | - if resp.Data.Lv != r1 { | ||
| 447 | - resp.Data.Lv = r1 | ||
| 448 | - resp.Data.Costtime = uinfo.UpLvCostTime / 3600 | ||
| 449 | - } | ||
| 450 | - resp.Data.Rewardstar += r2 | ||
| 451 | - resp.Data.Chuiitem += r3 | ||
| 452 | - resp.Data.Shuaitem += r4 | ||
| 453 | - resp.Data.Swapitem += r5 | ||
| 454 | - resp.Data.Eliminitem += r6 | ||
| 455 | - resp.Data.Goldnum = r7 | ||
| 456 | - resp.Data.Addgold = r8 | 445 | + _, _, _, _, _, _, r7, r8 := uinfo.RewardUser(rtype, rnum, req.Gameid, req.Channel, uuid) |
| 446 | + resp.Data.Getrednum = r8 | ||
| 447 | + resp.Data.Totalrednum = r7 | ||
| 448 | + break | ||
| 457 | } | 449 | } |
| 458 | 450 | ||
| 459 | return nil | 451 | return nil |
| @@ -483,7 +475,14 @@ func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel str | @@ -483,7 +475,14 @@ func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel str | ||
| 483 | logger.Info("RewardUser rtype=%v,num=%v", rtype, num) | 475 | logger.Info("RewardUser rtype=%v,num=%v", rtype, num) |
| 484 | switch rtype { | 476 | switch rtype { |
| 485 | case REWARDTYPE_STAR: | 477 | case REWARDTYPE_STAR: |
| 486 | - return 0, num, 0, 0, 0, 0, 0, 0 | 478 | + readadd := num / 100 |
| 479 | + goldnum, _, err := AddCoinToSdk(uuid, readadd, gameid, channel, 102) | ||
| 480 | + if err != nil { | ||
| 481 | + logger.Error("RewardUser failer err=%v", err) | ||
| 482 | + } | ||
| 483 | + uinfo.RealGold = goldnum | ||
| 484 | + return 0, 0, 0, 0, 0, 0, uinfo.RealGold, readadd | ||
| 485 | + //uinfo.RealGold += num | ||
| 487 | case REWARDTYPE_CHUI: | 486 | case REWARDTYPE_CHUI: |
| 488 | return 0, 0, num, 0, 0, 0, 0, 0 | 487 | return 0, 0, num, 0, 0, 0, 0, 0 |
| 489 | case REWARDTYPE_SHUA: | 488 | case REWARDTYPE_SHUA: |