diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index 648ada4..77087f2 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -316,6 +316,16 @@ func (u *UserData) GetLimitCatList() []int { return rtlist } +//查询是否有空位 +func (u *UserData) HasEmptyPos() bool { + for _, v := range u.PosInfo { + if v.Cat == 0 { + return true + } + } + return false +} + //根据猫等级获得位置 func (u *UserData) GetCatPos(catlv int) int { pos := -1 diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 529cbf8..9f09520 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -1499,6 +1499,14 @@ func HandlerDoFlop(w http.ResponseWriter, data string, uuid int) { break } + //判断下是否有位置 + if !uinfo.HasEmptyPos() { + logger.Error("HandlerDoFlop flopcnt failed=%v", err) + resp.Code = 1 + resp.Message = "请尽快合成或回收猫咪为分红猫腾出位置" + break + } + uinfo.DoFlopCardd(&resp) resp.Code = 0 -- libgit2 0.21.0