Skip to content

Commit c746d94

Browse files
owentowent
authored
Merge pull request #43 from owent/dev
Prepare v2.17.1
2 parents d4783d6 + 0c814cf commit c746d94

File tree

145 files changed

+141
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+141
-430
lines changed

‎HISTORY.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
## Unrelease
44

5+
## 2.17.1
6+
7+
1. 修复数组别名丢失字段映射的问题
8+
2. 修复文本模式输出跨分组转出数据没清理干净的问题
9+
510
## 2.17.0
611

712
1. 增加 `--disable-data-validator` 允许跳过数据验证。

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.xresloader</groupId>
88
<artifactId>xresloader</artifactId>
9-
<version>2.17.0</version>
9+
<version>2.17.1</version>
1010
<packaging>jar</packaging>
1111
<name>xresloader</name>
1212

‎sample/proto_v2/arr_in_arr_cfg.bin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
�
3-
2.16.01.0.0.0"Gsha256:001a7128e8311bf632d0042ad2727cd0b44418a0dacbaa38fe0d5e861c2fd22c*Test arr_in_arr_cfgZ'
3+
2.17.11.0.0.0"Gsha256:001a7128e8311bf632d0042ad2727cd0b44418a0dacbaa38fe0d5e861c2fd22c*Test arr_in_arr_cfgZ'
44
资源转换示例.xlsx
55
arr_in_arr��N-
66
第一个-Aef 啦啦啦啦 嘞嘞嘞嘞-

