diff --git a/config/IndoorProgress.xlsx b/config/IndoorProgress.xlsx index cc0bfaf1..95b6705c 100644 Binary files a/config/IndoorProgress.xlsx and b/config/IndoorProgress.xlsx differ diff --git a/config/MergeData.xlsx b/config/MergeData.xlsx index ba76ee46..7d832466 100644 Binary files a/config/MergeData.xlsx and b/config/MergeData.xlsx differ diff --git a/config/OrderData.xlsx b/config/OrderData.xlsx index b974e5ff..4b6c51a4 100644 Binary files a/config/OrderData.xlsx and b/config/OrderData.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 8ae7ebda..38dbcc66 100644 --- 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{ diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index 56769c99..0dd52485 100644 --- 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",