Commit 37d0e947955ee3c80a9cd9a026b8ccd3a375ce6e
1 parent
99e0fe5d
Exists in
master
提交
Showing
2 changed files
with
19 additions
and
8 deletions
Show diff stats
src/HttpServer/logic/function.go
| @@ -215,18 +215,21 @@ func (u *UserData) CalcRandRedBagNum() float32 { | @@ -215,18 +215,21 @@ func (u *UserData) CalcRandRedBagNum() float32 { | ||
| 215 | func (u *UserData) CalcMainCatNum() int { | 215 | func (u *UserData) CalcMainCatNum() int { |
| 216 | sumnum := 0 | 216 | sumnum := 0 |
| 217 | for _, v := range u.PosInfo { | 217 | for _, v := range u.PosInfo { |
| 218 | - if v.Cat < REDCATIDEXTRA { | ||
| 219 | - sumnum++ | ||
| 220 | - } | 218 | + if v.Cat != 0 { |
| 219 | + if v.Cat < REDCATIDEXTRA { | ||
| 220 | + sumnum++ | ||
| 221 | + } | ||
| 221 | 222 | ||
| 222 | - if v.Cat > REDCATIDEXTRA && v.Cat < BOXGIFTEXTRA { | ||
| 223 | - cfg := jsonconf.GetRedCatConfig(v.Cat) | ||
| 224 | - if cfg != nil { | ||
| 225 | - if cfg.Is_37 == 1 { | ||
| 226 | - sumnum++ | 223 | + if v.Cat > REDCATIDEXTRA && v.Cat < BOXGIFTEXTRA { |
| 224 | + cfg := jsonconf.GetRedCatConfig(v.Cat) | ||
| 225 | + if cfg != nil { | ||
| 226 | + if cfg.Is_37 == 1 { | ||
| 227 | + sumnum++ | ||
| 228 | + } | ||
| 227 | } | 229 | } |
| 228 | } | 230 | } |
| 229 | } | 231 | } |
| 232 | + | ||
| 230 | } | 233 | } |
| 231 | 234 | ||
| 232 | return sumnum | 235 | return sumnum |
src/HttpServer/logic/logic.go
| @@ -3005,6 +3005,14 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | @@ -3005,6 +3005,14 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | ||
| 3005 | break | 3005 | break |
| 3006 | } | 3006 | } |
| 3007 | 3007 | ||
| 3008 | + catnum := uinfo.CalcMainCatNum() | ||
| 3009 | + if catnum <= 1 { | ||
| 3010 | + logger.Error("HandlerPutCattoWareHouse not right failed=%v", err) | ||
| 3011 | + resp.Code = 1 | ||
| 3012 | + resp.Message = "只有一只猫无法加入背包" | ||
| 3013 | + break | ||
| 3014 | + } | ||
| 3015 | + | ||
| 3008 | //合成界面红包猫的等级采用id+37的形式 | 3016 | //合成界面红包猫的等级采用id+37的形式 |
| 3009 | rtval := uinfo.tryPutToWareHouse(udata, rdata.Position, uuid) | 3017 | rtval := uinfo.tryPutToWareHouse(udata, rdata.Position, uuid) |
| 3010 | if rtval == -1 { | 3018 | if rtval == -1 { |