Merge pull request #43 from owent/dev

Prepare v2.17.1
owent · Jul 16, 2024 · c746d94 · c746d94
2 parents d4783d6 + 0c814cf
commit c746d94
Show file tree

Hide file tree

Showing 145 changed files with 141 additions and 430 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,6 +2,11 @@
 
 ## Unrelease
 
+## 2.17.1
+
+1. 修复数组别名丢失字段映射的问题
+2. 修复文本模式输出跨分组转出数据没清理干净的问题
+
 ## 2.17.0
 
 1. 增加 `--disable-data-validator` 允许跳过数据验证。

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
  <groupId>org.xresloader</groupId>
  <artifactId>xresloader</artifactId>
- <version>2.17.0</version>
+ <version>2.17.1</version>
  <packaging>jar</packaging>
  <name>xresloader</name>
 

diff --git a/sample/proto_v2/arr_in_arr_cfg.bin b/sample/proto_v2/arr_in_arr_cfg.bin
@@ -1,6 +1,6 @@
 
 �
-2.16.01.0.0.0"Gsha256:001a7128e8311bf632d0042ad2727cd0b44418a0dacbaa38fe0d5e861c2fd22c*Test arr_in_arr_cfgZ'
+2.17.11.0.0.0"Gsha256:001a7128e8311bf632d0042ad2727cd0b44418a0dacbaa38fe0d5e861c2fd22c*Test arr_in_arr_cfgZ'
 资源转换示例.xlsx
 arr_in_arr��N-
 第一个-Aef 啦啦啦啦 嘞嘞嘞嘞-

