Merge branch 'main' of gitea.bywaystudios.com:wuminzhe/docs

# Conflicts:
#	config/Item.xlsx

proto/Gameapi.proto

@@ -85,6 +85,7 @@ enum ITEM_POP_LABEL { // item弹窗标签
 	GetChessRetireReward = 77; // 退役奖励
 	ApplyFriendSponsor = 78; // 申请好友赞助
 	PetFurShop = 79; //宠物毛皮商店购买
+	ActTypeAddGift = 80; // 加送礼包
 }
 enum HANDLE_TYPE {
 	ADD = 0;
@@ -2079,7 +2080,7 @@ message ResChampship{
 	int32 EndTime = 3;
 	int32 Period = 4;
 	int32 Rank = 5;
-	int32 RankReward = 6;
+	int32 RankReward = 6; // 1可领取 2已领取
 	int32 Status = 7;
 	int32 TodayActivityId = 8;//今日生效的活动类型
 	int32 YesterdayActivityId = 9;//昨日生效的活动类型

tool/cfg/cfg_xlsx.json

@@ -4,6 +4,13 @@
     "file_list": [
         {
             "in_file":"AllLanguage.xlsx",
+            "out_file":"AllLanguageClient.json",
+            "key": "key",
+            "sheet_name" :"client",
+            "fields" :["en_US","zh_CN","pt_BR","es_LATAM"]
+        },
+                {
+            "in_file":"AllLanguage.xlsx",
             "out_file":"AllLanguage.json",
             "key": "key",
             "sheet_name" :"backend",