Commit 4bb5dfa294f36ff926fd1da5d9b3facbf69f45bf
1 parent
3e2f8b16
Exists in
master
提交
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
src/HttpServer/logic/logic.go
| @@ -1933,7 +1933,7 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) { | @@ -1933,7 +1933,7 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) { | ||
| 1933 | } | 1933 | } |
| 1934 | 1934 | ||
| 1935 | //下面判断是交换还是合成 | 1935 | //下面判断是交换还是合成 |
| 1936 | - if uinfo.PosInfo[rdata.From].Cat == uinfo.PosInfo[rdata.To].Cat { | 1936 | + if uinfo.PosInfo[rdata.From].Cat == uinfo.PosInfo[rdata.To].Cat && uinfo.PosInfo[rdata.From].Cat < 37 { |
| 1937 | //相同 则合成 | 1937 | //相同 则合成 |
| 1938 | //首先判断是否是顶级猫了 | 1938 | //首先判断是否是顶级猫了 |
| 1939 | if uinfo.PosInfo[rdata.From].Cat == 36 { | 1939 | if uinfo.PosInfo[rdata.From].Cat == 36 { |