Commit 504fbd447c1418724ea05ff1b874fed8cf21bbf6
1 parent
6f4f6448
Exists in
master
提交
Showing
2 changed files
with
13 additions
and
13 deletions
Show diff stats
src/HttpServer/logic/datadef.go
| @@ -730,16 +730,16 @@ type LimitListDesc struct { | @@ -730,16 +730,16 @@ type LimitListDesc struct { | ||
| 730 | } | 730 | } |
| 731 | 731 | ||
| 732 | type GetMainPageInfoData struct { | 732 | type GetMainPageInfoData struct { |
| 733 | - LimitCatList []int `json:"limitCatList"` | ||
| 734 | - CatList []CatPosInfo `json:"catList"` | ||
| 735 | - Coin DoBuyCatCoin `json:"coin"` | ||
| 736 | - AdRate adRateData `json:"adRate"` | ||
| 737 | - Level int `json:"level"` | ||
| 738 | - TotalCashReward float32 `json:"totalCashReward"` | ||
| 739 | - Guide bool `json:"guide"` | ||
| 740 | - Redbagnum int `json:"redbagnum"` | ||
| 741 | - Flyboxnum int `json:"flyboxnum"` | ||
| 742 | - Leftredbagnum int `json:"leftredbagnum"` | 733 | + LimitCatList []LimitListDesc `json:"limitCatList"` |
| 734 | + CatList []CatPosInfo `json:"catList"` | ||
| 735 | + Coin DoBuyCatCoin `json:"coin"` | ||
| 736 | + AdRate adRateData `json:"adRate"` | ||
| 737 | + Level int `json:"level"` | ||
| 738 | + TotalCashReward float32 `json:"totalCashReward"` | ||
| 739 | + Guide bool `json:"guide"` | ||
| 740 | + Redbagnum int `json:"redbagnum"` | ||
| 741 | + Flyboxnum int `json:"flyboxnum"` | ||
| 742 | + Leftredbagnum int `json:"leftredbagnum"` | ||
| 743 | } | 743 | } |
| 744 | 744 | ||
| 745 | type GetMainPageInfoResp struct { | 745 | type GetMainPageInfoResp struct { |
src/HttpServer/logic/function.go
| @@ -1019,8 +1019,8 @@ func (u *UserData) CalcHigestCatName() string { | @@ -1019,8 +1019,8 @@ func (u *UserData) CalcHigestCatName() string { | ||
| 1019 | } | 1019 | } |
| 1020 | 1020 | ||
| 1021 | //获取红包猫列表 | 1021 | //获取红包猫列表 |
| 1022 | -func (u *UserData) GetRedCatIdList() []int { | ||
| 1023 | - var rtsl []int | 1022 | +func (u *UserData) GetRedCatIdList() []LimitListDesc { |
| 1023 | + var rtsl []LimitListDesc | ||
| 1024 | nowtime := int(time.Now().Unix()) | 1024 | nowtime := int(time.Now().Unix()) |
| 1025 | for _, val := range u.PosInfo { | 1025 | for _, val := range u.PosInfo { |
| 1026 | if val.Cat > REDCATIDEXTRA && val.Cat < BOXGIFTEXTRA { | 1026 | if val.Cat > REDCATIDEXTRA && val.Cat < BOXGIFTEXTRA { |
| @@ -1031,7 +1031,7 @@ func (u *UserData) GetRedCatIdList() []int { | @@ -1031,7 +1031,7 @@ func (u *UserData) GetRedCatIdList() []int { | ||
| 1031 | var tmp LimitListDesc | 1031 | var tmp LimitListDesc |
| 1032 | tmp.Cat = val.Cat | 1032 | tmp.Cat = val.Cat |
| 1033 | tmp.Money = val.RedPacket | 1033 | tmp.Money = val.RedPacket |
| 1034 | - rtsl = append(rtsl, val.Cat) | 1034 | + rtsl = append(rtsl, tmp) |
| 1035 | //需要删除 | 1035 | //需要删除 |
| 1036 | u.CleadPos(val.Position) | 1036 | u.CleadPos(val.Position) |
| 1037 | } | 1037 | } |