Skip to content

Commit

Permalink
Merge pull request #47 from owent/dev
Browse files Browse the repository at this point in the history
USTRUCT初始值赋值
  • Loading branch information
owent authored Sep 13, 2024
2 parents 2096e16 + 9705e2c commit f9416a9
Show file tree
Hide file tree
Showing 155 changed files with 320 additions and 312 deletions.
2 changes: 2 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unrelease

1. 输出的UE代码的默认值也输出到 USTRUCT 申明中。

## 2.19.0

1. 优化整数类型的验证,不允许浮点数转整数。
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.xresloader</groupId>
<artifactId>xresloader</artifactId>
<version>2.19.0</version>
<version>2.19.1</version>
<packaging>jar</packaging>
<name>xresloader</name>

Expand Down
Binary file modified sample/proto_v2/arr_in_arr_cfg.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion sample/proto_v2/arr_in_arr_cfg.hidden.bin
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

�
2.19.01.0.0.0"Gsha256:960ff46566e477db8f731488949271a1c499ec9015122ce90bca4496872ac61a*Test arr_in_arr_cfgZ'
2.19.11.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
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/arr_in_arr_cfg.hidden.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:b4d268d9a7b1a8cf6fc18489dd67c4a298408e7bffbde43c91d6ac2f47836601",
xres_ver = "2.19.0",
xres_ver = "2.19.1",
},
[2] = "arr_in_arr_cfg",
arr_in_arr_cfg = {
Expand Down
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.19.0",
xres_ver = "2.19.1",
},
[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.19.0</xres_ver>
<xres_ver>2.19.1</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.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
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.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
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.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
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.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
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.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
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.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/csv/Private/ConfigRec/RoleUpgradeCfg.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand Down
2 changes: 1 addition & 1 deletion sample/proto_v2/csv/Private/ConfigRec/TestMsgVerifier.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand Down
4 changes: 2 additions & 2 deletions sample/proto_v2/csv/Public/ConfigRec/ArrInArr.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand All @@ -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;
FName Name = TEXT("");

/** Field Type: INT, Name: IntArr, Index: 2. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
Expand Down
6 changes: 3 additions & 3 deletions sample/proto_v2/csv/Public/ConfigRec/ArrInArrCfg.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand All @@ -24,12 +24,12 @@ 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;
FName Name = TEXT("");

// This is a Key
/** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 Id;
int32 Id = 0;

/** Field Type: MESSAGE, Name: Arr, Index: 2. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
Expand Down
6 changes: 3 additions & 3 deletions sample/proto_v2/csv/Public/ConfigRec/Dep2Cfg.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand All @@ -20,10 +20,10 @@ struct FDep2Cfg : public FTableRowBase
// Start of fields
/** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 Id;
int32 Id = 0;

/** Field Type: STRING, Name: Level, Index: 2. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
FString Level;
FString Level = TEXT("");

};
20 changes: 10 additions & 10 deletions sample/proto_v2/csv/Public/ConfigRec/EventCfg.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand All @@ -26,23 +26,23 @@ 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;
FName Name = TEXT("");

/** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 Id;
int32 Id = 0;

/** Field Type: INT, Name: Process, Index: 2. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 Process;
int32 Process = 0;

/** Field Type: oneof/union -> FString, Name: Reward, Index: 0. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
FString Reward;
FString Reward = TEXT("");

/** Field Type: oneof/union -> FString, Name: UnlockType, Index: 1. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
FString UnlockType;
FString UnlockType = TEXT("");

/** Field Type: MESSAGE, Name: Rule, Index: 6. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
Expand All @@ -58,19 +58,19 @@ struct FEventCfg : public FTableRowBase

/** Field Type: LONG, Name: UserExp, Index: 12. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int64 UserExp;
int64 UserExp = 0;

/** Field Type: STRING, Name: Note, Index: 13. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
FString Note;
FString Note = TEXT("");

/** Field Type: INT, Name: EnumType, Index: 14. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 EnumType;
int32 EnumType = 0;

/** Field Type: INT, Name: UserLevel, Index: 51. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 UserLevel;
int32 UserLevel = 0;

/** Field Type: MESSAGE, Name: TestArr, Index: 91. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
Expand Down
12 changes: 6 additions & 6 deletions sample/proto_v2/csv/Public/ConfigRec/EventRewardItem.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand All @@ -23,22 +23,22 @@ 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;
FString Nested = TEXT("");

/** Field Type: INT, Name: ItemId, Index: 1. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 ItemId;
int32 ItemId = 0;

/** Field Type: INT, Name: ItemCount, Index: 2. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 ItemCount;
int32 ItemCount = 0;

/** Field Type: STRING, Name: NestedNote, Index: 11. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
FString NestedNote;
FString NestedNote = TEXT("");

/** Field Type: INT, Name: NestedEnumType, Index: 12. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 NestedEnumType;
int32 NestedEnumType = 0;

};
12 changes: 6 additions & 6 deletions sample/proto_v2/csv/Public/ConfigRec/EventRuleItem.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand All @@ -23,22 +23,22 @@ 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;
FString Nested = TEXT("");

/** Field Type: INT, Name: RuleId, Index: 1. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 RuleId;
int32 RuleId = 0;

/** Field Type: INT, Name: RuleParam, Index: 2. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 RuleParam;
int32 RuleParam = 0;

/** Field Type: STRING, Name: NestedNote, Index: 11. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
FString NestedNote;
FString NestedNote = TEXT("");

/** Field Type: INT, Name: NestedEnumType, Index: 12. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 NestedEnumType;
int32 NestedEnumType = 0;

};
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand All @@ -21,12 +21,12 @@ 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;
FName Name = TEXT("");

// This is a Key
/** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 Id;
int32 Id = 0;

/** Field Type: MESSAGE, Name: ArrayMsg, Index: 2. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
Expand Down
14 changes: 7 additions & 7 deletions sample/proto_v2/csv/Public/ConfigRec/RoleUpgradeCfg.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand All @@ -21,28 +21,28 @@ 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;
FName Name = TEXT("");

/** Field Type: INT, Name: Id, Index: 1. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 Id;
int32 Id = 0;

/** Field Type: INT, Name: Level, Index: 2. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 Level;
int32 Level = 0;

// Refer to cost_type
/** Field Type: INT, Name: CostType, Index: 3. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 CostType;
int32 CostType = 0;

/** Field Type: LONG, Name: CostValue, Index: 4. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int64 CostValue;
int64 CostValue = 0;

/** Field Type: INT, Name: ScoreAdd, Index: 5. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 ScoreAdd;
int32 ScoreAdd = 0;

};

Expand Down
8 changes: 4 additions & 4 deletions sample/proto_v2/csv/Public/ConfigRec/TestMsgVerifier.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* This file is generated by xresloader 2.19.0, please don't edit it.
* This file is generated by xresloader 2.19.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 .
*/
Expand All @@ -20,14 +20,14 @@ struct FTestMsgVerifier : public FTableRowBase
// Start of fields
/** Field Type: INT, Name: TestId1, Index: 10001. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 TestId1;
int32 TestId1 = 0;

/** Field Type: INT, Name: TestId2, Index: 10002. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 TestId2;
int32 TestId2 = 0;

/** Field Type: INT, Name: TestId3, Index: 10003. This field is generated for UE Editor compatible. **/
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "XResConfig")
int32 TestId3;
int32 TestId3 = 0;

};
Binary file modified sample/proto_v2/event_cfg.bin
Binary file not shown.
Binary file modified sample/proto_v2/event_cfg.hidden.bin
Binary file not shown.
Loading

0 comments on commit f9416a9

Please sign in to comment.