diff --git a/config/MergeData.xlsx b/config/MergeData.xlsx index 7310e5a4..41fe20ad 100644 Binary files a/config/MergeData.xlsx and b/config/MergeData.xlsx differ diff --git a/config/OrderData.xlsx b/config/OrderData.xlsx index c98f5b28..36ab6ae6 100644 Binary files a/config/OrderData.xlsx and b/config/OrderData.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index faaf5bdd..dbd02599 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -133,6 +133,7 @@ enum ORDER_TYPE { Pet_type = 11; // 宠物订单 Preview_type = 12; // 预览订单 Fixed_type = 13; // 修复订单 + Playroom_type = 14; // playroom订单 } enum LOGIN_TYPE { diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index 3a894a97..fe2645a1 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -71,7 +71,7 @@ "out_file": "StartOrder.json", "key": "Id", "sheet_name" :"StartOrder", - "fields" :["Id", "merge_id_list", "appear", "reward","preview"] + "fields" :["Id", "merge_id_list", "appear", "reward","preview", "type"] }, { "in_file": "OrderData.xlsx",