diff --git a/config/Champship.xlsx b/config/Champship.xlsx
index 7eda7f8e..5efea4ff 100644
Binary files a/config/Champship.xlsx and b/config/Champship.xlsx differ
diff --git a/makedown/optimization.md b/makedown/optimization.md
index a0134228..5a01778b 100644
--- a/makedown/optimization.md
+++ b/makedown/optimization.md
@@ -183,8 +183,21 @@ message BaseInfo {
  int32 EenegyMul = 1;
  bool IsFirstBuy = 2;  // 是否已第一次购买体力商店
  int32 EnergyBuy = 3; // 今日体力商店购买次数
+ int32 Uid = 4;
+ string nickname = 5;
 }
 
+// 设置昵称
+message ReqSetName {
+ string Name = 1;
+}
+
+message ResSetName {
+ RES_CODE ResultCode = 1;
+ string Msg = 2;
+}
+s
+
 //体力商店购买体力
 message ReqBuyEnergy{
  int32 Energy = 1; // 购买体力
@@ -316,6 +329,11 @@ message ResCardInfo{
  repeated int32 ExUid = 10; // 今日已置换的Uid
 }
 
+// 卡牌通知
+message ResNotifyCard{
+ map<int32, int32> Card = 1; //  卡牌
+}
+
 // 领取卡牌系列收集奖励
 message ReqCardCollectReward{
  int32 Color = 1;
@@ -954,6 +972,8 @@ message ResChampship{
  int32 Reward = 2; // 当前已领取的档次
  int32 EndTime = 3; // 结束时间
  int32 Period = 4; //周期
+ int32 Rank = 5;// 自身排行
+ bool RankReward = 6; // 是否已领排行奖励
 }
 
 message ReqChampshipReward{}
@@ -963,12 +983,32 @@ message ResChampshipReward{
  string Msg = 2;
 }
 
+message ReqChampshipRankReward{}
+message ResChampshipRankReward{
+ RES_CODE Code = 1;
+ string Msg = 2;
+}
+
 ```
 
 ## 排行榜
 
 ```protobuf
 
+// 玩家榜单
+message ReqRank{
+ int32 Type = 1; // 1:玩家榜单 2:锦标赛榜单
+}
+
+message ResRank{
+ int32 Type = 1; // 榜单类型
+ map<int32, ResPlayerSimple> RankList = 2; // 榜单数据
+ int32 MyRank = 3; // 我的排行
+}
+
+// 请求昨日锦标赛榜单
+message ReqChampshipRank{}
+
 ```
 
 ## 活动类
diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto
index 72e796c1..b8d5f331 100644
--- a/proto/Gameapi.proto
+++ b/proto/Gameapi.proto
@@ -23,6 +23,7 @@ enum ITEM_TYPE {
 }
 
 
+
 message ClientReq{   //客户都请求数据
   string func = 1;  //  serverMode/functionID
   string cid = 2;
@@ -2295,6 +2296,18 @@ message BaseInfo {
 	int32 EnergyMul = 1;  // 能量倍数
 	bool IsFirstBuy = 2;  // 是否已第一次购买体力商店
 	int32 EnergyBuy = 3; // 今日体力商店购买次数
+	int32 Uid = 4; // Uid
+	string nickname = 5; // 昵称
+}
+
+// 设置昵称
+message ReqSetName {
+	string Name = 1;
+}
+
+message ResSetName {
+	RES_CODE ResultCode = 1;
+	string Msg = 2;
 }
 
 //	购买能量
@@ -3024,6 +3037,8 @@ message ResChampship{
 	int32 Reward = 2;
 	int32 EndTime = 3;
 	int32 Period = 4;
+	int32 Rank = 5;
+	int32 RankReward = 6;
 }
 
 message ReqChampshipReward{}
@@ -3031,4 +3046,14 @@ message ReqChampshipReward{}
 message ResChampshipReward{
 	RES_CODE Code = 1;
 	string Msg = 2;
-}
\ No newline at end of file
+}
+
+message ReqChampshipRankReward{}
+message ResChampshipRankReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+message ResNotifyCard{
+	map<int32, int32> Card = 1; //  卡牌
+}
diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json
index 4ebd6d36..bb596415 100644
--- a/tool/cfg/cfg_xlsx.json
+++ b/tool/cfg/cfg_xlsx.json
@@ -331,6 +331,13 @@
             "key": "Id",
             "sheet_name" :"Rank",
             "fields" :["Min", "Max", "Items"]
+        },
+        {
+            "in_file": "Champship.xlsx",
+            "out_file": "ChampshipGroup.json",
+            "key": "Id",
+            "sheet_name" :"Group",
+            "fields" :["Min", "Max"]
         }
         ]
 }
\ No newline at end of file