From cc8c20a66a7b607ea3cdacc9d0bb53aa9409e7f0 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 25 Nov 2024 16:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=8C=E4=BA=A4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 makedown/optimization.md | 34 +++++++++++++++++++++++++---------
 proto/Gameapi.proto      | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/makedown/optimization.md b/makedown/optimization.md
index 5a8b8070..095e9f84 100644
--- a/makedown/optimization.md
+++ b/makedown/optimization.md
@@ -311,14 +311,9 @@ message ReqGmCommand{
 
 ### 卡牌交换
 
-卡牌交换一天可以请求交换五次，请求24小时到期
-
-- A向B发送交换卡牌请求，扣除A的卡牌,扣除发送次数
-- B 拒绝，A重新加上自己卡牌，增加A的发送次数
-- B 接收，可以选择需要带的卡牌，扣除B的卡牌
-- A 拒绝，A和B都加上自己的卡牌
-- A 接受，A和B都加上对方的卡牌
-
+好友赠送  status 1直接赠送  任务直接完成，过期也不能删除，直至被赠送好友接受
+好友交换 1发起交换请求 2好友选择交换的卡牌后发起回执 3发起方同意交换 4接收方领取卡牌（状态124 时间过期后可以删除，3不能删除，只能等接收方领取完卡牌，状态变成4后才能删除）
+好友请求 1 同时发起多名好友 2 有其中一名好友同意请求 （状态1过期直接作废删除，2不能删除直到发起者接受卡牌）
 
 ```protobuf
 message Card {
@@ -405,11 +400,21 @@ message ResRefuseCardGive{
  string Msg = 2;
 }
 
+// 赠送卡牌
+message ReqCardSend{
+ int32 Uid = 1;
+ int32 CardId = 2;
+}
 
+message ResCardSend{
+ RES_CODE Code = 1;
+ string Msg = 2;
+}
+
+// 请求卡牌交换
 message ReqCardExchange{
  int32 Uid = 1;
  int32 CardId = 2;
- int32 Type = 3; // 0 白送 1 交换
 }
 
 message ResCardExchange{
@@ -446,6 +451,11 @@ message ResRefuseCardExchange{
  string Msg = 2;
 }
 
+// 领取卡牌
+message ReqGetFriendCard{
+    string Id = 1;
+}
+
 ```
 
 ## 引导
@@ -696,6 +706,7 @@ const (
 )
 ```
 
+
 ## 好友
 
 ```protobuf
@@ -752,6 +763,10 @@ message ResFriendLog{
  int32 Time = 7;
 }
 
+message NotifyFriendCard{
+ ResFriendCard Info = 1;
+}
+
 // 好友卡牌申请
 message ResFriendCard{
  int32 Uid = 1; 
@@ -764,6 +779,7 @@ message ResFriendCard{
  int32 CardId = 8;
  int32 ExCardId = 9;
  int32 Status = 10;
+ string Id = 11;
 }
 
 message ReqFriendList{}
diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto
index 5500d760..45b65454 100644
--- a/proto/Gameapi.proto
+++ b/proto/Gameapi.proto
@@ -2471,11 +2471,21 @@ message ResRefuseCardGive{
 	string Msg = 2;
 }
 
+// 直接赠送卡牌
+message ReqCardSend{
+	int32 Uid = 1;
+	int32 CardId = 2;
+}
+   
+message ResCardSend{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
 // 请求卡牌交换
 message ReqCardExchange{
 	int32 Uid = 1;
 	int32 CardId = 2;
-	int32 Type = 3; // 1 白送 2 交换
 }
 
 message ResCardExchange{
@@ -2519,6 +2529,15 @@ message ResRefuseCardExchange{
 	string Msg = 2;
 }
 
+// 领取卡牌
+message ReqGetFriendCard{
+    string Id = 1;
+}
+
+message ResGetFriendCard{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
 
 // 领取引导奖励
 message ReqGuideReward{
@@ -2787,15 +2806,22 @@ message ResFriendLog{
 	int32 Time = 7;
 }
 
+message NotifyFriendCard{
+	ResFriendCard Info = 1;
+}
+
 message ResFriendCard{
 	int32 Uid = 1;
 	string Name = 2;
 	int32 Face = 3;
 	int32 Avatar = 4;
 	int32 Level = 5;
-	int32 Time = 6;
-	int32 CardId = 7;
-	int32 ExCardId = 8;
+	int32 Type = 6;
+	int32 Time = 7;
+	int32 CardId = 8;
+	int32 ExCardId = 9;
+	int32 Status = 10;
+	string Id = 11;
 }
 
 message ReqKv{