From 67060f71d89eec4d756c9b2afcad939721366338 Mon Sep 17 00:00:00 2001 From: quabug Date: Sun, 14 Mar 2021 19:22:05 +0800 Subject: [PATCH] fix sample without imported tests --- .../CannotDisplayIfNotRef/ClassDefines.cs | 5 +- .../CannotDisplayIfNotRef/Invisible.asmdef | 2 +- Assets/Sample/Test.unity | 26 ++++---- Assets/Sample/TestMonoBehavior.cs | 59 ++++++++++++++++++- Assets/Sample/TestSO.asset | 4 +- Assets/Sample/TestSO.cs | 2 +- .../generic-serialize-reference/Tests.meta | 8 --- 7 files changed, 75 insertions(+), 31 deletions(-) delete mode 100644 Packages/generic-serialize-reference/Tests.meta diff --git a/Assets/Sample/CannotDisplayIfNotRef/ClassDefines.cs b/Assets/Sample/CannotDisplayIfNotRef/ClassDefines.cs index 67312c5..0120075 100644 --- a/Assets/Sample/CannotDisplayIfNotRef/ClassDefines.cs +++ b/Assets/Sample/CannotDisplayIfNotRef/ClassDefines.cs @@ -1,4 +1 @@ -using GenericSerializeReference.Tests; - -public class IntIntObject : MultipleGeneric.IInterface {} -public class IntObject : SingleGeneric.IInterface {} +public class IntObject : IMyInterface {} diff --git a/Assets/Sample/CannotDisplayIfNotRef/Invisible.asmdef b/Assets/Sample/CannotDisplayIfNotRef/Invisible.asmdef index abdfee2..415668f 100644 --- a/Assets/Sample/CannotDisplayIfNotRef/Invisible.asmdef +++ b/Assets/Sample/CannotDisplayIfNotRef/Invisible.asmdef @@ -2,7 +2,7 @@ "name": "Invisible", "rootNamespace": "", "references": [ - "GUID:7db2c3edd9cbf4a0c84e314cca3ddf42" + "GUID:f4e0bad0409094416a9502287ae04b5c" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Sample/Test.unity b/Assets/Sample/Test.unity index 8f70a50..242df0f 100644 --- a/Assets/Sample/Test.unity +++ b/Assets/Sample/Test.unity @@ -170,39 +170,39 @@ MonoBehaviour: references: version: 1 00000000: - type: {class: TestMonoBehavior/__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample} + type: {class: TestMonoBehavior/__generic_serialize_reference/Object, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample} data: - ValueT: 0 - ValueU: 0 - SubValueT: - SubValueU: [] + V: 0 00000001: - type: {class: TestMonoBehavior/__generic_serialize_reference/NonGeneric, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample} + type: {class: TestMonoBehavior/__generic_serialize_reference/NonGeneric, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample} data: ValueT: 0 ValueU: 0 ValueDouble: 0 00000002: - type: {class: TestMonoBehavior/__generic_serialize_reference/PartialObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample} + type: {class: TestMonoBehavior/__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample} data: ValueT: 0 ValueU: 0 - ValueDouble: 0 + SubValueT: + SubValueU: 00000003: - type: {class: TestMonoBehavior/__generic_serialize_reference/Object, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample} + type: {class: TestMonoBehavior/__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample} data: Value: 0 + SubValue: 00000004: - type: {class: TestMonoBehavior/__generic_serialize_reference/DoubleObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample} + type: {class: TestMonoBehavior/__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample} data: Value: 0 + SubValue: [] 00000005: - type: {class: TestMonoBehavior/__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample} + type: {class: TestMonoBehavior/__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample} data: Value: 0 SubValue: 00000006: - type: {class: TestMonoBehavior/__generic_serialize_reference/PartialObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample} + type: {class: TestMonoBehavior/__generic_serialize_reference/PartialObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample} data: ValueT: 0 ValueU: 0 @@ -238,4 +238,4 @@ MonoBehaviour: references: version: 1 00000000: - type: {class: , ns: , asm: } + type: {class: MyMonoBehavior/__generic_serialize_reference/MyIntObject, ns: , asm: GenericSerializeReference.Sample} diff --git a/Assets/Sample/TestMonoBehavior.cs b/Assets/Sample/TestMonoBehavior.cs index da46e3d..9c68d0f 100644 --- a/Assets/Sample/TestMonoBehavior.cs +++ b/Assets/Sample/TestMonoBehavior.cs @@ -1,10 +1,11 @@ using System; using GenericSerializeReference; using UnityEngine; +using UnityEngine.Scripting; [assembly: GenericSerializeReferenceLogger(LogLevel.Debug)] -namespace GenericSerializeReference.Tests +namespace GenericSerializeReference.Sample { public class TestMonoBehavior : MonoBehaviour { @@ -45,4 +46,60 @@ private void Awake() Debug.Log($"{IntFloat.GetType()}: \n {JsonUtility.ToJson(IntFloat)}"); } } + + + public static class SingleGeneric + { + public interface IInterface {} + + [Serializable] + public class Object : IInterface + { + public T Value; + } + + [Serializable] + public class SubObject : Object + { + public T[] SubValue; + } + + [Serializable] + public class DoubleObject : IInterface + { + public double Value; + } + } + + public static class MultipleGeneric + { + [Preserve] + public interface IInterface {} + + [Serializable] + public class Object : IInterface + { + public T ValueT; + public U ValueU; + } + + [Serializable] + public class SubObject : Object + { + public T[] SubValueT; + public U[] SubValueU; + } + + [Serializable] + public class PartialObject : Object + { + public double ValueDouble; + } + + [Serializable] + public class NonGeneric : Object, IInterface + { + public double ValueDouble; + } + } } \ No newline at end of file diff --git a/Assets/Sample/TestSO.asset b/Assets/Sample/TestSO.asset index 1d939f0..f80a0da 100644 --- a/Assets/Sample/TestSO.asset +++ b/Assets/Sample/TestSO.asset @@ -17,9 +17,7 @@ MonoBehaviour: references: version: 1 00000000: - type: {class: TestSO/__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample} + type: {class: TestSO/__generic_serialize_reference/MultipleGeneric.Object`2., ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample} data: ValueT: 0 ValueU: 0 - SubValueT: - SubValueU: [] diff --git a/Assets/Sample/TestSO.cs b/Assets/Sample/TestSO.cs index a30c95e..30fdeac 100644 --- a/Assets/Sample/TestSO.cs +++ b/Assets/Sample/TestSO.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace GenericSerializeReference.Tests +namespace GenericSerializeReference.Sample { [CreateAssetMenu(fileName = "TestSO", menuName = "TestSO", order = 0)] public class TestSO : ScriptableObject diff --git a/Packages/generic-serialize-reference/Tests.meta b/Packages/generic-serialize-reference/Tests.meta deleted file mode 100644 index 896b590..0000000 --- a/Packages/generic-serialize-reference/Tests.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dd8c07bd1367549b2a75edb2c26d08ad -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: