From 0c814cfc24ea59eb7c1edebd101bf9e217a5670a Mon Sep 17 00:00:00 2001 From: owent <> Date: Tue, 16 Jul 2024 19:22:19 +0800 Subject: [PATCH] Prepare v2.17.1 --- HISTORY.md | 5 + pom.xml | 2 +- sample/proto_v2/arr_in_arr_cfg.bin | 2 +- sample/proto_v2/arr_in_arr_cfg.lua | 2 +- sample/proto_v2/arr_in_arr_cfg.xml | 144 +----------------- .../csv/Private/ConfigRec/ArrInArr.cpp | 2 +- .../csv/Private/ConfigRec/ArrInArrCfg.cpp | 2 +- .../csv/Private/ConfigRec/Dep2Cfg.cpp | 2 +- .../csv/Private/ConfigRec/EventCfg.cpp | 2 +- .../csv/Private/ConfigRec/EventRewardItem.cpp | 2 +- .../csv/Private/ConfigRec/EventRuleItem.cpp | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.cpp | 2 +- .../csv/Private/ConfigRec/RoleUpgradeCfg.cpp | 2 +- .../csv/Private/ConfigRec/TestMsgVerifier.cpp | 2 +- .../proto_v2/csv/Public/ConfigRec/ArrInArr.h | 2 +- .../csv/Public/ConfigRec/ArrInArrCfg.h | 2 +- .../proto_v2/csv/Public/ConfigRec/Dep2Cfg.h | 2 +- .../proto_v2/csv/Public/ConfigRec/EventCfg.h | 2 +- .../csv/Public/ConfigRec/EventRewardItem.h | 2 +- .../csv/Public/ConfigRec/EventRuleItem.h | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../csv/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- .../csv/Public/ConfigRec/TestMsgVerifier.h | 2 +- sample/proto_v2/event_cfg.bin | Bin 420 -> 420 bytes sample/proto_v2/event_cfg.lua | 4 +- sample/proto_v2/json/KindConst.cpp | 2 +- sample/proto_v2/json/KindConst.h | 2 +- .../json/Private/ConfigRec/ArrInArr.cpp | 2 +- .../json/Private/ConfigRec/ArrInArrCfg.cpp | 2 +- .../json/Private/ConfigRec/Dep2Cfg.cpp | 2 +- .../json/Private/ConfigRec/EventCfg.cpp | 2 +- .../Private/ConfigRec/EventRewardItem.cpp | 2 +- .../json/Private/ConfigRec/EventRuleItem.cpp | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.cpp | 2 +- .../json/Private/ConfigRec/RoleUpgradeCfg.cpp | 2 +- .../Private/ConfigRec/TestMsgVerifier.cpp | 2 +- .../proto_v2/json/Public/ConfigRec/ArrInArr.h | 2 +- .../json/Public/ConfigRec/ArrInArrCfg.h | 2 +- .../proto_v2/json/Public/ConfigRec/Dep2Cfg.h | 2 +- .../proto_v2/json/Public/ConfigRec/EventCfg.h | 2 +- .../json/Public/ConfigRec/EventRewardItem.h | 2 +- .../json/Public/ConfigRec/EventRuleItem.h | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../json/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- .../json/Public/ConfigRec/TestMsgVerifier.h | 2 +- sample/proto_v2/keep_empty_list_cfg.bin | Bin 498 -> 498 bytes sample/proto_v2/keep_empty_list_cfg.lua | 2 +- sample/proto_v2/process_by_script.bin | 2 +- sample/proto_v2/process_by_script.json | 2 +- sample/proto_v2/process_by_script.lua | 2 +- sample/proto_v2/role_cfg.amd.js | 2 +- sample/proto_v2/role_cfg.bin | Bin 1397 -> 1397 bytes sample/proto_v2/role_cfg.js | 2 +- sample/proto_v2/role_cfg.json | 2 +- sample/proto_v2/role_cfg.lua | 2 +- sample/proto_v2/role_cfg.msgpack.bin | Bin 3393 -> 3393 bytes sample/proto_v2/role_cfg.n.js | 2 +- sample/proto_v2/role_cfg.xml | 2 +- sample/proto_v2/role_cfg_module.lua | 2 +- sample/proto_v2/role_upgrade_cfg.bin | Bin 1550 -> 1550 bytes sample/proto_v2/role_upgrade_cfg.json | 2 +- sample/proto_v2/role_upgrade_cfg.lua | 2 +- sample/proto_v2/strip_list_tail_cfg.bin | Bin 490 -> 490 bytes sample/proto_v2/strip_list_tail_cfg.lua | 2 +- sample/proto_v3/arr_in_arr_cfg.bin | 2 +- sample/proto_v3/arr_in_arr_cfg.lua | 2 +- sample/proto_v3/arr_in_arr_cfg.xml | 144 +----------------- .../csv/Private/ConfigRec/ArrInArr.cpp | 2 +- .../csv/Private/ConfigRec/ArrInArrCfg.cpp | 2 +- .../csv/Private/ConfigRec/Dep2Cfg.cpp | 2 +- .../proto_v3/csv/Private/ConfigRec/DepCfg.cpp | 2 +- .../csv/Private/ConfigRec/EventCfg.cpp | 2 +- .../csv/Private/ConfigRec/EventRewardItem.cpp | 2 +- .../csv/Private/ConfigRec/EventRuleItem.cpp | 2 +- .../ConfigRec/GoogleProtobufDuration.cpp | 2 +- .../ConfigRec/GoogleProtobufTimestamp.cpp | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.cpp | 2 +- .../csv/Private/ConfigRec/RoleCfg.cpp | 2 +- .../csv/Private/ConfigRec/RoleUpgradeCfg.cpp | 2 +- .../csv/Private/ConfigRec/TestMsgVerifier.cpp | 2 +- .../proto_v3/csv/Public/ConfigRec/ArrInArr.h | 2 +- .../csv/Public/ConfigRec/ArrInArrCfg.h | 2 +- .../proto_v3/csv/Public/ConfigRec/Dep2Cfg.h | 2 +- sample/proto_v3/csv/Public/ConfigRec/DepCfg.h | 2 +- .../proto_v3/csv/Public/ConfigRec/EventCfg.h | 2 +- .../csv/Public/ConfigRec/EventRewardItem.h | 2 +- .../csv/Public/ConfigRec/EventRuleItem.h | 2 +- .../Public/ConfigRec/GoogleProtobufDuration.h | 2 +- .../ConfigRec/GoogleProtobufTimestamp.h | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../proto_v3/csv/Public/ConfigRec/RoleCfg.h | 2 +- .../csv/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- .../csv/Public/ConfigRec/TestMsgVerifier.h | 2 +- sample/proto_v3/event_cfg.bin | Bin 420 -> 420 bytes sample/proto_v3/event_cfg.lua | 4 +- sample/proto_v3/json/KindConst.cpp | 2 +- sample/proto_v3/json/KindConst.h | 2 +- .../json/Private/ConfigRec/ArrInArr.cpp | 2 +- .../json/Private/ConfigRec/ArrInArrCfg.cpp | 2 +- .../json/Private/ConfigRec/Dep2Cfg.cpp | 2 +- .../json/Private/ConfigRec/DepCfg.cpp | 2 +- .../json/Private/ConfigRec/EventCfg.cpp | 2 +- .../Private/ConfigRec/EventRewardItem.cpp | 2 +- .../json/Private/ConfigRec/EventRuleItem.cpp | 2 +- .../ConfigRec/GoogleProtobufDuration.cpp | 2 +- .../ConfigRec/GoogleProtobufTimestamp.cpp | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.cpp | 2 +- .../json/Private/ConfigRec/RoleCfg.cpp | 2 +- .../json/Private/ConfigRec/RoleUpgradeCfg.cpp | 2 +- .../Private/ConfigRec/TestMsgVerifier.cpp | 2 +- .../proto_v3/json/Public/ConfigRec/ArrInArr.h | 2 +- .../json/Public/ConfigRec/ArrInArrCfg.h | 2 +- .../proto_v3/json/Public/ConfigRec/Dep2Cfg.h | 2 +- .../proto_v3/json/Public/ConfigRec/DepCfg.h | 2 +- .../proto_v3/json/Public/ConfigRec/EventCfg.h | 2 +- .../json/Public/ConfigRec/EventRewardItem.h | 2 +- .../json/Public/ConfigRec/EventRuleItem.h | 2 +- .../Public/ConfigRec/GoogleProtobufDuration.h | 2 +- .../ConfigRec/GoogleProtobufTimestamp.h | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../proto_v3/json/Public/ConfigRec/RoleCfg.h | 2 +- .../json/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- .../json/Public/ConfigRec/TestMsgVerifier.h | 2 +- sample/proto_v3/keep_empty_list_cfg.bin | Bin 490 -> 490 bytes sample/proto_v3/keep_empty_list_cfg.lua | 2 +- sample/proto_v3/process_by_script.bin | 2 +- sample/proto_v3/process_by_script.json | 2 +- sample/proto_v3/process_by_script.lua | 2 +- sample/proto_v3/role_cfg.amd.js | 2 +- sample/proto_v3/role_cfg.bin | Bin 1397 -> 1397 bytes sample/proto_v3/role_cfg.js | 2 +- sample/proto_v3/role_cfg.json | 2 +- sample/proto_v3/role_cfg.lua | 2 +- sample/proto_v3/role_cfg.msgpack.bin | Bin 3393 -> 3393 bytes sample/proto_v3/role_cfg.n.js | 2 +- sample/proto_v3/role_cfg.xml | 2 +- sample/proto_v3/role_cfg_module.lua | 2 +- sample/proto_v3/role_upgrade_cfg.bin | 2 +- sample/proto_v3/role_upgrade_cfg.json | 2 +- sample/proto_v3/role_upgrade_cfg.lua | 2 +- sample/proto_v3/strip_list_tail_cfg.bin | Bin 484 -> 484 bytes sample/proto_v3/strip_list_tail_cfg.lua | 2 +- .../xresloader/core/data/dst/DataDstJava.java | 1 + .../xresloader/core/data/dst/DataDstPb.java | 6 +- .../xresloader/core/data/dst/DataDstXml.java | 11 -- 145 files changed, 141 insertions(+), 430 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index bc7ab05a..c5d87da7 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,11 @@ ## Unrelease +## 2.17.1 + +1. 修复数组别名丢失字段映射的问题 +2. 修复文本模式输出跨分组转出数据没清理干净的问题 + ## 2.17.0 1. 增加 `--disable-data-validator` 允许跳过数据验证。 diff --git a/pom.xml b/pom.xml index 72c3d1d0..b8bb3286 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.xresloader xresloader - 2.17.0 + 2.17.1 jar xresloader diff --git a/sample/proto_v2/arr_in_arr_cfg.bin b/sample/proto_v2/arr_in_arr_cfg.bin index c4682a67..dec4c570 100755 --- a/sample/proto_v2/arr_in_arr_cfg.bin +++ b/sample/proto_v2/arr_in_arr_cfg.bin @@ -1,6 +1,6 @@  -2.16.01.0.0.0"Gsha256:001a7128e8311bf632d0042ad2727cd0b44418a0dacbaa38fe0d5e861c2fd22c*Test arr_in_arr_cfgZ' +2.17.11.0.0.0"Gsha256:001a7128e8311bf632d0042ad2727cd0b44418a0dacbaa38fe0d5e861c2fd22c*Test arr_in_arr_cfgZ' 资源转换示例.xlsx arr_in_arrN- 第一个-Aef 啦啦啦啦 嘞嘞嘞嘞- diff --git a/sample/proto_v2/arr_in_arr_cfg.lua b/sample/proto_v2/arr_in_arr_cfg.lua index f759d1e5..51656ec7 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:6b2919a501f5cb402ca608dd55aa11785ba4214ff99908aba25609118cb9e0e7", - xres_ver = "2.16.0", + xres_ver = "2.17.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 5542c817..58b8868f 100644 --- a/sample/proto_v2/arr_in_arr_cfg.xml +++ b/sample/proto_v2/arr_in_arr_cfg.xml @@ -12,151 +12,9 @@ 1.0.0.0 Test arr_in_arr_cfg sha256:6b2919a501f5cb402ca608dd55aa11785ba4214ff99908aba25609118cb9e0e7 - 2.16.0 + 2.17.1 - - - 101 - 102 - 第一个-A - 啦啦啦啦 - 嘞嘞嘞嘞 - - - 111 - 112 - 第一个-B - 嘟嘟嘟嘟 - 嚓嚓嚓嚓 - - 10001 - - Map嵌套模式[0].value - Map嵌套模式[1].value - - - - 111 - 112 - - - 121 - 122 - - - 10001 - 10001 - 10001 - 1 - 2 - 3 - - 1 - 2 - - - 1 - 2 - - - 3 - 4 - - - 5 - 6 - - - - - 201 - 202 - 测试项-A - biubiubiubiu - 唰唰唰唰 - - - 211 - 212 - 测试项-B - 哦哦哦哦 - 哈哈哈哈 - - 10002 - - Map嵌套模式[0].value - Map嵌套模式[1].value - - - - 211 - 212 - - - 221 - 222 - - - 10101 - 10101 - 10101 - 4 - 5 - 6 - - 3 - 4 - 5 - - - 7 - 8 - - - 9 - 10 - - - - - 301 - 测试项-C - - - 311 - 测试项-B - 哦哦哦哦 - - 10003 - - Map嵌套模式[0].value - Map嵌套模式[1].value - - - - 311 - 312 - - - 321 - 322 - - - 10001 - 10001 - 10001 - 7 - 8 - 9 - - 6 - - - 11 - 12 - - 101 diff --git a/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp index 233aaeb7..0af10b9a 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 fb63e1cd..3648010f 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 e8b7fff3..6d2bd99e 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 96cef91f..06a0e2a7 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 41032287..701b93ac 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 3846de47..127c2d82 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 01d08133..81c68853 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 381a23ee..b4e66228 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 b8384b07..de75635b 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 16f0ac0d..b532f332 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 d9172de1..d7d93e5d 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 88d1d6b7..425ed52d 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 2a92361e..0d124e36 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 b38106bb..344ea03c 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 dfdb774e..688345c4 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 ab26f7a9..ad2e8da9 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 c34c1a60..69ce889d 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 6a9613c2..a311384b 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 2b250a7402ef6353a0a4128120cbfdb97356ea25..27b01520ec8fb0adf98330db42d455b5826eb07e 100644 GIT binary patch delta 20 bcmZ3&yo8yXYdIqqn~|QOxt`%h?wO1LFvA3y delta 20 bcmZ3&yo8yXYdIqqn~|QOnV!K$?wO1LFt-Gk diff --git a/sample/proto_v2/event_cfg.lua b/sample/proto_v2/event_cfg.lua index d8d9686e..903e4312 100644 --- a/sample/proto_v2/event_cfg.lua +++ b/sample/proto_v2/event_cfg.lua @@ -2,7 +2,7 @@ return { [1] = { - count = 7, + count = 5, data_source = { { count = 5, @@ -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.16.0", + xres_ver = "2.17.1", }, [2] = "event_cfg", event_cfg = { diff --git a/sample/proto_v2/json/KindConst.cpp b/sample/proto_v2/json/KindConst.cpp index c2216fdc..17a92323 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 51818e54..b2886682 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 f5a5f166..6498851b 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 41a1284b..a5051279 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 03fd083a..6816a6e6 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 bc88628a..7e27ea88 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 b4b94412..c1afcfbd 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 c68ec195..7f3562d2 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 01d08133..81c68853 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 37b58952..6c1c24a5 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 d7a5d8c2..580dab33 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 150f2888..92149634 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 15b72ebf..3062e0fa 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 6d490944..852b0d8c 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 572da897..2eef977e 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 1892016c..6aa0b1ca 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 a640cb9f..70cf63b8 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 ab26f7a9..ad2e8da9 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 f48b686f..79aa8f0a 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 89b8b397..4e8185ad 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 4f9f3879ca3d3dec019441898f82beffab850abe..4af753a8cebd4212b0958a1683687497dc666ddf 100644 GIT binary patch delta 20 bcmeyw{E3;HYceAjn~|QOxt`%h?&pjEJKF_s delta 20 bcmeyw{E3;HYceAjn~|QOnV!K$?&pjEJI@7e diff --git a/sample/proto_v2/keep_empty_list_cfg.lua b/sample/proto_v2/keep_empty_list_cfg.lua index 1b12bb49..0f13df0a 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.16.0", + xres_ver = "2.17.1", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/sample/proto_v2/process_by_script.bin b/sample/proto_v2/process_by_script.bin index 61197fae..6b876cd6 100644 --- a/sample/proto_v2/process_by_script.bin +++ b/sample/proto_v2/process_by_script.bin @@ -1,6 +1,6 @@  -2.16.01.0.0.0"Gsha256:61e311d737fbee8763ecc058018322b9dc17f25f809f407d62b96afaba6bb9c9Z/ +2.17.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 6bd1ee77..b76d0274 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.16.0" + "xres_ver": "2.17.1" }, {"process_by_script": [ { diff --git a/sample/proto_v2/process_by_script.lua b/sample/proto_v2/process_by_script.lua index e8c627c3..d24a3988 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.16.0", + xres_ver = "2.17.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 faa443d0..2c8e602c 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.16.0" + xres_ver : "2.17.1" }, "role_cfg": [ { diff --git a/sample/proto_v2/role_cfg.bin b/sample/proto_v2/role_cfg.bin index 2db758bd8ebaf3074586337d6ff7320aa88251d9..42088ed934a414fd2c9ce4d33855fa5df5f1d673 100755 GIT binary patch delta 19 acmey$^_7c@tDcL^NYBt*&u}AGHY)%)iv;ul delta 19 acmey$^_7c@tDcL^NYBtr&tM~0HY)%)e+2RX diff --git a/sample/proto_v2/role_cfg.js b/sample/proto_v2/role_cfg.js index e0a17dfa..7bcfc8db 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.16.0" + xres_ver : "2.17.1" } } }; diff --git a/sample/proto_v2/role_cfg.json b/sample/proto_v2/role_cfg.json index e437c05b..887e7ce2 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.16.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.17.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 ba89c5c3..86d01c64 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.16.0", + xres_ver = "2.17.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 0830e950dbd4c05aee9e6722161311088aadd6e3..17869d630d09364e6eaf6ec9b10a49f28591ab9c 100755 GIT binary patch delta 14 VcmX>obx>-;K4x=0!;J?UcmOOL1)Kl? delta 14 VcmX>obx>-;K4vpLgN+9pcmOO91)2Z= diff --git a/sample/proto_v2/role_cfg.n.js b/sample/proto_v2/role_cfg.n.js index 9e3845ea..0cb3d1f1 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.16.0" + xres_ver : "2.17.1" }; exports.role_cfg = [ { diff --git a/sample/proto_v2/role_cfg.xml b/sample/proto_v2/role_cfg.xml index b00500d4..17015090 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.16.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都玛西亚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.17.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 c1563273..f4f1ff59 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.16.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.17.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 f27e017a922ac599d08c98a299c0e4f25501c047..ac4b473e74f016d35cc4b7713039f649fa64f3e1 100644 GIT binary patch delta 20 bcmeC<>Eq$%YGUGIGtx6O*E8J6&CCV>E29I- delta 20 bcmeC<>Eq$%YGUGIGtx6O(=*t}&CCV>E0+Vv diff --git a/sample/proto_v2/role_upgrade_cfg.json b/sample/proto_v2/role_upgrade_cfg.json index 5e303a67..db45e975 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.16.0" + "xres_ver": "2.17.1" }, {"role_upgrade_cfg": [ { diff --git a/sample/proto_v2/role_upgrade_cfg.lua b/sample/proto_v2/role_upgrade_cfg.lua index 1c89d507..fd2e7564 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.16.0", + xres_ver = "2.17.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 bc266dbf71cc48fe442c179a22d0a828dd746707..189a3bd16f92d36bf7dbdf135364d7d88de808fa 100644 GIT binary patch delta 20 bcmaFG{EC^IYceAjn~|QOxt`%h?)!`YI-3Po delta 20 bcmaFG{EC^IYceAjn~|QOnV!K$?)!`YI*$ca diff --git a/sample/proto_v2/strip_list_tail_cfg.lua b/sample/proto_v2/strip_list_tail_cfg.lua index 9346c1fe..4957f103 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.16.0", + xres_ver = "2.17.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 74f03358..c0ef9f8e 100755 --- a/sample/proto_v3/arr_in_arr_cfg.bin +++ b/sample/proto_v3/arr_in_arr_cfg.bin @@ -1,6 +1,6 @@  -2.16.01.0.0.0"Gsha256:ec3b06f7ffc1df7953fc2f23746182d1c312464e9d0ef3765fd8f2187a44193a*Test arr_in_arr_cfgZ' +2.17.11.0.0.0"Gsha256:ec3b06f7ffc1df7953fc2f23746182d1c312464e9d0ef3765fd8f2187a44193a*Test arr_in_arr_cfgZ' 资源转换示例.xlsx arr_in_arrN- 第一个-Aef 啦啦啦啦 嘞嘞嘞嘞- diff --git a/sample/proto_v3/arr_in_arr_cfg.lua b/sample/proto_v3/arr_in_arr_cfg.lua index f759d1e5..51656ec7 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:6b2919a501f5cb402ca608dd55aa11785ba4214ff99908aba25609118cb9e0e7", - xres_ver = "2.16.0", + xres_ver = "2.17.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 5542c817..58b8868f 100644 --- a/sample/proto_v3/arr_in_arr_cfg.xml +++ b/sample/proto_v3/arr_in_arr_cfg.xml @@ -12,151 +12,9 @@ 1.0.0.0 Test arr_in_arr_cfg sha256:6b2919a501f5cb402ca608dd55aa11785ba4214ff99908aba25609118cb9e0e7 - 2.16.0 + 2.17.1 - - - 101 - 102 - 第一个-A - 啦啦啦啦 - 嘞嘞嘞嘞 - - - 111 - 112 - 第一个-B - 嘟嘟嘟嘟 - 嚓嚓嚓嚓 - - 10001 - - Map嵌套模式[0].value - Map嵌套模式[1].value - - - - 111 - 112 - - - 121 - 122 - - - 10001 - 10001 - 10001 - 1 - 2 - 3 - - 1 - 2 - - - 1 - 2 - - - 3 - 4 - - - 5 - 6 - - - - - 201 - 202 - 测试项-A - biubiubiubiu - 唰唰唰唰 - - - 211 - 212 - 测试项-B - 哦哦哦哦 - 哈哈哈哈 - - 10002 - - Map嵌套模式[0].value - Map嵌套模式[1].value - - - - 211 - 212 - - - 221 - 222 - - - 10101 - 10101 - 10101 - 4 - 5 - 6 - - 3 - 4 - 5 - - - 7 - 8 - - - 9 - 10 - - - - - 301 - 测试项-C - - - 311 - 测试项-B - 哦哦哦哦 - - 10003 - - Map嵌套模式[0].value - Map嵌套模式[1].value - - - - 311 - 312 - - - 321 - 322 - - - 10001 - 10001 - 10001 - 7 - 8 - 9 - - 6 - - - 11 - 12 - - 101 diff --git a/sample/proto_v3/csv/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v3/csv/Private/ConfigRec/ArrInArr.cpp index c5835e46..5e826ed8 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 fb63e1cd..3648010f 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 e8b7fff3..6d2bd99e 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 e21a91b2..db66801f 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 96cef91f..06a0e2a7 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 41032287..701b93ac 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 3846de47..127c2d82 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 10874cc2..0ac87ec2 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 fafdd6f4..b13d299b 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 01d08133..81c68853 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 d3c31aed..88c851a2 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 3c74e154..99dba6e4 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 b8384b07..de75635b 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 54622a7f..d0350cc9 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 d9172de1..d7d93e5d 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 88d1d6b7..425ed52d 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 5958b786..699af680 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 2a92361e..0d124e36 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 b38106bb..344ea03c 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 dfdb774e..688345c4 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 1ac79132..60ecfe78 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 daf3c07c..11e9feae 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 ab26f7a9..ad2e8da9 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 13efb596..da9710b2 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 c34c1a60..69ce889d 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 6a9613c2..a311384b 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 2b250a7402ef6353a0a4128120cbfdb97356ea25..27b01520ec8fb0adf98330db42d455b5826eb07e 100644 GIT binary patch delta 20 bcmZ3&yo8yXYdIqqn~|QOxt`%h?wO1LFvA3y delta 20 bcmZ3&yo8yXYdIqqn~|QOnV!K$?wO1LFt-Gk diff --git a/sample/proto_v3/event_cfg.lua b/sample/proto_v3/event_cfg.lua index d8d9686e..903e4312 100644 --- a/sample/proto_v3/event_cfg.lua +++ b/sample/proto_v3/event_cfg.lua @@ -2,7 +2,7 @@ return { [1] = { - count = 7, + count = 5, data_source = { { count = 5, @@ -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.16.0", + xres_ver = "2.17.1", }, [2] = "event_cfg", event_cfg = { diff --git a/sample/proto_v3/json/KindConst.cpp b/sample/proto_v3/json/KindConst.cpp index c2216fdc..17a92323 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 51818e54..b2886682 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 7cde8e88..c602e35e 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 41a1284b..a5051279 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 03fd083a..6816a6e6 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 012ebf69..3e38d2d2 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 bc88628a..7e27ea88 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 b4b94412..c1afcfbd 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 c68ec195..7f3562d2 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 10874cc2..0ac87ec2 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 fafdd6f4..b13d299b 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 01d08133..81c68853 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 e464f739..ab7fa7f1 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 306a6d6a..dc8db7d7 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 d7a5d8c2..580dab33 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 b1528084..bbaa4818 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 15b72ebf..3062e0fa 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 6d490944..852b0d8c 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 4f648d0c..c8625184 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 572da897..2eef977e 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 1892016c..6aa0b1ca 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 a640cb9f..70cf63b8 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 1ac79132..60ecfe78 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 daf3c07c..11e9feae 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 ab26f7a9..ad2e8da9 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 fb1441b6..09f5e3df 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 f48b686f..79aa8f0a 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 89b8b397..4e8185ad 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.16.0, please don't edit it. + * This file is generated by xresloader 2.17.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 632171f1b8ebb4ac8836dc4c75220791fdfe0caa..dbc7fa6024db83c718c4dfef493d90fe97f55b07 100644 GIT binary patch delta 20 bcmaFG{EC^IYceAjn~|QOxt`%h?)!`YI-3Po delta 20 bcmaFG{EC^IYceAjn~|QOnV!K$?)!`YI*$ca diff --git a/sample/proto_v3/keep_empty_list_cfg.lua b/sample/proto_v3/keep_empty_list_cfg.lua index 1b12bb49..0f13df0a 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.16.0", + xres_ver = "2.17.1", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/sample/proto_v3/process_by_script.bin b/sample/proto_v3/process_by_script.bin index 84b46047..2fd1dbac 100644 --- a/sample/proto_v3/process_by_script.bin +++ b/sample/proto_v3/process_by_script.bin @@ -1,6 +1,6 @@  -2.16.01.0.0.0"Gsha256:e7e3d54a300a251f9b6a33886083711d5bcbff18988c9109db959d3d3e89a939Z/ +2.17.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 c9b282ac..d321d809 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.16.0" + "xres_ver": "2.17.1" }, {"process_by_script": [ { diff --git a/sample/proto_v3/process_by_script.lua b/sample/proto_v3/process_by_script.lua index 4855fae4..30230155 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.16.0", + xres_ver = "2.17.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 faa443d0..2c8e602c 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.16.0" + xres_ver : "2.17.1" }, "role_cfg": [ { diff --git a/sample/proto_v3/role_cfg.bin b/sample/proto_v3/role_cfg.bin index 9aecf4795ab630c7e459207bedc5b13e53fce0bf..afe515c32f8d286b7b13e2b460308d1752b5a8a0 100755 GIT binary patch delta 19 acmey$^_7c@tDcL^NYBt*&u}AGHY)%)iv;ul delta 19 acmey$^_7c@tDcL^NYBtr&tM~0HY)%)e+2RX diff --git a/sample/proto_v3/role_cfg.js b/sample/proto_v3/role_cfg.js index e0a17dfa..7bcfc8db 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.16.0" + xres_ver : "2.17.1" } } }; diff --git a/sample/proto_v3/role_cfg.json b/sample/proto_v3/role_cfg.json index e437c05b..887e7ce2 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.16.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.17.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 ba89c5c3..86d01c64 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.16.0", + xres_ver = "2.17.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 0830e950dbd4c05aee9e6722161311088aadd6e3..17869d630d09364e6eaf6ec9b10a49f28591ab9c 100755 GIT binary patch delta 14 VcmX>obx>-;K4x=0!;J?UcmOOL1)Kl? delta 14 VcmX>obx>-;K4vpLgN+9pcmOO91)2Z= diff --git a/sample/proto_v3/role_cfg.n.js b/sample/proto_v3/role_cfg.n.js index 9e3845ea..0cb3d1f1 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.16.0" + xres_ver : "2.17.1" }; exports.role_cfg = [ { diff --git a/sample/proto_v3/role_cfg.xml b/sample/proto_v3/role_cfg.xml index b00500d4..17015090 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.16.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都玛西亚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.17.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 c1563273..f4f1ff59 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.16.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.17.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 cca21bc1..6a4a0ec3 100644 --- a/sample/proto_v3/role_upgrade_cfg.bin +++ b/sample/proto_v3/role_upgrade_cfg.bin @@ -1,6 +1,6 @@  -2.16.01.0.0.0f"Gsha256:bbf8dcdce30a89f9c7fbb31163c4821ab84d36954758b06c2969dd0217db951c*LTest role_upgrade_cfg with multi keys +2.17.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 5e303a67..db45e975 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.16.0" + "xres_ver": "2.17.1" }, {"role_upgrade_cfg": [ { diff --git a/sample/proto_v3/role_upgrade_cfg.lua b/sample/proto_v3/role_upgrade_cfg.lua index 1c89d507..fd2e7564 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.16.0", + xres_ver = "2.17.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 9da2115353ec7545d2b979f769755a9e38dfb907..0473c4fde47f6f3542c86d264a30fe7eebd330e0 100644 GIT binary patch delta 20 bcmaFD{DhgCYceAjn~|QOxt`%h?wgDNIjaRl delta 20 bcmaFD{DhgCYceAjn~|QOnV!K$?wgDNIiCeX diff --git a/sample/proto_v3/strip_list_tail_cfg.lua b/sample/proto_v3/strip_list_tail_cfg.lua index 9346c1fe..4957f103 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.16.0", + xres_ver = "2.17.1", }, [2] = "keep_or_strip_empty_list_cfg", keep_or_strip_empty_list_cfg = { diff --git a/src/org/xresloader/core/data/dst/DataDstJava.java b/src/org/xresloader/core/data/dst/DataDstJava.java index 5f72ef53..3a50555c 100644 --- a/src/org/xresloader/core/data/dst/DataDstJava.java +++ b/src/org/xresloader/core/data/dst/DataDstJava.java @@ -220,6 +220,7 @@ protected DataDstObject build_data(DataDstImpl compiler) throws ConvException { if (!description_list.isEmpty()) { ret.header.put("description", String.join(getSystemEndl(), description_list)); } + ret.header.replace("count", item_list.size()); // 校验码 MessageDigest sha256 = null; diff --git a/src/org/xresloader/core/data/dst/DataDstPb.java b/src/org/xresloader/core/data/dst/DataDstPb.java index e44152f8..9315d274 100644 --- a/src/org/xresloader/core/data/dst/DataDstPb.java +++ b/src/org/xresloader/core/data/dst/DataDstPb.java @@ -1393,7 +1393,7 @@ private boolean testMessage(DataDstWriterNode node, LinkedList name_list child = node.addChild(fd.getName(), c, fd, DataDstWriterNode.CHILD_NODE_TYPE.STANDARD); ret = true; test_passed = true; - } else if (0 == count && null != field_alias) { + } else if (null != field_alias) { for (String alias_name : field_alias) { String test_field_name = alias_name.strip(); if (test_field_name.isEmpty()) { @@ -1415,7 +1415,7 @@ private boolean testMessage(DataDstWriterNode node, LinkedList name_list // try plain mode - array item String real_name = DataDstWriterNode.makeChildPath(prefix, fd.getName(), count); IdentifyDescriptor col = data_src.getColumnByName(real_name); - if (null == col && 0 == count && null != field_alias) { + if (null == col && null != field_alias) { for (String alias_name : field_alias) { String test_field_name = alias_name.strip(); if (test_field_name.isEmpty()) { @@ -1553,7 +1553,7 @@ private boolean testMessage(DataDstWriterNode node, LinkedList name_list for (;; ++count) { String real_name = DataDstWriterNode.makeChildPath(prefix, fd.getName(), count); IdentifyDescriptor col = data_src.getColumnByName(real_name); - if (null == col && 0 == count && null != field_alias) { + if (null == col && null != field_alias) { for (String alias_name : field_alias) { String test_field_name = alias_name.strip(); if (test_field_name.isEmpty()) { diff --git a/src/org/xresloader/core/data/dst/DataDstXml.java b/src/org/xresloader/core/data/dst/DataDstXml.java index 98422fe8..8a245e2a 100644 --- a/src/org/xresloader/core/data/dst/DataDstXml.java +++ b/src/org/xresloader/core/data/dst/DataDstXml.java @@ -88,17 +88,6 @@ public final byte[] build(DataDstImpl compiler) throws ConvException { writeData(header, data_obj.header, header.getName()); - // body - for (Map.Entry> item : data_obj.body.entrySet()) { - for (Object obj : item.getValue()) { - Element xml_item = DocumentHelper.createElement(item.getKey()); - - writeData(xml_item, obj, item.getKey()); - - body.add(xml_item); - } - } - writeData(body, data_obj.body, body.getName()); writeData(data_message_type, data_obj.data_message_type, data_message_type.getName());