From 2d2f41087c3a839b70572c791510a9d6ef727b14 Mon Sep 17 00:00:00 2001 From: owent <> Date: Tue, 10 Sep 2024 16:27:45 +0800 Subject: [PATCH] v2.19.0 --- sample/cxx/v2/kind.pb.cc | 148 ++++++++--------- sample/cxx/v2/kind.pb.h | 12 +- sample/cxx/v3/kind.pb.cc | 153 +++++++++--------- sample/cxx/v3/kind.pb.h | 12 +- sample/gen_sample_output.ps1 | 4 + sample/gen_sample_output.sh | 4 + sample/proto_v2/arr_in_arr_cfg.bin | Bin 868 -> 868 bytes sample/proto_v2/arr_in_arr_cfg.hidden.bin | 12 ++ sample/proto_v2/arr_in_arr_cfg.hidden.lua | 127 +++++++++++++++ sample/proto_v2/arr_in_arr_cfg.lua | 2 +- sample/proto_v2/arr_in_arr_cfg.xml | 2 +- .../csv/Private/ConfigRec/ArrInArr.cpp | 2 +- .../csv/Private/ConfigRec/ArrInArrCfg.cpp | 2 +- .../csv/Private/ConfigRec/Dep2Cfg.cpp | 2 +- .../csv/Private/ConfigRec/EventCfg.cpp | 2 +- .../csv/Private/ConfigRec/EventRewardItem.cpp | 2 +- .../csv/Private/ConfigRec/EventRuleItem.cpp | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.cpp | 2 +- .../csv/Private/ConfigRec/RoleUpgradeCfg.cpp | 2 +- .../csv/Private/ConfigRec/TestMsgVerifier.cpp | 2 +- .../proto_v2/csv/Public/ConfigRec/ArrInArr.h | 2 +- .../csv/Public/ConfigRec/ArrInArrCfg.h | 2 +- .../proto_v2/csv/Public/ConfigRec/Dep2Cfg.h | 2 +- .../proto_v2/csv/Public/ConfigRec/EventCfg.h | 2 +- .../csv/Public/ConfigRec/EventRewardItem.h | 2 +- .../csv/Public/ConfigRec/EventRuleItem.h | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../csv/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- .../csv/Public/ConfigRec/TestMsgVerifier.h | 2 +- sample/proto_v2/event_cfg.bin | Bin 420 -> 420 bytes sample/proto_v2/event_cfg.hidden.bin | Bin 0 -> 373 bytes sample/proto_v2/event_cfg.hidden.lua | 90 +++++++++++ sample/proto_v2/event_cfg.lua | 2 +- sample/proto_v2/json/KindConst.cpp | 2 +- sample/proto_v2/json/KindConst.h | 2 +- .../json/Private/ConfigRec/ArrInArr.cpp | 2 +- .../json/Private/ConfigRec/ArrInArrCfg.cpp | 2 +- .../json/Private/ConfigRec/Dep2Cfg.cpp | 2 +- .../json/Private/ConfigRec/EventCfg.cpp | 2 +- .../Private/ConfigRec/EventRewardItem.cpp | 2 +- .../json/Private/ConfigRec/EventRuleItem.cpp | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.cpp | 2 +- .../json/Private/ConfigRec/RoleUpgradeCfg.cpp | 2 +- .../Private/ConfigRec/TestMsgVerifier.cpp | 2 +- .../proto_v2/json/Public/ConfigRec/ArrInArr.h | 2 +- .../json/Public/ConfigRec/ArrInArrCfg.h | 2 +- .../proto_v2/json/Public/ConfigRec/Dep2Cfg.h | 2 +- .../proto_v2/json/Public/ConfigRec/EventCfg.h | 2 +- .../json/Public/ConfigRec/EventRewardItem.h | 2 +- .../json/Public/ConfigRec/EventRuleItem.h | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../json/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- .../json/Public/ConfigRec/TestMsgVerifier.h | 2 +- sample/proto_v2/keep_empty_list_cfg.bin | Bin 498 -> 498 bytes sample/proto_v2/keep_empty_list_cfg.lua | 2 +- sample/proto_v2/kind.desc.json | 15 +- sample/proto_v2/kind.desc.lua | 29 ++++ sample/proto_v2/kind.pb | Bin 5251 -> 5311 bytes sample/proto_v2/kind.proto | 7 +- sample/proto_v2/kind_option.js | 33 +++- sample/proto_v2/kind_option.lua | 29 ++++ sample/proto_v2/kind_option.mod.lua | 29 ++++ sample/proto_v2/next_alias.bin | Bin 256 -> 256 bytes sample/proto_v2/next_alias.lua | 2 +- sample/proto_v2/process_by_script.bin | 2 +- sample/proto_v2/process_by_script.json | 2 +- sample/proto_v2/process_by_script.lua | 2 +- sample/proto_v2/role_cfg.amd.js | 2 +- sample/proto_v2/role_cfg.bin | Bin 1397 -> 1397 bytes sample/proto_v2/role_cfg.js | 2 +- sample/proto_v2/role_cfg.json | 2 +- sample/proto_v2/role_cfg.lua | 2 +- sample/proto_v2/role_cfg.msgpack.bin | Bin 3393 -> 3393 bytes sample/proto_v2/role_cfg.n.js | 2 +- sample/proto_v2/role_cfg.xml | 2 +- sample/proto_v2/role_cfg_module.lua | 2 +- sample/proto_v2/role_upgrade_cfg.bin | Bin 1550 -> 1550 bytes sample/proto_v2/role_upgrade_cfg.json | 2 +- sample/proto_v2/role_upgrade_cfg.lua | 2 +- sample/proto_v2/strip_list_tail_cfg.bin | Bin 490 -> 490 bytes sample/proto_v2/strip_list_tail_cfg.lua | 2 +- sample/proto_v3/arr_in_arr_cfg.bin | Bin 862 -> 862 bytes sample/proto_v3/arr_in_arr_cfg.hidden.bin | 12 ++ sample/proto_v3/arr_in_arr_cfg.hidden.lua | 127 +++++++++++++++ sample/proto_v3/arr_in_arr_cfg.lua | 2 +- sample/proto_v3/arr_in_arr_cfg.xml | 2 +- .../csv/Private/ConfigRec/ArrInArr.cpp | 2 +- .../csv/Private/ConfigRec/ArrInArrCfg.cpp | 2 +- .../csv/Private/ConfigRec/Dep2Cfg.cpp | 2 +- .../proto_v3/csv/Private/ConfigRec/DepCfg.cpp | 2 +- .../csv/Private/ConfigRec/EventCfg.cpp | 2 +- .../csv/Private/ConfigRec/EventRewardItem.cpp | 2 +- .../csv/Private/ConfigRec/EventRuleItem.cpp | 2 +- .../ConfigRec/GoogleProtobufDuration.cpp | 2 +- .../ConfigRec/GoogleProtobufTimestamp.cpp | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.cpp | 2 +- .../csv/Private/ConfigRec/RoleCfg.cpp | 2 +- .../csv/Private/ConfigRec/RoleUpgradeCfg.cpp | 2 +- .../csv/Private/ConfigRec/TestMsgVerifier.cpp | 2 +- .../proto_v3/csv/Public/ConfigRec/ArrInArr.h | 2 +- .../csv/Public/ConfigRec/ArrInArrCfg.h | 2 +- .../proto_v3/csv/Public/ConfigRec/Dep2Cfg.h | 2 +- sample/proto_v3/csv/Public/ConfigRec/DepCfg.h | 2 +- .../proto_v3/csv/Public/ConfigRec/EventCfg.h | 2 +- .../csv/Public/ConfigRec/EventRewardItem.h | 2 +- .../csv/Public/ConfigRec/EventRuleItem.h | 2 +- .../Public/ConfigRec/GoogleProtobufDuration.h | 2 +- .../ConfigRec/GoogleProtobufTimestamp.h | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../proto_v3/csv/Public/ConfigRec/RoleCfg.h | 2 +- .../csv/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- .../csv/Public/ConfigRec/TestMsgVerifier.h | 2 +- sample/proto_v3/event_cfg.bin | Bin 420 -> 420 bytes sample/proto_v3/event_cfg.hidden.bin | Bin 0 -> 373 bytes sample/proto_v3/event_cfg.hidden.lua | 90 +++++++++++ sample/proto_v3/event_cfg.lua | 2 +- sample/proto_v3/json/KindConst.cpp | 2 +- sample/proto_v3/json/KindConst.h | 2 +- .../json/Private/ConfigRec/ArrInArr.cpp | 2 +- .../json/Private/ConfigRec/ArrInArrCfg.cpp | 2 +- .../json/Private/ConfigRec/Dep2Cfg.cpp | 2 +- .../json/Private/ConfigRec/DepCfg.cpp | 2 +- .../json/Private/ConfigRec/EventCfg.cpp | 2 +- .../Private/ConfigRec/EventRewardItem.cpp | 2 +- .../json/Private/ConfigRec/EventRuleItem.cpp | 2 +- .../ConfigRec/GoogleProtobufDuration.cpp | 2 +- .../ConfigRec/GoogleProtobufTimestamp.cpp | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.cpp | 2 +- .../json/Private/ConfigRec/RoleCfg.cpp | 2 +- .../json/Private/ConfigRec/RoleUpgradeCfg.cpp | 2 +- .../Private/ConfigRec/TestMsgVerifier.cpp | 2 +- .../proto_v3/json/Public/ConfigRec/ArrInArr.h | 2 +- .../json/Public/ConfigRec/ArrInArrCfg.h | 2 +- .../proto_v3/json/Public/ConfigRec/Dep2Cfg.h | 2 +- .../proto_v3/json/Public/ConfigRec/DepCfg.h | 2 +- .../proto_v3/json/Public/ConfigRec/EventCfg.h | 2 +- .../json/Public/ConfigRec/EventRewardItem.h | 2 +- .../json/Public/ConfigRec/EventRuleItem.h | 2 +- .../Public/ConfigRec/GoogleProtobufDuration.h | 2 +- .../ConfigRec/GoogleProtobufTimestamp.h | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../proto_v3/json/Public/ConfigRec/RoleCfg.h | 2 +- .../json/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- .../json/Public/ConfigRec/TestMsgVerifier.h | 2 +- sample/proto_v3/keep_empty_list_cfg.bin | Bin 490 -> 490 bytes sample/proto_v3/keep_empty_list_cfg.lua | 2 +- sample/proto_v3/kind.desc.json | 15 +- sample/proto_v3/kind.desc.lua | 29 ++++ sample/proto_v3/kind.pb | Bin 5931 -> 5991 bytes sample/proto_v3/kind.proto | 7 +- sample/proto_v3/kind_option.js | 33 +++- sample/proto_v3/kind_option.lua | 29 ++++ sample/proto_v3/kind_option.mod.lua | 29 ++++ sample/proto_v3/next_alias.bin | Bin 247 -> 247 bytes sample/proto_v3/next_alias.lua | 2 +- sample/proto_v3/process_by_script.bin | 2 +- sample/proto_v3/process_by_script.json | 2 +- sample/proto_v3/process_by_script.lua | 2 +- sample/proto_v3/role_cfg.amd.js | 2 +- sample/proto_v3/role_cfg.bin | Bin 1397 -> 1397 bytes sample/proto_v3/role_cfg.js | 2 +- sample/proto_v3/role_cfg.json | 2 +- sample/proto_v3/role_cfg.lua | 2 +- sample/proto_v3/role_cfg.msgpack.bin | Bin 3393 -> 3393 bytes sample/proto_v3/role_cfg.n.js | 2 +- sample/proto_v3/role_cfg.xml | 2 +- sample/proto_v3/role_cfg_module.lua | 2 +- sample/proto_v3/role_upgrade_cfg.bin | 2 +- sample/proto_v3/role_upgrade_cfg.json | 2 +- sample/proto_v3/role_upgrade_cfg.lua | 2 +- sample/proto_v3/strip_list_tail_cfg.bin | Bin 484 -> 484 bytes sample/proto_v3/strip_list_tail_cfg.lua | 2 +- .../xresloader/core/data/dst/DataDstJava.java | 31 ++-- .../xresloader/core/data/dst/DataDstPb.java | 30 ++-- .../core/data/dst/DataDstWriterNode.java | 52 +++++- 175 files changed, 1109 insertions(+), 337 deletions(-) create mode 100644 sample/proto_v2/arr_in_arr_cfg.hidden.bin create mode 100644 sample/proto_v2/arr_in_arr_cfg.hidden.lua create mode 100644 sample/proto_v2/event_cfg.hidden.bin create mode 100644 sample/proto_v2/event_cfg.hidden.lua create mode 100644 sample/proto_v3/arr_in_arr_cfg.hidden.bin create mode 100644 sample/proto_v3/arr_in_arr_cfg.hidden.lua create mode 100644 sample/proto_v3/event_cfg.hidden.bin create mode 100644 sample/proto_v3/event_cfg.hidden.lua diff --git a/sample/cxx/v2/kind.pb.cc b/sample/cxx/v2/kind.pb.cc index 0602145e..f8bb1287 100755 --- a/sample/cxx/v2/kind.pb.cc +++ b/sample/cxx/v2/kind.pb.cc @@ -959,67 +959,69 @@ const char descriptor_table_protodef_kind_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIA "\231\001\n\narr_in_arr\022-\n\004name\030\001 \001(\tB\037\232\?\034This is" " a test name in array\022=\n\007int_arr\030\002 \003(\005B," "\020\001\320\?\001\332\? game_const_config.EN_GCC_UNKNOWN" - "\342\?\0013\022\017\n\007str_arr\030\003 \003(\t:\014\352D\006helper\360D\001\"\374\003\n\016" + "\342\?\0013\022\017\n\007str_arr\030\003 \003(\t:\014\352D\006helper\360D\001\"\232\004\n\016" "arr_in_arr_cfg\022\037\n\002id\030\001 \001(\rB\023\232\?\rThis is a" - " Key\350D\001\022\030\n\003arr\030\002 \003(\0132\013.arr_in_arr\022$\n\022tes" - "t_plain_int_arr\030\003 \003(\005B\010\332\?\0011\342\?\0013\022\'\n\023test_" - "plain_enum_arr\030\004 \003(\0162\n.cost_type\0220\n\016test" - "_plain_msg\030\005 \001(\0132\022.test_msg_verifierB\004\262\?" - "\001&\022.\n\022test_plain_msg_arr\030\006 \003(\0132\022.test_ms" - "g_verifier\0223\n\013test_map_is\030\007 \003(\0132\036.arr_in" - "_arr_cfg.TestMapIsEntry\0229\n\013test_map_sm\030\010" - " \003(\0132\036.arr_in_arr_cfg.TestMapSmEntryB\004\262\?" - "\001|\0320\n\016TestMapIsEntry\022\013\n\003key\030\001 \001(\005\022\r\n\005val" - "ue\030\002 \001(\t:\0028\001\032;\n\016TestMapSmEntry\022\013\n\003key\030\001 " - "\001(\t\022\030\n\005value\030\002 \001(\0132\t.dep2_cfg:\0028\001:\037\312>\023Te" - "st arr_in_arr_cfg\352D\006helper\"\243\001\n\021event_rew" - "ard_item\022\017\n\007item_id\030\001 \001(\r\022\022\n\nitem_count\030" - "\002 \001(\r\022&\n\013nested_note\030\013 \001(\tB\017\242\?\014\346\217\217\350\277\260\346\226\207" - "\346\234\254H\000\0227\n\020nested_enum_type\030\014 \001(\0162\n.cost_t" - "ypeB\017\242\?\014\350\264\247\345\270\201\347\261\273\345\236\213H\000B\010\n\006nested\"\241\001\n\017eve" - "nt_rule_item\022\017\n\007rule_id\030\001 \001(\r\022\022\n\nrule_pa" - "ram\030\002 \001(\r\022&\n\013nested_note\030\013 \001(\tB\017\242\?\014\346\217\217\350\277" - "\260\346\226\207\346\234\254H\000\0227\n\020nested_enum_type\030\014 \001(\0162\n.co" - "st_typeB\017\242\?\014\350\264\247\345\270\201\347\261\273\345\236\213H\000B\010\n\006nested\"\244\004\n" - "\tevent_cfg\022.\n\002id\030\001 \001(\rB\"\312>\014custom_rule4\322" - ">\nunique_tag\330>\001\350Dd\022$\n\007process\030\002 \001(\rB\023\322>\n" - "unique_tag\330>\001\350D\001\022\036\n\004rule\030\006 \001(\0132\020.event_r" - "ule_item\022\'\n\rspecify_field\030\007 \001(\0132\020.event_" - "rule_item\0223\n\004item\030\013 \001(\0132\022.event_reward_i" - "temB\017\242\?\014\345\245\226\345\212\261\351\201\223\345\205\267H\000\022#\n\010user_exp\030\014 \001(\003" - "B\017\242\?\014\345\245\226\345\212\261\347\273\217\351\252\214H\000\022\037\n\004note\030\r \001(\tB\017\242\?\014\346\217" - "\217\350\277\260\346\226\207\346\234\254H\000\0220\n\tenum_type\030\016 \001(\0162\n.cost_t" - "ypeB\017\242\?\014\350\264\247\345\270\201\347\261\273\345\236\213H\000\022%\n\nuser_level\0303 \001" - "(\rB\017\242\?\014\347\216\251\345\256\266\347\255\211\347\272\247H\001\022(\n\010test_arr\030[ \003(\0132" - "\020.event_rule_itemB\004\262\?\001;\022.\n\016test_empty_ar" - "r\030\\ \003(\0132\020.event_rule_itemB\004\262\?\001;:,\312> Test" - " event_cfg with oneof fields\352D\006helperB\r\n" - "\006reward\022\003\330>\001B\r\n\013unlock_type\"\266\001\n\034keep_or_" - "strip_empty_list_cfg\022\037\n\002id\030\001 \001(\rB\023\232\?\rThi" - "s is a Key\350D\001\022\034\n\tarray_msg\030\002 \003(\0132\t.dep2_" - "cfg\022\"\n\017array_plain_msg\030\003 \003(\0132\t.dep2_cfg\022" - "\023\n\013array_int32\030\004 \003(\005\022\023\n\013array_int64\030\005 \003(" - "\003:\t\352D\006helper\"4\n\ncombine_id\022\016\n\006prefix\030\001 \001" - "(\r\022\026\n\002id\030\002 \001(\rB\n\312>\0070-99999\"\224\003\n\021process_b" - "y_script\022\n\n\002id\030\001 \001(\r\022<\n\016map_u32_string\030\002" - " \003(\0132$.process_by_script.MapU32StringEnt" - "ry\0226\n\013test_map_is\030\007 \003(\0132!.process_by_scr" - "ipt.TestMapIsEntry\022<\n\013test_map_sm\030\010 \003(\0132" - "!.process_by_script.TestMapSmEntryB\004\262\?\001|" - "\022\033\n\005id_id\030\351\007 \001(\0132\013.combine_id\0323\n\021MapU32S" - "tringEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\t:\002" - "8\001\0320\n\016TestMapIsEntry\022\013\n\003key\030\001 \001(\005\022\r\n\005val" - "ue\030\002 \001(\t:\0028\001\032;\n\016TestMapSmEntry\022\013\n\003key\030\001 " - "\001(\t\022\030\n\005value\030\002 \001(\0132\t.dep2_cfg:\0028\001\"\222\001\n\017la" - "rge_file_test\022\n\n\002id\030\001 \001(\r\022\020\n\010i32value\030\002 " - "\001(\005\022\020\n\010u64value\030\003 \001(\004\022\020\n\010f64value\030\004 \001(\001\022" - "\020\n\010f32value\030\005 \001(\002\022\017\n\007szvalue\030\006 \001(\t\022\032\n\005id" - "_id\030\007 \001(\0132\013.combine_id\"N\n\023inner_alias_me" - "ssage\022\026\n\005iType\030\001 \001(\005B\007\242\?\004Type\022\037\n\tparamLi" - "st\030\002 \003(\003B\014\242\?\005Param\332\?\0012\"|\n\023outer_alias_me" - "ssage\022\022\n\003iId\030\001 \001(\005B\005\242\?\002ID\0222\n\006inners\030\002 \003(" - "\0132\024.inner_alias_messageB\014\242\?\tCondition\022\035\n" - "\010nest_int\030\003 \003(\005B\013\242\?\004Nest\332\?\0012" + " Key\350D\001\022(\n\003arr\030\002 \003(\0132\013.arr_in_arrB\016\362\?\013se" + "rver_only\0222\n\022test_plain_int_arr\030\003 \003(\005B\026\332" + "\?\0011\342\?\0013\362\?\013server_only\022\'\n\023test_plain_enum" + "_arr\030\004 \003(\0162\n.cost_type\0220\n\016test_plain_msg" + "\030\005 \001(\0132\022.test_msg_verifierB\004\262\?\001&\022.\n\022test" + "_plain_msg_arr\030\006 \003(\0132\022.test_msg_verifier" + "\0223\n\013test_map_is\030\007 \003(\0132\036.arr_in_arr_cfg.T" + "estMapIsEntry\0229\n\013test_map_sm\030\010 \003(\0132\036.arr" + "_in_arr_cfg.TestMapSmEntryB\004\262\?\001|\0320\n\016Test" + "MapIsEntry\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\t:\002" + "8\001\032;\n\016TestMapSmEntry\022\013\n\003key\030\001 \001(\t\022\030\n\005val" + "ue\030\002 \001(\0132\t.dep2_cfg:\0028\001:\037\312>\023Test arr_in_" + "arr_cfg\352D\006helper\"\243\001\n\021event_reward_item\022\017" + "\n\007item_id\030\001 \001(\r\022\022\n\nitem_count\030\002 \001(\r\022&\n\013n" + "ested_note\030\013 \001(\tB\017\242\?\014\346\217\217\350\277\260\346\226\207\346\234\254H\000\0227\n\020n" + "ested_enum_type\030\014 \001(\0162\n.cost_typeB\017\242\?\014\350\264" + "\247\345\270\201\347\261\273\345\236\213H\000B\010\n\006nested\"\241\001\n\017event_rule_it" + "em\022\017\n\007rule_id\030\001 \001(\r\022\022\n\nrule_param\030\002 \001(\r\022" + "&\n\013nested_note\030\013 \001(\tB\017\242\?\014\346\217\217\350\277\260\346\226\207\346\234\254H\000\022" + "7\n\020nested_enum_type\030\014 \001(\0162\n.cost_typeB\017\242" + "\?\014\350\264\247\345\270\201\347\261\273\345\236\213H\000B\010\n\006nested\"\302\004\n\tevent_cfg" + "\022.\n\002id\030\001 \001(\rB\"\312>\014custom_rule4\322>\nunique_t" + "ag\330>\001\350Dd\022$\n\007process\030\002 \001(\rB\023\322>\nunique_tag" + "\330>\001\350D\001\022\036\n\004rule\030\006 \001(\0132\020.event_rule_item\0227" + "\n\rspecify_field\030\007 \001(\0132\020.event_rule_itemB" + "\016\362\?\013server_only\0223\n\004item\030\013 \001(\0132\022.event_re" + "ward_itemB\017\242\?\014\345\245\226\345\212\261\351\201\223\345\205\267H\000\022#\n\010user_exp" + "\030\014 \001(\003B\017\242\?\014\345\245\226\345\212\261\347\273\217\351\252\214H\000\022\037\n\004note\030\r \001(\tB" + "\017\242\?\014\346\217\217\350\277\260\346\226\207\346\234\254H\000\0220\n\tenum_type\030\016 \001(\0162\n." + "cost_typeB\017\242\?\014\350\264\247\345\270\201\347\261\273\345\236\213H\000\022%\n\nuser_lev" + "el\0303 \001(\rB\017\242\?\014\347\216\251\345\256\266\347\255\211\347\272\247H\001\022(\n\010test_arr\030" + "[ \003(\0132\020.event_rule_itemB\004\262\?\001;\022.\n\016test_em" + "pty_arr\030\\ \003(\0132\020.event_rule_itemB\004\262\?\001;:,\312" + "> Test event_cfg with oneof fields\352D\006hel" + "perB\033\n\006reward\022\021\330>\001\352>\013server_onlyB\r\n\013unlo" + "ck_type\"\266\001\n\034keep_or_strip_empty_list_cfg" + "\022\037\n\002id\030\001 \001(\rB\023\232\?\rThis is a Key\350D\001\022\034\n\tarr" + "ay_msg\030\002 \003(\0132\t.dep2_cfg\022\"\n\017array_plain_m" + "sg\030\003 \003(\0132\t.dep2_cfg\022\023\n\013array_int32\030\004 \003(\005" + "\022\023\n\013array_int64\030\005 \003(\003:\t\352D\006helper\"4\n\ncomb" + "ine_id\022\016\n\006prefix\030\001 \001(\r\022\026\n\002id\030\002 \001(\rB\n\312>\0070" + "-99999\"\224\003\n\021process_by_script\022\n\n\002id\030\001 \001(\r" + "\022<\n\016map_u32_string\030\002 \003(\0132$.process_by_sc" + "ript.MapU32StringEntry\0226\n\013test_map_is\030\007 " + "\003(\0132!.process_by_script.TestMapIsEntry\022<" + "\n\013test_map_sm\030\010 \003(\0132!.process_by_script." + "TestMapSmEntryB\004\262\?\001|\022\033\n\005id_id\030\351\007 \001(\0132\013.c" + "ombine_id\0323\n\021MapU32StringEntry\022\013\n\003key\030\001 " + "\001(\r\022\r\n\005value\030\002 \001(\t:\0028\001\0320\n\016TestMapIsEntry" + "\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\016Test" + "MapSmEntry\022\013\n\003key\030\001 \001(\t\022\030\n\005value\030\002 \001(\0132\t" + ".dep2_cfg:\0028\001\"\222\001\n\017large_file_test\022\n\n\002id\030" + "\001 \001(\r\022\020\n\010i32value\030\002 \001(\005\022\020\n\010u64value\030\003 \001(" + "\004\022\020\n\010f64value\030\004 \001(\001\022\020\n\010f32value\030\005 \001(\002\022\017\n" + "\007szvalue\030\006 \001(\t\022\032\n\005id_id\030\007 \001(\0132\013.combine_" + "id\"N\n\023inner_alias_message\022\026\n\005iType\030\001 \001(\005" + "B\007\242\?\004Type\022\037\n\tparamList\030\002 \003(\003B\014\242\?\005Param\332\?" + "\0012\"|\n\023outer_alias_message\022\022\n\003iId\030\001 \001(\005B\005" + "\242\?\002ID\0222\n\006inners\030\002 \003(\0132\024.inner_alias_mess" + "ageB\014\242\?\tCondition\022\035\n\010nest_int\030\003 \003(\005B\013\242\?\004" + "Nest\332\?\0012" }; static const ::_pbi::DescriptorTable* const descriptor_table_kind_2eproto_deps[6] = { @@ -1034,7 +1036,7 @@ static ::absl::once_flag descriptor_table_kind_2eproto_once; PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_kind_2eproto = { false, false, - 3708, + 3768, descriptor_table_protodef_kind_2eproto, "kind.proto", &descriptor_table_kind_2eproto_once, @@ -3006,10 +3008,10 @@ const ::_pbi::TcParseTable<3, 8, 7, 53, 2> arr_in_arr_cfg::_table_ = { // optional uint32 id = 1 [(.org.xresloader.field_description) = "This is a Key", (.org.xresloader.ue.key_tag) = 1]; {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(arr_in_arr_cfg, _impl_.id_), 1>(), {8, 1, 0, PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.id_)}}, - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; {::_pbi::TcParser::FastMtR1, {18, 63, 0, PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.arr_)}}, - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; {::_pbi::TcParser::FastV32R1, {24, 63, 0, PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.test_plain_int_arr_)}}, // repeated .cost_type test_plain_enum_arr = 4; @@ -3028,10 +3030,10 @@ const ::_pbi::TcParseTable<3, 8, 7, 53, 2> arr_in_arr_cfg::_table_ = { // optional uint32 id = 1 [(.org.xresloader.field_description) = "This is a Key", (.org.xresloader.ue.key_tag) = 1]; {PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.id_), _Internal::kHasBitsOffset + 1, 0, (0 | ::_fl::kFcOptional | ::_fl::kUInt32)}, - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; {PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.arr_), -1, 0, (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)}, - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; {PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.test_plain_int_arr_), -1, 0, (0 | ::_fl::kFcRepeated | ::_fl::kInt32)}, // repeated .cost_type test_plain_enum_arr = 4; @@ -3117,7 +3119,7 @@ PROTOBUF_NOINLINE void arr_in_arr_cfg::Clear() { 1, this_._internal_id(), target); } - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; for (unsigned i = 0, n = static_cast( this_._internal_arr_size()); i < n; i++) { @@ -3128,7 +3130,7 @@ PROTOBUF_NOINLINE void arr_in_arr_cfg::Clear() { target, stream); } - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; for (int i = 0, n = this_._internal_test_plain_int_arr_size(); i < n; ++i) { target = stream->EnsureSpace(target); target = ::_pbi::WireFormatLite::WriteInt32ToArray( @@ -3240,14 +3242,14 @@ PROTOBUF_NOINLINE void arr_in_arr_cfg::Clear() { ::_pbi::Prefetch5LinesFrom7Lines(&this_); { - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; { total_size += 1UL * this_._internal_arr_size(); for (const auto& msg : this_._internal_arr()) { total_size += ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } } - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; { std::size_t data_size = ::_pbi::WireFormatLite::Int32Size( this_._internal_test_plain_int_arr()) @@ -4393,7 +4395,7 @@ const ::_pbi::TcParseTable<3, 11, 6, 30, 11> event_cfg::_table_ = { // optional .event_rule_item rule = 6; {::_pbi::TcParser::FastMtS1, {50, 0, 0, PROTOBUF_FIELD_OFFSET(event_cfg, _impl_.rule_)}}, - // optional .event_rule_item specify_field = 7; + // optional .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; {::_pbi::TcParser::FastMtS1, {58, 1, 1, PROTOBUF_FIELD_OFFSET(event_cfg, _impl_.specify_field_)}}, }}, {{ @@ -4410,7 +4412,7 @@ const ::_pbi::TcParseTable<3, 11, 6, 30, 11> event_cfg::_table_ = { // optional .event_rule_item rule = 6; {PROTOBUF_FIELD_OFFSET(event_cfg, _impl_.rule_), _Internal::kHasBitsOffset + 0, 0, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, - // optional .event_rule_item specify_field = 7; + // optional .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; {PROTOBUF_FIELD_OFFSET(event_cfg, _impl_.specify_field_), _Internal::kHasBitsOffset + 1, 1, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, // .event_reward_item item = 11 [(.org.xresloader.field_alias) = "\345\245\226\345\212\261\351\201\223\345\205\267"]; @@ -4516,7 +4518,7 @@ PROTOBUF_NOINLINE void event_cfg::Clear() { stream); } - // optional .event_rule_item specify_field = 7; + // optional .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; if (cached_has_bits & 0x00000002u) { target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage( 7, *this_._impl_.specify_field_, this_._impl_.specify_field_->GetCachedSize(), target, @@ -4628,7 +4630,7 @@ PROTOBUF_NOINLINE void event_cfg::Clear() { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.rule_); } - // optional .event_rule_item specify_field = 7; + // optional .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; if (cached_has_bits & 0x00000002u) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.specify_field_); diff --git a/sample/cxx/v2/kind.pb.h b/sample/cxx/v2/kind.pb.h index 886fdc57..96d4f9d9 100755 --- a/sample/cxx/v2/kind.pb.h +++ b/sample/cxx/v2/kind.pb.h @@ -2864,7 +2864,7 @@ class event_cfg final : public ::google::protobuf::Message ::event_rule_item* _internal_mutable_rule(); public: - // optional .event_rule_item specify_field = 7; + // optional .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; bool has_specify_field() const; void clear_specify_field() ; const ::event_rule_item& specify_field() const; @@ -3976,7 +3976,7 @@ class arr_in_arr_cfg final : public ::google::protobuf::Message kTestPlainMsgFieldNumber = 5, kIdFieldNumber = 1, }; - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; int arr_size() const; private: int _internal_arr_size() const; @@ -3993,7 +3993,7 @@ class arr_in_arr_cfg final : public ::google::protobuf::Message const ::arr_in_arr& arr(int index) const; ::arr_in_arr* add_arr(); const ::google::protobuf::RepeatedPtrField<::arr_in_arr>& arr() const; - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; int test_plain_int_arr_size() const; private: int _internal_test_plain_int_arr_size() const; @@ -5617,7 +5617,7 @@ inline void arr_in_arr_cfg::_internal_set_id(::uint32_t value) { _impl_.id_ = value; } -// repeated .arr_in_arr arr = 2; +// repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; inline int arr_in_arr_cfg::_internal_arr_size() const { return _internal_arr().size(); } @@ -5666,7 +5666,7 @@ arr_in_arr_cfg::_internal_mutable_arr() { return &_impl_.arr_; } -// repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; +// repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; inline int arr_in_arr_cfg::_internal_test_plain_int_arr_size() const { return _internal_test_plain_int_arr().size(); } @@ -6487,7 +6487,7 @@ inline void event_cfg::set_allocated_rule(::event_rule_item* value) { // @@protoc_insertion_point(field_set_allocated:event_cfg.rule) } -// optional .event_rule_item specify_field = 7; +// optional .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; inline bool event_cfg::has_specify_field() const { bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0; PROTOBUF_ASSUME(!value || _impl_.specify_field_ != nullptr); diff --git a/sample/cxx/v3/kind.pb.cc b/sample/cxx/v3/kind.pb.cc index 8c409319..e4639080 100755 --- a/sample/cxx/v3/kind.pb.cc +++ b/sample/cxx/v3/kind.pb.cc @@ -998,69 +998,70 @@ const char descriptor_table_protodef_kind_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIA "hB\013\n\ttest_onof\"}\n\021test_msg_verifier\022\022\n\tt" "est_id_1\030\221N \001(\r\0224\n\ttest_id_2\030\222N \001(\rB \242\?\017" "\346\265\213\350\257\225ID\345\210\253\345\220\2152\362\?\013server_only\022\027\n\ttest_id" - "_3\030\223N \001(\rB\003\310\?\001:\005\242\?\002-^\"\374\003\n\016arr_in_arr_cfg" - "\022\037\n\002id\030\001 \001(\rB\023\232\?\rThis is a Key\350D\001\022\030\n\003arr" - "\030\002 \003(\0132\013.arr_in_arr\022$\n\022test_plain_int_ar" - "r\030\003 \003(\005B\010\332\?\0011\342\?\0013\022\'\n\023test_plain_enum_arr" - "\030\004 \003(\0162\n.cost_type\0220\n\016test_plain_msg\030\005 \001" - "(\0132\022.test_msg_verifierB\004\262\?\001&\022.\n\022test_pla" - "in_msg_arr\030\006 \003(\0132\022.test_msg_verifier\0223\n\013" - "test_map_is\030\007 \003(\0132\036.arr_in_arr_cfg.TestM" - "apIsEntry\0229\n\013test_map_sm\030\010 \003(\0132\036.arr_in_" - "arr_cfg.TestMapSmEntryB\004\262\?\001|\0320\n\016TestMapI" - "sEntry\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\t:\0028\001\032;" - "\n\016TestMapSmEntry\022\013\n\003key\030\001 \001(\t\022\030\n\005value\030\002" - " \001(\0132\t.dep2_cfg:\0028\001:\037\312>\023Test arr_in_arr_" - "cfg\352D\006helper\"\243\001\n\021event_reward_item\022\017\n\007it" - "em_id\030\001 \001(\r\022\022\n\nitem_count\030\002 \001(\r\022&\n\013neste" - "d_note\030\013 \001(\tB\017\242\?\014\346\217\217\350\277\260\346\226\207\346\234\254H\000\0227\n\020neste" - "d_enum_type\030\014 \001(\0162\n.cost_typeB\017\242\?\014\350\264\247\345\270\201" - "\347\261\273\345\236\213H\000B\010\n\006nested\"\241\001\n\017event_rule_item\022\017" - "\n\007rule_id\030\001 \001(\r\022\022\n\nrule_param\030\002 \001(\r\022&\n\013n" - "ested_note\030\013 \001(\tB\017\242\?\014\346\217\217\350\277\260\346\226\207\346\234\254H\000\0227\n\020n" - "ested_enum_type\030\014 \001(\0162\n.cost_typeB\017\242\?\014\350\264" - "\247\345\270\201\347\261\273\345\236\213H\000B\010\n\006nested\"\244\004\n\tevent_cfg\022.\n\002" - "id\030\001 \001(\rB\"\312>\014custom_rule4\322>\nunique_tag\330>" - "\001\350Dd\022$\n\007process\030\002 \001(\rB\023\322>\nunique_tag\330>\001\350" - "D\001\022\036\n\004rule\030\006 \001(\0132\020.event_rule_item\022\'\n\rsp" - "ecify_field\030\007 \001(\0132\020.event_rule_item\0223\n\004i" - "tem\030\013 \001(\0132\022.event_reward_itemB\017\242\?\014\345\245\226\345\212\261" - "\351\201\223\345\205\267H\000\022#\n\010user_exp\030\014 \001(\003B\017\242\?\014\345\245\226\345\212\261\347\273\217" - "\351\252\214H\000\022\037\n\004note\030\r \001(\tB\017\242\?\014\346\217\217\350\277\260\346\226\207\346\234\254H\000\0220" - "\n\tenum_type\030\016 \001(\0162\n.cost_typeB\017\242\?\014\350\264\247\345\270\201" - "\347\261\273\345\236\213H\000\022%\n\nuser_level\0303 \001(\rB\017\242\?\014\347\216\251\345\256\266\347" - "\255\211\347\272\247H\001\022(\n\010test_arr\030[ \003(\0132\020.event_rule_i" - "temB\004\262\?\001;\022.\n\016test_empty_arr\030\\ \003(\0132\020.even" - "t_rule_itemB\004\262\?\001;:,\312> Test event_cfg wit" - "h oneof fields\352D\006helperB\r\n\006reward\022\003\330>\001B\r" - "\n\013unlock_type\"\266\001\n\034keep_or_strip_empty_li" - "st_cfg\022\037\n\002id\030\001 \001(\rB\023\232\?\rThis is a Key\350D\001\022" - "\034\n\tarray_msg\030\002 \003(\0132\t.dep2_cfg\022\"\n\017array_p" - "lain_msg\030\003 \003(\0132\t.dep2_cfg\022\023\n\013array_int32" - "\030\004 \003(\005\022\023\n\013array_int64\030\005 \003(\003:\t\352D\006helper\"4" - "\n\ncombine_id\022\016\n\006prefix\030\001 \001(\r\022\026\n\002id\030\002 \001(\r" - "B\n\312>\0070-99999\"\333\003\n\021process_by_script\022\n\n\002id" - "\030\001 \001(\r\022<\n\016map_u32_string\030\002 \003(\0132$.process" - "_by_script.MapU32StringEntry\022\033\n\023human_re" - "adable_date\030\003 \001(\t\022(\n\004date\030\004 \001(\0132\032.google" - ".protobuf.Timestamp\0226\n\013test_map_is\030\007 \003(\013" - "2!.process_by_script.TestMapIsEntry\022<\n\013t" - "est_map_sm\030\010 \003(\0132!.process_by_script.Tes" - "tMapSmEntryB\004\262\?\001|\022\033\n\005id_id\030\351\007 \001(\0132\013.comb" - "ine_id\0323\n\021MapU32StringEntry\022\013\n\003key\030\001 \001(\r" - "\022\r\n\005value\030\002 \001(\t:\0028\001\0320\n\016TestMapIsEntry\022\013\n" - "\003key\030\001 \001(\005\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\016TestMap" - "SmEntry\022\013\n\003key\030\001 \001(\t\022\030\n\005value\030\002 \001(\0132\t.de" - "p2_cfg:\0028\001\"\222\001\n\017large_file_test\022\n\n\002id\030\001 \001" - "(\r\022\020\n\010i32value\030\002 \001(\005\022\020\n\010u64value\030\003 \001(\004\022\020" - "\n\010f64value\030\004 \001(\001\022\020\n\010f32value\030\005 \001(\002\022\017\n\007sz" - "value\030\006 \001(\t\022\032\n\005id_id\030\007 \001(\0132\013.combine_id\"" - "N\n\023inner_alias_message\022\026\n\005iType\030\001 \001(\005B\007\242" - "\?\004Type\022\037\n\tparamList\030\002 \003(\003B\014\242\?\005Param\332\?\0012\"" - "|\n\023outer_alias_message\022\022\n\003iId\030\001 \001(\005B\005\242\?\002" - "ID\0222\n\006inners\030\002 \003(\0132\024.inner_alias_message" - "B\014\242\?\tCondition\022\035\n\010nest_int\030\003 \003(\005B\013\242\?\004Nes" - "t\332\?\0012b\006proto3" + "_3\030\223N \001(\rB\003\310\?\001:\005\242\?\002-^\"\232\004\n\016arr_in_arr_cfg" + "\022\037\n\002id\030\001 \001(\rB\023\232\?\rThis is a Key\350D\001\022(\n\003arr" + "\030\002 \003(\0132\013.arr_in_arrB\016\362\?\013server_only\0222\n\022t" + "est_plain_int_arr\030\003 \003(\005B\026\332\?\0011\342\?\0013\362\?\013serv" + "er_only\022\'\n\023test_plain_enum_arr\030\004 \003(\0162\n.c" + "ost_type\0220\n\016test_plain_msg\030\005 \001(\0132\022.test_" + "msg_verifierB\004\262\?\001&\022.\n\022test_plain_msg_arr" + "\030\006 \003(\0132\022.test_msg_verifier\0223\n\013test_map_i" + "s\030\007 \003(\0132\036.arr_in_arr_cfg.TestMapIsEntry\022" + "9\n\013test_map_sm\030\010 \003(\0132\036.arr_in_arr_cfg.Te" + "stMapSmEntryB\004\262\?\001|\0320\n\016TestMapIsEntry\022\013\n\003" + "key\030\001 \001(\005\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\016TestMapS" + "mEntry\022\013\n\003key\030\001 \001(\t\022\030\n\005value\030\002 \001(\0132\t.dep" + "2_cfg:\0028\001:\037\312>\023Test arr_in_arr_cfg\352D\006help" + "er\"\243\001\n\021event_reward_item\022\017\n\007item_id\030\001 \001(" + "\r\022\022\n\nitem_count\030\002 \001(\r\022&\n\013nested_note\030\013 \001" + "(\tB\017\242\?\014\346\217\217\350\277\260\346\226\207\346\234\254H\000\0227\n\020nested_enum_typ" + "e\030\014 \001(\0162\n.cost_typeB\017\242\?\014\350\264\247\345\270\201\347\261\273\345\236\213H\000B\010" + "\n\006nested\"\241\001\n\017event_rule_item\022\017\n\007rule_id\030" + "\001 \001(\r\022\022\n\nrule_param\030\002 \001(\r\022&\n\013nested_note" + "\030\013 \001(\tB\017\242\?\014\346\217\217\350\277\260\346\226\207\346\234\254H\000\0227\n\020nested_enum" + "_type\030\014 \001(\0162\n.cost_typeB\017\242\?\014\350\264\247\345\270\201\347\261\273\345\236\213" + "H\000B\010\n\006nested\"\302\004\n\tevent_cfg\022.\n\002id\030\001 \001(\rB\"" + "\312>\014custom_rule4\322>\nunique_tag\330>\001\350Dd\022$\n\007pr" + "ocess\030\002 \001(\rB\023\322>\nunique_tag\330>\001\350D\001\022\036\n\004rule" + "\030\006 \001(\0132\020.event_rule_item\0227\n\rspecify_fiel" + "d\030\007 \001(\0132\020.event_rule_itemB\016\362\?\013server_onl" + "y\0223\n\004item\030\013 \001(\0132\022.event_reward_itemB\017\242\?\014" + "\345\245\226\345\212\261\351\201\223\345\205\267H\000\022#\n\010user_exp\030\014 \001(\003B\017\242\?\014\345\245\226" + "\345\212\261\347\273\217\351\252\214H\000\022\037\n\004note\030\r \001(\tB\017\242\?\014\346\217\217\350\277\260\346\226\207\346" + "\234\254H\000\0220\n\tenum_type\030\016 \001(\0162\n.cost_typeB\017\242\?\014" + "\350\264\247\345\270\201\347\261\273\345\236\213H\000\022%\n\nuser_level\0303 \001(\rB\017\242\?\014\347" + "\216\251\345\256\266\347\255\211\347\272\247H\001\022(\n\010test_arr\030[ \003(\0132\020.event_" + "rule_itemB\004\262\?\001;\022.\n\016test_empty_arr\030\\ \003(\0132" + "\020.event_rule_itemB\004\262\?\001;:,\312> Test event_c" + "fg with oneof fields\352D\006helperB\033\n\006reward\022" + "\021\330>\001\352>\013server_onlyB\r\n\013unlock_type\"\266\001\n\034ke" + "ep_or_strip_empty_list_cfg\022\037\n\002id\030\001 \001(\rB\023" + "\232\?\rThis is a Key\350D\001\022\034\n\tarray_msg\030\002 \003(\0132\t" + ".dep2_cfg\022\"\n\017array_plain_msg\030\003 \003(\0132\t.dep" + "2_cfg\022\023\n\013array_int32\030\004 \003(\005\022\023\n\013array_int6" + "4\030\005 \003(\003:\t\352D\006helper\"4\n\ncombine_id\022\016\n\006pref" + "ix\030\001 \001(\r\022\026\n\002id\030\002 \001(\rB\n\312>\0070-99999\"\333\003\n\021pro" + "cess_by_script\022\n\n\002id\030\001 \001(\r\022<\n\016map_u32_st" + "ring\030\002 \003(\0132$.process_by_script.MapU32Str" + "ingEntry\022\033\n\023human_readable_date\030\003 \001(\t\022(\n" + "\004date\030\004 \001(\0132\032.google.protobuf.Timestamp\022" + "6\n\013test_map_is\030\007 \003(\0132!.process_by_script" + ".TestMapIsEntry\022<\n\013test_map_sm\030\010 \003(\0132!.p" + "rocess_by_script.TestMapSmEntryB\004\262\?\001|\022\033\n" + "\005id_id\030\351\007 \001(\0132\013.combine_id\0323\n\021MapU32Stri" + "ngEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\t:\0028\001\032" + "0\n\016TestMapIsEntry\022\013\n\003key\030\001 \001(\005\022\r\n\005value\030" + "\002 \001(\t:\0028\001\032;\n\016TestMapSmEntry\022\013\n\003key\030\001 \001(\t" + "\022\030\n\005value\030\002 \001(\0132\t.dep2_cfg:\0028\001\"\222\001\n\017large" + "_file_test\022\n\n\002id\030\001 \001(\r\022\020\n\010i32value\030\002 \001(\005" + "\022\020\n\010u64value\030\003 \001(\004\022\020\n\010f64value\030\004 \001(\001\022\020\n\010" + "f32value\030\005 \001(\002\022\017\n\007szvalue\030\006 \001(\t\022\032\n\005id_id" + "\030\007 \001(\0132\013.combine_id\"N\n\023inner_alias_messa" + "ge\022\026\n\005iType\030\001 \001(\005B\007\242\?\004Type\022\037\n\tparamList\030" + "\002 \003(\003B\014\242\?\005Param\332\?\0012\"|\n\023outer_alias_messa" + "ge\022\022\n\003iId\030\001 \001(\005B\005\242\?\002ID\0222\n\006inners\030\002 \003(\0132\024" + ".inner_alias_messageB\014\242\?\tCondition\022\035\n\010ne" + "st_int\030\003 \003(\005B\013\242\?\004Nest\332\?\0012b\006proto3" }; static const ::_pbi::DescriptorTable* const descriptor_table_kind_2eproto_deps[6] = { @@ -1075,7 +1076,7 @@ static ::absl::once_flag descriptor_table_kind_2eproto_once; PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_kind_2eproto = { false, false, - 4253, + 4313, descriptor_table_protodef_kind_2eproto, "kind.proto", &descriptor_table_kind_2eproto_once, @@ -3533,10 +3534,10 @@ const ::_pbi::TcParseTable<3, 8, 6, 53, 2> arr_in_arr_cfg::_table_ = { // uint32 id = 1 [(.org.xresloader.field_description) = "This is a Key", (.org.xresloader.ue.key_tag) = 1]; {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(arr_in_arr_cfg, _impl_.id_), 63>(), {8, 63, 0, PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.id_)}}, - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; {::_pbi::TcParser::FastMtR1, {18, 63, 0, PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.arr_)}}, - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; {::_pbi::TcParser::FastV32P1, {26, 63, 0, PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.test_plain_int_arr_)}}, // repeated .cost_type test_plain_enum_arr = 4; @@ -3555,10 +3556,10 @@ const ::_pbi::TcParseTable<3, 8, 6, 53, 2> arr_in_arr_cfg::_table_ = { // uint32 id = 1 [(.org.xresloader.field_description) = "This is a Key", (.org.xresloader.ue.key_tag) = 1]; {PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.id_), -1, 0, (0 | ::_fl::kFcSingular | ::_fl::kUInt32)}, - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; {PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.arr_), -1, 0, (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)}, - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; {PROTOBUF_FIELD_OFFSET(arr_in_arr_cfg, _impl_.test_plain_int_arr_), -1, 0, (0 | ::_fl::kFcRepeated | ::_fl::kPackedInt32)}, // repeated .cost_type test_plain_enum_arr = 4; @@ -3642,7 +3643,7 @@ PROTOBUF_NOINLINE void arr_in_arr_cfg::Clear() { 1, this_._internal_id(), target); } - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; for (unsigned i = 0, n = static_cast( this_._internal_arr_size()); i < n; i++) { @@ -3653,7 +3654,7 @@ PROTOBUF_NOINLINE void arr_in_arr_cfg::Clear() { target, stream); } - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; { int byte_size = this_._impl_._test_plain_int_arr_cached_byte_size_.Get(); if (byte_size > 0) { @@ -3770,14 +3771,14 @@ PROTOBUF_NOINLINE void arr_in_arr_cfg::Clear() { ::_pbi::Prefetch5LinesFrom7Lines(&this_); { - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; { total_size += 1UL * this_._internal_arr_size(); for (const auto& msg : this_._internal_arr()) { total_size += ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } } - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; { std::size_t data_size = ::_pbi::WireFormatLite::Int32Size( this_._internal_test_plain_int_arr()) @@ -4901,7 +4902,7 @@ const ::_pbi::TcParseTable<3, 11, 5, 30, 11> event_cfg::_table_ = { // .event_rule_item rule = 6; {::_pbi::TcParser::FastMtS1, {50, 0, 0, PROTOBUF_FIELD_OFFSET(event_cfg, _impl_.rule_)}}, - // .event_rule_item specify_field = 7; + // .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; {::_pbi::TcParser::FastMtS1, {58, 1, 1, PROTOBUF_FIELD_OFFSET(event_cfg, _impl_.specify_field_)}}, }}, {{ @@ -4918,7 +4919,7 @@ const ::_pbi::TcParseTable<3, 11, 5, 30, 11> event_cfg::_table_ = { // .event_rule_item rule = 6; {PROTOBUF_FIELD_OFFSET(event_cfg, _impl_.rule_), _Internal::kHasBitsOffset + 0, 0, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, - // .event_rule_item specify_field = 7; + // .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; {PROTOBUF_FIELD_OFFSET(event_cfg, _impl_.specify_field_), _Internal::kHasBitsOffset + 1, 1, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, // .event_reward_item item = 11 [(.org.xresloader.field_alias) = "\345\245\226\345\212\261\351\201\223\345\205\267"]; @@ -5021,7 +5022,7 @@ PROTOBUF_NOINLINE void event_cfg::Clear() { stream); } - // .event_rule_item specify_field = 7; + // .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; if (cached_has_bits & 0x00000002u) { target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage( 7, *this_._impl_.specify_field_, this_._impl_.specify_field_->GetCachedSize(), target, @@ -5133,7 +5134,7 @@ PROTOBUF_NOINLINE void event_cfg::Clear() { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.rule_); } - // .event_rule_item specify_field = 7; + // .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; if (cached_has_bits & 0x00000002u) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*this_._impl_.specify_field_); diff --git a/sample/cxx/v3/kind.pb.h b/sample/cxx/v3/kind.pb.h index 49da7d66..d1504b0c 100755 --- a/sample/cxx/v3/kind.pb.h +++ b/sample/cxx/v3/kind.pb.h @@ -2654,7 +2654,7 @@ class event_cfg final : public ::google::protobuf::Message ::event_rule_item* _internal_mutable_rule(); public: - // .event_rule_item specify_field = 7; + // .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; bool has_specify_field() const; void clear_specify_field() ; const ::event_rule_item& specify_field() const; @@ -4361,7 +4361,7 @@ class arr_in_arr_cfg final : public ::google::protobuf::Message kTestPlainMsgFieldNumber = 5, kIdFieldNumber = 1, }; - // repeated .arr_in_arr arr = 2; + // repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; int arr_size() const; private: int _internal_arr_size() const; @@ -4378,7 +4378,7 @@ class arr_in_arr_cfg final : public ::google::protobuf::Message const ::arr_in_arr& arr(int index) const; ::arr_in_arr* add_arr(); const ::google::protobuf::RepeatedPtrField<::arr_in_arr>& arr() const; - // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; + // repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; int test_plain_int_arr_size() const; private: int _internal_test_plain_int_arr_size() const; @@ -6156,7 +6156,7 @@ inline void arr_in_arr_cfg::_internal_set_id(::uint32_t value) { _impl_.id_ = value; } -// repeated .arr_in_arr arr = 2; +// repeated .arr_in_arr arr = 2 [(.org.xresloader.field_tag) = "server_only"]; inline int arr_in_arr_cfg::_internal_arr_size() const { return _internal_arr().size(); } @@ -6205,7 +6205,7 @@ arr_in_arr_cfg::_internal_mutable_arr() { return &_impl_.arr_; } -// repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3"]; +// repeated int32 test_plain_int_arr = 3 [(.org.xresloader.field_list_min_size) = "1", (.org.xresloader.field_list_max_size) = "3", (.org.xresloader.field_tag) = "server_only"]; inline int arr_in_arr_cfg::_internal_test_plain_int_arr_size() const { return _internal_test_plain_int_arr().size(); } @@ -6986,7 +6986,7 @@ inline void event_cfg::set_allocated_rule(::event_rule_item* value) { // @@protoc_insertion_point(field_set_allocated:event_cfg.rule) } -// .event_rule_item specify_field = 7; +// .event_rule_item specify_field = 7 [(.org.xresloader.field_tag) = "server_only"]; inline bool event_cfg::has_specify_field() const { bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0; PROTOBUF_ASSUME(!value || _impl_.specify_field_ != nullptr); diff --git a/sample/gen_sample_output.ps1 b/sample/gen_sample_output.ps1 index 36560a21..3a877652 100755 --- a/sample/gen_sample_output.ps1 +++ b/sample/gen_sample_output.ps1 @@ -43,6 +43,8 @@ foreach ($proto_dir in "proto_v2", "proto_v3") { "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2", "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2", "-t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.xml -m KeyRow=2", + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2", + "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2", "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade --disable-excel-formular", "-t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n '/(?i)\.bin$/\.json/' --pretty 2 --disable-excel-formular", "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n '/(?i)\.bin$/\.lua/' --pretty 2 --disable-excel-formular", @@ -51,6 +53,8 @@ foreach ($proto_dir in "proto_v2", "proto_v3") { "-t js -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.js --javascript-export nodejs", "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.bin -m KeyRow=2", "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.lua -m KeyRow=2", + "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2", + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2", "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -c KindConst.json", "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec", "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|upgrade_10001|3,1' -m 'DataSource=$XLSX_FILE|upgrade_10002|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec", diff --git a/sample/gen_sample_output.sh b/sample/gen_sample_output.sh index 840adfde..9088d2c1 100755 --- a/sample/gen_sample_output.sh +++ b/sample/gen_sample_output.sh @@ -37,6 +37,8 @@ for proto_dir in proto_v2 proto_v3; do -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2 -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2 -t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.xml -m KeyRow=2 + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2 + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2 -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade --disable-excel-formular -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n "/(?i)\.bin$/\.json/" --pretty 2 --disable-excel-formular -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n "/(?i)\.bin$/\.lua/" --pretty 2 --disable-excel-formular @@ -45,6 +47,8 @@ for proto_dir in proto_v2 proto_v3; do -t js -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.js --javascript-export nodejs -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.bin -m KeyRow=2 -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.lua -m KeyRow=2 + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2 + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2 -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -c KindConst.json -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|upgrade_10001|3,1 -m DataSource='$XLSX_FILE'|upgrade_10002|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec diff --git a/sample/proto_v2/arr_in_arr_cfg.bin b/sample/proto_v2/arr_in_arr_cfg.bin index 55fa7ac31f06509efd741235be4b91fa9b5bab6b..4bcd3a5ad7b9f10faa419965388a620cbedc327f 100755 GIT binary patch delta 20 bcmaFD_Joa_YZfCHn~|QOrJlh??nq_;IfMk& delta 20 bcmaFD_Joa_YZfCHn~|QOg`Uwy?nq_;Ifn$+ diff --git a/sample/proto_v2/arr_in_arr_cfg.hidden.bin b/sample/proto_v2/arr_in_arr_cfg.hidden.bin new file mode 100644 index 00000000..9ab72be2 --- /dev/null +++ b/sample/proto_v2/arr_in_arr_cfg.hidden.bin @@ -0,0 +1,12 @@ + + +2.19.01.0.0.0"Gsha256:960ff46566e477db8f731488949271a1c499ec9015122ce90bca4496872ac61a*Test arr_in_arr_cfgZ' +资源转换示例.xlsx +arr_in_arrN N N N*222: +Map嵌套模式[0].value: Map嵌套模式[1].valueB +aao112B + 特殊:字符y122N N N N*22 :Map嵌套模式[0].value:Map嵌套模式[1].valueB +ba212B + 特殊.字符222tN N N N*2 :Map嵌套模式[0].value:Map嵌套模式[1].valueB +ca312B +cb322arr_in_arr_cfg \ No newline at end of file diff --git a/sample/proto_v2/arr_in_arr_cfg.hidden.lua b/sample/proto_v2/arr_in_arr_cfg.hidden.lua new file mode 100644 index 00000000..77a6c9fd --- /dev/null +++ b/sample/proto_v2/arr_in_arr_cfg.hidden.lua @@ -0,0 +1,127 @@ +-- this file is generated by xresloader, please don't edit it. + +return { + [1] = { + count = 3, + data_source = { + { + count = 3, + file = "资源转换示例.xlsx", + sheet = "arr_in_arr", + }, + }, + data_ver = "1.0.0.0", + description = "Test arr_in_arr_cfg", + hash_code = "sha256:b4d268d9a7b1a8cf6fc18489dd67c4a298408e7bffbde43c91d6ac2f47836601", + xres_ver = "2.19.0", + }, + [2] = "arr_in_arr_cfg", + arr_in_arr_cfg = { + { + arr = { + }, + id = 10001, + test_map_is = { + [10] = "Map嵌套模式[0].value", + [11] = "Map嵌套模式[1].value", + }, + test_map_sm = { + ["aa"] = { + id = 111, + level = "112", + }, + ["特殊:字符"] = { + id = 121, + level = "122", + }, + }, + test_plain_enum_arr = { + 10001, + 10001, + 10001, + }, + test_plain_msg = { + test_id_1 = 1, + }, + test_plain_msg_arr = { + { + test_id_1 = 1, + }, + { + test_id_1 = 3, + }, + { + test_id_1 = 5, + }, + }, + }, + { + arr = { + }, + id = 10002, + test_map_is = { + [20] = "Map嵌套模式[0].value", + [21] = "Map嵌套模式[1].value", + }, + test_map_sm = { + ["ba"] = { + id = 211, + level = "212", + }, + ["特殊.字符"] = { + id = 221, + level = "222", + }, + }, + test_plain_enum_arr = { + 10101, + 10101, + 10101, + }, + test_plain_msg = { + test_id_1 = 3, + test_id_3 = 5, + }, + test_plain_msg_arr = { + { + test_id_1 = 7, + }, + { + test_id_1 = 9, + }, + }, + }, + { + arr = { + }, + id = 10003, + test_map_is = { + [30] = "Map嵌套模式[0].value", + [31] = "Map嵌套模式[1].value", + }, + test_map_sm = { + ["ca"] = { + id = 311, + level = "312", + }, + ["cb"] = { + id = 321, + level = "322", + }, + }, + test_plain_enum_arr = { + 10001, + 10001, + 10001, + }, + test_plain_msg = { + test_id_1 = 6, + }, + test_plain_msg_arr = { + { + test_id_1 = 11, + }, + }, + }, + }, +} \ No newline at end of file diff --git a/sample/proto_v2/arr_in_arr_cfg.lua b/sample/proto_v2/arr_in_arr_cfg.lua index e15d77c6..16eedc0b 100755 --- a/sample/proto_v2/arr_in_arr_cfg.lua +++ b/sample/proto_v2/arr_in_arr_cfg.lua @@ -13,7 +13,7 @@ return { data_ver = "1.0.0.0", description = "Test arr_in_arr_cfg", hash_code = "sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "arr_in_arr_cfg", arr_in_arr_cfg = { diff --git a/sample/proto_v2/arr_in_arr_cfg.xml b/sample/proto_v2/arr_in_arr_cfg.xml index cd5f5445..4e2984a1 100644 --- a/sample/proto_v2/arr_in_arr_cfg.xml +++ b/sample/proto_v2/arr_in_arr_cfg.xml @@ -12,7 +12,7 @@ 1.0.0.0 Test arr_in_arr_cfg sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f - 2.18.2 + 2.19.0 diff --git a/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp index 0f9964d3..5da94982 100644 --- a/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp +++ b/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Private/ConfigRec/ArrInArrCfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/ArrInArrCfg.cpp index c44bfb43..0c301ed1 100644 --- a/sample/proto_v2/csv/Private/ConfigRec/ArrInArrCfg.cpp +++ b/sample/proto_v2/csv/Private/ConfigRec/ArrInArrCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Private/ConfigRec/Dep2Cfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/Dep2Cfg.cpp index d1b950ca..83c7e4df 100644 --- a/sample/proto_v2/csv/Private/ConfigRec/Dep2Cfg.cpp +++ b/sample/proto_v2/csv/Private/ConfigRec/Dep2Cfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Private/ConfigRec/EventCfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/EventCfg.cpp index 3a1c9b94..75e2b834 100644 --- a/sample/proto_v2/csv/Private/ConfigRec/EventCfg.cpp +++ b/sample/proto_v2/csv/Private/ConfigRec/EventCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Private/ConfigRec/EventRewardItem.cpp b/sample/proto_v2/csv/Private/ConfigRec/EventRewardItem.cpp index 1944ad41..6c6f91a8 100644 --- a/sample/proto_v2/csv/Private/ConfigRec/EventRewardItem.cpp +++ b/sample/proto_v2/csv/Private/ConfigRec/EventRewardItem.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Private/ConfigRec/EventRuleItem.cpp b/sample/proto_v2/csv/Private/ConfigRec/EventRuleItem.cpp index b2f740ae..22e90836 100644 --- a/sample/proto_v2/csv/Private/ConfigRec/EventRuleItem.cpp +++ b/sample/proto_v2/csv/Private/ConfigRec/EventRuleItem.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp index 4f3e9b93..e0cd2a7e 100644 --- a/sample/proto_v2/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp +++ b/sample/proto_v2/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Private/ConfigRec/RoleUpgradeCfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/RoleUpgradeCfg.cpp index dc8d6211..860337ac 100644 --- a/sample/proto_v2/csv/Private/ConfigRec/RoleUpgradeCfg.cpp +++ b/sample/proto_v2/csv/Private/ConfigRec/RoleUpgradeCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Private/ConfigRec/TestMsgVerifier.cpp b/sample/proto_v2/csv/Private/ConfigRec/TestMsgVerifier.cpp index 9b09f4cd..b01f834f 100644 --- a/sample/proto_v2/csv/Private/ConfigRec/TestMsgVerifier.cpp +++ b/sample/proto_v2/csv/Private/ConfigRec/TestMsgVerifier.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h b/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h index e262991a..102d9857 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h +++ b/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h b/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h index 1cdbd05a..9ba99aa6 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h b/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h index 300f3194..83a97ad4 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h b/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h index 7b909000..0f09441b 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h b/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h index a862d6fd..1e9ef05b 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h +++ b/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h b/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h index 9aa1b7c6..95859f3a 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h +++ b/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h b/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h index 4f0db46a..db3949a1 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h b/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h index 52e20a94..399aae72 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/csv/Public/ConfigRec/TestMsgVerifier.h b/sample/proto_v2/csv/Public/ConfigRec/TestMsgVerifier.h index 8030d8cc..4420f4d1 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/TestMsgVerifier.h +++ b/sample/proto_v2/csv/Public/ConfigRec/TestMsgVerifier.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/event_cfg.bin b/sample/proto_v2/event_cfg.bin index b4f9a75198f405015cedcb1881a78bd88fa70812..1e76ac61aba7dc7a6b48b219f065eefa65d65f31 100644 GIT binary patch delta 20 bcmZ3&yo8yXYdIqqn~|QOrJlh??wO1LFw6v+ delta 20 bcmZ3&yo8yXYdIqqn~|QOg`Uwy?wO1LFwX>= diff --git a/sample/proto_v2/event_cfg.hidden.bin b/sample/proto_v2/event_cfg.hidden.bin new file mode 100644 index 0000000000000000000000000000000000000000..db52e5d5639c60c780b2d8b5a19eeae427671ce9 GIT binary patch literal 373 zcmd;D&d9}Pq-SWUXCTCGsAm9z60Az@#Tki4re;=_=0=I;DW++rsmVze#)d|QmKJ6v zsfosBh6YI{#%7j==7vVbX{l*OW{Jj0M#hGg$;pYPiD?$emX;Rgrm2=%3L&Y*B?_r! zsd**w$!X~d<(VZJ3i)}d`DqGinW;G`#Zl^9;xD$gJli$l#ojf~dKW!kvg^sdZoP_} z;tCFcXaJKDCr2lXKo?8GM88|CoE#Tf1un5d*<0BJwy`CA1&T{?%wz|$ zqlBJK-SB*O3(%gYOQ%Du5)$ON3^a!sXwGC7fhjCN^+Ez1SAaq+Mr<5&Sp?>>WHCTR S*nlD%Sp+r#MWi_4p#T7c%6-iM literal 0 HcmV?d00001 diff --git a/sample/proto_v2/event_cfg.hidden.lua b/sample/proto_v2/event_cfg.hidden.lua new file mode 100644 index 00000000..f2c02b37 --- /dev/null +++ b/sample/proto_v2/event_cfg.hidden.lua @@ -0,0 +1,90 @@ +-- this file is generated by xresloader, please don't edit it. + +return { + [1] = { + count = 5, + data_source = { + { + count = 5, + file = "资源转换示例.xlsx", + sheet = "test_oneof", + }, + }, + data_ver = "1.0.0.0", + description = "Test event_cfg with oneof fields", + hash_code = "sha256:1ee8cc927336f8c693fbc5c5ca1f78d0e28d0f614de15d7dbe42cdd51b56f5f2", + xres_ver = "2.19.0", + }, + [2] = "event_cfg", + event_cfg = { + { + id = 50001, + process = 1, + rule = { + nested_note = "内嵌one of文本", + rule_id = 511, + rule_param = 512, + }, + test_arr = { + { + nested_note = "内嵌one of文本", + rule_id = 711, + rule_param = 712, + }, + }, + }, + { + id = 50002, + process = 2, + rule = { + nested_enum_type = 10001, + rule_id = 521, + rule_param = 522, + }, + test_arr = { + { + nested_enum_type = 10001, + rule_id = 721, + rule_param = 722, + }, + { + nested_enum_type = 10101, + rule_id = 821, + rule_param = 822, + }, + { + nested_note = "数组嵌套one of", + rule_id = 921, + rule_param = 822, + }, + }, + }, + { + id = 50003, + process = 3, + rule = { + nested_enum_type = 10101, + rule_id = 531, + rule_param = 532, + }, + }, + { + id = 50004, + note = "", + process = 4, + rule = { + rule_id = 541, + rule_param = 542, + }, + }, + { + id = 50004, + note = "", + process = 6, + rule = { + rule_id = 561, + rule_param = 562, + }, + }, + }, +} \ No newline at end of file diff --git a/sample/proto_v2/event_cfg.lua b/sample/proto_v2/event_cfg.lua index a7805daf..7b3c88fc 100644 --- a/sample/proto_v2/event_cfg.lua +++ b/sample/proto_v2/event_cfg.lua @@ -13,7 +13,7 @@ return { data_ver = "1.0.0.0", description = "Test event_cfg with oneof fields", hash_code = "sha256:f54ea4a17140ed6e75a9136bff6c0053251bb5a4cd3954d905cf5bac8fcce998", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "event_cfg", event_cfg = { diff --git a/sample/proto_v2/json/KindConst.cpp b/sample/proto_v2/json/KindConst.cpp index bf26ee5e..7bf9c60a 100644 --- a/sample/proto_v2/json/KindConst.cpp +++ b/sample/proto_v2/json/KindConst.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/KindConst.h b/sample/proto_v2/json/KindConst.h index 920ac45c..364822f4 100644 --- a/sample/proto_v2/json/KindConst.h +++ b/sample/proto_v2/json/KindConst.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v2/json/Private/ConfigRec/ArrInArr.cpp index 9576cfa4..7e80e9bc 100644 --- a/sample/proto_v2/json/Private/ConfigRec/ArrInArr.cpp +++ b/sample/proto_v2/json/Private/ConfigRec/ArrInArr.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Private/ConfigRec/ArrInArrCfg.cpp b/sample/proto_v2/json/Private/ConfigRec/ArrInArrCfg.cpp index 83b1be6b..dbf1515f 100644 --- a/sample/proto_v2/json/Private/ConfigRec/ArrInArrCfg.cpp +++ b/sample/proto_v2/json/Private/ConfigRec/ArrInArrCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Private/ConfigRec/Dep2Cfg.cpp b/sample/proto_v2/json/Private/ConfigRec/Dep2Cfg.cpp index b5e3cc66..07f7809f 100644 --- a/sample/proto_v2/json/Private/ConfigRec/Dep2Cfg.cpp +++ b/sample/proto_v2/json/Private/ConfigRec/Dep2Cfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Private/ConfigRec/EventCfg.cpp b/sample/proto_v2/json/Private/ConfigRec/EventCfg.cpp index 6b918cca..dd09e759 100644 --- a/sample/proto_v2/json/Private/ConfigRec/EventCfg.cpp +++ b/sample/proto_v2/json/Private/ConfigRec/EventCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Private/ConfigRec/EventRewardItem.cpp b/sample/proto_v2/json/Private/ConfigRec/EventRewardItem.cpp index 01b79dcf..d47fe92b 100644 --- a/sample/proto_v2/json/Private/ConfigRec/EventRewardItem.cpp +++ b/sample/proto_v2/json/Private/ConfigRec/EventRewardItem.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Private/ConfigRec/EventRuleItem.cpp b/sample/proto_v2/json/Private/ConfigRec/EventRuleItem.cpp index f8c75ff2..46900c8f 100644 --- a/sample/proto_v2/json/Private/ConfigRec/EventRuleItem.cpp +++ b/sample/proto_v2/json/Private/ConfigRec/EventRuleItem.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp b/sample/proto_v2/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp index 4f3e9b93..e0cd2a7e 100644 --- a/sample/proto_v2/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp +++ b/sample/proto_v2/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Private/ConfigRec/RoleUpgradeCfg.cpp b/sample/proto_v2/json/Private/ConfigRec/RoleUpgradeCfg.cpp index 486318df..dcb55521 100644 --- a/sample/proto_v2/json/Private/ConfigRec/RoleUpgradeCfg.cpp +++ b/sample/proto_v2/json/Private/ConfigRec/RoleUpgradeCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Private/ConfigRec/TestMsgVerifier.cpp b/sample/proto_v2/json/Private/ConfigRec/TestMsgVerifier.cpp index f301e7e3..b99bc222 100644 --- a/sample/proto_v2/json/Private/ConfigRec/TestMsgVerifier.cpp +++ b/sample/proto_v2/json/Private/ConfigRec/TestMsgVerifier.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Public/ConfigRec/ArrInArr.h b/sample/proto_v2/json/Public/ConfigRec/ArrInArr.h index c1f8e92b..505b069b 100644 --- a/sample/proto_v2/json/Public/ConfigRec/ArrInArr.h +++ b/sample/proto_v2/json/Public/ConfigRec/ArrInArr.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Public/ConfigRec/ArrInArrCfg.h b/sample/proto_v2/json/Public/ConfigRec/ArrInArrCfg.h index b527b95e..0619163a 100644 --- a/sample/proto_v2/json/Public/ConfigRec/ArrInArrCfg.h +++ b/sample/proto_v2/json/Public/ConfigRec/ArrInArrCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Public/ConfigRec/Dep2Cfg.h b/sample/proto_v2/json/Public/ConfigRec/Dep2Cfg.h index 372b5073..051696e7 100644 --- a/sample/proto_v2/json/Public/ConfigRec/Dep2Cfg.h +++ b/sample/proto_v2/json/Public/ConfigRec/Dep2Cfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Public/ConfigRec/EventCfg.h b/sample/proto_v2/json/Public/ConfigRec/EventCfg.h index d3b71444..b88b383f 100644 --- a/sample/proto_v2/json/Public/ConfigRec/EventCfg.h +++ b/sample/proto_v2/json/Public/ConfigRec/EventCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Public/ConfigRec/EventRewardItem.h b/sample/proto_v2/json/Public/ConfigRec/EventRewardItem.h index 0a7a29e5..6008b1d7 100644 --- a/sample/proto_v2/json/Public/ConfigRec/EventRewardItem.h +++ b/sample/proto_v2/json/Public/ConfigRec/EventRewardItem.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Public/ConfigRec/EventRuleItem.h b/sample/proto_v2/json/Public/ConfigRec/EventRuleItem.h index 0579a512..b98226ac 100644 --- a/sample/proto_v2/json/Public/ConfigRec/EventRuleItem.h +++ b/sample/proto_v2/json/Public/ConfigRec/EventRuleItem.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h b/sample/proto_v2/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h index 4f0db46a..db3949a1 100644 --- a/sample/proto_v2/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h +++ b/sample/proto_v2/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Public/ConfigRec/RoleUpgradeCfg.h b/sample/proto_v2/json/Public/ConfigRec/RoleUpgradeCfg.h index 691d9b6e..e1361580 100644 --- a/sample/proto_v2/json/Public/ConfigRec/RoleUpgradeCfg.h +++ b/sample/proto_v2/json/Public/ConfigRec/RoleUpgradeCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/json/Public/ConfigRec/TestMsgVerifier.h b/sample/proto_v2/json/Public/ConfigRec/TestMsgVerifier.h index d3ff8663..572078b5 100644 --- a/sample/proto_v2/json/Public/ConfigRec/TestMsgVerifier.h +++ b/sample/proto_v2/json/Public/ConfigRec/TestMsgVerifier.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v2/keep_empty_list_cfg.bin b/sample/proto_v2/keep_empty_list_cfg.bin index 2cbf362a3c40f3aa98df7594d7cb0dcdd9d1e15a..bacd30fc947f51418ab5d21519b7f0c945ecd66d 100644 GIT binary patch delta 20 bcmeyw{E3;HYceAjn~|QOrJlh??&pjEJLCm$ delta 20 bcmeyw{E3;HYceAjn~|QOg`Uwy?&pjEJLd&) diff --git a/sample/proto_v2/keep_empty_list_cfg.lua b/sample/proto_v2/keep_empty_list_cfg.lua index 4b55ca6d..da32a895 100644 --- a/sample/proto_v2/keep_empty_list_cfg.lua +++ b/sample/proto_v2/keep_empty_list_cfg.lua @@ -12,7 +12,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:e192b1278aea13633eb67e367edc99aa2bb8b487e32f3e8a0f9c5b975230304e", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/sample/proto_v2/kind.desc.json b/sample/proto_v2/kind.desc.json index 57c889bc..7678e7f7 100644 --- a/sample/proto_v2/kind.desc.json +++ b/sample/proto_v2/kind.desc.json @@ -190,6 +190,7 @@ "arr": { "name": "arr", "number": 2, + "options": {"field_tag": ["server_only"]}, "type_name": "MESSAGE" }, "id": { @@ -222,7 +223,8 @@ "number": 3, "options": { "field_list_max_size": "3", - "field_list_min_size": "1" + "field_list_min_size": "1", + "field_tag": ["server_only"] }, "type_name": "INT32" }, @@ -309,6 +311,7 @@ "specify_field": { "name": "specify_field", "number": 7, + "options": {"field_tag": ["server_only"]}, "type_name": "MESSAGE" }, "test_arr": { @@ -340,7 +343,10 @@ "oneof_decl": { "reward": { "name": "reward", - "options": {"oneof_not_null": true} + "options": { + "oneof_not_null": true, + "oneof_tag": ["server_only"] + } }, "unlock_type": {"name": "unlock_type"} }, @@ -754,7 +760,10 @@ "test_id_2": { "name": "test_id_2", "number": 10002, - "options": {"field_alias": ["测试ID别名2"]}, + "options": { + "field_alias": ["测试ID别名2"], + "field_tag": ["server_only"] + }, "type_name": "UINT32" }, "test_id_3": { diff --git a/sample/proto_v2/kind.desc.lua b/sample/proto_v2/kind.desc.lua index bb2d7789..9708c36c 100644 --- a/sample/proto_v2/kind.desc.lua +++ b/sample/proto_v2/kind.desc.lua @@ -87,6 +87,16 @@ local const_res = { }, }, field = { + arr = { + name = "arr", + number = 2, + options = { + field_tag = { + "server_only", + }, + }, + type_name = "MESSAGE", + }, id = { name = "id", number = 1, @@ -110,6 +120,9 @@ local const_res = { options = { field_list_max_size = "3", field_list_min_size = "1", + field_tag = { + "server_only", + }, }, type_name = "INT32", }, @@ -198,6 +211,16 @@ local const_res = { }, type_name = "UINT32", }, + specify_field = { + name = "specify_field", + number = 7, + options = { + field_tag = { + "server_only", + }, + }, + type_name = "MESSAGE", + }, test_arr = { name = "test_arr", number = 91, @@ -241,6 +264,9 @@ local const_res = { name = "reward", options = { oneof_not_null = true, + oneof_tag = { + "server_only", + }, }, }, }, @@ -492,6 +518,9 @@ local const_res = { field_alias = { "测试ID别名2", }, + field_tag = { + "server_only", + }, }, type_name = "UINT32", }, diff --git a/sample/proto_v2/kind.pb b/sample/proto_v2/kind.pb index bf7dc03369f2b98ee899aeb789125ef6027d4dda..cb5667eb373bff125b4be75feb4fd7e8263889f5 100755 GIT binary patch delta 193 zcmZqH+^@Nzf{F3y=1Qg}Hm1p}lmBv+?K~5r2S!P}dNT~!fP&ccS*e!cT!$*US6>H_FSZ@$I5hEYbEi>)ZNJh3Q6NbrUo<10I4%QsKqf6oE{ DCZa+M delta 132 zcmdn5*{r#tf{C$nb0t#~8`D>o$$vS_Tx7YJ6N`!@m=u^bxQ)2=fb96pym%lL1QHiA zK$VmhWXXcfFq$HSus#%>lZrL*$KC)*t-aM6a2{U8cWGmijjHZ(>@~Us< c;9JAU$IHc5lvobx>-;K4wcjgN+9pcmOOU1)Tr@ delta 14 VcmX>obx>-;K4uF&qm2g}cmOOX1)cx^ diff --git a/sample/proto_v2/role_cfg.n.js b/sample/proto_v2/role_cfg.n.js index f931e1f6..e6d240a5 100755 --- a/sample/proto_v2/role_cfg.n.js +++ b/sample/proto_v2/role_cfg.n.js @@ -12,7 +12,7 @@ exports.role_cfg_header = { ], data_ver : "1.0.0.0", hash_code : "sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f", - xres_ver : "2.18.2" + xres_ver : "2.19.0" }; exports.role_cfg = [ { diff --git a/sample/proto_v2/role_cfg.xml b/sample/proto_v2/role_cfg.xml index 22cba822..830ba6cd 100755 --- a/sample/proto_v2/role_cfg.xml +++ b/sample/proto_v2/role_cfg.xml @@ -1,2 +1,2 @@ -
77资源转换示例.xlsxkind1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.18.2
04591504951504591501666627200016693056000166662720011012014/10/1351123100010欧若拉12:45:1513:45:1512:45:152022-10-252022-11-252022-10-25lalal欧若拉小魔女1000104591504951504591501666673115016693515150166667311522012014/10/1461654100021杰克4591549515459152022-10-25 12:45:152022-11-25 12:45:152022-10-25 12:45:15blebleble杰克海盗王子100011010139045915049515044555901666673115016693515150166667311543012014/10/1571sdadasd100032库拉4591513:45:15123:45:59166667311516693515151666673115hahaha库拉喵少年100011000110101850495150445520016666731150166935151501666701915840119:10:5081ffff100043莫瑞茨13:45:15123:45:20Z16666731152022-11-25 12:45:152022-10-25 12:45:15Zangel莫瑞茨1220445559123000000416720016693515151230000001666673115124123:45:59123:45:20.123+08:002022-11-25 12:45:152022-10-25 12:45:15.123+08:001230000004455201230000001666673115999995019:10:50 上午91gggg100055爱丽丝123:45:20.1232022-10-25 12:45:15.12318310001laopo爱丽丝1230000004591512300000016666731159996012014-10-20 19:50:50101hhhhh100066都玛西亚45915.1231666673115.12327410101keai都玛西亚role_cfg \ No newline at end of file +
77资源转换示例.xlsxkind1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.19.0
04591504951504591501666627200016693056000166662720011012014/10/1351123100010欧若拉12:45:1513:45:1512:45:152022-10-252022-11-252022-10-25lalal欧若拉小魔女1000104591504951504591501666673115016693515150166667311522012014/10/1461654100021杰克4591549515459152022-10-25 12:45:152022-11-25 12:45:152022-10-25 12:45:15blebleble杰克海盗王子100011010139045915049515044555901666673115016693515150166667311543012014/10/1571sdadasd100032库拉4591513:45:15123:45:59166667311516693515151666673115hahaha库拉喵少年100011000110101850495150445520016666731150166935151501666701915840119:10:5081ffff100043莫瑞茨13:45:15123:45:20Z16666731152022-11-25 12:45:152022-10-25 12:45:15Zangel莫瑞茨1220445559123000000416720016693515151230000001666673115124123:45:59123:45:20.123+08:002022-11-25 12:45:152022-10-25 12:45:15.123+08:001230000004455201230000001666673115999995019:10:50 上午91gggg100055爱丽丝123:45:20.1232022-10-25 12:45:15.12318310001laopo爱丽丝1230000004591512300000016666731159996012014-10-20 19:50:50101hhhhh100066都玛西亚45915.1231666673115.12327410101keai都玛西亚role_cfg \ No newline at end of file diff --git a/sample/proto_v2/role_cfg_module.lua b/sample/proto_v2/role_cfg_module.lua index 27731660..4381ecee 100755 --- a/sample/proto_v2/role_cfg_module.lua +++ b/sample/proto_v2/role_cfg_module.lua @@ -1,5 +1,5 @@ module("ProtoData.Kind.role_cfg", package.seeall) -- this file is generated by xresloader, please don't edit it. - header = { count = 7, data_source = { { count = 7, file = "资源转换示例.xlsx", sheet = "kind", }, }, data_ver = "1.0.0.0", hash_code = "sha256:f83885dbe713ab6b423cf917a202d67da647d58a4636dbad41575d5479a6e87a", xres_ver = "2.18.2", } + header = { count = 7, data_source = { { count = 7, file = "资源转换示例.xlsx", sheet = "kind", }, }, data_ver = "1.0.0.0", hash_code = "sha256:f83885dbe713ab6b423cf917a202d67da647d58a4636dbad41575d5479a6e87a", xres_ver = "2.19.0", } data_message_type = "role_cfg" role_cfg = { { convert_duration_arr = { { nanos = 0, seconds = 45915, }, { nanos = 0, seconds = 49515, }, }, convert_duration_one = { nanos = 0, seconds = 45915, }, convert_timepoint_arr = { { nanos = 0, seconds = 1666627200, }, { nanos = 0, seconds = 1669305600, }, }, convert_timepoint_one = { nanos = 0, seconds = 1666627200, }, cost_value = 1, dep_test = { dep2 = { id = 101, level = "2014/10/13", }, id = 51, name = "123", }, id = 10001, int_as_string = "0", name = "欧若拉", origin_duration_arr = { "12:45:15", "13:45:15", }, origin_duration_one = "12:45:15", origin_timepoint_arr = { "2022-10-25", "2022-11-25", }, origin_timepoint_one = "2022-10-25", test_array = { "lalal", "欧若拉", "小魔女", }, test_plain_enum_array = { 10001, }, }, { convert_duration_arr = { { nanos = 0, seconds = 45915, }, { nanos = 0, seconds = 49515, }, }, convert_duration_one = { nanos = 0, seconds = 45915, }, convert_timepoint_arr = { { nanos = 0, seconds = 1666673115, }, { nanos = 0, seconds = 1669351515, }, }, convert_timepoint_one = { nanos = 0, seconds = 1666673115, }, cost_value = 2, dep_test = { dep2 = { id = 201, level = "2014/10/14", }, id = 61, name = "654", }, id = 10002, int_as_string = "1", name = "杰克", origin_duration_arr = { "45915", "49515", }, origin_duration_one = "45915", origin_timepoint_arr = { "2022-10-25 12:45:15", "2022-11-25 12:45:15", }, origin_timepoint_one = "2022-10-25 12:45:15", test_array = { "blebleble", "杰克", "海盗王子", }, test_plain_enum_array = { 10001, 10101, }, unlock_level = 39, }, { convert_duration_arr = { { nanos = 0, seconds = 45915, }, { nanos = 0, seconds = 49515, }, }, convert_duration_one = { nanos = 0, seconds = 445559, }, convert_timepoint_arr = { { nanos = 0, seconds = 1666673115, }, { nanos = 0, seconds = 1669351515, }, }, convert_timepoint_one = { nanos = 0, seconds = 1666673115, }, cost_value = 4, dep_test = { dep2 = { id = 301, level = "2014/10/15", }, id = 71, name = "sdadasd", }, id = 10003, int_as_string = "2", name = "库拉", origin_duration_arr = { "45915", "13:45:15", }, origin_duration_one = "123:45:59", origin_timepoint_arr = { "1666673115", "1669351515", }, origin_timepoint_one = "1666673115", test_array = { "hahaha", "库拉", "喵少年", }, test_plain_enum_array = { 10001, 10001, 10101, }, unlock_level = 85, }, { convert_duration_arr = { { nanos = 0, seconds = 49515, }, }, convert_duration_one = { nanos = 0, seconds = 445520, }, convert_timepoint_arr = { { nanos = 0, seconds = 1666673115, }, { nanos = 0, seconds = 1669351515, }, }, convert_timepoint_one = { nanos = 0, seconds = 1666701915, }, cost_value = 8, dep_test = { dep2 = { id = 401, level = "19:10:50", }, id = 81, name = "ffff", }, id = 10004, int_as_string = "3", name = "莫瑞茨", origin_duration_arr = { "", "13:45:15", }, origin_duration_one = "123:45:20Z", origin_timepoint_arr = { "1666673115", "2022-11-25 12:45:15", }, origin_timepoint_one = "2022-10-25 12:45:15Z", test_array = { "angel", "莫瑞茨", }, unlock_level = 122, }, { convert_duration_arr = { { nanos = 0, seconds = 445559, }, }, convert_duration_one = { nanos = 123000000, seconds = 416720, }, convert_timepoint_arr = { { nanos = 0, seconds = 1669351515, }, }, convert_timepoint_one = { nanos = 123000000, seconds = 1666673115, }, dep_test = { id = 12, }, int_as_string = "4", origin_duration_arr = { "", "123:45:59", }, origin_duration_one = "123:45:20.123+08:00", origin_timepoint_arr = { "", "2022-11-25 12:45:15", }, origin_timepoint_one = "2022-10-25 12:45:15.123+08:00", }, { convert_duration_one = { nanos = 123000000, seconds = 445520, }, convert_timepoint_one = { nanos = 123000000, seconds = 1666673115, }, cost_type = 10001, cost_value = 99999, dep_test = { dep2 = { id = 501, level = "9:10:50 上午", }, id = 91, name = "gggg", }, id = 10005, int_as_string = "5", name = "爱丽丝", origin_duration_one = "123:45:20.123", origin_timepoint_one = "2022-10-25 12:45:15.123", test_array = { "laopo", "爱丽丝", }, unlock_level = 183, }, { convert_duration_one = { nanos = 123000000, seconds = 45915, }, convert_timepoint_one = { nanos = 123000000, seconds = 1666673115, }, cost_type = 10101, cost_value = 999, dep_test = { dep2 = { id = 601, level = "2014-10-20 19:50:50", }, id = 101, name = "hhhhh", }, id = 10006, int_as_string = "6", name = "都玛西亚", origin_duration_one = "45915.123", origin_timepoint_one = "1666673115.123", test_array = { "keai", "都玛西亚", }, unlock_level = 274, }, } \ No newline at end of file diff --git a/sample/proto_v2/role_upgrade_cfg.bin b/sample/proto_v2/role_upgrade_cfg.bin index b7ac686c5fabf2add62b1667fb821a2adf914911..717ed345ffa32205af4c1393d539dc8a1909117c 100644 GIT binary patch delta 20 bcmeC<>Eq$%YGUGIGtx7()HB$~&CCV>E35;{ delta 20 bcmeC<>Eq$%YGUGIGtx7(&@E3X60 diff --git a/sample/proto_v2/role_upgrade_cfg.json b/sample/proto_v2/role_upgrade_cfg.json index e684307d..d0a8f7d0 100755 --- a/sample/proto_v2/role_upgrade_cfg.json +++ b/sample/proto_v2/role_upgrade_cfg.json @@ -16,7 +16,7 @@ "data_ver": "1.0.0.0", "description": "Test role_upgrade_cfg with multi keys\r\nTest role_upgrade_cfg with multi keys", "hash_code": "sha256:e356806bc55be9cc8a6c701d4295989e0fc3887b368681bb9457b0e51df8f445", - "xres_ver": "2.18.2" + "xres_ver": "2.19.0" }, {"role_upgrade_cfg": [ { diff --git a/sample/proto_v2/role_upgrade_cfg.lua b/sample/proto_v2/role_upgrade_cfg.lua index 3c4139c8..9041cecb 100755 --- a/sample/proto_v2/role_upgrade_cfg.lua +++ b/sample/proto_v2/role_upgrade_cfg.lua @@ -18,7 +18,7 @@ return { data_ver = "1.0.0.0", description = "Test role_upgrade_cfg with multi keys\r\nTest role_upgrade_cfg with multi keys", hash_code = "sha256:e356806bc55be9cc8a6c701d4295989e0fc3887b368681bb9457b0e51df8f445", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "role_upgrade_cfg", role_upgrade_cfg = { diff --git a/sample/proto_v2/strip_list_tail_cfg.bin b/sample/proto_v2/strip_list_tail_cfg.bin index 9655cf5729bcb7eed5b305ca0aa55cec000e4ab9..d8d529e64b37a46a65d8329929e8bb438c4c0812 100644 GIT binary patch delta 20 bcmaFG{EC^IYceAjn~|QOrJlh??)!`YI-~_y delta 20 bcmaFG{EC^IYceAjn~|QOg`Uwy?)!`YI;RC$ diff --git a/sample/proto_v2/strip_list_tail_cfg.lua b/sample/proto_v2/strip_list_tail_cfg.lua index ea2cca80..8e4cfce1 100644 --- a/sample/proto_v2/strip_list_tail_cfg.lua +++ b/sample/proto_v2/strip_list_tail_cfg.lua @@ -12,7 +12,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:bef5c76679b43b65aec7906f42010530fadae99f0e386d94e3a77e94a7d12e8e", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/sample/proto_v3/arr_in_arr_cfg.bin b/sample/proto_v3/arr_in_arr_cfg.bin index 2b8b6869e0a43002b66f733faa2560b7170187ee..6ed040c6bdfac3010105e24a1d05a39c108ba0c4 100755 GIT binary patch delta 20 bcmcb|c8`slYZfCHn~|QOrJlh??qFsBIFtm# delta 20 bcmcb|c8`slYZfCHn~|QOg`Uwy?qFsBIF|&( diff --git a/sample/proto_v3/arr_in_arr_cfg.hidden.bin b/sample/proto_v3/arr_in_arr_cfg.hidden.bin new file mode 100644 index 00000000..427fa8f3 --- /dev/null +++ b/sample/proto_v3/arr_in_arr_cfg.hidden.bin @@ -0,0 +1,12 @@ + + +2.19.01.0.0.0"Gsha256:bc5118693da3a47c87e3dfaa4c5942fb7a5ba6865b8184f4a5f106fd603733dc*Test arr_in_arr_cfgZ' +资源转换示例.xlsx +arr_in_arrN"NNN*222: +Map嵌套模式[0].value: Map嵌套模式[1].valueB +aao112B + 特殊:字符y122N"NNN*22 :Map嵌套模式[0].value:Map嵌套模式[1].valueB +ba212B + 特殊.字符222sN"NNN*2 :Map嵌套模式[0].value:Map嵌套模式[1].valueB +ca312B +cb322arr_in_arr_cfg \ No newline at end of file diff --git a/sample/proto_v3/arr_in_arr_cfg.hidden.lua b/sample/proto_v3/arr_in_arr_cfg.hidden.lua new file mode 100644 index 00000000..77a6c9fd --- /dev/null +++ b/sample/proto_v3/arr_in_arr_cfg.hidden.lua @@ -0,0 +1,127 @@ +-- this file is generated by xresloader, please don't edit it. + +return { + [1] = { + count = 3, + data_source = { + { + count = 3, + file = "资源转换示例.xlsx", + sheet = "arr_in_arr", + }, + }, + data_ver = "1.0.0.0", + description = "Test arr_in_arr_cfg", + hash_code = "sha256:b4d268d9a7b1a8cf6fc18489dd67c4a298408e7bffbde43c91d6ac2f47836601", + xres_ver = "2.19.0", + }, + [2] = "arr_in_arr_cfg", + arr_in_arr_cfg = { + { + arr = { + }, + id = 10001, + test_map_is = { + [10] = "Map嵌套模式[0].value", + [11] = "Map嵌套模式[1].value", + }, + test_map_sm = { + ["aa"] = { + id = 111, + level = "112", + }, + ["特殊:字符"] = { + id = 121, + level = "122", + }, + }, + test_plain_enum_arr = { + 10001, + 10001, + 10001, + }, + test_plain_msg = { + test_id_1 = 1, + }, + test_plain_msg_arr = { + { + test_id_1 = 1, + }, + { + test_id_1 = 3, + }, + { + test_id_1 = 5, + }, + }, + }, + { + arr = { + }, + id = 10002, + test_map_is = { + [20] = "Map嵌套模式[0].value", + [21] = "Map嵌套模式[1].value", + }, + test_map_sm = { + ["ba"] = { + id = 211, + level = "212", + }, + ["特殊.字符"] = { + id = 221, + level = "222", + }, + }, + test_plain_enum_arr = { + 10101, + 10101, + 10101, + }, + test_plain_msg = { + test_id_1 = 3, + test_id_3 = 5, + }, + test_plain_msg_arr = { + { + test_id_1 = 7, + }, + { + test_id_1 = 9, + }, + }, + }, + { + arr = { + }, + id = 10003, + test_map_is = { + [30] = "Map嵌套模式[0].value", + [31] = "Map嵌套模式[1].value", + }, + test_map_sm = { + ["ca"] = { + id = 311, + level = "312", + }, + ["cb"] = { + id = 321, + level = "322", + }, + }, + test_plain_enum_arr = { + 10001, + 10001, + 10001, + }, + test_plain_msg = { + test_id_1 = 6, + }, + test_plain_msg_arr = { + { + test_id_1 = 11, + }, + }, + }, + }, +} \ No newline at end of file diff --git a/sample/proto_v3/arr_in_arr_cfg.lua b/sample/proto_v3/arr_in_arr_cfg.lua index e15d77c6..16eedc0b 100755 --- a/sample/proto_v3/arr_in_arr_cfg.lua +++ b/sample/proto_v3/arr_in_arr_cfg.lua @@ -13,7 +13,7 @@ return { data_ver = "1.0.0.0", description = "Test arr_in_arr_cfg", hash_code = "sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "arr_in_arr_cfg", arr_in_arr_cfg = { diff --git a/sample/proto_v3/arr_in_arr_cfg.xml b/sample/proto_v3/arr_in_arr_cfg.xml index cd5f5445..4e2984a1 100644 --- a/sample/proto_v3/arr_in_arr_cfg.xml +++ b/sample/proto_v3/arr_in_arr_cfg.xml @@ -12,7 +12,7 @@ 1.0.0.0 Test arr_in_arr_cfg sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f - 2.18.2 + 2.19.0 diff --git a/sample/proto_v3/csv/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v3/csv/Private/ConfigRec/ArrInArr.cpp index 42609520..c83cfe8f 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/ArrInArr.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/ArrInArr.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/ArrInArrCfg.cpp b/sample/proto_v3/csv/Private/ConfigRec/ArrInArrCfg.cpp index c44bfb43..0c301ed1 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/ArrInArrCfg.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/ArrInArrCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/Dep2Cfg.cpp b/sample/proto_v3/csv/Private/ConfigRec/Dep2Cfg.cpp index d1b950ca..83c7e4df 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/Dep2Cfg.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/Dep2Cfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/DepCfg.cpp b/sample/proto_v3/csv/Private/ConfigRec/DepCfg.cpp index aee88eec..ed543dce 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/DepCfg.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/DepCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/EventCfg.cpp b/sample/proto_v3/csv/Private/ConfigRec/EventCfg.cpp index 3a1c9b94..75e2b834 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/EventCfg.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/EventCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/EventRewardItem.cpp b/sample/proto_v3/csv/Private/ConfigRec/EventRewardItem.cpp index 1944ad41..6c6f91a8 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/EventRewardItem.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/EventRewardItem.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/EventRuleItem.cpp b/sample/proto_v3/csv/Private/ConfigRec/EventRuleItem.cpp index b2f740ae..22e90836 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/EventRuleItem.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/EventRuleItem.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/GoogleProtobufDuration.cpp b/sample/proto_v3/csv/Private/ConfigRec/GoogleProtobufDuration.cpp index c21eb5e5..f73057d5 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/GoogleProtobufDuration.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/GoogleProtobufDuration.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/GoogleProtobufTimestamp.cpp b/sample/proto_v3/csv/Private/ConfigRec/GoogleProtobufTimestamp.cpp index 6e7234ee..7477a073 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/GoogleProtobufTimestamp.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/GoogleProtobufTimestamp.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp b/sample/proto_v3/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp index 4f3e9b93..e0cd2a7e 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/RoleCfg.cpp b/sample/proto_v3/csv/Private/ConfigRec/RoleCfg.cpp index 3aa7bce0..9a07d74d 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/RoleCfg.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/RoleCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/RoleUpgradeCfg.cpp b/sample/proto_v3/csv/Private/ConfigRec/RoleUpgradeCfg.cpp index 840bd560..92e43717 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/RoleUpgradeCfg.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/RoleUpgradeCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Private/ConfigRec/TestMsgVerifier.cpp b/sample/proto_v3/csv/Private/ConfigRec/TestMsgVerifier.cpp index 9b09f4cd..b01f834f 100644 --- a/sample/proto_v3/csv/Private/ConfigRec/TestMsgVerifier.cpp +++ b/sample/proto_v3/csv/Private/ConfigRec/TestMsgVerifier.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/ArrInArr.h b/sample/proto_v3/csv/Public/ConfigRec/ArrInArr.h index 1234afbd..67dded80 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/ArrInArr.h +++ b/sample/proto_v3/csv/Public/ConfigRec/ArrInArr.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/ArrInArrCfg.h b/sample/proto_v3/csv/Public/ConfigRec/ArrInArrCfg.h index 1cdbd05a..9ba99aa6 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/ArrInArrCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/ArrInArrCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/Dep2Cfg.h b/sample/proto_v3/csv/Public/ConfigRec/Dep2Cfg.h index 300f3194..83a97ad4 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/Dep2Cfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/Dep2Cfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/DepCfg.h b/sample/proto_v3/csv/Public/ConfigRec/DepCfg.h index 991e8968..38f5b9c9 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/DepCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/DepCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/EventCfg.h b/sample/proto_v3/csv/Public/ConfigRec/EventCfg.h index 7b909000..0f09441b 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/EventCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/EventCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/EventRewardItem.h b/sample/proto_v3/csv/Public/ConfigRec/EventRewardItem.h index a862d6fd..1e9ef05b 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/EventRewardItem.h +++ b/sample/proto_v3/csv/Public/ConfigRec/EventRewardItem.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/EventRuleItem.h b/sample/proto_v3/csv/Public/ConfigRec/EventRuleItem.h index 9aa1b7c6..95859f3a 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/EventRuleItem.h +++ b/sample/proto_v3/csv/Public/ConfigRec/EventRuleItem.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/GoogleProtobufDuration.h b/sample/proto_v3/csv/Public/ConfigRec/GoogleProtobufDuration.h index 3a075781..9814fa37 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/GoogleProtobufDuration.h +++ b/sample/proto_v3/csv/Public/ConfigRec/GoogleProtobufDuration.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/GoogleProtobufTimestamp.h b/sample/proto_v3/csv/Public/ConfigRec/GoogleProtobufTimestamp.h index c8ec36c8..a7b95edb 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/GoogleProtobufTimestamp.h +++ b/sample/proto_v3/csv/Public/ConfigRec/GoogleProtobufTimestamp.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h b/sample/proto_v3/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h index 4f0db46a..db3949a1 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/RoleCfg.h b/sample/proto_v3/csv/Public/ConfigRec/RoleCfg.h index 1d342a6a..d41702f5 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/RoleCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/RoleCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/RoleUpgradeCfg.h b/sample/proto_v3/csv/Public/ConfigRec/RoleUpgradeCfg.h index 52e20a94..399aae72 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/RoleUpgradeCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/RoleUpgradeCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/csv/Public/ConfigRec/TestMsgVerifier.h b/sample/proto_v3/csv/Public/ConfigRec/TestMsgVerifier.h index 8030d8cc..4420f4d1 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/TestMsgVerifier.h +++ b/sample/proto_v3/csv/Public/ConfigRec/TestMsgVerifier.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/event_cfg.bin b/sample/proto_v3/event_cfg.bin index b4f9a75198f405015cedcb1881a78bd88fa70812..1e76ac61aba7dc7a6b48b219f065eefa65d65f31 100644 GIT binary patch delta 20 bcmZ3&yo8yXYdIqqn~|QOrJlh??wO1LFw6v+ delta 20 bcmZ3&yo8yXYdIqqn~|QOg`Uwy?wO1LFwX>= diff --git a/sample/proto_v3/event_cfg.hidden.bin b/sample/proto_v3/event_cfg.hidden.bin new file mode 100644 index 0000000000000000000000000000000000000000..db52e5d5639c60c780b2d8b5a19eeae427671ce9 GIT binary patch literal 373 zcmd;D&d9}Pq-SWUXCTCGsAm9z60Az@#Tki4re;=_=0=I;DW++rsmVze#)d|QmKJ6v zsfosBh6YI{#%7j==7vVbX{l*OW{Jj0M#hGg$;pYPiD?$emX;Rgrm2=%3L&Y*B?_r! zsd**w$!X~d<(VZJ3i)}d`DqGinW;G`#Zl^9;xD$gJli$l#ojf~dKW!kvg^sdZoP_} z;tCFcXaJKDCr2lXKo?8GM88|CoE#Tf1un5d*<0BJwy`CA1&T{?%wz|$ zqlBJK-SB*O3(%gYOQ%Du5)$ON3^a!sXwGC7fhjCN^+Ez1SAaq+Mr<5&Sp?>>WHCTR S*nlD%Sp+r#MWi_4p#T7c%6-iM literal 0 HcmV?d00001 diff --git a/sample/proto_v3/event_cfg.hidden.lua b/sample/proto_v3/event_cfg.hidden.lua new file mode 100644 index 00000000..f2c02b37 --- /dev/null +++ b/sample/proto_v3/event_cfg.hidden.lua @@ -0,0 +1,90 @@ +-- this file is generated by xresloader, please don't edit it. + +return { + [1] = { + count = 5, + data_source = { + { + count = 5, + file = "资源转换示例.xlsx", + sheet = "test_oneof", + }, + }, + data_ver = "1.0.0.0", + description = "Test event_cfg with oneof fields", + hash_code = "sha256:1ee8cc927336f8c693fbc5c5ca1f78d0e28d0f614de15d7dbe42cdd51b56f5f2", + xres_ver = "2.19.0", + }, + [2] = "event_cfg", + event_cfg = { + { + id = 50001, + process = 1, + rule = { + nested_note = "内嵌one of文本", + rule_id = 511, + rule_param = 512, + }, + test_arr = { + { + nested_note = "内嵌one of文本", + rule_id = 711, + rule_param = 712, + }, + }, + }, + { + id = 50002, + process = 2, + rule = { + nested_enum_type = 10001, + rule_id = 521, + rule_param = 522, + }, + test_arr = { + { + nested_enum_type = 10001, + rule_id = 721, + rule_param = 722, + }, + { + nested_enum_type = 10101, + rule_id = 821, + rule_param = 822, + }, + { + nested_note = "数组嵌套one of", + rule_id = 921, + rule_param = 822, + }, + }, + }, + { + id = 50003, + process = 3, + rule = { + nested_enum_type = 10101, + rule_id = 531, + rule_param = 532, + }, + }, + { + id = 50004, + note = "", + process = 4, + rule = { + rule_id = 541, + rule_param = 542, + }, + }, + { + id = 50004, + note = "", + process = 6, + rule = { + rule_id = 561, + rule_param = 562, + }, + }, + }, +} \ No newline at end of file diff --git a/sample/proto_v3/event_cfg.lua b/sample/proto_v3/event_cfg.lua index a7805daf..7b3c88fc 100644 --- a/sample/proto_v3/event_cfg.lua +++ b/sample/proto_v3/event_cfg.lua @@ -13,7 +13,7 @@ return { data_ver = "1.0.0.0", description = "Test event_cfg with oneof fields", hash_code = "sha256:f54ea4a17140ed6e75a9136bff6c0053251bb5a4cd3954d905cf5bac8fcce998", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "event_cfg", event_cfg = { diff --git a/sample/proto_v3/json/KindConst.cpp b/sample/proto_v3/json/KindConst.cpp index bf26ee5e..7bf9c60a 100644 --- a/sample/proto_v3/json/KindConst.cpp +++ b/sample/proto_v3/json/KindConst.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/KindConst.h b/sample/proto_v3/json/KindConst.h index 920ac45c..364822f4 100644 --- a/sample/proto_v3/json/KindConst.h +++ b/sample/proto_v3/json/KindConst.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v3/json/Private/ConfigRec/ArrInArr.cpp index 958e6f30..bde24238 100644 --- a/sample/proto_v3/json/Private/ConfigRec/ArrInArr.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/ArrInArr.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/ArrInArrCfg.cpp b/sample/proto_v3/json/Private/ConfigRec/ArrInArrCfg.cpp index 83b1be6b..dbf1515f 100644 --- a/sample/proto_v3/json/Private/ConfigRec/ArrInArrCfg.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/ArrInArrCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/Dep2Cfg.cpp b/sample/proto_v3/json/Private/ConfigRec/Dep2Cfg.cpp index b5e3cc66..07f7809f 100644 --- a/sample/proto_v3/json/Private/ConfigRec/Dep2Cfg.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/Dep2Cfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/DepCfg.cpp b/sample/proto_v3/json/Private/ConfigRec/DepCfg.cpp index 29f127ad..94a503a7 100644 --- a/sample/proto_v3/json/Private/ConfigRec/DepCfg.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/DepCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/EventCfg.cpp b/sample/proto_v3/json/Private/ConfigRec/EventCfg.cpp index 6b918cca..dd09e759 100644 --- a/sample/proto_v3/json/Private/ConfigRec/EventCfg.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/EventCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/EventRewardItem.cpp b/sample/proto_v3/json/Private/ConfigRec/EventRewardItem.cpp index 01b79dcf..d47fe92b 100644 --- a/sample/proto_v3/json/Private/ConfigRec/EventRewardItem.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/EventRewardItem.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/EventRuleItem.cpp b/sample/proto_v3/json/Private/ConfigRec/EventRuleItem.cpp index f8c75ff2..46900c8f 100644 --- a/sample/proto_v3/json/Private/ConfigRec/EventRuleItem.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/EventRuleItem.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/GoogleProtobufDuration.cpp b/sample/proto_v3/json/Private/ConfigRec/GoogleProtobufDuration.cpp index c21eb5e5..f73057d5 100644 --- a/sample/proto_v3/json/Private/ConfigRec/GoogleProtobufDuration.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/GoogleProtobufDuration.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/GoogleProtobufTimestamp.cpp b/sample/proto_v3/json/Private/ConfigRec/GoogleProtobufTimestamp.cpp index 6e7234ee..7477a073 100644 --- a/sample/proto_v3/json/Private/ConfigRec/GoogleProtobufTimestamp.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/GoogleProtobufTimestamp.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp b/sample/proto_v3/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp index 4f3e9b93..e0cd2a7e 100644 --- a/sample/proto_v3/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/RoleCfg.cpp b/sample/proto_v3/json/Private/ConfigRec/RoleCfg.cpp index ba251216..89a8b39b 100644 --- a/sample/proto_v3/json/Private/ConfigRec/RoleCfg.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/RoleCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/RoleUpgradeCfg.cpp b/sample/proto_v3/json/Private/ConfigRec/RoleUpgradeCfg.cpp index c15a9ebe..621a9f33 100644 --- a/sample/proto_v3/json/Private/ConfigRec/RoleUpgradeCfg.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/RoleUpgradeCfg.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Private/ConfigRec/TestMsgVerifier.cpp b/sample/proto_v3/json/Private/ConfigRec/TestMsgVerifier.cpp index f301e7e3..b99bc222 100644 --- a/sample/proto_v3/json/Private/ConfigRec/TestMsgVerifier.cpp +++ b/sample/proto_v3/json/Private/ConfigRec/TestMsgVerifier.cpp @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/ArrInArr.h b/sample/proto_v3/json/Public/ConfigRec/ArrInArr.h index ace96c0d..fd996d1e 100644 --- a/sample/proto_v3/json/Public/ConfigRec/ArrInArr.h +++ b/sample/proto_v3/json/Public/ConfigRec/ArrInArr.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/ArrInArrCfg.h b/sample/proto_v3/json/Public/ConfigRec/ArrInArrCfg.h index b527b95e..0619163a 100644 --- a/sample/proto_v3/json/Public/ConfigRec/ArrInArrCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/ArrInArrCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/Dep2Cfg.h b/sample/proto_v3/json/Public/ConfigRec/Dep2Cfg.h index 372b5073..051696e7 100644 --- a/sample/proto_v3/json/Public/ConfigRec/Dep2Cfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/Dep2Cfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/DepCfg.h b/sample/proto_v3/json/Public/ConfigRec/DepCfg.h index 6fa867d4..a54a3c3f 100644 --- a/sample/proto_v3/json/Public/ConfigRec/DepCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/DepCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/EventCfg.h b/sample/proto_v3/json/Public/ConfigRec/EventCfg.h index d3b71444..b88b383f 100644 --- a/sample/proto_v3/json/Public/ConfigRec/EventCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/EventCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/EventRewardItem.h b/sample/proto_v3/json/Public/ConfigRec/EventRewardItem.h index 0a7a29e5..6008b1d7 100644 --- a/sample/proto_v3/json/Public/ConfigRec/EventRewardItem.h +++ b/sample/proto_v3/json/Public/ConfigRec/EventRewardItem.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/EventRuleItem.h b/sample/proto_v3/json/Public/ConfigRec/EventRuleItem.h index 0579a512..b98226ac 100644 --- a/sample/proto_v3/json/Public/ConfigRec/EventRuleItem.h +++ b/sample/proto_v3/json/Public/ConfigRec/EventRuleItem.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/GoogleProtobufDuration.h b/sample/proto_v3/json/Public/ConfigRec/GoogleProtobufDuration.h index 3a075781..9814fa37 100644 --- a/sample/proto_v3/json/Public/ConfigRec/GoogleProtobufDuration.h +++ b/sample/proto_v3/json/Public/ConfigRec/GoogleProtobufDuration.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/GoogleProtobufTimestamp.h b/sample/proto_v3/json/Public/ConfigRec/GoogleProtobufTimestamp.h index c8ec36c8..a7b95edb 100644 --- a/sample/proto_v3/json/Public/ConfigRec/GoogleProtobufTimestamp.h +++ b/sample/proto_v3/json/Public/ConfigRec/GoogleProtobufTimestamp.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h b/sample/proto_v3/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h index 4f0db46a..db3949a1 100644 --- a/sample/proto_v3/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/RoleCfg.h b/sample/proto_v3/json/Public/ConfigRec/RoleCfg.h index 7ccb8618..fdcb1f84 100644 --- a/sample/proto_v3/json/Public/ConfigRec/RoleCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/RoleCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/RoleUpgradeCfg.h b/sample/proto_v3/json/Public/ConfigRec/RoleUpgradeCfg.h index 691d9b6e..e1361580 100644 --- a/sample/proto_v3/json/Public/ConfigRec/RoleUpgradeCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/RoleUpgradeCfg.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/json/Public/ConfigRec/TestMsgVerifier.h b/sample/proto_v3/json/Public/ConfigRec/TestMsgVerifier.h index d3ff8663..572078b5 100644 --- a/sample/proto_v3/json/Public/ConfigRec/TestMsgVerifier.h +++ b/sample/proto_v3/json/Public/ConfigRec/TestMsgVerifier.h @@ -1,5 +1,5 @@ /** - * This file is generated by xresloader 2.18.2, please don't edit it. + * This file is generated by xresloader 2.19.0, please don't edit it. * You can find more information about this xresloader on https://xresloader.atframe.work/ . * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues . */ diff --git a/sample/proto_v3/keep_empty_list_cfg.bin b/sample/proto_v3/keep_empty_list_cfg.bin index 287c45c90d02d00de7e8703bd8425f23fce0fd74..39f68cb07d46a204ae1da37badf4f78f89200693 100644 GIT binary patch delta 20 bcmaFG{EC^IYceAjn~|QOrJlh??)!`YI-~_y delta 20 bcmaFG{EC^IYceAjn~|QOg`Uwy?)!`YI;RC$ diff --git a/sample/proto_v3/keep_empty_list_cfg.lua b/sample/proto_v3/keep_empty_list_cfg.lua index 4b55ca6d..da32a895 100644 --- a/sample/proto_v3/keep_empty_list_cfg.lua +++ b/sample/proto_v3/keep_empty_list_cfg.lua @@ -12,7 +12,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:e192b1278aea13633eb67e367edc99aa2bb8b487e32f3e8a0f9c5b975230304e", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/sample/proto_v3/kind.desc.json b/sample/proto_v3/kind.desc.json index b2db27b9..72a0ef53 100644 --- a/sample/proto_v3/kind.desc.json +++ b/sample/proto_v3/kind.desc.json @@ -243,6 +243,7 @@ "arr": { "name": "arr", "number": 2, + "options": {"field_tag": ["server_only"]}, "type_name": "MESSAGE" }, "id": { @@ -275,7 +276,8 @@ "number": 3, "options": { "field_list_max_size": "3", - "field_list_min_size": "1" + "field_list_min_size": "1", + "field_tag": ["server_only"] }, "type_name": "INT32" }, @@ -362,6 +364,7 @@ "specify_field": { "name": "specify_field", "number": 7, + "options": {"field_tag": ["server_only"]}, "type_name": "MESSAGE" }, "test_arr": { @@ -393,7 +396,10 @@ "oneof_decl": { "reward": { "name": "reward", - "options": {"oneof_not_null": true} + "options": { + "oneof_not_null": true, + "oneof_tag": ["server_only"] + } }, "unlock_type": {"name": "unlock_type"} }, @@ -817,7 +823,10 @@ "test_id_2": { "name": "test_id_2", "number": 10002, - "options": {"field_alias": ["测试ID别名2"]}, + "options": { + "field_alias": ["测试ID别名2"], + "field_tag": ["server_only"] + }, "type_name": "UINT32" }, "test_id_3": { diff --git a/sample/proto_v3/kind.desc.lua b/sample/proto_v3/kind.desc.lua index 912e1eb2..463fd6fd 100644 --- a/sample/proto_v3/kind.desc.lua +++ b/sample/proto_v3/kind.desc.lua @@ -89,6 +89,16 @@ local const_res = { }, }, field = { + arr = { + name = "arr", + number = 2, + options = { + field_tag = { + "server_only", + }, + }, + type_name = "MESSAGE", + }, id = { name = "id", number = 1, @@ -112,6 +122,9 @@ local const_res = { options = { field_list_max_size = "3", field_list_min_size = "1", + field_tag = { + "server_only", + }, }, type_name = "INT32", }, @@ -200,6 +213,16 @@ local const_res = { }, type_name = "UINT32", }, + specify_field = { + name = "specify_field", + number = 7, + options = { + field_tag = { + "server_only", + }, + }, + type_name = "MESSAGE", + }, test_arr = { name = "test_arr", number = 91, @@ -243,6 +266,9 @@ local const_res = { name = "reward", options = { oneof_not_null = true, + oneof_tag = { + "server_only", + }, }, }, }, @@ -494,6 +520,9 @@ local const_res = { field_alias = { "测试ID别名2", }, + field_tag = { + "server_only", + }, }, type_name = "UINT32", }, diff --git a/sample/proto_v3/kind.pb b/sample/proto_v3/kind.pb index b4a47bdac08f964fc656a31287299eae1e9a5da8..75c72d7e8b55fe75232050046cd48735fc285e5d 100755 GIT binary patch delta 193 zcmZ3j_grs72NUDn&7Dk}IG850PPXMXOVZ_HPAn>tU{YY#;5Opc1G3{Y^WuS&6W=F$ z?&8#tU{YY#;5Opc1G3{Y^WuS25J+6e zluM{2wYVg{ASV$hoS9bwl9FHss%CZKxMk01_{g5oc=J{6CCrR%ldJfrF`7;m6j0yn cA+Uy#kC%(BD78GXC`E|*h8^Q(0ikeK0HpaRm;e9( diff --git a/sample/proto_v3/kind.proto b/sample/proto_v3/kind.proto index 03b8097d..2f9b42a8 100755 --- a/sample/proto_v3/kind.proto +++ b/sample/proto_v3/kind.proto @@ -87,9 +87,9 @@ message arr_in_arr_cfg { option (org.xresloader.msg_description) = "Test arr_in_arr_cfg"; uint32 id = 1 [ (org.xresloader.ue.key_tag) = 1, (org.xresloader.field_description) = "This is a Key" ]; - repeated arr_in_arr arr = 2; + repeated arr_in_arr arr = 2 [ (org.xresloader.field_tag) = "server_only" ]; - repeated int32 test_plain_int_arr = 3 [ (org.xresloader.field_list_min_size) = "1", (org.xresloader.field_list_max_size) = "3" ]; + repeated int32 test_plain_int_arr = 3 [ (org.xresloader.field_list_min_size) = "1", (org.xresloader.field_list_max_size) = "3", (org.xresloader.field_tag) = "server_only" ]; repeated cost_type test_plain_enum_arr = 4; test_msg_verifier test_plain_msg = 5 [ (org.xresloader.field_separator) = "&" ]; repeated test_msg_verifier test_plain_msg_arr = 6; @@ -126,10 +126,11 @@ message event_cfg { uint32 process = 2 [ (org.xresloader.ue.key_tag) = 1, (org.xresloader.field_not_null) = true, (org.xresloader.field_unique_tag) = "unique_tag" ]; event_rule_item rule = 6; - event_rule_item specify_field = 7; + event_rule_item specify_field = 7 [ (org.xresloader.field_tag) = "server_only" ]; oneof reward { option (org.xresloader.oneof_not_null) = true; + option (org.xresloader.oneof_tag) = "server_only"; event_reward_item item = 11 [ (org.xresloader.field_alias) = "奖励道具" ]; int64 user_exp = 12 [ (org.xresloader.field_alias) = "奖励经验" ]; diff --git a/sample/proto_v3/kind_option.js b/sample/proto_v3/kind_option.js index f015ca27..3638c947 100644 --- a/sample/proto_v3/kind_option.js +++ b/sample/proto_v3/kind_option.js @@ -88,6 +88,16 @@ exports.files = [ } }, field : { + arr : { + name : "arr", + number : 2, + options : { + field_tag : [ + "server_only" + ] + }, + type_name : "MESSAGE" + }, id : { name : "id", number : 1, @@ -110,7 +120,10 @@ exports.files = [ number : 3, options : { field_list_max_size : "3", - field_list_min_size : "1" + field_list_min_size : "1", + field_tag : [ + "server_only" + ] }, type_name : "INT32" }, @@ -199,6 +212,16 @@ exports.files = [ }, type_name : "UINT32" }, + specify_field : { + name : "specify_field", + number : 7, + options : { + field_tag : [ + "server_only" + ] + }, + type_name : "MESSAGE" + }, test_arr : { name : "test_arr", number : 91, @@ -241,7 +264,10 @@ exports.files = [ reward : { name : "reward", options : { - oneof_not_null : true + oneof_not_null : true, + oneof_tag : [ + "server_only" + ] } } }, @@ -492,6 +518,9 @@ exports.files = [ options : { field_alias : [ "测试ID别名2" + ], + field_tag : [ + "server_only" ] }, type_name : "UINT32" diff --git a/sample/proto_v3/kind_option.lua b/sample/proto_v3/kind_option.lua index 997699e8..7facb38e 100644 --- a/sample/proto_v3/kind_option.lua +++ b/sample/proto_v3/kind_option.lua @@ -89,6 +89,16 @@ local const_res = { }, }, field = { + arr = { + name = "arr", + number = 2, + options = { + field_tag = { + "server_only", + }, + }, + type_name = "MESSAGE", + }, id = { name = "id", number = 1, @@ -112,6 +122,9 @@ local const_res = { options = { field_list_max_size = "3", field_list_min_size = "1", + field_tag = { + "server_only", + }, }, type_name = "INT32", }, @@ -200,6 +213,16 @@ local const_res = { }, type_name = "UINT32", }, + specify_field = { + name = "specify_field", + number = 7, + options = { + field_tag = { + "server_only", + }, + }, + type_name = "MESSAGE", + }, test_arr = { name = "test_arr", number = 91, @@ -243,6 +266,9 @@ local const_res = { name = "reward", options = { oneof_not_null = true, + oneof_tag = { + "server_only", + }, }, }, }, @@ -494,6 +520,9 @@ local const_res = { field_alias = { "测试ID别名2", }, + field_tag = { + "server_only", + }, }, type_name = "UINT32", }, diff --git a/sample/proto_v3/kind_option.mod.lua b/sample/proto_v3/kind_option.mod.lua index cf2994d1..2696d6fe 100644 --- a/sample/proto_v3/kind_option.mod.lua +++ b/sample/proto_v3/kind_option.mod.lua @@ -90,6 +90,16 @@ local const_res = { }, }, field = { + arr = { + name = "arr", + number = 2, + options = { + field_tag = { + "server_only", + }, + }, + type_name = "MESSAGE", + }, id = { name = "id", number = 1, @@ -113,6 +123,9 @@ local const_res = { options = { field_list_max_size = "3", field_list_min_size = "1", + field_tag = { + "server_only", + }, }, type_name = "INT32", }, @@ -201,6 +214,16 @@ local const_res = { }, type_name = "UINT32", }, + specify_field = { + name = "specify_field", + number = 7, + options = { + field_tag = { + "server_only", + }, + }, + type_name = "MESSAGE", + }, test_arr = { name = "test_arr", number = 91, @@ -244,6 +267,9 @@ local const_res = { name = "reward", options = { oneof_not_null = true, + oneof_tag = { + "server_only", + }, }, }, }, @@ -495,6 +521,9 @@ local const_res = { field_alias = { "测试ID别名2", }, + field_tag = { + "server_only", + }, }, type_name = "UINT32", }, diff --git a/sample/proto_v3/next_alias.bin b/sample/proto_v3/next_alias.bin index 14fa4ce261c00e779d9c88c490e26d83319f9b9c..32491e7425bb0c7f85f71c4b1badb6db0c9ba9bc 100644 GIT binary patch delta 19 acmey)_??lPtCf+9%}CGCQqN!__Zt8;(*;Zb delta 19 acmey)_??lPtCf+9%}CGCLeFR-_Zt8;)dfue diff --git a/sample/proto_v3/next_alias.lua b/sample/proto_v3/next_alias.lua index 4ded3aaa..0ead78f4 100644 --- a/sample/proto_v3/next_alias.lua +++ b/sample/proto_v3/next_alias.lua @@ -12,7 +12,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:e99feb6b80a35127a916429bb5f48c7e15bd16e198bad71422598eb47765aa67", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "outer_alias_message", outer_alias_message = { diff --git a/sample/proto_v3/process_by_script.bin b/sample/proto_v3/process_by_script.bin index ae2b8164..d224d233 100644 --- a/sample/proto_v3/process_by_script.bin +++ b/sample/proto_v3/process_by_script.bin @@ -1,6 +1,6 @@  -2.18.21.0.0.0"Gsha256:e7e3d54a300a251f9b6a33886083711d5bcbff18988c9109db959d3d3e89a939Z/ +2.19.01.0.0.0"Gsha256:e7e3d54a300a251f9b6a33886083711d5bcbff18988c9109db959d3d3e89a939Z/ 资源转换示例.xlsxprocess_by_script1 Z/ 资源转换示例.xlsxprocess_by_script2 diff --git a/sample/proto_v3/process_by_script.json b/sample/proto_v3/process_by_script.json index 14fe39a5..2ed0a888 100644 --- a/sample/proto_v3/process_by_script.json +++ b/sample/proto_v3/process_by_script.json @@ -15,7 +15,7 @@ ], "data_ver": "1.0.0.0", "hash_code": "sha256:fcc0bde151e4556a4dbea40a41b8e6394c46cb77b2c59cdaa1e365c642f9f0e2", - "xres_ver": "2.18.2" + "xres_ver": "2.19.0" }, {"process_by_script": [ { diff --git a/sample/proto_v3/process_by_script.lua b/sample/proto_v3/process_by_script.lua index 72530c27..b1219332 100644 --- a/sample/proto_v3/process_by_script.lua +++ b/sample/proto_v3/process_by_script.lua @@ -17,7 +17,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:fcc0bde151e4556a4dbea40a41b8e6394c46cb77b2c59cdaa1e365c642f9f0e2", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "process_by_script", process_by_script = { diff --git a/sample/proto_v3/role_cfg.amd.js b/sample/proto_v3/role_cfg.amd.js index 716fcc7f..a05c6194 100755 --- a/sample/proto_v3/role_cfg.amd.js +++ b/sample/proto_v3/role_cfg.amd.js @@ -13,7 +13,7 @@ define({ ], data_ver : "1.0.0.0", hash_code : "sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f", - xres_ver : "2.18.2" + xres_ver : "2.19.0" }, "role_cfg": [ { diff --git a/sample/proto_v3/role_cfg.bin b/sample/proto_v3/role_cfg.bin index bc63b358de96b0bfaeccbe1f3e3623f807095caf..8621a3727e03c87d2d77311eda1e59ef057ecdfb 100755 GIT binary patch delta 19 acmey$^_7c@tDcL^NYBtx&tM~0HY)%)lmztv delta 19 acmey$^_7c@tDcL^NYBth&uAl8HY)%)mjw0z diff --git a/sample/proto_v3/role_cfg.js b/sample/proto_v3/role_cfg.js index d739ffb3..c7e3ae00 100755 --- a/sample/proto_v3/role_cfg.js +++ b/sample/proto_v3/role_cfg.js @@ -366,7 +366,7 @@ ], data_ver : "1.0.0.0", hash_code : "sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f", - xres_ver : "2.18.2" + xres_ver : "2.19.0" } } }; diff --git a/sample/proto_v3/role_cfg.json b/sample/proto_v3/role_cfg.json index 84ee649d..bc5f2610 100755 --- a/sample/proto_v3/role_cfg.json +++ b/sample/proto_v3/role_cfg.json @@ -1 +1 @@ -[{"count":7,"data_source":[{"count":7,"file":"资源转换示例.xlsx","sheet":"kind"}],"data_ver":"1.0.0.0","hash_code":"sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f","xres_ver":"2.18.2"},{"role_cfg":[{"convert_duration_arr":[{"nanos":0,"seconds":45915},{"nanos":0,"seconds":49515}],"convert_duration_one":{"nanos":0,"seconds":45915},"convert_timepoint_arr":[{"nanos":0,"seconds":1666627200},{"nanos":0,"seconds":1669305600}],"convert_timepoint_one":{"nanos":0,"seconds":1666627200},"cost_value":1,"dep_test":{"dep2":{"id":101,"level":"2014/10/13"},"id":51,"name":"123"},"id":10001,"int_as_string":"0","name":"欧若拉","origin_duration_arr":["12:45:15","13:45:15"],"origin_duration_one":"12:45:15","origin_timepoint_arr":["2022-10-25","2022-11-25"],"origin_timepoint_one":"2022-10-25","test_array":["lalal","欧若拉","小魔女"],"test_plain_enum_array":[10001]},{"convert_duration_arr":[{"nanos":0,"seconds":45915},{"nanos":0,"seconds":49515}],"convert_duration_one":{"nanos":0,"seconds":45915},"convert_timepoint_arr":[{"nanos":0,"seconds":1666673115},{"nanos":0,"seconds":1669351515}],"convert_timepoint_one":{"nanos":0,"seconds":1666673115},"cost_value":2,"dep_test":{"dep2":{"id":201,"level":"2014/10/14"},"id":61,"name":"654"},"id":10002,"int_as_string":"1","name":"杰克","origin_duration_arr":["45915","49515"],"origin_duration_one":"45915","origin_timepoint_arr":["2022-10-25 12:45:15","2022-11-25 12:45:15"],"origin_timepoint_one":"2022-10-25 12:45:15","test_array":["blebleble","杰克","海盗王子"],"test_plain_enum_array":[10001,10101],"unlock_level":39},{"convert_duration_arr":[{"nanos":0,"seconds":45915},{"nanos":0,"seconds":49515}],"convert_duration_one":{"nanos":0,"seconds":445559},"convert_timepoint_arr":[{"nanos":0,"seconds":1666673115},{"nanos":0,"seconds":1669351515}],"convert_timepoint_one":{"nanos":0,"seconds":1666673115},"cost_value":4,"dep_test":{"dep2":{"id":301,"level":"2014/10/15"},"id":71,"name":"sdadasd"},"id":10003,"int_as_string":"2","name":"库拉","origin_duration_arr":["45915","13:45:15"],"origin_duration_one":"123:45:59","origin_timepoint_arr":["1666673115","1669351515"],"origin_timepoint_one":"1666673115","test_array":["hahaha","库拉","喵少年"],"test_plain_enum_array":[10001,10001,10101],"unlock_level":85},{"convert_duration_arr":[{"nanos":0,"seconds":49515}],"convert_duration_one":{"nanos":0,"seconds":445520},"convert_timepoint_arr":[{"nanos":0,"seconds":1666673115},{"nanos":0,"seconds":1669351515}],"convert_timepoint_one":{"nanos":0,"seconds":1666701915},"cost_value":8,"dep_test":{"dep2":{"id":401,"level":"19:10:50"},"id":81,"name":"ffff"},"id":10004,"int_as_string":"3","name":"莫瑞茨","origin_duration_arr":["","13:45:15"],"origin_duration_one":"123:45:20Z","origin_timepoint_arr":["1666673115","2022-11-25 12:45:15"],"origin_timepoint_one":"2022-10-25 12:45:15Z","test_array":["angel","莫瑞茨"],"unlock_level":122},{"convert_duration_arr":[{"nanos":0,"seconds":445559}],"convert_duration_one":{"nanos":123000000,"seconds":416720},"convert_timepoint_arr":[{"nanos":0,"seconds":1669351515}],"convert_timepoint_one":{"nanos":123000000,"seconds":1666673115},"dep_test":{"id":12},"int_as_string":"4","origin_duration_arr":["","123:45:59"],"origin_duration_one":"123:45:20.123+08:00","origin_timepoint_arr":["","2022-11-25 12:45:15"],"origin_timepoint_one":"2022-10-25 12:45:15.123+08:00"},{"convert_duration_one":{"nanos":123000000,"seconds":445520},"convert_timepoint_one":{"nanos":123000000,"seconds":1666673115},"cost_type":10001,"cost_value":99999,"dep_test":{"dep2":{"id":501,"level":"9:10:50 上午"},"id":91,"name":"gggg"},"id":10005,"int_as_string":"5","name":"爱丽丝","origin_duration_one":"123:45:20.123","origin_timepoint_one":"2022-10-25 12:45:15.123","test_array":["laopo","爱丽丝"],"unlock_level":183},{"convert_duration_one":{"nanos":123000000,"seconds":45915},"convert_timepoint_one":{"nanos":123000000,"seconds":1666673115},"cost_type":10101,"cost_value":999,"dep_test":{"dep2":{"id":601,"level":"2014-10-20 19:50:50"},"id":101,"name":"hhhhh"},"id":10006,"int_as_string":"6","name":"都玛西亚","origin_duration_one":"45915.123","origin_timepoint_one":"1666673115.123","test_array":["keai","都玛西亚"],"unlock_level":274}]},"role_cfg"] \ No newline at end of file +[{"count":7,"data_source":[{"count":7,"file":"资源转换示例.xlsx","sheet":"kind"}],"data_ver":"1.0.0.0","hash_code":"sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f","xres_ver":"2.19.0"},{"role_cfg":[{"convert_duration_arr":[{"nanos":0,"seconds":45915},{"nanos":0,"seconds":49515}],"convert_duration_one":{"nanos":0,"seconds":45915},"convert_timepoint_arr":[{"nanos":0,"seconds":1666627200},{"nanos":0,"seconds":1669305600}],"convert_timepoint_one":{"nanos":0,"seconds":1666627200},"cost_value":1,"dep_test":{"dep2":{"id":101,"level":"2014/10/13"},"id":51,"name":"123"},"id":10001,"int_as_string":"0","name":"欧若拉","origin_duration_arr":["12:45:15","13:45:15"],"origin_duration_one":"12:45:15","origin_timepoint_arr":["2022-10-25","2022-11-25"],"origin_timepoint_one":"2022-10-25","test_array":["lalal","欧若拉","小魔女"],"test_plain_enum_array":[10001]},{"convert_duration_arr":[{"nanos":0,"seconds":45915},{"nanos":0,"seconds":49515}],"convert_duration_one":{"nanos":0,"seconds":45915},"convert_timepoint_arr":[{"nanos":0,"seconds":1666673115},{"nanos":0,"seconds":1669351515}],"convert_timepoint_one":{"nanos":0,"seconds":1666673115},"cost_value":2,"dep_test":{"dep2":{"id":201,"level":"2014/10/14"},"id":61,"name":"654"},"id":10002,"int_as_string":"1","name":"杰克","origin_duration_arr":["45915","49515"],"origin_duration_one":"45915","origin_timepoint_arr":["2022-10-25 12:45:15","2022-11-25 12:45:15"],"origin_timepoint_one":"2022-10-25 12:45:15","test_array":["blebleble","杰克","海盗王子"],"test_plain_enum_array":[10001,10101],"unlock_level":39},{"convert_duration_arr":[{"nanos":0,"seconds":45915},{"nanos":0,"seconds":49515}],"convert_duration_one":{"nanos":0,"seconds":445559},"convert_timepoint_arr":[{"nanos":0,"seconds":1666673115},{"nanos":0,"seconds":1669351515}],"convert_timepoint_one":{"nanos":0,"seconds":1666673115},"cost_value":4,"dep_test":{"dep2":{"id":301,"level":"2014/10/15"},"id":71,"name":"sdadasd"},"id":10003,"int_as_string":"2","name":"库拉","origin_duration_arr":["45915","13:45:15"],"origin_duration_one":"123:45:59","origin_timepoint_arr":["1666673115","1669351515"],"origin_timepoint_one":"1666673115","test_array":["hahaha","库拉","喵少年"],"test_plain_enum_array":[10001,10001,10101],"unlock_level":85},{"convert_duration_arr":[{"nanos":0,"seconds":49515}],"convert_duration_one":{"nanos":0,"seconds":445520},"convert_timepoint_arr":[{"nanos":0,"seconds":1666673115},{"nanos":0,"seconds":1669351515}],"convert_timepoint_one":{"nanos":0,"seconds":1666701915},"cost_value":8,"dep_test":{"dep2":{"id":401,"level":"19:10:50"},"id":81,"name":"ffff"},"id":10004,"int_as_string":"3","name":"莫瑞茨","origin_duration_arr":["","13:45:15"],"origin_duration_one":"123:45:20Z","origin_timepoint_arr":["1666673115","2022-11-25 12:45:15"],"origin_timepoint_one":"2022-10-25 12:45:15Z","test_array":["angel","莫瑞茨"],"unlock_level":122},{"convert_duration_arr":[{"nanos":0,"seconds":445559}],"convert_duration_one":{"nanos":123000000,"seconds":416720},"convert_timepoint_arr":[{"nanos":0,"seconds":1669351515}],"convert_timepoint_one":{"nanos":123000000,"seconds":1666673115},"dep_test":{"id":12},"int_as_string":"4","origin_duration_arr":["","123:45:59"],"origin_duration_one":"123:45:20.123+08:00","origin_timepoint_arr":["","2022-11-25 12:45:15"],"origin_timepoint_one":"2022-10-25 12:45:15.123+08:00"},{"convert_duration_one":{"nanos":123000000,"seconds":445520},"convert_timepoint_one":{"nanos":123000000,"seconds":1666673115},"cost_type":10001,"cost_value":99999,"dep_test":{"dep2":{"id":501,"level":"9:10:50 上午"},"id":91,"name":"gggg"},"id":10005,"int_as_string":"5","name":"爱丽丝","origin_duration_one":"123:45:20.123","origin_timepoint_one":"2022-10-25 12:45:15.123","test_array":["laopo","爱丽丝"],"unlock_level":183},{"convert_duration_one":{"nanos":123000000,"seconds":45915},"convert_timepoint_one":{"nanos":123000000,"seconds":1666673115},"cost_type":10101,"cost_value":999,"dep_test":{"dep2":{"id":601,"level":"2014-10-20 19:50:50"},"id":101,"name":"hhhhh"},"id":10006,"int_as_string":"6","name":"都玛西亚","origin_duration_one":"45915.123","origin_timepoint_one":"1666673115.123","test_array":["keai","都玛西亚"],"unlock_level":274}]},"role_cfg"] \ No newline at end of file diff --git a/sample/proto_v3/role_cfg.lua b/sample/proto_v3/role_cfg.lua index bae6cfa0..823d4bb6 100755 --- a/sample/proto_v3/role_cfg.lua +++ b/sample/proto_v3/role_cfg.lua @@ -12,7 +12,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:f83885dbe713ab6b423cf917a202d67da647d58a4636dbad41575d5479a6e87a", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "role_cfg", role_cfg = { diff --git a/sample/proto_v3/role_cfg.msgpack.bin b/sample/proto_v3/role_cfg.msgpack.bin index ab7c2ca6ee5956fec85a98858a90dcb26ff82454..f6d331878ccb47bfc4d3d68d0ed8003b03276b5d 100755 GIT binary patch delta 14 VcmX>obx>-;K4wcjgN+9pcmOOU1)Tr@ delta 14 VcmX>obx>-;K4uF&qm2g}cmOOX1)cx^ diff --git a/sample/proto_v3/role_cfg.n.js b/sample/proto_v3/role_cfg.n.js index f931e1f6..e6d240a5 100755 --- a/sample/proto_v3/role_cfg.n.js +++ b/sample/proto_v3/role_cfg.n.js @@ -12,7 +12,7 @@ exports.role_cfg_header = { ], data_ver : "1.0.0.0", hash_code : "sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f", - xres_ver : "2.18.2" + xres_ver : "2.19.0" }; exports.role_cfg = [ { diff --git a/sample/proto_v3/role_cfg.xml b/sample/proto_v3/role_cfg.xml index 22cba822..830ba6cd 100755 --- a/sample/proto_v3/role_cfg.xml +++ b/sample/proto_v3/role_cfg.xml @@ -1,2 +1,2 @@ -
77资源转换示例.xlsxkind1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.18.2
04591504951504591501666627200016693056000166662720011012014/10/1351123100010欧若拉12:45:1513:45:1512:45:152022-10-252022-11-252022-10-25lalal欧若拉小魔女1000104591504951504591501666673115016693515150166667311522012014/10/1461654100021杰克4591549515459152022-10-25 12:45:152022-11-25 12:45:152022-10-25 12:45:15blebleble杰克海盗王子100011010139045915049515044555901666673115016693515150166667311543012014/10/1571sdadasd100032库拉4591513:45:15123:45:59166667311516693515151666673115hahaha库拉喵少年100011000110101850495150445520016666731150166935151501666701915840119:10:5081ffff100043莫瑞茨13:45:15123:45:20Z16666731152022-11-25 12:45:152022-10-25 12:45:15Zangel莫瑞茨1220445559123000000416720016693515151230000001666673115124123:45:59123:45:20.123+08:002022-11-25 12:45:152022-10-25 12:45:15.123+08:001230000004455201230000001666673115999995019:10:50 上午91gggg100055爱丽丝123:45:20.1232022-10-25 12:45:15.12318310001laopo爱丽丝1230000004591512300000016666731159996012014-10-20 19:50:50101hhhhh100066都玛西亚45915.1231666673115.12327410101keai都玛西亚role_cfg \ No newline at end of file +
77资源转换示例.xlsxkind1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.19.0
04591504951504591501666627200016693056000166662720011012014/10/1351123100010欧若拉12:45:1513:45:1512:45:152022-10-252022-11-252022-10-25lalal欧若拉小魔女1000104591504951504591501666673115016693515150166667311522012014/10/1461654100021杰克4591549515459152022-10-25 12:45:152022-11-25 12:45:152022-10-25 12:45:15blebleble杰克海盗王子100011010139045915049515044555901666673115016693515150166667311543012014/10/1571sdadasd100032库拉4591513:45:15123:45:59166667311516693515151666673115hahaha库拉喵少年100011000110101850495150445520016666731150166935151501666701915840119:10:5081ffff100043莫瑞茨13:45:15123:45:20Z16666731152022-11-25 12:45:152022-10-25 12:45:15Zangel莫瑞茨1220445559123000000416720016693515151230000001666673115124123:45:59123:45:20.123+08:002022-11-25 12:45:152022-10-25 12:45:15.123+08:001230000004455201230000001666673115999995019:10:50 上午91gggg100055爱丽丝123:45:20.1232022-10-25 12:45:15.12318310001laopo爱丽丝1230000004591512300000016666731159996012014-10-20 19:50:50101hhhhh100066都玛西亚45915.1231666673115.12327410101keai都玛西亚role_cfg \ No newline at end of file diff --git a/sample/proto_v3/role_cfg_module.lua b/sample/proto_v3/role_cfg_module.lua index 27731660..4381ecee 100755 --- a/sample/proto_v3/role_cfg_module.lua +++ b/sample/proto_v3/role_cfg_module.lua @@ -1,5 +1,5 @@ module("ProtoData.Kind.role_cfg", package.seeall) -- this file is generated by xresloader, please don't edit it. - header = { count = 7, data_source = { { count = 7, file = "资源转换示例.xlsx", sheet = "kind", }, }, data_ver = "1.0.0.0", hash_code = "sha256:f83885dbe713ab6b423cf917a202d67da647d58a4636dbad41575d5479a6e87a", xres_ver = "2.18.2", } + header = { count = 7, data_source = { { count = 7, file = "资源转换示例.xlsx", sheet = "kind", }, }, data_ver = "1.0.0.0", hash_code = "sha256:f83885dbe713ab6b423cf917a202d67da647d58a4636dbad41575d5479a6e87a", xres_ver = "2.19.0", } data_message_type = "role_cfg" role_cfg = { { convert_duration_arr = { { nanos = 0, seconds = 45915, }, { nanos = 0, seconds = 49515, }, }, convert_duration_one = { nanos = 0, seconds = 45915, }, convert_timepoint_arr = { { nanos = 0, seconds = 1666627200, }, { nanos = 0, seconds = 1669305600, }, }, convert_timepoint_one = { nanos = 0, seconds = 1666627200, }, cost_value = 1, dep_test = { dep2 = { id = 101, level = "2014/10/13", }, id = 51, name = "123", }, id = 10001, int_as_string = "0", name = "欧若拉", origin_duration_arr = { "12:45:15", "13:45:15", }, origin_duration_one = "12:45:15", origin_timepoint_arr = { "2022-10-25", "2022-11-25", }, origin_timepoint_one = "2022-10-25", test_array = { "lalal", "欧若拉", "小魔女", }, test_plain_enum_array = { 10001, }, }, { convert_duration_arr = { { nanos = 0, seconds = 45915, }, { nanos = 0, seconds = 49515, }, }, convert_duration_one = { nanos = 0, seconds = 45915, }, convert_timepoint_arr = { { nanos = 0, seconds = 1666673115, }, { nanos = 0, seconds = 1669351515, }, }, convert_timepoint_one = { nanos = 0, seconds = 1666673115, }, cost_value = 2, dep_test = { dep2 = { id = 201, level = "2014/10/14", }, id = 61, name = "654", }, id = 10002, int_as_string = "1", name = "杰克", origin_duration_arr = { "45915", "49515", }, origin_duration_one = "45915", origin_timepoint_arr = { "2022-10-25 12:45:15", "2022-11-25 12:45:15", }, origin_timepoint_one = "2022-10-25 12:45:15", test_array = { "blebleble", "杰克", "海盗王子", }, test_plain_enum_array = { 10001, 10101, }, unlock_level = 39, }, { convert_duration_arr = { { nanos = 0, seconds = 45915, }, { nanos = 0, seconds = 49515, }, }, convert_duration_one = { nanos = 0, seconds = 445559, }, convert_timepoint_arr = { { nanos = 0, seconds = 1666673115, }, { nanos = 0, seconds = 1669351515, }, }, convert_timepoint_one = { nanos = 0, seconds = 1666673115, }, cost_value = 4, dep_test = { dep2 = { id = 301, level = "2014/10/15", }, id = 71, name = "sdadasd", }, id = 10003, int_as_string = "2", name = "库拉", origin_duration_arr = { "45915", "13:45:15", }, origin_duration_one = "123:45:59", origin_timepoint_arr = { "1666673115", "1669351515", }, origin_timepoint_one = "1666673115", test_array = { "hahaha", "库拉", "喵少年", }, test_plain_enum_array = { 10001, 10001, 10101, }, unlock_level = 85, }, { convert_duration_arr = { { nanos = 0, seconds = 49515, }, }, convert_duration_one = { nanos = 0, seconds = 445520, }, convert_timepoint_arr = { { nanos = 0, seconds = 1666673115, }, { nanos = 0, seconds = 1669351515, }, }, convert_timepoint_one = { nanos = 0, seconds = 1666701915, }, cost_value = 8, dep_test = { dep2 = { id = 401, level = "19:10:50", }, id = 81, name = "ffff", }, id = 10004, int_as_string = "3", name = "莫瑞茨", origin_duration_arr = { "", "13:45:15", }, origin_duration_one = "123:45:20Z", origin_timepoint_arr = { "1666673115", "2022-11-25 12:45:15", }, origin_timepoint_one = "2022-10-25 12:45:15Z", test_array = { "angel", "莫瑞茨", }, unlock_level = 122, }, { convert_duration_arr = { { nanos = 0, seconds = 445559, }, }, convert_duration_one = { nanos = 123000000, seconds = 416720, }, convert_timepoint_arr = { { nanos = 0, seconds = 1669351515, }, }, convert_timepoint_one = { nanos = 123000000, seconds = 1666673115, }, dep_test = { id = 12, }, int_as_string = "4", origin_duration_arr = { "", "123:45:59", }, origin_duration_one = "123:45:20.123+08:00", origin_timepoint_arr = { "", "2022-11-25 12:45:15", }, origin_timepoint_one = "2022-10-25 12:45:15.123+08:00", }, { convert_duration_one = { nanos = 123000000, seconds = 445520, }, convert_timepoint_one = { nanos = 123000000, seconds = 1666673115, }, cost_type = 10001, cost_value = 99999, dep_test = { dep2 = { id = 501, level = "9:10:50 上午", }, id = 91, name = "gggg", }, id = 10005, int_as_string = "5", name = "爱丽丝", origin_duration_one = "123:45:20.123", origin_timepoint_one = "2022-10-25 12:45:15.123", test_array = { "laopo", "爱丽丝", }, unlock_level = 183, }, { convert_duration_one = { nanos = 123000000, seconds = 45915, }, convert_timepoint_one = { nanos = 123000000, seconds = 1666673115, }, cost_type = 10101, cost_value = 999, dep_test = { dep2 = { id = 601, level = "2014-10-20 19:50:50", }, id = 101, name = "hhhhh", }, id = 10006, int_as_string = "6", name = "都玛西亚", origin_duration_one = "45915.123", origin_timepoint_one = "1666673115.123", test_array = { "keai", "都玛西亚", }, unlock_level = 274, }, } \ No newline at end of file diff --git a/sample/proto_v3/role_upgrade_cfg.bin b/sample/proto_v3/role_upgrade_cfg.bin index 66008047..2ed3df83 100644 --- a/sample/proto_v3/role_upgrade_cfg.bin +++ b/sample/proto_v3/role_upgrade_cfg.bin @@ -1,6 +1,6 @@  -2.18.21.0.0.0f"Gsha256:bbf8dcdce30a89f9c7fbb31163c4821ab84d36954758b06c2969dd0217db951c*LTest role_upgrade_cfg with multi keys +2.19.01.0.0.0f"Gsha256:bbf8dcdce30a89f9c7fbb31163c4821ab84d36954758b06c2969dd0217db951c*LTest role_upgrade_cfg with multi keys Test role_upgrade_cfg with multi keysZ* 资源转换示例.xlsx upgrade_10001*Z* 资源转换示例.xlsx upgrade_10002<N diff --git a/sample/proto_v3/role_upgrade_cfg.json b/sample/proto_v3/role_upgrade_cfg.json index e684307d..d0a8f7d0 100755 --- a/sample/proto_v3/role_upgrade_cfg.json +++ b/sample/proto_v3/role_upgrade_cfg.json @@ -16,7 +16,7 @@ "data_ver": "1.0.0.0", "description": "Test role_upgrade_cfg with multi keys\r\nTest role_upgrade_cfg with multi keys", "hash_code": "sha256:e356806bc55be9cc8a6c701d4295989e0fc3887b368681bb9457b0e51df8f445", - "xres_ver": "2.18.2" + "xres_ver": "2.19.0" }, {"role_upgrade_cfg": [ { diff --git a/sample/proto_v3/role_upgrade_cfg.lua b/sample/proto_v3/role_upgrade_cfg.lua index 3c4139c8..9041cecb 100755 --- a/sample/proto_v3/role_upgrade_cfg.lua +++ b/sample/proto_v3/role_upgrade_cfg.lua @@ -18,7 +18,7 @@ return { data_ver = "1.0.0.0", description = "Test role_upgrade_cfg with multi keys\r\nTest role_upgrade_cfg with multi keys", hash_code = "sha256:e356806bc55be9cc8a6c701d4295989e0fc3887b368681bb9457b0e51df8f445", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "role_upgrade_cfg", role_upgrade_cfg = { diff --git a/sample/proto_v3/strip_list_tail_cfg.bin b/sample/proto_v3/strip_list_tail_cfg.bin index 9175b7223d5f81f50503c49d826838bca6acc53e..271e880359ed4e0b5599e939d2f3eb1beecf53b9 100644 GIT binary patch delta 20 bcmaFD{DhgCYceAjn~|QOrJlh??wgDNIkW{v delta 20 bcmaFD{DhgCYceAjn~|QOg`Uwy?wgDNIkyEz diff --git a/sample/proto_v3/strip_list_tail_cfg.lua b/sample/proto_v3/strip_list_tail_cfg.lua index ea2cca80..8e4cfce1 100644 --- a/sample/proto_v3/strip_list_tail_cfg.lua +++ b/sample/proto_v3/strip_list_tail_cfg.lua @@ -12,7 +12,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:bef5c76679b43b65aec7906f42010530fadae99f0e386d94e3a77e94a7d12e8e", - xres_ver = "2.18.2", + xres_ver = "2.19.0", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/src/org/xresloader/core/data/dst/DataDstJava.java b/src/org/xresloader/core/data/dst/DataDstJava.java index 4bc67ce0..9c2a60fa 100644 --- a/src/org/xresloader/core/data/dst/DataDstJava.java +++ b/src/org/xresloader/core/data/dst/DataDstJava.java @@ -319,7 +319,8 @@ private Object getDefault(DataDstWriterNode.DataDstTypeDescriptor container, .getTypeDescriptor(), sub_item.getValue(), 0); } else if (sub_item.getValue().isList() && sub_item.getValue().getListExtension() != null && sub_item.getValue().getListExtension().strictSize - && sub_item.getValue().getListExtension().minSize > 0) { + && sub_item.getValue().getListExtension().minSize > 0 + && !sub_item.getValue().containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags)) { this.logErrorMessage( "Field \"%s\" in \"%s\" has set field_list_min_size %d, which is not allowed to be auto filled with default value.", sub_item.getValue().getName(), field.getTypeDescriptor().getFullName(), @@ -489,7 +490,13 @@ private void dumpDefault(HashMap builder, DataDstWriterNode.Data old = new ArrayList(); builder.put(field.getName(), old); } - old.add(val); + + while (listIndex > old.size()) { + old.add(val); + } + if (listIndex == old.size()) { + old.add(val); + } } else { builder.put(field.getName(), val); } @@ -508,6 +515,7 @@ protected boolean dumpMessage(HashMap builder, DataDstWriterNode throws ConvException { boolean ret = false; for (Map.Entry c : node.getChildren().entrySet()) { + boolean ignoreFieldTags = c.getValue().containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags); if (c.getValue().isOneof()) { boolean fieldHasValue = false; @@ -574,7 +582,7 @@ protected boolean dumpMessage(HashMap builder, DataDstWriterNode if (childList != null && childList instanceof List) { listSize = ((List) childList).size(); } - if (listExt.minSize > 0 && listExt.minSize > listSize) { + if (listExt.minSize > 0 && listExt.minSize > listSize && !ignoreFieldTags) { throw new ConvException( String.format( "Try to convert %s failed, require at least %d element(s), real got %d element(s).", @@ -619,7 +627,9 @@ private boolean dumpStandardField(HashMap builder, return false; } else if (as_child.containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags)) { - dumpDefault(builder, container, as_child, desc.getListIndex()); + if (as_child.isRequired() || as_child.isList()) { + dumpDefault(builder, container, as_child, -1); + } return true; } @@ -732,7 +742,7 @@ private boolean dumpPlainField(HashMap builder, DataDstWriterNod break; } - if (res.length == 1 || field.containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags)) { + if (res.length == 1) { if (maybeFromNode != null) { dumpDefault(builder, container, sub_field, maybeFromNode.getListIndex()); } else { @@ -787,13 +797,6 @@ private boolean dumpPlainField(HashMap builder, DataDstWriterNod } } return false; - } else if (field.containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags)) { - if (maybeFromNode != null) { - dumpDefault(builder, container, field, maybeFromNode.getListIndex()); - } else { - dumpDefault(builder, container, field, 0); - } - return true; } return dumpPlainField(builder, container, ident, field, maybeFromNode, res.value, rowContext, fieldPath); @@ -1202,7 +1205,9 @@ private boolean dumpPlainField(HashMap builder, DataDstWriterNod } if (ignoreFieldTags) { - dumpDefault(builder, container, field, -1); + if (field.isRequired() || field.isList()) { + dumpDefault(builder, container, field, -1); + } return true; } diff --git a/src/org/xresloader/core/data/dst/DataDstPb.java b/src/org/xresloader/core/data/dst/DataDstPb.java index 06b91037..75390cb1 100644 --- a/src/org/xresloader/core/data/dst/DataDstPb.java +++ b/src/org/xresloader/core/data/dst/DataDstPb.java @@ -2023,7 +2023,8 @@ private Object getDefault(DynamicMessage.Builder builder, DataDstFieldDescriptor if (subField.isRequired()) { dumpDefault(subnode, subField, 0); } else if (subField.isList() && subField.getListExtension() != null - && subField.getListExtension().strictSize && subField.getListExtension().minSize > 0) { + && subField.getListExtension().strictSize && subField.getListExtension().minSize > 0 + && !subField.containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags)) { this.logErrorMessage( "Field \"%s\" in \"%s\" has set field_list_min_size %d, which is not allowed to be auto filled with default value.", subField.getName(), fd.getFullName(), @@ -2263,6 +2264,10 @@ private void dumpDefault(DynamicMessage.Builder builder, DataDstOneofDescriptor private void dumpDefault(DynamicMessage.Builder builder, DataDstFieldDescriptor field, int index) throws ConvException { + if (field.isList() && index < 0) { + return; + } + Object val = getDefault(builder, field, index); if (val != null) { dumpValue(builder, field, val, index, null, ""); @@ -2282,6 +2287,8 @@ private boolean dumpMessage(DynamicMessage.Builder builder, DataDstWriterNode no boolean ret = false; for (Map.Entry c : node.getChildren().entrySet()) { + boolean ignoreFieldTags = c.getValue().containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags); + if (c.getValue().isOneof()) { // dump oneof data boolean fieldHasValue = false; @@ -2351,7 +2358,8 @@ private boolean dumpMessage(DynamicMessage.Builder builder, DataDstWriterNode no if (listExt != null && c.getValue().innerFieldDesc != null) { Descriptors.FieldDescriptor fd = (Descriptors.FieldDescriptor) c.getValue().innerFieldDesc .getRawDescriptor(); - if (listExt.minSize > 0 && listExt.minSize > builder.getRepeatedFieldCount(fd)) { + if (listExt.minSize > 0 && listExt.minSize > builder.getRepeatedFieldCount(fd) + && !ignoreFieldTags) { throw new ConvException( String.format( "Try to convert %s failed, require at least %d element(s), real got %d element(s).", @@ -2395,7 +2403,9 @@ private boolean dumpStandardField(DynamicMessage.Builder builder, DataDstWriterN return false; } else if (field.containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags)) { - dumpDefault(builder, field, desc.getListIndex()); + if (field.isRequired() || field.isList()) { + dumpDefault(builder, field, -1); + } return true; } @@ -2423,11 +2433,6 @@ private boolean dumpPlainField(DynamicMessage.Builder builder, IdentifyDescripto return false; } - if (field.containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags)) { - dumpDefault(builder, field); - return true; - } - return dumpPlainField(builder, ident, field, maybeFromNode, res.value, rowContext, fieldPath); } @@ -2457,7 +2462,7 @@ private boolean dumpPlainField(DynamicMessage.Builder builder, IdentifyDescripto break; } - if (res.length == 1 || field.containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags)) { + if (res.length == 1) { dumpDefault(builder, sub_field, 0); ret = true; break; @@ -2498,9 +2503,6 @@ private boolean dumpPlainField(DynamicMessage.Builder builder, IdentifyDescripto dumpDefault(builder, field, 0); } return false; - } else if (field.containsFieldTags(ProgramOptions.getInstance().ignoreFieldTags)) { - dumpDefault(builder, field, 0); - return true; } return dumpPlainField(builder, ident, field, maybeFromNode, res.value, rowContext, fieldPath); @@ -2876,7 +2878,9 @@ private boolean dumpPlainField(DynamicMessage.Builder builder, IdentifyDescripto } if (ignoreFieldTags) { - dumpDefault(builder, field, 0); + if (field.isRequired() || field.isList()) { + dumpDefault(builder, field, -1); + } return true; } diff --git a/src/org/xresloader/core/data/dst/DataDstWriterNode.java b/src/org/xresloader/core/data/dst/DataDstWriterNode.java index 83dd7afc..d9e71d33 100644 --- a/src/org/xresloader/core/data/dst/DataDstWriterNode.java +++ b/src/org/xresloader/core/data/dst/DataDstWriterNode.java @@ -63,6 +63,8 @@ static public class DataDstFieldExt { public boolean allowMissingInPlainMode = false; public ArrayList uniqueTags = null; public HashSet fieldTags = null; + private Boolean withIgnoredFieldTagsValueCache = null; + private String[] withIgnoredFieldTagsCheckCache = null; private DataDstFieldExtUE ue = null; private DataDstFieldExtList list = null; @@ -95,6 +97,8 @@ static public class DataDstOneofExt { public boolean notNull = false; public boolean allowMissingInPlainMode = false; public HashSet fieldTags = null; + private Boolean withIgnoredFieldTagsValueCache = null; + private String[] withIgnoredFieldTagsCheckCache = null; } static public class DataDstMessageExtUE { @@ -252,16 +256,42 @@ public HashSet getFieldTags() { public boolean containsFieldTags(String[] tags) { if (this.extension == null || tags == null) { - return false; + if (null != this.referOneofDescriptor) { + return this.referOneofDescriptor.containsFieldTags(tags); + } else { + return false; + } + } + + if (this.extension.fieldTags == null) { + if (null != this.referOneofDescriptor) { + return this.referOneofDescriptor.containsFieldTags(tags); + } else { + return false; + } } + if (this.extension.withIgnoredFieldTagsValueCache != null + && this.extension.withIgnoredFieldTagsCheckCache == tags) { + return this.extension.withIgnoredFieldTagsValueCache; + } + + this.extension.withIgnoredFieldTagsCheckCache = tags; + this.extension.withIgnoredFieldTagsValueCache = false; for (var tag : tags) { if (this.extension.fieldTags.contains(tag)) { - return true; + this.extension.withIgnoredFieldTagsValueCache = true; + break; } } - return false; + if (null != this.referOneofDescriptor) { + if (this.referOneofDescriptor.containsFieldTags(tags)) { + this.extension.withIgnoredFieldTagsValueCache = true; + } + } + + return this.extension.withIgnoredFieldTagsValueCache; } public boolean isNotNull() { @@ -484,13 +514,25 @@ public boolean containsFieldTags(String[] tags) { return false; } + if (this.extension.fieldTags == null) { + return false; + } + + if (this.extension.withIgnoredFieldTagsValueCache != null + && this.extension.withIgnoredFieldTagsCheckCache == tags) { + return this.extension.withIgnoredFieldTagsValueCache; + } + + this.extension.withIgnoredFieldTagsCheckCache = tags; + this.extension.withIgnoredFieldTagsValueCache = false; for (var tag : tags) { if (this.extension.fieldTags.contains(tag)) { - return true; + this.extension.withIgnoredFieldTagsValueCache = true; + break; } } - return false; + return this.extension.withIgnoredFieldTagsValueCache; } }