diff --git a/Assets/UnityScreenNavigator/Runtime/Core/Shared/Animation/SimpleTransitionAnimationBehaviour.cs b/Assets/UnityScreenNavigator/Runtime/Core/Shared/Animation/SimpleTransitionAnimationBehaviour.cs index 9cfafb8..5a38392 100644 --- a/Assets/UnityScreenNavigator/Runtime/Core/Shared/Animation/SimpleTransitionAnimationBehaviour.cs +++ b/Assets/UnityScreenNavigator/Runtime/Core/Shared/Animation/SimpleTransitionAnimationBehaviour.cs @@ -1,8 +1,8 @@ using System.Threading; using Cysharp.Threading.Tasks; -using DG.Tweening; using UnityEngine; - +using DG.Tweening; +using Sequence = DG.Tweening.Sequence; namespace UnityScreenNavigator.Runtime.Core.Shared.Animation { public sealed class SimpleTransitionAnimationBehaviour : TransitionAnimationBehaviour @@ -56,16 +56,6 @@ public override async UniTask Play(CancellationToken cancellationToken) public async UniTask SetTime() { - // time = Mathf.Max(0.0f, time - _delay); - // var progress = _duration <= 0.0f ? 1.0f : Mathf.Clamp01(time / _duration); - // progress = Easings.Interpolate(progress, _easeType); - // var position = Vector3.Lerp(_beforePosition, _afterPosition, progress); - // var scale = Vector3.Lerp(_beforeScale, _afterScale, progress); - // var alpha = Mathf.Lerp(_beforeAlpha, _afterAlpha, progress); - // RectTransform.anchoredPosition = position; - // RectTransform.localScale = scale; - // _canvasGroup.alpha = alpha; - var anchorTweener = RectTransform.DOAnchorPos(_afterPosition, _duration).SetDelay(_delay).SetEase(_easeType) .From(_beforePosition); var scaleTweener = RectTransform.DOScale(_afterScale, _duration).SetDelay(_delay).SetEase(_easeType) diff --git a/Assets/UnityScreenNavigator/package.json b/Assets/UnityScreenNavigator/package.json index 52c6215..3d9e4d5 100644 --- a/Assets/UnityScreenNavigator/package.json +++ b/Assets/UnityScreenNavigator/package.json @@ -1,13 +1,14 @@ { - "name": "com.felixngd.unityuimanager", + "name": "com.wolffungame.unityuimanager", "displayName": "Unity UI Manager", - "version": "1.2.29", + "version": "1.2.30", "unity": "2020.3", "license": "MIT", "dependencies": { "com.cysharp.unitask": "2.2.5", "com.zbase.collections.pooled": "2.8.1", - "com.zbase.foundation.pooling": "2.3.9" + "com.zbase.foundation.pooling": "2.3.9", + "com.dre0dru.addressables.services": "1.2.0" }, "author": { "name": "Nguyen Danh Dat", diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 585caaf..4aab942 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -26,6 +26,14 @@ MonoBehaviour: m_IsDefault: 1 m_Capabilities: 7 m_ConfigSource: 0 + - m_Id: scoped:project:Unity NuGet + m_Name: Unity NuGet + m_Url: https://unitynuget-registry.azurewebsites.net + m_Scopes: + - org.nuget + m_IsDefault: 0 + m_Capabilities: 0 + m_ConfigSource: 4 - m_Id: scoped:project:package.openupm.com m_Name: package.openupm.com m_Url: https://package.openupm.com @@ -36,7 +44,7 @@ MonoBehaviour: m_IsDefault: 0 m_Capabilities: 0 m_ConfigSource: 4 - m_UserSelectedRegistryName: package.openupm.com + m_UserSelectedRegistryName: Unity NuGet m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0