From 961cb5cd97d08622d1c20ffd33c909123c0c519f Mon Sep 17 00:00:00 2001
From: ouczbs <ouczbs@qq.com>
Date: Fri, 14 Jun 2024 22:26:49 +0800
Subject: [PATCH] update liquid

---
 src/refl/template/meta.liquid | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/refl/template/meta.liquid b/src/refl/template/meta.liquid
index f7854a4..187fb69 100644
--- a/src/refl/template/meta.liquid
+++ b/src/refl/template/meta.liquid
@@ -1,18 +1,14 @@
 {%- assign NewLine = newline_to_br  -%}
 {{ Indent2 }}struct {{ Name }}_Static_{{MetaName}} {
-{{ Indent2 }}    consteval static auto __StaticFields() {
-{{ Indent2 }}        return std::make_tuple({% for field in FieldList %}{% if field.Type != 2 %}{% unless forloop.first %}, {% endunless %}&{{Name}}::{{field.Name}}{% endif %}{% endfor %});
-{{ Indent2 }}    };
-{{ NewLine }}
 {{ Indent2 }}    consteval static auto __MakeStaticFields() {
 {{ Indent2 }}        return std::array{
 {{ NewLine }}            {%- for field in FieldList -%}
 {{ NewLine }}                {%- if field.Type == 1 -%}
-{{ Indent2 }}            refl::StaticMethodField(&{{Name}}::{{field.Name}}, FName("{{field.Name}}"), {{field.Meta}}),
+{{ Indent2 }}            refl::StaticMemberField(&{{Name}}::{{field.Name}}, FName("{{field.Name}}"), {{field.Meta}}),
 {{ NewLine }}                {%- elsif field.Type == 2 -%}
 {{ Indent2 }}            refl::StaticCtorField<{{field.Name}}>({{field.Meta}}),
 {{ NewLine }}                {%- else -%}
-{{ Indent2 }}            refl::StaticMemberField(&{{Name}}::{{field.Name}}, FName("{{field.Name}}"), {{field.Meta}}),
+{{ Indent2 }}            refl::StaticMethodField(&{{Name}}::{{field.Name}}, FName("{{field.Name}}"), {{field.Meta}}),
 {{ NewLine }}                {%- endif -%}
 {{ NewLine }}            {%- endfor -%}
 {{ Indent2 }}        };
@@ -30,7 +26,7 @@
 {{ Indent2 }}};
 {{ NewLine }}
 {{ Indent2 }}struct {{ Name }}_{{MetaName}} : public refl::Meta {
-{{ Indent2 }}    using MyUClass = refl::UClass_Meta<{{ Name }}_{{MetaName}}, {{ ParentName }}>;
+{{ Indent2 }}    using MyUClass = refl::UClass_Meta<{{ Name }}, {{ ParentName }}>;
 {{ Indent2 }}    using MyStatic = {{ Name }}_Static_{{MetaName}};
 {{ NewLine }}    {%-if IsMultyMeta -%}
 {{ Indent2 }}    using MyMetas = class {{Name}}_MulytMeta;
@@ -41,11 +37,11 @@
 {{ Indent2 }}        return std::array{
 {{ NewLine }}            {%- for field in FieldList -%}
 {{ NewLine }}                {%- if field.Type == 1 -%}
-{{ Indent2 }}            MethodField(&{{Name}}::{{field.Name}}, FName("{{field.Name}}"), memory, {{field.Meta}}),
-{{ NewLine }}                {%- elsif field.Type == 2 -%}
-{{ Indent2 }}            CtorField<{{field.Name}}>({{field.Meta}}),
-{{ NewLine }}                {%- else -%}
 {{ Indent2 }}            MemberField(&{{Name}}::{{field.Name}}, FName("{{field.Name}}"), memory, {{field.Meta}}),
+{{ NewLine }}                {%- elsif field.Type == 2 -%}
+{{ Indent2 }}            CtorField<{{field.Name}}>(memory, {{field.Meta}}),
+{{ NewLine }}                {%- else -%}
+{{ Indent2 }}            MethodField(&{{Name}}::{{field.Name}}, FName("{{field.Name}}"), memory, {{field.Meta}}),
 {{ NewLine }}                {%- endif -%}
 {{ NewLine }}            {%- endfor -%}
 {{ Indent2 }}        };