更新协议

makedown/optimization.md

@@ -463,6 +463,7 @@ message ReqSelectCardExchange{
 message ResSelectCardExchange{
  RES_CODE Code = 1;
  string Msg = 2;
+ string Id = 3;
 }
 
 // 同意卡牌交换
@@ -475,6 +476,15 @@ message ResAgreeCardExchange{
  string Id = 3;
 }
 
+// 拒绝选择卡牌进行交换
+message ReqRefuseCardSelect{
+ string Id = 1;
+}
+message ResRefuseCardSelect{
+ RES_CODE Code = 1;
+ string Msg = 2;
+ string Id = 3;
+}
 // 拒绝卡牌交换
 message ReqRefuseCardExchange{
  int32 Uid = 1;
@@ -497,6 +507,9 @@ message ResGetFriendCard{
     int32 CardId = 4;
 }
 
+// 获取可以交换的金卡
+message ReqGetGoldCard{}
+
 ```
 
 ## 引导

proto/Gameapi.proto

@@ -2504,6 +2504,7 @@ message ReqSelectCardExchange{
 message ResSelectCardExchange{
 	RES_CODE Code = 1;
 	string Msg = 2;
+	string Id = 3;
 }
 
 

tool/cfg/cfg_xlsx.json

@@ -8,7 +8,7 @@
             "out_file": "MergeData.json",
             "key": "Id",
             "sheet_name" :"MergeData",
-            "fields" :["Id", "Icon", "Lv", "MaxLv", "MergeId", "SellType", "SellNum", "SellDiamond", "CoolTime", "Star", "Type", "Emit_Product", "Color", "Emit_ID", "PType"]
+            "fields" :["Id", "Icon", "Lv", "MaxLv", "MergeId", "SellType", "SellNum", "SellDiamond", "CoolTime", "Star", "Type", "Emit_Product", "Product_Type", "Color", "Emit_ID", "PType"]
         },
         {
             "in_file": "MergeData.xlsx",
@@ -345,6 +345,13 @@
             "key": "Id",
             "sheet_name" :"Reward",
             "fields" :["Need", "Items"]
+        },
+        {
+            "in_file": "RandName.xlsx",
+            "out_file": "RandName.json",
+            "key": "Id",
+            "sheet_name" :"RandomNameDataBase",
+            "fields" :["EnName", "CnName", "Gender"]
         }
         ]
 }