diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 6ccd9ca..10392a4 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -1933,7 +1933,7 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) { } //下面判断是交换还是合成 - if uinfo.PosInfo[rdata.From].Cat == uinfo.PosInfo[rdata.To].Cat { + if uinfo.PosInfo[rdata.From].Cat == uinfo.PosInfo[rdata.To].Cat && uinfo.PosInfo[rdata.From].Cat < 37 { //相同 则合成 //首先判断是否是顶级猫了 if uinfo.PosInfo[rdata.From].Cat == 36 { -- libgit2 0.21.0