diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index 4aca0dd..67be315 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -215,18 +215,21 @@ func (u *UserData) CalcRandRedBagNum() float32 { func (u *UserData) CalcMainCatNum() int { sumnum := 0 for _, v := range u.PosInfo { - if v.Cat < REDCATIDEXTRA { - sumnum++ - } + if v.Cat != 0 { + if v.Cat < REDCATIDEXTRA { + sumnum++ + } - if v.Cat > REDCATIDEXTRA && v.Cat < BOXGIFTEXTRA { - cfg := jsonconf.GetRedCatConfig(v.Cat) - if cfg != nil { - if cfg.Is_37 == 1 { - sumnum++ + if v.Cat > REDCATIDEXTRA && v.Cat < BOXGIFTEXTRA { + cfg := jsonconf.GetRedCatConfig(v.Cat) + if cfg != nil { + if cfg.Is_37 == 1 { + sumnum++ + } } } } + } return sumnum diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index e09449c..0ca48aa 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -3005,6 +3005,14 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { break } + catnum := uinfo.CalcMainCatNum() + if catnum <= 1 { + logger.Error("HandlerPutCattoWareHouse not right failed=%v", err) + resp.Code = 1 + resp.Message = "只有一只猫无法加入背包" + break + } + //合成界面红包猫的等级采用id+37的形式 rtval := uinfo.tryPutToWareHouse(udata, rdata.Position, uuid) if rtval == -1 { -- libgit2 0.21.0