Skip to content

Commit

Permalink
v2.19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
owent committed Sep 10, 2024
1 parent 8997c01 commit 2d2f410
Show file tree
Hide file tree
Showing 175 changed files with 1,109 additions and 337 deletions.
148 changes: 75 additions & 73 deletions sample/cxx/v2/kind.pb.cc

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions sample/cxx/v2/kind.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

153 changes: 77 additions & 76 deletions sample/cxx/v3/kind.pb.cc

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions sample/cxx/v3/kind.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions sample/gen_sample_output.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ foreach ($proto_dir in "proto_v2", "proto_v3") {
"-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2",
"-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2",
"-t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.xml -m KeyRow=2",
"-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2",
"-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2",
"-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade --disable-excel-formular",
"-t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n '/(?i)\.bin$/\.json/' --pretty 2 --disable-excel-formular",
"-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n '/(?i)\.bin$/\.lua/' --pretty 2 --disable-excel-formular",
Expand All @@ -51,6 +53,8 @@ foreach ($proto_dir in "proto_v2", "proto_v3") {
"-t js -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.js --javascript-export nodejs",
"-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.bin -m KeyRow=2",
"-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.lua -m KeyRow=2",
"-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2",
"-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|test_oneof|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2",
"-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -c KindConst.json",
"-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|arr_in_arr|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec",
"-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m 'DataSource=$XLSX_FILE|upgrade_10001|3,1' -m 'DataSource=$XLSX_FILE|upgrade_10002|3,1' -m 'MacroSource=$XLSX_FILE|macro|2,1' -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec",
Expand Down
4 changes: 4 additions & 0 deletions sample/gen_sample_output.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ for proto_dir in proto_v2 proto_v3; do
-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2
-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2
-t xml -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.xml -m KeyRow=2
-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2
-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2
-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade --disable-excel-formular
-t json -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n "/(?i)\.bin$/\.json/" --pretty 2 --disable-excel-formular
-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' --validator-rules custom_validator.yaml -m scheme_upgrade -n "/(?i)\.bin$/\.lua/" --pretty 2 --disable-excel-formular
Expand All @@ -45,6 +47,8 @@ for proto_dir in proto_v2 proto_v3; do
-t js -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 -i kind_option.js --javascript-export nodejs
-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.bin -m KeyRow=2
-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.lua -m KeyRow=2
-t bin -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.bin --ignore-field-tags server_only -m KeyRow=2
-t lua -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' --pretty 2 --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|test_oneof|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=event_cfg -m OutputFile=event_cfg.hidden.lua --ignore-field-tags server_only -m KeyRow=2
-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' -c KindConst.json
-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=ArrInArrCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec
-t ue-json -o '$proto_dir/json' -f '$proto_dir/kind.pb' --validator-rules custom_validator.yaml -m DataSource='$XLSX_FILE'|upgrade_10001|3,1 -m DataSource='$XLSX_FILE'|upgrade_10002|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_upgrade_cfg -m OutputFile=RoleUpgradeCfg.json -m KeyRow=2 -m UeCfg-CodeOutput=|Public/ConfigRec|Private/ConfigRec
Expand Down
Binary file modified sample/proto_v2/arr_in_arr_cfg.bin
Binary file not shown.
12 changes: 12 additions & 0 deletions sample/proto_v2/arr_in_arr_cfg.hidden.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

�
2.19.01.0.0.0"Gsha256:960ff46566e477db8f731488949271a1c499ec9015122ce90bca4496872ac61a*Test arr_in_arr_cfgZ'
资源转换示例.xlsx
arr_in_arr��N �N �N �N*��2��2��2��:
Map嵌套模式[0].value: Map嵌套模式[1].valueB
aao112B
特殊:字符y122��N �N �N �N*����2��2�� :Map嵌套模式[0].value:Map嵌套模式[1].valueB
ba�212B
特殊.字符�222t�N �N �N �N*��2�� :Map嵌套模式[0].value:Map嵌套模式[1].valueB
ca�312B
cb�322arr_in_arr_cfg
Expand Down
127 changes: 127 additions & 0 deletions sample/proto_v2/arr_in_arr_cfg.hidden.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
-- this file is generated by xresloader, please don't edit it.

return {
[1] = {
count = 3,
data_source = {
{
count = 3,
file = "资源转换示例.xlsx",
sheet = "arr_in_arr",
},
},
data_ver = "1.0.0.0",
description = "Test arr_in_arr_cfg",
hash_code = "sha256:b4d268d9a7b1a8cf6fc18489dd67c4a298408e7bffbde43c91d6ac2f47836601",
xres_ver = "2.19.0",
},
[2] = "arr_in_arr_cfg",
arr_in_arr_cfg = {
{
arr = {
},
id = 10001,
test_map_is = {
[10] = "Map嵌套模式[0].value",
[11] = "Map嵌套模式[1].value",
},
test_map_sm = {
["aa"] = {
id = 111,
level = "112",
},
["特殊:字符"] = {
id = 121,
level = "122",
},
},
test_plain_enum_arr = {
10001,
10001,
10001,
},
test_plain_msg = {
test_id_1 = 1,
},
test_plain_msg_arr = {
{
test_id_1 = 1,
},
{
test_id_1 = 3,
},
{
test_id_1 = 5,
},
},
},
{
arr = {
},
id = 10002,
test_map_is = {
[20] = "Map嵌套模式[0].value",
[21] = "Map嵌套模式[1].value",
},
test_map_sm = {
["ba"] = {
id = 211,
level = "212",
},
["特殊.字符"] = {
id = 221,
level = "222",
},
},
test_plain_enum_arr = {
10101,
10101,
10101,
},
test_plain_msg = {
test_id_1 = 3,
test_id_3 = 5,
},
test_plain_msg_arr = {
{
test_id_1 = 7,
},
{
test_id_1 = 9,
},
},
},
{
arr = {
},
id = 10003,
test_map_is = {
[30] = "Map嵌套模式[0].value",
[31] = "Map嵌套模式[1].value",
},
test_map_sm = {
["ca"] = {
id = 311,
level = "312",
},
["cb"] = {
id = 321,
level = "322",
},
},
test_plain_enum_arr = {
10001,
10001,
10001,
},
test_plain_msg = {
test_id_1 = 6,
},
test_plain_msg_arr = {
{
test_id_1 = 11,
},
},
},
},
}
2 changes: 1 addition & 1 deletion sample/proto_v2/arr_in_arr_cfg.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ return {
data_ver = "1.0.0.0",
description = "Test arr_in_arr_cfg",
hash_code = "sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f",
xres_ver = "2.18.2",
xres_ver = "2.19.0",
},
[2] = "arr_in_arr_cfg",
arr_in_arr_cfg = {
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/arr_in_arr_cfg.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<data_ver>1.0.0.0</data_ver>
<description>Test arr_in_arr_cfg</description>
<hash_code>sha256:dd55e67e5c1312ca507fedd631c54b8c1266ab82859ed36bd535db90ac36a95f</hash_code>
<xres_ver>2.18.2</xres_ver>
<xres_ver>2.19.0</xres_ver>
</header>
<body mode="message">
<arr_in_arr_cfg for="0" mode="message">
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.18.2, please don't edit it.
* This file is generated by xresloader 2.19.0, please don't edit it.
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
*/
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/csv/Private/ConfigRec/ArrInArrCfg.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.18.2, please don't edit it.
* This file is generated by xresloader 2.19.0, please don't edit it.
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
*/
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/csv/Private/ConfigRec/Dep2Cfg.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.18.2, please don't edit it.
* This file is generated by xresloader 2.19.0, please don't edit it.
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
*/
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/csv/Private/ConfigRec/EventCfg.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.18.2, please don't edit it.
* This file is generated by xresloader 2.19.0, please don't edit it.
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
*/
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/csv/Private/ConfigRec/EventRewardItem.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.18.2, please don't edit it.
* This file is generated by xresloader 2.19.0, please don't edit it.
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
*/
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/csv/Private/ConfigRec/EventRuleItem.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.18.2, please don't edit it.
* This file is generated by xresloader 2.19.0, please don't edit it.
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.18.2, please don't edit it.
* This file is generated by xresloader 2.19.0, please don't edit it.
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
*/
Expand Down
Loading

0 comments on commit 2d2f410

Please sign in to comment.