diff --git a/config/OrderData.xlsx b/config/OrderData.xlsx index c1a66e8d..d826568f 100644 Binary files a/config/OrderData.xlsx and b/config/OrderData.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 32ad22dd..c5ccb0d7 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -130,7 +130,9 @@ enum ORDER_TYPE { Clean_type2 = 8; // 棋盘空格不足清理棋子的订单 COMFORT_TYPE = 9; // 安慰订单 Guide_type = 10; // 引导订单 - Pet_type = 11; // 宠物订单 + Pet_type = 11; // 宠物订单 + Preview_type = 12; // 预览订单 + Fixed_type = 13; // 修复订单 } enum LOGIN_TYPE { diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index 85b108df..0da745cf 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", "step"] + "fields" :["Id", "merge_id_list", "appear", "reward","preview"] }, { "in_file": "UserData.xlsx",