Skip to content

Commit

Permalink
Merge branch 'release/2024.5.22'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Leopotam
Leopotam committed May 22, 2024
2 parents d7055df + 2cef898 commit e39b84a
Show file tree
Hide file tree
Showing 39 changed files with 84 additions and 86 deletions.
4 changes: 2 additions & 2 deletions Editor/Widgets/EcsUguiNonVisualWidgetInspector.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEditor;
Expand Down
10 changes: 3 additions & 7 deletions LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
Copyright (c) 2012 - 2022 [email protected]
Copyright (c) 2012-2024 [email protected]

Данное программное обеспечение и сопутствующая документация (далее - Продукт)
выпускается на условиях двойного лицензирования - под собственнической/коммерческой
и MIT-Red лицензиями.

Условия использования под собственнической/коммерческой лицензии обсуждаются
индивидуально, для подробностей следует писать на электронную почту.
выпускается под MIT-Red лицензией.

MIT-Red регулируется совокупностью следующих правил, если хотя бы
одно из них невыполнимо - использование Продукта запрещено:
Expand All @@ -30,4 +26,4 @@ MIT-Red регулируется совокупностью следующих
НЕ ОГРАНИЧИВАЯСЬ ИМИ. НИ В КАКОМ СЛУЧАЕ АВТОРЫ ИЛИ ПРАВООБЛАДАТЕЛИ НЕ НЕСУТ
ОТВЕТСТВЕННОСТИ ПО КАКИМ-ЛИБО ИСКАМ, ЗА УЩЕРБ ИЛИ ПО ИНЫМ ТРЕБОВАНИЯМ,
В ТОМ ЧИСЛЕ, ПРИ ДЕЙСТВИИ КОНТРАКТА, ДЕЛИКТЕ ИЛИ ИНОЙ СИТУАЦИИ, ВОЗНИКШИМ
ИЗ-ЗА ИСПОЛЬЗОВАНИЯ ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ ИЛИ ИНЫХ ДЕЙСТВИЙ С ПРОДУКТОМ.
ИЗ-ЗА ИСПОЛЬЗОВАНИЯ ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ ИЛИ ИНЫХ ДЕЙСТВИЙ С ПРОДУКТОМ.
8 changes: 5 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -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) - зависимость должна быть установлена до установки этого модуля.
Expand All @@ -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/)

# Установка

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -174,7 +176,7 @@ public class TestUguiClickEventSystem : IEcsInitSystem, IEcsRunSystem {
```

# Лицензия
Фреймворк выпускается под двумя лицензиями, [подробности тут](./LICENSE.md).
Пакет выпускается под [MIT-Red лицензией](./LICENSE.md).

В случаях лицензирования по условиям MIT-Red не стоит расчитывать на
персональные консультации или какие-либо гарантии.
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiActionBase.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiClickAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.EventSystems;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiDownAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.EventSystems;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiDragEndAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.EventSystems;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiDragMoveAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.EventSystems;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiDragStartAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.EventSystems;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiDropAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.EventSystems;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiEnterAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.EventSystems;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiExitAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.EventSystems;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiNoAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

namespace Leopotam.EcsLite.Unity.Ugui {
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiScrollViewAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiSliderAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiTmpDropdownAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using TMPro;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiTmpInputChangeAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using TMPro;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiTmpInputEndAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using TMPro;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Actions/EcsUguiUpAction.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.EventSystems;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiClickEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiDownEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiDragEndEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiDragMoveEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiDragStartEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiDropEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiEnterEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiExitEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiScrollViewEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiSliderChangeEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine.UI;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiTmpDropdownChangeEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using TMPro;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiTmpInputChangeEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using TMPro;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiTmpInputEndEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using TMPro;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Components/EcsUguiUpEvent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Systems/EcsUguiCallbackSystem.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using System;
Expand Down
10 changes: 5 additions & 5 deletions Runtime/Systems/EcsUguiEmitter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using System;
Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions Runtime/Systems/EcsUguiProxyEmitter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Systems/Extensions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using System;
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Widgets/EcsUguiNonVisualWidget.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// The Proprietary or MIT-Red License
// Copyright (c) 2012-2022 Leopotam <[email protected]>
// The MIT-Red License
// Copyright (c) 2012-2024 Leopotam <[email protected]>
// ----------------------------------------------------------------------------

using UnityEngine;
Expand Down
Loading

0 comments on commit e39b84a

Please sign in to comment.