From 502628b768dcc9ec1ee252cfccf4e85e0455375e Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Fri, 30 Apr 2021 13:02:20 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B8=E3=82=A7=E3=83=8D=E3=83=AC=E3=83=BC?=
 =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=81=AE=E5=90=8D=E5=89=8D=E7=AB=B6=E5=90=88?=
 =?UTF-8?q?=E3=81=AE=E5=9B=9E=E9=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/JsonSchema/Schemas/ObjectJsonSchema.cs   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Assets/UniGLTF/Editor/JsonSchema/Schemas/ObjectJsonSchema.cs b/Assets/UniGLTF/Editor/JsonSchema/Schemas/ObjectJsonSchema.cs
index 50ea95918..ff9694a32 100644
--- a/Assets/UniGLTF/Editor/JsonSchema/Schemas/ObjectJsonSchema.cs
+++ b/Assets/UniGLTF/Editor/JsonSchema/Schemas/ObjectJsonSchema.cs
@@ -71,6 +71,8 @@ public static $0 $2(JsonNode parsed)
 .Replace("$2", callName)
 );
 
+            var prefix = string.IsNullOrEmpty(ClassName) ? "Deserialize_" : $"{ClassName}_Deserialize_";
+
             foreach (var kv in Properties)
             {
                 writer.Write(@"
@@ -80,7 +82,7 @@ public static $0 $2(JsonNode parsed)
         }
 "
 .Replace("$0", kv.Key)
-.Replace("$1", kv.Value.GenerateDeserializerCall($"Deserialize_{kv.Key.ToUpperCamel()}", "kv.Value"))
+.Replace("$1", kv.Value.GenerateDeserializerCall($"{prefix}{kv.Key.ToUpperCamel()}", "kv.Value"))
 .Replace("$2", kv.Key.ToUpperCamel())
 );
             }
@@ -95,7 +97,7 @@ public static $0 $2(JsonNode parsed)
             {
                 if (!kv.Value.IsInline)
                 {
-                    kv.Value.GenerateDeserializer(writer, $"Deserialize_{kv.Key.ToUpperCamel()}");
+                    kv.Value.GenerateDeserializer(writer, $"{prefix}{kv.Key.ToUpperCamel()}");
                 }
             }
         }
@@ -131,6 +133,9 @@ public static void {callName}(JsonFormatter f, {ValueType} value)
 "
 );
 
+
+            var prefix = string.IsNullOrEmpty(ClassName) ? "Serialize_" : $"{ClassName}_Serialize_";
+
             foreach (var kv in Properties)
             {
                 var valueName = $"value.{kv.Key.ToUpperCamel()}";
@@ -138,7 +143,7 @@ public static void {callName}(JsonFormatter f, {ValueType} value)
                 writer.Write($@"
     if({kv.Value.CreateSerializationCondition(valueName)}{condition}){{
         f.Key(""{kv.Key}"");                
-        {kv.Value.GenerateSerializerCall($"Serialize_{kv.Key.ToUpperCamel()}", valueName)};
+        {kv.Value.GenerateSerializerCall($"{prefix}{kv.Key.ToUpperCamel()}", valueName)};
     }}
 ");
             }
@@ -152,7 +157,7 @@ public static void {callName}(JsonFormatter f, {ValueType} value)
             {
                 if (!kv.Value.IsInline)
                 {
-                    kv.Value.GenerateSerializer(writer, $"Serialize_{kv.Key.ToUpperCamel()}");
+                    kv.Value.GenerateSerializer(writer, $"{prefix}{kv.Key.ToUpperCamel()}");
                 }
             }
         }