Merge branch 'release/2024.5.22'

Leopotam · May 22, 2024 · e39b84a · e39b84a
2 parents d7055df + 2cef898
commit e39b84a
Show file tree

Hide file tree

Showing 39 changed files with 84 additions and 86 deletions.
diff --git a/Editor/Widgets/EcsUguiNonVisualWidgetInspector.cs b/Editor/Widgets/EcsUguiNonVisualWidgetInspector.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEditor;

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,11 +1,7 @@
-Copyright (c) 2012 - 2022 leopotam@yandex.ru
+Copyright (c) 2012-2024 leopotam@yandex.ru
 
 Данное программное обеспечение и сопутствующая документация (далее - Продукт)
-выпускается на условиях двойного лицензирования - под собственнической/коммерческой
-и MIT-Red лицензиями.
-
-Условия использования под собственнической/коммерческой лицензии обсуждаются
-индивидуально, для подробностей следует писать на электронную почту.
+выпускается под MIT-Red лицензией.
 
 MIT-Red регулируется совокупностью следующих правил, если хотя бы
 одно из них невыполнимо - использование Продукта запрещено:
@@ -30,4 +26,4 @@ MIT-Red регулируется совокупностью следующих
 НЕ ОГРАНИЧИВАЯСЬ ИМИ. НИ В КАКОМ СЛУЧАЕ АВТОРЫ ИЛИ ПРАВООБЛАДАТЕЛИ НЕ НЕСУТ
 ОТВЕТСТВЕННОСТИ ПО КАКИМ-ЛИБО ИСКАМ, ЗА УЩЕРБ ИЛИ ПО ИНЫМ ТРЕБОВАНИЯМ,
 В ТОМ ЧИСЛЕ, ПРИ ДЕЙСТВИИ КОНТРАКТА, ДЕЛИКТЕ ИЛИ ИНОЙ СИТУАЦИИ, ВОЗНИКШИМ
-ИЗ-ЗА ИСПОЛЬЗОВАНИЯ ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ ИЛИ ИНЫХ ДЕЙСТВИЙ С ПРОДУКТОМ. 
+ИЗ-ЗА ИСПОЛЬЗОВАНИЯ ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ ИЛИ ИНЫХ ДЕЙСТВИЙ С ПРОДУКТОМ.
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # LeoECS Lite uGui Bindings - поддержка событий uGui в ECS-мире
 Интеграция событий uGui в ECS-мир.
 
