Merge branch 'sdk' into online

2025-09-17 14:29:16 +08:00 · 2025-09-17 14:29:16 +08:00 · 833dd4b8ce
commit 833dd4b8ce
parent 461d84cef2 641b6113ce
5 changed files with 2 additions and 1 deletions
--- a/config/IndoorProgress.xlsx
+++ b/config/IndoorProgress.xlsx
--- a/config/MergeData.xlsx
+++ b/config/MergeData.xlsx
--- a/config/OrderData.xlsx
+++ b/config/OrderData.xlsx
--- a/proto/Gameapi.proto
+++ b/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{
--- a/tool/cfg/cfg_xlsx.json
+++ b/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",