From cd0bf9983732caacc674c800df5adfca82d4e916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Heiling?= Date: Sat, 2 Dec 2023 09:19:26 +0100 Subject: [PATCH] v3.0.0 --- Common/Scripts/BoolEvent.cs | 8 - Common/Scripts/BoolEvent.cs.meta | 13 - Common/Scripts/BoolSignal.cs | 2 +- Common/Scripts/BoolSignalListener.cs | 2 +- Common/Scripts/BoolValueReference.cs | 11 - Common/Scripts/BoolValueReference.cs.meta | 13 - Common/Scripts/CharEvent.cs | 8 - Common/Scripts/CharEvent.cs.meta | 13 - Common/Scripts/CharSignal.cs | 2 +- Common/Scripts/CharSignalListener.cs | 2 +- Common/Scripts/CharValueReference.cs | 11 - Common/Scripts/CharValueReference.cs.meta | 13 - Common/Scripts/Editor/BoolSignalEditor.cs | 2 +- .../Editor/BoolValueReferenceDrawer.cs | 2 +- Common/Scripts/Editor/CharSignalEditor.cs | 2 +- .../Editor/CharValueReferenceDrawer.cs | 2 +- Common/Scripts/Editor/FloatSignalEditor.cs | 2 +- .../Editor/FloatValueReferenceDrawer.cs | 2 +- Common/Scripts/Editor/IntSignalEditor.cs | 2 +- .../Scripts/Editor/IntValueReferenceDrawer.cs | 2 +- .../Scripts/Editor/QuaternionSignalEditor.cs | 2 +- .../Editor/QuaternionValueReferenceDrawer.cs | 6 +- .../Editor/Signals.Common.Editor.asmdef | 1 + Common/Scripts/Editor/StringSignalEditor.cs | 2 +- .../Editor/StringValueReferenceDrawer.cs | 2 +- .../Scripts/Editor/Vector2IntSignalEditor.cs | 2 +- .../Editor/Vector2IntValueReferenceDrawer.cs | 3 +- Common/Scripts/Editor/Vector2SignalEditor.cs | 2 +- .../Editor/Vector2ValueReferenceDrawer.cs | 3 +- .../Scripts/Editor/Vector3IntSignalEditor.cs | 2 +- .../Editor/Vector3IntValueReferenceDrawer.cs | 3 +- Common/Scripts/Editor/Vector3SignalEditor.cs | 2 +- .../Editor/Vector3ValueReferenceDrawer.cs | 5 +- Common/Scripts/Editor/Vector4SignalEditor.cs | 2 +- .../Editor/Vector4ValueReferenceDrawer.cs | 2 +- Common/Scripts/FloatEvent.cs | 8 - Common/Scripts/FloatEvent.cs.meta | 13 - Common/Scripts/FloatSignal.cs | 2 +- Common/Scripts/FloatSignalListener.cs | 2 +- Common/Scripts/FloatValueReference.cs | 11 - Common/Scripts/FloatValueReference.cs.meta | 13 - Common/Scripts/IntEvent.cs | 8 - Common/Scripts/IntEvent.cs.meta | 13 - Common/Scripts/IntSignal.cs | 2 +- Common/Scripts/IntSignalListener.cs | 2 +- Common/Scripts/IntValueReference.cs | 11 - Common/Scripts/IntValueReference.cs.meta | 13 - Common/Scripts/QuaternionEvent.cs | 9 - Common/Scripts/QuaternionEvent.cs.meta | 13 - Common/Scripts/QuaternionSignal.cs | 2 +- Common/Scripts/QuaternionSignalListener.cs | 2 +- Common/Scripts/QuaternionValueReference.cs | 12 - .../Scripts/QuaternionValueReference.cs.meta | 13 - Common/Scripts/StringEvent.cs | 8 - Common/Scripts/StringEvent.cs.meta | 13 - Common/Scripts/StringSignal.cs | 2 +- Common/Scripts/StringSignalListener.cs | 2 +- Common/Scripts/StringValueReference.cs | 11 - Common/Scripts/StringValueReference.cs.meta | 13 - Common/Scripts/Vector2Event.cs | 9 - Common/Scripts/Vector2Event.cs.meta | 13 - Common/Scripts/Vector2IntEvent.cs | 9 - Common/Scripts/Vector2IntEvent.cs.meta | 13 - Common/Scripts/Vector2IntSignal.cs | 2 +- Common/Scripts/Vector2IntSignalListener.cs | 2 +- Common/Scripts/Vector2IntValueReference.cs | 12 - .../Scripts/Vector2IntValueReference.cs.meta | 13 - Common/Scripts/Vector2Signal.cs | 2 +- Common/Scripts/Vector2SignalListener.cs | 2 +- Common/Scripts/Vector2ValueReference.cs | 12 - Common/Scripts/Vector2ValueReference.cs.meta | 13 - Common/Scripts/Vector3Event.cs | 9 - Common/Scripts/Vector3Event.cs.meta | 13 - Common/Scripts/Vector3IntEvent.cs | 9 - Common/Scripts/Vector3IntEvent.cs.meta | 13 - Common/Scripts/Vector3IntSignal.cs | 2 +- Common/Scripts/Vector3IntSignalListener.cs | 2 +- Common/Scripts/Vector3IntValueReference.cs | 12 - .../Scripts/Vector3IntValueReference.cs.meta | 13 - Common/Scripts/Vector3Signal.cs | 2 +- Common/Scripts/Vector3SignalListener.cs | 2 +- Common/Scripts/Vector3ValueReference.cs | 12 - Common/Scripts/Vector3ValueReference.cs.meta | 13 - Common/Scripts/Vector4Event.cs | 9 - Common/Scripts/Vector4Event.cs.meta | 13 - Common/Scripts/Vector4Signal.cs | 2 +- Common/Scripts/Vector4SignalListener.cs | 2 +- Common/Scripts/Vector4ValueReference.cs | 12 - Common/Scripts/Vector4ValueReference.cs.meta | 13 - Examples/Example1/Scene.unity | 358 +++-- .../Scripts/ExamplePlayerCharacterInput.cs | 3 +- Examples/Example1/Scripts/Name.cs | 3 +- Examples/Example3/Scene.unity | 1250 +++++++++++------ .../Example3/Scripts/GravityYSignalUpdater.cs | 3 +- .../Scripts/TimeScaleSignalUpdater.cs | 3 +- ...layerCharacterInputSettingsSignalEditor.cs | 2 +- .../RigidbodyCharacterSettingsSignalEditor.cs | 2 +- .../Scripts/PlayerCharacterInput.cs | 2 +- .../PlayerCharacterInputSettingsEvent.cs | 8 - .../PlayerCharacterInputSettingsEvent.cs.meta | 13 - .../PlayerCharacterInputSettingsSignal.cs | 2 +- ...yerCharacterInputSettingsValueReference.cs | 12 - ...aracterInputSettingsValueReference.cs.meta | 13 - .../Characters/Scripts/RigidbodyCharacter.cs | 4 +- .../Scripts/RigidbodyCharacterSettings.cs | 2 +- .../RigidbodyCharacterSettingsEvent.cs | 8 - .../RigidbodyCharacterSettingsEvent.cs.meta | 13 - .../RigidbodyCharacterSettingsSignal.cs | 2 +- ...igidbodyCharacterSettingsValueReference.cs | 12 - ...odyCharacterSettingsValueReference.cs.meta | 13 - .../Scripts/TopDownPlayerCharacterInput.cs | 5 +- .../Scripts/ApplicationSettingsEvent.cs | 8 - .../Scripts/ApplicationSettingsEvent.cs.meta | 13 - .../Scripts/ApplicationSettingsSignal.cs | 2 +- .../ApplicationSettingsValueReference.cs | 7 - .../ApplicationSettingsValueReference.cs.meta | 13 - Extras/Engine/Scripts/ApplicationSetup.cs | 2 +- .../Editor/ApplicationSettingsSignalEditor.cs | 2 +- .../Editor/EngineSettingsSignalEditor.cs | 3 +- .../Scripts/Editor/EngineSetupEditor.cs | 3 +- .../Editor/PhysicsSettingsSignalEditor.cs | 2 +- .../Editor/TimeSettingsSignalEditor.cs | 2 +- .../Scripts/Editor/TimeWrapperEditor.cs | 3 +- Extras/Engine/Scripts/EngineSettingsSignal.cs | 9 +- Extras/Engine/Scripts/EngineSetup.cs | 14 +- Extras/Engine/Scripts/PhysicsSettings.cs | 2 +- Extras/Engine/Scripts/PhysicsSettingsEvent.cs | 8 - .../Scripts/PhysicsSettingsEvent.cs.meta | 13 - .../Engine/Scripts/PhysicsSettingsSignal.cs | 2 +- .../Scripts/PhysicsSettingsValueReference.cs | 7 - .../PhysicsSettingsValueReference.cs.meta | 13 - Extras/Engine/Scripts/PhysicsSetup.cs | 2 +- Extras/Engine/Scripts/TimeSettingsEvent.cs | 8 - .../Engine/Scripts/TimeSettingsEvent.cs.meta | 13 - Extras/Engine/Scripts/TimeSettingsSignal.cs | 2 +- .../Scripts/TimeSettingsValueReference.cs | 7 - .../TimeSettingsValueReference.cs.meta | 13 - Extras/Engine/Scripts/TimeSetup.cs | 2 +- Extras/Utility/Scripts/EulerAnglesTracker.cs | 5 +- Extras/Utility/Scripts/PositionTracker.cs | 5 +- Extras/Utility/Scripts/RotationTracker.cs | 5 +- README.md | 41 +- Scripts/Editor/SignalEditor.cs | 5 +- Scripts/Editor/ValueReferenceDrawer.cs | 10 +- Scripts/ISignal.cs | 3 +- Scripts/Signal.cs | 7 +- Scripts/SignalListener.cs | 15 +- Scripts/ValueReference.cs | 16 +- Scripts/ValueReferenceComponent.cs | 14 +- 149 files changed, 1202 insertions(+), 1438 deletions(-) delete mode 100644 Common/Scripts/BoolEvent.cs delete mode 100644 Common/Scripts/BoolEvent.cs.meta delete mode 100644 Common/Scripts/BoolValueReference.cs delete mode 100644 Common/Scripts/BoolValueReference.cs.meta delete mode 100644 Common/Scripts/CharEvent.cs delete mode 100644 Common/Scripts/CharEvent.cs.meta delete mode 100644 Common/Scripts/CharValueReference.cs delete mode 100644 Common/Scripts/CharValueReference.cs.meta delete mode 100644 Common/Scripts/FloatEvent.cs delete mode 100644 Common/Scripts/FloatEvent.cs.meta delete mode 100644 Common/Scripts/FloatValueReference.cs delete mode 100644 Common/Scripts/FloatValueReference.cs.meta delete mode 100644 Common/Scripts/IntEvent.cs delete mode 100644 Common/Scripts/IntEvent.cs.meta delete mode 100644 Common/Scripts/IntValueReference.cs delete mode 100644 Common/Scripts/IntValueReference.cs.meta delete mode 100644 Common/Scripts/QuaternionEvent.cs delete mode 100644 Common/Scripts/QuaternionEvent.cs.meta delete mode 100644 Common/Scripts/QuaternionValueReference.cs delete mode 100644 Common/Scripts/QuaternionValueReference.cs.meta delete mode 100644 Common/Scripts/StringEvent.cs delete mode 100644 Common/Scripts/StringEvent.cs.meta delete mode 100644 Common/Scripts/StringValueReference.cs delete mode 100644 Common/Scripts/StringValueReference.cs.meta delete mode 100644 Common/Scripts/Vector2Event.cs delete mode 100644 Common/Scripts/Vector2Event.cs.meta delete mode 100644 Common/Scripts/Vector2IntEvent.cs delete mode 100644 Common/Scripts/Vector2IntEvent.cs.meta delete mode 100644 Common/Scripts/Vector2IntValueReference.cs delete mode 100644 Common/Scripts/Vector2IntValueReference.cs.meta delete mode 100644 Common/Scripts/Vector2ValueReference.cs delete mode 100644 Common/Scripts/Vector2ValueReference.cs.meta delete mode 100644 Common/Scripts/Vector3Event.cs delete mode 100644 Common/Scripts/Vector3Event.cs.meta delete mode 100644 Common/Scripts/Vector3IntEvent.cs delete mode 100644 Common/Scripts/Vector3IntEvent.cs.meta delete mode 100644 Common/Scripts/Vector3IntValueReference.cs delete mode 100644 Common/Scripts/Vector3IntValueReference.cs.meta delete mode 100644 Common/Scripts/Vector3ValueReference.cs delete mode 100644 Common/Scripts/Vector3ValueReference.cs.meta delete mode 100644 Common/Scripts/Vector4Event.cs delete mode 100644 Common/Scripts/Vector4Event.cs.meta delete mode 100644 Common/Scripts/Vector4ValueReference.cs delete mode 100644 Common/Scripts/Vector4ValueReference.cs.meta delete mode 100644 Extras/Characters/Scripts/PlayerCharacterInputSettingsEvent.cs delete mode 100644 Extras/Characters/Scripts/PlayerCharacterInputSettingsEvent.cs.meta delete mode 100644 Extras/Characters/Scripts/PlayerCharacterInputSettingsValueReference.cs delete mode 100644 Extras/Characters/Scripts/PlayerCharacterInputSettingsValueReference.cs.meta delete mode 100644 Extras/Characters/Scripts/RigidbodyCharacterSettingsEvent.cs delete mode 100644 Extras/Characters/Scripts/RigidbodyCharacterSettingsEvent.cs.meta delete mode 100644 Extras/Characters/Scripts/RigidbodyCharacterSettingsValueReference.cs delete mode 100644 Extras/Characters/Scripts/RigidbodyCharacterSettingsValueReference.cs.meta delete mode 100644 Extras/Engine/Scripts/ApplicationSettingsEvent.cs delete mode 100644 Extras/Engine/Scripts/ApplicationSettingsEvent.cs.meta delete mode 100644 Extras/Engine/Scripts/ApplicationSettingsValueReference.cs delete mode 100644 Extras/Engine/Scripts/ApplicationSettingsValueReference.cs.meta delete mode 100644 Extras/Engine/Scripts/PhysicsSettingsEvent.cs delete mode 100644 Extras/Engine/Scripts/PhysicsSettingsEvent.cs.meta delete mode 100644 Extras/Engine/Scripts/PhysicsSettingsValueReference.cs delete mode 100644 Extras/Engine/Scripts/PhysicsSettingsValueReference.cs.meta delete mode 100644 Extras/Engine/Scripts/TimeSettingsEvent.cs delete mode 100644 Extras/Engine/Scripts/TimeSettingsEvent.cs.meta delete mode 100644 Extras/Engine/Scripts/TimeSettingsValueReference.cs delete mode 100644 Extras/Engine/Scripts/TimeSettingsValueReference.cs.meta diff --git a/Common/Scripts/BoolEvent.cs b/Common/Scripts/BoolEvent.cs deleted file mode 100644 index c260ed3..0000000 --- a/Common/Scripts/BoolEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class BoolEvent : UnityEvent { } -} diff --git a/Common/Scripts/BoolEvent.cs.meta b/Common/Scripts/BoolEvent.cs.meta deleted file mode 100644 index 50b16d1..0000000 --- a/Common/Scripts/BoolEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 134cc8e684253ca4f803d5ea78fac293 -timeCreated: 1518081956 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/BoolSignal.cs b/Common/Scripts/BoolSignal.cs index 32b63c9..2f4466e 100644 --- a/Common/Scripts/BoolSignal.cs +++ b/Common/Scripts/BoolSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(BoolSignal))] - public class BoolSignal : Signal { } + public class BoolSignal : Signal { } } diff --git a/Common/Scripts/BoolSignalListener.cs b/Common/Scripts/BoolSignalListener.cs index b8f26a5..52fd954 100644 --- a/Common/Scripts/BoolSignalListener.cs +++ b/Common/Scripts/BoolSignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(BoolSignalListener))] - public class BoolSignalListener : SignalListener { } + public class BoolSignalListener : SignalListener { } } diff --git a/Common/Scripts/BoolValueReference.cs b/Common/Scripts/BoolValueReference.cs deleted file mode 100644 index d612857..0000000 --- a/Common/Scripts/BoolValueReference.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Signals.Common -{ - [Serializable] - public class BoolValueReference : ValueReference - { - public BoolValueReference() { } - public BoolValueReference(bool localValue) : base(localValue) { } - } -} diff --git a/Common/Scripts/BoolValueReference.cs.meta b/Common/Scripts/BoolValueReference.cs.meta deleted file mode 100644 index e260e7e..0000000 --- a/Common/Scripts/BoolValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: cbe6ff9bc1c24bb468f14e0189c6ec50 -timeCreated: 1518081957 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/CharEvent.cs b/Common/Scripts/CharEvent.cs deleted file mode 100644 index 8b90f56..0000000 --- a/Common/Scripts/CharEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class CharEvent : UnityEvent { } -} diff --git a/Common/Scripts/CharEvent.cs.meta b/Common/Scripts/CharEvent.cs.meta deleted file mode 100644 index 5da1e49..0000000 --- a/Common/Scripts/CharEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: a54ccee0514bed14c9973f4022c1ee1b -timeCreated: 1518081957 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/CharSignal.cs b/Common/Scripts/CharSignal.cs index ae396fc..70bbf18 100644 --- a/Common/Scripts/CharSignal.cs +++ b/Common/Scripts/CharSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(CharSignal))] - public class CharSignal : Signal { } + public class CharSignal : Signal { } } diff --git a/Common/Scripts/CharSignalListener.cs b/Common/Scripts/CharSignalListener.cs index 1c0c6a0..769a92e 100644 --- a/Common/Scripts/CharSignalListener.cs +++ b/Common/Scripts/CharSignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(CharSignalListener))] - public class CharSignalListener : SignalListener { } + public class CharSignalListener : SignalListener { } } diff --git a/Common/Scripts/CharValueReference.cs b/Common/Scripts/CharValueReference.cs deleted file mode 100644 index d75def9..0000000 --- a/Common/Scripts/CharValueReference.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Signals.Common -{ - [Serializable] - public class CharValueReference : ValueReference - { - public CharValueReference() { } - public CharValueReference(char localValue) : base(localValue) { } - } -} diff --git a/Common/Scripts/CharValueReference.cs.meta b/Common/Scripts/CharValueReference.cs.meta deleted file mode 100644 index d38f7b6..0000000 --- a/Common/Scripts/CharValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: e96e41d1081a23f4bb2a6f09c0aff2ed -timeCreated: 1518081957 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Editor/BoolSignalEditor.cs b/Common/Scripts/Editor/BoolSignalEditor.cs index cdbd8ba..cf0050b 100644 --- a/Common/Scripts/Editor/BoolSignalEditor.cs +++ b/Common/Scripts/Editor/BoolSignalEditor.cs @@ -3,7 +3,7 @@ namespace Signals.Common { [CustomEditor(typeof(BoolSignal), true)] - public class BoolSignalEditor : SignalEditor + public class BoolSignalEditor : SignalEditor { protected override bool ValueField(bool value) => EditorGUILayout.Toggle(value); } diff --git a/Common/Scripts/Editor/BoolValueReferenceDrawer.cs b/Common/Scripts/Editor/BoolValueReferenceDrawer.cs index 1c48491..ca87479 100644 --- a/Common/Scripts/Editor/BoolValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/BoolValueReferenceDrawer.cs @@ -2,6 +2,6 @@ namespace Signals.Common { - [CustomPropertyDrawer(typeof(BoolValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class BoolValueReferenceDrawer : ValueReferenceDrawer { } } diff --git a/Common/Scripts/Editor/CharSignalEditor.cs b/Common/Scripts/Editor/CharSignalEditor.cs index a259688..8454e75 100644 --- a/Common/Scripts/Editor/CharSignalEditor.cs +++ b/Common/Scripts/Editor/CharSignalEditor.cs @@ -3,7 +3,7 @@ namespace Signals.Common { [CustomEditor(typeof(CharSignal), true)] - public class CharSignalEditor : SignalEditor + public class CharSignalEditor : SignalEditor { protected override char ValueField(char value) { diff --git a/Common/Scripts/Editor/CharValueReferenceDrawer.cs b/Common/Scripts/Editor/CharValueReferenceDrawer.cs index b781f7b..c099686 100644 --- a/Common/Scripts/Editor/CharValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/CharValueReferenceDrawer.cs @@ -2,6 +2,6 @@ namespace Signals.Common { - [CustomPropertyDrawer(typeof(CharValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class CharValueReferenceDrawer : ValueReferenceDrawer { } } diff --git a/Common/Scripts/Editor/FloatSignalEditor.cs b/Common/Scripts/Editor/FloatSignalEditor.cs index 513da1d..8f676d4 100644 --- a/Common/Scripts/Editor/FloatSignalEditor.cs +++ b/Common/Scripts/Editor/FloatSignalEditor.cs @@ -3,7 +3,7 @@ namespace Signals.Common { [CustomEditor(typeof(FloatSignal), true)] - public class FloatSignalEditor : SignalEditor + public class FloatSignalEditor : SignalEditor { protected override float ValueField(float value) => EditorGUILayout.DelayedFloatField(value); } diff --git a/Common/Scripts/Editor/FloatValueReferenceDrawer.cs b/Common/Scripts/Editor/FloatValueReferenceDrawer.cs index aaf65af..ff51b45 100644 --- a/Common/Scripts/Editor/FloatValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/FloatValueReferenceDrawer.cs @@ -2,6 +2,6 @@ namespace Signals.Common { - [CustomPropertyDrawer(typeof(FloatValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class FloatValueReferenceDrawer : ValueReferenceDrawer { } } \ No newline at end of file diff --git a/Common/Scripts/Editor/IntSignalEditor.cs b/Common/Scripts/Editor/IntSignalEditor.cs index cf8169c..6177ebf 100644 --- a/Common/Scripts/Editor/IntSignalEditor.cs +++ b/Common/Scripts/Editor/IntSignalEditor.cs @@ -3,7 +3,7 @@ namespace Signals.Common { [CustomEditor(typeof(IntSignal), true)] - public class IntSignalEditor : SignalEditor + public class IntSignalEditor : SignalEditor { protected override int ValueField(int value) => EditorGUILayout.DelayedIntField(value); } diff --git a/Common/Scripts/Editor/IntValueReferenceDrawer.cs b/Common/Scripts/Editor/IntValueReferenceDrawer.cs index 56408db..3c8ac75 100644 --- a/Common/Scripts/Editor/IntValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/IntValueReferenceDrawer.cs @@ -2,6 +2,6 @@ namespace Signals.Common { - [CustomPropertyDrawer(typeof(IntValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class IntValueReferenceDrawer : ValueReferenceDrawer { } } diff --git a/Common/Scripts/Editor/QuaternionSignalEditor.cs b/Common/Scripts/Editor/QuaternionSignalEditor.cs index d1e2e02..c6c0b9c 100644 --- a/Common/Scripts/Editor/QuaternionSignalEditor.cs +++ b/Common/Scripts/Editor/QuaternionSignalEditor.cs @@ -4,7 +4,7 @@ namespace Signals.Common { [CustomEditor(typeof(QuaternionSignal), true)] - public class QuaternionSignalEditor : SignalEditor + public class QuaternionSignalEditor : SignalEditor { protected override Quaternion ValueField(Quaternion value) { diff --git a/Common/Scripts/Editor/QuaternionValueReferenceDrawer.cs b/Common/Scripts/Editor/QuaternionValueReferenceDrawer.cs index 0b667c4..1d313a4 100644 --- a/Common/Scripts/Editor/QuaternionValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/QuaternionValueReferenceDrawer.cs @@ -3,12 +3,12 @@ namespace Signals.Common { - [CustomPropertyDrawer(typeof(QuaternionValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class QuaternionValueReferenceDrawer : ValueReferenceDrawer { - static Vector4 QuaternionToVector4(Quaternion quaternion) => new Vector4(quaternion.x, quaternion.y, quaternion.z, quaternion.w); + static Vector4 QuaternionToVector4(Quaternion quaternion) => new(quaternion.x, quaternion.y, quaternion.z, quaternion.w); - static Quaternion Vector4ToQuaternion(Vector4 vector) => new Quaternion(vector.x, vector.y, vector.z, vector.w); + static Quaternion Vector4ToQuaternion(Vector4 vector) => new(vector.x, vector.y, vector.z, vector.w); protected override void LocalValueField(Rect position, SerializedProperty localValue) => localValue.quaternionValue = Vector4ToQuaternion(EditorGUI.Vector4Field(position, GUIContent.none, QuaternionToVector4(localValue.quaternionValue))); diff --git a/Common/Scripts/Editor/Signals.Common.Editor.asmdef b/Common/Scripts/Editor/Signals.Common.Editor.asmdef index 5a99954..56d35e7 100644 --- a/Common/Scripts/Editor/Signals.Common.Editor.asmdef +++ b/Common/Scripts/Editor/Signals.Common.Editor.asmdef @@ -1,6 +1,7 @@ { "name": "Signals.Common.Editor", "references": [ + "Signals", "Signals.Editor", "Signals.Common" ], diff --git a/Common/Scripts/Editor/StringSignalEditor.cs b/Common/Scripts/Editor/StringSignalEditor.cs index 1a35cb7..3675bb9 100644 --- a/Common/Scripts/Editor/StringSignalEditor.cs +++ b/Common/Scripts/Editor/StringSignalEditor.cs @@ -3,7 +3,7 @@ namespace Signals.Common { [CustomEditor(typeof(StringSignal), true)] - public class StringSignalEditor : SignalEditor + public class StringSignalEditor : SignalEditor { protected override string ValueField(string value) => EditorGUILayout.DelayedTextField(value); } diff --git a/Common/Scripts/Editor/StringValueReferenceDrawer.cs b/Common/Scripts/Editor/StringValueReferenceDrawer.cs index 814c728..abd5648 100644 --- a/Common/Scripts/Editor/StringValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/StringValueReferenceDrawer.cs @@ -2,6 +2,6 @@ namespace Signals.Common { - [CustomPropertyDrawer(typeof(StringValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class StringValueReferenceDrawer : ValueReferenceDrawer { } } \ No newline at end of file diff --git a/Common/Scripts/Editor/Vector2IntSignalEditor.cs b/Common/Scripts/Editor/Vector2IntSignalEditor.cs index 7cd7ca8..3e74f58 100644 --- a/Common/Scripts/Editor/Vector2IntSignalEditor.cs +++ b/Common/Scripts/Editor/Vector2IntSignalEditor.cs @@ -4,7 +4,7 @@ namespace Signals.Common { [CustomEditor(typeof(Vector2IntSignal), true)] - public class Vector2IntSignalEditor : SignalEditor + public class Vector2IntSignalEditor : SignalEditor { protected override Vector2Int ValueField(Vector2Int value) => EditorGUILayout.Vector2IntField("", value); } diff --git a/Common/Scripts/Editor/Vector2IntValueReferenceDrawer.cs b/Common/Scripts/Editor/Vector2IntValueReferenceDrawer.cs index bb3b63c..eab3c23 100644 --- a/Common/Scripts/Editor/Vector2IntValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/Vector2IntValueReferenceDrawer.cs @@ -1,7 +1,8 @@ using UnityEditor; +using UnityEngine; namespace Signals.Common { - [CustomPropertyDrawer(typeof(Vector2IntValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class Vector2IntValueReferenceDrawer : ValueReferenceDrawer { } } diff --git a/Common/Scripts/Editor/Vector2SignalEditor.cs b/Common/Scripts/Editor/Vector2SignalEditor.cs index 8b19ddc..274bdf0 100644 --- a/Common/Scripts/Editor/Vector2SignalEditor.cs +++ b/Common/Scripts/Editor/Vector2SignalEditor.cs @@ -4,7 +4,7 @@ namespace Signals.Common { [CustomEditor(typeof(Vector2Signal), true)] - public class Vector2SignalEditor : SignalEditor + public class Vector2SignalEditor : SignalEditor { protected override Vector2 ValueField(Vector2 value) => EditorGUILayout.Vector2Field("", value); } diff --git a/Common/Scripts/Editor/Vector2ValueReferenceDrawer.cs b/Common/Scripts/Editor/Vector2ValueReferenceDrawer.cs index 9450e72..387562d 100644 --- a/Common/Scripts/Editor/Vector2ValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/Vector2ValueReferenceDrawer.cs @@ -1,7 +1,8 @@ +using UnityEngine; using UnityEditor; namespace Signals.Common { - [CustomPropertyDrawer(typeof(Vector2ValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class Vector2ValueReferenceDrawer : ValueReferenceDrawer { } } diff --git a/Common/Scripts/Editor/Vector3IntSignalEditor.cs b/Common/Scripts/Editor/Vector3IntSignalEditor.cs index 4f9258f..129fd70 100644 --- a/Common/Scripts/Editor/Vector3IntSignalEditor.cs +++ b/Common/Scripts/Editor/Vector3IntSignalEditor.cs @@ -4,7 +4,7 @@ namespace Signals.Common { [CustomEditor(typeof(Vector3IntSignal), true)] - public class Vector3IntSignalEditor : SignalEditor + public class Vector3IntSignalEditor : SignalEditor { protected override Vector3Int ValueField(Vector3Int value) => EditorGUILayout.Vector3IntField("", value); } diff --git a/Common/Scripts/Editor/Vector3IntValueReferenceDrawer.cs b/Common/Scripts/Editor/Vector3IntValueReferenceDrawer.cs index d8ac443..1a19b47 100644 --- a/Common/Scripts/Editor/Vector3IntValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/Vector3IntValueReferenceDrawer.cs @@ -1,7 +1,8 @@ +using UnityEngine; using UnityEditor; namespace Signals.Common { - [CustomPropertyDrawer(typeof(Vector3IntValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class Vector3IntValueReferenceDrawer : ValueReferenceDrawer { } } diff --git a/Common/Scripts/Editor/Vector3SignalEditor.cs b/Common/Scripts/Editor/Vector3SignalEditor.cs index f88ee35..ca1468d 100644 --- a/Common/Scripts/Editor/Vector3SignalEditor.cs +++ b/Common/Scripts/Editor/Vector3SignalEditor.cs @@ -4,7 +4,7 @@ namespace Signals.Common { [CustomEditor(typeof(Vector3Signal), true)] - public class Vector3SignalEditor : SignalEditor + public class Vector3SignalEditor : SignalEditor { protected override Vector3 ValueField(Vector3 value) => EditorGUILayout.Vector3Field("", value); } diff --git a/Common/Scripts/Editor/Vector3ValueReferenceDrawer.cs b/Common/Scripts/Editor/Vector3ValueReferenceDrawer.cs index 1b804e1..e2c960d 100644 --- a/Common/Scripts/Editor/Vector3ValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/Vector3ValueReferenceDrawer.cs @@ -1,7 +1,8 @@ -using UnityEditor; +using UnityEngine; +using UnityEditor; namespace Signals.Common { - [CustomPropertyDrawer(typeof(Vector3ValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class Vector3ValueReferenceDrawer : ValueReferenceDrawer { } } \ No newline at end of file diff --git a/Common/Scripts/Editor/Vector4SignalEditor.cs b/Common/Scripts/Editor/Vector4SignalEditor.cs index b6008bc..83e043f 100644 --- a/Common/Scripts/Editor/Vector4SignalEditor.cs +++ b/Common/Scripts/Editor/Vector4SignalEditor.cs @@ -4,7 +4,7 @@ namespace Signals.Common { [CustomEditor(typeof(Vector4Signal), true)] - public class Vector4SignalEditor : SignalEditor + public class Vector4SignalEditor : SignalEditor { protected override Vector4 ValueField(Vector4 value) => EditorGUILayout.Vector4Field("", value); } diff --git a/Common/Scripts/Editor/Vector4ValueReferenceDrawer.cs b/Common/Scripts/Editor/Vector4ValueReferenceDrawer.cs index ebe63a8..f13ef71 100644 --- a/Common/Scripts/Editor/Vector4ValueReferenceDrawer.cs +++ b/Common/Scripts/Editor/Vector4ValueReferenceDrawer.cs @@ -3,7 +3,7 @@ namespace Signals.Common { - [CustomPropertyDrawer(typeof(Vector4ValueReference))] + [CustomPropertyDrawer(typeof(ValueReference))] public class Vector4ValueReferenceDrawer : ValueReferenceDrawer { protected override void LocalValueField(Rect position, SerializedProperty localValue) => diff --git a/Common/Scripts/FloatEvent.cs b/Common/Scripts/FloatEvent.cs deleted file mode 100644 index 20cc9a9..0000000 --- a/Common/Scripts/FloatEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class FloatEvent : UnityEvent { } -} \ No newline at end of file diff --git a/Common/Scripts/FloatEvent.cs.meta b/Common/Scripts/FloatEvent.cs.meta deleted file mode 100644 index 396dae2..0000000 --- a/Common/Scripts/FloatEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 2982dce3a52a14945adf84b2d1cb2fe8 -timeCreated: 1517319754 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/FloatSignal.cs b/Common/Scripts/FloatSignal.cs index bc0d9f5..f72184c 100644 --- a/Common/Scripts/FloatSignal.cs +++ b/Common/Scripts/FloatSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(FloatSignal))] - public class FloatSignal : Signal { } + public class FloatSignal : Signal { } } \ No newline at end of file diff --git a/Common/Scripts/FloatSignalListener.cs b/Common/Scripts/FloatSignalListener.cs index 2683755..fb37b66 100644 --- a/Common/Scripts/FloatSignalListener.cs +++ b/Common/Scripts/FloatSignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(FloatSignalListener))] - public class FloatSignalListener : SignalListener { } + public class FloatSignalListener : SignalListener { } } \ No newline at end of file diff --git a/Common/Scripts/FloatValueReference.cs b/Common/Scripts/FloatValueReference.cs deleted file mode 100644 index 20274c4..0000000 --- a/Common/Scripts/FloatValueReference.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Signals.Common -{ - [Serializable] - public class FloatValueReference : ValueReference - { - public FloatValueReference() { } - public FloatValueReference(float localValue) : base(localValue) { } - } -} \ No newline at end of file diff --git a/Common/Scripts/FloatValueReference.cs.meta b/Common/Scripts/FloatValueReference.cs.meta deleted file mode 100644 index f9599cf..0000000 --- a/Common/Scripts/FloatValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 81779b26b7b04904eafff37db30c1167 -timeCreated: 1517341717 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/IntEvent.cs b/Common/Scripts/IntEvent.cs deleted file mode 100644 index a9567fb..0000000 --- a/Common/Scripts/IntEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class IntEvent : UnityEvent { } -} diff --git a/Common/Scripts/IntEvent.cs.meta b/Common/Scripts/IntEvent.cs.meta deleted file mode 100644 index 6dcd0a9..0000000 --- a/Common/Scripts/IntEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 25fde9c8fbc2edb4dba0d46b774a9ff8 -timeCreated: 1518033601 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/IntSignal.cs b/Common/Scripts/IntSignal.cs index a321a0f..dab819d 100644 --- a/Common/Scripts/IntSignal.cs +++ b/Common/Scripts/IntSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(IntSignal))] - public class IntSignal : Signal { } + public class IntSignal : Signal { } } diff --git a/Common/Scripts/IntSignalListener.cs b/Common/Scripts/IntSignalListener.cs index 6e40043..646101d 100644 --- a/Common/Scripts/IntSignalListener.cs +++ b/Common/Scripts/IntSignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(IntSignalListener))] - public class IntSignalListener : SignalListener { } + public class IntSignalListener : SignalListener { } } diff --git a/Common/Scripts/IntValueReference.cs b/Common/Scripts/IntValueReference.cs deleted file mode 100644 index b7d9b1b..0000000 --- a/Common/Scripts/IntValueReference.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Signals.Common -{ - [Serializable] - public class IntValueReference : ValueReference - { - public IntValueReference() { } - public IntValueReference(int localValue) : base(localValue) { } - } -} diff --git a/Common/Scripts/IntValueReference.cs.meta b/Common/Scripts/IntValueReference.cs.meta deleted file mode 100644 index 628f272..0000000 --- a/Common/Scripts/IntValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 78db9e1e40417b54798480fdb89095c2 -timeCreated: 1518033601 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/QuaternionEvent.cs b/Common/Scripts/QuaternionEvent.cs deleted file mode 100644 index 9cfda41..0000000 --- a/Common/Scripts/QuaternionEvent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class QuaternionEvent : UnityEvent { } -} diff --git a/Common/Scripts/QuaternionEvent.cs.meta b/Common/Scripts/QuaternionEvent.cs.meta deleted file mode 100644 index e025f4a..0000000 --- a/Common/Scripts/QuaternionEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 52bfb569488dda048b93bd65b6286d11 -timeCreated: 1518081956 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/QuaternionSignal.cs b/Common/Scripts/QuaternionSignal.cs index 0893b51..d57fb13 100644 --- a/Common/Scripts/QuaternionSignal.cs +++ b/Common/Scripts/QuaternionSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(QuaternionSignal))] - public class QuaternionSignal : Signal { } + public class QuaternionSignal : Signal { } } diff --git a/Common/Scripts/QuaternionSignalListener.cs b/Common/Scripts/QuaternionSignalListener.cs index d0e4612..aefe333 100644 --- a/Common/Scripts/QuaternionSignalListener.cs +++ b/Common/Scripts/QuaternionSignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(QuaternionSignalListener))] - public class QuaternionSignalListener : SignalListener { } + public class QuaternionSignalListener : SignalListener { } } diff --git a/Common/Scripts/QuaternionValueReference.cs b/Common/Scripts/QuaternionValueReference.cs deleted file mode 100644 index f1c889d..0000000 --- a/Common/Scripts/QuaternionValueReference.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using UnityEngine; - -namespace Signals.Common -{ - [Serializable] - public class QuaternionValueReference : ValueReference - { - public QuaternionValueReference() { } - public QuaternionValueReference(Quaternion localValue) : base(localValue) { } - } -} diff --git a/Common/Scripts/QuaternionValueReference.cs.meta b/Common/Scripts/QuaternionValueReference.cs.meta deleted file mode 100644 index dfa5158..0000000 --- a/Common/Scripts/QuaternionValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: c347269e43a65474991c2fdb0759b9ba -timeCreated: 1518081957 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/StringEvent.cs b/Common/Scripts/StringEvent.cs deleted file mode 100644 index f2b28ed..0000000 --- a/Common/Scripts/StringEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class StringEvent : UnityEvent { } -} \ No newline at end of file diff --git a/Common/Scripts/StringEvent.cs.meta b/Common/Scripts/StringEvent.cs.meta deleted file mode 100644 index 2f521a9..0000000 --- a/Common/Scripts/StringEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: bf862c8a04e132743905be1ffe991bc4 -timeCreated: 1517483562 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/StringSignal.cs b/Common/Scripts/StringSignal.cs index c6ea106..0e68fe2 100644 --- a/Common/Scripts/StringSignal.cs +++ b/Common/Scripts/StringSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(StringSignal))] - public class StringSignal : Signal { } + public class StringSignal : Signal { } } \ No newline at end of file diff --git a/Common/Scripts/StringSignalListener.cs b/Common/Scripts/StringSignalListener.cs index dcdfd85..11434b1 100644 --- a/Common/Scripts/StringSignalListener.cs +++ b/Common/Scripts/StringSignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(StringSignalListener))] - public class StringSignalListener : SignalListener { } + public class StringSignalListener : SignalListener { } } \ No newline at end of file diff --git a/Common/Scripts/StringValueReference.cs b/Common/Scripts/StringValueReference.cs deleted file mode 100644 index 7adb52b..0000000 --- a/Common/Scripts/StringValueReference.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Signals.Common -{ - [Serializable] - public class StringValueReference : ValueReference - { - public StringValueReference() { } - public StringValueReference(string localValue) : base(localValue) { } - } -} \ No newline at end of file diff --git a/Common/Scripts/StringValueReference.cs.meta b/Common/Scripts/StringValueReference.cs.meta deleted file mode 100644 index 47c37f9..0000000 --- a/Common/Scripts/StringValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 769dba08e3ade5b47913a4f57a6aba9d -timeCreated: 1517483561 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector2Event.cs b/Common/Scripts/Vector2Event.cs deleted file mode 100644 index a735a3f..0000000 --- a/Common/Scripts/Vector2Event.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class Vector2Event : UnityEvent { } -} diff --git a/Common/Scripts/Vector2Event.cs.meta b/Common/Scripts/Vector2Event.cs.meta deleted file mode 100644 index 7af4c33..0000000 --- a/Common/Scripts/Vector2Event.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 6db61281c54e9d049ab64907808576ce -timeCreated: 1518081956 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector2IntEvent.cs b/Common/Scripts/Vector2IntEvent.cs deleted file mode 100644 index 49e56b8..0000000 --- a/Common/Scripts/Vector2IntEvent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class Vector2IntEvent : UnityEvent { } -} diff --git a/Common/Scripts/Vector2IntEvent.cs.meta b/Common/Scripts/Vector2IntEvent.cs.meta deleted file mode 100644 index b9a3a13..0000000 --- a/Common/Scripts/Vector2IntEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: c81e69ebf34c7764bab3b13d5593ac72 -timeCreated: 1518081957 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector2IntSignal.cs b/Common/Scripts/Vector2IntSignal.cs index 010389d..c001234 100644 --- a/Common/Scripts/Vector2IntSignal.cs +++ b/Common/Scripts/Vector2IntSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Vector2IntSignal))] - public class Vector2IntSignal : Signal { } + public class Vector2IntSignal : Signal { } } diff --git a/Common/Scripts/Vector2IntSignalListener.cs b/Common/Scripts/Vector2IntSignalListener.cs index 4215d5d..45f7466 100644 --- a/Common/Scripts/Vector2IntSignalListener.cs +++ b/Common/Scripts/Vector2IntSignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(Vector2IntSignalListener))] - public class Vector2IntSignalListener : SignalListener { } + public class Vector2IntSignalListener : SignalListener { } } diff --git a/Common/Scripts/Vector2IntValueReference.cs b/Common/Scripts/Vector2IntValueReference.cs deleted file mode 100644 index 6b5e4c9..0000000 --- a/Common/Scripts/Vector2IntValueReference.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using UnityEngine; - -namespace Signals.Common -{ - [Serializable] - public class Vector2IntValueReference : ValueReference - { - public Vector2IntValueReference() { } - public Vector2IntValueReference(Vector2Int localValue) : base(localValue) { } - } -} diff --git a/Common/Scripts/Vector2IntValueReference.cs.meta b/Common/Scripts/Vector2IntValueReference.cs.meta deleted file mode 100644 index 742515f..0000000 --- a/Common/Scripts/Vector2IntValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 8a21fe4a5eb071c429c1065cc0d199e1 -timeCreated: 1518081957 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector2Signal.cs b/Common/Scripts/Vector2Signal.cs index 27fc7d3..e237326 100644 --- a/Common/Scripts/Vector2Signal.cs +++ b/Common/Scripts/Vector2Signal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Vector2Signal))] - public class Vector2Signal : Signal { } + public class Vector2Signal : Signal { } } diff --git a/Common/Scripts/Vector2SignalListener.cs b/Common/Scripts/Vector2SignalListener.cs index c074e1a..f8c77cb 100644 --- a/Common/Scripts/Vector2SignalListener.cs +++ b/Common/Scripts/Vector2SignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(Vector2SignalListener))] - public class Vector2SignalListener : SignalListener { } + public class Vector2SignalListener : SignalListener { } } diff --git a/Common/Scripts/Vector2ValueReference.cs b/Common/Scripts/Vector2ValueReference.cs deleted file mode 100644 index f4dad35..0000000 --- a/Common/Scripts/Vector2ValueReference.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using UnityEngine; - -namespace Signals.Common -{ - [Serializable] - public class Vector2ValueReference : ValueReference - { - public Vector2ValueReference() { } - public Vector2ValueReference(Vector2 localValue) : base(localValue) { } - } -} diff --git a/Common/Scripts/Vector2ValueReference.cs.meta b/Common/Scripts/Vector2ValueReference.cs.meta deleted file mode 100644 index ec8b4d2..0000000 --- a/Common/Scripts/Vector2ValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: d6b0cf3a1bbb3314d8be6bce1ef5d5f6 -timeCreated: 1518081957 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector3Event.cs b/Common/Scripts/Vector3Event.cs deleted file mode 100644 index 11b0304..0000000 --- a/Common/Scripts/Vector3Event.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class Vector3Event : UnityEvent { } -} \ No newline at end of file diff --git a/Common/Scripts/Vector3Event.cs.meta b/Common/Scripts/Vector3Event.cs.meta deleted file mode 100644 index cac5beb..0000000 --- a/Common/Scripts/Vector3Event.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: cf302c7627d7dbd41903f2d2be5d391b -timeCreated: 1517386781 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector3IntEvent.cs b/Common/Scripts/Vector3IntEvent.cs deleted file mode 100644 index a89dfaf..0000000 --- a/Common/Scripts/Vector3IntEvent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class Vector3IntEvent : UnityEvent { } -} diff --git a/Common/Scripts/Vector3IntEvent.cs.meta b/Common/Scripts/Vector3IntEvent.cs.meta deleted file mode 100644 index 1ee93f5..0000000 --- a/Common/Scripts/Vector3IntEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 802a83fb2ccdc49418b3e5c57f8f4b15 -timeCreated: 1518081956 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector3IntSignal.cs b/Common/Scripts/Vector3IntSignal.cs index 454ab6f..3565b1a 100644 --- a/Common/Scripts/Vector3IntSignal.cs +++ b/Common/Scripts/Vector3IntSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Vector3IntSignal))] - public class Vector3IntSignal : Signal { } + public class Vector3IntSignal : Signal { } } diff --git a/Common/Scripts/Vector3IntSignalListener.cs b/Common/Scripts/Vector3IntSignalListener.cs index 603e85a..ce9f04b 100644 --- a/Common/Scripts/Vector3IntSignalListener.cs +++ b/Common/Scripts/Vector3IntSignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(Vector3IntSignalListener))] - public class Vector3IntSignalListener : SignalListener { } + public class Vector3IntSignalListener : SignalListener { } } diff --git a/Common/Scripts/Vector3IntValueReference.cs b/Common/Scripts/Vector3IntValueReference.cs deleted file mode 100644 index 44458eb..0000000 --- a/Common/Scripts/Vector3IntValueReference.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using UnityEngine; - -namespace Signals.Common -{ - [Serializable] - public class Vector3IntValueReference : ValueReference - { - public Vector3IntValueReference() { } - public Vector3IntValueReference(Vector3Int localValue) : base(localValue) { } - } -} diff --git a/Common/Scripts/Vector3IntValueReference.cs.meta b/Common/Scripts/Vector3IntValueReference.cs.meta deleted file mode 100644 index c4e4051..0000000 --- a/Common/Scripts/Vector3IntValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: d074d3ffebfaa1f47b44867ede76b52b -timeCreated: 1518081957 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector3Signal.cs b/Common/Scripts/Vector3Signal.cs index 73cd358..932e7b3 100644 --- a/Common/Scripts/Vector3Signal.cs +++ b/Common/Scripts/Vector3Signal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Vector3Signal))] - public class Vector3Signal : Signal { } + public class Vector3Signal : Signal { } } \ No newline at end of file diff --git a/Common/Scripts/Vector3SignalListener.cs b/Common/Scripts/Vector3SignalListener.cs index f84be1f..9dcbe9b 100644 --- a/Common/Scripts/Vector3SignalListener.cs +++ b/Common/Scripts/Vector3SignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(Vector3SignalListener))] - public class Vector3SignalListener : SignalListener { } + public class Vector3SignalListener : SignalListener { } } \ No newline at end of file diff --git a/Common/Scripts/Vector3ValueReference.cs b/Common/Scripts/Vector3ValueReference.cs deleted file mode 100644 index 82ba053..0000000 --- a/Common/Scripts/Vector3ValueReference.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using UnityEngine; - -namespace Signals.Common -{ - [Serializable] - public class Vector3ValueReference : ValueReference - { - public Vector3ValueReference() { } - public Vector3ValueReference(Vector3 localValue) : base(localValue) { } - } -} \ No newline at end of file diff --git a/Common/Scripts/Vector3ValueReference.cs.meta b/Common/Scripts/Vector3ValueReference.cs.meta deleted file mode 100644 index 3108617..0000000 --- a/Common/Scripts/Vector3ValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 8eb6bd58a0025da448a575578f62dc5e -timeCreated: 1517386781 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector4Event.cs b/Common/Scripts/Vector4Event.cs deleted file mode 100644 index 8276d16..0000000 --- a/Common/Scripts/Vector4Event.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.Events; - -namespace Signals.Common -{ - [Serializable] - public class Vector4Event : UnityEvent { } -} diff --git a/Common/Scripts/Vector4Event.cs.meta b/Common/Scripts/Vector4Event.cs.meta deleted file mode 100644 index 356a885..0000000 --- a/Common/Scripts/Vector4Event.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 33a64de618eb880449ece48860640f0f -timeCreated: 1518081956 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Common/Scripts/Vector4Signal.cs b/Common/Scripts/Vector4Signal.cs index 804a477..a865e50 100644 --- a/Common/Scripts/Vector4Signal.cs +++ b/Common/Scripts/Vector4Signal.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Vector4Signal))] - public class Vector4Signal : Signal { } + public class Vector4Signal : Signal { } } diff --git a/Common/Scripts/Vector4SignalListener.cs b/Common/Scripts/Vector4SignalListener.cs index 9ece6d1..ad0b0e1 100644 --- a/Common/Scripts/Vector4SignalListener.cs +++ b/Common/Scripts/Vector4SignalListener.cs @@ -3,5 +3,5 @@ namespace Signals.Common { [AddComponentMenu(nameof(Signals) + "/" + nameof(Vector4SignalListener))] - public class Vector4SignalListener : SignalListener { } + public class Vector4SignalListener : SignalListener { } } diff --git a/Common/Scripts/Vector4ValueReference.cs b/Common/Scripts/Vector4ValueReference.cs deleted file mode 100644 index 5078ad6..0000000 --- a/Common/Scripts/Vector4ValueReference.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using UnityEngine; - -namespace Signals.Common -{ - [Serializable] - public class Vector4ValueReference : ValueReference - { - public Vector4ValueReference() { } - public Vector4ValueReference(Vector4 localValue) : base(localValue) { } - } -} diff --git a/Common/Scripts/Vector4ValueReference.cs.meta b/Common/Scripts/Vector4ValueReference.cs.meta deleted file mode 100644 index 5975ff2..0000000 --- a/Common/Scripts/Vector4ValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 5f094d5eb9b130e42b14b64e31d29471 -timeCreated: 1518081956 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Examples/Example1/Scene.unity b/Examples/Example1/Scene.unity index 32910b4..7f392bd 100644 --- a/Examples/Example1/Scene.unity +++ b/Examples/Example1/Scene.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -62,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -76,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -87,15 +94,17 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 1873500707} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -108,7 +117,9 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 23800000, guid: c935735d2a5f76f4f81bdf696718e366, type: 2} @@ -141,9 +152,9 @@ 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: 747196916} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -159,17 +170,17 @@ MonoBehaviour: m_GameObject: {fileID: 60878532} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -206,15 +217,11 @@ MonoBehaviour: m_EditorClassIdentifier: _description: _signal: {fileID: 11400000, guid: 6f1c73932d73c534aa4902c3afd564e3, type: 2} - _onChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: Signals.Common.StringEvent, Signals, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null _onUpdated: m_PersistentCalls: m_Calls: - m_Target: {fileID: 60878534} + m_TargetAssemblyTypeName: m_MethodName: set_text m_Mode: 0 m_Arguments: @@ -225,9 +232,28 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: Signals.Common.StringEvent, Signals, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null _invokeImmediately: 1 +--- !u!1 &161703289 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1834396067648326, guid: a75977e9e7dfa3a4ea6548e584846580, type: 3} + m_PrefabInstance: {fileID: 570096003} + m_PrefabAsset: {fileID: 0} +--- !u!114 &161703295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161703289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a7f9b7c34290b448c080879af2605d, type: 3} + m_Name: + m_EditorClassIdentifier: + _reference: + _useLocalValue: 1 + _signal: {fileID: 0} + _localValue: Bruno --- !u!1 &173878849 GameObject: m_ObjectHideFlags: 0 @@ -259,9 +285,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -273,6 +302,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -285,6 +315,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &173878851 MeshCollider: m_ObjectHideFlags: 0 @@ -293,11 +324,19 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 173878849} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 5 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &173878852 MeshFilter: @@ -314,12 +353,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 173878849} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 50, y: 1, z: 50} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &173878854 MonoBehaviour: @@ -365,9 +405,9 @@ 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: 2005121115} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -383,17 +423,17 @@ MonoBehaviour: m_GameObject: {fileID: 197377585} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -443,12 +483,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 301815458} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 2 @@ -458,6 +500,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -465,12 +525,16 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 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 &301815460 @@ -480,20 +544,26 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 301815458} + serializedVersion: 2 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: 7 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &570096003 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4537980640830410, guid: a75977e9e7dfa3a4ea6548e584846580, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} - target: {fileID: 4537980640830410, guid: a75977e9e7dfa3a4ea6548e584846580, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -506,6 +576,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4537980640830410, guid: a75977e9e7dfa3a4ea6548e584846580, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4537980640830410, guid: a75977e9e7dfa3a4ea6548e584846580, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -518,15 +592,13 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4537980640830410, guid: a75977e9e7dfa3a4ea6548e584846580, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4537980640830410, guid: a75977e9e7dfa3a4ea6548e584846580, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1834396067648326, guid: a75977e9e7dfa3a4ea6548e584846580, type: 3} + insertIndex: -1 + addedObject: {fileID: 161703295} m_SourcePrefab: {fileID: 100100000, guid: a75977e9e7dfa3a4ea6548e584846580, type: 3} --- !u!1 &747196915 GameObject: @@ -556,11 +628,11 @@ 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: 1364501945} - {fileID: 60878533} m_Father: {fileID: 821908609} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -576,17 +648,17 @@ MonoBehaviour: m_GameObject: {fileID: 747196915} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -596,6 +668,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &747196918 CanvasRenderer: m_ObjectHideFlags: 0 @@ -632,7 +705,7 @@ MonoBehaviour: m_GameObject: {fileID: 821908605} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -649,7 +722,7 @@ MonoBehaviour: m_GameObject: {fileID: 821908605} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 @@ -662,6 +735,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &821908608 Canvas: m_ObjectHideFlags: 0 @@ -679,7 +753,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -693,11 +769,11 @@ 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: 747196916} - {fileID: 2005121115} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -731,9 +807,10 @@ MonoBehaviour: m_GameObject: {fileID: 854976828} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -750,7 +827,7 @@ MonoBehaviour: m_GameObject: {fileID: 854976828} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -763,20 +840,26 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 854976828} + serializedVersion: 2 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: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &875820308 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4387215547455362, guid: 496b4b3f58937d54f83bcc62be33998d, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} - target: {fileID: 4387215547455362, guid: 496b4b3f58937d54f83bcc62be33998d, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -789,6 +872,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4387215547455362, guid: 496b4b3f58937d54f83bcc62be33998d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4387215547455362, guid: 496b4b3f58937d54f83bcc62be33998d, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -801,15 +888,10 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4387215547455362, guid: 496b4b3f58937d54f83bcc62be33998d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4387215547455362, guid: 496b4b3f58937d54f83bcc62be33998d, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 496b4b3f58937d54f83bcc62be33998d, type: 3} --- !u!1 &881143273 GameObject: @@ -858,9 +940,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -872,6 +957,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -884,6 +970,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &881143276 BoxCollider: m_ObjectHideFlags: 0 @@ -892,9 +979,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 881143273} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!33 &881143277 @@ -912,12 +1007,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 881143273} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -10, y: 1, z: -5} m_LocalScale: {x: 10, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &1064793884 GameObject: @@ -957,12 +1053,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1064793884} + serializedVersion: 2 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: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1364501944 GameObject: @@ -992,9 +1089,9 @@ 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: 747196916} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1010,17 +1107,17 @@ MonoBehaviour: m_GameObject: {fileID: 1364501944} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -1092,9 +1189,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1106,6 +1206,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1118,6 +1219,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1548334281 BoxCollider: m_ObjectHideFlags: 0 @@ -1126,9 +1228,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1548334278} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!33 &1548334282 @@ -1146,12 +1256,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1548334278} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 5} m_LocalScale: {x: 10, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1556388713 GameObject: @@ -1200,9 +1311,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1214,6 +1328,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1226,6 +1341,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1556388716 BoxCollider: m_ObjectHideFlags: 0 @@ -1234,9 +1350,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1556388713} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!33 &1556388717 @@ -1254,13 +1378,78 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1556388713} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 10, y: 1, z: -5} m_LocalScale: {x: 10, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!850595691 &1873500707 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Settings.lighting + serializedVersion: 6 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &2005121114 GameObject: m_ObjectHideFlags: 0 @@ -1289,11 +1478,11 @@ 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: 197377586} - {fileID: 2015111839} m_Father: {fileID: 821908609} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1309,17 +1498,17 @@ MonoBehaviour: m_GameObject: {fileID: 2005121114} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1329,6 +1518,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &2005121117 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1367,9 +1557,9 @@ 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: 2005121115} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1397,17 +1587,17 @@ MonoBehaviour: m_GameObject: {fileID: 2015111838} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -1444,15 +1634,11 @@ MonoBehaviour: m_EditorClassIdentifier: _description: _signal: {fileID: 11400000, guid: cbc6c60aea74f1a4bbae11198e8221bd, type: 2} - _onChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: Signals.Common.Vector3Event, Signals, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null _onUpdated: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2015111840} + m_TargetAssemblyTypeName: m_MethodName: SetText m_Mode: 0 m_Arguments: @@ -1463,6 +1649,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: Signals.Common.Vector3Event, Signals, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null _invokeImmediately: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 854976831} + - {fileID: 1064793886} + - {fileID: 821908609} + - {fileID: 173878853} + - {fileID: 1548334283} + - {fileID: 1556388718} + - {fileID: 881143278} + - {fileID: 301815460} + - {fileID: 570096003} + - {fileID: 875820308} diff --git a/Examples/Example1/Scripts/ExamplePlayerCharacterInput.cs b/Examples/Example1/Scripts/ExamplePlayerCharacterInput.cs index ca461ff..0511c38 100644 --- a/Examples/Example1/Scripts/ExamplePlayerCharacterInput.cs +++ b/Examples/Example1/Scripts/ExamplePlayerCharacterInput.cs @@ -1,5 +1,4 @@ using UnityEngine; -using Signals.Common; using Signals.Extras.Characters; namespace Signals.Examples @@ -7,7 +6,7 @@ namespace Signals.Examples [AddComponentMenu(nameof(Signals) + "/" + nameof(Examples) + "/" + nameof(ExamplePlayerCharacterInput))] public class ExamplePlayerCharacterInput : TopDownPlayerCharacterInput { - [SerializeField] StringSignal _lookingAtSignal; + [SerializeField] Signal _lookingAtSignal; protected override void OnMouseOverUI() => _lookingAtSignal.Value = ""; diff --git a/Examples/Example1/Scripts/Name.cs b/Examples/Example1/Scripts/Name.cs index ce3c2ee..acdb448 100644 --- a/Examples/Example1/Scripts/Name.cs +++ b/Examples/Example1/Scripts/Name.cs @@ -1,8 +1,7 @@ using UnityEngine; -using Signals.Common; namespace Signals.Examples { [AddComponentMenu(nameof(Signals) + "/" + nameof(Examples) + "/" + nameof(Name))] - public class Name : ValueReferenceComponent { } + public class Name : ValueReferenceComponent { } } \ No newline at end of file diff --git a/Examples/Example3/Scene.unity b/Examples/Example3/Scene.unity index ede6c98..3003340 100644 --- a/Examples/Example3/Scene.unity +++ b/Examples/Example3/Scene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,31 +38,31 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -88,15 +94,17 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 1008300931} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -109,16 +117,19 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &34568272 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 34568273} m_Layer: 5 @@ -131,19 +142,20 @@ GameObject: --- !u!224 &34568273 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 34568272} 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: 350744090} - {fileID: 1349907267} - {fileID: 1872853507} - {fileID: 922545531} m_Father: {fileID: 1481762435} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -153,9 +165,10 @@ RectTransform: --- !u!1 &133866654 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 133866655} - component: {fileID: 133866658} @@ -171,16 +184,17 @@ GameObject: --- !u!224 &133866655 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 133866654} 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: 788141517} m_Father: {fileID: 325018260} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -190,16 +204,18 @@ RectTransform: --- !u!114 &133866656 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 133866654} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -209,17 +225,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 133866657} @@ -227,6 +246,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11400000, guid: ff8e3a15878d0184398677a742439b60, type: 2} + m_TargetAssemblyTypeName: m_MethodName: set_TimeScale m_Mode: 4 m_Arguments: @@ -237,27 +257,26 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &133866657 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 133866654} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -266,18 +285,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &133866658 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 133866654} + m_CullTransparentMesh: 1 --- !u!1 &192880984 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 192880986} - component: {fileID: 192880985} @@ -291,16 +315,19 @@ GameObject: --- !u!108 &192880985 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192880984} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 2 @@ -310,6 +337,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -317,32 +362,40 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 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 &192880986 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192880984} + serializedVersion: 2 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: 4 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &284972862 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 284972863} - component: {fileID: 284972865} @@ -359,15 +412,16 @@ GameObject: --- !u!224 &284972863 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 284972862} 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: 350744090} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -377,22 +431,23 @@ RectTransform: --- !u!114 &284972864 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 284972862} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -410,14 +465,17 @@ MonoBehaviour: --- !u!222 &284972865 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 284972862} + m_CullTransparentMesh: 1 --- !u!114 &284972866 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 284972862} m_Enabled: 1 m_EditorHideFlags: 0 @@ -427,8 +485,9 @@ MonoBehaviour: --- !u!114 &284972867 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 284972862} m_Enabled: 1 m_EditorHideFlags: 0 @@ -437,29 +496,17 @@ MonoBehaviour: m_EditorClassIdentifier: _description: _signal: {fileID: 11400000, guid: 52c07f3b656c23f4dba92dfb368286e5, type: 2} - _onChanged: + _onUpdated: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 284972866} - m_MethodName: SetText - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: Signals.Common.FloatEvent, Signals, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null + m_Calls: [] _invokeImmediately: 1 --- !u!1 &325018259 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 325018260} m_Layer: 5 @@ -472,19 +519,20 @@ GameObject: --- !u!224 &325018260 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 325018259} 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: 1104404580} - {fileID: 133866655} - {fileID: 1384766351} - {fileID: 625052929} m_Father: {fileID: 1481762435} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -494,9 +542,10 @@ RectTransform: --- !u!1 &350744089 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 350744090} - component: {fileID: 350744092} @@ -511,17 +560,18 @@ GameObject: --- !u!224 &350744090 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350744089} 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: 1693662388} - {fileID: 284972863} m_Father: {fileID: 34568273} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -531,22 +581,23 @@ RectTransform: --- !u!114 &350744091 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350744089} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -555,18 +606,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &350744092 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350744089} + m_CullTransparentMesh: 1 --- !u!1 &440705431 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 440705432} - component: {fileID: 440705434} @@ -581,15 +637,16 @@ GameObject: --- !u!224 &440705432 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440705431} 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: 922545531} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -599,22 +656,23 @@ RectTransform: --- !u!114 &440705433 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440705431} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -634,15 +692,18 @@ MonoBehaviour: --- !u!222 &440705434 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440705431} + m_CullTransparentMesh: 1 --- !u!1 &598752374 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 598752375} - component: {fileID: 598752379} @@ -659,15 +720,16 @@ GameObject: --- !u!224 &598752375 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 598752374} 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: 1104404580} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -677,8 +739,9 @@ RectTransform: --- !u!114 &598752376 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 598752374} m_Enabled: 1 m_EditorHideFlags: 0 @@ -687,28 +750,16 @@ MonoBehaviour: m_EditorClassIdentifier: _description: _signal: {fileID: 11400000, guid: bd35dffaed2232c469b4d40e8501eb6f, type: 2} - _onChanged: + _onUpdated: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 598752377} - m_MethodName: SetText - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: Signals.Common.FloatEvent, Signals, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null + m_Calls: [] _invokeImmediately: 1 --- !u!114 &598752377 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 598752374} m_Enabled: 1 m_EditorHideFlags: 0 @@ -718,22 +769,23 @@ MonoBehaviour: --- !u!114 &598752378 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 598752374} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -751,15 +803,18 @@ MonoBehaviour: --- !u!222 &598752379 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 598752374} + m_CullTransparentMesh: 1 --- !u!1 &625052928 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 625052929} - component: {fileID: 625052932} @@ -775,16 +830,17 @@ GameObject: --- !u!224 &625052929 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 625052928} 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: 1356172121} m_Father: {fileID: 325018260} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -794,16 +850,18 @@ RectTransform: --- !u!114 &625052930 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 625052928} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -813,17 +871,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 625052931} @@ -831,6 +892,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11400000, guid: ff8e3a15878d0184398677a742439b60, type: 2} + m_TargetAssemblyTypeName: m_MethodName: set_TimeScale m_Mode: 4 m_Arguments: @@ -841,27 +903,26 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &625052931 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 625052928} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -870,18 +931,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &625052932 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 625052928} + m_CullTransparentMesh: 1 --- !u!1 &788141516 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 788141517} - component: {fileID: 788141519} @@ -896,15 +962,16 @@ GameObject: --- !u!224 &788141517 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 788141516} 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: 133866655} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -914,22 +981,23 @@ RectTransform: --- !u!114 &788141518 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 788141516} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -947,15 +1015,18 @@ MonoBehaviour: --- !u!222 &788141519 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 788141516} + m_CullTransparentMesh: 1 --- !u!1 &922545530 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 922545531} - component: {fileID: 922545534} @@ -971,16 +1042,17 @@ GameObject: --- !u!224 &922545531 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 922545530} 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: 440705432} m_Father: {fileID: 34568273} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -990,16 +1062,18 @@ RectTransform: --- !u!114 &922545532 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 922545530} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1009,17 +1083,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 922545533} @@ -1027,6 +1104,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11400000, guid: c5332623499ef0e44b426a3630209545, type: 2} + m_TargetAssemblyTypeName: m_MethodName: set_GravityY m_Mode: 4 m_Arguments: @@ -1037,27 +1115,26 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &922545533 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 922545530} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1066,18 +1143,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &922545534 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 922545530} + m_CullTransparentMesh: 1 --- !u!1 &977402255 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 977402258} - component: {fileID: 977402257} @@ -1092,14 +1174,16 @@ GameObject: --- !u!114 &977402256 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 977402255} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1110,12 +1194,13 @@ MonoBehaviour: --- !u!114 &977402257 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 977402255} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -1124,22 +1209,89 @@ MonoBehaviour: --- !u!4 &977402258 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 977402255} + serializedVersion: 2 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: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!850595691 &1008300931 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Settings.lighting + serializedVersion: 6 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &1035032121 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1035032122} - component: {fileID: 1035032124} @@ -1154,15 +1306,16 @@ GameObject: --- !u!224 &1035032122 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1035032121} 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: 1349907267} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1172,22 +1325,23 @@ RectTransform: --- !u!114 &1035032123 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1035032121} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -1205,15 +1359,18 @@ MonoBehaviour: --- !u!222 &1035032124 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1035032121} + m_CullTransparentMesh: 1 --- !u!1 &1073333797 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1073333798} - component: {fileID: 1073333800} @@ -1228,15 +1385,16 @@ GameObject: --- !u!224 &1073333798 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1073333797} 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: 1104404580} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1246,22 +1404,23 @@ RectTransform: --- !u!114 &1073333799 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1073333797} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -1279,15 +1438,18 @@ MonoBehaviour: --- !u!222 &1073333800 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1073333797} + m_CullTransparentMesh: 1 --- !u!1 &1104404579 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1104404580} - component: {fileID: 1104404582} @@ -1302,17 +1464,18 @@ GameObject: --- !u!224 &1104404580 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1104404579} 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: 1073333798} - {fileID: 598752375} m_Father: {fileID: 325018260} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1322,22 +1485,23 @@ RectTransform: --- !u!114 &1104404581 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1104404579} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1346,18 +1510,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1104404582 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1104404579} + m_CullTransparentMesh: 1 --- !u!1 &1197374900 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1197374905} - component: {fileID: 1197374904} @@ -1374,8 +1543,9 @@ GameObject: --- !u!114 &1197374901 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197374900} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1387,13 +1557,25 @@ MonoBehaviour: --- !u!54 &1197374902 Rigidbody: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197374900} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 5 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -1402,16 +1584,22 @@ Rigidbody: --- !u!23 &1197374903 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197374900} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1421,6 +1609,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1433,32 +1622,37 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1197374904 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197374900} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1197374905 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197374900} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1268641393 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1268641394} - component: {fileID: 1268641396} @@ -1473,15 +1667,16 @@ GameObject: --- !u!224 &1268641394 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268641393} 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: 1384766351} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1491,22 +1686,23 @@ RectTransform: --- !u!114 &1268641395 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268641393} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -1524,15 +1720,18 @@ MonoBehaviour: --- !u!222 &1268641396 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268641393} + m_CullTransparentMesh: 1 --- !u!1 &1301379655 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1301379659} - component: {fileID: 1301379658} @@ -1549,16 +1748,22 @@ GameObject: --- !u!23 &1301379656 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1301379655} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1568,6 +1773,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1580,16 +1786,29 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!54 &1301379657 Rigidbody: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1301379655} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 1 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -1598,28 +1817,32 @@ Rigidbody: --- !u!33 &1301379658 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1301379655} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1301379659 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1301379655} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5, y: 4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1301379660 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1301379655} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1631,9 +1854,10 @@ MonoBehaviour: --- !u!1 &1349907266 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1349907267} - component: {fileID: 1349907270} @@ -1649,16 +1873,17 @@ GameObject: --- !u!224 &1349907267 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1349907266} 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: 1035032122} m_Father: {fileID: 34568273} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1668,16 +1893,18 @@ RectTransform: --- !u!114 &1349907268 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1349907266} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1687,17 +1914,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1349907269} @@ -1705,6 +1935,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11400000, guid: c5332623499ef0e44b426a3630209545, type: 2} + m_TargetAssemblyTypeName: m_MethodName: set_GravityY m_Mode: 4 m_Arguments: @@ -1715,27 +1946,26 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1349907269 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1349907266} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1744,18 +1974,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1349907270 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1349907266} + m_CullTransparentMesh: 1 --- !u!1 &1356172120 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1356172121} - component: {fileID: 1356172123} @@ -1770,15 +2005,16 @@ GameObject: --- !u!224 &1356172121 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356172120} 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: 625052929} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1788,22 +2024,23 @@ RectTransform: --- !u!114 &1356172122 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356172120} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -1821,15 +2058,18 @@ MonoBehaviour: --- !u!222 &1356172123 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356172120} + m_CullTransparentMesh: 1 --- !u!1 &1384766350 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1384766351} - component: {fileID: 1384766354} @@ -1845,16 +2085,17 @@ GameObject: --- !u!224 &1384766351 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1384766350} 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: 1268641394} m_Father: {fileID: 325018260} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1864,16 +2105,18 @@ RectTransform: --- !u!114 &1384766352 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1384766350} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1883,17 +2126,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1384766353} @@ -1901,6 +2147,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11400000, guid: ff8e3a15878d0184398677a742439b60, type: 2} + m_TargetAssemblyTypeName: m_MethodName: set_TimeScale m_Mode: 4 m_Arguments: @@ -1911,27 +2158,26 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1384766353 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1384766350} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1940,75 +2186,80 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1384766354 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1384766350} + m_CullTransparentMesh: 1 --- !u!1001 &1417149771 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 2} + - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 2} + - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 2} + - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 2} + - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 2} + - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 2} + - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4039937738773196, guid: cc2075f60294e8243890aa678086a8e5, type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114136788496006860, guid: cc2075f60294e8243890aa678086a8e5, - type: 2} + - target: {fileID: 114136788496006860, guid: cc2075f60294e8243890aa678086a8e5, type: 3} propertyPath: _settings._localValue._gravity.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114608416324585012, guid: cc2075f60294e8243890aa678086a8e5, - type: 2} - propertyPath: _settings._localValue._timeScale - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114371468365317956, guid: cc2075f60294e8243890aa678086a8e5, - type: 2} + - target: {fileID: 114371468365317956, guid: cc2075f60294e8243890aa678086a8e5, type: 3} propertyPath: _settings._localValue._targetFrameRate value: 60 objectReference: {fileID: 0} + - target: {fileID: 114608416324585012, guid: cc2075f60294e8243890aa678086a8e5, type: 3} + propertyPath: _settings._localValue._timeScale + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: cc2075f60294e8243890aa678086a8e5, type: 2} - m_IsPrefabParent: 0 + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cc2075f60294e8243890aa678086a8e5, type: 3} --- !u!1 &1473926186 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1473926187} - component: {fileID: 1473926189} @@ -2023,15 +2274,16 @@ GameObject: --- !u!224 &1473926187 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1473926186} 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: 1872853507} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2041,22 +2293,23 @@ RectTransform: --- !u!114 &1473926188 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1473926186} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -2074,15 +2327,18 @@ MonoBehaviour: --- !u!222 &1473926189 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1473926186} + m_CullTransparentMesh: 1 --- !u!1 &1481762431 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1481762435} - component: {fileID: 1481762434} @@ -2098,12 +2354,13 @@ GameObject: --- !u!114 &1481762432 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1481762431} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -2114,12 +2371,13 @@ MonoBehaviour: --- !u!114 &1481762433 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1481762431} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 @@ -2132,11 +2390,13 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1481762434 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1481762431} m_Enabled: 1 serializedVersion: 3 @@ -2148,24 +2408,27 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!224 &1481762435 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1481762431} 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: 34568273} - {fileID: 325018260} m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2175,9 +2438,10 @@ RectTransform: --- !u!1 &1693662387 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1693662388} - component: {fileID: 1693662390} @@ -2192,15 +2456,16 @@ GameObject: --- !u!224 &1693662388 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1693662387} 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: 350744090} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2210,22 +2475,23 @@ RectTransform: --- !u!114 &1693662389 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1693662387} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -2243,15 +2509,18 @@ MonoBehaviour: --- !u!222 &1693662390 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1693662387} + m_CullTransparentMesh: 1 --- !u!1 &1848854249 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1848854251} - component: {fileID: 1848854250} @@ -2266,8 +2535,9 @@ GameObject: --- !u!114 &1848854250 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1848854249} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2278,21 +2548,24 @@ MonoBehaviour: --- !u!4 &1848854251 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1848854249} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1848854252 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1848854249} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2303,9 +2576,10 @@ MonoBehaviour: --- !u!1 &1872853506 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1872853507} - component: {fileID: 1872853510} @@ -2321,16 +2595,17 @@ GameObject: --- !u!224 &1872853507 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1872853506} 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: 1473926187} m_Father: {fileID: 34568273} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2340,16 +2615,18 @@ RectTransform: --- !u!114 &1872853508 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1872853506} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -2359,17 +2636,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1872853509} @@ -2377,6 +2657,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11400000, guid: c5332623499ef0e44b426a3630209545, type: 2} + m_TargetAssemblyTypeName: m_MethodName: set_GravityY m_Mode: 4 m_Arguments: @@ -2387,27 +2668,26 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1872853509 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1872853506} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: 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: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -2416,18 +2696,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1872853510 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1872853506} + m_CullTransparentMesh: 1 --- !u!1 &1929913406 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1929913411} - component: {fileID: 1929913410} @@ -2444,8 +2729,9 @@ GameObject: --- !u!114 &1929913407 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1929913406} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2457,13 +2743,25 @@ MonoBehaviour: --- !u!54 &1929913408 Rigidbody: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1929913406} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 10 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -2472,16 +2770,22 @@ Rigidbody: --- !u!23 &1929913409 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1929913406} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2491,6 +2795,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2503,32 +2808,37 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1929913410 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1929913406} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1929913411 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1929913406} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 5, y: 4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2133258587 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2133258591} - component: {fileID: 2133258590} @@ -2544,27 +2854,44 @@ GameObject: --- !u!81 &2133258588 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2133258587} m_Enabled: 1 --- !u!124 &2133258589 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2133258587} m_Enabled: 1 --- !u!20 &2133258590 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2133258587} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -2594,13 +2921,28 @@ Camera: --- !u!4 &2133258591 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2133258587} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1417149771} + - {fileID: 977402258} + - {fileID: 1848854251} + - {fileID: 1481762435} + - {fileID: 192880986} + - {fileID: 1301379659} + - {fileID: 1197374905} + - {fileID: 1929913411} + - {fileID: 2133258591} diff --git a/Examples/Example3/Scripts/GravityYSignalUpdater.cs b/Examples/Example3/Scripts/GravityYSignalUpdater.cs index f7dc5ee..fe84ba9 100644 --- a/Examples/Example3/Scripts/GravityYSignalUpdater.cs +++ b/Examples/Example3/Scripts/GravityYSignalUpdater.cs @@ -1,12 +1,11 @@ using UnityEngine; -using Signals.Common; namespace Signals.Examples { [AddComponentMenu(nameof(Signals) + "/" + nameof(Examples) + "/" + nameof(GravityYSignalUpdater))] public class GravityYSignalUpdater : MonoBehaviour { - public FloatSignal Signal; + public Signal Signal; void OnEnable() => UpdateSignal(); void Update() => UpdateSignal(); diff --git a/Examples/Example3/Scripts/TimeScaleSignalUpdater.cs b/Examples/Example3/Scripts/TimeScaleSignalUpdater.cs index 93d2159..cff3f2d 100644 --- a/Examples/Example3/Scripts/TimeScaleSignalUpdater.cs +++ b/Examples/Example3/Scripts/TimeScaleSignalUpdater.cs @@ -1,12 +1,11 @@ using UnityEngine; -using Signals.Common; namespace Signals.Examples { [AddComponentMenu(nameof(Signals) + "/" + nameof(Examples) + "/" + nameof(TimeScaleSignalUpdater))] public class TimeScaleSignalUpdater : MonoBehaviour { - public FloatSignal Signal; + public Signal Signal; void OnEnable() => UpdateSignal(); void Update() => UpdateSignal(); diff --git a/Extras/Characters/Scripts/Editor/PlayerCharacterInputSettingsSignalEditor.cs b/Extras/Characters/Scripts/Editor/PlayerCharacterInputSettingsSignalEditor.cs index 00fdd4f..d7b4010 100644 --- a/Extras/Characters/Scripts/Editor/PlayerCharacterInputSettingsSignalEditor.cs +++ b/Extras/Characters/Scripts/Editor/PlayerCharacterInputSettingsSignalEditor.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Characters { [CustomEditor(typeof(PlayerCharacterInputSettingsSignal))] - public class PlayerCharacterInputSettingsSignalEditor : SignalEditor { } + public class PlayerCharacterInputSettingsSignalEditor : SignalEditor { } } diff --git a/Extras/Characters/Scripts/Editor/RigidbodyCharacterSettingsSignalEditor.cs b/Extras/Characters/Scripts/Editor/RigidbodyCharacterSettingsSignalEditor.cs index 6c5e392..60b2433 100644 --- a/Extras/Characters/Scripts/Editor/RigidbodyCharacterSettingsSignalEditor.cs +++ b/Extras/Characters/Scripts/Editor/RigidbodyCharacterSettingsSignalEditor.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Characters { [CustomEditor(typeof(RigidbodyCharacterSettingsSignal))] - public class RigidbodyCharacterSettingsSignalEditor : SignalEditor { } + public class RigidbodyCharacterSettingsSignalEditor : SignalEditor { } } diff --git a/Extras/Characters/Scripts/PlayerCharacterInput.cs b/Extras/Characters/Scripts/PlayerCharacterInput.cs index ac5221f..f2a11da 100644 --- a/Extras/Characters/Scripts/PlayerCharacterInput.cs +++ b/Extras/Characters/Scripts/PlayerCharacterInput.cs @@ -6,7 +6,7 @@ namespace Signals.Extras.Characters [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Characters) + "/" + nameof(PlayerCharacterInput))] public class PlayerCharacterInput : MonoBehaviour { - [SerializeField] PlayerCharacterInputSettingsValueReference _settings; + [SerializeField] ValueReference _settings; [SerializeField] CharacterMoveSignal _moveSignal; [SerializeField] BoolSignal _runSignal; [SerializeField] BoolSignal _jumpSignal; diff --git a/Extras/Characters/Scripts/PlayerCharacterInputSettingsEvent.cs b/Extras/Characters/Scripts/PlayerCharacterInputSettingsEvent.cs deleted file mode 100644 index 22cfd46..0000000 --- a/Extras/Characters/Scripts/PlayerCharacterInputSettingsEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Extras.Characters -{ - [Serializable] - public class PlayerCharacterInputSettingsEvent : UnityEvent { } -} diff --git a/Extras/Characters/Scripts/PlayerCharacterInputSettingsEvent.cs.meta b/Extras/Characters/Scripts/PlayerCharacterInputSettingsEvent.cs.meta deleted file mode 100644 index 7dbbee8..0000000 --- a/Extras/Characters/Scripts/PlayerCharacterInputSettingsEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: b36099a9298428646acabac83373c56f -timeCreated: 1519159373 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Characters/Scripts/PlayerCharacterInputSettingsSignal.cs b/Extras/Characters/Scripts/PlayerCharacterInputSettingsSignal.cs index 70f1997..bfa9540 100644 --- a/Extras/Characters/Scripts/PlayerCharacterInputSettingsSignal.cs +++ b/Extras/Characters/Scripts/PlayerCharacterInputSettingsSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Characters { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Characters) + "/" + nameof(PlayerCharacterInputSettingsSignal))] - public class PlayerCharacterInputSettingsSignal : Signal { } + public class PlayerCharacterInputSettingsSignal : Signal { } } diff --git a/Extras/Characters/Scripts/PlayerCharacterInputSettingsValueReference.cs b/Extras/Characters/Scripts/PlayerCharacterInputSettingsValueReference.cs deleted file mode 100644 index ea10d91..0000000 --- a/Extras/Characters/Scripts/PlayerCharacterInputSettingsValueReference.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace Signals.Extras.Characters -{ - [Serializable] - public class PlayerCharacterInputSettingsValueReference : - ValueReference - { - public PlayerCharacterInputSettingsValueReference() { } - public PlayerCharacterInputSettingsValueReference(PlayerCharacterInputSettings localValue) : base(localValue) { } - } -} diff --git a/Extras/Characters/Scripts/PlayerCharacterInputSettingsValueReference.cs.meta b/Extras/Characters/Scripts/PlayerCharacterInputSettingsValueReference.cs.meta deleted file mode 100644 index c60432e..0000000 --- a/Extras/Characters/Scripts/PlayerCharacterInputSettingsValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: c0fc26c3b834d5e4ab4585ce2a119f0d -timeCreated: 1519159373 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Characters/Scripts/RigidbodyCharacter.cs b/Extras/Characters/Scripts/RigidbodyCharacter.cs index 3b9e311..a05e74b 100644 --- a/Extras/Characters/Scripts/RigidbodyCharacter.cs +++ b/Extras/Characters/Scripts/RigidbodyCharacter.cs @@ -8,7 +8,7 @@ namespace Signals.Extras.Characters [RequireComponent(typeof(CapsuleCollider))] public class RigidbodyCharacter : MonoBehaviour { - [SerializeField] RigidbodyCharacterSettingsValueReference _settings; + [SerializeField] ValueReference _settings; [SerializeField] Transform _cameraPivot; [SerializeField] CharacterMoveSignal _moveSignal; [SerializeField] BoolSignal _runSignal; @@ -21,7 +21,7 @@ public class RigidbodyCharacter : MonoBehaviour Quaternion _targetRotationX = Quaternion.identity, _targetRotationY = Quaternion.identity; bool _isGrounded, _isJumping; - public RigidbodyCharacterSettingsValueReference Settings => _settings; + public RigidbodyCharacterSettings Settings => _settings; public Transform CameraPivot { diff --git a/Extras/Characters/Scripts/RigidbodyCharacterSettings.cs b/Extras/Characters/Scripts/RigidbodyCharacterSettings.cs index 35d77e7..c2e6182 100644 --- a/Extras/Characters/Scripts/RigidbodyCharacterSettings.cs +++ b/Extras/Characters/Scripts/RigidbodyCharacterSettings.cs @@ -10,7 +10,7 @@ public class RigidbodyCharacterSettings [SerializeField] float _backwardForce = 20f; [SerializeField] float _strafeForce = 20f; [SerializeField] float _runMultiplier = 2f; - [SerializeField] AnimationCurve _slopeModifier = new AnimationCurve(new Keyframe(-90.0f, 1.0f), new Keyframe(0.0f, 1.0f), new Keyframe(90.0f, 0.0f)); + [SerializeField] AnimationCurve _slopeModifier = new(new Keyframe(-90.0f, 1.0f), new Keyframe(0.0f, 1.0f), new Keyframe(90.0f, 0.0f)); [SerializeField] float _jumpForce = 400f; [SerializeField] bool _airControl; [SerializeField] float _groundDrag = 5f; diff --git a/Extras/Characters/Scripts/RigidbodyCharacterSettingsEvent.cs b/Extras/Characters/Scripts/RigidbodyCharacterSettingsEvent.cs deleted file mode 100644 index 6c35d70..0000000 --- a/Extras/Characters/Scripts/RigidbodyCharacterSettingsEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Extras.Characters -{ - [Serializable] - public class RigidbodyCharacterSettingsEvent : UnityEvent { } -} diff --git a/Extras/Characters/Scripts/RigidbodyCharacterSettingsEvent.cs.meta b/Extras/Characters/Scripts/RigidbodyCharacterSettingsEvent.cs.meta deleted file mode 100644 index 57f0a96..0000000 --- a/Extras/Characters/Scripts/RigidbodyCharacterSettingsEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 96167e55132af9d4ca099a454812ee11 -timeCreated: 1519159373 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Characters/Scripts/RigidbodyCharacterSettingsSignal.cs b/Extras/Characters/Scripts/RigidbodyCharacterSettingsSignal.cs index 45be4a6..dc86f29 100644 --- a/Extras/Characters/Scripts/RigidbodyCharacterSettingsSignal.cs +++ b/Extras/Characters/Scripts/RigidbodyCharacterSettingsSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Characters { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Characters) + "/" + nameof(RigidbodyCharacterSettingsSignal))] - public class RigidbodyCharacterSettingsSignal : Signal { } + public class RigidbodyCharacterSettingsSignal : Signal { } } diff --git a/Extras/Characters/Scripts/RigidbodyCharacterSettingsValueReference.cs b/Extras/Characters/Scripts/RigidbodyCharacterSettingsValueReference.cs deleted file mode 100644 index d95faa2..0000000 --- a/Extras/Characters/Scripts/RigidbodyCharacterSettingsValueReference.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace Signals.Extras.Characters -{ - [Serializable] - public class RigidbodyCharacterSettingsValueReference : - ValueReference - { - public RigidbodyCharacterSettingsValueReference() { } - public RigidbodyCharacterSettingsValueReference(RigidbodyCharacterSettings localValue) : base(localValue) { } - } -} diff --git a/Extras/Characters/Scripts/RigidbodyCharacterSettingsValueReference.cs.meta b/Extras/Characters/Scripts/RigidbodyCharacterSettingsValueReference.cs.meta deleted file mode 100644 index 2df958d..0000000 --- a/Extras/Characters/Scripts/RigidbodyCharacterSettingsValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 193e2a45be1a1a84088c34847e421bc1 -timeCreated: 1519159373 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Characters/Scripts/TopDownPlayerCharacterInput.cs b/Extras/Characters/Scripts/TopDownPlayerCharacterInput.cs index fd4d5d3..ea61444 100644 --- a/Extras/Characters/Scripts/TopDownPlayerCharacterInput.cs +++ b/Extras/Characters/Scripts/TopDownPlayerCharacterInput.cs @@ -1,15 +1,14 @@ using UnityEngine; using UnityEngine.EventSystems; -using Signals.Common; namespace Signals.Extras.Characters { [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Characters) + "/" + nameof(TopDownPlayerCharacterInput))] public class TopDownPlayerCharacterInput : MonoBehaviour { - [SerializeField] Vector3Signal _destinationSignal; + [SerializeField] Signal _destinationSignal; - public Vector3Signal DestinationSignal + public Signal DestinationSignal { get => _destinationSignal; set => _destinationSignal = value; diff --git a/Extras/Engine/Scripts/ApplicationSettingsEvent.cs b/Extras/Engine/Scripts/ApplicationSettingsEvent.cs deleted file mode 100644 index 7a83eb4..0000000 --- a/Extras/Engine/Scripts/ApplicationSettingsEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Extras.Engine -{ - [Serializable] - public class ApplicationSettingsEvent : UnityEvent { } -} diff --git a/Extras/Engine/Scripts/ApplicationSettingsEvent.cs.meta b/Extras/Engine/Scripts/ApplicationSettingsEvent.cs.meta deleted file mode 100644 index f3ae19a..0000000 --- a/Extras/Engine/Scripts/ApplicationSettingsEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: ae352a2b653182e4db1f2dfbda788829 -timeCreated: 1518519374 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Engine/Scripts/ApplicationSettingsSignal.cs b/Extras/Engine/Scripts/ApplicationSettingsSignal.cs index 1af0e03..0609a86 100644 --- a/Extras/Engine/Scripts/ApplicationSettingsSignal.cs +++ b/Extras/Engine/Scripts/ApplicationSettingsSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Engine { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(ApplicationSettingsSignal))] - public class ApplicationSettingsSignal : EngineSettingsSignal { } + public class ApplicationSettingsSignal : EngineSettingsSignal { } } diff --git a/Extras/Engine/Scripts/ApplicationSettingsValueReference.cs b/Extras/Engine/Scripts/ApplicationSettingsValueReference.cs deleted file mode 100644 index 2486578..0000000 --- a/Extras/Engine/Scripts/ApplicationSettingsValueReference.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; - -namespace Signals.Extras.Engine -{ - [Serializable] - public class ApplicationSettingsValueReference : ValueReference { } -} diff --git a/Extras/Engine/Scripts/ApplicationSettingsValueReference.cs.meta b/Extras/Engine/Scripts/ApplicationSettingsValueReference.cs.meta deleted file mode 100644 index a2f7529..0000000 --- a/Extras/Engine/Scripts/ApplicationSettingsValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: bf5936ce84ce5d442b6be6c5c16b5366 -timeCreated: 1518519374 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Engine/Scripts/ApplicationSetup.cs b/Extras/Engine/Scripts/ApplicationSetup.cs index 86a04a9..f35e92e 100644 --- a/Extras/Engine/Scripts/ApplicationSetup.cs +++ b/Extras/Engine/Scripts/ApplicationSetup.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Engine { [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(ApplicationSetup))] - public class ApplicationSetup : EngineSetup { } + public class ApplicationSetup : EngineSetup { } } \ No newline at end of file diff --git a/Extras/Engine/Scripts/Editor/ApplicationSettingsSignalEditor.cs b/Extras/Engine/Scripts/Editor/ApplicationSettingsSignalEditor.cs index dcc23c9..990a61d 100644 --- a/Extras/Engine/Scripts/Editor/ApplicationSettingsSignalEditor.cs +++ b/Extras/Engine/Scripts/Editor/ApplicationSettingsSignalEditor.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Engine { [CustomEditor(typeof(ApplicationSettingsSignal))] - public class ApplicationSettingsSignalEditor : EngineSettingsSignalEditor { } + public class ApplicationSettingsSignalEditor : EngineSettingsSignalEditor { } } diff --git a/Extras/Engine/Scripts/Editor/EngineSettingsSignalEditor.cs b/Extras/Engine/Scripts/Editor/EngineSettingsSignalEditor.cs index a260f0d..d7ac9c3 100644 --- a/Extras/Engine/Scripts/Editor/EngineSettingsSignalEditor.cs +++ b/Extras/Engine/Scripts/Editor/EngineSettingsSignalEditor.cs @@ -3,9 +3,8 @@ namespace Signals.Extras.Engine { - public abstract class EngineSettingsSignalEditor : SignalEditor + public abstract class EngineSettingsSignalEditor : SignalEditor where T : class, IEngineSettings - where ET : UnityEvent, new() { public override void OnInspectorGUI() { diff --git a/Extras/Engine/Scripts/Editor/EngineSetupEditor.cs b/Extras/Engine/Scripts/Editor/EngineSetupEditor.cs index c2716bc..8d4cfb6 100644 --- a/Extras/Engine/Scripts/Editor/EngineSetupEditor.cs +++ b/Extras/Engine/Scripts/Editor/EngineSetupEditor.cs @@ -3,7 +3,8 @@ namespace Signals.Extras.Engine { - public abstract class EngineSetupEditor : Editor where T : class, IEngineSettings + public abstract class EngineSetupEditor : Editor + where T : class, IEngineSettings { public override void OnInspectorGUI() { diff --git a/Extras/Engine/Scripts/Editor/PhysicsSettingsSignalEditor.cs b/Extras/Engine/Scripts/Editor/PhysicsSettingsSignalEditor.cs index 98280df..fa73f9c 100644 --- a/Extras/Engine/Scripts/Editor/PhysicsSettingsSignalEditor.cs +++ b/Extras/Engine/Scripts/Editor/PhysicsSettingsSignalEditor.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Engine { [CustomEditor(typeof(PhysicsSettingsSignal))] - public class PhysicsSettingsSignalEditor : EngineSettingsSignalEditor { } + public class PhysicsSettingsSignalEditor : EngineSettingsSignalEditor { } } diff --git a/Extras/Engine/Scripts/Editor/TimeSettingsSignalEditor.cs b/Extras/Engine/Scripts/Editor/TimeSettingsSignalEditor.cs index 166ca09..b0b611a 100644 --- a/Extras/Engine/Scripts/Editor/TimeSettingsSignalEditor.cs +++ b/Extras/Engine/Scripts/Editor/TimeSettingsSignalEditor.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Engine { [CustomEditor(typeof(TimeSettingsSignal))] - public class TimeSettingsSignalEditor : EngineSettingsSignalEditor { } + public class TimeSettingsSignalEditor : EngineSettingsSignalEditor { } } diff --git a/Extras/Engine/Scripts/Editor/TimeWrapperEditor.cs b/Extras/Engine/Scripts/Editor/TimeWrapperEditor.cs index 881690f..2d85c9a 100644 --- a/Extras/Engine/Scripts/Editor/TimeWrapperEditor.cs +++ b/Extras/Engine/Scripts/Editor/TimeWrapperEditor.cs @@ -1,5 +1,4 @@ -using UnityEngine; -using UnityEditor; +using UnityEditor; namespace Signals.Extras.Engine { diff --git a/Extras/Engine/Scripts/EngineSettingsSignal.cs b/Extras/Engine/Scripts/EngineSettingsSignal.cs index 5e39305..570b486 100644 --- a/Extras/Engine/Scripts/EngineSettingsSignal.cs +++ b/Extras/Engine/Scripts/EngineSettingsSignal.cs @@ -1,14 +1,11 @@ -using UnityEngine.Events; - -namespace Signals.Extras.Engine +namespace Signals.Extras.Engine { - public abstract class EngineSettingsSignal : Signal, IEngineSettings + public abstract class EngineSettingsSignal : Signal, IEngineSettings where T : IEngineSettings, new() - where ET : UnityEvent, new() { public void SetToCurrent() { - if (Value == null) Value = new T(); + Value ??= new T(); Value.SetToCurrent(); } diff --git a/Extras/Engine/Scripts/EngineSetup.cs b/Extras/Engine/Scripts/EngineSetup.cs index 04f57d9..087a16f 100644 --- a/Extras/Engine/Scripts/EngineSetup.cs +++ b/Extras/Engine/Scripts/EngineSetup.cs @@ -1,20 +1,14 @@ using UnityEngine; -using UnityEngine.Events; namespace Signals.Extras.Engine { - public abstract class EngineSetup : MonoBehaviour, IEngineSettings + public abstract class EngineSetup : MonoBehaviour, IEngineSettings where T : IEngineSettings, new() - where ET : UnityEvent, new() - where ST : ISignal - where VT : ValueReference { -#pragma warning disable 649 - [SerializeField] VT _settings; + [SerializeField] ValueReference _settings; [SerializeField] bool _applyOnStart = true; -#pragma warning restore 649 - public VT Settings => _settings; + public ValueReference Settings => _settings; public bool ApplyOnStart { @@ -24,7 +18,7 @@ public bool ApplyOnStart public void SetToCurrent() { - if (_settings.Value == null) _settings.Value = new T(); + _settings.Value ??= new T(); _settings.Value.SetToCurrent(); } diff --git a/Extras/Engine/Scripts/PhysicsSettings.cs b/Extras/Engine/Scripts/PhysicsSettings.cs index 341bc7e..9e5e30c 100644 --- a/Extras/Engine/Scripts/PhysicsSettings.cs +++ b/Extras/Engine/Scripts/PhysicsSettings.cs @@ -6,7 +6,7 @@ namespace Signals.Extras.Engine [Serializable] public class PhysicsSettings : IEngineSettings { - [SerializeField] Vector3 _gravity = new Vector3(0f, -9.81f, 0f); + [SerializeField] Vector3 _gravity = new(0f, -9.81f, 0f); [SerializeField] float _bounceThreshold = 2f; [SerializeField] float _sleepThreshold = .005f; [SerializeField] float _defaultContactOffset = .01f; diff --git a/Extras/Engine/Scripts/PhysicsSettingsEvent.cs b/Extras/Engine/Scripts/PhysicsSettingsEvent.cs deleted file mode 100644 index ac2c5cc..0000000 --- a/Extras/Engine/Scripts/PhysicsSettingsEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Extras.Engine -{ - [Serializable] - public class PhysicsSettingsEvent : UnityEvent { } -} diff --git a/Extras/Engine/Scripts/PhysicsSettingsEvent.cs.meta b/Extras/Engine/Scripts/PhysicsSettingsEvent.cs.meta deleted file mode 100644 index 963c7a9..0000000 --- a/Extras/Engine/Scripts/PhysicsSettingsEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 5559ab201c3cc8d4da294ab347940a40 -timeCreated: 1518199375 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Engine/Scripts/PhysicsSettingsSignal.cs b/Extras/Engine/Scripts/PhysicsSettingsSignal.cs index 638b43a..ba6f1d7 100644 --- a/Extras/Engine/Scripts/PhysicsSettingsSignal.cs +++ b/Extras/Engine/Scripts/PhysicsSettingsSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Engine { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(PhysicsSettingsSignal))] - public class PhysicsSettingsSignal : EngineSettingsSignal { } + public class PhysicsSettingsSignal : EngineSettingsSignal { } } diff --git a/Extras/Engine/Scripts/PhysicsSettingsValueReference.cs b/Extras/Engine/Scripts/PhysicsSettingsValueReference.cs deleted file mode 100644 index 1ec4803..0000000 --- a/Extras/Engine/Scripts/PhysicsSettingsValueReference.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; - -namespace Signals.Extras.Engine -{ - [Serializable] - public class PhysicsSettingsValueReference : ValueReference { } -} diff --git a/Extras/Engine/Scripts/PhysicsSettingsValueReference.cs.meta b/Extras/Engine/Scripts/PhysicsSettingsValueReference.cs.meta deleted file mode 100644 index 4eeaca0..0000000 --- a/Extras/Engine/Scripts/PhysicsSettingsValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: cacf18364564b564fa073f717cb0b5fe -timeCreated: 1518199375 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Engine/Scripts/PhysicsSetup.cs b/Extras/Engine/Scripts/PhysicsSetup.cs index 69956f9..4899062 100644 --- a/Extras/Engine/Scripts/PhysicsSetup.cs +++ b/Extras/Engine/Scripts/PhysicsSetup.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Engine { [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(PhysicsSetup))] - public class PhysicsSetup : EngineSetup { } + public class PhysicsSetup : EngineSetup { } } \ No newline at end of file diff --git a/Extras/Engine/Scripts/TimeSettingsEvent.cs b/Extras/Engine/Scripts/TimeSettingsEvent.cs deleted file mode 100644 index 1bbd113..0000000 --- a/Extras/Engine/Scripts/TimeSettingsEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UnityEngine.Events; - -namespace Signals.Extras.Engine -{ - [Serializable] - public class TimeSettingsEvent : UnityEvent { } -} diff --git a/Extras/Engine/Scripts/TimeSettingsEvent.cs.meta b/Extras/Engine/Scripts/TimeSettingsEvent.cs.meta deleted file mode 100644 index 103cbcf..0000000 --- a/Extras/Engine/Scripts/TimeSettingsEvent.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: bdb82b0b158c67446946478bf207d047 -timeCreated: 1518443133 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Engine/Scripts/TimeSettingsSignal.cs b/Extras/Engine/Scripts/TimeSettingsSignal.cs index 6b8c64d..660c553 100644 --- a/Extras/Engine/Scripts/TimeSettingsSignal.cs +++ b/Extras/Engine/Scripts/TimeSettingsSignal.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Engine { [CreateAssetMenu(menuName = nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(TimeSettingsSignal))] - public class TimeSettingsSignal : Signal { } + public class TimeSettingsSignal : Signal { } } diff --git a/Extras/Engine/Scripts/TimeSettingsValueReference.cs b/Extras/Engine/Scripts/TimeSettingsValueReference.cs deleted file mode 100644 index d427f29..0000000 --- a/Extras/Engine/Scripts/TimeSettingsValueReference.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; - -namespace Signals.Extras.Engine -{ - [Serializable] - public class TimeSettingsValueReference : ValueReference { } -} diff --git a/Extras/Engine/Scripts/TimeSettingsValueReference.cs.meta b/Extras/Engine/Scripts/TimeSettingsValueReference.cs.meta deleted file mode 100644 index 2a28fc2..0000000 --- a/Extras/Engine/Scripts/TimeSettingsValueReference.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 4ec88eadea7af7445a104fd9ba9d5aa6 -timeCreated: 1518443133 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extras/Engine/Scripts/TimeSetup.cs b/Extras/Engine/Scripts/TimeSetup.cs index 8e32000..bdc684b 100644 --- a/Extras/Engine/Scripts/TimeSetup.cs +++ b/Extras/Engine/Scripts/TimeSetup.cs @@ -3,5 +3,5 @@ namespace Signals.Extras.Engine { [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Engine) + "/" + nameof(TimeSetup))] - public class TimeSetup : EngineSetup { } + public class TimeSetup : EngineSetup { } } \ No newline at end of file diff --git a/Extras/Utility/Scripts/EulerAnglesTracker.cs b/Extras/Utility/Scripts/EulerAnglesTracker.cs index 4793803..d613955 100644 --- a/Extras/Utility/Scripts/EulerAnglesTracker.cs +++ b/Extras/Utility/Scripts/EulerAnglesTracker.cs @@ -1,5 +1,4 @@ using UnityEngine; -using Signals.Common; namespace Signals.Extras.Utility { @@ -7,14 +6,14 @@ namespace Signals.Extras.Utility [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Utility) + "/" + nameof(EulerAnglesTracker))] public class EulerAnglesTracker : MonoBehaviour { - [SerializeField] Vector3Signal _signal; + [SerializeField] Signal _signal; [SerializeField] bool _local; [SerializeField] bool _trackOnUpdate = true; [SerializeField] bool _trackOnLateUpdate; [SerializeField] bool _trackOnFixedUpdate; /// The signal that keeps track of the rotation. - public Vector3Signal Signal { get => _signal; set => _signal = value; } + public Signal Signal { get => _signal; set => _signal = value; } /// True to track local instead of global rotation. public bool Local { get => _local; set => _local = value; } diff --git a/Extras/Utility/Scripts/PositionTracker.cs b/Extras/Utility/Scripts/PositionTracker.cs index 07d50c2..757f3a4 100644 --- a/Extras/Utility/Scripts/PositionTracker.cs +++ b/Extras/Utility/Scripts/PositionTracker.cs @@ -1,5 +1,4 @@ using UnityEngine; -using Signals.Common; namespace Signals.Extras.Utility { @@ -10,14 +9,14 @@ namespace Signals.Extras.Utility [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Utility) + "/" + nameof(PositionTracker))] public class PositionTracker : MonoBehaviour { - [SerializeField] Vector3Signal _signal; + [SerializeField] Signal _signal; [SerializeField] bool _local; [SerializeField] bool _trackOnUpdate = true; [SerializeField] bool _trackOnLateUpdate; [SerializeField] bool _trackOnFixedUpdate; /// The signal that keeps track of the position. - public Vector3Signal Signal { get => _signal; set => _signal = value; } + public Signal Signal { get => _signal; set => _signal = value; } /// True to track local instead of global position. public bool Local { get => _local; set => _local = value; } diff --git a/Extras/Utility/Scripts/RotationTracker.cs b/Extras/Utility/Scripts/RotationTracker.cs index 7834f8f..9cc0dac 100644 --- a/Extras/Utility/Scripts/RotationTracker.cs +++ b/Extras/Utility/Scripts/RotationTracker.cs @@ -1,5 +1,4 @@ using UnityEngine; -using Signals.Common; namespace Signals.Extras.Utility { @@ -9,14 +8,14 @@ namespace Signals.Extras.Utility [AddComponentMenu(nameof(Signals) + "/" + nameof(Extras) + "/" + nameof(Utility) + "/" + nameof(RotationTracker))] public class RotationTracker : MonoBehaviour { - [SerializeField] QuaternionSignal _signal; + [SerializeField] Signal _signal; [SerializeField] bool _local; [SerializeField] bool _trackOnUpdate = true; [SerializeField] bool _trackOnLateUpdate; [SerializeField] bool _trackOnFixedUpdate; /// The signal that keeps track of the rotation. - public QuaternionSignal Signal { get => _signal; set => _signal = value; } + public Signal Signal { get => _signal; set => _signal = value; } /// True to track local instead of global rotation. public bool Local { get => _local; set => _local = value; } diff --git a/README.md b/README.md index d22438e..6b31d18 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Signals For Unity3D v2.2.0 +# Signals For Unity3D v3.0.0 Tested with Unity 2022.3.14f1 LTS ## Documentation You can find the API documentation [here](https://jheiling.github.io/unity-signals/). @@ -16,16 +16,10 @@ Signals are a solution for both use cases. Copy everything somewhere into your project's Asset folder. ## Usage ### Implementing A Signal -First you need to create a class for the signal's OnChanged event: -```c# -[System.Serializable] -public class FloatEvent : UnityEvent { } -``` - -Next create a class for the signal: +Create a class for the signal: ```c# [UnityEngine.CreateAssetMenu] -public class FloatSignal : Signal { } +public class FloatSignal : Signal { } ``` By default signals will trigger the OnChanged event whenever a new value is assigned. By overriding the ValidateValue method you can validate the value and/or add a check to avoid unnecessarily triggering the event. @@ -33,38 +27,17 @@ By default ValidateValue will use the Equals method for this check. If you want to have a nice inspector create an editor class for your signal and override the ValueField method: ```c# -[UnityEditor.CustomEditor(typeof(FloatSignal))] -public class FloatSignalEditor : SignalEditor +[UnityEditor.CustomEditor(typeof(Signal))] +public class FloatSignalEditor : SignalEditor { - protected override float ValueField(float value) - { - return EditorGUILayout.DelayedFloatField(value); - } + protected override float ValueField(float value) => EditorGUILayout.DelayedFloatField(value); } ``` ### Implementing A SignalListener By inheriting from SignalListener you can create a Component that listens to a signal's OnChanged event and propagates it: ```c# -public class FloatSignalListener : SignalListener { } -``` -### Implementing A ValueReference -By inheriting from ValueReference you can use serializable fields in your scripts that can either hold a local value or a reference to a signal's value: -```c# -[System.Serializable] -public class FloatValueReference : ValueReference -{ - public FloatValueReference() { } - public FloatValueReference(float localValue) : base(localValue) { } -} -``` - -And to make it look nice in the editor: -```c# -[UnityEditor.CustomPropertyDrawer(typeof(FloatValueReference))] -public class FloatValueReferenceDrawer : ValueReferenceDrawer { } +public class FloatSignalListener : SignalListener { } ``` -### Code Generation -You can find a simple code generator that can save you a lot of work [here](https://github.com/jheiling/unity-signals-generator). ### Examples See Examples folder. ## Credits diff --git a/Scripts/Editor/SignalEditor.cs b/Scripts/Editor/SignalEditor.cs index 1f4f9e3..7738bfc 100644 --- a/Scripts/Editor/SignalEditor.cs +++ b/Scripts/Editor/SignalEditor.cs @@ -6,8 +6,7 @@ namespace Signals { /// Abstract base class for custom editors for classes inheriting from . /// The type of the . - /// The type of the event. - public abstract class SignalEditor : Editor where ET : UnityEvent, new() + public abstract class SignalEditor : Editor { static readonly GUIContent _descriptionLabel = new("Description"); static readonly GUIContent _onUpdatedLabel = new("On Updated"); @@ -27,7 +26,7 @@ void OnEnable() public override void OnInspectorGUI() { serializedObject.Update(); - var signal = target as Signal; + var signal = target as Signal; EditorGUILayout.PropertyField(_description, _descriptionLabel); diff --git a/Scripts/Editor/ValueReferenceDrawer.cs b/Scripts/Editor/ValueReferenceDrawer.cs index ac20cdd..fe86c0e 100644 --- a/Scripts/Editor/ValueReferenceDrawer.cs +++ b/Scripts/Editor/ValueReferenceDrawer.cs @@ -8,13 +8,15 @@ public abstract class ValueReferenceDrawer : PropertyDrawer { static readonly string[] _popupOptions = { "Use Signal Value", "Use Local Value" }; - static readonly GUIStyle _popupStyle = new(GUI.skin.GetStyle("PaneOptions")) - { - imagePosition = ImagePosition.ImageOnly - }; + static GUIStyle _popupStyle; public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) { + _popupStyle ??= new(GUI.skin.GetStyle("PaneOptions")) + { + imagePosition = ImagePosition.ImageOnly + }; + label = EditorGUI.BeginProperty(position, label, property); position = EditorGUI.PrefixLabel(position, label); diff --git a/Scripts/ISignal.cs b/Scripts/ISignal.cs index 614eb9b..8f98aae 100644 --- a/Scripts/ISignal.cs +++ b/Scripts/ISignal.cs @@ -19,8 +19,7 @@ public interface ISignal /// The Signal interface. /// The type of the . - /// The type of the event. - public interface ISignal where ET : UnityEvent, new() + public interface ISignal { /// /// The current value of the . diff --git a/Scripts/Signal.cs b/Scripts/Signal.cs index bd60bae..dc15ab7 100644 --- a/Scripts/Signal.cs +++ b/Scripts/Signal.cs @@ -24,15 +24,14 @@ public class Signal : ScriptableObject, ISignal /// Implements the interface. /// /// The type of the . - /// The type of the underlying UnityEvent. - public abstract class Signal : ScriptableObject, ISignal where ET : UnityEvent, new() + public abstract class Signal : ScriptableObject, ISignal { #if UNITY_EDITOR [SerializeField, Multiline] string _description; [SerializeField] bool _serializeChanges; #endif [SerializeField] T _initialValue; - [SerializeField] ET _onUpdated; + [SerializeField] UnityEvent _onUpdated; [SerializeField] bool _useValidation = true; T _value; @@ -91,6 +90,6 @@ protected virtual void ProcessValue(ref T value) { } /// Implicit cast from the to it's . /// The . - public static implicit operator T(Signal signal) => signal._value; + public static implicit operator T(Signal signal) => signal._value; } } \ No newline at end of file diff --git a/Scripts/SignalListener.cs b/Scripts/SignalListener.cs index ef46192..7f827a9 100644 --- a/Scripts/SignalListener.cs +++ b/Scripts/SignalListener.cs @@ -1,5 +1,4 @@ -using System.Diagnostics.CodeAnalysis; -using UnityEngine; +using UnityEngine; using UnityEngine.Events; namespace Signals @@ -62,21 +61,18 @@ void RemoveListenerFromSignal() /// Abstract base class for SignalListeners. /// The type of the . - /// The type of the event. /// The type of the Signal. - public abstract class SignalListener : MonoBehaviour - where ET : UnityEvent, new() - where ST : ISignal + public abstract class SignalListener : MonoBehaviour { #if UNITY_EDITOR [SerializeField] [Multiline] string _description; #endif - [SerializeField] ST _signal; - [SerializeField] ET _onUpdated; + [SerializeField] Signal _signal; + [SerializeField] UnityEvent _onUpdated; [SerializeField] bool _invokeImmediately; /// The . - public ST Signal + public Signal Signal { get => _signal; set @@ -112,7 +108,6 @@ void AddListenerToSignal() } } - [SuppressMessage("Style", "IDE0031:Use null propagation", Justification = "_signal is a Unity Object")] void RemoveListenerFromSignal() { if (_signal != null) _signal.RemoveListener(_onUpdated.Invoke); diff --git a/Scripts/ValueReference.cs b/Scripts/ValueReference.cs index 97f7039..3b97dbf 100644 --- a/Scripts/ValueReference.cs +++ b/Scripts/ValueReference.cs @@ -1,19 +1,15 @@ using System; using UnityEngine; -using UnityEngine.Events; namespace Signals { - /// Abstract base class for serializable classes referencing either a or a . + /// Serializable class referencing either a or a . /// The type of the . - /// The type of the event. - /// The type of the Signal. - public abstract class ValueReference - where ET : UnityEvent, new() - where ST : ISignal + [Serializable] + public class ValueReference { [SerializeField] bool _useLocalValue = true; - [SerializeField] ST _signal; + [SerializeField] Signal _signal; [SerializeField] T _localValue; /// Default constructor. @@ -31,7 +27,7 @@ public bool UseLocalValue } /// The Signal whose is used if is false. - public ST Signal + public Signal Signal { get => _signal; set => _signal = value; @@ -64,6 +60,6 @@ public T Value /// Implicit cast from the to it's . /// The . - public static implicit operator T(ValueReference reference) => reference.Value; + public static implicit operator T(ValueReference reference) => reference.Value; } } \ No newline at end of file diff --git a/Scripts/ValueReferenceComponent.cs b/Scripts/ValueReferenceComponent.cs index b56bd0b..73771d5 100644 --- a/Scripts/ValueReferenceComponent.cs +++ b/Scripts/ValueReferenceComponent.cs @@ -1,23 +1,19 @@ using UnityEngine; -using UnityEngine.Events; namespace Signals { - public abstract class ValueReferenceComponent : MonoBehaviour - where ET : UnityEvent, new() - where ST : ISignal - where VT : ValueReference + public abstract class ValueReferenceComponent : MonoBehaviour { - [SerializeField] VT _reference; + [SerializeField] ValueReference _reference; - public VT Reference => _reference; + public ValueReference Reference => _reference; /// Implicit cast from the ValueReferenceComponent to the wrapped . /// The ValueReferenceComponent. - public static implicit operator VT(ValueReferenceComponent component) => component._reference; + public static implicit operator ValueReference(ValueReferenceComponent component) => component._reference; /// Implicit cast from the ValueReferenceComponent to the wrapped . /// The ValueReferenceComponent. - public static implicit operator T(ValueReferenceComponent component) => component._reference.Value; + public static implicit operator T(ValueReferenceComponent component) => component._reference.Value; } } \ No newline at end of file