+> **ВАЖНО!** АКТИВНАЯ РАЗРАБОТКА ПРЕКРАЩЕНА, ВОЗМОЖНО ТОЛЬКО ИСПРАВЛЕНИЕ ОБНАРУЖЕННЫХ ОШИБОК. СОСТОЯНИЕ СТАБИЛЬНОЕ, ИЗВЕСТНЫХ ОШИБОК НЕ ОБНАРУЖЕНО. ЗА НОВЫМ ПОКОЛЕНИЕМ ФРЕЙМВОРКА СТОИТ СЛЕДИТЬ В БЛОГЕ https://leopotam.com/
+
 > Проверено на Unity 2020.3 (зависит от Unity) и содержит asmdef-описания для компиляции в виде отдельных сборок и уменьшения времени рекомпиляции основного проекта.
 
 > **ВАЖНО!** Зависит от [LeoECS Lite](https://github.com/Leopotam/ecslite) - зависимость должна быть установлена до установки этого модуля.
@@ -16,7 +18,7 @@
 * [Лицензия](#Лицензия)
 
 # Социальные ресурсы
-[![discord](https://img.shields.io/discord/404358247621853185.svg?label=enter%20to%20discord%20server&style=for-the-badge&logo=discord)](https://discord.gg/5GZVde6)
+[Блог разработчика](https://leopotam.com/)
 
 # Установка
 
@@ -75,7 +77,7 @@ public class Startup : MonoBehaviour {
 public class Test1System : IEcsInitSystem {
     // Это поле будет автоматически инициализировано
     // ссылкой на экземпляр эмиттера на сцене.
-    readonly EcsUguiEmitter _ugui = default;
+    readonly EcsCustomInject<EcsUguiEmitter> _ugui = default;
 
     GameObject _btnGo;
     Transform _btnTransform;
@@ -174,7 +176,7 @@ public class TestUguiClickEventSystem : IEcsInitSystem, IEcsRunSystem {
 ```
 
 # Лицензия
-Фреймворк выпускается под двумя лицензиями, [подробности тут](./LICENSE.md).
+Пакет выпускается под [MIT-Red лицензией](./LICENSE.md).
 
 В случаях лицензирования по условиям MIT-Red не стоит расчитывать на
 персональные консультации или какие-либо гарантии.
diff --git a/Runtime/Actions/EcsUguiActionBase.cs b/Runtime/Actions/EcsUguiActionBase.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Actions/EcsUguiClickAction.cs b/Runtime/Actions/EcsUguiClickAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.EventSystems;

diff --git a/Runtime/Actions/EcsUguiDownAction.cs b/Runtime/Actions/EcsUguiDownAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.EventSystems;

diff --git a/Runtime/Actions/EcsUguiDragEndAction.cs b/Runtime/Actions/EcsUguiDragEndAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.EventSystems;

diff --git a/Runtime/Actions/EcsUguiDragMoveAction.cs b/Runtime/Actions/EcsUguiDragMoveAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.EventSystems;

diff --git a/Runtime/Actions/EcsUguiDragStartAction.cs b/Runtime/Actions/EcsUguiDragStartAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.EventSystems;

diff --git a/Runtime/Actions/EcsUguiDropAction.cs b/Runtime/Actions/EcsUguiDropAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.EventSystems;

diff --git a/Runtime/Actions/EcsUguiEnterAction.cs b/Runtime/Actions/EcsUguiEnterAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.EventSystems;

diff --git a/Runtime/Actions/EcsUguiExitAction.cs b/Runtime/Actions/EcsUguiExitAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.EventSystems;

diff --git a/Runtime/Actions/EcsUguiNoAction.cs b/Runtime/Actions/EcsUguiNoAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 namespace Leopotam.EcsLite.Unity.Ugui {

diff --git a/Runtime/Actions/EcsUguiScrollViewAction.cs b/Runtime/Actions/EcsUguiScrollViewAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Actions/EcsUguiSliderAction.cs b/Runtime/Actions/EcsUguiSliderAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Actions/EcsUguiTmpDropdownAction.cs b/Runtime/Actions/EcsUguiTmpDropdownAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using TMPro;

diff --git a/Runtime/Actions/EcsUguiTmpInputChangeAction.cs b/Runtime/Actions/EcsUguiTmpInputChangeAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using TMPro;

diff --git a/Runtime/Actions/EcsUguiTmpInputEndAction.cs b/Runtime/Actions/EcsUguiTmpInputEndAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using TMPro;

diff --git a/Runtime/Actions/EcsUguiUpAction.cs b/Runtime/Actions/EcsUguiUpAction.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.EventSystems;

diff --git a/Runtime/Components/EcsUguiClickEvent.cs b/Runtime/Components/EcsUguiClickEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Components/EcsUguiDownEvent.cs b/Runtime/Components/EcsUguiDownEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Components/EcsUguiDragEndEvent.cs b/Runtime/Components/EcsUguiDragEndEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Components/EcsUguiDragMoveEvent.cs b/Runtime/Components/EcsUguiDragMoveEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Components/EcsUguiDragStartEvent.cs b/Runtime/Components/EcsUguiDragStartEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Components/EcsUguiDropEvent.cs b/Runtime/Components/EcsUguiDropEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Components/EcsUguiEnterEvent.cs b/Runtime/Components/EcsUguiEnterEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Components/EcsUguiExitEvent.cs b/Runtime/Components/EcsUguiExitEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Components/EcsUguiScrollViewEvent.cs b/Runtime/Components/EcsUguiScrollViewEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Components/EcsUguiSliderChangeEvent.cs b/Runtime/Components/EcsUguiSliderChangeEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine.UI;

diff --git a/Runtime/Components/EcsUguiTmpDropdownChangeEvent.cs b/Runtime/Components/EcsUguiTmpDropdownChangeEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using TMPro;

diff --git a/Runtime/Components/EcsUguiTmpInputChangeEvent.cs b/Runtime/Components/EcsUguiTmpInputChangeEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using TMPro;

diff --git a/Runtime/Components/EcsUguiTmpInputEndEvent.cs b/Runtime/Components/EcsUguiTmpInputEndEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using TMPro;

diff --git a/Runtime/Components/EcsUguiUpEvent.cs b/Runtime/Components/EcsUguiUpEvent.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Systems/EcsUguiCallbackSystem.cs b/Runtime/Systems/EcsUguiCallbackSystem.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using System;

diff --git a/Runtime/Systems/EcsUguiEmitter.cs b/Runtime/Systems/EcsUguiEmitter.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using System;
@@ -16,13 +16,13 @@ public class EcsUguiEmitter : MonoBehaviour {
         readonly Dictionary<int, GameObject> _actions = new Dictionary<int, GameObject> (64);
 
         internal void SetWorld (EcsWorld world) {
-#if DEBUG && !LEOECSLITE_NO_SANITIZE_CHECKS
-            if (_world != null) { throw new Exception ("World already attached."); }
-#endif
             _world = world;
         }
 
         public virtual EcsWorld GetWorld () {
+            if (_world != null && !_world.IsAlive ()) {
+                _world = null;
+            }
             return _world;
         }
 

diff --git a/Runtime/Systems/EcsUguiProxyEmitter.cs b/Runtime/Systems/EcsUguiProxyEmitter.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;

diff --git a/Runtime/Systems/Extensions.cs b/Runtime/Systems/Extensions.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using System;

diff --git a/Runtime/Widgets/EcsUguiNonVisualWidget.cs b/Runtime/Widgets/EcsUguiNonVisualWidget.cs
@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------------
-// The Proprietary or MIT-Red License
-// Copyright (c) 2012-2022 Leopotam <leopotam@yandex.ru>
+// The MIT-Red License
+// Copyright (c) 2012-2024 Leopotam <leopotam@yandex.ru>
 // ----------------------------------------------------------------------------
 
 using UnityEngine;