From 53426a1e628a1b157bf414690ac29d1e93c09e9e Mon Sep 17 00:00:00 2001 From: owent <> Date: Fri, 27 Sep 2024 21:24:21 +0800 Subject: [PATCH] v2.19.1 --- HISTORY.md | 3 +- README.md | 3 + header/org/xresloader/Xresloader.java | 6 +- header/org/xresloader/pb/PbHeaderV3.java | 10 +- header/org/xresloader/ue/XresloaderUe.java | 6 +- loader-binding/cxx/pb_header.pb.cc | 2 +- loader-binding/cxx/pb_header.pb.h | 4 +- loader-binding/cxx/pb_header_v3.pb.cc | 2 +- loader-binding/cxx/pb_header_v3.pb.h | 4 +- sample/cxx/v2/dep_level2.pb.cc | 2 +- sample/cxx/v2/dep_level2.pb.h | 4 +- sample/cxx/v2/dependency.pb.cc | 2 +- sample/cxx/v2/dependency.pb.h | 4 +- sample/cxx/v2/kind.pb.cc | 2 +- sample/cxx/v2/kind.pb.h | 4 +- sample/cxx/v3/dep_level2.pb.cc | 2 +- sample/cxx/v3/dep_level2.pb.h | 4 +- sample/cxx/v3/dependency.pb.cc | 2 +- sample/cxx/v3/dependency.pb.h | 4 +- sample/cxx/v3/kind.pb.cc | 2 +- sample/cxx/v3/kind.pb.h | 4 +- sample/gen_sample_output.ps1 | 86 +++---- sample/gen_sample_output.sh | 86 +++---- sample/proto_v2/arr_in_arr_cfg.bin | Bin 868 -> 1009 bytes sample/proto_v2/arr_in_arr_cfg.hidden.bin | 7 +- sample/proto_v2/arr_in_arr_cfg.hidden.lua | 6 +- sample/proto_v2/arr_in_arr_cfg.lua | 6 +- sample/proto_v2/arr_in_arr_cfg.xml | 6 +- .../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 | 8 +- .../csv/Public/ConfigRec/EventRewardItem.h | 4 +- .../csv/Public/ConfigRec/EventRuleItem.h | 4 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../csv/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- sample/proto_v2/data_source_mapping.txt | 13 ++ sample/proto_v2/event_cfg.bin | Bin 420 -> 548 bytes sample/proto_v2/event_cfg.hidden.bin | Bin 373 -> 501 bytes sample/proto_v2/event_cfg.hidden.lua | 6 +- sample/proto_v2/event_cfg.lua | 6 +- sample/proto_v2/json/KindConst.h | 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 | 8 +- .../json/Public/ConfigRec/EventRewardItem.h | 4 +- .../json/Public/ConfigRec/EventRuleItem.h | 4 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../json/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- sample/proto_v2/keep_empty_list_cfg.bin | Bin 498 -> 580 bytes sample/proto_v2/keep_empty_list_cfg.lua | 4 +- sample/proto_v2/next_alias.bin | Bin 256 -> 352 bytes sample/proto_v2/next_alias.lua | 4 +- sample/proto_v2/process_by_script.bin | 10 +- sample/proto_v2/process_by_script.json | 8 +- sample/proto_v2/process_by_script.lua | 8 +- sample/proto_v2/role_cfg.amd.js | 4 +- sample/proto_v2/role_cfg.js | 4 +- sample/proto_v2/role_cfg.json | 2 +- sample/proto_v2/role_cfg.msgpack.bin | Bin 3393 -> 3496 bytes sample/proto_v2/role_cfg.n.js | 4 +- sample/proto_v2/role_cfg.xml | 2 +- sample/proto_v2/role_upgrade_cfg.bin | Bin 1550 -> 1791 bytes sample/proto_v2/role_upgrade_cfg.json | 10 +- sample/proto_v2/role_upgrade_cfg.lua | 10 +- sample/proto_v2/strip_list_tail_cfg.bin | Bin 490 -> 572 bytes sample/proto_v2/strip_list_tail_cfg.lua | 4 +- sample/proto_v3/arr_in_arr_cfg.bin | Bin 862 -> 1003 bytes sample/proto_v3/arr_in_arr_cfg.hidden.bin | 7 +- sample/proto_v3/arr_in_arr_cfg.hidden.lua | 6 +- sample/proto_v3/arr_in_arr_cfg.lua | 6 +- sample/proto_v3/arr_in_arr_cfg.xml | 6 +- .../proto_v3/csv/Public/ConfigRec/ArrInArr.h | 4 +- .../csv/Public/ConfigRec/ArrInArrCfg.h | 2 +- .../proto_v3/csv/Public/ConfigRec/Dep2Cfg.h | 2 +- sample/proto_v3/csv/Public/ConfigRec/DepCfg.h | 2 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../proto_v3/csv/Public/ConfigRec/RoleCfg.h | 8 +- .../csv/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- sample/proto_v3/csv/UnreaImportSettings.json | 8 +- sample/proto_v3/data_source_mapping.txt | 13 ++ sample/proto_v3/event_cfg.bin | Bin 420 -> 548 bytes sample/proto_v3/event_cfg.hidden.bin | Bin 373 -> 501 bytes sample/proto_v3/event_cfg.hidden.lua | 6 +- sample/proto_v3/event_cfg.lua | 6 +- sample/proto_v3/json/KindConst.h | 2 +- .../proto_v3/json/Public/ConfigRec/ArrInArr.h | 4 +- .../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 | 8 +- .../json/Public/ConfigRec/EventRewardItem.h | 4 +- .../json/Public/ConfigRec/EventRuleItem.h | 4 +- .../ConfigRec/KeepOrStripEmptyListCfg.h | 2 +- .../proto_v3/json/Public/ConfigRec/RoleCfg.h | 8 +- .../json/Public/ConfigRec/RoleUpgradeCfg.h | 2 +- sample/proto_v3/keep_empty_list_cfg.bin | Bin 490 -> 572 bytes sample/proto_v3/keep_empty_list_cfg.lua | 4 +- sample/proto_v3/next_alias.bin | Bin 247 -> 343 bytes sample/proto_v3/next_alias.lua | 4 +- sample/proto_v3/process_by_script.bin | 10 +- sample/proto_v3/process_by_script.json | 8 +- sample/proto_v3/process_by_script.lua | 8 +- sample/proto_v3/role_cfg.amd.js | 4 +- sample/proto_v3/role_cfg.js | 4 +- sample/proto_v3/role_cfg.json | 2 +- sample/proto_v3/role_cfg.msgpack.bin | Bin 3393 -> 3496 bytes sample/proto_v3/role_cfg.n.js | 4 +- sample/proto_v3/role_cfg.xml | 2 +- sample/proto_v3/role_upgrade_cfg.bin | 10 +- sample/proto_v3/role_upgrade_cfg.json | 10 +- sample/proto_v3/role_upgrade_cfg.lua | 10 +- sample/proto_v3/strip_list_tail_cfg.bin | Bin 484 -> 566 bytes sample/proto_v3/strip_list_tail_cfg.lua | 4 +- src/org/xresloader/core/ProgramOptions.java | 217 ++++++++++++++++++ .../xresloader/core/data/dst/DataDstJava.java | 11 +- .../xresloader/core/data/dst/DataDstPb.java | 10 +- src/org/xresloader/core/main.java | 1 + tools/linux_x86_64/protoc | 4 +- tools/macos_x86_64/protoc | 4 +- tools/windows_x86_64/protoc.exe | 4 +- 122 files changed, 568 insertions(+), 313 deletions(-) create mode 100644 sample/proto_v2/data_source_mapping.txt create mode 100644 sample/proto_v3/data_source_mapping.txt diff --git a/HISTORY.md b/HISTORY.md index 3df6fb76..4de432be 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,9 +2,10 @@ ## Unrelease -## 2.19.0 +## 2.19.1 1. 输出的UE代码的默认值也输出到 USTRUCT 申明中（不包含 `FString` ）。 +2. 增加 `--data-source-mapping-file`, `--data-source-mapping-mode`, `--data-source-mapping-seed` 控制数据源输出通过Hash隐藏原始文件。 ## 2.19.0 diff --git a/README.md b/README.md index 9c1aac6e..b6245aad 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,9 @@ echo " | --data-source-lru-cache-rows | 数据源的LRU Cache行数 | 仅缓存流式索引 | | --tolerate-max-empty-rows | 连续空行检测的行数 | 设置连续空行检测的行数(>=2.14.1版本) ，大量的连续空行通常是误操作 | | --ignore-field-tags | 字段Tag | 忽略指定tag的字段转出(>=2.19.0版本) | +| --data-source-mapping-file | 数据源映射输出文件 | (>=2.19.1版本) | +| --data-source-mapping-mode | 数据源映射输出模式 | `none`, `md5`, `sha1`, `sha256` (>=2.19.1版本) | +| --data-source-mapping-seed | 数据源映射输出Hash Seed | (>=2.19.1版本) | ### 协议类型 diff --git a/header/org/xresloader/Xresloader.java b/header/org/xresloader/Xresloader.java index 35cb56a2..af892e92 100644 --- a/header/org/xresloader/Xresloader.java +++ b/header/org/xresloader/Xresloader.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: xresloader.proto -// Protobuf Java Version: 4.28.0 +// Protobuf Java Version: 4.28.2 package org.xresloader; @@ -12,7 +12,7 @@ private Xresloader() {} com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, /* minor= */ 28, - /* patch= */ 0, + /* patch= */ 2, /* suffix= */ "", Xresloader.class.getName()); } @@ -100,7 +100,7 @@ public enum ListStripOption com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, /* minor= */ 28, - /* patch= */ 0, + /* patch= */ 2, /* suffix= */ "", ListStripOption.class.getName()); } diff --git a/header/org/xresloader/pb/PbHeaderV3.java b/header/org/xresloader/pb/PbHeaderV3.java index 1385ba7a..36ed1dd9 100644 --- a/header/org/xresloader/pb/PbHeaderV3.java +++ b/header/org/xresloader/pb/PbHeaderV3.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: pb_header_v3.proto -// Protobuf Java Version: 4.28.0 +// Protobuf Java Version: 4.28.2 package org.xresloader.pb; @@ -12,7 +12,7 @@ private PbHeaderV3() {} com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, /* minor= */ 28, - /* patch= */ 0, + /* patch= */ 2, /* suffix= */ "", PbHeaderV3.class.getName()); } @@ -72,7 +72,7 @@ public static final class xresloader_data_source extends com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, /* minor= */ 28, - /* patch= */ 0, + /* patch= */ 2, /* suffix= */ "", xresloader_data_source.class.getName()); } @@ -850,7 +850,7 @@ public static final class xresloader_header extends com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, /* minor= */ 28, - /* patch= */ 0, + /* patch= */ 2, /* suffix= */ "", xresloader_header.class.getName()); } @@ -2220,7 +2220,7 @@ public static final class xresloader_datablocks extends com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, /* minor= */ 28, - /* patch= */ 0, + /* patch= */ 2, /* suffix= */ "", xresloader_datablocks.class.getName()); } diff --git a/header/org/xresloader/ue/XresloaderUe.java b/header/org/xresloader/ue/XresloaderUe.java index 9b2b6ae6..f420b9f8 100644 --- a/header/org/xresloader/ue/XresloaderUe.java +++ b/header/org/xresloader/ue/XresloaderUe.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: xresloader_ue.proto -// Protobuf Java Version: 4.28.0 +// Protobuf Java Version: 4.28.2 package org.xresloader.ue; @@ -12,7 +12,7 @@ private XresloaderUe() {} com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, /* minor= */ 28, - /* patch= */ 0, + /* patch= */ 2, /* suffix= */ "", XresloaderUe.class.getName()); } @@ -59,7 +59,7 @@ public enum loader_mode com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, /* minor= */ 28, - /* patch= */ 0, + /* patch= */ 2, /* suffix= */ "", loader_mode.class.getName()); } diff --git a/loader-binding/cxx/pb_header.pb.cc b/loader-binding/cxx/pb_header.pb.cc index e26a84a0..afbc90ec 100644 --- a/loader-binding/cxx/pb_header.pb.cc +++ b/loader-binding/cxx/pb_header.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: pb_header.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #include "pb_header.pb.h" diff --git a/loader-binding/cxx/pb_header.pb.h b/loader-binding/cxx/pb_header.pb.h index 3036c3e8..6111d843 100644 --- a/loader-binding/cxx/pb_header.pb.h +++ b/loader-binding/cxx/pb_header.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: pb_header.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #ifndef GOOGLE_PROTOBUF_INCLUDED_pb_5fheader_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_pb_5fheader_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5028000 +#if PROTOBUF_VERSION != 5028002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/loader-binding/cxx/pb_header_v3.pb.cc b/loader-binding/cxx/pb_header_v3.pb.cc index 8830bdcd..e8a9d970 100644 --- a/loader-binding/cxx/pb_header_v3.pb.cc +++ b/loader-binding/cxx/pb_header_v3.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: pb_header_v3.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #include "pb_header_v3.pb.h" diff --git a/loader-binding/cxx/pb_header_v3.pb.h b/loader-binding/cxx/pb_header_v3.pb.h index 82bf15f0..9d472900 100644 --- a/loader-binding/cxx/pb_header_v3.pb.h +++ b/loader-binding/cxx/pb_header_v3.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: pb_header_v3.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #ifndef GOOGLE_PROTOBUF_INCLUDED_pb_5fheader_5fv3_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_pb_5fheader_5fv3_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5028000 +#if PROTOBUF_VERSION != 5028002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/sample/cxx/v2/dep_level2.pb.cc b/sample/cxx/v2/dep_level2.pb.cc index 484d0c1e..af2d15e2 100755 --- a/sample/cxx/v2/dep_level2.pb.cc +++ b/sample/cxx/v2/dep_level2.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: dep_level2.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #include "dep_level2.pb.h" diff --git a/sample/cxx/v2/dep_level2.pb.h b/sample/cxx/v2/dep_level2.pb.h index f0edfc27..28f277ef 100755 --- a/sample/cxx/v2/dep_level2.pb.h +++ b/sample/cxx/v2/dep_level2.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: dep_level2.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #ifndef GOOGLE_PROTOBUF_INCLUDED_dep_5flevel2_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_dep_5flevel2_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5028000 +#if PROTOBUF_VERSION != 5028002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/sample/cxx/v2/dependency.pb.cc b/sample/cxx/v2/dependency.pb.cc index 4389bdb8..a1cd5d45 100755 --- a/sample/cxx/v2/dependency.pb.cc +++ b/sample/cxx/v2/dependency.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: dependency.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #include "dependency.pb.h" diff --git a/sample/cxx/v2/dependency.pb.h b/sample/cxx/v2/dependency.pb.h index b2372929..b4b95fdf 100755 --- a/sample/cxx/v2/dependency.pb.h +++ b/sample/cxx/v2/dependency.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: dependency.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #ifndef GOOGLE_PROTOBUF_INCLUDED_dependency_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_dependency_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5028000 +#if PROTOBUF_VERSION != 5028002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/sample/cxx/v2/kind.pb.cc b/sample/cxx/v2/kind.pb.cc index f8bb1287..6672c594 100755 --- a/sample/cxx/v2/kind.pb.cc +++ b/sample/cxx/v2/kind.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: kind.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #include "kind.pb.h" diff --git a/sample/cxx/v2/kind.pb.h b/sample/cxx/v2/kind.pb.h index 96d4f9d9..2ecf3530 100755 --- a/sample/cxx/v2/kind.pb.h +++ b/sample/cxx/v2/kind.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: kind.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #ifndef GOOGLE_PROTOBUF_INCLUDED_kind_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_kind_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5028000 +#if PROTOBUF_VERSION != 5028002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/sample/cxx/v3/dep_level2.pb.cc b/sample/cxx/v3/dep_level2.pb.cc index dca254af..bcf213e5 100755 --- a/sample/cxx/v3/dep_level2.pb.cc +++ b/sample/cxx/v3/dep_level2.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: dep_level2.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #include "dep_level2.pb.h" diff --git a/sample/cxx/v3/dep_level2.pb.h b/sample/cxx/v3/dep_level2.pb.h index 316c0fa7..98082661 100755 --- a/sample/cxx/v3/dep_level2.pb.h +++ b/sample/cxx/v3/dep_level2.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: dep_level2.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #ifndef GOOGLE_PROTOBUF_INCLUDED_dep_5flevel2_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_dep_5flevel2_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5028000 +#if PROTOBUF_VERSION != 5028002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/sample/cxx/v3/dependency.pb.cc b/sample/cxx/v3/dependency.pb.cc index b6cf6c03..a696f266 100755 --- a/sample/cxx/v3/dependency.pb.cc +++ b/sample/cxx/v3/dependency.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: dependency.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #include "dependency.pb.h" diff --git a/sample/cxx/v3/dependency.pb.h b/sample/cxx/v3/dependency.pb.h index 8c7c21d9..7ac96822 100755 --- a/sample/cxx/v3/dependency.pb.h +++ b/sample/cxx/v3/dependency.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: dependency.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #ifndef GOOGLE_PROTOBUF_INCLUDED_dependency_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_dependency_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5028000 +#if PROTOBUF_VERSION != 5028002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/sample/cxx/v3/kind.pb.cc b/sample/cxx/v3/kind.pb.cc index e4639080..2cac702b 100755 --- a/sample/cxx/v3/kind.pb.cc +++ b/sample/cxx/v3/kind.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: kind.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #include "kind.pb.h" diff --git a/sample/cxx/v3/kind.pb.h b/sample/cxx/v3/kind.pb.h index d1504b0c..41eb99fb 100755 --- a/sample/cxx/v3/kind.pb.h +++ b/sample/cxx/v3/kind.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: kind.proto -// Protobuf C++ Version: 5.28.0 +// Protobuf C++ Version: 5.28.2 #ifndef GOOGLE_PROTOBUF_INCLUDED_kind_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_kind_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5028000 +#if PROTOBUF_VERSION != 5028002 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/sample/gen_sample_output.ps1 b/sample/gen_sample_output.ps1 index 3a877652..836acf33 100755 --- a/sample/gen_sample_output.ps1 +++ b/sample/gen_sample_output.ps1 @@ -32,49 +32,49 @@ foreach ($proto_dir in "proto_v2", "proto_v3") { & java -client -jar "$XRESLOADER" -t lua -p protobuf -o "$proto_dir" -f "$proto_dir/kind.pb" --lua-module ProtoData.Kind -s "$XLSX_FILE" -m scheme_kind -n '/(?i)\.bin$/_module\.lua/' --data-version 1.0.0.0 ; Write-Output "Generate sample data for $proto_dir, batchmode using --stdin"; $TASK_LINES = @( - "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind.desc.lua", - "-t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -r kind.desc.json", - "-t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.json/'", - "-t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.xml/'", - "-t msgpack -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.msgpack.bin/'", - "-t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.js/' --javascript-global sample.xresloader", - "-t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m 'DataSource=$XLSX_FILE|kind|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=role_cfg -m OutputFile=role_cfg.n.js -m KeyRow=2 -m KeyCase=lower -m KeyWordSplit=_ -m 'KeyWordRegex=[A-Z_\$ \t\r\n]|[_\$ \t\r\n]|[a-zA-Z_\$]' --javascript-export nodejs", - "-t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.amd\.js/' --javascript-export amd", - "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2", - "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2", - "-t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.xml -m KeyRow=2", - "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2", - "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2", - "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade --disable-excel-formular", - "-t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n '/(?i)\.bin$/\.json/' --pretty 2 --disable-excel-formular", - "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n '/(?i)\.bin$/\.lua/' --pretty 2 --disable-excel-formular", - "-t lua -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.lua", - "-t lua -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --lua-module ProtoOptions.Kind -i kind_option.mod.lua", - "-t js -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.js --javascript-export nodejs", - "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.bin -m KeyRow=2", - "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.lua -m KeyRow=2", - "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2", - "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2", - "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -c KindConst.json", - "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec", - "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|upgrade_10001|3,1' -m 'DataSource=$XLSX_FILE|upgrade_10002|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec", - "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-EnableDefaultLoader=false", - "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|upgrade_10001|3,1' -m 'DataSource=$XLSX_FILE|upgrade_10002|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec", - "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=EventCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-IncludeHeader=Engine/CompositeDataTable.h", - "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=EventCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-IncludeHeader=Engine/CompositeDataTable.h", - "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=keep_empty_list_cfg.lua -m KeyRow=2 --list-keep-empty", - "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=KeepEmptyListCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-keep-empty", - "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=KeepEmptyListCfg.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-keep-empty", - "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=keep_empty_list_cfg.bin -m KeyRow=2 --list-keep-empty", - "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=strip_list_tail_cfg.lua -m KeyRow=2 --list-strip-empty-tail", - "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=StripListTailCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-strip-empty-tail", - "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=StripListTailCfg.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-strip-empty-tail", - "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=strip_list_tail_cfg.bin -m KeyRow=2 --list-strip-empty-tail" - " -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m 'DataSource=$XLSX_FILE|process_by_script1|2,1' -m 'DataSource=$XLSX_FILE|process_by_script2|2,1' -m ProtoName=process_by_script -m OutputFile=process_by_script.json -m KeyRow=1 --pretty 2 --list-strip-empty-tail" - " -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m 'DataSource=$XLSX_FILE|process_by_script1|2,1' -m 'DataSource=$XLSX_FILE|process_by_script2|2,1' -m ProtoName=process_by_script -m OutputFile=process_by_script.bin -m KeyRow=1 --list-strip-empty-tail" - " -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m 'DataSource=$XLSX_FILE|process_by_script1|2,1' -m 'DataSource=$XLSX_FILE|process_by_script2|2,1' -m ProtoName=process_by_script -m OutputFile=process_by_script.lua -m KeyRow=1 --pretty 2 --list-strip-empty-tail" - " -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|nest_alias|3,1' -m ProtoName=outer_alias_message -m OutputFile=next_alias.bin -m KeyRow=2 --require-mapping-all --list-keep-empty --enable-alias-mapping" - " -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|nest_alias|3,1' -m ProtoName=outer_alias_message -m OutputFile=next_alias.lua -m KeyRow=2 --pretty 2 --require-mapping-all --list-keep-empty --enable-alias-mapping" + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind.desc.lua --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -r kind.desc.json --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.json/' --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.xml/' --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t msgpack -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.msgpack.bin/' --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.js/' --javascript-global sample.xresloader --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m 'DataSource=$XLSX_FILE|kind|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=role_cfg -m OutputFile=role_cfg.n.js -m KeyRow=2 -m KeyCase=lower -m KeyWordSplit=_ -m 'KeyWordRegex=[A-Z_\$ \t\r\n]|[_\$ \t\r\n]|[a-zA-Z_\$]' --javascript-export nodejs --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n '/(?i)\.bin$/\.amd\.js/' --javascript-export amd --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.xml -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade --disable-excel-formular --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n '/(?i)\.bin$/\.json/' --pretty 2 --disable-excel-formular --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n '/(?i)\.bin$/\.lua/' --pretty 2 --disable-excel-formular --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t lua -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.lua --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t lua -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --lua-module ProtoOptions.Kind -i kind_option.mod.lua --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t js -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.js --javascript-export nodejs --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.bin -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.lua -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -c KindConst.json --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|upgrade_10001|3,1' -m 'DataSource=$XLSX_FILE|upgrade_10002|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-EnableDefaultLoader=false --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|upgrade_10001|3,1' -m 'DataSource=$XLSX_FILE|upgrade_10002|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=EventCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-IncludeHeader=Engine/CompositeDataTable.h --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=EventCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-IncludeHeader=Engine/CompositeDataTable.h --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=keep_empty_list_cfg.lua -m KeyRow=2 --list-keep-empty --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=KeepEmptyListCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-keep-empty --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=KeepEmptyListCfg.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-keep-empty --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=keep_empty_list_cfg.bin -m KeyRow=2 --list-keep-empty --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=strip_list_tail_cfg.lua -m KeyRow=2 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=StripListTailCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=StripListTailCfg.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + "-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|keep_or_strip_empty_list|3,1' -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=strip_list_tail_cfg.bin -m KeyRow=2 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + " -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m 'DataSource=$XLSX_FILE|process_by_script1|2,1' -m 'DataSource=$XLSX_FILE|process_by_script2|2,1' -m ProtoName=process_by_script -m OutputFile=process_by_script.json -m KeyRow=1 --pretty 2 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + " -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m 'DataSource=$XLSX_FILE|process_by_script1|2,1' -m 'DataSource=$XLSX_FILE|process_by_script2|2,1' -m ProtoName=process_by_script -m OutputFile=process_by_script.bin -m KeyRow=1 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + " -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m 'DataSource=$XLSX_FILE|process_by_script1|2,1' -m 'DataSource=$XLSX_FILE|process_by_script2|2,1' -m ProtoName=process_by_script -m OutputFile=process_by_script.lua -m KeyRow=1 --pretty 2 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + " -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|nest_alias|3,1' -m ProtoName=outer_alias_message -m OutputFile=next_alias.bin -m KeyRow=2 --require-mapping-all --list-keep-empty --enable-alias-mapping --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'", + " -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m 'DataSource=$XLSX_FILE|nest_alias|3,1' -m ProtoName=outer_alias_message -m OutputFile=next_alias.lua -m KeyRow=2 --pretty 2 --require-mapping-all --list-keep-empty --enable-alias-mapping --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt'" ) Write-Output "Write-Output '$($TASK_LINES -join "`n")' | java `"-Dfile.encoding=UTF-8`" `"-Dlog4j.appender.console.encoding=UTF-8`" -client -jar `"$XRESLOADER`" --stdin --data-version 1.0.0.0" $TASK_LINES -join "`n" | java "-Dfile.encoding=UTF-8" "-Dlog4j.appender.console.encoding=UTF-8" -client -jar "$XRESLOADER" --stdin --data-version 1.0.0.0 diff --git a/sample/gen_sample_output.sh b/sample/gen_sample_output.sh index 9088d2c1..6b23cf19 100755 --- a/sample/gen_sample_output.sh +++ b/sample/gen_sample_output.sh @@ -26,49 +26,49 @@ for proto_dir in proto_v2 proto_v3; do java -client -jar "$XRESLOADER" -t lua -p protobuf -o $proto_dir -f $proto_dir/kind.pb --lua-module ProtoData.Kind -s $XLSX_FILE -m scheme_kind -n "/(?i)\.bin\$/_module\.lua/" --data-version 1.0.0.0 echo "Generate sample data for $proto_dir, batchmode using --stdin" CMDS=' - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind.desc.lua - -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind.desc.json - -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.json/" - -t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.xml/" - -t msgpack -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.msgpack.bin/" - -t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.js/" --javascript-global sample.xresloader - -t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|kind|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_cfg -m OutputFile=role_cfg.n.js -m KeyRow=2 -m KeyCase=lower -m KeyWordSplit=_ -m "KeyWordRegex=[A-Z_\$ \t]|[_\$ \t]|[a-zA-Z_\$]" --javascript-export nodejs - -t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.amd\.js/" --javascript-export amd - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2 - -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2 - -t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.xml -m KeyRow=2 - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2 - -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2 - -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade --disable-excel-formular - -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n "/(?i)\.bin$/\.json/" --pretty 2 --disable-excel-formular - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n "/(?i)\.bin$/\.lua/" --pretty 2 --disable-excel-formular - -t lua -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.lua - -t lua -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --lua-module ProtoOptions.Kind -i kind_option.mod.lua - -t js -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.js --javascript-export nodejs - -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.bin -m KeyRow=2 - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.lua -m KeyRow=2 - -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2 - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2 - -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -c KindConst.json - -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec - -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|upgrade_10001|3,1 -m DataSource='$XLSX_FILE'|upgrade_10002|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec - -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-EnableDefaultLoader=false - -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|upgrade_10001|3,1 -m DataSource='$XLSX_FILE'|upgrade_10002|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec - -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=EventCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-IncludeHeader=Engine/CompositeDataTable.h - -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=EventCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-IncludeHeader=Engine/CompositeDataTable.h - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=keep_empty_list_cfg.lua -m KeyRow=2 --list-keep-empty - -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=KeepEmptyListCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-keep-empty - -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=KeepEmptyListCfg.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-keep-empty - -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=keep_empty_list_cfg.bin -m KeyRow=2 --list-keep-empty - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=strip_list_tail_cfg.lua -m KeyRow=2 --list-strip-empty-tail - -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=StripListTailCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-strip-empty-tail - -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=StripListTailCfg.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-strip-empty-tail - -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=strip_list_tail_cfg.bin -m KeyRow=2 --list-strip-empty-tail - -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m DataSource='$XLSX_FILE'|process_by_script1|2,1 -m DataSource='$XLSX_FILE'|process_by_script2|2,1 -m ProtoName=process_by_script -m OutputFile=process_by_script.json -m KeyRow=1 --pretty 2 --list-strip-empty-tail - -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m DataSource='$XLSX_FILE'|process_by_script1|2,1 -m DataSource='$XLSX_FILE'|process_by_script2|2,1 -m ProtoName=process_by_script -m OutputFile=process_by_script.bin -m KeyRow=1 --list-strip-empty-tail - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m DataSource='$XLSX_FILE'|process_by_script1|2,1 -m DataSource='$XLSX_FILE'|process_by_script2|2,1 -m ProtoName=process_by_script -m OutputFile=process_by_script.lua -m KeyRow=1 --pretty 2 --list-strip-empty-tail - -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|nest_alias|3,1 -m ProtoName=outer_alias_message -m OutputFile=next_alias.bin -m KeyRow=2 --require-mapping-all --list-keep-empty --enable-alias-mapping - -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|nest_alias|3,1 -m ProtoName=outer_alias_message -m OutputFile=next_alias.lua -m KeyRow=2 --pretty 2 --require-mapping-all --list-keep-empty --enable-alias-mapping + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind.desc.lua --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind.desc.json --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.json/" --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.xml/" --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t msgpack -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.msgpack.bin/" --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.js/" --javascript-global sample.xresloader --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|kind|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_cfg -m OutputFile=role_cfg.n.js -m KeyRow=2 -m KeyCase=lower -m KeyWordSplit=_ -m "KeyWordRegex=[A-Z_\$ \t]|[_\$ \t]|[a-zA-Z_\$]" --javascript-export nodejs --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t js -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.amd\.js/" --javascript-export amd --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.xml -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade --disable-excel-formular --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n "/(?i)\.bin$/\.json/" --pretty 2 --disable-excel-formular --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n "/(?i)\.bin$/\.lua/" --pretty 2 --disable-excel-formular --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.lua --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --lua-module ProtoOptions.Kind -i kind_option.mod.lua --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t js -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.js --javascript-export nodejs --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.bin -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.lua -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2 --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -c KindConst.json --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|upgrade_10001|3,1 -m DataSource='$XLSX_FILE'|upgrade_10002|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-EnableDefaultLoader=false --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|upgrade_10001|3,1 -m DataSource='$XLSX_FILE'|upgrade_10002|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=EventCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-IncludeHeader=Engine/CompositeDataTable.h --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=EventCfgRec.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec -m UeCfg-IncludeHeader=Engine/CompositeDataTable.h --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=keep_empty_list_cfg.lua -m KeyRow=2 --list-keep-empty --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=KeepEmptyListCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-keep-empty --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=KeepEmptyListCfg.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-keep-empty --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=keep_empty_list_cfg.bin -m KeyRow=2 --list-keep-empty --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=strip_list_tail_cfg.lua -m KeyRow=2 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=StripListTailCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t ue-csv -o '$proto_dir/csv' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=StripListTailCfg.csv -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|keep_or_strip_empty_list|3,1 -m ProtoName=keep_or_strip_empty_list_cfg -m OutputFile=strip_list_tail_cfg.bin -m KeyRow=2 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m DataSource='$XLSX_FILE'|process_by_script1|2,1 -m DataSource='$XLSX_FILE'|process_by_script2|2,1 -m ProtoName=process_by_script -m OutputFile=process_by_script.json -m KeyRow=1 --pretty 2 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m DataSource='$XLSX_FILE'|process_by_script1|2,1 -m DataSource='$XLSX_FILE'|process_by_script2|2,1 -m ProtoName=process_by_script -m OutputFile=process_by_script.bin -m KeyRow=1 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m CallbackScript=cb_script.js -m DataSource='$XLSX_FILE'|process_by_script1|2,1 -m DataSource='$XLSX_FILE'|process_by_script2|2,1 -m ProtoName=process_by_script -m OutputFile=process_by_script.lua -m KeyRow=1 --pretty 2 --list-strip-empty-tail --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|nest_alias|3,1 -m ProtoName=outer_alias_message -m OutputFile=next_alias.bin -m KeyRow=2 --require-mapping-all --list-keep-empty --enable-alias-mapping --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' + -t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|nest_alias|3,1 -m ProtoName=outer_alias_message -m OutputFile=next_alias.lua -m KeyRow=2 --pretty 2 --require-mapping-all --list-keep-empty --enable-alias-mapping --data-source-mapping-mode sha256 --data-source-mapping-file '$proto_dir/data_source_mapping.txt' ' echo "Run with --stdin: $CMDS" diff --git a/sample/proto_v2/arr_in_arr_cfg.bin b/sample/proto_v2/arr_in_arr_cfg.bin index f3f6a8187c256d0471deb60e5ac490adac8786c6..2e54aa4c14c87baf70d3f3a27303cbb71a2e0b05 100755 GIT binary patch delta 217 zcmWN{yG?^Z3;^11&MSG?+O(a0q zy?Rb6H!g7MW)#U8Y77oFBPAmP`=&AqL|zUZv2^mH8m`Fz?7}6%wFbH6pkbf_`q*ui RjcZRC7IUBk@%Puy=^u1TJAD8E delta 76 zcmey!{)CO0YZl`~=2&atkksN5g~Xzw_{_X`5S5&k9;MDD{$gv(vt1Kj>|OJ$chU1D XyPoXp)~m=Vt`OovDBY~Vc#;VKv%VnW diff --git a/sample/proto_v2/arr_in_arr_cfg.hidden.bin b/sample/proto_v2/arr_in_arr_cfg.hidden.bin index 09e91fec..d7c67ebc 100644 --- a/sample/proto_v2/arr_in_arr_cfg.hidden.bin +++ b/sample/proto_v2/arr_in_arr_cfg.hidden.bin @@ -1,8 +1,7 @@ - -2.19.11.0.0.0"Gsha256:960ff46566e477db8f731488949271a1c499ec9015122ce90bca4496872ac61a*Test arr_in_arr_cfgZ' -资源转换示例.xlsx -arr_in_arrN N N N*222: + +2.19.11.0.0.0"Gsha256:960ff46566e477db8f731488949271a1c499ec9015122ce90bca4496872ac61a*@b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425eaZ +@b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166@70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34N N N N*222: Map嵌套模式[0].value: Map嵌套模式[1].valueB aao112B 特殊:字符y122N N N N*22 :Map嵌套模式[0].value:Map嵌套模式[1].valueB diff --git a/sample/proto_v2/arr_in_arr_cfg.hidden.lua b/sample/proto_v2/arr_in_arr_cfg.hidden.lua index 5e75f6aa..b3486be4 100644 --- a/sample/proto_v2/arr_in_arr_cfg.hidden.lua +++ b/sample/proto_v2/arr_in_arr_cfg.hidden.lua @@ -6,12 +6,12 @@ return { data_source = { { count = 3, - file = "资源转换示例.xlsx", - sheet = "arr_in_arr", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34", }, }, data_ver = "1.0.0.0", - description = "Test arr_in_arr_cfg", + description = "b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425ea", hash_code = "sha256:b4d268d9a7b1a8cf6fc18489dd67c4a298408e7bffbde43c91d6ac2f47836601", xres_ver = "2.19.1", }, diff --git a/sample/proto_v2/arr_in_arr_cfg.lua b/sample/proto_v2/arr_in_arr_cfg.lua index 517a1b49..b05e3fd3 100755 --- a/sample/proto_v2/arr_in_arr_cfg.lua +++ b/sample/proto_v2/arr_in_arr_cfg.lua @@ -6,12 +6,12 @@ return { data_source = { { count = 3, - file = "资源转换示例.xlsx", - sheet = "arr_in_arr", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34", }, }, data_ver = "1.0.0.0", - description = "Test arr_in_arr_cfg", + description = "b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425ea", hash_code = "sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f", xres_ver = "2.19.1", }, diff --git a/sample/proto_v2/arr_in_arr_cfg.xml b/sample/proto_v2/arr_in_arr_cfg.xml index 66748b22..f231bbbc 100644 --- a/sample/proto_v2/arr_in_arr_cfg.xml +++ b/sample/proto_v2/arr_in_arr_cfg.xml @@ -6,11 +6,11 @@ 3 3 - 资源转换示例.xlsx - arr_in_arr + b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166 + 70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34 1.0.0.0 - Test arr_in_arr_cfg + b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425ea sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f 2.19.1 diff --git a/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h b/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h index 6efd18de..0b4c78c2 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h +++ b/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h @@ -21,7 +21,7 @@ struct FArrInArr : public FTableRowBase // This is a test name in array /** Field Type: STRING, Name: Name, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: IntArr, Index: 2. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h b/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h index 64703601..9b4af86a 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h @@ -24,7 +24,7 @@ struct FArrInArrCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; // This is a Key /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ diff --git a/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h b/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h index 6d712628..561bb3cd 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h @@ -24,6 +24,6 @@ struct FDep2Cfg : public FTableRowBase /** Field Type: STRING, Name: Level, Index: 2. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Level = TEXT(""); + FString Level; }; \ No newline at end of file diff --git a/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h b/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h index 95ce0b87..d3f8648a 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h @@ -26,7 +26,7 @@ struct FEventCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -38,11 +38,11 @@ struct FEventCfg : public FTableRowBase /** Field Type: oneof/union -> FString, Name: Reward, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Reward = TEXT(""); + FString Reward; /** Field Type: oneof/union -> FString, Name: UnlockType, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString UnlockType = TEXT(""); + FString UnlockType; /** Field Type: MESSAGE, Name: Rule, Index: 6. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -62,7 +62,7 @@ struct FEventCfg : public FTableRowBase /** Field Type: STRING, Name: Note, Index: 13. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Note = TEXT(""); + FString Note; /** Field Type: INT, Name: EnumType, Index: 14. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h b/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h index 8771d938..4da52add 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h +++ b/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h @@ -23,7 +23,7 @@ struct FEventRewardItem : public FTableRowBase // Start of fields /** Field Type: oneof/union -> FString, Name: Nested, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Nested = TEXT(""); + FString Nested; /** Field Type: INT, Name: ItemId, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -35,7 +35,7 @@ struct FEventRewardItem : public FTableRowBase /** Field Type: STRING, Name: NestedNote, Index: 11. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString NestedNote = TEXT(""); + FString NestedNote; /** Field Type: INT, Name: NestedEnumType, Index: 12. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h b/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h index 4e7e9de4..53746b06 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h +++ b/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h @@ -23,7 +23,7 @@ struct FEventRuleItem : public FTableRowBase // Start of fields /** Field Type: oneof/union -> FString, Name: Nested, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Nested = TEXT(""); + FString Nested; /** Field Type: INT, Name: RuleId, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -35,7 +35,7 @@ struct FEventRuleItem : public FTableRowBase /** Field Type: STRING, Name: NestedNote, Index: 11. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString NestedNote = TEXT(""); + FString NestedNote; /** Field Type: INT, Name: NestedEnumType, Index: 12. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h b/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h index 38b9d4e5..f2b9b3a8 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h @@ -21,7 +21,7 @@ struct FKeepOrStripEmptyListCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; // This is a Key /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ diff --git a/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h b/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h index 0e77d356..7515d283 100644 --- a/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h +++ b/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h @@ -21,7 +21,7 @@ struct FRoleUpgradeCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v2/data_source_mapping.txt b/sample/proto_v2/data_source_mapping.txt new file mode 100644 index 00000000..b77a70b7 --- /dev/null +++ b/sample/proto_v2/data_source_mapping.txt @@ -0,0 +1,13 @@ +22de63222e7669d86d3c05764562bad370b48bed5744d9b987b3c9c9969c5f2b keep_or_strip_empty_list +3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f Test role_upgrade_cfg with multi keys +5f8b0bbb40554bc961efac19277f262d34379203b8b5929e82bb4c46418f7b03 upgrade_10001 +65b9ffc26b9db836c8027373c0c9076a1de4c86c2dc3cb424813b4227a02451e process_by_script1 +68ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f kind +70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34 arr_in_arr +9ee5db50099f5abf0549d2c89f47e995bceb6dbd12066fdd3875911fad832d44 Test event_cfg with oneof fields +b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425ea Test arr_in_arr_cfg +b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166 资源转换示例.xlsx +def96413dedba45aaa6fb05b30ec91a7ac0cfadf824f6c8e37323250134e521d process_by_script2 +e12a7838113bb6c5f3dc4870002c1dd1399e0b63812a749c756e280a7d25bff7 test_oneof +e3be2e511dd722012bd2fb826fde32896d3966e31b698c01942203699e2f9bc8 upgrade_10002 +fea1727ebf0dc3a369193e2d07ebf3c9fb34c14439678ccd7540f313ec3e6b28 nest_alias diff --git a/sample/proto_v2/event_cfg.bin b/sample/proto_v2/event_cfg.bin index 559f920e222942fa32aaebb892b226389bc242e9..59a7ed6aed81fdf151f6442ce308b2115b6bcb87 100644 GIT binary patch delta 216 zcmWNKyKO@;3;>b5R4y|KKO!Y|uk{K6T!aW(6JO~X9!Q{C5j?sWV$B##(b~`7$K~`f%iOhCh>@(vDiKZ_ zEz!8Dk*dq=qoHB$kNWgUb?pj?s^4cKZOj9acW6m*tTs9T(8360vjo>IY_HksqDcd0 L4-&8H_vh;kRoOf< delta 88 zcmZ3&vV@tLYdPaY=2#DfkksN5h19atyps6jv~-2?%#sX+{JhlsG=;Rx)SQ&!D0MFJ p7h7AN?V9jn@0w@5i=Hpp^<-bSUPVrEg%DQ>P;)$3^<)jkKLF-eB})JR diff --git a/sample/proto_v2/event_cfg.hidden.bin b/sample/proto_v2/event_cfg.hidden.bin index a89c6f0aac83db8a08954fdcfdfa9d419ef8ed83..1b51fba2e120b5dc9afe038923159098eb5c1ca0 100644 GIT binary patch delta 216 zcmWNKyKzG?48Sgaoy$zZk4TB#YrTT+QivkCM!NK#!d@ohxVLKHfcNEn9M|XNas2$A zmMP%^U{*4{K$-=uVbyw?iLZ1G4i3yQ8}mTq9a>TxtBno-v@inMEWvdP+iSMEXwrb$ LgT$-)P;)$3^<)jkvj7~KCA FString, Name: Reward, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Reward = TEXT(""); + FString Reward; /** Field Type: oneof/union -> FString, Name: UnlockType, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString UnlockType = TEXT(""); + FString UnlockType; /** Field Type: MESSAGE, Name: Rule, Index: 6. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -62,7 +62,7 @@ struct FEventCfg : public FTableRowBase /** Field Type: STRING, Name: Note, Index: 13. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Note = TEXT(""); + FString Note; /** Field Type: INT, Name: EnumType, Index: 14. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v2/json/Public/ConfigRec/EventRewardItem.h b/sample/proto_v2/json/Public/ConfigRec/EventRewardItem.h index a4102ea6..b1c484b8 100644 --- a/sample/proto_v2/json/Public/ConfigRec/EventRewardItem.h +++ b/sample/proto_v2/json/Public/ConfigRec/EventRewardItem.h @@ -23,7 +23,7 @@ struct FEventRewardItem : public FTableRowBase // Start of fields /** Field Type: oneof/union -> FString, Name: Nested, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Nested = TEXT(""); + FString Nested; /** Field Type: INT, Name: ItemId, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -35,7 +35,7 @@ struct FEventRewardItem : public FTableRowBase /** Field Type: STRING, Name: NestedNote, Index: 11. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString NestedNote = TEXT(""); + FString NestedNote; /** Field Type: INT, Name: NestedEnumType, Index: 12. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v2/json/Public/ConfigRec/EventRuleItem.h b/sample/proto_v2/json/Public/ConfigRec/EventRuleItem.h index 9c253875..078a3b15 100644 --- a/sample/proto_v2/json/Public/ConfigRec/EventRuleItem.h +++ b/sample/proto_v2/json/Public/ConfigRec/EventRuleItem.h @@ -23,7 +23,7 @@ struct FEventRuleItem : public FTableRowBase // Start of fields /** Field Type: oneof/union -> FString, Name: Nested, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Nested = TEXT(""); + FString Nested; /** Field Type: INT, Name: RuleId, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -35,7 +35,7 @@ struct FEventRuleItem : public FTableRowBase /** Field Type: STRING, Name: NestedNote, Index: 11. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString NestedNote = TEXT(""); + FString NestedNote; /** Field Type: INT, Name: NestedEnumType, Index: 12. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v2/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h b/sample/proto_v2/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h index 38b9d4e5..f2b9b3a8 100644 --- a/sample/proto_v2/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h +++ b/sample/proto_v2/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h @@ -21,7 +21,7 @@ struct FKeepOrStripEmptyListCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; // This is a Key /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ diff --git a/sample/proto_v2/json/Public/ConfigRec/RoleUpgradeCfg.h b/sample/proto_v2/json/Public/ConfigRec/RoleUpgradeCfg.h index e0037c72..e77b1da6 100644 --- a/sample/proto_v2/json/Public/ConfigRec/RoleUpgradeCfg.h +++ b/sample/proto_v2/json/Public/ConfigRec/RoleUpgradeCfg.h @@ -21,7 +21,7 @@ struct FRoleUpgradeCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v2/keep_empty_list_cfg.bin b/sample/proto_v2/keep_empty_list_cfg.bin index 07cc3c4f2c4935774b3a0da50d34b801cc688d20..23e6481f3420f7ba9f590c6ba48de28f7e686f23 100644 GIT binary patch delta 150 zcmV~$yA8rX3;<9OkdRU`NzUJMmq{X>&-NO0^hhki4y?igOu&1;^XIax-{*4NAE$Nq zKFZvskO3Q*#w=z`>y*u~ia^A9Xs2c^dARuS0j08K6S?gGk%9n_Dq_(kaBi$ZEZ`$h ZH>d6ytVCgMT^*-Qv#Z$T0)M}b(;syPDVYEO delta 67 zcmV-J0KEUi1o8s{3X_onUNkid7wENw=DLvRy{zVqqUWT#YDd0%X4b9AxhUI8n!A3Xp7 diff --git a/sample/proto_v2/keep_empty_list_cfg.lua b/sample/proto_v2/keep_empty_list_cfg.lua index 27cd18de..bfd3fbcc 100644 --- a/sample/proto_v2/keep_empty_list_cfg.lua +++ b/sample/proto_v2/keep_empty_list_cfg.lua @@ -6,8 +6,8 @@ return { data_source = { { count = 4, - file = "资源转换示例.xlsx", - sheet = "keep_or_strip_empty_list", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "22de63222e7669d86d3c05764562bad370b48bed5744d9b987b3c9c9969c5f2b", }, }, data_ver = "1.0.0.0", diff --git a/sample/proto_v2/next_alias.bin b/sample/proto_v2/next_alias.bin index f03e070561934ff93444066e746b26247fd21a9e..459862a7b05ccb68e2e7a77152c94b2b3c0d5271 100644 GIT binary patch delta 149 zcmWm5u?+$-3;;lp2I)&CiS5LWyPpIpcI+W&p!)tdq+t)BJ?UQMUCQ=3%l&y=w%x`| zHRGg?1gNq+d#BLR0+ccvGFzWA8Yo1c#x`wY3fBPU+nzB&P{Oh+}Cj~J@} diff --git a/sample/proto_v2/next_alias.lua b/sample/proto_v2/next_alias.lua index 852b9acc..7b5001c0 100644 --- a/sample/proto_v2/next_alias.lua +++ b/sample/proto_v2/next_alias.lua @@ -6,8 +6,8 @@ return { data_source = { { count = 2, - file = "资源转换示例.xlsx", - sheet = "nest_alias", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "fea1727ebf0dc3a369193e2d07ebf3c9fb34c14439678ccd7540f313ec3e6b28", }, }, data_ver = "1.0.0.0", diff --git a/sample/proto_v2/process_by_script.bin b/sample/proto_v2/process_by_script.bin index dcc263cb..1ad642e1 100644 --- a/sample/proto_v2/process_by_script.bin +++ b/sample/proto_v2/process_by_script.bin @@ -1,9 +1,9 @@ - -2.19.11.0.0.0"Gsha256:61e311d737fbee8763ecc058018322b9dc17f25f809f407d62b96afaba6bb9c9Z/ -资源转换示例.xlsxprocess_by_script1 -Z/ -资源转换示例.xlsxprocess_by_script2 + +2.19.11.0.0.0"Gsha256:61e311d737fbee8763ecc058018322b9dc17f25f809f407d62b96afaba6bb9c9Z +@b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166@65b9ffc26b9db836c8027373c0c9076a1de4c86c2dc3cb424813b4227a02451e +Z +@b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166@def96413dedba45aaa6fb05b30ec91a7ac0cfadf824f6c8e37323250134e521d 9:1:1B [a]1B [b]2>9:2:2B diff --git a/sample/proto_v2/process_by_script.json b/sample/proto_v2/process_by_script.json index 174798e4..a0d913e4 100644 --- a/sample/proto_v2/process_by_script.json +++ b/sample/proto_v2/process_by_script.json @@ -4,13 +4,13 @@ "data_source": [ { "count": 10, - "file": "资源转换示例.xlsx", - "sheet": "process_by_script1" + "file": "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + "sheet": "65b9ffc26b9db836c8027373c0c9076a1de4c86c2dc3cb424813b4227a02451e" }, { "count": 10, - "file": "资源转换示例.xlsx", - "sheet": "process_by_script2" + "file": "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + "sheet": "def96413dedba45aaa6fb05b30ec91a7ac0cfadf824f6c8e37323250134e521d" } ], "data_ver": "1.0.0.0", diff --git a/sample/proto_v2/process_by_script.lua b/sample/proto_v2/process_by_script.lua index 7a59c1b6..911e0445 100644 --- a/sample/proto_v2/process_by_script.lua +++ b/sample/proto_v2/process_by_script.lua @@ -6,13 +6,13 @@ return { data_source = { { count = 10, - file = "资源转换示例.xlsx", - sheet = "process_by_script1", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "65b9ffc26b9db836c8027373c0c9076a1de4c86c2dc3cb424813b4227a02451e", }, { count = 10, - file = "资源转换示例.xlsx", - sheet = "process_by_script2", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "def96413dedba45aaa6fb05b30ec91a7ac0cfadf824f6c8e37323250134e521d", }, }, data_ver = "1.0.0.0", diff --git a/sample/proto_v2/role_cfg.amd.js b/sample/proto_v2/role_cfg.amd.js index f578ce39..b3f48ce6 100755 --- a/sample/proto_v2/role_cfg.amd.js +++ b/sample/proto_v2/role_cfg.amd.js @@ -7,8 +7,8 @@ define({ data_source : [ { count : 7, - file : "资源转换示例.xlsx", - sheet : "kind" + file : "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet : "68ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f" } ], data_ver : "1.0.0.0", diff --git a/sample/proto_v2/role_cfg.js b/sample/proto_v2/role_cfg.js index c788f962..839c2188 100755 --- a/sample/proto_v2/role_cfg.js +++ b/sample/proto_v2/role_cfg.js @@ -360,8 +360,8 @@ data_source : [ { count : 7, - file : "资源转换示例.xlsx", - sheet : "kind" + file : "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet : "68ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f" } ], data_ver : "1.0.0.0", diff --git a/sample/proto_v2/role_cfg.json b/sample/proto_v2/role_cfg.json index 64ec69cd..8d613cf4 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.19.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 +[{"count":7,"data_source":[{"count":7,"file":"b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166","sheet":"68ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f"}],"data_ver":"1.0.0.0","hash_code":"sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f","xres_ver":"2.19.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.msgpack.bin b/sample/proto_v2/role_cfg.msgpack.bin index e7c7f7c3e4c913822a4671c959fec84d84270b39..52580f17a447449f1385685f9231da7320710e7e 100755 GIT binary patch delta 150 zcmWN~I}rjw3;<98pa2|D?QZ@Z1`v_#B|{HA7BImKEfSD%J`ljQuX*3Y`}jOP)^n(r zMQ{NP=)+{0MFeSz*$t|2FbBCPcI!zV93DPOxMgR4-L9GU^~^f6i=g177)sa{QgRRh coStnftYBHnEvKU}HG*A36V=V2K9}GA4`?AQrT_o{ delta 46 zcmV+}0MY-b8^IcoDkHb(wS?xnkm$Xv=8dA~q`Kt3i!OL -
77资源转换示例.xlsxkind1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.19.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 +
77b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e16668ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.19.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_upgrade_cfg.bin b/sample/proto_v2/role_upgrade_cfg.bin index 1fecf5d19414368241516c83ef757caedc6b8ca8..e4f8cee9c6e9dd7098d0e249291cf1f48407ef36 100644 GIT binary patch delta 424 zcmb`DF-`?B3`DhB(JcIi2F^eg+p%MJ{~SmZabjO%B??L;&ce|+07P5?`q7)2_kQ<% z*^jUNV}ChcH=2~AnMo1XE<|HEw!~T*V-)Hr!81|KRbwPf0p=J{%4jZmIsQO6e-Y1b z+i_jxX}*BONPyPnNM;Jt8eo)JQN+17tzZz`UA%k8Y*GS5?ysEc#ocRRu0Bj4vJWt9 z>yF^0O3kp4tFxhnqMu$zl?s~83q3yl(~=+$3B(=Cip(sBmHNLbUy(lpyH9k2lU7sO;xD$gJli$l#ojf~dKW!kvg^sdZoP_};tC;NnDK@N1_p)_S`f7=L?|}e J{DqO56#$f&O9lV{ diff --git a/sample/proto_v2/role_upgrade_cfg.json b/sample/proto_v2/role_upgrade_cfg.json index fa5ddec9..ae097bfe 100755 --- a/sample/proto_v2/role_upgrade_cfg.json +++ b/sample/proto_v2/role_upgrade_cfg.json @@ -4,17 +4,17 @@ "data_source": [ { "count": 42, - "file": "资源转换示例.xlsx", - "sheet": "upgrade_10001" + "file": "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + "sheet": "5f8b0bbb40554bc961efac19277f262d34379203b8b5929e82bb4c46418f7b03" }, { "count": 60, - "file": "资源转换示例.xlsx", - "sheet": "upgrade_10002" + "file": "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + "sheet": "e3be2e511dd722012bd2fb826fde32896d3966e31b698c01942203699e2f9bc8" } ], "data_ver": "1.0.0.0", - "description": "Test role_upgrade_cfg with multi keys\r\nTest role_upgrade_cfg with multi keys", + "description": "3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f\r\n3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f", "hash_code": "sha256:e356806bc55be9cc8a6c701d4295989e0fc3887b368681bb9457b0e51df8f445", "xres_ver": "2.19.1" }, diff --git a/sample/proto_v2/role_upgrade_cfg.lua b/sample/proto_v2/role_upgrade_cfg.lua index 72626ad0..028c7d08 100755 --- a/sample/proto_v2/role_upgrade_cfg.lua +++ b/sample/proto_v2/role_upgrade_cfg.lua @@ -6,17 +6,17 @@ return { data_source = { { count = 42, - file = "资源转换示例.xlsx", - sheet = "upgrade_10001", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "5f8b0bbb40554bc961efac19277f262d34379203b8b5929e82bb4c46418f7b03", }, { count = 60, - file = "资源转换示例.xlsx", - sheet = "upgrade_10002", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "e3be2e511dd722012bd2fb826fde32896d3966e31b698c01942203699e2f9bc8", }, }, data_ver = "1.0.0.0", - description = "Test role_upgrade_cfg with multi keys\r\nTest role_upgrade_cfg with multi keys", + description = "3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f\r\n3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f", hash_code = "sha256:e356806bc55be9cc8a6c701d4295989e0fc3887b368681bb9457b0e51df8f445", xres_ver = "2.19.1", }, diff --git a/sample/proto_v2/strip_list_tail_cfg.bin b/sample/proto_v2/strip_list_tail_cfg.bin index df3145d06ffd35ca993ced19d231eeab12943a4c..7dcdc5be4751836790af2ec7b765319ac36c4a72 100644 GIT binary patch delta 150 zcmV~$yA1*{3;y*u~ia^A9Xs2c^dARuS0j08K6S?dFk%9n_Dq_(kaBi$ZEZ`$h ZH>d6ytVCgMT^*-Qv$NRb0)M}*hd*nkDS-e0 delta 47 zcmV+~0MP%u1nL6<3X_onUK}+F7wENw=DLvRy{zVqqUWT#^11umtJ8;`_b)J)f`l z)93l^{YYgHV^nVuPLFtaq1M8sGSQb0GvZB%p`@X^BYVqUjI-kP&MSG?+O(a0q zy?Rb6H!g7MW)#U8Y77oFBPAmP`=&AqL|zUZv2^mH8m`Fz?7}6%wFbH6pkbf_`q*ui RjcZRC7IUBk@%Puy=^ttyJ8J*{ delta 76 zcmaFOevgfrYZl`~=2&atkksN5g~Xzw_{_X`5S5&k9;MDD{$gv(vt1Kj>|OJ$chU1D XyPoXp)~m=Vt`OovDBY~Vc$f(Qur46b diff --git a/sample/proto_v3/arr_in_arr_cfg.hidden.bin b/sample/proto_v3/arr_in_arr_cfg.hidden.bin index 38182136..dfdef504 100644 --- a/sample/proto_v3/arr_in_arr_cfg.hidden.bin +++ b/sample/proto_v3/arr_in_arr_cfg.hidden.bin @@ -1,8 +1,7 @@ - -2.19.11.0.0.0"Gsha256:bc5118693da3a47c87e3dfaa4c5942fb7a5ba6865b8184f4a5f106fd603733dc*Test arr_in_arr_cfgZ' -资源转换示例.xlsx -arr_in_arrN"NNN*222: + +2.19.11.0.0.0"Gsha256:bc5118693da3a47c87e3dfaa4c5942fb7a5ba6865b8184f4a5f106fd603733dc*@b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425eaZ +@b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166@70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34N"NNN*222: Map嵌套模式[0].value: Map嵌套模式[1].valueB aao112B 特殊:字符y122N"NNN*22 :Map嵌套模式[0].value:Map嵌套模式[1].valueB diff --git a/sample/proto_v3/arr_in_arr_cfg.hidden.lua b/sample/proto_v3/arr_in_arr_cfg.hidden.lua index 5e75f6aa..b3486be4 100644 --- a/sample/proto_v3/arr_in_arr_cfg.hidden.lua +++ b/sample/proto_v3/arr_in_arr_cfg.hidden.lua @@ -6,12 +6,12 @@ return { data_source = { { count = 3, - file = "资源转换示例.xlsx", - sheet = "arr_in_arr", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34", }, }, data_ver = "1.0.0.0", - description = "Test arr_in_arr_cfg", + description = "b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425ea", hash_code = "sha256:b4d268d9a7b1a8cf6fc18489dd67c4a298408e7bffbde43c91d6ac2f47836601", xres_ver = "2.19.1", }, diff --git a/sample/proto_v3/arr_in_arr_cfg.lua b/sample/proto_v3/arr_in_arr_cfg.lua index 517a1b49..b05e3fd3 100755 --- a/sample/proto_v3/arr_in_arr_cfg.lua +++ b/sample/proto_v3/arr_in_arr_cfg.lua @@ -6,12 +6,12 @@ return { data_source = { { count = 3, - file = "资源转换示例.xlsx", - sheet = "arr_in_arr", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34", }, }, data_ver = "1.0.0.0", - description = "Test arr_in_arr_cfg", + description = "b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425ea", hash_code = "sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f", xres_ver = "2.19.1", }, diff --git a/sample/proto_v3/arr_in_arr_cfg.xml b/sample/proto_v3/arr_in_arr_cfg.xml index 66748b22..f231bbbc 100644 --- a/sample/proto_v3/arr_in_arr_cfg.xml +++ b/sample/proto_v3/arr_in_arr_cfg.xml @@ -6,11 +6,11 @@ 3 3 - 资源转换示例.xlsx - arr_in_arr + b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166 + 70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34 1.0.0.0 - Test arr_in_arr_cfg + b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425ea sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f 2.19.1 diff --git a/sample/proto_v3/csv/Public/ConfigRec/ArrInArr.h b/sample/proto_v3/csv/Public/ConfigRec/ArrInArr.h index d253975d..4f67e43d 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/ArrInArr.h +++ b/sample/proto_v3/csv/Public/ConfigRec/ArrInArr.h @@ -26,11 +26,11 @@ struct FArrInArr : public FTableRowBase // This is a test name in array /** Field Type: STRING, Name: Name, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: oneof/union -> FString, Name: TestOnof, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString TestOnof = TEXT(""); + FString TestOnof; /** Field Type: INT, Name: IntArr, Index: 2. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/csv/Public/ConfigRec/ArrInArrCfg.h b/sample/proto_v3/csv/Public/ConfigRec/ArrInArrCfg.h index 64703601..9b4af86a 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/ArrInArrCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/ArrInArrCfg.h @@ -24,7 +24,7 @@ struct FArrInArrCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; // This is a Key /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ diff --git a/sample/proto_v3/csv/Public/ConfigRec/Dep2Cfg.h b/sample/proto_v3/csv/Public/ConfigRec/Dep2Cfg.h index 6d712628..561bb3cd 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/Dep2Cfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/Dep2Cfg.h @@ -24,6 +24,6 @@ struct FDep2Cfg : public FTableRowBase /** Field Type: STRING, Name: Level, Index: 2. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Level = TEXT(""); + FString Level; }; \ No newline at end of file diff --git a/sample/proto_v3/csv/Public/ConfigRec/DepCfg.h b/sample/proto_v3/csv/Public/ConfigRec/DepCfg.h index 79c0ab5d..526083ab 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/DepCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/DepCfg.h @@ -21,7 +21,7 @@ struct FDepCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 2. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h b/sample/proto_v3/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h index 38b9d4e5..f2b9b3a8 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h @@ -21,7 +21,7 @@ struct FKeepOrStripEmptyListCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; // This is a Key /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ diff --git a/sample/proto_v3/csv/Public/ConfigRec/RoleCfg.h b/sample/proto_v3/csv/Public/ConfigRec/RoleCfg.h index 4a74ec98..5d5c094b 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/RoleCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/RoleCfg.h @@ -23,7 +23,7 @@ struct FRoleCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 5. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -51,7 +51,7 @@ struct FRoleCfg : public FTableRowBase /** Field Type: STRING, Name: IntAsString, Index: 12. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString IntAsString = TEXT(""); + FString IntAsString; /** Field Type: INT, Name: TestPlainEnumArray, Index: 13. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -63,7 +63,7 @@ struct FRoleCfg : public FTableRowBase /** Field Type: STRING, Name: OriginTimepointOne, Index: 22. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString OriginTimepointOne = TEXT(""); + FString OriginTimepointOne; /** Field Type: MESSAGE, Name: ConvertDurationOne, Index: 23. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -71,7 +71,7 @@ struct FRoleCfg : public FTableRowBase /** Field Type: STRING, Name: OriginDurationOne, Index: 24. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString OriginDurationOne = TEXT(""); + FString OriginDurationOne; /** Field Type: MESSAGE, Name: ConvertTimepointArr, Index: 25. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/csv/Public/ConfigRec/RoleUpgradeCfg.h b/sample/proto_v3/csv/Public/ConfigRec/RoleUpgradeCfg.h index 0e77d356..7515d283 100644 --- a/sample/proto_v3/csv/Public/ConfigRec/RoleUpgradeCfg.h +++ b/sample/proto_v3/csv/Public/ConfigRec/RoleUpgradeCfg.h @@ -21,7 +21,7 @@ struct FRoleUpgradeCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/csv/UnreaImportSettings.json b/sample/proto_v3/csv/UnreaImportSettings.json index 58e0b32a..88288fd5 100644 --- a/sample/proto_v3/csv/UnreaImportSettings.json +++ b/sample/proto_v3/csv/UnreaImportSettings.json @@ -27,10 +27,10 @@ "GroupName": "XResConfig", "DestinationPath": "ConfigRec", "FactoryName": "ReimportDataTableFactory", - "Filenames": ["D:\\workspace\\git\\github\\xresloader\\xresloader\\sample\\proto_v3\\csv\\StripListTailCfg.csv"], + "Filenames": ["D:\\workspace\\git\\github\\xresloader\\xresloader\\sample\\proto_v3\\csv\\EventCfgRec.csv"], "ImportSettings": { "ImportType": "ECSV_DataTable", - "ImportRowStruct": "KeepOrStripEmptyListCfg" + "ImportRowStruct": "EventCfg" }, "bSkipReadOnly": "true", "bReplaceExisting": "true" @@ -39,10 +39,10 @@ "GroupName": "XResConfig", "DestinationPath": "ConfigRec", "FactoryName": "ReimportDataTableFactory", - "Filenames": ["D:\\workspace\\git\\github\\xresloader\\xresloader\\sample\\proto_v3\\csv\\EventCfgRec.csv"], + "Filenames": ["D:\\workspace\\git\\github\\xresloader\\xresloader\\sample\\proto_v3\\csv\\StripListTailCfg.csv"], "ImportSettings": { "ImportType": "ECSV_DataTable", - "ImportRowStruct": "EventCfg" + "ImportRowStruct": "KeepOrStripEmptyListCfg" }, "bSkipReadOnly": "true", "bReplaceExisting": "true" diff --git a/sample/proto_v3/data_source_mapping.txt b/sample/proto_v3/data_source_mapping.txt new file mode 100644 index 00000000..b77a70b7 --- /dev/null +++ b/sample/proto_v3/data_source_mapping.txt @@ -0,0 +1,13 @@ +22de63222e7669d86d3c05764562bad370b48bed5744d9b987b3c9c9969c5f2b keep_or_strip_empty_list +3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f Test role_upgrade_cfg with multi keys +5f8b0bbb40554bc961efac19277f262d34379203b8b5929e82bb4c46418f7b03 upgrade_10001 +65b9ffc26b9db836c8027373c0c9076a1de4c86c2dc3cb424813b4227a02451e process_by_script1 +68ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f kind +70ac754c3e097b4114964e6a4ec0398b030817617166f8ebf2cd5608a5026a34 arr_in_arr +9ee5db50099f5abf0549d2c89f47e995bceb6dbd12066fdd3875911fad832d44 Test event_cfg with oneof fields +b741684279f664b9aa427c27ec2c76529c908834d322a737a7dfabfd6dc425ea Test arr_in_arr_cfg +b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166 资源转换示例.xlsx +def96413dedba45aaa6fb05b30ec91a7ac0cfadf824f6c8e37323250134e521d process_by_script2 +e12a7838113bb6c5f3dc4870002c1dd1399e0b63812a749c756e280a7d25bff7 test_oneof +e3be2e511dd722012bd2fb826fde32896d3966e31b698c01942203699e2f9bc8 upgrade_10002 +fea1727ebf0dc3a369193e2d07ebf3c9fb34c14439678ccd7540f313ec3e6b28 nest_alias diff --git a/sample/proto_v3/event_cfg.bin b/sample/proto_v3/event_cfg.bin index 559f920e222942fa32aaebb892b226389bc242e9..59a7ed6aed81fdf151f6442ce308b2115b6bcb87 100644 GIT binary patch delta 216 zcmWNKyKO@;3;>b5R4y|KKO!Y|uk{K6T!aW(6JO~X9!Q{C5j?sWV$B##(b~`7$K~`f%iOhCh>@(vDiKZ_ zEz!8Dk*dq=qoHB$kNWgUb?pj?s^4cKZOj9acW6m*tTs9T(8360vjo>IY_HksqDcd0 L4-&8H_vh;kRoOf< delta 88 zcmZ3&vV@tLYdPaY=2#DfkksN5h19atyps6jv~-2?%#sX+{JhlsG=;Rx)SQ&!D0MFJ p7h7AN?V9jn@0w@5i=Hpp^<-bSUPVrEg%DQ>P;)$3^<)jkKLF-eB})JR diff --git a/sample/proto_v3/event_cfg.hidden.bin b/sample/proto_v3/event_cfg.hidden.bin index a89c6f0aac83db8a08954fdcfdfa9d419ef8ed83..1b51fba2e120b5dc9afe038923159098eb5c1ca0 100644 GIT binary patch delta 216 zcmWNKyKzG?48Sgaoy$zZk4TB#YrTT+QivkCM!NK#!d@ohxVLKHfcNEn9M|XNas2$A zmMP%^U{*4{K$-=uVbyw?iLZ1G4i3yQ8}mTq9a>TxtBno-v@inMEWvdP+iSMEXwrb$ LgT$-)P;)$3^<)jkvj7~KCA FString, Name: TestOnof, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString TestOnof = TEXT(""); + FString TestOnof; /** Field Type: INT, Name: IntArr, Index: 2. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/json/Public/ConfigRec/ArrInArrCfg.h b/sample/proto_v3/json/Public/ConfigRec/ArrInArrCfg.h index e943c428..739ad475 100644 --- a/sample/proto_v3/json/Public/ConfigRec/ArrInArrCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/ArrInArrCfg.h @@ -24,7 +24,7 @@ struct FArrInArrCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; // This is a Key /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ diff --git a/sample/proto_v3/json/Public/ConfigRec/Dep2Cfg.h b/sample/proto_v3/json/Public/ConfigRec/Dep2Cfg.h index 56c156f3..250a9794 100644 --- a/sample/proto_v3/json/Public/ConfigRec/Dep2Cfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/Dep2Cfg.h @@ -24,6 +24,6 @@ struct FDep2Cfg : public FTableRowBase /** Field Type: STRING, Name: Level, Index: 2. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Level = TEXT(""); + FString Level; }; \ No newline at end of file diff --git a/sample/proto_v3/json/Public/ConfigRec/DepCfg.h b/sample/proto_v3/json/Public/ConfigRec/DepCfg.h index 5a2952d4..48939fe1 100644 --- a/sample/proto_v3/json/Public/ConfigRec/DepCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/DepCfg.h @@ -21,7 +21,7 @@ struct FDepCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 2. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/json/Public/ConfigRec/EventCfg.h b/sample/proto_v3/json/Public/ConfigRec/EventCfg.h index 8dec77bd..c9fe2f39 100644 --- a/sample/proto_v3/json/Public/ConfigRec/EventCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/EventCfg.h @@ -26,7 +26,7 @@ struct FEventCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -38,11 +38,11 @@ struct FEventCfg : public FTableRowBase /** Field Type: oneof/union -> FString, Name: Reward, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Reward = TEXT(""); + FString Reward; /** Field Type: oneof/union -> FString, Name: UnlockType, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString UnlockType = TEXT(""); + FString UnlockType; /** Field Type: MESSAGE, Name: Rule, Index: 6. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -62,7 +62,7 @@ struct FEventCfg : public FTableRowBase /** Field Type: STRING, Name: Note, Index: 13. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Note = TEXT(""); + FString Note; /** Field Type: INT, Name: EnumType, Index: 14. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/json/Public/ConfigRec/EventRewardItem.h b/sample/proto_v3/json/Public/ConfigRec/EventRewardItem.h index a4102ea6..b1c484b8 100644 --- a/sample/proto_v3/json/Public/ConfigRec/EventRewardItem.h +++ b/sample/proto_v3/json/Public/ConfigRec/EventRewardItem.h @@ -23,7 +23,7 @@ struct FEventRewardItem : public FTableRowBase // Start of fields /** Field Type: oneof/union -> FString, Name: Nested, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Nested = TEXT(""); + FString Nested; /** Field Type: INT, Name: ItemId, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -35,7 +35,7 @@ struct FEventRewardItem : public FTableRowBase /** Field Type: STRING, Name: NestedNote, Index: 11. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString NestedNote = TEXT(""); + FString NestedNote; /** Field Type: INT, Name: NestedEnumType, Index: 12. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/json/Public/ConfigRec/EventRuleItem.h b/sample/proto_v3/json/Public/ConfigRec/EventRuleItem.h index 9c253875..078a3b15 100644 --- a/sample/proto_v3/json/Public/ConfigRec/EventRuleItem.h +++ b/sample/proto_v3/json/Public/ConfigRec/EventRuleItem.h @@ -23,7 +23,7 @@ struct FEventRuleItem : public FTableRowBase // Start of fields /** Field Type: oneof/union -> FString, Name: Nested, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString Nested = TEXT(""); + FString Nested; /** Field Type: INT, Name: RuleId, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -35,7 +35,7 @@ struct FEventRuleItem : public FTableRowBase /** Field Type: STRING, Name: NestedNote, Index: 11. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString NestedNote = TEXT(""); + FString NestedNote; /** Field Type: INT, Name: NestedEnumType, Index: 12. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h b/sample/proto_v3/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h index 38b9d4e5..f2b9b3a8 100644 --- a/sample/proto_v3/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/KeepOrStripEmptyListCfg.h @@ -21,7 +21,7 @@ struct FKeepOrStripEmptyListCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; // This is a Key /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ diff --git a/sample/proto_v3/json/Public/ConfigRec/RoleCfg.h b/sample/proto_v3/json/Public/ConfigRec/RoleCfg.h index afb01d62..ca90e7cc 100644 --- a/sample/proto_v3/json/Public/ConfigRec/RoleCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/RoleCfg.h @@ -23,7 +23,7 @@ struct FRoleCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 5. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -51,7 +51,7 @@ struct FRoleCfg : public FTableRowBase /** Field Type: STRING, Name: IntAsString, Index: 12. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString IntAsString = TEXT(""); + FString IntAsString; /** Field Type: INT, Name: TestPlainEnumArray, Index: 13. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -63,7 +63,7 @@ struct FRoleCfg : public FTableRowBase /** Field Type: STRING, Name: OriginTimepointOne, Index: 22. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString OriginTimepointOne = TEXT(""); + FString OriginTimepointOne; /** Field Type: MESSAGE, Name: ConvertDurationOne, Index: 23. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") @@ -71,7 +71,7 @@ struct FRoleCfg : public FTableRowBase /** Field Type: STRING, Name: OriginDurationOne, Index: 24. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FString OriginDurationOne = TEXT(""); + FString OriginDurationOne; /** Field Type: MESSAGE, Name: ConvertTimepointArr, Index: 25. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/json/Public/ConfigRec/RoleUpgradeCfg.h b/sample/proto_v3/json/Public/ConfigRec/RoleUpgradeCfg.h index e0037c72..e77b1da6 100644 --- a/sample/proto_v3/json/Public/ConfigRec/RoleUpgradeCfg.h +++ b/sample/proto_v3/json/Public/ConfigRec/RoleUpgradeCfg.h @@ -21,7 +21,7 @@ struct FRoleUpgradeCfg : public FTableRowBase // Start of fields /** Field Type: STRING, Name: Name, Index: 0. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") - FName Name = TEXT(""); + FName Name; /** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/ UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig") diff --git a/sample/proto_v3/keep_empty_list_cfg.bin b/sample/proto_v3/keep_empty_list_cfg.bin index d325626e3d62a4c359967402f739121ea4c7640e..04d4220ebff1077dc5bd0fd014bbf20e7cb46566 100644 GIT binary patch delta 150 zcmV~$yA1*{3;y*u~ia^A9Xs2c^dARuS0j08K6S?dFk%9n_Dq_(kaBi$ZEZ`$h ZH>d6ytVCgMT^*-Qv$NRb0)M}*hd*nkDS-e0 delta 47 zcmV+~0MP%u1nL6<3X_onUK}+F7wENw=DLvRy{zVqqUWT#D+s|OpqDU#%WKw@A6*P?Q^b=*RgE7 z^^t1ENeu~5WqP(op}htuWmaUiHl$Zjh&GIE*uWGn0nGP3V}PK9WtmQcSg#j2%b&+uOzZnkz diff --git a/sample/proto_v3/next_alias.lua b/sample/proto_v3/next_alias.lua index 852b9acc..7b5001c0 100644 --- a/sample/proto_v3/next_alias.lua +++ b/sample/proto_v3/next_alias.lua @@ -6,8 +6,8 @@ return { data_source = { { count = 2, - file = "资源转换示例.xlsx", - sheet = "nest_alias", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "fea1727ebf0dc3a369193e2d07ebf3c9fb34c14439678ccd7540f313ec3e6b28", }, }, data_ver = "1.0.0.0", diff --git a/sample/proto_v3/process_by_script.bin b/sample/proto_v3/process_by_script.bin index 77e13597..8d5c4410 100644 --- a/sample/proto_v3/process_by_script.bin +++ b/sample/proto_v3/process_by_script.bin @@ -1,9 +1,9 @@ - -2.19.11.0.0.0"Gsha256:e7e3d54a300a251f9b6a33886083711d5bcbff18988c9109db959d3d3e89a939Z/ -资源转换示例.xlsxprocess_by_script1 -Z/ -资源转换示例.xlsxprocess_by_script2 + +2.19.11.0.0.0"Gsha256:e7e3d54a300a251f9b6a33886083711d5bcbff18988c9109db959d3d3e89a939Z +@b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166@65b9ffc26b9db836c8027373c0c9076a1de4c86c2dc3cb424813b4227a02451e +Z +@b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166@def96413dedba45aaa6fb05b30ec91a7ac0cfadf824f6c8e37323250134e521d _2022-12-2 00:11:22.456" :1:1B [a]1B [b]2>U2022-12-2 00:11:22":2:2B diff --git a/sample/proto_v3/process_by_script.json b/sample/proto_v3/process_by_script.json index de609fbb..51427ea5 100644 --- a/sample/proto_v3/process_by_script.json +++ b/sample/proto_v3/process_by_script.json @@ -4,13 +4,13 @@ "data_source": [ { "count": 10, - "file": "资源转换示例.xlsx", - "sheet": "process_by_script1" + "file": "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + "sheet": "65b9ffc26b9db836c8027373c0c9076a1de4c86c2dc3cb424813b4227a02451e" }, { "count": 10, - "file": "资源转换示例.xlsx", - "sheet": "process_by_script2" + "file": "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + "sheet": "def96413dedba45aaa6fb05b30ec91a7ac0cfadf824f6c8e37323250134e521d" } ], "data_ver": "1.0.0.0", diff --git a/sample/proto_v3/process_by_script.lua b/sample/proto_v3/process_by_script.lua index 3f996c39..2ca46156 100644 --- a/sample/proto_v3/process_by_script.lua +++ b/sample/proto_v3/process_by_script.lua @@ -6,13 +6,13 @@ return { data_source = { { count = 10, - file = "资源转换示例.xlsx", - sheet = "process_by_script1", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "65b9ffc26b9db836c8027373c0c9076a1de4c86c2dc3cb424813b4227a02451e", }, { count = 10, - file = "资源转换示例.xlsx", - sheet = "process_by_script2", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "def96413dedba45aaa6fb05b30ec91a7ac0cfadf824f6c8e37323250134e521d", }, }, data_ver = "1.0.0.0", diff --git a/sample/proto_v3/role_cfg.amd.js b/sample/proto_v3/role_cfg.amd.js index f578ce39..b3f48ce6 100755 --- a/sample/proto_v3/role_cfg.amd.js +++ b/sample/proto_v3/role_cfg.amd.js @@ -7,8 +7,8 @@ define({ data_source : [ { count : 7, - file : "资源转换示例.xlsx", - sheet : "kind" + file : "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet : "68ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f" } ], data_ver : "1.0.0.0", diff --git a/sample/proto_v3/role_cfg.js b/sample/proto_v3/role_cfg.js index c788f962..839c2188 100755 --- a/sample/proto_v3/role_cfg.js +++ b/sample/proto_v3/role_cfg.js @@ -360,8 +360,8 @@ data_source : [ { count : 7, - file : "资源转换示例.xlsx", - sheet : "kind" + file : "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet : "68ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f" } ], data_ver : "1.0.0.0", diff --git a/sample/proto_v3/role_cfg.json b/sample/proto_v3/role_cfg.json index 64ec69cd..8d613cf4 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.19.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 +[{"count":7,"data_source":[{"count":7,"file":"b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166","sheet":"68ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f"}],"data_ver":"1.0.0.0","hash_code":"sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f","xres_ver":"2.19.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.msgpack.bin b/sample/proto_v3/role_cfg.msgpack.bin index e7c7f7c3e4c913822a4671c959fec84d84270b39..52580f17a447449f1385685f9231da7320710e7e 100755 GIT binary patch delta 150 zcmWN~I}rjw3;<98pa2|D?QZ@Z1`v_#B|{HA7BImKEfSD%J`ljQuX*3Y`}jOP)^n(r zMQ{NP=)+{0MFeSz*$t|2FbBCPcI!zV93DPOxMgR4-L9GU^~^f6i=g177)sa{QgRRh coStnftYBHnEvKU}HG*A36V=V2K9}GA4`?AQrT_o{ delta 46 zcmV+}0MY-b8^IcoDkHb(wS?xnkm$Xv=8dA~q`Kt3i!OL -
77资源转换示例.xlsxkind1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.19.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 +
77b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e16668ce177474c5b28540d585a37734cae0bb69f3ddfa9eca4765053049788fa93f1.0.0.0sha256:eeaf27d61a221566a4129cce5f868e1d929d571f6ad2859de106242f0acc820f2.19.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_upgrade_cfg.bin b/sample/proto_v3/role_upgrade_cfg.bin index 997582e4..9980dca9 100644 --- a/sample/proto_v3/role_upgrade_cfg.bin +++ b/sample/proto_v3/role_upgrade_cfg.bin @@ -1,9 +1,9 @@ - -2.19.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 + +2.19.11.0.0.0f"Gsha256:bbf8dcdce30a89f9c7fbb31163c4821ab84d36954758b06c2969dd0217db951c*3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f +3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6fZ +@b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166@5f8b0bbb40554bc961efac19277f262d34379203b8b5929e82bb4c46418f7b03*Z +@b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166@e3be2e511dd722012bd2fb826fde32896d3966e31b698c01942203699e2f9bc8<N NN 2 NN d NN  NN  NN  NN  NN  N N  N N  N N  N N  N N  NN  NN  NN  NN  NN  NN  NN  NN  NN  NN  NN  NN  NN  NN diff --git a/sample/proto_v3/role_upgrade_cfg.json b/sample/proto_v3/role_upgrade_cfg.json index fa5ddec9..ae097bfe 100755 --- a/sample/proto_v3/role_upgrade_cfg.json +++ b/sample/proto_v3/role_upgrade_cfg.json @@ -4,17 +4,17 @@ "data_source": [ { "count": 42, - "file": "资源转换示例.xlsx", - "sheet": "upgrade_10001" + "file": "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + "sheet": "5f8b0bbb40554bc961efac19277f262d34379203b8b5929e82bb4c46418f7b03" }, { "count": 60, - "file": "资源转换示例.xlsx", - "sheet": "upgrade_10002" + "file": "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + "sheet": "e3be2e511dd722012bd2fb826fde32896d3966e31b698c01942203699e2f9bc8" } ], "data_ver": "1.0.0.0", - "description": "Test role_upgrade_cfg with multi keys\r\nTest role_upgrade_cfg with multi keys", + "description": "3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f\r\n3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f", "hash_code": "sha256:e356806bc55be9cc8a6c701d4295989e0fc3887b368681bb9457b0e51df8f445", "xres_ver": "2.19.1" }, diff --git a/sample/proto_v3/role_upgrade_cfg.lua b/sample/proto_v3/role_upgrade_cfg.lua index 72626ad0..028c7d08 100755 --- a/sample/proto_v3/role_upgrade_cfg.lua +++ b/sample/proto_v3/role_upgrade_cfg.lua @@ -6,17 +6,17 @@ return { data_source = { { count = 42, - file = "资源转换示例.xlsx", - sheet = "upgrade_10001", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "5f8b0bbb40554bc961efac19277f262d34379203b8b5929e82bb4c46418f7b03", }, { count = 60, - file = "资源转换示例.xlsx", - sheet = "upgrade_10002", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "e3be2e511dd722012bd2fb826fde32896d3966e31b698c01942203699e2f9bc8", }, }, data_ver = "1.0.0.0", - description = "Test role_upgrade_cfg with multi keys\r\nTest role_upgrade_cfg with multi keys", + description = "3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f\r\n3d3fc799606b8a633ccb27f240752e03a26e5df289b88ecf1d6155ece00c7b6f", hash_code = "sha256:e356806bc55be9cc8a6c701d4295989e0fc3887b368681bb9457b0e51df8f445", xres_ver = "2.19.1", }, diff --git a/sample/proto_v3/strip_list_tail_cfg.bin b/sample/proto_v3/strip_list_tail_cfg.bin index f7c0478ed54f10a42d5a4200d3dbd1f45a89e18f..fd7ed180ce8f109c3aa0e99ac83b6a6ad426a7d4 100644 GIT binary patch delta 150 zcmV~$yA1*{3;?}69z~8Uy;SXeYDd0%X4b9AxhPyr-g9}@ro diff --git a/sample/proto_v3/strip_list_tail_cfg.lua b/sample/proto_v3/strip_list_tail_cfg.lua index 08e00de0..f325f383 100644 --- a/sample/proto_v3/strip_list_tail_cfg.lua +++ b/sample/proto_v3/strip_list_tail_cfg.lua @@ -6,8 +6,8 @@ return { data_source = { { count = 4, - file = "资源转换示例.xlsx", - sheet = "keep_or_strip_empty_list", + file = "b8af9bb6f35231297dcf553e984e193ff4266b5a784191e5ab6baba2f760e166", + sheet = "22de63222e7669d86d3c05764562bad370b48bed5744d9b987b3c9c9969c5f2b", }, }, data_ver = "1.0.0.0", diff --git a/src/org/xresloader/core/ProgramOptions.java b/src/org/xresloader/core/ProgramOptions.java index a726e028..21ae7474 100644 --- a/src/org/xresloader/core/ProgramOptions.java +++ b/src/org/xresloader/core/ProgramOptions.java @@ -1,15 +1,26 @@ package org.xresloader.core; import org.apache.commons.cli.*; +import org.apache.commons.codec.binary.Hex; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; +import java.util.HashMap; import java.util.Properties; +import java.util.Scanner; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -32,6 +43,9 @@ public class RenameRule { private static Options options = null; private static String version = null; private static Properties properties = null; + private static String dataSourceMappingFile = ""; + private static HashMap dataSourceMappingResult = new HashMap(); + private static String dataSourceMappingHashSeed = "xresloader"; private String defaultDataVersion = null; private String dataVersion = null; @@ -68,6 +82,7 @@ public class RenameRule { public String javascriptExport = null; public String javascriptGlobalVar = ""; public int tolerateContinueEmptyRows = 100000; + public DataSourceMappingType dataSourceMappingType = DataSourceMappingType.NONE; private ProgramOptions() { dataSourceMetas = new String[] {}; @@ -127,6 +142,8 @@ public void reset() { javascriptGlobalVar = ""; tolerateContinueEmptyRows = 100000; + dataSourceMappingType = DataSourceMappingType.NONE; + dataVersion = null; } @@ -246,6 +263,17 @@ private static synchronized Options get_options_group() { options.addOption(Option.builder().longOpt("tolerate-max-empty-rows") .desc("set max continue empty rows").hasArg().argName("NUMBER").build()); + options.addOption(Option.builder().longOpt("data-source-mapping-file") + .desc("set where to store data source mapping result").hasArg().argName("FILE PATH").build()); + + options.addOption(Option.builder().longOpt("data-source-mapping-mode") + .desc("set where to store data source mapping mode(none, md5, sha1, sha256)").hasArg() + .argName("ALGORITHM").build()); + + options.addOption(Option.builder().longOpt("data-source-mapping-seed") + .desc("set data source mapping seed").hasArg() + .argName("SEED").build()); + return options; } @@ -389,6 +417,34 @@ public int init(String[] args) { if (cmd.hasOption("tolerate-max-empty-rows")) { tolerateContinueEmptyRows = Integer.parseInt(cmd.getOptionValue("tolerate-max-empty-rows", "100000")); } + if (cmd.hasOption("data-source-mapping-file")) { + String filePath = cmd.getOptionValue("data-source-mapping-file", ""); + if (!filePath.isEmpty()) { + synchronized (dataSourceMappingFile) { + dataSourceMappingFile = filePath; + } + } + } + if (cmd.hasOption("data-source-mapping-mode")) { + String mode = cmd.getOptionValue("data-source-mapping-mode", "none"); + if (mode.equalsIgnoreCase("md5")) { + dataSourceMappingType = DataSourceMappingType.MD5; + } else if (mode.equalsIgnoreCase("sha1")) { + dataSourceMappingType = DataSourceMappingType.SHA1; + } else if (mode.equalsIgnoreCase("sha256")) { + dataSourceMappingType = DataSourceMappingType.SHA256; + } else if (mode.equalsIgnoreCase("none") || mode.isEmpty()) { + dataSourceMappingType = DataSourceMappingType.NONE; + } else { + ProgramOptions.getLoger().warn("Unknown --data-source-mapping-mode %s.", mode); + dataSourceMappingType = DataSourceMappingType.NONE; + } + } + if (cmd.hasOption("data-source-mapping-seed")) { + synchronized (dataSourceMappingHashSeed) { + dataSourceMappingHashSeed = cmd.getOptionValue("data-source-mapping-seed", "xresloader"); + } + } // pretty print prettyIndent = Integer.parseInt(cmd.getOptionValue("pretty", "0")); @@ -557,6 +613,54 @@ public String getDefaultDataVersion() { return defaultDataVersion; } + public String getDataSourceMapping(String input, boolean pathMode) { + if (DataSourceMappingType.NONE == dataSourceMappingType) { + return input; + } + + if (null == input) { + return input; + } + + if (input.isEmpty()) { + return input; + } + + if (pathMode) { + input = input.replaceAll("\\\\", "/"); + } + + synchronized (dataSourceMappingResult) { + if (dataSourceMappingResult.containsKey(input)) { + return dataSourceMappingResult.get(input); + } + + MessageDigest hasher = null; + try { + if (DataSourceMappingType.MD5 == dataSourceMappingType) { + hasher = MessageDigest.getInstance("MD5"); + } else if (DataSourceMappingType.SHA1 == dataSourceMappingType) { + hasher = MessageDigest.getInstance("SHA-1"); + } else { + hasher = MessageDigest.getInstance("SHA-256"); + } + + synchronized (dataSourceMappingHashSeed) { + if (dataSourceMappingHashSeed != null && !dataSourceMappingHashSeed.equals(input)) { + hasher.update(dataSourceMappingHashSeed.getBytes()); + } + } + hasher.update(input.getBytes(Charset.forName("UTF-8"))); + String result = Hex.encodeHexString(hasher.digest()); + dataSourceMappingResult.put(result, input); + return result; + } catch (NoSuchAlgorithmException e) { + ProgramOptions.getLoger().error("%s", e.getMessage()); + return input; + } + } + } + public enum FileType { BIN, LUA, MSGPACK, JSON, XML, INI, EXCEL, JAVASCRIPT, UECSV, UEJSON } @@ -573,6 +677,10 @@ public enum ListStripRule { STRIP_EMPTY_ALL, STRIP_EMPTY_TAIL, KEEP_ALL, } + public enum DataSourceMappingType { + NONE, MD5, SHA1, SHA256 + } + static public synchronized Logger getLoger() { if (null != logger) { return logger; @@ -606,4 +714,113 @@ static public String getEndl() { return endl; } + + static public int dumpDataSourceMapping() { + int ret = 0; + OutputStream out = null; + File file = null; + synchronized (dataSourceMappingFile) { + if (dataSourceMappingFile.isEmpty()) { + return ret; + } + file = new File(dataSourceMappingFile); + } + + Charset utf8 = Charset.forName("UTF-8"); + + HashMap dataSourceMappingOrigin = new HashMap(); + if (file.exists()) { + try { + InputStream in = new FileInputStream(file); + Scanner s = new Scanner(in, utf8); + while (s.hasNextLine()) { + String line = s.nextLine(); + String[] parts = line.split("\\s+", 2); + if (parts.length < 2) { + continue; + } + if (parts[0].isEmpty()) { + continue; + } + + dataSourceMappingOrigin.put(parts[0], parts[1]); + } + s.close(); + in.close(); + } catch (IOException e) { + ProgramOptions.getLoger().error("Load data source mapping file %s failed.\n%s", dataSourceMappingFile, + e.getMessage()); + ret += 1; + } + } + + try { + File dir = new File(file.getParent()); + if (!dir.exists()) { + dir.mkdirs(); + } + out = new FileOutputStream(file); + } catch (IOException e) { + ProgramOptions.getLoger().error("Open data source mapping file %s failed.\n%s", dataSourceMappingFile, + e.getMessage()); + ret += 1; + return ret; + } + + ArrayList keys = new ArrayList(); + + synchronized (dataSourceMappingResult) { + for (String key : dataSourceMappingResult.keySet()) { + if (null == key) { + continue; + } + if (key.isEmpty()) { + continue; + } + keys.add(key); + } + + for (String key : dataSourceMappingOrigin.keySet()) { + if (null == key) { + continue; + } + if (key.isEmpty()) { + continue; + } + if (!dataSourceMappingResult.containsKey(key)) { + keys.add(key); + } + } + + keys.sort((l, r) -> { + return l.compareTo(r); + }); + + for (String key : keys) { + try { + out.write(key.getBytes(utf8)); + out.write(" ".getBytes(utf8)); + if (dataSourceMappingResult.containsKey(key)) { + out.write(dataSourceMappingResult.get(key).getBytes(utf8)); + } else { + out.write(dataSourceMappingOrigin.get(key).getBytes(utf8)); + } + out.write(getEndl().getBytes()); + } catch (IOException e) { + ProgramOptions.getLoger().error("Write data source mapping %s failed.\n%s", key, e.getMessage()); + ret += 1; + } + } + } + + try { + out.close(); + } catch (IOException e) { + ProgramOptions.getLoger().error("Close data source mapping file %s failed.\n%s", + file.getAbsoluteFile().getPath(), + e.getMessage()); + ret += 1; + } + return ret; + } } diff --git a/src/org/xresloader/core/data/dst/DataDstJava.java b/src/org/xresloader/core/data/dst/DataDstJava.java index 9c2a60fa..aacd52c3 100644 --- a/src/org/xresloader/core/data/dst/DataDstJava.java +++ b/src/org/xresloader/core/data/dst/DataDstJava.java @@ -168,12 +168,17 @@ protected DataDstTableContent buildCurrentTable(DataDstImpl compiler, DataTableC } if (ret.descriptor.getMessageExtension().description != null) { - ret.description = ret.descriptor.getMessageExtension().description; + ret.description = ProgramOptions.getInstance() + .getDataSourceMapping(ret.descriptor.getMessageExtension().description, false); } ret.data_message_type = ret.descriptor.getFullName(); - ret.data_source.put("file", DataSrcImpl.getOurInstance().getCurrentFileName()); - ret.data_source.put("sheet", DataSrcImpl.getOurInstance().getCurrentTableName()); + ret.data_source.put("file", + ProgramOptions.getInstance().getDataSourceMapping(DataSrcImpl.getOurInstance().getCurrentFileName(), + true)); + ret.data_source.put("sheet", + ProgramOptions.getInstance().getDataSourceMapping(DataSrcImpl.getOurInstance().getCurrentTableName(), + false)); ret.data_source.put("count", ret.rows.size() - previousRowNum); return ret; diff --git a/src/org/xresloader/core/data/dst/DataDstPb.java b/src/org/xresloader/core/data/dst/DataDstPb.java index 75390cb1..262e7ad9 100644 --- a/src/org/xresloader/core/data/dst/DataDstPb.java +++ b/src/org/xresloader/core/data/dst/DataDstPb.java @@ -1385,14 +1385,18 @@ public final byte[] build(DataDstImpl src) throws ConvException { } if (desc.getMessageExtension().description != null) { - descriptionList.add(desc.getMessageExtension().description); + descriptionList + .add(ProgramOptions.getInstance().getDataSourceMapping(desc.getMessageExtension().description, + false)); } blocks.setDataMessageType(desc.getFullName()); PbHeaderV3.xresloader_data_source.Builder data_source = header.addDataSourceBuilder(); - data_source.setFile(DataSrcImpl.getOurInstance().getCurrentFileName()); - data_source.setSheet(DataSrcImpl.getOurInstance().getCurrentTableName()); + data_source.setFile(ProgramOptions.getInstance() + .getDataSourceMapping(DataSrcImpl.getOurInstance().getCurrentFileName(), true)); + data_source.setSheet(ProgramOptions.getInstance() + .getDataSourceMapping(DataSrcImpl.getOurInstance().getCurrentTableName(), false)); data_source.setCount(blocks.getDataBlockCount() - previousRowNum); } diff --git a/src/org/xresloader/core/main.java b/src/org/xresloader/core/main.java index 629d4bad..e57d2a1f 100644 --- a/src/org/xresloader/core/main.java +++ b/src/org/xresloader/core/main.java @@ -426,6 +426,7 @@ public static void main(String[] args) { } // 退出码为失败的任务个数，用以外部捕获转换失败 + ret_code += ProgramOptions.dumpDataSourceMapping(); if (ret_code > 255) { ret_code = 255; } diff --git a/tools/linux_x86_64/protoc b/tools/linux_x86_64/protoc index 8719e84f..455d2195 100755 --- a/tools/linux_x86_64/protoc +++ b/tools/linux_x86_64/protoc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e7743bf9799614e64a81e1cc6a136d4a3a217f3330ba735f555ce790e5ec998 -size 9410360 +oid sha256:c280b6c0bec0c30b1b6127ed7f53488971efadfb249d7776331b9d63bc78f917 +size 9424272 diff --git a/tools/macos_x86_64/protoc b/tools/macos_x86_64/protoc index 9d711091..c5200700 100644 --- a/tools/macos_x86_64/protoc +++ b/tools/macos_x86_64/protoc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86cf2731dac1e81863cad1cc9b97938a5691d808c36ab40e68cc2252e900893b -size 16509616 +oid sha256:290572d6661a1a63c14105ef6c3e80bc9d52262be9081a067321553fea85d7d4 +size 16527552 diff --git a/tools/windows_x86_64/protoc.exe b/tools/windows_x86_64/protoc.exe index 2ba04efc..8e80d6d8 100644 --- a/tools/windows_x86_64/protoc.exe +++ b/tools/windows_x86_64/protoc.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ca3b4e23cd541db147c81dc5cea8b82a0b0a8b4f5016e4d62148a704fdae7e7 -size 11748543 +oid sha256:7bf33e0b00a7bc1dc672a385ea0dae2f86cfd2a52adb97719b083d00a212adf6 +size 11759344