From 2257ed834f9aa5f23f2ca2c935efcde41193ae46 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 26 Nov 2024 10:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 makedown/optimization.md | 25 ++++++++++++++++++-------
 proto/Gameapi.proto      | 19 ++++++++++++-------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/makedown/optimization.md b/makedown/optimization.md
index 2566bdc9..674501da 100644
--- a/makedown/optimization.md
+++ b/makedown/optimization.md
@@ -344,6 +344,8 @@ message ResCardInfo{
 // 卡牌通知
 message ResNotifyCard{
  map<int32, int32> Card = 1; //  卡牌
+ map<int32, int32> Master = 1; //  万能卡牌
+ int32 ExStar = 3; // 额外星星
 }
 
 
@@ -355,6 +357,8 @@ message ReqMasterCard{
 message ResMasterCard{
     RES_CODE Code = 1;
     string Msg = 2;
+    int32 MasterId = 3;
+    int32 CardId = 4;
 }
 
 // 领取卡牌系列收集奖励
@@ -666,6 +670,17 @@ message ResLimitEventProgress{
  int32 Progress = 2; //进度
  map<int32, int32> ProgressReward = 3; //奖励 可以选择的奖励 Id =》 RewardId
 }
+message ReqLimitEventReward{ // 领取限时事件奖励
+ int32 Id = 1;
+}
+
+message ResLimitEventReward{
+ RES_CODE Code = 1;
+ string Msg = 2;
+}
+message ReqSelectLimitEvent{
+    int32 Id = 1;
+}
 
 message LimitEvent {
  int32 EndTime = 1; //结束时间
@@ -688,14 +703,7 @@ message ResChessRainReward{
   int32 Chest = 1; // 宝箱id
 }
 
-message ReqLimitEventReward{ // 领取限时事件奖励
- int32 Id = 1;
-}
 
-message ResLimitEventReward{
- RES_CODE Code = 1;
- string Msg = 2;
-}
 // 连技快手奖励
 message ReqFastProduceReward{
  int32 Energy = 1; 
@@ -806,14 +814,17 @@ message ReqFriendList{}
 message ResFriendList{
  repeated ResPlayerSimple FriendList = 1;
 }
+// 好友申请列表
 message ReqFriendApply{}
 message ResFriendApply{
  repeated ResPlayerSimple ApplyList = 1; 
 }
+// 好友卡牌交换信息
 message ReqFriendCardMsg{}
 message ReqFriendCardMsg{
  repeated ResFriendCard MsgList = 1;
 }
+// 好友时间线
 message ReqFriendTimeLine{}
 message ResFriendTimeLine{
  repeated ResFriendLog Log = 1;
diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto
index d1c7a654..782a2c1b 100644
--- a/proto/Gameapi.proto
+++ b/proto/Gameapi.proto
@@ -2430,6 +2430,8 @@ message ReqMasterCard{
 message ResMasterCard{
 	RES_CODE Code = 1;
 	string Msg = 2;
+	int32 MasterId = 3;
+	int32 CardId = 4;
 }
 
 // 领取卡牌系列收集奖励
@@ -2750,6 +2752,14 @@ message ResLimitEventProgress{
 	int32 Progress = 2; //进度
 	map<int32, int32> ProgressReward = 3; //奖励 可以选择的奖励 Id =》 RewardId
 }
+message ReqLimitEventReward{ // 领取限时事件奖励
+	int32 Id = 1; 
+}
+
+message ResLimitEventReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
 
 message LimitEvent {
 	int32 EndTime = 1; //结束时间	
@@ -2775,14 +2785,7 @@ message ResChessRainReward{
 	int32 Chest = 1; // 宝箱id
 }
 
-message ReqLimitEventReward{ // 领取限时事件奖励
-	int32 Id = 1;
-}
 
-message ResLimitEventReward{
-	RES_CODE Code = 1;
-	string Msg = 2;
-}
 
 // 连技快手奖励
 message ReqFastProduceReward{
@@ -3119,4 +3122,6 @@ message ResChampshipRankReward{
 
 message ResNotifyCard{
 	map<int32, int32> Card = 1; //  卡牌
+	map<int32, int32> Master = 2; //  万能卡牌
+	int32 ExStar = 3; // 额外星星
 }