diff --git a/sample/proto_v2/arr_in_arr_cfg.lua b/sample/proto_v2/arr_in_arr_cfg.lua
@@ -13,7 +13,7 @@ return {
  data_ver = "1.0.0.0",
  description = "Test arr_in_arr_cfg",
  hash_code = "sha256:6b2919a501f5cb402ca608dd55aa11785ba4214ff99908aba25609118cb9e0e7",
- xres_ver = "2.16.0",
+ xres_ver = "2.17.1",
  },
  [2] = "arr_in_arr_cfg",
  arr_in_arr_cfg = {

diff --git a/sample/proto_v2/arr_in_arr_cfg.xml b/sample/proto_v2/arr_in_arr_cfg.xml
@@ -12,151 +12,9 @@
  <data_ver>1.0.0.0</data_ver>
  <description>Test arr_in_arr_cfg</description>
  <hash_code>sha256:6b2919a501f5cb402ca608dd55aa11785ba4214ff99908aba25609118cb9e0e7</hash_code>
- <xres_ver>2.16.0</xres_ver>
+ <xres_ver>2.17.1</xres_ver>
  </header>
  <body mode="message">
- <arr_in_arr_cfg mode="message">
- <arr for="0" mode="message">
- <int_arr for="0">101</int_arr>
- <int_arr for="1">102</int_arr>
- <name>第一个-A</name>
- <str_arr for="0">啦啦啦啦</str_arr>
- <str_arr for="1">嘞嘞嘞嘞</str_arr>
- </arr>
- <arr for="1" mode="message">
- <int_arr for="0">111</int_arr>
- <int_arr for="1">112</int_arr>
- <name>第一个-B</name>
- <str_arr for="0">嘟嘟嘟嘟</str_arr>
- <str_arr for="1">嚓嚓嚓嚓</str_arr>
- </arr>
- <id>10001</id>
- <test_map_is mode="map">
- <int32 key="10" type="int32">Map嵌套模式[0].value</int32>
- <int32 key="11" type="int32">Map嵌套模式[1].value</int32>
- </test_map_is>
- <test_map_sm mode="map">
- <string mode="message" key="aa" type="string">
- <id>111</id>
- <level>112</level>
- </string>
- <string mode="message" key="特殊:字符" type="string">
- <id>121</id>
- <level>122</level>
- </string>
- </test_map_sm>
- <test_plain_enum_arr for="0">10001</test_plain_enum_arr>
- <test_plain_enum_arr for="1">10001</test_plain_enum_arr>
- <test_plain_enum_arr for="2">10001</test_plain_enum_arr>
- <test_plain_int_arr for="0">1</test_plain_int_arr>
- <test_plain_int_arr for="1">2</test_plain_int_arr>
- <test_plain_int_arr for="2">3</test_plain_int_arr>
- <test_plain_msg mode="message">
- <test_id_1>1</test_id_1>
- <test_id_2>2</test_id_2>
- </test_plain_msg>
- <test_plain_msg_arr for="0" mode="message">
- <test_id_1>1</test_id_1>
- <test_id_2>2</test_id_2>
- </test_plain_msg_arr>
- <test_plain_msg_arr for="1" mode="message">
- <test_id_1>3</test_id_1>
- <test_id_2>4</test_id_2>
- </test_plain_msg_arr>
- <test_plain_msg_arr for="2" mode="message">
- <test_id_1>5</test_id_1>
- <test_id_2>6</test_id_2>
- </test_plain_msg_arr>
- </arr_in_arr_cfg>
- <arr_in_arr_cfg mode="message">
- <arr for="0" mode="message">
- <int_arr for="0">201</int_arr>
- <int_arr for="1">202</int_arr>
- <name>测试项-A</name>
- <str_arr for="0">biubiubiubiu</str_arr>
- <str_arr for="1">唰唰唰唰</str_arr>
- </arr>
- <arr for="1" mode="message">
- <int_arr for="0">211</int_arr>
- <int_arr for="1">212</int_arr>
- <name>测试项-B</name>
- <str_arr for="0">哦哦哦哦</str_arr>
- <str_arr for="1">哈哈哈哈</str_arr>
- </arr>
- <id>10002</id>
- <test_map_is mode="map">
- <int32 key="20" type="int32">Map嵌套模式[0].value</int32>
- <int32 key="21" type="int32">Map嵌套模式[1].value</int32>
- </test_map_is>
- <test_map_sm mode="map">
- <string mode="message" key="ba" type="string">
- <id>211</id>
- <level>212</level>
- </string>
- <string mode="message" key="特殊.字符" type="string">
- <id>221</id>
- <level>222</level>
- </string>
- </test_map_sm>
- <test_plain_enum_arr for="0">10101</test_plain_enum_arr>
- <test_plain_enum_arr for="1">10101</test_plain_enum_arr>
- <test_plain_enum_arr for="2">10101</test_plain_enum_arr>
- <test_plain_int_arr for="0">4</test_plain_int_arr>
- <test_plain_int_arr for="1">5</test_plain_int_arr>
- <test_plain_int_arr for="2">6</test_plain_int_arr>
- <test_plain_msg mode="message">
- <test_id_1>3</test_id_1>
- <test_id_2>4</test_id_2>
- <test_id_3>5</test_id_3>
- </test_plain_msg>
- <test_plain_msg_arr for="0" mode="message">
- <test_id_1>7</test_id_1>
- <test_id_2>8</test_id_2>
- </test_plain_msg_arr>
- <test_plain_msg_arr for="1" mode="message">
- <test_id_1>9</test_id_1>
- <test_id_2>10</test_id_2>
- </test_plain_msg_arr>
- </arr_in_arr_cfg>
- <arr_in_arr_cfg mode="message">
- <arr for="0" mode="message">
- <int_arr for="0">301</int_arr>
- <name>测试项-C</name>
- </arr>
- <arr for="1" mode="message">
- <int_arr for="0">311</int_arr>
- <name>测试项-B</name>
- <str_arr for="0">哦哦哦哦</str_arr>
- </arr>
- <id>10003</id>
- <test_map_is mode="map">
- <int32 key="30" type="int32">Map嵌套模式[0].value</int32>
- <int32 key="31" type="int32">Map嵌套模式[1].value</int32>
- </test_map_is>
- <test_map_sm mode="map">
- <string mode="message" key="ca" type="string">
- <id>311</id>
- <level>312</level>
- </string>
- <string mode="message" key="cb" type="string">
- <id>321</id>
- <level>322</level>
- </string>
- </test_map_sm>
- <test_plain_enum_arr for="0">10001</test_plain_enum_arr>
- <test_plain_enum_arr for="1">10001</test_plain_enum_arr>
- <test_plain_enum_arr for="2">10001</test_plain_enum_arr>
- <test_plain_int_arr for="0">7</test_plain_int_arr>
- <test_plain_int_arr for="1">8</test_plain_int_arr>
- <test_plain_int_arr for="2">9</test_plain_int_arr>
- <test_plain_msg mode="message">
- <test_id_1>6</test_id_1>
- </test_plain_msg>
- <test_plain_msg_arr for="0" mode="message">
- <test_id_1>11</test_id_1>
- <test_id_2>12</test_id_2>
- </test_plain_msg_arr>
- </arr_in_arr_cfg>
  <arr_in_arr_cfg for="0" mode="message">
  <arr for="0" mode="message">
  <int_arr for="0">101</int_arr>

diff --git a/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Private/ConfigRec/ArrInArrCfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/ArrInArrCfg.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Private/ConfigRec/Dep2Cfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/Dep2Cfg.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Private/ConfigRec/EventCfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/EventCfg.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Private/ConfigRec/EventRewardItem.cpp b/sample/proto_v2/csv/Private/ConfigRec/EventRewardItem.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Private/ConfigRec/EventRuleItem.cpp b/sample/proto_v2/csv/Private/ConfigRec/EventRuleItem.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Private/ConfigRec/RoleUpgradeCfg.cpp b/sample/proto_v2/csv/Private/ConfigRec/RoleUpgradeCfg.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Private/ConfigRec/TestMsgVerifier.cpp b/sample/proto_v2/csv/Private/ConfigRec/TestMsgVerifier.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h b/sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h b/sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h b/sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h b/sample/proto_v2/csv/Public/ConfigRec/EventCfg.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h b/sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h b/sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h b/sample/proto_v2/csv/Public/ConfigRec/KeepOrStripEmptyListCfg.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h b/sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/csv/Public/ConfigRec/TestMsgVerifier.h b/sample/proto_v2/csv/Public/ConfigRec/TestMsgVerifier.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/event_cfg.bin b/sample/proto_v2/event_cfg.bin
diff --git a/sample/proto_v2/event_cfg.lua b/sample/proto_v2/event_cfg.lua
@@ -2,7 +2,7 @@
 
 return {
  [1] = {
- count = 7,
+ count = 5,
  data_source = {
  {
  count = 5,
@@ -13,7 +13,7 @@ return {
  data_ver = "1.0.0.0",
  description = "Test event_cfg with oneof fields",
  hash_code = "sha256:f54ea4a17140ed6e75a9136bff6c0053251bb5a4cd3954d905cf5bac8fcce998",
- xres_ver = "2.16.0",
+ xres_ver = "2.17.1",
  },
  [2] = "event_cfg",
  event_cfg = {

diff --git a/sample/proto_v2/json/KindConst.cpp b/sample/proto_v2/json/KindConst.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/json/KindConst.h b/sample/proto_v2/json/KindConst.h
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/json/Private/ConfigRec/ArrInArr.cpp b/sample/proto_v2/json/Private/ConfigRec/ArrInArr.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/json/Private/ConfigRec/ArrInArrCfg.cpp b/sample/proto_v2/json/Private/ConfigRec/ArrInArrCfg.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/json/Private/ConfigRec/Dep2Cfg.cpp b/sample/proto_v2/json/Private/ConfigRec/Dep2Cfg.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/json/Private/ConfigRec/EventCfg.cpp b/sample/proto_v2/json/Private/ConfigRec/EventCfg.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/json/Private/ConfigRec/EventRewardItem.cpp b/sample/proto_v2/json/Private/ConfigRec/EventRewardItem.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/json/Private/ConfigRec/EventRuleItem.cpp b/sample/proto_v2/json/Private/ConfigRec/EventRuleItem.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */

diff --git a/sample/proto_v2/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp b/sample/proto_v2/json/Private/ConfigRec/KeepOrStripEmptyListCfg.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is generated by xresloader 2.16.0, please don't edit it.
+ * This file is generated by xresloader 2.17.1, please don't edit it.
  * You can find more information about this xresloader on https://xresloader.atframe.work/ .
  * If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
  */