From 4bb5dfa294f36ff926fd1da5d9b3facbf69f45bf Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Wed, 17 Jun 2020 14:00:12 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/logic.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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