diff --git a/HISTORY.md b/HISTORY.md index 3a6cf59b..3a1c6375 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,10 @@ ## Unrelease +## 2.18.1 + +1. 修复 `%` 后缀和带验证器时Excel对大数字自动附加的 `,` 的适配。 + ## 2.18.0 1. 增加插件 `org.xresloader.field_list_strip_option=LIST_STRIP_DEFAULT|LIST_STRIP_NOTHING|LIST_STRIP_TAIL|LIST_STRIP_ALL` 用于给单个字段设置数组裁剪。 diff --git a/pom.xml b/pom.xml index 1882f39f..4ab738b7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.xresloader xresloader - 2.18.0 + 2.18.1 jar xresloader diff --git a/sample/proto_v2/arr_in_arr_cfg.bin b/sample/proto_v2/arr_in_arr_cfg.bin index 303e7a31..43b4e011 100755 Binary files a/sample/proto_v2/arr_in_arr_cfg.bin and b/sample/proto_v2/arr_in_arr_cfg.bin differ diff --git a/sample/proto_v2/arr_in_arr_cfg.lua b/sample/proto_v2/arr_in_arr_cfg.lua index 7da80c06..e1a6c240 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.0", + xres_ver = "2.18.1", }, [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 26f7efdb..93d32a5b 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.0 + 2.18.1 diff --git a/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp index bcf057a7..46d19651 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 b75590f8..efd2cde8 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 0c678071..5349b5ff 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 cf6013da..ec4a24c3 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 46c708f3..ad8a29e7 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 09fe6036..6fd173b6 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 ed2be73c..30f93ce4 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 12523130..54728efa 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 82cf10b0..ef9621a8 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 d9002bb9..7dd642c4 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 01e8f8d1..43ac614b 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 910962b9..06b2518a 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 adb9ffbb..6421a3e4 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 533eee8f..532655e4 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 1f43bb23..96af4ac0 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 320c215f..f8e5512c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 416ab967..3f4a1231 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 aa42a46a..03d80693 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 ada2dcc0..789d3eda 100644 Binary files a/sample/proto_v2/event_cfg.bin and b/sample/proto_v2/event_cfg.bin differ diff --git a/sample/proto_v2/event_cfg.lua b/sample/proto_v2/event_cfg.lua index 100ccc01..97dd6619 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.0", + xres_ver = "2.18.1", }, [2] = "event_cfg", event_cfg = { diff --git a/sample/proto_v2/json/KindConst.cpp b/sample/proto_v2/json/KindConst.cpp index 014a078b..dc57c25c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 b69d0595..9879034c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 b8ce0664..03d6bf14 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 a4eae93e..98124832 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 246108e2..af74e274 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 9739e60c..3dad786d 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 8d9feac3..2157e2ae 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 9ea3ce4e..ad1cc288 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 ed2be73c..30f93ce4 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 86d4ad23..66f9acef 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 83df1c1e..11e08715 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 33ecc2ef..3b8e88fc 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 c5ff6f0e..c706b02c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 962ab40c..d9d43270 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 1f1c5fb3..b82399e7 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 793e7108..36329075 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 56e6bc87..9bb819d8 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 320c215f..f8e5512c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 354e91e2..c656d71a 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 8520782d..835058c2 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 53fae97a..fc3732c9 100644 Binary files a/sample/proto_v2/keep_empty_list_cfg.bin and b/sample/proto_v2/keep_empty_list_cfg.bin differ diff --git a/sample/proto_v2/keep_empty_list_cfg.lua b/sample/proto_v2/keep_empty_list_cfg.lua index 2ac8ada7..7855b389 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.0", + xres_ver = "2.18.1", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/sample/proto_v2/next_alias.bin b/sample/proto_v2/next_alias.bin index 4146e7a1..f72caa59 100644 Binary files a/sample/proto_v2/next_alias.bin and b/sample/proto_v2/next_alias.bin differ diff --git a/sample/proto_v2/next_alias.lua b/sample/proto_v2/next_alias.lua index 627bbeeb..8fb9cc44 100644 --- a/sample/proto_v2/next_alias.lua +++ b/sample/proto_v2/next_alias.lua @@ -12,7 +12,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:e99feb6b80a35127a916429bb5f48c7e15bd16e198bad71422598eb47765aa67", - xres_ver = "2.18.0", + xres_ver = "2.18.1", }, [2] = "outer_alias_message", outer_alias_message = { diff --git a/sample/proto_v2/process_by_script.bin b/sample/proto_v2/process_by_script.bin index 57e6f3e6..0ef10fcf 100644 --- a/sample/proto_v2/process_by_script.bin +++ b/sample/proto_v2/process_by_script.bin @@ -1,6 +1,6 @@  -2.18.01.0.0.0"Gsha256:61e311d737fbee8763ecc058018322b9dc17f25f809f407d62b96afaba6bb9c9Z/ +2.18.11.0.0.0"Gsha256:61e311d737fbee8763ecc058018322b9dc17f25f809f407d62b96afaba6bb9c9Z/ 资源转换示例.xlsxprocess_by_script1 Z/ 资源转换示例.xlsxprocess_by_script2 diff --git a/sample/proto_v2/process_by_script.json b/sample/proto_v2/process_by_script.json index 909404f8..a453ed08 100644 --- a/sample/proto_v2/process_by_script.json +++ b/sample/proto_v2/process_by_script.json @@ -15,7 +15,7 @@ ], "data_ver": "1.0.0.0", "hash_code": "sha256:9cefa62f0e07599754aed162aee8ac41e55ec4a86523ff8574aefa2f214f2c7d", - "xres_ver": "2.18.0" + "xres_ver": "2.18.1" }, {"process_by_script": [ { diff --git a/sample/proto_v2/process_by_script.lua b/sample/proto_v2/process_by_script.lua index 75bfde95..96d6f63b 100644 --- a/sample/proto_v2/process_by_script.lua +++ b/sample/proto_v2/process_by_script.lua @@ -17,7 +17,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:9cefa62f0e07599754aed162aee8ac41e55ec4a86523ff8574aefa2f214f2c7d", - xres_ver = "2.18.0", + xres_ver = "2.18.1", }, [2] = "process_by_script", process_by_script = { diff --git a/sample/proto_v2/role_cfg.amd.js b/sample/proto_v2/role_cfg.amd.js index b1b09f7d..fd5d6b9d 100755 --- a/sample/proto_v2/role_cfg.amd.js +++ b/sample/proto_v2/role_cfg.amd.js @@ -13,7 +13,7 @@ define({ ], data_ver : "1.0.0.0", hash_code : "sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f", - xres_ver : "2.18.0" + xres_ver : "2.18.1" }, "role_cfg": [ { diff --git a/sample/proto_v2/role_cfg.bin b/sample/proto_v2/role_cfg.bin index 1905a200..57bc3357 100755 Binary files a/sample/proto_v2/role_cfg.bin and b/sample/proto_v2/role_cfg.bin differ diff --git a/sample/proto_v2/role_cfg.js b/sample/proto_v2/role_cfg.js index 0f9b51e2..5206555e 100755 --- a/sample/proto_v2/role_cfg.js +++ b/sample/proto_v2/role_cfg.js @@ -366,7 +366,7 @@ ], data_ver : "1.0.0.0", hash_code : "sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f", - xres_ver : "2.18.0" + xres_ver : "2.18.1" } } }; diff --git a/sample/proto_v2/role_cfg.json b/sample/proto_v2/role_cfg.json index cab01d19..03cd13da 100755 --- a/sample/proto_v2/role_cfg.json +++ b/sample/proto_v2/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.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 +[{"count":7,"data_source":[{"count":7,"file":"资源转换示例.xlsx","sheet":"kind"}],"data_ver":"1.0.0.0","hash_code":"sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f","xres_ver":"2.18.1"},{"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_v2/role_cfg.lua b/sample/proto_v2/role_cfg.lua index 0edddcff..c457c69b 100755 --- a/sample/proto_v2/role_cfg.lua +++ b/sample/proto_v2/role_cfg.lua @@ -12,7 +12,7 @@ return { }, data_ver = "1.0.0.0", hash_code = "sha256:f83885dbe713ab6b423cf917a202d67da647d58a4636dbad41575d5479a6e87a", - xres_ver = "2.18.0", + xres_ver = "2.18.1", }, [2] = "role_cfg", role_cfg = { diff --git a/sample/proto_v2/role_cfg.msgpack.bin b/sample/proto_v2/role_cfg.msgpack.bin index 7d124c5b..b95d4bb3 100755 Binary files a/sample/proto_v2/role_cfg.msgpack.bin and b/sample/proto_v2/role_cfg.msgpack.bin differ diff --git a/sample/proto_v2/role_cfg.n.js b/sample/proto_v2/role_cfg.n.js index 7f15ff65..684174aa 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.0" + xres_ver : "2.18.1" }; exports.role_cfg = [ { diff --git a/sample/proto_v2/role_cfg.xml b/sample/proto_v2/role_cfg.xml index 2a113743..3c5aa993 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.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 +
77资源转换示例.xlsxkind1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.18.1
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 bdfca136..8cb873a3 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.0", } + 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.1", } 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 0e235bb2..2f8e4628 100644 Binary files a/sample/proto_v2/role_upgrade_cfg.bin and b/sample/proto_v2/role_upgrade_cfg.bin differ diff --git a/sample/proto_v2/role_upgrade_cfg.json b/sample/proto_v2/role_upgrade_cfg.json index 571d4a2e..e15d5e26 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.0" + "xres_ver": "2.18.1" }, {"role_upgrade_cfg": [ { diff --git a/sample/proto_v2/role_upgrade_cfg.lua b/sample/proto_v2/role_upgrade_cfg.lua index 12e026bb..103aa08b 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.0", + xres_ver = "2.18.1", }, [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 26322022..fd0f5e92 100644 Binary files a/sample/proto_v2/strip_list_tail_cfg.bin and b/sample/proto_v2/strip_list_tail_cfg.bin differ diff --git a/sample/proto_v2/strip_list_tail_cfg.lua b/sample/proto_v2/strip_list_tail_cfg.lua index 6dc247f3..64c9aa73 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.0", + xres_ver = "2.18.1", }, [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 a1a94714..30330370 100755 Binary files a/sample/proto_v3/arr_in_arr_cfg.bin and b/sample/proto_v3/arr_in_arr_cfg.bin differ diff --git a/sample/proto_v3/arr_in_arr_cfg.lua b/sample/proto_v3/arr_in_arr_cfg.lua index 7da80c06..e1a6c240 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.0", + xres_ver = "2.18.1", }, [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 26f7efdb..93d32a5b 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.0 + 2.18.1 diff --git a/sample/proto_v3/csv/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v3/csv/Private/ConfigRec/ArrInArr.cpp index 66e06d16..18218286 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 b75590f8..efd2cde8 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 0c678071..5349b5ff 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 ac75fc1c..837b846c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 cf6013da..ec4a24c3 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 46c708f3..ad8a29e7 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 09fe6036..6fd173b6 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 efbe7831..981f7366 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 6ee5b922..d62714c6 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 ed2be73c..30f93ce4 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 40f0c1f7..61cea47e 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 4062ec1f..f51523ac 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 82cf10b0..ef9621a8 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 ddbe6cfd..0b728af7 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 01e8f8d1..43ac614b 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 910962b9..06b2518a 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 4aa4f10a..19e0bb52 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 adb9ffbb..6421a3e4 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 533eee8f..532655e4 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 1f43bb23..96af4ac0 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 e6085c93..461f0377 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 65a7fc57..2d1cc30b 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 320c215f..f8e5512c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 f81cf85e..b3837611 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 416ab967..3f4a1231 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 aa42a46a..03d80693 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 ada2dcc0..789d3eda 100644 Binary files a/sample/proto_v3/event_cfg.bin and b/sample/proto_v3/event_cfg.bin differ diff --git a/sample/proto_v3/event_cfg.lua b/sample/proto_v3/event_cfg.lua index 100ccc01..97dd6619 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.0", + xres_ver = "2.18.1", }, [2] = "event_cfg", event_cfg = { diff --git a/sample/proto_v3/json/KindConst.cpp b/sample/proto_v3/json/KindConst.cpp index 014a078b..dc57c25c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 b69d0595..9879034c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 b4547916..0a7c44f7 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 a4eae93e..98124832 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 246108e2..af74e274 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 0ba67fe5..12dddbcc 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 9739e60c..3dad786d 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 8d9feac3..2157e2ae 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 9ea3ce4e..ad1cc288 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 efbe7831..981f7366 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 6ee5b922..d62714c6 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 ed2be73c..30f93ce4 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 cdf0a5ef..cc4cbdd1 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 763e3d26..b209bbb1 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 83df1c1e..11e08715 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 4ec492ca..9ef89d1a 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 c5ff6f0e..c706b02c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 962ab40c..d9d43270 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 45106407..38f69d6f 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 1f1c5fb3..b82399e7 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 793e7108..36329075 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 56e6bc87..9bb819d8 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 e6085c93..461f0377 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 65a7fc57..2d1cc30b 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 320c215f..f8e5512c 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 234357e6..fdf60696 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 354e91e2..c656d71a 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 8520782d..835058c2 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.0, please don't edit it. + * This file is generated by xresloader 2.18.1, 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 a574c32f..faa29800 100644 Binary files a/sample/proto_v3/keep_empty_list_cfg.bin and b/sample/proto_v3/keep_empty_list_cfg.bin differ diff --git a/sample/proto_v3/keep_empty_list_cfg.lua b/sample/proto_v3/keep_empty_list_cfg.lua index 2ac8ada7..7855b389 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.0", + xres_ver = "2.18.1", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/sample/proto_v3/next_alias.bin b/sample/proto_v3/next_alias.bin index 5786595e..adb64dae 100644 Binary files a/sample/proto_v3/next_alias.bin and b/sample/proto_v3/next_alias.bin differ diff --git a/sample/proto_v3/next_alias.lua b/sample/proto_v3/next_alias.lua index 627bbeeb..8fb9cc44 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.0", + xres_ver = "2.18.1", }, [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 929e7a53..4a32d738 100644 --- a/sample/proto_v3/process_by_script.bin +++ b/sample/proto_v3/process_by_script.bin @@ -1,6 +1,6 @@  -2.18.01.0.0.0"Gsha256:e7e3d54a300a251f9b6a33886083711d5bcbff18988c9109db959d3d3e89a939Z/ +2.18.11.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 f0f56333..18e90ddb 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.0" + "xres_ver": "2.18.1" }, {"process_by_script": [ { diff --git a/sample/proto_v3/process_by_script.lua b/sample/proto_v3/process_by_script.lua index f1da4af5..fbabe80c 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.0", + xres_ver = "2.18.1", }, [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 b1b09f7d..fd5d6b9d 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.0" + xres_ver : "2.18.1" }, "role_cfg": [ { diff --git a/sample/proto_v3/role_cfg.bin b/sample/proto_v3/role_cfg.bin index c253e955..5e72a044 100755 Binary files a/sample/proto_v3/role_cfg.bin and b/sample/proto_v3/role_cfg.bin differ diff --git a/sample/proto_v3/role_cfg.js b/sample/proto_v3/role_cfg.js index 0f9b51e2..5206555e 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.0" + xres_ver : "2.18.1" } } }; diff --git a/sample/proto_v3/role_cfg.json b/sample/proto_v3/role_cfg.json index cab01d19..03cd13da 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.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 +[{"count":7,"data_source":[{"count":7,"file":"资源转换示例.xlsx","sheet":"kind"}],"data_ver":"1.0.0.0","hash_code":"sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f","xres_ver":"2.18.1"},{"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 0edddcff..c457c69b 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.0", + xres_ver = "2.18.1", }, [2] = "role_cfg", role_cfg = { diff --git a/sample/proto_v3/role_cfg.msgpack.bin b/sample/proto_v3/role_cfg.msgpack.bin index 7d124c5b..b95d4bb3 100755 Binary files a/sample/proto_v3/role_cfg.msgpack.bin and b/sample/proto_v3/role_cfg.msgpack.bin differ diff --git a/sample/proto_v3/role_cfg.n.js b/sample/proto_v3/role_cfg.n.js index 7f15ff65..684174aa 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.0" + xres_ver : "2.18.1" }; exports.role_cfg = [ { diff --git a/sample/proto_v3/role_cfg.xml b/sample/proto_v3/role_cfg.xml index 2a113743..3c5aa993 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.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 +
77资源转换示例.xlsxkind1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.18.1
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 bdfca136..8cb873a3 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.0", } + 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.1", } 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 ba5dd2a4..4a8a5e58 100644 --- a/sample/proto_v3/role_upgrade_cfg.bin +++ b/sample/proto_v3/role_upgrade_cfg.bin @@ -1,6 +1,6 @@  -2.18.01.0.0.0f"Gsha256:bbf8dcdce30a89f9c7fbb31163c4821ab84d36954758b06c2969dd0217db951c*LTest role_upgrade_cfg with multi keys +2.18.11.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 571d4a2e..e15d5e26 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.0" + "xres_ver": "2.18.1" }, {"role_upgrade_cfg": [ { diff --git a/sample/proto_v3/role_upgrade_cfg.lua b/sample/proto_v3/role_upgrade_cfg.lua index 12e026bb..103aa08b 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.0", + xres_ver = "2.18.1", }, [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 e4f21648..20ae9ade 100644 Binary files a/sample/proto_v3/strip_list_tail_cfg.bin and b/sample/proto_v3/strip_list_tail_cfg.bin differ diff --git a/sample/proto_v3/strip_list_tail_cfg.lua b/sample/proto_v3/strip_list_tail_cfg.lua index 6dc247f3..64c9aa73 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.0", + xres_ver = "2.18.1", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/src/org/xresloader/core/data/vfy/DataVerifyCustomRule.java b/src/org/xresloader/core/data/vfy/DataVerifyCustomRule.java index cfe5b694..60d17a14 100644 --- a/src/org/xresloader/core/data/vfy/DataVerifyCustomRule.java +++ b/src/org/xresloader/core/data/vfy/DataVerifyCustomRule.java @@ -147,7 +147,7 @@ public boolean get(double number, DataVerifyResult res) { } @Override - public boolean get(String input, DataVerifyResult res) { + public boolean get(String input, DataVerifyResult res) throws NumberFormatException { if (this.validators == null || this.validators.size() == 0) { res.success = true; res.value = input; diff --git a/src/org/xresloader/core/data/vfy/DataVerifyImpl.java b/src/org/xresloader/core/data/vfy/DataVerifyImpl.java index 63949dd4..dabc6a25 100644 --- a/src/org/xresloader/core/data/vfy/DataVerifyImpl.java +++ b/src/org/xresloader/core/data/vfy/DataVerifyImpl.java @@ -21,9 +21,9 @@ public abstract class DataVerifyImpl { protected String name = ""; private static ThreadLocal PERCENT_PATTERN = ThreadLocal - .withInitial(() -> Pattern.compile("^\\s*((\\-\\s*)?[0-9]+(\\.[0-9]+)?)\\s*%\\s*$")); + .withInitial(() -> Pattern.compile("^\\s*((\\-\\s*)?[0-9\\,]+(\\.[0-9\\,]+)?)\\s*%\\s*$")); private static ThreadLocal INTEGER_WITH_DOT_PATTERN = ThreadLocal - .withInitial(() -> Pattern.compile("^\\s*((\\-\\s*)?[0-9\\,]+)\\s*$")); + .withInitial(() -> Pattern.compile("^\\s*((\\-\\s*)?[0-9\\,]+)\\s*(%\\s*)?$")); protected DataVerifyImpl(String _name) { name = _name; @@ -51,7 +51,14 @@ public boolean get(double number, DataVerifyResult res) { return false; } - private static double doubleValueOf(String input) { + private static double doubleValueOf(String input) throws NumberFormatException { + { + Matcher matcher = INTEGER_WITH_DOT_PATTERN.get().matcher(input); + if (matcher.matches()) { + input = input.replaceAll(",", "").trim(); + } + } + Matcher matcher = PERCENT_PATTERN.get().matcher(input); if (matcher.matches()) { return Double.valueOf(matcher.group(1).trim()) / 100.0; @@ -59,15 +66,30 @@ private static double doubleValueOf(String input) { return Double.valueOf(input); } - private static long longValueOf(String input) { - Matcher matcher = INTEGER_WITH_DOT_PATTERN.get().matcher(input); + private static long longValueOf(String input) throws NumberFormatException { + long ret; + { + Matcher matcher = INTEGER_WITH_DOT_PATTERN.get().matcher(input); + if (matcher.matches()) { + input = input.replaceAll(",", "").trim(); + } + } + + Matcher matcher = PERCENT_PATTERN.get().matcher(input); if (matcher.matches()) { - return Long.valueOf(input.replaceAll(",", "").trim()); + ret = Long.valueOf(matcher.group(1).trim()); + if (ret % 100 != 0) { + throw new NumberFormatException( + String.format("The number part of %s can not be devided by 100", input)); + } + } else { + ret = Long.valueOf(input); } - return Long.valueOf(input); + + return ret; } - public boolean get(String enum_name, DataVerifyResult res) { + public boolean get(String enum_name, DataVerifyResult res) throws NumberFormatException { if (null == enum_name || enum_name.isEmpty()) { res.success = true; res.value = 0; @@ -208,23 +230,25 @@ static public double getAndVerifyToDouble(List verifyEngine, Str boolean is_double = false; for (int i = 0; is_numeric && i < val.length(); ++i) { char c = val.charAt(i); - if ((c < '0' || c > '9') && '.' != c && '-' != c) { - is_numeric = false; + if ((c < '0' || c > '9') && '.' != c && '-' != c && ',' != c) { + if (!PERCENT_PATTERN.get().matcher(val).matches()) { + is_numeric = false; + } } if ('.' == c) { is_double = true; } } - if (is_numeric) { - if (is_double) { - return getAndVerify(verifyEngine, path, doubleValueOf(val)); - } else { - return getAndVerify(verifyEngine, path, longValueOf(val)); + try { + if (is_numeric) { + if (is_double) { + return getAndVerify(verifyEngine, path, doubleValueOf(val)); + } else { + return getAndVerify(verifyEngine, path, longValueOf(val)); + } } - } - try { if (verifyEngine == null || verifyEngine.isEmpty()) { if (is_double) { return doubleValueOf(val); diff --git a/src/org/xresloader/core/data/vfy/DataVerifyInTableColumn.java b/src/org/xresloader/core/data/vfy/DataVerifyInTableColumn.java index a1be0dbf..3a4c3824 100644 --- a/src/org/xresloader/core/data/vfy/DataVerifyInTableColumn.java +++ b/src/org/xresloader/core/data/vfy/DataVerifyInTableColumn.java @@ -158,7 +158,7 @@ public boolean get(double number, DataVerifyResult res) { } @Override - public boolean get(String input, DataVerifyResult res) { + public boolean get(String input, DataVerifyResult res) throws NumberFormatException { // 空值永久有效,因为空数据项会被填充默认值 if (input.isEmpty()) { res.success = true; diff --git a/src/org/xresloader/core/data/vfy/DataVerifyInText.java b/src/org/xresloader/core/data/vfy/DataVerifyInText.java index f799709b..8009fa43 100644 --- a/src/org/xresloader/core/data/vfy/DataVerifyInText.java +++ b/src/org/xresloader/core/data/vfy/DataVerifyInText.java @@ -145,7 +145,7 @@ public boolean get(double number, DataVerifyResult res) { } @Override - public boolean get(String input, DataVerifyResult res) { + public boolean get(String input, DataVerifyResult res) throws NumberFormatException { // 空值永久有效,因为空数据项会被填充默认值 if (input.isEmpty()) { res.success = true; diff --git a/src/org/xresloader/core/data/vfy/DataVerifyIntRange.java b/src/org/xresloader/core/data/vfy/DataVerifyIntRange.java index ea819ff9..ffec9472 100644 --- a/src/org/xresloader/core/data/vfy/DataVerifyIntRange.java +++ b/src/org/xresloader/core/data/vfy/DataVerifyIntRange.java @@ -94,7 +94,7 @@ public boolean get(double number, DataVerifyResult res) { } @Override - public boolean get(String intstr, DataVerifyResult res) { + public boolean get(String intstr, DataVerifyResult res) throws NumberFormatException { // check if it's a number boolean is_numeric = true; boolean is_double = false; diff --git a/src/org/xresloader/core/data/vfy/DataVerifyRegex.java b/src/org/xresloader/core/data/vfy/DataVerifyRegex.java index 87834960..a1ba435f 100644 --- a/src/org/xresloader/core/data/vfy/DataVerifyRegex.java +++ b/src/org/xresloader/core/data/vfy/DataVerifyRegex.java @@ -67,7 +67,7 @@ public boolean get(double number, DataVerifyResult res) { } @Override - public boolean get(String input, DataVerifyResult res) { + public boolean get(String input, DataVerifyResult res) throws NumberFormatException { // 空值永久有效,因为空数据项会被填充默认值 if (input.isEmpty()) { res.success = true;