Merge pull request #41 from mackysoft/feature/new-object-from-json
Restore values from json on create new managed reference
This commit is contained in:
commit
e6f57ed763
8
.github/workflows/package.yaml
vendored
8
.github/workflows/package.yaml
vendored
@ -28,9 +28,13 @@ jobs:
|
|||||||
|
|
||||||
# Build
|
# Build
|
||||||
- name: Build .unitypackage
|
- name: Build .unitypackage
|
||||||
uses: game-ci/unity-builder@v2
|
uses: game-ci/unity-builder@v4
|
||||||
|
env:
|
||||||
|
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
|
||||||
|
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
|
||||||
|
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
|
||||||
with:
|
with:
|
||||||
unityVersion: 2020.3.8f1
|
unityVersion: 2021.3.29f1
|
||||||
buildMethod: MackySoft.PackageTools.Editor.UnityPackageExporter.Export
|
buildMethod: MackySoft.PackageTools.Editor.UnityPackageExporter.Export
|
||||||
|
|
||||||
# Upload
|
# Upload
|
||||||
|
|||||||
@ -2,14 +2,27 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using UnityEditor;
|
using UnityEditor;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
namespace MackySoft.SerializeReferenceExtensions.Editor {
|
namespace MackySoft.SerializeReferenceExtensions.Editor {
|
||||||
public static class ManagedReferenceUtility {
|
public static class ManagedReferenceUtility {
|
||||||
|
|
||||||
public static object SetManagedReference (this SerializedProperty property,Type type) {
|
public static object SetManagedReference (this SerializedProperty property,Type type) {
|
||||||
object obj = (type != null) ? Activator.CreateInstance(type) : null;
|
object result;
|
||||||
property.managedReferenceValue = obj;
|
if (property.managedReferenceValue != null)
|
||||||
return obj;
|
{
|
||||||
|
// Restore an previous values from json.
|
||||||
|
string json = JsonUtility.ToJson(property.managedReferenceValue);
|
||||||
|
result = JsonUtility.FromJson(json, type);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
result = (type != null) ? Activator.CreateInstance(type) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
property.managedReferenceValue = result;
|
||||||
|
return result;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Type GetType (string typeName) {
|
public static Type GetType (string typeName) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user