Merge branch 'main' into audit

proto/Gameapi.proto

@@ -1458,6 +1458,7 @@ message NotifyFriendLog{
 message FriendBubbleInfo{
 	int32 Id = 1; // 气泡id
 	int32 Type = 2; // 气泡类型 1:普通 2:
+	repeated ItemInfo Items = 3; // 奖励
 }
 
 message NotifyFriendCard{
@@ -1730,6 +1731,7 @@ message ResCharge{
 	int32 SpecialChargeWeek = 11; // 距离现在多少周
 	float TodayCharge = 12; // 今日充值金额
 	float MonthCharge = 13; // 本月充值金额
+	int64 AdEndTime = 14; // 广告礼包结束时间
 }
 
 message WishList {

tool/cfg/cfg_xlsx.json

@@ -36,7 +36,7 @@
             "out_file": "MergeDataEmit.json",
             "key": "Type",
             "sheet_name" :"Emit",
-            "fields" :["Emit_Min_Lv","Ratio", "Product_Type", "Order_Type", "Retire"]
+            "fields" :["Emit_Min_Lv","Ratio", "Product_Type", "Order_Type", "Retire", "N"]
         },
         {
             "in_file": "StartMerge.xlsx",
@@ -71,7 +71,7 @@
             "out_file": "StartOrder.json",
             "key": "Id",
             "sheet_name" :"StartOrder",
-            "fields" :["Id", "merge_id_list", "appear", "reward","preview", "type"]
+            "fields" :["Id", "merge_id_list", "appear", "reward","preview", "type","group","step"]
         },
         {
             "in_file": "OrderData.xlsx",
@@ -87,6 +87,13 @@
             "sheet_name" :"OrderScene",
             "fields" :["Factor"]
         },
+        {
+            "in_file": "OrderData.xlsx",
+            "out_file": "OrderK.json",
+            "key": "Lv",
+            "sheet_name" :"OrderK",
+            "fields" :["Energy", "K"]
+        },
         {
             "in_file": "UserData.xlsx",
             "out_file": "UserData.json",
@@ -437,6 +444,13 @@
             "sheet_name" :"PetCoin",
             "fields" :["ChargeId", "Items", "Grade"]
         },
+        {
+            "in_file": "Charge.xlsx",
+            "out_file": "ChargeAD.json",
+            "key": "Id",
+            "sheet_name" :"AD",
+            "fields" :["ChargeId", "Items", "PetWork"]
+        },
         {
             "in_file": "Endless.xlsx",
             "out_file": "Endless.json",