From 1995c2fd09eb475c9baaa8dc77d60f05b1045e9b Mon Sep 17 00:00:00 2001 From: ls9512 <598914653@qq.com> Date: Thu, 21 Mar 2024 13:58:08 +0800 Subject: [PATCH] Fix 'DataContainer is NULL' error --- .../Binder/RuntimePropertyBinder(T1).cs | 100 +++++++ .../Binder/RuntimePropertyBinder(T1).cs.meta | 11 + .../Script/Binder/RuntimePropertyBinder.cs | 16 +- Runtime/Script/Component/PropertyBinder.cs | 98 +----- Runtime/Script/UBind.cs | 6 +- .../Scene/UBind_Sample_01_Common.unity | 280 +++++++++--------- .../Script/UBindSampleGameManager.cs | 15 +- 7 files changed, 272 insertions(+), 254 deletions(-) create mode 100644 Runtime/Script/Binder/RuntimePropertyBinder(T1).cs create mode 100644 Runtime/Script/Binder/RuntimePropertyBinder(T1).cs.meta diff --git a/Runtime/Script/Binder/RuntimePropertyBinder(T1).cs b/Runtime/Script/Binder/RuntimePropertyBinder(T1).cs new file mode 100644 index 0000000..b1ce617 --- /dev/null +++ b/Runtime/Script/Binder/RuntimePropertyBinder(T1).cs @@ -0,0 +1,100 @@ +using System; +using System.Globalization; +using System.Reflection; + +namespace Aya.DataBinding +{ + public class RuntimePropertyBinder : DataBinder + { + public string Property; + + public override bool NeedUpdate => true; + + public override object Value + { + get + { + if (FiledInfo != null) + { + var data = FiledInfo.GetValue(Target); + return data; + } + + if (PropertyInfo != null) + { + var data = PropertyInfo.GetValue(Target, null); + return data; + } + + return default; + } + set + { + var data = value; + var dataType = data != null ? data.GetType() : typeof(object); + if (FiledInfo != null) + { + if (data != null && dataType != FiledInfo.FieldType) + { + var convertData = Convert.ChangeType(data, FiledInfo.FieldType, CultureInfo.InvariantCulture); + FiledInfo.SetValue(Target, convertData); + } + else + { + FiledInfo.SetValue(Target, data); + } + } + + if (PropertyInfo != null) + { + if (data != null && dataType != PropertyInfo.PropertyType) + { + var convertData = Convert.ChangeType(data, PropertyInfo.PropertyType, + CultureInfo.InvariantCulture); + PropertyInfo.SetValue(Target, convertData, null); + } + else + { + PropertyInfo.SetValue(Target, data, null); + } + } + } + } + + public FieldInfo FiledInfo + { + get + { + if (_filedInfo == null || _filedInfo.Name != Property) + { + _filedInfo = TargetType.GetField(Property, TypeCaches.DefaultBindingFlags); + DataType = _filedInfo?.FieldType; + } + + return _filedInfo; + } + + internal set => _filedInfo = value; + } + + private FieldInfo _filedInfo; + + public PropertyInfo PropertyInfo + { + get + { + if (_propertyInfo == null || _propertyInfo.Name != Property) + { + _propertyInfo = TargetType.GetProperty(Property, TypeCaches.DefaultBindingFlags); + DataType = _propertyInfo?.PropertyType; + } + + return _propertyInfo; + } + + internal set => _propertyInfo = value; + } + + private PropertyInfo _propertyInfo; + } +} \ No newline at end of file diff --git a/Runtime/Script/Binder/RuntimePropertyBinder(T1).cs.meta b/Runtime/Script/Binder/RuntimePropertyBinder(T1).cs.meta new file mode 100644 index 0000000..3c236cb --- /dev/null +++ b/Runtime/Script/Binder/RuntimePropertyBinder(T1).cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ddb1aec04119be149bdaebaf72ef5707 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Script/Binder/RuntimePropertyBinder.cs b/Runtime/Script/Binder/RuntimePropertyBinder.cs index 207acbd..adab9e8 100644 --- a/Runtime/Script/Binder/RuntimePropertyBinder.cs +++ b/Runtime/Script/Binder/RuntimePropertyBinder.cs @@ -11,13 +11,7 @@ public class RuntimePropertyBinder : RuntimePropertyBinder public RuntimePropertyBinder(string container, string key, DataDirection direction, object target, PropertyInfo propertyInfo, FieldInfo fieldInfo) { - Container = container; - Key = key; - Direction = direction; - Target = target; - PropertyInfo = propertyInfo; - FiledInfo = fieldInfo; - + // var type = target.GetType(); if (propertyInfo != null) { Property = propertyInfo.Name; @@ -27,6 +21,14 @@ public RuntimePropertyBinder(string container, string key, DataDirection directi { Property = fieldInfo.Name; } + + // var bindKey = type.Name + "." + Property + "." + key; + Container = container; + Key = key; + Direction = direction; + Target = target; + PropertyInfo = propertyInfo; + FiledInfo = fieldInfo; } } } \ No newline at end of file diff --git a/Runtime/Script/Component/PropertyBinder.cs b/Runtime/Script/Component/PropertyBinder.cs index a8e5530..e9e9b48 100644 --- a/Runtime/Script/Component/PropertyBinder.cs +++ b/Runtime/Script/Component/PropertyBinder.cs @@ -1,7 +1,4 @@ -using System; -using System.Globalization; -using System.Reflection; -using UnityEngine; +using UnityEngine; namespace Aya.DataBinding { @@ -32,97 +29,4 @@ public override void Reset() Target = null; } } - - public class RuntimePropertyBinder : DataBinder - { - public string Property; - - public override bool NeedUpdate => true; - - public override object Value - { - get - { - if (FiledInfo != null) - { - var data = FiledInfo.GetValue(Target); - return data; - } - - if (PropertyInfo != null) - { - var data = PropertyInfo.GetValue(Target, null); - return data; - } - - return default; - } - set - { - var data = value; - var dataType = data != null ? data.GetType() : typeof(object); - if (FiledInfo != null) - { - if (data != null && dataType != FiledInfo.FieldType) - { - var convertData = Convert.ChangeType(data, FiledInfo.FieldType, CultureInfo.InvariantCulture); - FiledInfo.SetValue(Target, convertData); - } - else - { - FiledInfo.SetValue(Target, data); - } - } - - if (PropertyInfo != null) - { - if (data != null && dataType != PropertyInfo.PropertyType) - { - var convertData = Convert.ChangeType(data, PropertyInfo.PropertyType, CultureInfo.InvariantCulture); - PropertyInfo.SetValue(Target, convertData, null); - } - else - { - PropertyInfo.SetValue(Target, data, null); - } - } - } - } - - public FieldInfo FiledInfo - { - get - { - if (_filedInfo == null || _filedInfo.Name != Property) - { - _filedInfo = TargetType.GetField(Property, TypeCaches.DefaultBindingFlags); - DataType = _filedInfo?.FieldType; - } - - return _filedInfo; - } - - internal set => _filedInfo = value; - } - - private FieldInfo _filedInfo; - - public PropertyInfo PropertyInfo - { - get - { - if (_propertyInfo == null || _propertyInfo.Name != Property) - { - _propertyInfo = TargetType.GetProperty(Property, TypeCaches.DefaultBindingFlags); - DataType = _propertyInfo?.PropertyType; - } - - return _propertyInfo; - } - - internal set => _propertyInfo = value; - } - - private PropertyInfo _propertyInfo; - } } diff --git a/Runtime/Script/UBind.cs b/Runtime/Script/UBind.cs index 9578509..697ca23 100644 --- a/Runtime/Script/UBind.cs +++ b/Runtime/Script/UBind.cs @@ -1,4 +1,5 @@ -using System; +using Aya.Sample; +using System; using System.Reflection; namespace Aya.DataBinding @@ -170,7 +171,8 @@ public static RuntimePropertyBinder Bind(string key, DataDirection direction, ob public static RuntimePropertyBinder Bind(string container, string key, DataDirection direction, object target, string propertyName) { - var (propertyInfo, fieldInfo) = TypeCaches.GetTypePropertyOrFieldByName(target.GetType(), propertyName); + var type = target.GetType(); + var (propertyInfo, fieldInfo) = TypeCaches.GetTypePropertyOrFieldByName(type, propertyName); return Bind(container, key, direction, target, propertyInfo, fieldInfo); } diff --git a/Samples/Sample_01_Common/Scene/UBind_Sample_01_Common.unity b/Samples/Sample_01_Common/Scene/UBind_Sample_01_Common.unity index 79836f7..0b08c20 100644 --- a/Samples/Sample_01_Common/Scene/UBind_Sample_01_Common.unity +++ b/Samples/Sample_01_Common/Scene/UBind_Sample_01_Common.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +118,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -149,6 +151,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1444000358} - {fileID: 866471576} @@ -174,6 +177,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -219,7 +223,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c570d4d2df23d5340b5117eb6840f11c, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: AutoConvert Direction: 0 UpdateType: 0 @@ -252,6 +256,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 614389346} m_RootOrder: 1 @@ -276,6 +281,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -328,6 +334,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 87629553} - {fileID: 202976249} @@ -368,6 +375,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 85641825} m_RootOrder: 0 @@ -392,6 +400,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -430,7 +439,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97095e7019af5c24698845b959cdb3c0, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: BothSrcDst Direction: 2 UpdateType: 0 @@ -465,6 +474,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 580601640} m_RootOrder: 1 @@ -489,6 +499,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -542,7 +553,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 93fb937556de5054f9aaa39c10d560a8, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: Property Direction: 1 UpdateType: 0 @@ -576,6 +587,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 614389346} m_RootOrder: 0 @@ -600,6 +612,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -655,6 +668,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 85641825} m_RootOrder: 1 @@ -679,6 +693,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -717,7 +732,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97095e7019af5c24698845b959cdb3c0, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: BothSrcDst Direction: 2 UpdateType: 0 @@ -750,6 +765,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1737860255} m_RootOrder: 1 @@ -774,6 +790,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -839,6 +856,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -873,6 +891,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1807418814} - {fileID: 1211778186} @@ -898,6 +917,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -934,7 +954,10 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 0 - m_OnEndEdit: + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: m_PersistentCalls: m_Calls: [] m_OnValueChanged: @@ -947,6 +970,7 @@ MonoBehaviour: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 --- !u!114 &378955132 MonoBehaviour: m_ObjectHideFlags: 0 @@ -962,6 +986,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -996,7 +1021,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3d60b1773969a634ba06985ea7a74057, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: InputField Direction: 0 UpdateType: 0 @@ -1027,6 +1052,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 378955130} - {fileID: 772263128} @@ -1065,6 +1091,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1350305573} - {fileID: 1824023480} @@ -1102,6 +1129,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 909392245} - {fileID: 100068330} @@ -1143,6 +1171,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 118688138} - {fileID: 79331858} @@ -1168,6 +1197,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1204,7 +1234,10 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 2 m_CharacterLimit: 0 - m_OnEndEdit: + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: m_PersistentCalls: m_Calls: [] m_OnValueChanged: @@ -1217,6 +1250,7 @@ MonoBehaviour: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 --- !u!114 &614389348 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1232,6 +1266,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1266,7 +1301,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3d60b1773969a634ba06985ea7a74057, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: BindFormatValueSrc Direction: 0 UpdateType: 0 @@ -1297,6 +1332,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1063796228} m_Father: {fileID: 1848779270} @@ -1337,6 +1373,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1671893278} - {fileID: 986491798} @@ -1362,6 +1399,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1398,7 +1436,10 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 0 - m_OnEndEdit: + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: m_PersistentCalls: m_Calls: [] m_OnValueChanged: @@ -1411,6 +1452,7 @@ MonoBehaviour: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 --- !u!114 &772263130 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1426,6 +1468,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1460,7 +1503,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3d60b1773969a634ba06985ea7a74057, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: InputField Direction: 1 UpdateType: 0 @@ -1494,6 +1537,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 842783192} m_RootOrder: 0 @@ -1518,6 +1562,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1556,7 +1601,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97095e7019af5c24698845b959cdb3c0, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: Text Direction: 0 UpdateType: 0 @@ -1603,6 +1648,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -1633,6 +1679,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 824853297} m_Father: {fileID: 1848779270} @@ -1671,6 +1718,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 814988781} m_RootOrder: 0 @@ -1695,6 +1743,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1743,6 +1792,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 784040925} - {fileID: 938944960} @@ -1783,6 +1833,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 555449579} m_RootOrder: 2 @@ -1807,6 +1858,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1845,7 +1897,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97095e7019af5c24698845b959cdb3c0, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: InputField Direction: 1 UpdateType: 0 @@ -1878,6 +1930,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 18104507} m_RootOrder: 1 @@ -1902,6 +1955,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1958,6 +2012,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 580601640} m_RootOrder: 0 @@ -1982,6 +2037,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2035,7 +2091,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 93fb937556de5054f9aaa39c10d560a8, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: Property Direction: 0 UpdateType: 0 @@ -2069,6 +2125,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1275354879} m_RootOrder: 0 @@ -2093,6 +2150,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2144,97 +2202,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: efa53029e0a62304caf81173265515b9, type: 3} m_Name: m_EditorClassIdentifier: - undoProRecords: [] - undoState: - redoRecords: [] - undoRecords: - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Paste Text_SrcDst_1 - - Paste Text_SrcDst_1 - - Set Sibling Index - - Set Sibling Index - - Text_SrcDst_1 (1) Parenting - - Text_SrcDst_1 (1) Parenting - - Text _SrcDst_2 (1) Parenting - - Text _SrcDst_2 (1) Parenting - - Selection Change - - Rename Text_SrcDst_1 (1) - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Delete Game Objects - - Delete Game Objects - - Delete Game Objects - - Selection Change - - Move - - Move - - Inspector - - Selection Change - - Create InputField - - Add Image - - Add InputField - - Create Placeholder - - Add Text - - - - - - Create Text - - Add Text - - - - - - - - - - - - Create InputField - - Selection Change - - InputField Parenting - - Move - - Move - - Rename InputField - - Rename Input_FormatSrc - - Inspector - - Selection Change - - Selection Change - - Add InputFieldBinder - - Move Component(s) - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Inspector - - Selection Change - - Selection Change - - Remove MonoBehaviour - - Add TextFormatValueBinder - - Selection Change - - Selection Change - - Move Component(s) - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Inspector - - Selection Change - - Inspector - - Selection Change - - Inspector - - Reset Text_Format_Dst Aya.DataBinding.TextFormatValueBinder - - Inspector - - Inspector - - Inspector - - Inspector - - Inspector - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change --- !u!4 &926360979 Transform: m_ObjectHideFlags: 3 @@ -2245,9 +2212,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &938944959 GameObject: @@ -2278,6 +2246,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 842783192} m_RootOrder: 1 @@ -2302,6 +2271,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2340,7 +2310,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97095e7019af5c24698845b959cdb3c0, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: Text Direction: 1 UpdateType: 0 @@ -2373,6 +2343,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 772263128} m_RootOrder: 1 @@ -2397,6 +2368,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2451,6 +2423,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 715289686} m_RootOrder: 0 @@ -2475,6 +2448,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2525,6 +2499,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 378955130} m_RootOrder: 1 @@ -2549,6 +2524,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2603,6 +2579,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1289513810} m_RootOrder: 0 @@ -2627,6 +2604,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2707,6 +2685,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1221117633 Canvas: m_ObjectHideFlags: 0 @@ -2738,6 +2717,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2003445636} - {fileID: 842783192} @@ -2755,36 +2735,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1239341353 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1239341354} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1239341354 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239341353} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 605.5206, y: 384.56158, z: -28.484934} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1275354878 GameObject: m_ObjectHideFlags: 0 @@ -2813,6 +2763,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 911983365} m_Father: {fileID: 1737860255} @@ -2838,6 +2789,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2888,6 +2840,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1211954509} m_Father: {fileID: 1495158506} @@ -2913,6 +2866,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2963,6 +2917,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1848779270} m_RootOrder: 0 @@ -2987,6 +2942,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3038,6 +2994,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 579003092} m_RootOrder: 0 @@ -3062,6 +3019,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3096,7 +3054,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cbef07fdc5cc1cb4d92bd38b1a40052f, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: Color Direction: 0 UpdateType: 0 @@ -3129,6 +3087,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2124329599} m_Father: {fileID: 18104507} @@ -3154,6 +3113,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3204,6 +3164,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1289513810} - {fileID: 2108319873} @@ -3229,6 +3190,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -3274,7 +3236,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c570d4d2df23d5340b5117eb6840f11c, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: Toggle Direction: 0 UpdateType: 0 @@ -3308,6 +3270,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1599865660} m_RootOrder: 1 @@ -3332,6 +3295,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3370,7 +3334,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ad4f92a4a23e70642b3ee87cf3d4d257, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: BindFormatValueSrc Direction: 1 UpdateType: 0 @@ -3402,6 +3366,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 18104507} - {fileID: 2004425080} @@ -3493,6 +3458,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -3523,6 +3489,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 614389346} - {fileID: 1500002556} @@ -3562,6 +3529,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 772263128} m_RootOrder: 0 @@ -3586,6 +3554,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3640,6 +3609,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1275354879} - {fileID: 204227486} @@ -3665,6 +3635,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -3710,7 +3681,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c570d4d2df23d5340b5117eb6840f11c, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: Toggle Direction: 1 UpdateType: 0 @@ -3743,6 +3714,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 378955130} m_RootOrder: 0 @@ -3767,6 +3739,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3822,6 +3795,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 579003092} m_RootOrder: 1 @@ -3846,6 +3820,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3880,7 +3855,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cbef07fdc5cc1cb4d92bd38b1a40052f, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: Color Direction: 1 UpdateType: 0 @@ -3913,6 +3888,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1313683260} - {fileID: 715289686} @@ -3939,6 +3915,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -3987,7 +3964,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b35c69b2f33d1fa4992b5c05a361b13f, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: AutoConvert Direction: 1 UpdateType: 0 @@ -4068,6 +4045,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1885854701 @@ -4080,6 +4058,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -4114,6 +4093,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -4146,6 +4126,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -4176,6 +4157,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1495158506} - {fileID: 1737860255} @@ -4216,6 +4198,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1508905514} m_RootOrder: 1 @@ -4240,6 +4223,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4278,7 +4262,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97095e7019af5c24698845b959cdb3c0, type: 3} m_Name: m_EditorClassIdentifier: - Context: Default + Container: Default Key: AutoConvert Direction: 1 UpdateType: 0 @@ -4311,6 +4295,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1495158506} m_RootOrder: 1 @@ -4335,6 +4320,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4389,6 +4375,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1444000358} m_RootOrder: 0 @@ -4413,6 +4400,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Samples/Sample_02_TypeBinder/Script/UBindSampleGameManager.cs b/Samples/Sample_02_TypeBinder/Script/UBindSampleGameManager.cs index a78bec3..34d2085 100644 --- a/Samples/Sample_02_TypeBinder/Script/UBindSampleGameManager.cs +++ b/Samples/Sample_02_TypeBinder/Script/UBindSampleGameManager.cs @@ -1,9 +1,11 @@ -using System.Collections; +using System; +using System.Collections; using UnityEngine; using Aya.DataBinding; namespace Aya.Sample { + [Serializable] public class UBindSamplePlayerData { public string Name; @@ -19,8 +21,17 @@ public class UBindSampleGameManager : MonoBehaviour public void Awake() { Player = new UBindSamplePlayerData() {Name = "Player",}; + + // Source UBind.BindSource("PlayerData", Player); - StartCoroutine(_test()); + + // Manual Both + // UBind.BindBoth(nameof(UBindSamplePlayerData) + "." + nameof(Player.Name) + ".PlayerData", Player, nameof(Player.Name)); + // UBind.BindBoth(nameof(UBindSamplePlayerData) + "." + nameof(Player.Exp) + ".PlayerData", Player, nameof(Player.Exp)); + // UBind.BindBoth(nameof(UBindSamplePlayerData) + "." + nameof(Player.Stat) + ".PlayerData", Player, nameof(Player.Stat)); + // UBind.BindBoth(nameof(UBindSamplePlayerData) + "." + nameof(Player.PlayTime) + ".PlayerData", Player, nameof(Player.PlayTime)); + + // StartCoroutine(_test()); } IEnumerator _test()