‎sample/proto_v2/arr_in_arr_cfg.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ return {
1313
data_ver = "1.0.0.0",
1414
description = "Test arr_in_arr_cfg",
1515
hash_code = "sha256:6b2919a501f5cb402ca608dd55aa11785ba4214ff99908aba25609118cb9e0e7",
16-
xres_ver = "2.16.0",
16+
xres_ver = "2.17.1",
1717
},
1818
[2] = "arr_in_arr_cfg",
1919
arr_in_arr_cfg = {

‎sample/proto_v2/arr_in_arr_cfg.xml

Lines changed: 1 addition & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -12,151 +12,9 @@
1212
<data_ver>1.0.0.0</data_ver>
1313
<description>Test arr_in_arr_cfg</description>
1414
<hash_code>sha256:6b2919a501f5cb402ca608dd55aa11785ba4214ff99908aba25609118cb9e0e7</hash_code>
15-
<xres_ver>2.16.0</xres_ver>
15+
<xres_ver>2.17.1</xres_ver>
1616
</header>
1717
<body mode="message">
18-
<arr_in_arr_cfg mode="message">
19-
<arr for="0" mode="message">
20-
<int_arr for="0">101</int_arr>
21-
<int_arr for="1">102</int_arr>
22-
<name>第一个-A</name>
23-
<str_arr for="0">啦啦啦啦</str_arr>
24-
<str_arr for="1">嘞嘞嘞嘞</str_arr>
25-
</arr>
26-
<arr for="1" mode="message">
27-
<int_arr for="0">111</int_arr>
28-
<int_arr for="1">112</int_arr>
29-
<name>第一个-B</name>
30-
<str_arr for="0">嘟嘟嘟嘟</str_arr>
31-
<str_arr for="1">嚓嚓嚓嚓</str_arr>
32-
</arr>
33-
<id>10001</id>
34-
<test_map_is mode="map">
35-
<int32 key="10" type="int32">Map嵌套模式[0].value</int32>
36-
<int32 key="11" type="int32">Map嵌套模式[1].value</int32>
37-
</test_map_is>
38-
<test_map_sm mode="map">
39-
<string mode="message" key="aa" type="string">
40-
<id>111</id>
41-
<level>112</level>
42-
</string>
43-
<string mode="message" key="特殊:字符" type="string">
44-
<id>121</id>
45-
<level>122</level>
46-
</string>
47-
</test_map_sm>
48-
<test_plain_enum_arr for="0">10001</test_plain_enum_arr>
49-
<test_plain_enum_arr for="1">10001</test_plain_enum_arr>
50-
<test_plain_enum_arr for="2">10001</test_plain_enum_arr>
51-
<test_plain_int_arr for="0">1</test_plain_int_arr>
52-
<test_plain_int_arr for="1">2</test_plain_int_arr>
53-
<test_plain_int_arr for="2">3</test_plain_int_arr>
54-
<test_plain_msg mode="message">
55-
<test_id_1>1</test_id_1>
56-
<test_id_2>2</test_id_2>
57-
</test_plain_msg>
58-
<test_plain_msg_arr for="0" mode="message">
59-
<test_id_1>1</test_id_1>
60-
<test_id_2>2</test_id_2>
61-
</test_plain_msg_arr>
62-
<test_plain_msg_arr for="1" mode="message">
63-
<test_id_1>3</test_id_1>
64-
<test_id_2>4</test_id_2>
65-
</test_plain_msg_arr>
66-
<test_plain_msg_arr for="2" mode="message">
67-
<test_id_1>5</test_id_1>
68-
<test_id_2>6</test_id_2>
69-
</test_plain_msg_arr>
70-
</arr_in_arr_cfg>
71-
<arr_in_arr_cfg mode="message">
72-
<arr for="0" mode="message">
73-
<int_arr for="0">201</int_arr>
74-
<int_arr for="1">202</int_arr>
75-
<name>测试项-A</name>
76-
<str_arr for="0">biubiubiubiu</str_arr>
77-
<str_arr for="1">唰唰唰唰</str_arr>
78-
</arr>
79-
<arr for="1" mode="message">
80-
<int_arr for="0">211</int_arr>
81-
<int_arr for="1">212</int_arr>
82-
<name>测试项-B</name>
83-
<str_arr for="0">哦哦哦哦</str_arr>
84-
<str_arr for="1">哈哈哈哈</str_arr>
85-
</arr>
86-
<id>10002</id>
87-
<test_map_is mode="map">
88-
<int32 key="20" type="int32">Map嵌套模式[0].value</int32>
89-
<int32 key="21" type="int32">Map嵌套模式[1].value</int32>
90-
</test_map_is>
91-
<test_map_sm mode="map">
92-
<string mode="message" key="ba" type="string">
93-
<id>211</id>
94-
<level>212</level>
95-
</string>
96-
<string mode="message" key="特殊.字符" type="string">
97-
<id>221</id>
98-
<level>222</level>
99-
</string>
100-
</test_map_sm>
101-
<test_plain_enum_arr for="0">10101</test_plain_enum_arr>
102-
<test_plain_enum_arr for="1">10101</test_plain_enum_arr>
103-
<test_plain_enum_arr for="2">10101</test_plain_enum_arr>
104-
<test_plain_int_arr for="0">4</test_plain_int_arr>
105-
<test_plain_int_arr for="1">5</test_plain_int_arr>
106-
<test_plain_int_arr for="2">6</test_plain_int_arr>
107-
<test_plain_msg mode="message">
108-
<test_id_1>3</test_id_1>
109-
<test_id_2>4</test_id_2>
110-
<test_id_3>5</test_id_3>
111-
</test_plain_msg>
112-
<test_plain_msg_arr for="0" mode="message">
113-
<test_id_1>7</test_id_1>
114-
<test_id_2>8</test_id_2>
115-
</test_plain_msg_arr>
116-
<test_plain_msg_arr for="1" mode="message">
117-
<test_id_1>9</test_id_1>
118-
<test_id_2>10</test_id_2>
119-
</test_plain_msg_arr>
120-
</arr_in_arr_cfg>
121-
<arr_in_arr_cfg mode="message">
122-
<arr for="0" mode="message">
123-
<int_arr for="0">301</int_arr>
124-
<name>测试项-C</name>
125-
</arr>
126-
<arr for="1" mode="message">
127-
<int_arr for="0">311</int_arr>
128-
<name>测试项-B</name>
129-
<str_arr for="0">哦哦哦哦</str_arr>
130-
</arr>
131-
<id>10003</id>
132-
<test_map_is mode="map">
133-
<int32 key="30" type="int32">Map嵌套模式[0].value</int32>
134-
<int32 key="31" type="int32">Map嵌套模式[1].value</int32>
135-
</test_map_is>
136-
<test_map_sm mode="map">
137-
<string mode="message" key="ca" type="string">
138-
<id>311</id>
139-
<level>312</level>
140-
</string>
141-
<string mode="message" key="cb" type="string">
142-
<id>321</id>
143-
<level>322</level>
144-
</string>
145-
</test_map_sm>
146-
<test_plain_enum_arr for="0">10001</test_plain_enum_arr>
147-
<test_plain_enum_arr for="1">10001</test_plain_enum_arr>
148-
<test_plain_enum_arr for="2">10001</test_plain_enum_arr>
149-
<test_plain_int_arr for="0">7</test_plain_int_arr>
150-
<test_plain_int_arr for="1">8</test_plain_int_arr>
151-
<test_plain_int_arr for="2">9</test_plain_int_arr>
152-
<test_plain_msg mode="message">
153-
<test_id_1>6</test_id_1>
154-
</test_plain_msg>
155-
<test_plain_msg_arr for="0" mode="message">
156-
<test_id_1>11</test_id_1>
157-
<test_id_2>12</test_id_2>
158-
</test_plain_msg_arr>
159-
</arr_in_arr_cfg>
16018
<arr_in_arr_cfg for="0" mode="message">
16119
<arr for="0" mode="message">
16220
<int_arr for="0">101</int_arr>

‎sample/proto_v2/csv/Private/ConfigRec/ArrInArr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* This file is generated by xresloader 2.16.0, please don't edit it.
2+
* This file is generated by xresloader 2.17.1, please don't edit it.
33
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
44
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
55
*/

‎sample/proto_v2/csv/Private/ConfigRec/ArrInArrCfg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* This file is generated by xresloader 2.16.0, please don't edit it.
2+
* This file is generated by xresloader 2.17.1, please don't edit it.
33
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
44
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
55
*/

‎sample/proto_v2/csv/Private/ConfigRec/Dep2Cfg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* This file is generated by xresloader 2.16.0, please don't edit it.
2+
* This file is generated by xresloader 2.17.1, please don't edit it.
33
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
44
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
55
*/

‎sample/proto_v2/csv/Private/ConfigRec/EventCfg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* This file is generated by xresloader 2.16.0, please don't edit it.
2+
* This file is generated by xresloader 2.17.1, please don't edit it.
33
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
44
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
55
*/

‎sample/proto_v2/csv/Private/ConfigRec/EventRewardItem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* This file is generated by xresloader 2.16.0, please don't edit it.
2+
* This file is generated by xresloader 2.17.1, please don't edit it.
33
* You can find more information about this xresloader on https://xresloader.atframe.work/ .
44
* If there is any problem, please find or report issues on https://github.com/xresloader/xresloader/issues .
55
*/

0 commit comments

Comments
 (0)