Merge branch 'sdk' into online

proto/Gameapi.proto

@@ -1311,6 +1311,8 @@ enum ACTIVITY_TYPE {
 
 message ResActivity{
 	repeated ActivityInfo ActiveList = 1;
+	int64 AddEnd = 2; // 买一赠一礼包倒计时
+	bool AddReward = 3; // 买一赠一礼包奖励是否已领取
 }
 
 message ActivityInfo{
@@ -1333,6 +1335,16 @@ message ResActivityReward{
 	string Msg = 2;
 }
 
+// 领取买一赠一奖励
+message ReqAddGiftReward{
+
+}
+
+message ResAddGiftReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
 // #region 限时事件
 // 限时事件
 message ReqLimitEvent{}
@@ -2902,6 +2914,33 @@ message ResCatnipEmoji{
 	int32 Id = 4; // 猫草id
 }
 
+message MiningCfg{
+	string Name = 1;
+	int32 PassNum = 2;
+	repeated ItemInfo itemCost = 3;
+	int32 ItemId = 4;
+	int32 startItemnum = 5;
+	map<string, MinigCfgGem> Gem = 6;
+	map<string, MiningCfgJackpot> Jackpot = 7;
+	map<string, MiningCfgPass> Pass = 8;
+}
+
+message MinigCfgGem{
+	string Area = 1;
+}
+
+message MiningCfgJackpot{
+	int32 Prob = 1;
+	repeated ItemInfo Items = 2;
+}
+
+message MiningCfgPass{
+	repeated ItemInfo Items = 1;
+	string Area = 2;
+	int32 Gem = 3;
+	int32 StarReward = 4;
+}
+
 
 // -------------------后台管理-------------------
 message AdminReq{
@@ -2939,4 +2978,30 @@ message ReqAdminShipping{
 	string OrderSn = 1; // 订单号
 	int32 Status = 2; // 1:支付成功 2:支付失败
 	string ChannelOrderSn = 3; // 渠道订单号
+}
+
+message ReqActivityCfgReload{
+	repeated ActivityCfg List = 1;
+}
+
+message ActivityCfg{
+	int32 Id = 1;
+	int32 Type = 2;
+	int64 Starttime = 3;
+	int64 Endtime = 4;
+	int32 Level = 5;
+	string Title = 6;
+	string MailTitle = 7;
+	string MailContent = 8;
+	string RewardItem  = 9;
+	string Extra = 10;
+}
+
+message ResActivityCfgReload{
+	int32 Code = 1;
+	string Msg = 2;
+}
+
+service Backend {
+	rpc ReloadActivity(ReqActivityCfgReload) returns (ResActivityCfgReload); 
 }

tool/cfg/cfg_txt.json

@@ -224,6 +224,16 @@
             "int",
             "int"
          ]
+      },
+            {
+         "in_file": "Collect.xlsx",
+         "out_file": "CollectionsUnlockLineData.txt",
+         "sheet_name": "CollectionsUnlockLine",
+         "coloum_type": [
+            "int",
+            "int",
+            "int"
+         ]
       },
       {
          "in_file": "ComboGift.xlsx",
@@ -1157,6 +1167,16 @@
             "string"
          ]
       },
+      {
+         "in_file": "Constant.xlsx",
+         "out_file": "ConstantInt.txt",
+         "sheet_name": "ConstantInt",
+         "coloum_type": [
+            "int",
+            "string",
+            "int"
+         ]
+      },
       {
          "in_file": "Guide.xlsx",
          "out_file": "GuideReward.txt",
@@ -1234,6 +1254,16 @@
             "int",
             "int"
          ]
+      },
+      {
+         "in_file": "Invite.xlsx",
+         "out_file": "FriendInviteRewardData.txt",
+         "sheet_name": "Reward",
+         "coloum_type": [
+            "int",
+            "int",
+            "string"
+         ]
       }
    ]
 }

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",
@@ -248,21 +255,21 @@
             "out_file": "SevenLogin.json",
             "key": "Id",
             "sheet_name" :"SevenLogin",
-            "fields" :["Diamond", "RewardNum"]
+            "fields" :["Energy", "RewardNum"]
         },
         {
             "in_file": "SevenLoginCfg.xlsx",
             "out_file": "SevenLoginJackpot.json",
             "key": "Id",
             "sheet_name" :"Jackpot",
-            "fields" :["Diamond", "Item", "Month", "Type"]
+            "fields" :["Energy", "Item", "Month", "Type", "Level"]
         },
         {
             "in_file": "SevenLoginCfg.xlsx",
             "out_file": "SevenLoginMonth.json",
             "key": "Id",
             "sheet_name" :"Month",
-            "fields" :["Active", "Diamond", "RewardNum", "Month"]
+            "fields" :["Active", "Energy", "RewardNum", "Month"]
         },
         {
             "in_file": "Base.xlsx",