From 444981796ede14c116c3c669589bb90b438b9624 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Fri, 19 Jun 2020 17:59:10 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/function.go | 1 +
 src/HttpServer/logic/logic.go    | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 15665f8..fa72302 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -796,6 +796,7 @@ func DoAutoMergeRedCat(uinfo *UserData, uuid int) {
 
 //合成红包猫 返回红包猫等级 等级为red_catconfig的id+100
 func MergeRedBagCat(uinfo *UserData, pos int) float32 {
+
 	rtpos := float32(0)
 
 	//走随机合成逻辑
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 5ead6f8..75e0887 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -2271,6 +2271,7 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) {
 					//加钱
 					uinfo.AddRedPackect(idx, 100)
 				}
+				resp.Data.NewCat = 37
 
 			} else {
 				//
@@ -2288,7 +2289,7 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) {
 			}
 		} else {
 			//不相同 交换即可
-			if (uinfo.PosInfo[rdata.From].Cat == 108 && uinfo.PosInfo[rdata.To].Cat == 109) || (uinfo.PosInfo[rdata.From].Cat == 109 && uinfo.PosInfo[rdata.To].Cat == 108) {
+			if (uinfo.PosInfo[rdata.From].Cat == 45 && uinfo.PosInfo[rdata.To].Cat == 46) || (uinfo.PosInfo[rdata.From].Cat == 46 && uinfo.PosInfo[rdata.To].Cat == 45) {
 				//合成情侣猫
 				addredpacket := uinfo.PosInfo[rdata.From].RedPacket + uinfo.PosInfo[rdata.To].RedPacket
 				uinfo.PosInfo[rdata.From].Cat = 0
@@ -2300,6 +2301,11 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) {
 				//todo  调用sdk接口
 			} else {
 				uinfo.PosInfo[rdata.From].Cat, uinfo.PosInfo[rdata.To].Cat = uinfo.PosInfo[rdata.To].Cat, uinfo.PosInfo[rdata.From].Cat
+				uinfo.PosInfo[rdata.From].Time, uinfo.PosInfo[rdata.To].Time = uinfo.PosInfo[rdata.To].Time, uinfo.PosInfo[rdata.From].Time
+				uinfo.PosInfo[rdata.From].Position, uinfo.PosInfo[rdata.To].Position = uinfo.PosInfo[rdata.To].Position, uinfo.PosInfo[rdata.From].Position
+				uinfo.PosInfo[rdata.From].RedPacket, uinfo.PosInfo[rdata.To].RedPacket = uinfo.PosInfo[rdata.To].RedPacket, uinfo.PosInfo[rdata.From].RedPacket
+				uinfo.PosInfo[rdata.From].StartTime, uinfo.PosInfo[rdata.To].StartTime = uinfo.PosInfo[rdata.To].StartTime, uinfo.PosInfo[rdata.From].StartTime
+
 			}
 		}
 
--
libgit2 0.21.0