Compare commits
9
Commits
09219d9091
..
UI2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
91645c2d2c | ||
|
|
6de62720b0 | ||
|
|
7bc0f3b8fa | ||
|
|
724161c455 | ||
|
|
623b152690 | ||
|
|
5e4a7d2874 | ||
|
|
64aa63f4ed | ||
|
|
b4655c5665 | ||
|
|
9b26ff18fa |
No files matched your search
@@ -54,7 +54,7 @@ MonoBehaviour:
|
|||||||
m_Id:
|
m_Id:
|
||||||
m_RemoteCatalogLoadPath:
|
m_RemoteCatalogLoadPath:
|
||||||
m_Id:
|
m_Id:
|
||||||
m_ContentStateBuildPathProfileVariableName: <default settings path>
|
m_ContentStateBuildPathProfileVariableName:
|
||||||
m_CustomContentStateBuildPath:
|
m_CustomContentStateBuildPath:
|
||||||
m_ContentStateBuildPath:
|
m_ContentStateBuildPath:
|
||||||
m_BuildAddressablesWithPlayerBuild: 0
|
m_BuildAddressablesWithPlayerBuild: 0
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Scenes;
|
|
||||||
using Code.StateMachine;
|
using Code.StateMachine;
|
||||||
using Code.UI;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Code.App.AppStates
|
namespace Code.App.AppStates
|
||||||
{
|
{
|
||||||
@@ -10,32 +7,17 @@ namespace Code.App.AppStates
|
|||||||
{
|
{
|
||||||
public GameOverState(AppStateMachineContext context) : base(context)
|
public GameOverState(AppStateMachineContext context) : base(context)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
private float damnTimer = 3f; // TODO Удалить при первой возможности
|
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Context.UIService.SwitchPanelTo(UIPanel.GameOver);
|
|
||||||
|
|
||||||
base.EnterState();
|
base.EnterState();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ToMainMenu()
|
|
||||||
{
|
|
||||||
Context.StateMachine.SwitchState(AppState.MainMenu)
|
|
||||||
.AllowStateTransition(AppState.Gameplay);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Tick()
|
public override void Tick()
|
||||||
{
|
{ }
|
||||||
damnTimer -= Time.deltaTime;
|
|
||||||
if (damnTimer <= float.Epsilon) ToMainMenu();
|
|
||||||
}
|
|
||||||
public override void ExitState()
|
public override void ExitState()
|
||||||
{
|
{
|
||||||
damnTimer = 5f;
|
|
||||||
|
|
||||||
Context.UIService.LoadingScreen.Show();
|
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,95 +6,43 @@ using Code.Scenes;
|
|||||||
using Code.StateMachine;
|
using Code.StateMachine;
|
||||||
using Code.UI;
|
using Code.UI;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
|
||||||
|
|
||||||
namespace Code.App.AppStates
|
namespace Code.App.AppStates
|
||||||
{
|
{
|
||||||
public class GameplayState : BaseState<AppStateMachineContext>
|
public class GameplayState : BaseState<AppStateMachineContext>
|
||||||
{
|
{
|
||||||
private PlayerHealth _playerHealth;
|
private PlayerHealth _playerHealthPoints;
|
||||||
private PlayerMoney _playerMoney;
|
|
||||||
|
|
||||||
public GameplayState(AppStateMachineContext context) : base(context)
|
public GameplayState(AppStateMachineContext context) : base(context)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Context.UIService.LoadingScreen.Show();
|
Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded);
|
||||||
|
|
||||||
Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded); // TODO Фабрика говна Nada
|
|
||||||
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
||||||
|
|
||||||
Context.UIService.SwitchPanelTo(UIPanel.Gameplay);
|
|
||||||
|
|
||||||
Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);
|
|
||||||
|
|
||||||
_playerMoney = Context.PlayerFactory.CreatePlayerMoney();
|
|
||||||
_playerHealth = Context.PlayerFactory.CreatePlayerHealth();
|
|
||||||
|
|
||||||
_playerHealth.OnDeath += EndGame;
|
|
||||||
|
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.GiveHealth, GiveHealth);
|
Context.UIService.LoadingScreen.Show();
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.GiveMoney, GiveMoney);
|
Context.UIService.SwitchPanelTo(UIPanel.Gameplay);
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.LooseHealth, LooseHealth);
|
|
||||||
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.LooseMoney, LooseMoney);
|
Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SceneLoaded()
|
private void SceneLoaded()
|
||||||
{
|
{
|
||||||
((GameplayPanel)(Context.UIService.CurrentPanel)).Initialize(_playerMoney, _playerHealth);
|
|
||||||
Context.UIService.LoadingScreen.Hide();
|
Context.UIService.LoadingScreen.Hide();
|
||||||
|
|
||||||
base.EnterState();
|
base.EnterState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Debug
|
|
||||||
private void GiveHealth(InputAction.CallbackContext context)
|
|
||||||
{
|
|
||||||
_playerHealth.GetDamage(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LooseHealth(InputAction.CallbackContext context)
|
|
||||||
{
|
|
||||||
_playerHealth.GetDamage(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void GiveMoney(InputAction.CallbackContext context)
|
|
||||||
{
|
|
||||||
_playerMoney.GiveMoney(100);
|
|
||||||
((GameplayPanel)(Context.UIService.CurrentPanel)).SummonDispatcher();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LooseMoney(InputAction.CallbackContext context)
|
|
||||||
{
|
|
||||||
_playerMoney.LooseMoney(100);
|
|
||||||
((GameplayPanel)(Context.UIService.CurrentPanel)).CloseDispatcher();
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Tick()
|
public override void Tick()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
private void EndGame()
|
|
||||||
{
|
|
||||||
Context.StateMachine.SwitchState(AppState.GameOver)
|
|
||||||
.AllowStateTransition(AppState.MainMenu);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void ExitState()
|
public override void ExitState()
|
||||||
{
|
{
|
||||||
_playerHealth = null;
|
|
||||||
_playerMoney = null;
|
|
||||||
|
|
||||||
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
Context.InputService.DisableMap(ActionMappings.Gameplay);
|
||||||
|
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.GiveHealth, GiveHealth);
|
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.GiveMoney, GiveHealth);
|
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.LooseHealth, LooseHealth);
|
|
||||||
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.LooseMoney, LooseMoney);
|
|
||||||
|
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,59 +1,44 @@
|
|||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
using Code.Gameplay.Camera.CameraStates;
|
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
using Code.Scenes.SceneEnvironments;
|
|
||||||
using Code.StateMachine;
|
using Code.StateMachine;
|
||||||
using Code.UI;
|
using Code.UI;
|
||||||
using Reflex.Extensions;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.SceneManagement;
|
|
||||||
|
|
||||||
namespace Code.App.AppStates
|
namespace Code.App.AppStates
|
||||||
{
|
{
|
||||||
public class MainMenuState : BaseState<AppStateMachineContext>
|
public class MainMenuState : BaseState<AppStateMachineContext>
|
||||||
{
|
{
|
||||||
public MainMenuState(AppStateMachineContext context) : base(context)
|
public MainMenuState(AppStateMachineContext context) : base(context)
|
||||||
{
|
{ }
|
||||||
}
|
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Context.UIService.LoadingScreen.Show();
|
|
||||||
|
|
||||||
Context.SceneLoaderService.LoadScene((int)SceneIds.MainMenu, SceneLoaded);
|
Context.SceneLoaderService.LoadScene((int)SceneIds.MainMenu, SceneLoaded);
|
||||||
Context.InputService.EnableMap(ActionMappings.MainMenu);
|
Context.InputService.EnableMap(ActionMappings.MainMenu);
|
||||||
|
|
||||||
|
Context.UIService.LoadingScreen.Show();
|
||||||
Context.UIService.SwitchPanelTo(UIPanel.MainMenu);
|
Context.UIService.SwitchPanelTo(UIPanel.MainMenu);
|
||||||
((MainMenuPanel)Context.UIService.CurrentPanel).startButton.onClick.AddListener(StartGame);
|
((MainMenuPanel)Context.UIService.CurrentPanel).startButton.onClick.AddListener(StartGame);
|
||||||
((MainMenuPanel)Context.UIService.CurrentPanel).exitButton.onClick.AddListener(ExitGame);
|
((MainMenuPanel)Context.UIService.CurrentPanel).exitButton.onClick.AddListener(ExitGame);
|
||||||
|
|
||||||
Context.CameraStateMachine.SwitchState(CameraMode.Static);
|
Context.CameraStateMachine.SwitchState(CameraMode.Static);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SceneLoaded()
|
private void SceneLoaded()
|
||||||
{
|
{
|
||||||
Context.UIService.LoadingScreen.Hide();
|
Context.UIService.LoadingScreen.Hide();
|
||||||
|
|
||||||
var hui = ((MainMenuEnvironment)SceneManager.GetActiveScene()
|
|
||||||
.GetSceneContainer().Resolve<CurrentSceneEnvironment>());
|
|
||||||
|
|
||||||
((StaticState)Context.CameraStateMachine.CurrentBaseState).LookTarget =
|
|
||||||
hui.cameraTarget;
|
|
||||||
|
|
||||||
((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(hui.cameraPosition);
|
|
||||||
|
|
||||||
base.EnterState();
|
base.EnterState();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Tick()
|
public override void Tick()
|
||||||
{
|
{ }
|
||||||
}
|
|
||||||
|
|
||||||
private void StartGame()
|
private void StartGame()
|
||||||
{
|
{
|
||||||
Context.StateMachine.SwitchState(AppState.Gameplay)
|
Context.StateMachine.SwitchState(AppState.Gameplay)
|
||||||
|
.AllowStateTransition(AppState.MainMenu)
|
||||||
.AllowStateTransition(AppState.GameOver);
|
.AllowStateTransition(AppState.GameOver);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,11 +46,11 @@ namespace Code.App.AppStates
|
|||||||
{
|
{
|
||||||
Application.Quit();
|
Application.Quit();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void ExitState()
|
public override void ExitState()
|
||||||
{
|
{
|
||||||
Context.InputService.DisableMap(ActionMappings.MainMenu);
|
Context.InputService.DisableMap(ActionMappings.MainMenu);
|
||||||
|
|
||||||
base.ExitState();
|
base.ExitState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Gameplay.Camera;
|
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
using Code.StateMachine;
|
using Code.StateMachine;
|
||||||
@@ -17,8 +16,6 @@ namespace Code.App.AppStates
|
|||||||
{
|
{
|
||||||
Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded);
|
Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded);
|
||||||
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
Context.InputService.EnableMap(ActionMappings.Gameplay);
|
||||||
|
|
||||||
Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SceneLoaded()
|
private void SceneLoaded()
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
using Code.App.StateMachine;
|
using Code.App.StateMachine;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
using Code.Gameplay.Player;
|
using Code.Gameplay.Character.Camera;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
using Code.StaticData;
|
using Code.StaticData;
|
||||||
@@ -23,11 +23,10 @@ namespace Code.App
|
|||||||
InstallInfrastructureUnit(containerBuilder, staticDataService);
|
InstallInfrastructureUnit(containerBuilder, staticDataService);
|
||||||
|
|
||||||
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService));
|
||||||
containerBuilder.AddSingleton(typeof(PlayerFactory), typeof(IPlayerFactory));
|
containerBuilder.AddSingleton(typeof(UIService), typeof(IUIService));
|
||||||
|
|
||||||
InitializeCamera(containerBuilder, staticDataService);
|
InitializeCamera(containerBuilder, staticDataService);
|
||||||
containerBuilder.AddSingleton(typeof(UIFactory), typeof(IUIFactory));
|
|
||||||
containerBuilder.AddSingleton(typeof(UIService), typeof(IUIService));
|
|
||||||
containerBuilder.AddSingleton(typeof(SceneLoaderService), typeof(ISceneLoaderService));
|
containerBuilder.AddSingleton(typeof(SceneLoaderService), typeof(ISceneLoaderService));
|
||||||
|
|
||||||
containerBuilder.OnContainerBuilt += Bootstrap;
|
containerBuilder.OnContainerBuilt += Bootstrap;
|
||||||
@@ -39,7 +38,7 @@ namespace Code.App
|
|||||||
// containerBuilder.AddSingleton(cameraService);
|
// containerBuilder.AddSingleton(cameraService);
|
||||||
// DontDestroyOnLoad(cameraService);
|
// DontDestroyOnLoad(cameraService);
|
||||||
|
|
||||||
Camera camera = Instantiate(staticDataService.CameraConfig.cameraPrefab);
|
Camera camera = Instantiate(staticDataService.CameraConfig.cameraPrefab2);
|
||||||
DontDestroyOnLoad(camera);
|
DontDestroyOnLoad(camera);
|
||||||
containerBuilder.AddSingleton(camera);
|
containerBuilder.AddSingleton(camera);
|
||||||
}
|
}
|
||||||
@@ -63,10 +62,8 @@ namespace Code.App
|
|||||||
|
|
||||||
containerBuilder.AddSingleton(staticDataService, typeof(IStaticDataService));
|
containerBuilder.AddSingleton(staticDataService, typeof(IStaticDataService));
|
||||||
containerBuilder.AddSingleton(staticDataService.InputConfig.inputActionAsset, typeof(InputActionAsset));
|
containerBuilder.AddSingleton(staticDataService.InputConfig.inputActionAsset, typeof(InputActionAsset));
|
||||||
containerBuilder.AddSingleton(staticDataService.CameraConfig, typeof(CameraConfig));
|
|
||||||
containerBuilder.AddSingleton(staticDataService.PlayerConfig, typeof(PlayerConfig));
|
|
||||||
containerBuilder.AddSingleton(staticDataService.CharacterConfig, typeof(CharacterConfig));
|
|
||||||
containerBuilder.AddSingleton(staticDataService.UIConfig.canvasPrefab, typeof(Canvas));
|
containerBuilder.AddSingleton(staticDataService.UIConfig.canvasPrefab, typeof(Canvas));
|
||||||
|
containerBuilder.AddSingleton(staticDataService.CameraConfig, typeof(CameraConfig));
|
||||||
containerBuilder.AddSingleton(staticDataService.UIConfig.uiElementsPrefabs, typeof(UIElement[]));
|
containerBuilder.AddSingleton(staticDataService.UIConfig.uiElementsPrefabs, typeof(UIElement[]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: c7a271c6319540abb78d561f392e1396
|
|
||||||
timeCreated: 1761743570
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
using Code.Scenes;
|
|
||||||
using Code.Scenes.SceneEnvironments;
|
|
||||||
using Reflex.Core;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Code.App.SceneInstallers
|
|
||||||
{
|
|
||||||
public class MainMenuSceneInstaller : MonoBehaviour, IInstaller
|
|
||||||
{
|
|
||||||
[SerializeField] private MainMenuEnvironment _mainMenuEnvironment;
|
|
||||||
|
|
||||||
public void InstallBindings(ContainerBuilder containerBuilder)
|
|
||||||
{
|
|
||||||
containerBuilder.AddScoped(typeof(MainMenuEnvironment), typeof(CurrentSceneEnvironment));
|
|
||||||
|
|
||||||
containerBuilder.OnContainerBuilt += Initialize;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Initialize(Container container)
|
|
||||||
{
|
|
||||||
MainMenuEnvironment env = (MainMenuEnvironment)container.Resolve<CurrentSceneEnvironment>();
|
|
||||||
|
|
||||||
env.TransitVariables(_mainMenuEnvironment);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 04145a046c584b66818ca25745652e66
|
|
||||||
timeCreated: 1761743587
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
using Code.Gameplay.Player;
|
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Code.Scenes;
|
using Code.Scenes;
|
||||||
using Code.UI;
|
using Code.UI;
|
||||||
@@ -9,11 +8,10 @@ namespace Code.App.StateMachine
|
|||||||
{
|
{
|
||||||
public class AppStateMachineContext
|
public class AppStateMachineContext
|
||||||
{
|
{
|
||||||
[Inject] public ISceneLoaderService SceneLoaderService { get; private set; }
|
[Inject] public ISceneLoaderService SceneLoaderService;
|
||||||
[Inject] public IInputService InputService { get; private set; }
|
[Inject] public IInputService InputService;
|
||||||
[Inject] public AppStateMachine StateMachine { get; private set; }
|
[Inject] public IUIService UIService;
|
||||||
[Inject] public CameraStateMachine CameraStateMachine { get; private set; }
|
[Inject] public AppStateMachine StateMachine;
|
||||||
[Inject] public IUIService UIService { get; private set; }
|
[Inject] public CameraStateMachine CameraStateMachine;
|
||||||
[Inject] public IPlayerFactory PlayerFactory { get; private set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Character.Camera;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Code.Configs
|
namespace Code.Configs
|
||||||
{
|
{
|
||||||
[CreateAssetMenu(fileName = "CameraConfig", menuName = "Config/CameraConfig")]
|
[CreateAssetMenu(fileName = "CharacterCameraConfig", menuName = "Config/CharacterCameraConfig")]
|
||||||
public class CameraConfig : ScriptableObject
|
public class CameraConfig : ScriptableObject
|
||||||
{
|
{
|
||||||
public float
|
public float
|
||||||
@@ -28,10 +31,13 @@ namespace Code.Configs
|
|||||||
maxVerticalAngle = 70f, // Максимальный угол наклона камеры (вверх)
|
maxVerticalAngle = 70f, // Максимальный угол наклона камеры (вверх)
|
||||||
defaultVerticalAngle = 10f; // Стандартный угол наклона камеры
|
defaultVerticalAngle = 10f; // Стандартный угол наклона камеры
|
||||||
|
|
||||||
// Позиция следования по умолчанию
|
// Текущий режим камеры
|
||||||
|
public CameraMode defaultCameraMode = CameraMode.Bogdan;
|
||||||
|
|
||||||
|
// Позиция следования по умолчанию (для меню)
|
||||||
public Vector3 defaultFollowPosition = Vector3.zero;
|
public Vector3 defaultFollowPosition = Vector3.zero;
|
||||||
|
|
||||||
// Префаб камеры
|
public CameraService cameraPrefab;
|
||||||
public Camera cameraPrefab;
|
public Camera cameraPrefab2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Code.Configs
|
|
||||||
{
|
|
||||||
[CreateAssetMenu(fileName = "CharacterConfig", menuName = "Config/CharacterConfig")]
|
|
||||||
public class CharacterConfig : ScriptableObject
|
|
||||||
{
|
|
||||||
// Основное движение по земле
|
|
||||||
public float
|
|
||||||
maxStableMoveSpeed = 8f, // Максимальная скорость движения по устойчивой поверхности
|
|
||||||
stableMovementSharpness = 15f, // Резкость изменения скорости движения (чем выше - тем резче)
|
|
||||||
orientationSharpness = 10f, // Резкость изменения вращения персонажа (чем выше - тем резче)
|
|
||||||
jumpSpeed = 10f; // Скорость прыжка
|
|
||||||
|
|
||||||
// Спринт
|
|
||||||
public float
|
|
||||||
sprintMoveSpeed = 12f, // Максимальная скорость спринта
|
|
||||||
sprintAngleThreshold = 90f; // Максимальный угол (в градусах) от направления вперёд, при котором разрешён спринт
|
|
||||||
|
|
||||||
// Слайд
|
|
||||||
public float
|
|
||||||
slideSpeed = 20f, // Скорость слайда
|
|
||||||
slideDuration = 0.8f, // Длительность слайда в секундах
|
|
||||||
slideCooldown = 1.5f; // Время перезарядки слайда в секундах
|
|
||||||
|
|
||||||
// Залазание на стены
|
|
||||||
public float
|
|
||||||
wallClimbSpeedFactor = 0.8f, // Коэффициент преобразования горизонтальной скорости в вертикальную при залазании на стену
|
|
||||||
minWallClimbSpeed = 9f, // Минимальная горизонтальная скорость для начала залазания на стену
|
|
||||||
wallDetectionAngleThreshold = 80f; // Максимальный угол (в градусах) от вертикали, при котором поверхность считается "стеной"
|
|
||||||
|
|
||||||
// Наклон при залазании на стены
|
|
||||||
public float
|
|
||||||
maxWallLeanAngle = 45f, // Максимальный угол наклона от стены (в градусах)
|
|
||||||
wallLeanSharpness = 50f, // Скорость наклона/выпрямления (чем выше — тем резче)
|
|
||||||
wallLeanHeightScale = 0.1f; // Множитель: на сколько метров подъёма = 1 единица "наклона"
|
|
||||||
|
|
||||||
// Гравитация
|
|
||||||
public Vector3 gravity = new(0f, -30f, 0f); // Вектор, отвечающий за применение гравитации
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 10cfaf8e57f64eddb8c2eda147e4739a
|
|
||||||
timeCreated: 1761723608
|
|
||||||
@@ -1,152 +0,0 @@
|
|||||||
using Code.Configs;
|
|
||||||
using Code.Input;
|
|
||||||
using Code.StateMachine;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Code.Gameplay.Camera.CameraStates
|
|
||||||
{
|
|
||||||
public abstract class BaseCameraState : BaseState<CameraStateMachineContext>
|
|
||||||
{
|
|
||||||
// DI сервиса ввода
|
|
||||||
private readonly IInputService _inputService;
|
|
||||||
|
|
||||||
// Конфиг камеры
|
|
||||||
private readonly CameraConfig _config;
|
|
||||||
|
|
||||||
// Используемая камера
|
|
||||||
protected UnityEngine.Camera Camera { get; private set; }
|
|
||||||
|
|
||||||
// Трансформ объекта, за которым следует камера
|
|
||||||
protected Transform FollowTransform;
|
|
||||||
|
|
||||||
// Позиция следования: текущая сглаженная позиция и горизонтальное направление камеры
|
|
||||||
protected Vector3 CurrentFollowPosition;
|
|
||||||
|
|
||||||
// Fallback-позиция для режимов без цели
|
|
||||||
private Vector3 _defaultFollowPosition;
|
|
||||||
|
|
||||||
// Целевой вертикальный угол камеры (наклон вверх/вниз)
|
|
||||||
private float _targetVerticalAngle;
|
|
||||||
|
|
||||||
// Текущая и целевая дистанция камеры от цели
|
|
||||||
protected float CurrentDistance, TargetDistance;
|
|
||||||
|
|
||||||
// Исходные значения дистанции для восстановления
|
|
||||||
protected float OriginalDefaultDistance, OriginalMinDistance, OriginalMaxDistance;
|
|
||||||
|
|
||||||
// Горизонтальное направление камеры (проекция forward на плоскость)
|
|
||||||
private Vector3 PlanarDirection { get; set; }
|
|
||||||
|
|
||||||
// Параметры загружаются из CameraConfig
|
|
||||||
protected float
|
|
||||||
DefaultDistance,
|
|
||||||
MinDistance,
|
|
||||||
MaxDistance,
|
|
||||||
DistanceMovementSpeed,
|
|
||||||
RotationSpeed,
|
|
||||||
RotationSharpness,
|
|
||||||
FollowSharpness,
|
|
||||||
MinVerticalAngle,
|
|
||||||
MaxVerticalAngle,
|
|
||||||
DefaultVerticalAngle;
|
|
||||||
|
|
||||||
// Свойства для доступа к важным данным камеры извне
|
|
||||||
public Vector3 GetPlanarDirection() => PlanarDirection; // Горизонтальное направление камеры
|
|
||||||
public Quaternion GetCameraRotation() => Camera.transform.rotation; // Текущее вращение камеры
|
|
||||||
|
|
||||||
// Конструктор базового состояния
|
|
||||||
protected BaseCameraState(CameraStateMachineContext context) : base(context)
|
|
||||||
{
|
|
||||||
_inputService = context.InputService;
|
|
||||||
_config = context.Config;
|
|
||||||
LoadConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Загрузка конфига для камеры
|
|
||||||
private void LoadConfig()
|
|
||||||
{
|
|
||||||
// Загрузка значений из конфигов
|
|
||||||
DefaultDistance = _config.defaultDistance;
|
|
||||||
MinDistance = _config.minDistance;
|
|
||||||
MaxDistance = _config.maxDistance;
|
|
||||||
DistanceMovementSpeed = _config.distanceMovementSpeed;
|
|
||||||
RotationSpeed = _config.rotationSpeed;
|
|
||||||
RotationSharpness = _config.rotationSharpness;
|
|
||||||
FollowSharpness = _config.followSharpness;
|
|
||||||
MinVerticalAngle = _config.minVerticalAngle;
|
|
||||||
MaxVerticalAngle = _config.maxVerticalAngle;
|
|
||||||
DefaultVerticalAngle = _config.defaultVerticalAngle;
|
|
||||||
_defaultFollowPosition = _config.defaultFollowPosition;
|
|
||||||
|
|
||||||
// Обеспечиваем корректные значения дистанции и угла
|
|
||||||
DefaultDistance = Mathf.Clamp(DefaultDistance, MinDistance, MaxDistance);
|
|
||||||
DefaultVerticalAngle = Mathf.Clamp(DefaultVerticalAngle, MinVerticalAngle, MaxVerticalAngle);
|
|
||||||
|
|
||||||
// Сохраняем оригинальные значения для восстановления
|
|
||||||
OriginalDefaultDistance = DefaultDistance;
|
|
||||||
OriginalMinDistance = MinDistance;
|
|
||||||
OriginalMaxDistance = MaxDistance;
|
|
||||||
|
|
||||||
CurrentDistance = DefaultDistance;
|
|
||||||
TargetDistance = CurrentDistance;
|
|
||||||
_targetVerticalAngle = DefaultVerticalAngle;
|
|
||||||
PlanarDirection = Vector3.forward; // Начальное направление - вперед по оси Z
|
|
||||||
CurrentFollowPosition = _defaultFollowPosition;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Переход в состояние
|
|
||||||
public override void EnterState()
|
|
||||||
{
|
|
||||||
Camera = Context.Camera;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void LateTick()
|
|
||||||
{
|
|
||||||
// Обновляем камеру только если есть цель для следования
|
|
||||||
if (FollowTransform)
|
|
||||||
{
|
|
||||||
UpdateWithInput(Time.deltaTime, _inputService.ZoomInput, _inputService.LookInput);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Абстрактные методы для специфики режима
|
|
||||||
protected abstract void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation);
|
|
||||||
|
|
||||||
// Обработка вращения камеры на основе пользовательского ввода
|
|
||||||
// Теперь виртуальный, чтобы статический режим мог работать как хочет
|
|
||||||
protected virtual void HandleRotationInput(float deltaTime, Vector3 rotationInput, out Quaternion targetRotation)
|
|
||||||
{
|
|
||||||
// Вращение вокруг вертикальной оси (горизонтальный поворот)
|
|
||||||
var rotationFromInput = Quaternion.Euler(FollowTransform.up * (rotationInput.x * RotationSpeed));
|
|
||||||
PlanarDirection = rotationFromInput * PlanarDirection;
|
|
||||||
var planarRotation = Quaternion.LookRotation(PlanarDirection, FollowTransform.up);
|
|
||||||
|
|
||||||
// Вращение вокруг горизонтальной оси (вертикальный наклон)
|
|
||||||
_targetVerticalAngle -= rotationInput.y * RotationSpeed;
|
|
||||||
_targetVerticalAngle = Mathf.Clamp(_targetVerticalAngle, MinVerticalAngle, MaxVerticalAngle);
|
|
||||||
var verticalRotation = Quaternion.Euler(_targetVerticalAngle, 0, 0);
|
|
||||||
|
|
||||||
// Интерполяция к целевому вращению для плавности
|
|
||||||
targetRotation = Quaternion.Slerp(Camera.transform.rotation, planarRotation * verticalRotation, deltaTime * RotationSharpness);
|
|
||||||
|
|
||||||
// Применение финального вращения
|
|
||||||
Camera.transform.rotation = targetRotation;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Основной метод обновления камеры, вызываемый извне каждый кадр
|
|
||||||
private void UpdateWithInput(float deltaTime, float zoomInput, Vector3 rotationInput)
|
|
||||||
{
|
|
||||||
// Обработка ввода и позиционирования
|
|
||||||
HandleRotationInput(deltaTime, rotationInput, out var targetRotation);
|
|
||||||
HandlePosition(deltaTime, zoomInput, targetRotation);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Установка цели для следования камеры
|
|
||||||
public void SetFollowTransform(Transform t)
|
|
||||||
{
|
|
||||||
FollowTransform = t;
|
|
||||||
CurrentFollowPosition = t ? t.position : _defaultFollowPosition;
|
|
||||||
if (t) PlanarDirection = t.forward; // Начальное направление совпадает с направлением цели
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 92ff312b40a647b392af24877e699bd5
|
|
||||||
timeCreated: 1761685916
|
|
||||||
@@ -1,43 +1,153 @@
|
|||||||
|
using System;
|
||||||
|
using Code.Input;
|
||||||
|
using Code.StateMachine;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Code.Gameplay.Camera.CameraStates
|
namespace Code.Gameplay.Camera.CameraStates
|
||||||
{
|
{
|
||||||
/*
|
public class FirstPersonState : BaseState<CameraStateMachineContext>
|
||||||
* Состояние камеры от первого лица
|
|
||||||
* Камера размещается непосредственно на позиции цели (например, на уровне глаз персонажа)
|
|
||||||
* Дистанция до цели принудительно устанавливается в 0
|
|
||||||
* Вращение управляется мышью, позиция следует за целью без отступа
|
|
||||||
*/
|
|
||||||
public class FirstPersonState : BaseCameraState, ICameraState
|
|
||||||
{
|
{
|
||||||
public FirstPersonState(CameraStateMachineContext context) : base(context) { }
|
// Параметры загружаются из CameraConfig
|
||||||
|
private float
|
||||||
|
_defaultDistance,
|
||||||
|
_minDistance,
|
||||||
|
_maxDistance,
|
||||||
|
_distanceMovementSpeed,
|
||||||
|
_rotationSpeed,
|
||||||
|
_rotationSharpness,
|
||||||
|
_followSharpness,
|
||||||
|
_minVerticalAngle,
|
||||||
|
_maxVerticalAngle,
|
||||||
|
_defaultVerticalAngle;
|
||||||
|
|
||||||
|
// Трансформ объекта, за которым следует камера (для 1st-person: уровень глаз)
|
||||||
|
private Transform _followTransform;
|
||||||
|
|
||||||
|
// Позиция следования: текущая сглаженная позиция и горизонтальное направление камеры
|
||||||
|
private Vector3 _currentFollowPosition;
|
||||||
|
|
||||||
|
// Fallback-позиция для режимов без цели (например, MainMenu)
|
||||||
|
private Vector3 _defaultFollowPosition;
|
||||||
|
|
||||||
|
// Целевой вертикальный угол камеры (наклон вверх/вниз)
|
||||||
|
private float _targetVerticalAngle;
|
||||||
|
|
||||||
|
// Текущая и целевая дистанция камеры от цели
|
||||||
|
private float _currentDistance, _targetDistance;
|
||||||
|
|
||||||
|
// Исходные значения дистанции для восстановления после FirstPerson режима
|
||||||
|
private float _originalDefaultDistance, _originalMinDistance, _originalMaxDistance;
|
||||||
|
|
||||||
|
// Горизонтальное направление камеры (проекция forward на плоскость)
|
||||||
|
public Vector3 PlanarDirection { get; private set; }
|
||||||
|
|
||||||
|
private IInputService _inputService;
|
||||||
|
private UnityEngine.Camera _camera;
|
||||||
|
public FirstPersonState(CameraStateMachineContext context) : base(context)
|
||||||
|
{
|
||||||
|
_inputService = context.InputService;
|
||||||
|
// Загрузка значений из конфига
|
||||||
|
|
||||||
|
_defaultDistance = context.Config.defaultDistance;
|
||||||
|
_minDistance = context.Config.minDistance;
|
||||||
|
_maxDistance = context.Config.maxDistance;
|
||||||
|
_distanceMovementSpeed = context.Config.distanceMovementSpeed;
|
||||||
|
_rotationSpeed = context.Config.rotationSpeed;
|
||||||
|
_rotationSharpness = context.Config.rotationSharpness;
|
||||||
|
_followSharpness = context.Config.followSharpness;
|
||||||
|
_minVerticalAngle = context.Config.minVerticalAngle;
|
||||||
|
_maxVerticalAngle = context.Config.maxVerticalAngle;
|
||||||
|
_defaultVerticalAngle = context.Config.defaultVerticalAngle;
|
||||||
|
_defaultFollowPosition = context.Config.defaultFollowPosition;
|
||||||
|
|
||||||
|
// Валидация значений (на случай ручного редактирования конфига)
|
||||||
|
_defaultDistance = Mathf.Clamp(_defaultDistance, _minDistance, _maxDistance);
|
||||||
|
_defaultVerticalAngle = Mathf.Clamp(_defaultVerticalAngle, _minVerticalAngle, _maxVerticalAngle);
|
||||||
|
|
||||||
|
// Сохраняем оригинальные значения для восстановления
|
||||||
|
_originalDefaultDistance = _defaultDistance;
|
||||||
|
_originalMinDistance = _minDistance;
|
||||||
|
_originalMaxDistance = _maxDistance;
|
||||||
|
|
||||||
|
// Инициализация состояния камеры
|
||||||
|
_currentDistance = _defaultDistance;
|
||||||
|
_targetDistance = _currentDistance;
|
||||||
|
_targetVerticalAngle = _defaultVerticalAngle;
|
||||||
|
PlanarDirection = Vector3.forward; // Начальное направление - вперед по оси Z
|
||||||
|
_currentFollowPosition = _defaultFollowPosition;
|
||||||
|
}
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
// В FirstPerson режиме дистанция всегда равна 0
|
// В FirstPerson режиме дистанция всегда равна 0
|
||||||
MinDistance = 0f;
|
_minDistance = 0f;
|
||||||
MaxDistance = 0f;
|
_maxDistance = 0f;
|
||||||
DefaultDistance = 0f;
|
_defaultDistance = 0f;
|
||||||
TargetDistance = 0f;
|
_targetDistance = 0f;
|
||||||
CurrentDistance = 0f;
|
_currentDistance = 0f;
|
||||||
|
|
||||||
base.EnterState();
|
_camera = Context.Camera;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
public override void LateTick()
|
||||||
|
{
|
||||||
|
|
||||||
|
UpdateWithInput(Time.deltaTime,_inputService.ZoomInput, _inputService.LookInput);
|
||||||
|
}
|
||||||
|
// Обработка вращения камеры на основе пользовательского ввода
|
||||||
|
private void HandleRotationInput(float deltaTime, Vector3 rotationInput, out Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
// Вращение вокруг вертикальной оси (горизонтальный поворот)
|
||||||
|
var rotationFromInput = Quaternion.Euler(_followTransform.up * (rotationInput.x * _rotationSpeed));
|
||||||
|
PlanarDirection = rotationFromInput * PlanarDirection;
|
||||||
|
var planarRotation = Quaternion.LookRotation(PlanarDirection, _followTransform.up);
|
||||||
|
|
||||||
|
// Вращение вокруг горизонтальной оси (вертикальный наклон)
|
||||||
|
_targetVerticalAngle -= rotationInput.y * _rotationSpeed;
|
||||||
|
_targetVerticalAngle = Math.Clamp(_targetVerticalAngle, _minVerticalAngle, _maxVerticalAngle);
|
||||||
|
var verticalRotation = Quaternion.Euler(_targetVerticalAngle, 0, 0);
|
||||||
|
|
||||||
|
// Интерполяция к целевому вращению для плавности
|
||||||
|
targetRotation = Quaternion.Slerp(_camera.transform.rotation, planarRotation * verticalRotation, deltaTime * _rotationSharpness);
|
||||||
|
|
||||||
|
|
||||||
|
Debug.Log(_camera.transform.rotation.eulerAngles);
|
||||||
|
// Применение финального вращения
|
||||||
|
_camera.transform.rotation = targetRotation;
|
||||||
|
Debug.Log(_camera.transform.rotation.eulerAngles);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка позиционирования камеры и зума с учетом текущего режима
|
||||||
|
private void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
{
|
{
|
||||||
// Плавное следование за целью с использованием экспоненциального сглаживания
|
// Плавное следование за целью с использованием экспоненциального сглаживания
|
||||||
CurrentFollowPosition = Vector3.Lerp(CurrentFollowPosition, FollowTransform.position, 1f - Mathf.Exp(-FollowSharpness * deltaTime));
|
_currentFollowPosition = Vector3.Lerp(_currentFollowPosition, _followTransform.position, 1f - Mathf.Exp(-_followSharpness * deltaTime));
|
||||||
|
|
||||||
// В FirstPerson режиме камера находится прямо на позиции цели
|
// Вычисление целевой позиции камеры с учетом текущего режима
|
||||||
var targetPosition = CurrentFollowPosition;
|
Vector3 targetPosition;
|
||||||
|
// В FirstPerson режиме камера находится прямо на позиции цели
|
||||||
|
targetPosition = _currentFollowPosition;
|
||||||
|
|
||||||
// Установка финальной позиции камеры
|
// Установка финальной позиции камеры
|
||||||
Camera.transform.position = targetPosition;
|
_camera.transform.position = targetPosition;
|
||||||
}
|
}
|
||||||
public CameraMode GetCameraMode()
|
|
||||||
|
// Основной метод обновления камеры, вызываемый извне каждый кадр
|
||||||
|
public void UpdateWithInput(float deltaTime, float zoomInput, Vector3 rotationInput)
|
||||||
{
|
{
|
||||||
return CameraMode.FirstPerson;
|
// Проверка наличия цели для следования и проверка на режим главного меню
|
||||||
|
if (!_followTransform) return;
|
||||||
|
|
||||||
|
// Обработка ввода и позиционирования
|
||||||
|
HandleRotationInput(deltaTime, rotationInput, out var targetRotation);
|
||||||
|
HandlePosition(deltaTime, zoomInput, targetRotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Установка цели для следования камеры
|
||||||
|
public void SetFollowTransform(Transform t)
|
||||||
|
{
|
||||||
|
_followTransform = t;
|
||||||
|
_currentFollowPosition = t.position;
|
||||||
|
PlanarDirection = t.forward; // Начальное направление совпадает с направлением цели
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
namespace Code.Gameplay.Camera.CameraStates
|
|
||||||
{
|
|
||||||
public interface ICameraState
|
|
||||||
{
|
|
||||||
CameraMode GetCameraMode();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 4f25670e547242e8a91e19894cf6889c
|
|
||||||
timeCreated: 1761687204
|
|
||||||
@@ -1,30 +1,23 @@
|
|||||||
|
using Code.StateMachine;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Code.Gameplay.Camera.CameraStates
|
namespace Code.Gameplay.Camera.CameraStates
|
||||||
{
|
{
|
||||||
public class StaticState : BaseCameraState, ICameraState
|
public class StaticState : BaseState<CameraStateMachineContext>
|
||||||
{
|
{
|
||||||
public Transform LookTarget;
|
private Transform _target;
|
||||||
public StaticState(CameraStateMachineContext context) : base(context) { }
|
private Transform _position;
|
||||||
|
private UnityEngine.Camera _camera;
|
||||||
|
public StaticState(CameraStateMachineContext context) : base(context)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
Debug.Log("Static State Enter");
|
_camera = Context.Camera;
|
||||||
|
|
||||||
base.EnterState();
|
base.EnterState();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
|
||||||
{
|
|
||||||
Camera.transform.position = FollowTransform.position;
|
|
||||||
}
|
|
||||||
|
|
||||||
public CameraMode GetCameraMode() => CameraMode.Static;
|
|
||||||
|
|
||||||
protected override void HandleRotationInput(float deltaTime, Vector3 rotationInput,
|
|
||||||
out Quaternion targetRotation)
|
|
||||||
{
|
|
||||||
if(LookTarget) Camera.transform.LookAt(LookTarget);
|
|
||||||
targetRotation = Camera.transform.rotation;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,58 +1,164 @@
|
|||||||
|
using System;
|
||||||
|
using Code.Input;
|
||||||
|
using Code.StateMachine;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Code.Gameplay.Camera.CameraStates
|
namespace Code.Gameplay.Camera.CameraStates
|
||||||
{
|
{
|
||||||
/*
|
public class ThirdPersonState : BaseState<CameraStateMachineContext>
|
||||||
* Состояние камеры от третьего лица
|
|
||||||
* Камера следует за персонажем на заданном расстоянии
|
|
||||||
* Поддерживает зум, плавное следование и вращение с учётом угла наклона
|
|
||||||
* Дистанция и углы настраиваются через конфигурацию
|
|
||||||
*/
|
|
||||||
public class ThirdPersonState : BaseCameraState, ICameraState
|
|
||||||
{
|
{
|
||||||
public ThirdPersonState(CameraStateMachineContext context) : base(context) { }
|
// Параметры загружаются из CameraConfig
|
||||||
|
private float
|
||||||
|
_defaultDistance,
|
||||||
|
_minDistance,
|
||||||
|
_maxDistance,
|
||||||
|
_distanceMovementSpeed,
|
||||||
|
_rotationSpeed,
|
||||||
|
_rotationSharpness,
|
||||||
|
_followSharpness,
|
||||||
|
_minVerticalAngle,
|
||||||
|
_maxVerticalAngle,
|
||||||
|
_defaultVerticalAngle;
|
||||||
|
|
||||||
|
// Трансформ объекта, за которым следует камера (для 1st-person: уровень глаз)
|
||||||
|
private Transform _followTransform;
|
||||||
|
|
||||||
|
// Позиция следования: текущая сглаженная позиция и горизонтальное направление камеры
|
||||||
|
private Vector3 _currentFollowPosition;
|
||||||
|
|
||||||
|
// Fallback-позиция для режимов без цели (например, MainMenu)
|
||||||
|
private Vector3 _defaultFollowPosition;
|
||||||
|
|
||||||
|
// Целевой вертикальный угол камеры (наклон вверх/вниз)
|
||||||
|
private float _targetVerticalAngle;
|
||||||
|
|
||||||
|
// Текущая и целевая дистанция камеры от цели
|
||||||
|
private float _currentDistance, _targetDistance;
|
||||||
|
|
||||||
|
// Исходные значения дистанции для восстановления после FirstPerson режима
|
||||||
|
private float _originalDefaultDistance, _originalMinDistance, _originalMaxDistance;
|
||||||
|
|
||||||
|
// Горизонтальное направление камеры (проекция forward на плоскость)
|
||||||
|
public Vector3 PlanarDirection { get; private set; }
|
||||||
|
|
||||||
|
private IInputService _inputService;
|
||||||
|
private UnityEngine.Camera _camera;
|
||||||
|
|
||||||
|
public ThirdPersonState(CameraStateMachineContext context) : base(context)
|
||||||
|
{
|
||||||
|
_inputService = context.InputService;
|
||||||
|
// Загрузка значений из конфига
|
||||||
|
|
||||||
|
_defaultDistance = context.Config.defaultDistance;
|
||||||
|
_minDistance = context.Config.minDistance;
|
||||||
|
_maxDistance = context.Config.maxDistance;
|
||||||
|
_distanceMovementSpeed = context.Config.distanceMovementSpeed;
|
||||||
|
_rotationSpeed = context.Config.rotationSpeed;
|
||||||
|
_rotationSharpness = context.Config.rotationSharpness;
|
||||||
|
_followSharpness = context.Config.followSharpness;
|
||||||
|
_minVerticalAngle = context.Config.minVerticalAngle;
|
||||||
|
_maxVerticalAngle = context.Config.maxVerticalAngle;
|
||||||
|
_defaultVerticalAngle = context.Config.defaultVerticalAngle;
|
||||||
|
_defaultFollowPosition = context.Config.defaultFollowPosition;
|
||||||
|
|
||||||
|
// Валидация значений (на случай ручного редактирования конфига)
|
||||||
|
_defaultDistance = Mathf.Clamp(_defaultDistance, _minDistance, _maxDistance);
|
||||||
|
_defaultVerticalAngle = Mathf.Clamp(_defaultVerticalAngle, _minVerticalAngle, _maxVerticalAngle);
|
||||||
|
|
||||||
|
// Сохраняем оригинальные значения для восстановления
|
||||||
|
_originalDefaultDistance = _defaultDistance;
|
||||||
|
_originalMinDistance = _minDistance;
|
||||||
|
_originalMaxDistance = _maxDistance;
|
||||||
|
|
||||||
|
// Инициализация состояния камеры
|
||||||
|
_currentDistance = _defaultDistance;
|
||||||
|
_targetDistance = _currentDistance;
|
||||||
|
_targetVerticalAngle = _defaultVerticalAngle;
|
||||||
|
PlanarDirection = Vector3.forward; // Начальное направление - вперед по оси Z
|
||||||
|
_currentFollowPosition = _defaultFollowPosition;
|
||||||
|
}
|
||||||
|
|
||||||
public override void EnterState()
|
public override void EnterState()
|
||||||
{
|
{
|
||||||
// Восстанавливаем исходные значения дистанции
|
// Восстанавливаем исходные значения дистанции
|
||||||
MinDistance = OriginalMinDistance;
|
_minDistance = _originalMinDistance;
|
||||||
MaxDistance = OriginalMaxDistance;
|
_maxDistance = _originalMaxDistance;
|
||||||
DefaultDistance = OriginalDefaultDistance;
|
_defaultDistance = _originalDefaultDistance;
|
||||||
TargetDistance = DefaultDistance;
|
_targetDistance = _defaultDistance;
|
||||||
|
|
||||||
base.EnterState();
|
_camera = Context.Camera;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
public override void LateTick()
|
||||||
|
{
|
||||||
|
UpdateWithInput(Time.deltaTime, _inputService.ZoomInput, _inputService.LookInput);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Основной метод обновления камеры, вызываемый извне каждый кадр
|
||||||
|
public void UpdateWithInput(float deltaTime, float zoomInput, Vector3 rotationInput)
|
||||||
|
{
|
||||||
|
// Проверка наличия цели для следования и проверка на режим главного меню
|
||||||
|
if (!_followTransform) return;
|
||||||
|
|
||||||
|
// Обработка ввода и позиционирования
|
||||||
|
HandleRotationInput(deltaTime, rotationInput, out var targetRotation);
|
||||||
|
HandlePosition(deltaTime, zoomInput, targetRotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка вращения камеры на основе пользовательского ввода
|
||||||
|
private void HandleRotationInput(float deltaTime, Vector3 rotationInput, out Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
// Вращение вокруг вертикальной оси (горизонтальный поворот)
|
||||||
|
var rotationFromInput = Quaternion.Euler(_followTransform.up * (rotationInput.x * _rotationSpeed));
|
||||||
|
PlanarDirection = rotationFromInput * PlanarDirection;
|
||||||
|
var planarRotation = Quaternion.LookRotation(PlanarDirection, _followTransform.up);
|
||||||
|
|
||||||
|
// Вращение вокруг горизонтальной оси (вертикальный наклон)
|
||||||
|
_targetVerticalAngle -= rotationInput.y * _rotationSpeed;
|
||||||
|
_targetVerticalAngle = Math.Clamp(_targetVerticalAngle, _minVerticalAngle, _maxVerticalAngle);
|
||||||
|
var verticalRotation = Quaternion.Euler(_targetVerticalAngle, 0, 0);
|
||||||
|
|
||||||
|
// Интерполяция к целевому вращению для плавности
|
||||||
|
targetRotation = Quaternion.Slerp(_camera.transform.rotation, planarRotation * verticalRotation,
|
||||||
|
deltaTime * _rotationSharpness);
|
||||||
|
|
||||||
|
// Применение финального вращения
|
||||||
|
_camera.transform.rotation = targetRotation;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка позиционирования камеры и зума с учетом текущего режима
|
||||||
|
private void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
{
|
{
|
||||||
// Обновление целевой дистанции на основе ввода зума
|
// Обновление целевой дистанции на основе ввода зума
|
||||||
TargetDistance += zoomInput * DistanceMovementSpeed;
|
_targetDistance += zoomInput * _distanceMovementSpeed;
|
||||||
TargetDistance = Mathf.Clamp(TargetDistance, MinDistance, MaxDistance);
|
_targetDistance = Mathf.Clamp(_targetDistance, _minDistance, _maxDistance);
|
||||||
|
|
||||||
// Плавное следование за целью с использованием экспоненциального сглаживания
|
// Плавное следование за целью с использованием экспоненциального сглаживания
|
||||||
CurrentFollowPosition = Vector3.Lerp(
|
_currentFollowPosition = Vector3.Lerp(_currentFollowPosition, _followTransform.position,
|
||||||
CurrentFollowPosition,
|
1f - Mathf.Exp(-_followSharpness * deltaTime));
|
||||||
FollowTransform.position,
|
|
||||||
1f - Mathf.Exp(-FollowSharpness * deltaTime)
|
// Вычисление целевой позиции камеры с учетом текущего режима
|
||||||
);
|
Vector3 targetPosition;
|
||||||
|
|
||||||
// В ThirdPerson режиме камера отодвинута на расстояние от цели
|
// В ThirdPerson режиме камера отодвинута на расстояние от цели
|
||||||
var targetPosition = CurrentFollowPosition - targetRotation * Vector3.forward * CurrentDistance;
|
targetPosition = _currentFollowPosition - targetRotation * Vector3.forward * _currentDistance;
|
||||||
|
|
||||||
|
// Плавное изменение текущей дистанции к целевой (только для ThirdPerson)
|
||||||
|
|
||||||
|
_currentDistance = Mathf.Lerp(_currentDistance, _targetDistance,
|
||||||
|
1f - Mathf.Exp(-_distanceMovementSpeed * deltaTime));
|
||||||
|
|
||||||
// Плавное изменение текущей дистанции к целевой
|
|
||||||
CurrentDistance = Mathf.Lerp(
|
|
||||||
CurrentDistance,
|
|
||||||
TargetDistance,
|
|
||||||
1f - Mathf.Exp(-DistanceMovementSpeed * deltaTime)
|
|
||||||
);
|
|
||||||
|
|
||||||
// Установка финальной позиции камеры
|
// Установка финальной позиции камеры
|
||||||
Camera.transform.position = targetPosition;
|
_camera.transform.position = targetPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CameraMode GetCameraMode()
|
// Установка цели для следования камеры
|
||||||
|
public void SetFollowTransform(Transform t)
|
||||||
{
|
{
|
||||||
return CameraMode.ThirdPerson;
|
_followTransform = t;
|
||||||
|
_currentFollowPosition = t.position;
|
||||||
|
PlanarDirection = t.forward; // Начальное направление совпадает с направлением цели
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b36ec6a31fb74d608232394fd5df657c
|
||||||
|
timeCreated: 1761570832
|
||||||
@@ -0,0 +1,215 @@
|
|||||||
|
using System;
|
||||||
|
using Code.Configs;
|
||||||
|
using Code.Gameplay.Camera;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
using Code.StaticData;
|
||||||
|
using Reflex.Attributes;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.Gameplay.Character.Camera
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Скрипт, отвечающий за поведение камеры при передвижении
|
||||||
|
* Поддерживает как 3rd-person, так и 1st-person режимы камеры
|
||||||
|
* Реализует плавное следование за персонажем, вращение и зум камеры
|
||||||
|
*
|
||||||
|
* Источник: Tvtig, https://www.youtube.com/watch?v=9ibpY64wBYM
|
||||||
|
*/
|
||||||
|
public class CameraService : MonoBehaviour
|
||||||
|
{
|
||||||
|
// Параметры загружаются из CameraConfig
|
||||||
|
private float
|
||||||
|
_defaultDistance,
|
||||||
|
_minDistance,
|
||||||
|
_maxDistance,
|
||||||
|
_distanceMovementSpeed,
|
||||||
|
_rotationSpeed,
|
||||||
|
_rotationSharpness,
|
||||||
|
_followSharpness,
|
||||||
|
_minVerticalAngle,
|
||||||
|
_maxVerticalAngle,
|
||||||
|
_defaultVerticalAngle;
|
||||||
|
|
||||||
|
// Трансформ объекта, за которым следует камера (для 1st-person: уровень глаз)
|
||||||
|
private Transform _followTransform;
|
||||||
|
|
||||||
|
// Позиция следования: текущая сглаженная позиция и горизонтальное направление камеры
|
||||||
|
private Vector3 _currentFollowPosition;
|
||||||
|
|
||||||
|
// Fallback-позиция для режимов без цели (например, MainMenu)
|
||||||
|
private Vector3 _defaultFollowPosition;
|
||||||
|
|
||||||
|
// Целевой вертикальный угол камеры (наклон вверх/вниз)
|
||||||
|
private float _targetVerticalAngle;
|
||||||
|
|
||||||
|
// Текущая и целевая дистанция камеры от цели
|
||||||
|
private float _currentDistance, _targetDistance;
|
||||||
|
|
||||||
|
// Исходные значения дистанции для восстановления после FirstPerson режима
|
||||||
|
private float _originalDefaultDistance, _originalMinDistance, _originalMaxDistance;
|
||||||
|
|
||||||
|
// Горизонтальное направление камеры (проекция forward на плоскость)
|
||||||
|
public Vector3 PlanarDirection { get; private set; }
|
||||||
|
|
||||||
|
// Текущий режим работы камеры
|
||||||
|
public CameraMode CurrentMode { get; private set; }
|
||||||
|
|
||||||
|
// Загрузка конфига для камеры
|
||||||
|
[Inject]
|
||||||
|
private void LoadConfig(CameraConfig config)
|
||||||
|
{
|
||||||
|
// Загрузка значений из конфига
|
||||||
|
|
||||||
|
_defaultDistance = config.defaultDistance;
|
||||||
|
_minDistance = config.minDistance;
|
||||||
|
_maxDistance = config.maxDistance;
|
||||||
|
_distanceMovementSpeed = config.distanceMovementSpeed;
|
||||||
|
_rotationSpeed = config.rotationSpeed;
|
||||||
|
_rotationSharpness = config.rotationSharpness;
|
||||||
|
_followSharpness = config.followSharpness;
|
||||||
|
_minVerticalAngle = config.minVerticalAngle;
|
||||||
|
_maxVerticalAngle = config.maxVerticalAngle;
|
||||||
|
_defaultVerticalAngle = config.defaultVerticalAngle;
|
||||||
|
CurrentMode = config.defaultCameraMode;
|
||||||
|
_defaultFollowPosition = config.defaultFollowPosition;
|
||||||
|
|
||||||
|
// Валидация значений (на случай ручного редактирования конфига)
|
||||||
|
_defaultDistance = Mathf.Clamp(_defaultDistance, _minDistance, _maxDistance);
|
||||||
|
_defaultVerticalAngle = Mathf.Clamp(_defaultVerticalAngle, _minVerticalAngle, _maxVerticalAngle);
|
||||||
|
|
||||||
|
// Сохраняем оригинальные значения для восстановления
|
||||||
|
_originalDefaultDistance = _defaultDistance;
|
||||||
|
_originalMinDistance = _minDistance;
|
||||||
|
_originalMaxDistance = _maxDistance;
|
||||||
|
|
||||||
|
// Инициализация состояния камеры
|
||||||
|
_currentDistance = _defaultDistance;
|
||||||
|
_targetDistance = _currentDistance;
|
||||||
|
_targetVerticalAngle = _defaultVerticalAngle;
|
||||||
|
PlanarDirection = Vector3.forward; // Начальное направление - вперед по оси Z
|
||||||
|
_currentFollowPosition = _defaultFollowPosition;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Установка цели для следования камеры
|
||||||
|
public void SetFollowTransform(Transform t)
|
||||||
|
{
|
||||||
|
_followTransform = t;
|
||||||
|
_currentFollowPosition = t.position;
|
||||||
|
PlanarDirection = t.forward; // Начальное направление совпадает с направлением цели
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка вращения камеры на основе пользовательского ввода
|
||||||
|
private void HandleRotationInput(float deltaTime, Vector3 rotationInput, out Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
// Вращение вокруг вертикальной оси (горизонтальный поворот)
|
||||||
|
var rotationFromInput = Quaternion.Euler(_followTransform.up * (rotationInput.x * _rotationSpeed));
|
||||||
|
PlanarDirection = rotationFromInput * PlanarDirection;
|
||||||
|
var planarRotation = Quaternion.LookRotation(PlanarDirection, _followTransform.up);
|
||||||
|
|
||||||
|
// Вращение вокруг горизонтальной оси (вертикальный наклон)
|
||||||
|
_targetVerticalAngle -= rotationInput.y * _rotationSpeed;
|
||||||
|
_targetVerticalAngle = Math.Clamp(_targetVerticalAngle, _minVerticalAngle, _maxVerticalAngle);
|
||||||
|
var verticalRotation = Quaternion.Euler(_targetVerticalAngle, 0, 0);
|
||||||
|
|
||||||
|
// Интерполяция к целевому вращению для плавности
|
||||||
|
targetRotation = Quaternion.Slerp(transform.rotation, planarRotation * verticalRotation, deltaTime * _rotationSharpness);
|
||||||
|
|
||||||
|
// Применение финального вращения
|
||||||
|
transform.rotation = targetRotation;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Обработка позиционирования камеры и зума с учетом текущего режима
|
||||||
|
private void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation)
|
||||||
|
{
|
||||||
|
// В FirstPerson режиме зум отключается
|
||||||
|
if (CurrentMode != CameraMode.FirstPerson)
|
||||||
|
{
|
||||||
|
// Обновление целевой дистанции на основе ввода зума
|
||||||
|
_targetDistance += zoomInput * _distanceMovementSpeed;
|
||||||
|
_targetDistance = Mathf.Clamp(_targetDistance, _minDistance, _maxDistance);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Плавное следование за целью с использованием экспоненциального сглаживания
|
||||||
|
_currentFollowPosition = Vector3.Lerp(_currentFollowPosition, _followTransform.position, 1f - Mathf.Exp(-_followSharpness * deltaTime));
|
||||||
|
|
||||||
|
// Вычисление целевой позиции камеры с учетом текущего режима
|
||||||
|
Vector3 targetPosition;
|
||||||
|
if (CurrentMode == CameraMode.FirstPerson)
|
||||||
|
{
|
||||||
|
// В FirstPerson режиме камера находится прямо на позиции цели
|
||||||
|
targetPosition = _currentFollowPosition;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// В ThirdPerson режиме камера отодвинута на расстояние от цели
|
||||||
|
targetPosition = _currentFollowPosition - targetRotation * Vector3.forward * _currentDistance;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Плавное изменение текущей дистанции к целевой (только для ThirdPerson)
|
||||||
|
if (CurrentMode != CameraMode.FirstPerson)
|
||||||
|
{
|
||||||
|
_currentDistance = Mathf.Lerp(_currentDistance, _targetDistance, 1f - Mathf.Exp(-_distanceMovementSpeed * deltaTime));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Установка финальной позиции камеры
|
||||||
|
transform.position = targetPosition;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Основной метод обновления камеры, вызываемый извне каждый кадр
|
||||||
|
public void UpdateWithInput(float deltaTime, float zoomInput, Vector3 rotationInput)
|
||||||
|
{
|
||||||
|
// Проверка наличия цели для следования и проверка на режим главного меню
|
||||||
|
if (!_followTransform || CurrentMode == CameraMode.Bogdan) return;
|
||||||
|
|
||||||
|
// Обработка ввода и позиционирования
|
||||||
|
HandleRotationInput(deltaTime, rotationInput, out var targetRotation);
|
||||||
|
HandlePosition(deltaTime, zoomInput, targetRotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Смена режима камеры
|
||||||
|
public void SetCameraMode(CameraMode newMode)
|
||||||
|
{
|
||||||
|
if (CurrentMode == newMode) return;
|
||||||
|
CurrentMode = newMode;
|
||||||
|
|
||||||
|
// Применяем настройки специфичные для режима
|
||||||
|
ApplyModeSpecificSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Применение настроек специфичных для текущего режима
|
||||||
|
private void ApplyModeSpecificSettings()
|
||||||
|
{
|
||||||
|
switch (CurrentMode)
|
||||||
|
{
|
||||||
|
case CameraMode.FirstPerson:
|
||||||
|
// В FirstPerson режиме дистанция всегда равна 0
|
||||||
|
_minDistance = 0f;
|
||||||
|
_maxDistance = 0f;
|
||||||
|
_defaultDistance = 0f;
|
||||||
|
_targetDistance = 0f;
|
||||||
|
_currentDistance = 0f;
|
||||||
|
break;
|
||||||
|
case CameraMode.ThirdPerson:
|
||||||
|
// Восстанавливаем исходные значения дистанции
|
||||||
|
_minDistance = _originalMinDistance;
|
||||||
|
_maxDistance = _originalMaxDistance;
|
||||||
|
_defaultDistance = _originalDefaultDistance;
|
||||||
|
_targetDistance = _defaultDistance;
|
||||||
|
break;
|
||||||
|
// Заготовка на будущее (если понадобится)
|
||||||
|
case CameraMode.Bogdan:
|
||||||
|
_minDistance = 0f;
|
||||||
|
_maxDistance = 0f;
|
||||||
|
_defaultDistance = 0f;
|
||||||
|
_targetDistance = 0f;
|
||||||
|
_currentDistance = 0f;
|
||||||
|
break;
|
||||||
|
case CameraMode.Static:
|
||||||
|
case CameraMode.Cinematic:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f1d98e6c5419411098391c07861e627e
|
||||||
|
timeCreated: 1760627986
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
using KinematicCharacterController;
|
using KinematicCharacterController;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using Code.Gameplay.Character.Core;
|
||||||
|
|
||||||
namespace Code.Gameplay.Character.Controller.Abilities
|
namespace Code.Gameplay.Character.Controller.Abilities
|
||||||
{
|
{
|
||||||
|
|||||||
+3
-7
@@ -13,16 +13,12 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
private readonly float _wallClimbSpeedFactor;
|
private readonly float _wallClimbSpeedFactor;
|
||||||
// Минимальная горизонтальная скорость для начала залазания на стену
|
// Минимальная горизонтальная скорость для начала залазания на стену
|
||||||
private readonly float _minWallClimbSpeed;
|
private readonly float _minWallClimbSpeed;
|
||||||
// Пороговый косинус стены
|
|
||||||
public float WallNormalThreshold { get; }
|
|
||||||
|
|
||||||
// Конструктор механики залазания на стену
|
// Конструктор механики залазания на стену
|
||||||
public WallClimbMechanic(float wallClimbSpeedFactor, float minWallClimbSpeed, float wallDetectionAngleThreshold)
|
public WallClimbMechanic(float wallClimbSpeedFactor, float minWallClimbSpeed)
|
||||||
{
|
{
|
||||||
_wallClimbSpeedFactor = wallClimbSpeedFactor;
|
_wallClimbSpeedFactor = wallClimbSpeedFactor;
|
||||||
_minWallClimbSpeed = minWallClimbSpeed;
|
_minWallClimbSpeed = minWallClimbSpeed;
|
||||||
// Преобразуем угол в косинус порога: если |dot| > cos(threshold), то это НЕ стена
|
|
||||||
WallNormalThreshold = Mathf.Cos(Mathf.Deg2Rad * wallDetectionAngleThreshold);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Обработка столкновения при движении (вызывается при ударе о препятствие)
|
// Обработка столкновения при движении (вызывается при ударе о препятствие)
|
||||||
@@ -30,7 +26,7 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
{
|
{
|
||||||
// Проверяем, что это вертикальная или почти вертикальная поверхность (стена)
|
// Проверяем, что это вертикальная или почти вертикальная поверхность (стена)
|
||||||
var dotWithUp = Vector3.Dot(hitNormal, motor.CharacterUp);
|
var dotWithUp = Vector3.Dot(hitNormal, motor.CharacterUp);
|
||||||
if (Mathf.Abs(dotWithUp) > WallNormalThreshold) return; // Не стена — это пол или потолок
|
if (Mathf.Abs(dotWithUp) > 0.1f) return; // Не стена — это пол или потолок
|
||||||
|
|
||||||
// Получаем текущую скорость персонажа
|
// Получаем текущую скорость персонажа
|
||||||
var currentVelocity = motor.Velocity;
|
var currentVelocity = motor.Velocity;
|
||||||
|
|||||||
-79
@@ -1,79 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
using KinematicCharacterController;
|
|
||||||
|
|
||||||
namespace Code.Gameplay.Character.Controller.Abilities
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Механика наклона персонажа при контакте со стеной
|
|
||||||
* Управляет визуальным наклоном модели в зависимости от высоты подъёма по стене
|
|
||||||
*/
|
|
||||||
public class WallLeanMechanic
|
|
||||||
{
|
|
||||||
private readonly float _maxLeanAngle;
|
|
||||||
private readonly float _leanSharpness;
|
|
||||||
private readonly float _heightScale;
|
|
||||||
|
|
||||||
private Transform _characterTransform;
|
|
||||||
private Vector3 _lastWallNormal;
|
|
||||||
private float _lastWallContactHeight;
|
|
||||||
private float _leanFactor;
|
|
||||||
|
|
||||||
public WallLeanMechanic(float maxLeanAngle, float leanSharpness, float heightScale)
|
|
||||||
{
|
|
||||||
_maxLeanAngle = maxLeanAngle;
|
|
||||||
_leanSharpness = leanSharpness;
|
|
||||||
_heightScale = heightScale;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Назначаем трансформ визуальной модели один раз
|
|
||||||
public void SetCharacterTransform(Transform transform)
|
|
||||||
{
|
|
||||||
_characterTransform = transform;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Вызывается из OnMovementHit
|
|
||||||
public void OnWallContact(Vector3 wallNormal, float contactHeight)
|
|
||||||
{
|
|
||||||
_lastWallNormal = wallNormal;
|
|
||||||
_lastWallContactHeight = contactHeight; }
|
|
||||||
|
|
||||||
// Обновление каждый кадр
|
|
||||||
public void UpdateLean(KinematicCharacterMotor motor, float deltaTime)
|
|
||||||
{
|
|
||||||
if (!_characterTransform) return;
|
|
||||||
|
|
||||||
var isGrounded = motor.GroundingStatus.IsStableOnGround;
|
|
||||||
|
|
||||||
if (!isGrounded)
|
|
||||||
{
|
|
||||||
var heightDelta = motor.TransientPosition.y - _lastWallContactHeight;
|
|
||||||
var targetLeanFactor = Mathf.Clamp01(heightDelta * _heightScale);
|
|
||||||
_leanFactor = Mathf.Lerp(_leanFactor, targetLeanFactor, 1f - Mathf.Exp(-_leanSharpness * deltaTime));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
_leanFactor = Mathf.Lerp(_leanFactor, 0f, 1f - Mathf.Exp(-_leanSharpness * deltaTime));
|
|
||||||
}
|
|
||||||
|
|
||||||
ApplyLeanRotation(motor);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ApplyLeanRotation(KinematicCharacterMotor motor)
|
|
||||||
{
|
|
||||||
if (_leanFactor <= 0.01f)
|
|
||||||
{
|
|
||||||
_characterTransform.localRotation = Quaternion.identity;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var leanDirection = -_lastWallNormal;
|
|
||||||
leanDirection = Vector3.ProjectOnPlane(leanDirection, motor.CharacterUp).normalized;
|
|
||||||
|
|
||||||
if (leanDirection.sqrMagnitude < 0.01f) return;
|
|
||||||
|
|
||||||
var leanAngle = _leanFactor * _maxLeanAngle;
|
|
||||||
var leanRotation = Quaternion.AngleAxis(leanAngle, Vector3.Cross(motor.CharacterUp, leanDirection));
|
|
||||||
_characterTransform.localRotation = leanRotation;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: dfaefcb035124edb84b7874c5938defc
|
|
||||||
timeCreated: 1761738483
|
|
||||||
+47
-70
@@ -1,11 +1,9 @@
|
|||||||
using Code.Configs;
|
|
||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
using Code.Gameplay.Character.Controller.Abilities;
|
using Code.Gameplay.Character.Controller.Abilities;
|
||||||
using Code.Gameplay.Character.Controller.Input;
|
using Code.Gameplay.Character.Controller.Input;
|
||||||
using Code.Gameplay.Character.Controller.Movement;
|
using Code.Gameplay.Character.Controller.Movement;
|
||||||
using Code.Gameplay.Character.Core;
|
using Code.Gameplay.Character.Core;
|
||||||
using KinematicCharacterController;
|
using KinematicCharacterController;
|
||||||
using Reflex.Attributes;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Code.Gameplay.Character.Controller
|
namespace Code.Gameplay.Character.Controller
|
||||||
@@ -19,61 +17,50 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
*/
|
*/
|
||||||
public class CustomCharacterController : MonoBehaviour, ICharacterController
|
public class CustomCharacterController : MonoBehaviour, ICharacterController
|
||||||
{
|
{
|
||||||
[Inject] private CharacterConfig _characterConfig; // Конфиг персонажа через DI
|
[SerializeField]
|
||||||
|
private KinematicCharacterMotor motor; // Движок физического перемещения персонажа
|
||||||
|
|
||||||
[SerializeField] private KinematicCharacterMotor motor; // Движок физического перемещения персонажа
|
[SerializeField]
|
||||||
|
private float
|
||||||
|
maxStableMoveSpeed = 8f, // Максимальная скорость движения по устойчивой поверхности
|
||||||
|
sprintMoveSpeed = 12f, // Максимальная скорость спринта
|
||||||
|
slideSpeed = 20f, // Скорость слайда
|
||||||
|
slideDuration = 0.8f, // Длительность слайда в секундах
|
||||||
|
slideCooldown = 1.5f, // Время перезарядки слайда
|
||||||
|
stableMovementSharpness = 15f, // Резкость изменения скорости движения (чем выше - тем резче)
|
||||||
|
orientationSharpness = 10f, // Резкость изменения вращения персонажа (чем выше - тем резче)
|
||||||
|
jumpSpeed = 10f, // Скорость прыжка
|
||||||
|
wallClimbSpeedFactor = 0.8f, // Коэффициент преобразования горизонтальной скорости в вертикальную при залазании на стену
|
||||||
|
minWallClimbSpeed = 9f; // Минимальная горизонтальная скорость для начала залазания на стену
|
||||||
|
|
||||||
[SerializeField] private Transform characterTransform; // Трансформ персонажа (с точкой отслеживания камеры)
|
[SerializeField]
|
||||||
|
private Vector3 gravity = new(0, -30f, 0); // Вектор, отвечающий за применение гравитации
|
||||||
// Подсистемы
|
|
||||||
private CharacterInputHandler _inputHandler;
|
|
||||||
private SlideMechanic _slideMechanic;
|
|
||||||
private WallClimbMechanic _wallClimbMechanic;
|
|
||||||
private WallLeanMechanic _wallLeanMechanic;
|
|
||||||
private GroundMovementSystem _groundMovement;
|
|
||||||
private AirMovementSystem _airMovement;
|
|
||||||
|
|
||||||
// Инициализация контроллера
|
// Подсистемы
|
||||||
private void Awake()
|
private readonly CharacterInputHandler _inputHandler;
|
||||||
|
private readonly SlideMechanic _slideMechanic;
|
||||||
|
private readonly WallClimbMechanic _wallClimbMechanic;
|
||||||
|
private readonly GroundMovementSystem _groundMovement;
|
||||||
|
private readonly AirMovementSystem _airMovement;
|
||||||
|
|
||||||
|
// Конструктор без параметров, инициализирующий контроллер
|
||||||
|
public CustomCharacterController()
|
||||||
{
|
{
|
||||||
// Инициализация подсистем с параметрами из конфига
|
_inputHandler = new CharacterInputHandler();
|
||||||
_inputHandler = new CharacterInputHandler(
|
_slideMechanic = new SlideMechanic(slideSpeed, slideDuration, slideCooldown);
|
||||||
_characterConfig.sprintAngleThreshold
|
_wallClimbMechanic = new WallClimbMechanic(wallClimbSpeedFactor, minWallClimbSpeed);
|
||||||
);
|
_groundMovement = new GroundMovementSystem(maxStableMoveSpeed, sprintMoveSpeed, stableMovementSharpness, jumpSpeed);
|
||||||
_slideMechanic = new SlideMechanic(
|
_airMovement = new AirMovementSystem(gravity);
|
||||||
_characterConfig.slideSpeed,
|
|
||||||
_characterConfig.slideDuration,
|
|
||||||
_characterConfig.slideCooldown
|
|
||||||
);
|
|
||||||
_wallClimbMechanic = new WallClimbMechanic(
|
|
||||||
_characterConfig.wallClimbSpeedFactor,
|
|
||||||
_characterConfig.minWallClimbSpeed,
|
|
||||||
_characterConfig.wallDetectionAngleThreshold
|
|
||||||
);
|
|
||||||
_wallLeanMechanic = new WallLeanMechanic(
|
|
||||||
_characterConfig.maxWallLeanAngle,
|
|
||||||
_characterConfig.wallLeanSharpness,
|
|
||||||
_characterConfig.wallLeanHeightScale
|
|
||||||
);
|
|
||||||
_groundMovement = new GroundMovementSystem(
|
|
||||||
_characterConfig.maxStableMoveSpeed,
|
|
||||||
_characterConfig.sprintMoveSpeed,
|
|
||||||
_characterConfig.stableMovementSharpness,
|
|
||||||
_characterConfig.jumpSpeed
|
|
||||||
);
|
|
||||||
_airMovement = new AirMovementSystem(_characterConfig.gravity);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Текущий режим камеры для адаптации поведения
|
// Текущий режим камеры для адаптации поведения
|
||||||
private CameraMode _currentCameraMode = CameraMode.FirstPerson;
|
private CameraMode _currentCameraMode = CameraMode.ThirdPerson;
|
||||||
|
|
||||||
// Инициализация контроллера
|
// Инициализация контроллера
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
motor.CharacterController = this; // Регистрация этого контроллера в движке
|
motor.CharacterController = this; // Регистрация этого контроллера в движке
|
||||||
_inputHandler.FirstPersonCameraRotation =
|
_inputHandler.FirstPersonCameraRotation = motor.Transform.rotation; // Начальное вращение совпадает с персонажем
|
||||||
motor.Transform.rotation; // Начальное вращение совпадает с персонажемс
|
|
||||||
_wallLeanMechanic.SetCharacterTransform(characterTransform);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Обработка и преобразование входных данных от персонажа
|
// Обработка и преобразование входных данных от персонажа
|
||||||
@@ -81,7 +68,7 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
{
|
{
|
||||||
// Обновляем таймер перезарядки слайда
|
// Обновляем таймер перезарядки слайда
|
||||||
_slideMechanic.TickCooldown(Time.deltaTime);
|
_slideMechanic.TickCooldown(Time.deltaTime);
|
||||||
|
|
||||||
// Если активен слайд - игнорируем весь остальной ввод
|
// Если активен слайд - игнорируем весь остальной ввод
|
||||||
if (_slideMechanic.IsSliding)
|
if (_slideMechanic.IsSliding)
|
||||||
{
|
{
|
||||||
@@ -92,16 +79,16 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
_groundMovement.RequestJump(inputs.JumpPressed);
|
_groundMovement.RequestJump(inputs.JumpPressed);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Сохраняем текущий режим камеры
|
// Сохраняем текущий режим камеры
|
||||||
_currentCameraMode = inputs.CameraMode;
|
_currentCameraMode = inputs.CameraMode;
|
||||||
|
|
||||||
// Обработка слайда
|
// Обработка слайда
|
||||||
_slideMechanic.RequestSlide(inputs.SlidePressed);
|
_slideMechanic.RequestSlide(inputs.SlidePressed);
|
||||||
|
|
||||||
// Обработка остального ввода
|
// Обработка остального ввода
|
||||||
_inputHandler.ProcessInputs(ref inputs, motor);
|
_inputHandler.ProcessInputs(ref inputs, motor);
|
||||||
|
|
||||||
// Передаём запрос прыжка напрямую в систему движения по земле
|
// Передаём запрос прыжка напрямую в систему движения по земле
|
||||||
_groundMovement.RequestJump(inputs.JumpPressed);
|
_groundMovement.RequestJump(inputs.JumpPressed);
|
||||||
}
|
}
|
||||||
@@ -123,13 +110,13 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
case CameraMode.ThirdPerson:
|
case CameraMode.ThirdPerson:
|
||||||
{
|
{
|
||||||
// Вращение применяется только если есть направление движения и разрешена резкость вращения
|
// Вращение применяется только если есть направление движения и разрешена резкость вращения
|
||||||
if (_inputHandler.LookInputVector.sqrMagnitude > 0 && _characterConfig.orientationSharpness > 0)
|
if (_inputHandler.LookInputVector.sqrMagnitude > 0 && orientationSharpness > 0)
|
||||||
{
|
{
|
||||||
// Плавная интерполяция текущего направления к целевому с экспоненциальным сглаживанием
|
// Плавная интерполяция текущего направления к целевому с экспоненциальным сглаживанием
|
||||||
var smoothedLookInputDirection = Vector3.Slerp(
|
var smoothedLookInputDirection = Vector3.Slerp(
|
||||||
motor.CharacterForward,
|
motor.CharacterForward,
|
||||||
_inputHandler.LookInputVector,
|
_inputHandler.LookInputVector,
|
||||||
1f - Mathf.Exp(-_characterConfig.orientationSharpness * deltaTime)
|
1f - Mathf.Exp(-orientationSharpness * deltaTime)
|
||||||
).normalized;
|
).normalized;
|
||||||
|
|
||||||
// Установка нового вращения смотря в сглаженном направлении
|
// Установка нового вращения смотря в сглаженном направлении
|
||||||
@@ -155,12 +142,11 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
{
|
{
|
||||||
_slideMechanic.EndSlide();
|
_slideMechanic.EndSlide();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Проверяем запрос слайда и запускаем его если можно
|
// Проверяем запрос слайда и запускаем его если можно
|
||||||
if (!_slideMechanic.IsSliding)
|
if (!_slideMechanic.IsSliding)
|
||||||
{
|
{
|
||||||
_slideMechanic.TryStartSlide(motor, _currentCameraMode, _inputHandler.FirstPersonCameraRotation,
|
_slideMechanic.TryStartSlide(motor, _currentCameraMode, _inputHandler.FirstPersonCameraRotation, _inputHandler.LookInputVector);
|
||||||
_inputHandler.LookInputVector);
|
|
||||||
}
|
}
|
||||||
// Если активен слайд - обрабатываем отдельно
|
// Если активен слайд - обрабатываем отдельно
|
||||||
else
|
else
|
||||||
@@ -168,7 +154,7 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
_slideMechanic.HandleSlide(ref currentVelocity, deltaTime, motor);
|
_slideMechanic.HandleSlide(ref currentVelocity, deltaTime, motor);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Если персонаж находится на земле
|
// Если персонаж находится на земле
|
||||||
if (motor.GroundingStatus.IsStableOnGround)
|
if (motor.GroundingStatus.IsStableOnGround)
|
||||||
{
|
{
|
||||||
@@ -198,10 +184,9 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Метод вызывается после обновления персонажа
|
// Метод вызывается после обновления персонажа (можно использовать для пост-обработки)
|
||||||
public void AfterCharacterUpdate(float deltaTime)
|
public void AfterCharacterUpdate(float deltaTime)
|
||||||
{
|
{
|
||||||
_wallLeanMechanic.UpdateLean(motor, deltaTime);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Проверка валидности коллайдера для обработки столкновений
|
// Проверка валидности коллайдера для обработки столкновений
|
||||||
@@ -211,8 +196,7 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Обработка столкновения с землей (вызывается при приземлении)
|
// Обработка столкновения с землей (вызывается при приземлении)
|
||||||
public void OnGroundHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint,
|
public void OnGroundHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, ref HitStabilityReport hitStabilityReport)
|
||||||
ref HitStabilityReport hitStabilityReport)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -221,17 +205,10 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
ref HitStabilityReport hitStabilityReport)
|
ref HitStabilityReport hitStabilityReport)
|
||||||
{
|
{
|
||||||
_wallClimbMechanic.OnMovementHit(motor, hitNormal);
|
_wallClimbMechanic.OnMovementHit(motor, hitNormal);
|
||||||
|
|
||||||
var dotWithUp = Vector3.Dot(hitNormal, motor.CharacterUp);
|
|
||||||
if (Mathf.Abs(dotWithUp) <= _wallClimbMechanic.WallNormalThreshold)
|
|
||||||
{
|
|
||||||
_wallLeanMechanic.OnWallContact(hitNormal, motor.TransientPosition.y);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Обработка отчета о стабильности столкновения
|
// Обработка отчета о стабильности столкновения
|
||||||
public void ProcessHitStabilityReport(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint,
|
public void ProcessHitStabilityReport(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, Vector3 atCharacterPosition,
|
||||||
Vector3 atCharacterPosition,
|
|
||||||
Quaternion atCharacterRotation, ref HitStabilityReport hitStabilityReport)
|
Quaternion atCharacterRotation, ref HitStabilityReport hitStabilityReport)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-14
@@ -11,9 +11,6 @@ namespace Code.Gameplay.Character.Controller.Input
|
|||||||
*/
|
*/
|
||||||
public class CharacterInputHandler
|
public class CharacterInputHandler
|
||||||
{
|
{
|
||||||
// Косинус порогового угла для спринта (предвычислен)
|
|
||||||
private readonly float _sprintAngleThresholdCos;
|
|
||||||
|
|
||||||
// Векторы движения и направления взгляда
|
// Векторы движения и направления взгляда
|
||||||
public Vector3 MoveInputVector { get; set; }
|
public Vector3 MoveInputVector { get; set; }
|
||||||
public Vector3 LookInputVector { get; set; }
|
public Vector3 LookInputVector { get; set; }
|
||||||
@@ -26,16 +23,7 @@ namespace Code.Gameplay.Character.Controller.Input
|
|||||||
|
|
||||||
// Флаг-свойство указывающий, что нужно применить вращение камеры к персонажу
|
// Флаг-свойство указывающий, что нужно применить вращение камеры к персонажу
|
||||||
public bool ShouldApplyCameraRotation { get; private set; }
|
public bool ShouldApplyCameraRotation { get; private set; }
|
||||||
|
|
||||||
// Конструктор с пороговым углом
|
|
||||||
public CharacterInputHandler(float sprintAngleThreshold)
|
|
||||||
{
|
|
||||||
// Предвычисляем косинус порогового угла для эффективности
|
|
||||||
// Угол в градусах → радианы → косинус
|
|
||||||
// Чем меньше угол — тем строже условие
|
|
||||||
_sprintAngleThresholdCos = Mathf.Cos(Mathf.Deg2Rad * sprintAngleThreshold);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Обработка и преобразование входных данных от персонажа
|
// Обработка и преобразование входных данных от персонажа
|
||||||
public void ProcessInputs(ref CharacterInputs inputs, KinematicCharacterMotor motor)
|
public void ProcessInputs(ref CharacterInputs inputs, KinematicCharacterMotor motor)
|
||||||
{
|
{
|
||||||
@@ -43,7 +31,7 @@ namespace Code.Gameplay.Character.Controller.Input
|
|||||||
var currentCameraMode = inputs.CameraMode;
|
var currentCameraMode = inputs.CameraMode;
|
||||||
|
|
||||||
// Обработка спринта
|
// Обработка спринта
|
||||||
IsSprinting = inputs.SprintPressed && inputs.MoveAxisForward > _sprintAngleThresholdCos; // Спринт только при движении на заданный в конфиге угол
|
IsSprinting = inputs is { SprintPressed: true, MoveAxisForward: > 0.1f }; // Спринт только при движении вперёд
|
||||||
|
|
||||||
// Нормализация вектора движения и ограничение его величины до 1
|
// Нормализация вектора движения и ограничение его величины до 1
|
||||||
var moveInputVector =
|
var moveInputVector =
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
using Code.Gameplay.Camera;
|
using Code.Gameplay.Camera;
|
||||||
using Code.Gameplay.Camera.CameraStates;
|
using Code.Gameplay.Camera.CameraStates;
|
||||||
|
using Code.Gameplay.Character.Camera;
|
||||||
using Code.Gameplay.Character.Controller;
|
using Code.Gameplay.Character.Controller;
|
||||||
using Code.Input;
|
using Code.Input;
|
||||||
using Reflex.Attributes;
|
using Reflex.Attributes;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.Serialization;
|
||||||
|
|
||||||
namespace Code.Gameplay.Character.Core
|
namespace Code.Gameplay.Character.Core
|
||||||
{
|
{
|
||||||
@@ -15,7 +17,7 @@ namespace Code.Gameplay.Character.Core
|
|||||||
*/
|
*/
|
||||||
public class Character : MonoBehaviour
|
public class Character : MonoBehaviour
|
||||||
{
|
{
|
||||||
[Inject] private CameraStateMachine _cameraStateMachine; // Стейт-машина камеры (нужна для транзакций и т.п.)
|
[Inject] private CameraStateMachine _cameraService; // Компонент камеры персонажа
|
||||||
[SerializeField] private CustomCharacterController customCharacterController; // Компонент управления персонажем
|
[SerializeField] private CustomCharacterController customCharacterController; // Компонент управления персонажем
|
||||||
[SerializeField] private Transform cameraFollowPoint; // Точка следования камеры (уровень глаз для FirstPerson)
|
[SerializeField] private Transform cameraFollowPoint; // Точка следования камеры (уровень глаз для FirstPerson)
|
||||||
|
|
||||||
@@ -28,7 +30,7 @@ namespace Code.Gameplay.Character.Core
|
|||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
// Настройка камеры для следования за точкой камеры
|
// Настройка камеры для следования за точкой камеры
|
||||||
((BaseCameraState)_cameraStateMachine.CurrentBaseState).SetFollowTransform(cameraFollowPoint);
|
((FirstPersonState)_cameraService.CurrentBaseState).SetFollowTransform(cameraFollowPoint);
|
||||||
|
|
||||||
// Включение Gameplay мапа ввода
|
// Включение Gameplay мапа ввода
|
||||||
_inputService.EnableMap(ActionMappings.Gameplay);
|
_inputService.EnableMap(ActionMappings.Gameplay);
|
||||||
@@ -47,11 +49,9 @@ namespace Code.Gameplay.Character.Core
|
|||||||
inputs.JumpPressed = _inputService.JumpPressed; // Прыжки (Space)
|
inputs.JumpPressed = _inputService.JumpPressed; // Прыжки (Space)
|
||||||
inputs.SprintPressed = _inputService.SprintPressed; // Спринт (Shift)
|
inputs.SprintPressed = _inputService.SprintPressed; // Спринт (Shift)
|
||||||
inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl)
|
inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl)
|
||||||
inputs.CameraMode = ((ICameraState)_cameraStateMachine.CurrentBaseState).GetCameraMode();
|
|
||||||
|
|
||||||
// Передаем информацию о камере для адаптивного поведения
|
// Передаем информацию о камере для адаптивного поведения
|
||||||
inputs.CameraRotation = ((BaseCameraState)_cameraStateMachine.CurrentBaseState).GetCameraRotation();
|
inputs.CameraRotation = _cameraService.transform.rotation;
|
||||||
inputs.CameraPlanarDirection = ((BaseCameraState)_cameraStateMachine.CurrentBaseState).GetPlanarDirection();
|
|
||||||
|
|
||||||
// Передаем ввод в контроллер персонажа
|
// Передаем ввод в контроллер персонажа
|
||||||
customCharacterController.SetInputs(ref inputs);
|
customCharacterController.SetInputs(ref inputs);
|
||||||
@@ -67,7 +67,7 @@ namespace Code.Gameplay.Character.Core
|
|||||||
{
|
{
|
||||||
// Обрабатываем нажатие только один раз при первом обнаружении
|
// Обрабатываем нажатие только один раз при первом обнаружении
|
||||||
case true when !_cameraModeToggleHandled:
|
case true when !_cameraModeToggleHandled:
|
||||||
ToggleCameraMode();
|
// ToggleCameraMode();
|
||||||
_cameraModeToggleHandled = true;
|
_cameraModeToggleHandled = true;
|
||||||
break;
|
break;
|
||||||
// Сбрасываем флаг когда кнопка отпущена
|
// Сбрасываем флаг когда кнопка отпущена
|
||||||
@@ -76,17 +76,6 @@ namespace Code.Gameplay.Character.Core
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Метод для переключения режимов камеры
|
|
||||||
private void ToggleCameraMode()
|
|
||||||
{
|
|
||||||
var currentMode = ((ICameraState)_cameraStateMachine.CurrentBaseState).GetCameraMode();
|
|
||||||
var newMode = currentMode == CameraMode.FirstPerson ? CameraMode.ThirdPerson : CameraMode.FirstPerson;
|
|
||||||
|
|
||||||
_cameraStateMachine.SwitchState(newMode);
|
|
||||||
((BaseCameraState)_cameraStateMachine.CurrentBaseState).SetFollowTransform(cameraFollowPoint);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Обновление логики каждый кадр
|
// Обновление логики каждый кадр
|
||||||
private void Update()
|
private void Update()
|
||||||
@@ -97,5 +86,10 @@ namespace Code.Gameplay.Character.Core
|
|||||||
// Обработка переключения режима камеры
|
// Обработка переключения режима камеры
|
||||||
HandleCameraModeInput();
|
HandleCameraModeInput();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Обновление после всех вычислений (идеально для камеры)
|
||||||
|
private void LateUpdate()
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace Code.Gameplay.Player
|
|
||||||
{
|
|
||||||
public interface IPlayerFactory
|
|
||||||
{
|
|
||||||
PlayerHealth CreatePlayerHealth(int count = -1);
|
|
||||||
PlayerMoney CreatePlayerMoney(int count = 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 6d2689e8fb7e48a4a8a62a97d292e1e3
|
|
||||||
timeCreated: 1761761977
|
|
||||||
@@ -4,16 +4,15 @@ using Reflex.Attributes;
|
|||||||
|
|
||||||
namespace Code.Gameplay.Player
|
namespace Code.Gameplay.Player
|
||||||
{
|
{
|
||||||
public class PlayerFactory : IPlayerFactory
|
public class PlayerFactory
|
||||||
{
|
{
|
||||||
[Inject] PlayerConfig _playerConfig;
|
[Inject] PlayerConfig _playerConfig;
|
||||||
|
|
||||||
public PlayerHealth CreatePlayerHealth(int count = -1)
|
public PlayerHealth CreatePlayerHP(int count = -1)
|
||||||
{
|
{
|
||||||
if (count < 0) count = _playerConfig.maxHealth;
|
if (count < 0) count = _playerConfig.maxHealth;
|
||||||
|
|
||||||
return new(count);
|
return new PlayerHealth(count);
|
||||||
}
|
}
|
||||||
public PlayerMoney CreatePlayerMoney(int count = 0) => new(count);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,27 +6,22 @@ namespace Code.Gameplay.Player
|
|||||||
|
|
||||||
public event OnDeathDelegate OnDeath;
|
public event OnDeathDelegate OnDeath;
|
||||||
|
|
||||||
public delegate void OnDamageDelegate(int damage, PlayerHealth health);
|
public delegate void OnDamageDelegate(int damage);
|
||||||
|
|
||||||
public event OnDamageDelegate OnDamage;
|
public event OnDamageDelegate OnDamage;
|
||||||
|
|
||||||
private int _healthPoints;
|
private int _healthPoints;
|
||||||
public int HealthPoints => _healthPoints;
|
|
||||||
|
|
||||||
public int MaxHealthPoints { get; private set; }
|
public int HealthPoints => _healthPoints;
|
||||||
|
|
||||||
public void GetDamage(int count)
|
public void GetDamage(int count)
|
||||||
{
|
{
|
||||||
_healthPoints -= count;
|
_healthPoints -= count;
|
||||||
OnDamage?.Invoke(count, this);
|
OnDamage?.Invoke(count);
|
||||||
|
|
||||||
if (_healthPoints <= 0) OnDeath?.Invoke();
|
if (_healthPoints <= 0) OnDeath?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
public PlayerHealth(int maxHealthPoints = 1)
|
public PlayerHealth(int healthPoints = 1) => _healthPoints = healthPoints;
|
||||||
{
|
|
||||||
_healthPoints = maxHealthPoints;
|
|
||||||
MaxHealthPoints = maxHealthPoints;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
namespace Code.Gameplay.Player
|
|
||||||
{
|
|
||||||
public class PlayerMoney
|
|
||||||
{
|
|
||||||
public delegate void OnMoneyGetDelegate(int count, int money);
|
|
||||||
public event OnMoneyGetDelegate OnMoneyGet;
|
|
||||||
public delegate void OnMoneyLooseDelegate(int count, int money);
|
|
||||||
public event OnMoneyLooseDelegate OnMoneyLoose;
|
|
||||||
|
|
||||||
private int _money;
|
|
||||||
public int Money => _money;
|
|
||||||
|
|
||||||
public void GiveMoney(int amount)
|
|
||||||
{
|
|
||||||
_money += amount;
|
|
||||||
OnMoneyGet?.Invoke(amount, _money);
|
|
||||||
}
|
|
||||||
public void LooseMoney(int amount)
|
|
||||||
{
|
|
||||||
_money -= amount;
|
|
||||||
OnMoneyLoose?.Invoke(amount, _money);
|
|
||||||
}
|
|
||||||
|
|
||||||
public PlayerMoney(int money) => _money = money;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 455b08dd38eb4f4f8ab62b9493cd5e12
|
|
||||||
timeCreated: 1761760097
|
|
||||||
@@ -4,7 +4,6 @@ namespace Code.Input
|
|||||||
{
|
{
|
||||||
MainMenu,
|
MainMenu,
|
||||||
UI,
|
UI,
|
||||||
Gameplay,
|
Gameplay
|
||||||
Debug
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,11 +6,4 @@ namespace Code.Input
|
|||||||
Look,
|
Look,
|
||||||
Zoom
|
Zoom
|
||||||
}
|
}
|
||||||
public enum DebugActions
|
|
||||||
{
|
|
||||||
GiveHealth,
|
|
||||||
LooseHealth,
|
|
||||||
GiveMoney,
|
|
||||||
LooseMoney
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
using System;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
|
||||||
|
|
||||||
namespace Code.Input
|
namespace Code.Input
|
||||||
{
|
{
|
||||||
@@ -21,7 +19,5 @@ namespace Code.Input
|
|||||||
|
|
||||||
// Для переключения режима камеры
|
// Для переключения режима камеры
|
||||||
bool ToggleCameraModePressed { get; }
|
bool ToggleCameraModePressed { get; }
|
||||||
void DebugBindAction(int mapId, int actionId, Action<InputAction.CallbackContext> action);
|
|
||||||
void DebugUnbindAction(int mapId, int actionId, Action<InputAction.CallbackContext> action);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -21,8 +21,6 @@ namespace Code.Input
|
|||||||
{
|
{
|
||||||
_inputActionAsset = inputActionAsset;
|
_inputActionAsset = inputActionAsset;
|
||||||
SetupInputCallbacks();
|
SetupInputCallbacks();
|
||||||
|
|
||||||
inputActionAsset.actionMaps[(int)ActionMappings.Debug].Enable();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Обработка всех карт ввода
|
// Обработка всех карт ввода
|
||||||
@@ -167,10 +165,10 @@ namespace Code.Input
|
|||||||
public void EnableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Enable();
|
public void EnableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Enable();
|
||||||
public void DisableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Disable();
|
public void DisableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Disable();
|
||||||
|
|
||||||
public void DebugBindAction(int mapId, int actionId, Action<InputAction.CallbackContext> action) => _inputActionAsset
|
public void BindAction(int mapId, int actionId, Action<InputAction.CallbackContext> action) => _inputActionAsset
|
||||||
.actionMaps[mapId].actions[actionId].performed += action;
|
.actionMaps[mapId].actions[actionId].performed += action;
|
||||||
|
|
||||||
public void DebugUnbindAction(int mapId, int actionId, Action<InputAction.CallbackContext> action) =>
|
public void UnbindAction(int mapId, int actionId, Action<InputAction.CallbackContext> action) =>
|
||||||
_inputActionAsset
|
_inputActionAsset
|
||||||
.actionMaps[mapId].actions[actionId].performed -= action;
|
.actionMaps[mapId].actions[actionId].performed -= action;
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Code.Scenes
|
|
||||||
{
|
|
||||||
public abstract class CurrentSceneEnvironment
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: e67772183eee40b0bd3ca806dae98f20
|
|
||||||
timeCreated: 1761736090
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: a1364bdc4fb54b40843a614990de89ad
|
|
||||||
timeCreated: 1761736163
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
using UnityEngine.Serialization;
|
|
||||||
|
|
||||||
namespace Code.Scenes.SceneEnvironments
|
|
||||||
{
|
|
||||||
[System.Serializable]
|
|
||||||
public class MainMenuEnvironment : CurrentSceneEnvironment
|
|
||||||
{
|
|
||||||
public Transform cameraTarget;
|
|
||||||
public Transform cameraPosition;
|
|
||||||
|
|
||||||
public void TransitVariables(MainMenuEnvironment env)
|
|
||||||
{
|
|
||||||
cameraTarget = env.cameraTarget;
|
|
||||||
cameraPosition = env.cameraPosition;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 2e7be1a504f64b20ac431e6e231c1f70
|
|
||||||
timeCreated: 1761736177
|
|
||||||
@@ -6,7 +6,6 @@ namespace Code.Scenes
|
|||||||
MainMenu,
|
MainMenu,
|
||||||
Gameplay,
|
Gameplay,
|
||||||
// TODO: поменяно для теста
|
// TODO: поменяно для теста
|
||||||
MovementDev,
|
MovementDev
|
||||||
DevGen
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Code.Configs;
|
using Code.Configs;
|
||||||
|
|
||||||
@@ -9,9 +8,7 @@ namespace Code.StaticData
|
|||||||
void Load();
|
void Load();
|
||||||
InputConfig InputConfig { get; }
|
InputConfig InputConfig { get; }
|
||||||
AppConfig AppConfig { get; }
|
AppConfig AppConfig { get; }
|
||||||
CameraConfig CameraConfig { get; }
|
|
||||||
CharacterConfig CharacterConfig { get; }
|
|
||||||
UIConfig UIConfig { get; }
|
UIConfig UIConfig { get; }
|
||||||
PlayerConfig PlayerConfig { get; }
|
CameraConfig CameraConfig { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,19 +8,15 @@ namespace Code.StaticData
|
|||||||
{
|
{
|
||||||
public AppConfig AppConfig { get; private set; }
|
public AppConfig AppConfig { get; private set; }
|
||||||
public InputConfig InputConfig { get; private set; }
|
public InputConfig InputConfig { get; private set; }
|
||||||
public CameraConfig CameraConfig { get; private set; }
|
|
||||||
public CharacterConfig CharacterConfig { get; private set; }
|
|
||||||
public UIConfig UIConfig { get; private set; }
|
public UIConfig UIConfig { get; private set; }
|
||||||
public PlayerConfig PlayerConfig { get; private set; }
|
public CameraConfig CameraConfig { get; private set; }
|
||||||
|
|
||||||
public void Load()
|
public void Load()
|
||||||
{
|
{
|
||||||
InputConfig = Resources.Load<InputConfig>(string.Format(StringPaths.ConfigSingle, "App", "InputConfig"));
|
InputConfig = Resources.Load<InputConfig>(string.Format(StringPaths.ConfigSingle, "App", "InputConfig"));
|
||||||
AppConfig = Resources.Load<AppConfig>(string.Format(StringPaths.ConfigSingle, "App", "AppConfig"));
|
AppConfig = Resources.Load<AppConfig>(string.Format(StringPaths.ConfigSingle, "App", "AppConfig"));
|
||||||
CameraConfig = Resources.Load<CameraConfig>(string.Format(StringPaths.ConfigSingle, "App", "CameraConfig"));
|
CameraConfig = Resources.Load<CameraConfig>(string.Format(StringPaths.ConfigSingle, "App", "CharacterCameraConfig"));
|
||||||
CharacterConfig = Resources.Load<CharacterConfig>(string.Format(StringPaths.ConfigSingle, "App", "CharacterConfig"));
|
|
||||||
UIConfig = Resources.Load<UIConfig>(string.Format(StringPaths.ConfigSingle, "App", "UIConfig"));
|
UIConfig = Resources.Load<UIConfig>(string.Format(StringPaths.ConfigSingle, "App", "UIConfig"));
|
||||||
PlayerConfig = Resources.Load<PlayerConfig>(string.Format(StringPaths.ConfigSingle, "App", "PlayerConfig"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Code.UI
|
|
||||||
{
|
|
||||||
public interface IUIFactory
|
|
||||||
{
|
|
||||||
Canvas CreateCanvas();
|
|
||||||
UIElement CreatePanel(Canvas canvas, UIPanel uiPanel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 61892c4ae3ab4b1498c3df219c5c75d6
|
|
||||||
timeCreated: 1761922548
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Code.UI
|
||||||
|
{
|
||||||
|
public class LoadingPanel : UIElement
|
||||||
|
{
|
||||||
|
public void Hide()
|
||||||
|
{
|
||||||
|
gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
public void Show()
|
||||||
|
{
|
||||||
|
gameObject.SetActive(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
File renamed without changes.
-7
@@ -7,12 +7,5 @@ namespace Code.UI
|
|||||||
{
|
{
|
||||||
public Button startButton;
|
public Button startButton;
|
||||||
public Button exitButton;
|
public Button exitButton;
|
||||||
public override void Show()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Hide()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
File renamed without changes.
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: e8f289dfee4b4bd4988d217b988ae82d
|
|
||||||
timeCreated: 1761951389
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
using UnityEngine.UI;
|
|
||||||
|
|
||||||
namespace Code.UI
|
|
||||||
{
|
|
||||||
public class GameOverPanel : UIElement
|
|
||||||
{
|
|
||||||
[SerializeField] private Image _background;
|
|
||||||
|
|
||||||
public override void Hide()
|
|
||||||
{
|
|
||||||
_background.enabled = false;
|
|
||||||
}
|
|
||||||
public override void Show()
|
|
||||||
{
|
|
||||||
_background.enabled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: ecbe291069244405ac22e5470f3ba62b
|
|
||||||
timeCreated: 1761948692
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
using Code.Gameplay.Player;
|
|
||||||
using DG.Tweening;
|
|
||||||
using TMPro;
|
|
||||||
using UnityEngine;
|
|
||||||
using UnityEngine.Serialization;
|
|
||||||
using UnityEngine.UI;
|
|
||||||
|
|
||||||
namespace Code.UI
|
|
||||||
{
|
|
||||||
public class GameplayPanel : UIElement
|
|
||||||
{
|
|
||||||
[Header("Dispatcher")]
|
|
||||||
[SerializeField] private Image dispatcher;
|
|
||||||
[SerializeField] private RectTransform dispatcherHiddenPosition;
|
|
||||||
[SerializeField] private RectTransform dispatcherShownPosition;
|
|
||||||
[SerializeField] private float dispatcherTransitionTime = 0.5f;
|
|
||||||
[Header("Timer")]
|
|
||||||
[SerializeField] private TMP_Text timer;
|
|
||||||
[Header("HealthBar")]
|
|
||||||
[SerializeField] private Image healthBar;
|
|
||||||
[Header("MoneyBar")]
|
|
||||||
[SerializeField] private TMP_Text moneyText;
|
|
||||||
|
|
||||||
private void MoneyUpdate(int count, int money)
|
|
||||||
{
|
|
||||||
// TODO Анимация получения\потери
|
|
||||||
moneyText.text = money.ToString();
|
|
||||||
}
|
|
||||||
private void HealthUpdate(int count, PlayerHealth health)
|
|
||||||
{
|
|
||||||
// TODO Анимация потери
|
|
||||||
float fillAmount = (float)health.HealthPoints / health.MaxHealthPoints;
|
|
||||||
healthBar.fillAmount = fillAmount;
|
|
||||||
}
|
|
||||||
public void Initialize(PlayerMoney money, PlayerHealth health)
|
|
||||||
{
|
|
||||||
money.OnMoneyGet += MoneyUpdate;
|
|
||||||
money.OnMoneyLoose += MoneyUpdate;
|
|
||||||
MoneyUpdate(0,money.Money);
|
|
||||||
|
|
||||||
health.OnDamage += HealthUpdate;
|
|
||||||
HealthUpdate(0,health);
|
|
||||||
}
|
|
||||||
private void Update()
|
|
||||||
{
|
|
||||||
timer.text = Time.deltaTime.ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SummonDispatcher()
|
|
||||||
{
|
|
||||||
// TODO
|
|
||||||
dispatcher.transform.DOMoveX(dispatcherShownPosition.position.x, dispatcherTransitionTime);
|
|
||||||
}
|
|
||||||
public void CloseDispatcher()
|
|
||||||
{
|
|
||||||
dispatcher.transform.DOMoveX(dispatcherHiddenPosition.position.x, dispatcherTransitionTime);
|
|
||||||
// TODO
|
|
||||||
}
|
|
||||||
public override void Hide()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
public override void Show()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: d79893d2e9024719924dc5c15d582e33
|
|
||||||
timeCreated: 1761760839
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
using UnityEngine.UI;
|
|
||||||
|
|
||||||
namespace Code.UI
|
|
||||||
{
|
|
||||||
public class LoadingPanel : UIElement
|
|
||||||
{
|
|
||||||
[SerializeField] private Image _background;
|
|
||||||
public override void Hide()
|
|
||||||
{
|
|
||||||
_background.enabled = false;
|
|
||||||
}
|
|
||||||
public override void Show()
|
|
||||||
{
|
|
||||||
_background.enabled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,9 +2,7 @@ using UnityEngine;
|
|||||||
|
|
||||||
namespace Code.UI
|
namespace Code.UI
|
||||||
{
|
{
|
||||||
public abstract class UIElement : MonoBehaviour
|
public class UIElement : MonoBehaviour
|
||||||
{
|
{
|
||||||
public abstract void Show();
|
|
||||||
public abstract void Hide();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
using Reflex.Attributes;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace Code.UI
|
|
||||||
{
|
|
||||||
public class UIFactory : IUIFactory
|
|
||||||
{
|
|
||||||
[Inject] private UIElement[] _uiPanelsPrefabs;
|
|
||||||
[Inject] private Canvas _canvasPrefab;
|
|
||||||
|
|
||||||
public Canvas CreateCanvas()
|
|
||||||
{
|
|
||||||
Canvas canvas = Object.Instantiate(_canvasPrefab);
|
|
||||||
Object.DontDestroyOnLoad(canvas);
|
|
||||||
|
|
||||||
return canvas;
|
|
||||||
}
|
|
||||||
|
|
||||||
public UIElement CreatePanel(Canvas canvas, UIPanel uiPanel)
|
|
||||||
{
|
|
||||||
return Object.Instantiate(_uiPanelsPrefabs[(int)uiPanel], canvas.transform);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 2250767e26ad4e0aa313b80087696ea9
|
|
||||||
timeCreated: 1761922359
|
|
||||||
@@ -4,7 +4,6 @@ namespace Code.UI
|
|||||||
{
|
{
|
||||||
Loading,
|
Loading,
|
||||||
MainMenu,
|
MainMenu,
|
||||||
Gameplay,
|
Gameplay
|
||||||
GameOver
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,28 +4,30 @@ namespace Code.UI
|
|||||||
{
|
{
|
||||||
public class UIService : IUIService
|
public class UIService : IUIService
|
||||||
{
|
{
|
||||||
|
private UIElement[] _uiPanelsPrefabs;
|
||||||
private Canvas _canvas;
|
private Canvas _canvas;
|
||||||
private IUIFactory _factory;
|
|
||||||
|
|
||||||
public UIElement CurrentPanel { get; private set; }
|
public UIElement CurrentPanel { get; private set; }
|
||||||
public LoadingPanel LoadingScreen { get; private set; }
|
public LoadingPanel LoadingScreen { get; private set; }
|
||||||
|
|
||||||
public UIService(IUIFactory factory)
|
public UIService(UIElement[] uiPanelsPrefabs, Canvas canvas)
|
||||||
{
|
{
|
||||||
_factory = factory;
|
_canvas = Object.Instantiate(canvas);
|
||||||
_canvas = _factory.CreateCanvas();
|
Object.DontDestroyOnLoad(_canvas);
|
||||||
|
|
||||||
LoadingScreen = (LoadingPanel) _factory.CreatePanel(_canvas,UIPanel.Loading);
|
_uiPanelsPrefabs = uiPanelsPrefabs;
|
||||||
|
|
||||||
|
LoadingScreen = (LoadingPanel)Object.Instantiate(_uiPanelsPrefabs[(int)UIPanel.Loading], _canvas.transform);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void EnablePanel() => CurrentPanel.gameObject.SetActive(true);
|
public void EnablePanel() => CurrentPanel.gameObject.SetActive(true);
|
||||||
public void DisablePanel() => CurrentPanel.gameObject.SetActive(false);
|
public void DisablePanel() => CurrentPanel.gameObject.SetActive(false);
|
||||||
|
|
||||||
public void SwitchPanelTo(UIPanel uiPanel)
|
public void SwitchPanelTo(UIPanel uiPanel)
|
||||||
{
|
{
|
||||||
if(CurrentPanel) Object.Destroy(CurrentPanel.gameObject);
|
if (CurrentPanel != null)
|
||||||
|
Object.Destroy(CurrentPanel.gameObject);
|
||||||
CurrentPanel = _factory.CreatePanel(_canvas, uiPanel);
|
|
||||||
|
CurrentPanel = Object.Instantiate(_uiPanelsPrefabs[(int)uiPanel], _canvas.transform);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 818f68f6dbb84d44d80bc53754eb6352
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: e07037ec18739b44fb4040e9a19a8b2a
|
|
||||||
TextScriptImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 26b8dbfe064a19e4eb85bf9f0f2cd2a1
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: e67b7301aadd4a946a3c815ca954708a
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,144 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<doc>
|
|
||||||
<assembly>
|
|
||||||
<name>DOTweenEditor</name>
|
|
||||||
</assembly>
|
|
||||||
<members>
|
|
||||||
<member name="T:DG.DOTweenEditor.EditorCompatibilityUtils">
|
|
||||||
<summary>
|
|
||||||
Contains compatibility methods taken from DemiEditor (for when DOTween is without it)
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorCompatibilityUtils.FindObjectOfType``1(System.Boolean)">
|
|
||||||
<summary>
|
|
||||||
Warning: some versions of this method don't have the includeInactive parameter so it won't be taken into account
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorCompatibilityUtils.FindObjectOfType(System.Type,System.Boolean)">
|
|
||||||
<summary>
|
|
||||||
Warning: some versions of this method don't have the includeInactive parameter so it won't be taken into account
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorCompatibilityUtils.FindObjectsOfType``1(System.Boolean)">
|
|
||||||
<summary>
|
|
||||||
Warning: some versions of this method don't have the includeInactive parameter so it won't be taken into account
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorCompatibilityUtils.FindObjectsOfType(System.Type,System.Boolean)">
|
|
||||||
<summary>
|
|
||||||
Warning: some versions of this method don't have the includeInactive parameter so it won't be taken into account
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.DOTweenEditorPreview.Start(System.Action)">
|
|
||||||
<summary>
|
|
||||||
Starts the update loop of tween in the editor. Has no effect during playMode.
|
|
||||||
</summary>
|
|
||||||
<param name="onPreviewUpdated">Eventual callback to call after every update</param>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.DOTweenEditorPreview.Stop(System.Boolean,System.Boolean)">
|
|
||||||
<summary>
|
|
||||||
Stops the update loop and clears the onPreviewUpdated callback.
|
|
||||||
</summary>
|
|
||||||
<param name="resetTweenTargets">If TRUE also resets the tweened objects to their original state.
|
|
||||||
Note that this works by calling Rewind on all tweens, so it will work correctly
|
|
||||||
only if you have a single tween type per object and it wasn't killed</param>
|
|
||||||
<param name="clearTweens">If TRUE also kills any cached tween</param>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.DOTweenEditorPreview.PrepareTweenForPreview(DG.Tweening.Tween,System.Boolean,System.Boolean,System.Boolean)">
|
|
||||||
<summary>
|
|
||||||
Readies the tween for editor preview by setting its UpdateType to Manual plus eventual extra settings.
|
|
||||||
</summary>
|
|
||||||
<param name="t">The tween to ready</param>
|
|
||||||
<param name="clearCallbacks">If TRUE (recommended) removes all callbacks (OnComplete/Rewind/etc)</param>
|
|
||||||
<param name="preventAutoKill">If TRUE prevents the tween from being auto-killed at completion</param>
|
|
||||||
<param name="andPlay">If TRUE starts playing the tween immediately</param>
|
|
||||||
</member>
|
|
||||||
<member name="F:DG.DOTweenEditor.EditorVersion.Version">
|
|
||||||
<summary>Full major version + first minor version (ex: 2018.1f)</summary>
|
|
||||||
</member>
|
|
||||||
<member name="F:DG.DOTweenEditor.EditorVersion.MajorVersion">
|
|
||||||
<summary>Major version</summary>
|
|
||||||
</member>
|
|
||||||
<member name="F:DG.DOTweenEditor.EditorVersion.MinorVersion">
|
|
||||||
<summary>First minor version (ex: in 2018.1 it would be 1)</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.SetEditorTexture(UnityEngine.Texture2D,UnityEngine.FilterMode,System.Int32)">
|
|
||||||
<summary>
|
|
||||||
Checks that the given editor texture use the correct import settings,
|
|
||||||
and applies them if they're incorrect.
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.DOTweenSetupRequired">
|
|
||||||
<summary>
|
|
||||||
Returns TRUE if setup is required
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.AssetExists(System.String)">
|
|
||||||
<summary>
|
|
||||||
Returns TRUE if the file/directory at the given path exists.
|
|
||||||
</summary>
|
|
||||||
<param name="adbPath">Path, relative to Unity's project folder</param>
|
|
||||||
<returns></returns>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.ADBPathToFullPath(System.String)">
|
|
||||||
<summary>
|
|
||||||
Converts the given project-relative path to a full path,
|
|
||||||
with backward (\) slashes).
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.FullPathToADBPath(System.String)">
|
|
||||||
<summary>
|
|
||||||
Converts the given full path to a path usable with AssetDatabase methods
|
|
||||||
(relative to Unity's project folder, and with the correct Unity forward (/) slashes).
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.ConnectToSourceAsset``1(System.String,System.Boolean)">
|
|
||||||
<summary>
|
|
||||||
Connects to a <see cref="T:UnityEngine.ScriptableObject"/> asset.
|
|
||||||
If the asset already exists at the given path, loads it and returns it.
|
|
||||||
Otherwise, either returns NULL or automatically creates it before loading and returning it
|
|
||||||
(depending on the given parameters).
|
|
||||||
</summary>
|
|
||||||
<typeparam name="T">Asset type</typeparam>
|
|
||||||
<param name="adbFilePath">File path (relative to Unity's project folder)</param>
|
|
||||||
<param name="createIfMissing">If TRUE and the requested asset doesn't exist, forces its creation</param>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.GetAssemblyFilePath(System.Reflection.Assembly)">
|
|
||||||
<summary>
|
|
||||||
Full path for the given loaded assembly, assembly file included
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.AddGlobalDefine(System.String)">
|
|
||||||
<summary>
|
|
||||||
Adds the given global define if it's not already present
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.RemoveGlobalDefine(System.String)">
|
|
||||||
<summary>
|
|
||||||
Removes the given global define if it's present
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="M:DG.DOTweenEditor.EditorUtils.HasGlobalDefine(System.String,System.Nullable{UnityEditor.BuildTargetGroup})">
|
|
||||||
<summary>
|
|
||||||
Returns TRUE if the given global define is present in all the <see cref="T:UnityEditor.BuildTargetGroup"/>
|
|
||||||
or only in the given <see cref="T:UnityEditor.BuildTargetGroup"/>, depending on passed parameters.<para/>
|
|
||||||
</summary>
|
|
||||||
<param name="id"></param>
|
|
||||||
<param name="buildTargetGroup"><see cref="T:UnityEditor.BuildTargetGroup"/>to use. Leave NULL to check in all of them.</param>
|
|
||||||
</member>
|
|
||||||
<member name="T:DG.DOTweenEditor.DOTweenDefines">
|
|
||||||
<summary>
|
|
||||||
Not used as menu item anymore, but as a utility function
|
|
||||||
</summary>
|
|
||||||
</member>
|
|
||||||
<member name="F:DG.DOTweenEditor.UnityEditorVersion.Version">
|
|
||||||
<summary>Full major version + first minor version (ex: 2018.1f)</summary>
|
|
||||||
</member>
|
|
||||||
<member name="F:DG.DOTweenEditor.UnityEditorVersion.MajorVersion">
|
|
||||||
<summary>Major version</summary>
|
|
||||||
</member>
|
|
||||||
<member name="F:DG.DOTweenEditor.UnityEditorVersion.MinorVersion">
|
|
||||||
<summary>First minor version (ex: in 2018.1 it would be 1)</summary>
|
|
||||||
</member>
|
|
||||||
</members>
|
|
||||||
</doc>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: c3a0d4ea64302bb4991712323bb30d9e
|
|
||||||
TextScriptImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 94b982fba6cf0aa45bcdf01c3482d100
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 95b29595c168b71499bad9d6478e8197
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
@@ -1,117 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: b902d1eb53417de449e5bca5240aa270
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 13
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 1
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 1
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 0
|
|
||||||
wrapV: 0
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 1
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 0
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 0
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 0
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
customData:
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID:
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
spriteCustomMetadata:
|
|
||||||
entries: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
@@ -1,117 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 1db1e959b7dc07649ac59e1c7893d491
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 13
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 1
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 1
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 0
|
|
||||||
wrapV: 0
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 1
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 0
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 0
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 0
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
customData:
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID:
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
spriteCustomMetadata:
|
|
||||||
entries: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
@@ -1,117 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: d248ad19bd4cd6441903457017e9a89e
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 13
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 0
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 1
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 1
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 0
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 2
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 256
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
customData:
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID:
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
spriteCustomMetadata:
|
|
||||||
entries: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
@@ -1,117 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 303132c0f3de1ad41a12da103de7e06d
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 13
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 1
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 1
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 0
|
|
||||||
wrapV: 0
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 1
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 0
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 0
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 0
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
customData:
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID:
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
spriteCustomMetadata:
|
|
||||||
entries: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
@@ -1,117 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 2b04f9c855a815247965dd166a078a2e
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 13
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 0
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
flipGreenChannel: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMipmapLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 1
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 1
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 0
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 2
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
swizzle: 50462976
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 512
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 4
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
ignorePlatformSupport: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
customData:
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID:
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
spriteCustomMetadata:
|
|
||||||
entries: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
mipmapLimitGroupName:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 687808f6960389c42be607a9d0c85db8
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,198 +0,0 @@
|
|||||||
// Author: Daniele Giardini - http://www.demigiant.com
|
|
||||||
// Created: 2018/07/13
|
|
||||||
|
|
||||||
#if true // MODULE_MARKER
|
|
||||||
using System;
|
|
||||||
using DG.Tweening.Core;
|
|
||||||
using DG.Tweening.Plugins.Options;
|
|
||||||
using UnityEngine;
|
|
||||||
using UnityEngine.Audio; // Required for AudioMixer
|
|
||||||
|
|
||||||
#pragma warning disable 1591
|
|
||||||
namespace DG.Tweening
|
|
||||||
{
|
|
||||||
public static class DOTweenModuleAudio
|
|
||||||
{
|
|
||||||
#region Shortcuts
|
|
||||||
|
|
||||||
#region Audio
|
|
||||||
|
|
||||||
/// <summary>Tweens an AudioSource's volume to the given value.
|
|
||||||
/// Also stores the AudioSource as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach (0 to 1)</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOFade(this AudioSource target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
if (endValue < 0) endValue = 0;
|
|
||||||
else if (endValue > 1) endValue = 1;
|
|
||||||
TweenerCore<float, float, FloatOptions> t = DOTween.To(() => target.volume, x => target.volume = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens an AudioSource's pitch to the given value.
|
|
||||||
/// Also stores the AudioSource as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOPitch(this AudioSource target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<float, float, FloatOptions> t = DOTween.To(() => target.pitch, x => target.pitch = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region AudioMixer
|
|
||||||
|
|
||||||
/// <summary>Tweens an AudioMixer's exposed float to the given value.
|
|
||||||
/// Also stores the AudioMixer as the tween's target so it can be used for filtered operations.
|
|
||||||
/// Note that you need to manually expose a float in an AudioMixerGroup in order to be able to tween it from an AudioMixer.</summary>
|
|
||||||
/// <param name="floatName">Name given to the exposed float to set</param>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOSetFloat(this AudioMixer target, string floatName, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<float, float, FloatOptions> t = DOTween.To(()=> {
|
|
||||||
float currVal;
|
|
||||||
target.GetFloat(floatName, out currVal);
|
|
||||||
return currVal;
|
|
||||||
}, x=> target.SetFloat(floatName, x), endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Operation Shortcuts
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Completes all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens completed
|
|
||||||
/// (meaning the tweens that don't have infinite loops and were not already complete)
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="withCallbacks">For Sequences only: if TRUE also internal Sequence callbacks will be fired,
|
|
||||||
/// otherwise they will be ignored</param>
|
|
||||||
public static int DOComplete(this AudioMixer target, bool withCallbacks = false)
|
|
||||||
{
|
|
||||||
return DOTween.Complete(target, withCallbacks);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Kills all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens killed.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="complete">If TRUE completes the tween before killing it</param>
|
|
||||||
public static int DOKill(this AudioMixer target, bool complete = false)
|
|
||||||
{
|
|
||||||
return DOTween.Kill(target, complete);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Flips the direction (backwards if it was going forward or viceversa) of all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens flipped.
|
|
||||||
/// </summary>
|
|
||||||
public static int DOFlip(this AudioMixer target)
|
|
||||||
{
|
|
||||||
return DOTween.Flip(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Sends to the given position all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens involved.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="to">Time position to reach
|
|
||||||
/// (if higher than the whole tween duration the tween will simply reach its end)</param>
|
|
||||||
/// <param name="andPlay">If TRUE will play the tween after reaching the given position, otherwise it will pause it</param>
|
|
||||||
public static int DOGoto(this AudioMixer target, float to, bool andPlay = false)
|
|
||||||
{
|
|
||||||
return DOTween.Goto(target, to, andPlay);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Pauses all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens paused.
|
|
||||||
/// </summary>
|
|
||||||
public static int DOPause(this AudioMixer target)
|
|
||||||
{
|
|
||||||
return DOTween.Pause(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Plays all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens played.
|
|
||||||
/// </summary>
|
|
||||||
public static int DOPlay(this AudioMixer target)
|
|
||||||
{
|
|
||||||
return DOTween.Play(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Plays backwards all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens played.
|
|
||||||
/// </summary>
|
|
||||||
public static int DOPlayBackwards(this AudioMixer target)
|
|
||||||
{
|
|
||||||
return DOTween.PlayBackwards(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Plays forward all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens played.
|
|
||||||
/// </summary>
|
|
||||||
public static int DOPlayForward(this AudioMixer target)
|
|
||||||
{
|
|
||||||
return DOTween.PlayForward(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Restarts all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens restarted.
|
|
||||||
/// </summary>
|
|
||||||
public static int DORestart(this AudioMixer target)
|
|
||||||
{
|
|
||||||
return DOTween.Restart(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Rewinds all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens rewinded.
|
|
||||||
/// </summary>
|
|
||||||
public static int DORewind(this AudioMixer target)
|
|
||||||
{
|
|
||||||
return DOTween.Rewind(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Smoothly rewinds all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens rewinded.
|
|
||||||
/// </summary>
|
|
||||||
public static int DOSmoothRewind(this AudioMixer target)
|
|
||||||
{
|
|
||||||
return DOTween.SmoothRewind(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Toggles the paused state (plays if it was paused, pauses if it was playing) of all tweens that have this target as a reference
|
|
||||||
/// (meaning tweens that were started from this target, or that had this target added as an Id)
|
|
||||||
/// and returns the total number of tweens involved.
|
|
||||||
/// </summary>
|
|
||||||
public static int DOTogglePause(this AudioMixer target)
|
|
||||||
{
|
|
||||||
return DOTween.TogglePause(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 1147dbe38997e96479427367869dcf4c
|
|
||||||
@@ -1,146 +0,0 @@
|
|||||||
using UnityEngine;
|
|
||||||
|
|
||||||
#if false || EPO_DOTWEEN // MODULE_MARKER
|
|
||||||
|
|
||||||
using EPOOutline;
|
|
||||||
using DG.Tweening.Plugins.Options;
|
|
||||||
using DG.Tweening;
|
|
||||||
using DG.Tweening.Core;
|
|
||||||
|
|
||||||
namespace DG.Tweening
|
|
||||||
{
|
|
||||||
public static class DOTweenModuleEPOOutline
|
|
||||||
{
|
|
||||||
public static int DOKill(this SerializedPass target, bool complete)
|
|
||||||
{
|
|
||||||
return DOTween.Kill(target, complete);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOFloat(this SerializedPass target, string propertyName, float endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.GetFloat(propertyName), x => target.SetFloat(propertyName, x), endValue, duration);
|
|
||||||
tweener.SetOptions(true).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOFade(this SerializedPass target, string propertyName, float endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.ToAlpha(() => target.GetColor(propertyName), x => target.SetColor(propertyName, x), endValue, duration);
|
|
||||||
tweener.SetOptions(true).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOColor(this SerializedPass target, string propertyName, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.GetColor(propertyName), x => target.SetColor(propertyName, x), endValue, duration);
|
|
||||||
tweener.SetOptions(false).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TweenerCore<Vector4, Vector4, VectorOptions> DOVector(this SerializedPass target, string propertyName, Vector4 endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.GetVector(propertyName), x => target.SetVector(propertyName, x), endValue, duration);
|
|
||||||
tweener.SetOptions(false).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOFloat(this SerializedPass target, int propertyId, float endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.GetFloat(propertyId), x => target.SetFloat(propertyId, x), endValue, duration);
|
|
||||||
tweener.SetOptions(true).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOFade(this SerializedPass target, int propertyId, float endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.ToAlpha(() => target.GetColor(propertyId), x => target.SetColor(propertyId, x), endValue, duration);
|
|
||||||
tweener.SetOptions(true).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOColor(this SerializedPass target, int propertyId, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.GetColor(propertyId), x => target.SetColor(propertyId, x), endValue, duration);
|
|
||||||
tweener.SetOptions(false).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TweenerCore<Vector4, Vector4, VectorOptions> DOVector(this SerializedPass target, int propertyId, Vector4 endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.GetVector(propertyId), x => target.SetVector(propertyId, x), endValue, duration);
|
|
||||||
tweener.SetOptions(false).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int DOKill(this Outlinable.OutlineProperties target, bool complete = false)
|
|
||||||
{
|
|
||||||
return DOTween.Kill(target, complete);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int DOKill(this Outliner target, bool complete = false)
|
|
||||||
{
|
|
||||||
return DOTween.Kill(target, complete);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Controls the alpha (transparency) of the outline
|
|
||||||
/// </summary>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOFade(this Outlinable.OutlineProperties target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.ToAlpha(() => target.Color, x => target.Color = x, endValue, duration);
|
|
||||||
tweener.SetOptions(true).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Controls the color of the outline
|
|
||||||
/// </summary>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOColor(this Outlinable.OutlineProperties target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.Color, x => target.Color = x, endValue, duration);
|
|
||||||
tweener.SetOptions(false).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Controls the amount of blur applied to the outline
|
|
||||||
/// </summary>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOBlurShift(this Outlinable.OutlineProperties target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.BlurShift, x => target.BlurShift = x, endValue, duration);
|
|
||||||
tweener.SetOptions(snapping).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Controls the amount of blur applied to the outline
|
|
||||||
/// </summary>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOBlurShift(this Outliner target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.BlurShift, x => target.BlurShift = x, endValue, duration);
|
|
||||||
tweener.SetOptions(snapping).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Controls the amount of dilation applied to the outline
|
|
||||||
/// </summary>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DODilateShift(this Outlinable.OutlineProperties target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.DilateShift, x => target.DilateShift = x, endValue, duration);
|
|
||||||
tweener.SetOptions(snapping).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Controls the amount of dilation applied to the outline
|
|
||||||
/// </summary>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DODilateShift(this Outliner target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
var tweener = DOTween.To(() => target.DilateShift, x => target.DilateShift = x, endValue, duration);
|
|
||||||
tweener.SetOptions(snapping).SetTarget(target);
|
|
||||||
return tweener;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 2cdcb9f1cd5d3f34d880e4d6cc33f685
|
|
||||||
@@ -1,216 +0,0 @@
|
|||||||
// Author: Daniele Giardini - http://www.demigiant.com
|
|
||||||
// Created: 2018/07/13
|
|
||||||
|
|
||||||
#if true // MODULE_MARKER
|
|
||||||
using System;
|
|
||||||
using DG.Tweening.Core;
|
|
||||||
using DG.Tweening.Core.Enums;
|
|
||||||
using DG.Tweening.Plugins;
|
|
||||||
using DG.Tweening.Plugins.Core.PathCore;
|
|
||||||
using DG.Tweening.Plugins.Options;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
#pragma warning disable 1591
|
|
||||||
namespace DG.Tweening
|
|
||||||
{
|
|
||||||
public static class DOTweenModulePhysics
|
|
||||||
{
|
|
||||||
#region Shortcuts
|
|
||||||
|
|
||||||
#region Rigidbody
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody's position to the given value.
|
|
||||||
/// Also stores the rigidbody as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector3, Vector3, VectorOptions> DOMove(this Rigidbody target, Vector3 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Vector3, VectorOptions> t = DOTween.To(() => target.position, target.MovePosition, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody's X position to the given value.
|
|
||||||
/// Also stores the rigidbody as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector3, Vector3, VectorOptions> DOMoveX(this Rigidbody target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Vector3, VectorOptions> t = DOTween.To(() => target.position, target.MovePosition, new Vector3(endValue, 0, 0), duration);
|
|
||||||
t.SetOptions(AxisConstraint.X, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody's Y position to the given value.
|
|
||||||
/// Also stores the rigidbody as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector3, Vector3, VectorOptions> DOMoveY(this Rigidbody target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Vector3, VectorOptions> t = DOTween.To(() => target.position, target.MovePosition, new Vector3(0, endValue, 0), duration);
|
|
||||||
t.SetOptions(AxisConstraint.Y, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody's Z position to the given value.
|
|
||||||
/// Also stores the rigidbody as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector3, Vector3, VectorOptions> DOMoveZ(this Rigidbody target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Vector3, VectorOptions> t = DOTween.To(() => target.position, target.MovePosition, new Vector3(0, 0, endValue), duration);
|
|
||||||
t.SetOptions(AxisConstraint.Z, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody's rotation to the given value.
|
|
||||||
/// Also stores the rigidbody as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="mode">Rotation mode</param>
|
|
||||||
public static TweenerCore<Quaternion, Vector3, QuaternionOptions> DORotate(this Rigidbody target, Vector3 endValue, float duration, RotateMode mode = RotateMode.Fast)
|
|
||||||
{
|
|
||||||
TweenerCore<Quaternion, Vector3, QuaternionOptions> t = DOTween.To(() => target.rotation, target.MoveRotation, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
t.plugOptions.rotateMode = mode;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody's rotation so that it will look towards the given position.
|
|
||||||
/// Also stores the rigidbody as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="towards">The position to look at</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="axisConstraint">Eventual axis constraint for the rotation</param>
|
|
||||||
/// <param name="up">The vector that defines in which direction up is (default: Vector3.up)</param>
|
|
||||||
public static TweenerCore<Quaternion, Vector3, QuaternionOptions> DOLookAt(this Rigidbody target, Vector3 towards, float duration, AxisConstraint axisConstraint = AxisConstraint.None, Vector3? up = null)
|
|
||||||
{
|
|
||||||
TweenerCore<Quaternion, Vector3, QuaternionOptions> t = DOTween.To(() => target.rotation, target.MoveRotation, towards, duration)
|
|
||||||
.SetTarget(target).SetSpecialStartupMode(SpecialStartupMode.SetLookAt);
|
|
||||||
t.plugOptions.axisConstraint = axisConstraint;
|
|
||||||
t.plugOptions.up = (up == null) ? Vector3.up : (Vector3)up;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Special
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody's position to the given value, while also applying a jump effect along the Y axis.
|
|
||||||
/// Returns a Sequence instead of a Tweener.
|
|
||||||
/// Also stores the Rigidbody as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param>
|
|
||||||
/// <param name="jumpPower">Power of the jump (the max height of the jump is represented by this plus the final Y offset)</param>
|
|
||||||
/// <param name="numJumps">Total number of jumps</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static Sequence DOJump(this Rigidbody target, Vector3 endValue, float jumpPower, int numJumps, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
if (numJumps < 1) numJumps = 1;
|
|
||||||
float startPosY = 0;
|
|
||||||
float offsetY = -1;
|
|
||||||
bool offsetYSet = false;
|
|
||||||
Sequence s = DOTween.Sequence();
|
|
||||||
Tween yTween = DOTween.To(() => target.position, target.MovePosition, new Vector3(0, jumpPower, 0), duration / (numJumps * 2))
|
|
||||||
.SetOptions(AxisConstraint.Y, snapping).SetEase(Ease.OutQuad).SetRelative()
|
|
||||||
.SetLoops(numJumps * 2, LoopType.Yoyo)
|
|
||||||
.OnStart(() => startPosY = target.position.y);
|
|
||||||
s.Append(DOTween.To(() => target.position, target.MovePosition, new Vector3(endValue.x, 0, 0), duration)
|
|
||||||
.SetOptions(AxisConstraint.X, snapping).SetEase(Ease.Linear)
|
|
||||||
).Join(DOTween.To(() => target.position, target.MovePosition, new Vector3(0, 0, endValue.z), duration)
|
|
||||||
.SetOptions(AxisConstraint.Z, snapping).SetEase(Ease.Linear)
|
|
||||||
).Join(yTween)
|
|
||||||
.SetTarget(target).SetEase(DOTween.defaultEaseType);
|
|
||||||
yTween.OnUpdate(() => {
|
|
||||||
if (!offsetYSet) {
|
|
||||||
offsetYSet = true;
|
|
||||||
offsetY = s.isRelative ? endValue.y : endValue.y - startPosY;
|
|
||||||
}
|
|
||||||
Vector3 pos = target.position;
|
|
||||||
pos.y += DOVirtual.EasedValue(0, offsetY, yTween.ElapsedPercentage(), Ease.OutQuad);
|
|
||||||
target.MovePosition(pos);
|
|
||||||
});
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody's position through the given path waypoints, using the chosen path algorithm.
|
|
||||||
/// Also stores the Rigidbody as the tween's target so it can be used for filtered operations.
|
|
||||||
/// <para>NOTE: to tween a rigidbody correctly it should be set to kinematic at least while being tweened.</para>
|
|
||||||
/// <para>BEWARE: doesn't work on Windows Phone store (waiting for Unity to fix their own bug).
|
|
||||||
/// If you plan to publish there you should use a regular transform.DOPath.</para></summary>
|
|
||||||
/// <param name="path">The waypoints to go through</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="pathType">The type of path: Linear (straight path), CatmullRom (curved CatmullRom path) or CubicBezier (curved with control points)</param>
|
|
||||||
/// <param name="pathMode">The path mode: 3D, side-scroller 2D, top-down 2D</param>
|
|
||||||
/// <param name="resolution">The resolution of the path (useless in case of Linear paths): higher resolutions make for more detailed curved paths but are more expensive.
|
|
||||||
/// Defaults to 10, but a value of 5 is usually enough if you don't have dramatic long curves between waypoints</param>
|
|
||||||
/// <param name="gizmoColor">The color of the path (shown when gizmos are active in the Play panel and the tween is running)</param>
|
|
||||||
public static TweenerCore<Vector3, Path, PathOptions> DOPath(
|
|
||||||
this Rigidbody target, Vector3[] path, float duration, PathType pathType = PathType.Linear,
|
|
||||||
PathMode pathMode = PathMode.Full3D, int resolution = 10, Color? gizmoColor = null
|
|
||||||
)
|
|
||||||
{
|
|
||||||
if (resolution < 1) resolution = 1;
|
|
||||||
TweenerCore<Vector3, Path, PathOptions> t = DOTween.To(PathPlugin.Get(), () => target.position, target.MovePosition, new Path(pathType, path, resolution, gizmoColor), duration)
|
|
||||||
.SetTarget(target).SetUpdate(UpdateType.Fixed);
|
|
||||||
|
|
||||||
t.plugOptions.isRigidbody = true;
|
|
||||||
t.plugOptions.mode = pathMode;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a Rigidbody's localPosition through the given path waypoints, using the chosen path algorithm.
|
|
||||||
/// Also stores the Rigidbody as the tween's target so it can be used for filtered operations
|
|
||||||
/// <para>NOTE: to tween a rigidbody correctly it should be set to kinematic at least while being tweened.</para>
|
|
||||||
/// <para>BEWARE: doesn't work on Windows Phone store (waiting for Unity to fix their own bug).
|
|
||||||
/// If you plan to publish there you should use a regular transform.DOLocalPath.</para></summary>
|
|
||||||
/// <param name="path">The waypoint to go through</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="pathType">The type of path: Linear (straight path), CatmullRom (curved CatmullRom path) or CubicBezier (curved with control points)</param>
|
|
||||||
/// <param name="pathMode">The path mode: 3D, side-scroller 2D, top-down 2D</param>
|
|
||||||
/// <param name="resolution">The resolution of the path: higher resolutions make for more detailed curved paths but are more expensive.
|
|
||||||
/// Defaults to 10, but a value of 5 is usually enough if you don't have dramatic long curves between waypoints</param>
|
|
||||||
/// <param name="gizmoColor">The color of the path (shown when gizmos are active in the Play panel and the tween is running)</param>
|
|
||||||
public static TweenerCore<Vector3, Path, PathOptions> DOLocalPath(
|
|
||||||
this Rigidbody target, Vector3[] path, float duration, PathType pathType = PathType.Linear,
|
|
||||||
PathMode pathMode = PathMode.Full3D, int resolution = 10, Color? gizmoColor = null
|
|
||||||
)
|
|
||||||
{
|
|
||||||
if (resolution < 1) resolution = 1;
|
|
||||||
Transform trans = target.transform;
|
|
||||||
TweenerCore<Vector3, Path, PathOptions> t = DOTween.To(PathPlugin.Get(), () => trans.localPosition, x => target.MovePosition(trans.parent == null ? x : trans.parent.TransformPoint(x)), new Path(pathType, path, resolution, gizmoColor), duration)
|
|
||||||
.SetTarget(target).SetUpdate(UpdateType.Fixed);
|
|
||||||
|
|
||||||
t.plugOptions.isRigidbody = true;
|
|
||||||
t.plugOptions.mode = pathMode;
|
|
||||||
t.plugOptions.useLocalPosition = true;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
// Used by path editor when creating the actual tween, so it can pass a pre-compiled path
|
|
||||||
internal static TweenerCore<Vector3, Path, PathOptions> DOPath(
|
|
||||||
this Rigidbody target, Path path, float duration, PathMode pathMode = PathMode.Full3D
|
|
||||||
)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Path, PathOptions> t = DOTween.To(PathPlugin.Get(), () => target.position, target.MovePosition, path, duration)
|
|
||||||
.SetTarget(target);
|
|
||||||
|
|
||||||
t.plugOptions.isRigidbody = true;
|
|
||||||
t.plugOptions.mode = pathMode;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
internal static TweenerCore<Vector3, Path, PathOptions> DOLocalPath(
|
|
||||||
this Rigidbody target, Path path, float duration, PathMode pathMode = PathMode.Full3D
|
|
||||||
)
|
|
||||||
{
|
|
||||||
Transform trans = target.transform;
|
|
||||||
TweenerCore<Vector3, Path, PathOptions> t = DOTween.To(PathPlugin.Get(), () => trans.localPosition, x => target.MovePosition(trans.parent == null ? x : trans.parent.TransformPoint(x)), path, duration)
|
|
||||||
.SetTarget(target);
|
|
||||||
|
|
||||||
t.plugOptions.isRigidbody = true;
|
|
||||||
t.plugOptions.mode = pathMode;
|
|
||||||
t.plugOptions.useLocalPosition = true;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: c66e526951ba6474abaf336a4f2d23ba
|
|
||||||
@@ -1,193 +0,0 @@
|
|||||||
// Author: Daniele Giardini - http://www.demigiant.com
|
|
||||||
// Created: 2018/07/13
|
|
||||||
|
|
||||||
#if true // MODULE_MARKER
|
|
||||||
using System;
|
|
||||||
using DG.Tweening.Core;
|
|
||||||
using DG.Tweening.Plugins;
|
|
||||||
using DG.Tweening.Plugins.Core.PathCore;
|
|
||||||
using DG.Tweening.Plugins.Options;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
#pragma warning disable 1591
|
|
||||||
namespace DG.Tweening
|
|
||||||
{
|
|
||||||
public static class DOTweenModulePhysics2D
|
|
||||||
{
|
|
||||||
#region Shortcuts
|
|
||||||
|
|
||||||
#region Rigidbody2D Shortcuts
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody2D's position to the given value.
|
|
||||||
/// Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOMove(this Rigidbody2D target, Vector2 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.position, target.MovePosition, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody2D's X position to the given value.
|
|
||||||
/// Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOMoveX(this Rigidbody2D target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.position, target.MovePosition, new Vector2(endValue, 0), duration);
|
|
||||||
t.SetOptions(AxisConstraint.X, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody2D's Y position to the given value.
|
|
||||||
/// Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOMoveY(this Rigidbody2D target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.position, target.MovePosition, new Vector2(0, endValue), duration);
|
|
||||||
t.SetOptions(AxisConstraint.Y, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody2D's rotation to the given value.
|
|
||||||
/// Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DORotate(this Rigidbody2D target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<float, float, FloatOptions> t = DOTween.To(() => target.rotation, target.MoveRotation, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Special
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody2D's position to the given value, while also applying a jump effect along the Y axis.
|
|
||||||
/// Returns a Sequence instead of a Tweener.
|
|
||||||
/// Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations.
|
|
||||||
/// <para>IMPORTANT: a rigidbody2D can't be animated in a jump arc using MovePosition, so the tween will directly set the position</para></summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param>
|
|
||||||
/// <param name="jumpPower">Power of the jump (the max height of the jump is represented by this plus the final Y offset)</param>
|
|
||||||
/// <param name="numJumps">Total number of jumps</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static Sequence DOJump(this Rigidbody2D target, Vector2 endValue, float jumpPower, int numJumps, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
if (numJumps < 1) numJumps = 1;
|
|
||||||
float startPosY = 0;
|
|
||||||
float offsetY = -1;
|
|
||||||
bool offsetYSet = false;
|
|
||||||
Sequence s = DOTween.Sequence();
|
|
||||||
Tween yTween = DOTween.To(() => target.position, x => target.position = x, new Vector2(0, jumpPower), duration / (numJumps * 2))
|
|
||||||
.SetOptions(AxisConstraint.Y, snapping).SetEase(Ease.OutQuad).SetRelative()
|
|
||||||
.SetLoops(numJumps * 2, LoopType.Yoyo)
|
|
||||||
.OnStart(() => startPosY = target.position.y);
|
|
||||||
s.Append(DOTween.To(() => target.position, x => target.position = x, new Vector2(endValue.x, 0), duration)
|
|
||||||
.SetOptions(AxisConstraint.X, snapping).SetEase(Ease.Linear)
|
|
||||||
).Join(yTween)
|
|
||||||
.SetTarget(target).SetEase(DOTween.defaultEaseType);
|
|
||||||
yTween.OnUpdate(() => {
|
|
||||||
if (!offsetYSet) {
|
|
||||||
offsetYSet = true;
|
|
||||||
offsetY = s.isRelative ? endValue.y : endValue.y - startPosY;
|
|
||||||
}
|
|
||||||
Vector3 pos = target.position;
|
|
||||||
pos.y += DOVirtual.EasedValue(0, offsetY, yTween.ElapsedPercentage(), Ease.OutQuad);
|
|
||||||
target.MovePosition(pos);
|
|
||||||
});
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Rigidbody2D's position through the given path waypoints, using the chosen path algorithm.
|
|
||||||
/// Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations.
|
|
||||||
/// <para>NOTE: to tween a Rigidbody2D correctly it should be set to kinematic at least while being tweened.</para>
|
|
||||||
/// <para>BEWARE: doesn't work on Windows Phone store (waiting for Unity to fix their own bug).
|
|
||||||
/// If you plan to publish there you should use a regular transform.DOPath.</para></summary>
|
|
||||||
/// <param name="path">The waypoints to go through</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="pathType">The type of path: Linear (straight path), CatmullRom (curved CatmullRom path) or CubicBezier (curved with control points)</param>
|
|
||||||
/// <param name="pathMode">The path mode: 3D, side-scroller 2D, top-down 2D</param>
|
|
||||||
/// <param name="resolution">The resolution of the path (useless in case of Linear paths): higher resolutions make for more detailed curved paths but are more expensive.
|
|
||||||
/// Defaults to 10, but a value of 5 is usually enough if you don't have dramatic long curves between waypoints</param>
|
|
||||||
/// <param name="gizmoColor">The color of the path (shown when gizmos are active in the Play panel and the tween is running)</param>
|
|
||||||
public static TweenerCore<Vector3, Path, PathOptions> DOPath(
|
|
||||||
this Rigidbody2D target, Vector2[] path, float duration, PathType pathType = PathType.Linear,
|
|
||||||
PathMode pathMode = PathMode.Full3D, int resolution = 10, Color? gizmoColor = null
|
|
||||||
)
|
|
||||||
{
|
|
||||||
if (resolution < 1) resolution = 1;
|
|
||||||
int len = path.Length;
|
|
||||||
Vector3[] path3D = new Vector3[len];
|
|
||||||
for (int i = 0; i < len; ++i) path3D[i] = path[i];
|
|
||||||
TweenerCore<Vector3, Path, PathOptions> t = DOTween.To(PathPlugin.Get(), () => target.position, x => target.MovePosition(x), new Path(pathType, path3D, resolution, gizmoColor), duration)
|
|
||||||
.SetTarget(target).SetUpdate(UpdateType.Fixed);
|
|
||||||
|
|
||||||
t.plugOptions.isRigidbody2D = true;
|
|
||||||
t.plugOptions.mode = pathMode;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a Rigidbody2D's localPosition through the given path waypoints, using the chosen path algorithm.
|
|
||||||
/// Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations
|
|
||||||
/// <para>NOTE: to tween a Rigidbody2D correctly it should be set to kinematic at least while being tweened.</para>
|
|
||||||
/// <para>BEWARE: doesn't work on Windows Phone store (waiting for Unity to fix their own bug).
|
|
||||||
/// If you plan to publish there you should use a regular transform.DOLocalPath.</para></summary>
|
|
||||||
/// <param name="path">The waypoint to go through</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="pathType">The type of path: Linear (straight path), CatmullRom (curved CatmullRom path) or CubicBezier (curved with control points)</param>
|
|
||||||
/// <param name="pathMode">The path mode: 3D, side-scroller 2D, top-down 2D</param>
|
|
||||||
/// <param name="resolution">The resolution of the path: higher resolutions make for more detailed curved paths but are more expensive.
|
|
||||||
/// Defaults to 10, but a value of 5 is usually enough if you don't have dramatic long curves between waypoints</param>
|
|
||||||
/// <param name="gizmoColor">The color of the path (shown when gizmos are active in the Play panel and the tween is running)</param>
|
|
||||||
public static TweenerCore<Vector3, Path, PathOptions> DOLocalPath(
|
|
||||||
this Rigidbody2D target, Vector2[] path, float duration, PathType pathType = PathType.Linear,
|
|
||||||
PathMode pathMode = PathMode.Full3D, int resolution = 10, Color? gizmoColor = null
|
|
||||||
)
|
|
||||||
{
|
|
||||||
if (resolution < 1) resolution = 1;
|
|
||||||
int len = path.Length;
|
|
||||||
Vector3[] path3D = new Vector3[len];
|
|
||||||
for (int i = 0; i < len; ++i) path3D[i] = path[i];
|
|
||||||
Transform trans = target.transform;
|
|
||||||
TweenerCore<Vector3, Path, PathOptions> t = DOTween.To(PathPlugin.Get(), () => trans.localPosition, x => target.MovePosition(trans.parent == null ? x : trans.parent.TransformPoint(x)), new Path(pathType, path3D, resolution, gizmoColor), duration)
|
|
||||||
.SetTarget(target).SetUpdate(UpdateType.Fixed);
|
|
||||||
|
|
||||||
t.plugOptions.isRigidbody2D = true;
|
|
||||||
t.plugOptions.mode = pathMode;
|
|
||||||
t.plugOptions.useLocalPosition = true;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
// Used by path editor when creating the actual tween, so it can pass a pre-compiled path
|
|
||||||
internal static TweenerCore<Vector3, Path, PathOptions> DOPath(
|
|
||||||
this Rigidbody2D target, Path path, float duration, PathMode pathMode = PathMode.Full3D
|
|
||||||
)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Path, PathOptions> t = DOTween.To(PathPlugin.Get(), () => target.position, x => target.MovePosition(x), path, duration)
|
|
||||||
.SetTarget(target);
|
|
||||||
|
|
||||||
t.plugOptions.isRigidbody2D = true;
|
|
||||||
t.plugOptions.mode = pathMode;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
internal static TweenerCore<Vector3, Path, PathOptions> DOLocalPath(
|
|
||||||
this Rigidbody2D target, Path path, float duration, PathMode pathMode = PathMode.Full3D
|
|
||||||
)
|
|
||||||
{
|
|
||||||
Transform trans = target.transform;
|
|
||||||
TweenerCore<Vector3, Path, PathOptions> t = DOTween.To(PathPlugin.Get(), () => trans.localPosition, x => target.MovePosition(trans.parent == null ? x : trans.parent.TransformPoint(x)), path, duration)
|
|
||||||
.SetTarget(target);
|
|
||||||
|
|
||||||
t.plugOptions.isRigidbody2D = true;
|
|
||||||
t.plugOptions.mode = pathMode;
|
|
||||||
t.plugOptions.useLocalPosition = true;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: c0660795e980e2e4ca12c5029233e196
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
// Author: Daniele Giardini - http://www.demigiant.com
|
|
||||||
// Created: 2018/07/13
|
|
||||||
|
|
||||||
#if true // MODULE_MARKER
|
|
||||||
using System;
|
|
||||||
using UnityEngine;
|
|
||||||
using DG.Tweening.Core;
|
|
||||||
using DG.Tweening.Plugins.Options;
|
|
||||||
|
|
||||||
#pragma warning disable 1591
|
|
||||||
namespace DG.Tweening
|
|
||||||
{
|
|
||||||
public static class DOTweenModuleSprite
|
|
||||||
{
|
|
||||||
#region Shortcuts
|
|
||||||
|
|
||||||
#region SpriteRenderer
|
|
||||||
|
|
||||||
/// <summary>Tweens a SpriteRenderer's color to the given value.
|
|
||||||
/// Also stores the spriteRenderer as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOColor(this SpriteRenderer target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.To(() => target.color, x => target.color = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Material's alpha color to the given value.
|
|
||||||
/// Also stores the spriteRenderer as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOFade(this SpriteRenderer target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.ToAlpha(() => target.color, x => target.color = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a SpriteRenderer's color using the given gradient
|
|
||||||
/// (NOTE 1: only uses the colors of the gradient, not the alphas - NOTE 2: creates a Sequence, not a Tweener).
|
|
||||||
/// Also stores the image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="gradient">The gradient to use</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static Sequence DOGradientColor(this SpriteRenderer target, Gradient gradient, float duration)
|
|
||||||
{
|
|
||||||
Sequence s = DOTween.Sequence();
|
|
||||||
GradientColorKey[] colors = gradient.colorKeys;
|
|
||||||
int len = colors.Length;
|
|
||||||
for (int i = 0; i < len; ++i) {
|
|
||||||
GradientColorKey c = colors[i];
|
|
||||||
if (i == 0 && c.time <= 0) {
|
|
||||||
target.color = c.color;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
float colorDuration = i == len - 1
|
|
||||||
? duration - s.Duration(false) // Verifies that total duration is correct
|
|
||||||
: duration * (i == 0 ? c.time : c.time - colors[i - 1].time);
|
|
||||||
s.Append(target.DOColor(c.color, colorDuration).SetEase(Ease.Linear));
|
|
||||||
}
|
|
||||||
s.SetTarget(target);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Blendables
|
|
||||||
|
|
||||||
#region SpriteRenderer
|
|
||||||
|
|
||||||
/// <summary>Tweens a SpriteRenderer's color to the given value,
|
|
||||||
/// in a way that allows other DOBlendableColor tweens to work together on the same target,
|
|
||||||
/// instead than fight each other as multiple DOColor would do.
|
|
||||||
/// Also stores the SpriteRenderer as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The value to tween to</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static Tweener DOBlendableColor(this SpriteRenderer target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
endValue = endValue - target.color;
|
|
||||||
Color to = new Color(0, 0, 0, 0);
|
|
||||||
return DOTween.To(() => to, x => {
|
|
||||||
Color diff = x - to;
|
|
||||||
to = x;
|
|
||||||
target.color += diff;
|
|
||||||
}, endValue, duration)
|
|
||||||
.Blendable().SetTarget(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 8e8f5010462a02647ae4b0306b0a7bc6
|
|
||||||
@@ -1,662 +0,0 @@
|
|||||||
// Author: Daniele Giardini - http://www.demigiant.com
|
|
||||||
// Created: 2018/07/13
|
|
||||||
|
|
||||||
#if true // MODULE_MARKER
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Globalization;
|
|
||||||
using UnityEngine;
|
|
||||||
using UnityEngine.UI;
|
|
||||||
using DG.Tweening.Core;
|
|
||||||
using DG.Tweening.Core.Enums;
|
|
||||||
using DG.Tweening.Plugins;
|
|
||||||
using DG.Tweening.Plugins.Options;
|
|
||||||
using Outline = UnityEngine.UI.Outline;
|
|
||||||
using Text = UnityEngine.UI.Text;
|
|
||||||
|
|
||||||
#pragma warning disable 1591
|
|
||||||
namespace DG.Tweening
|
|
||||||
{
|
|
||||||
public static class DOTweenModuleUI
|
|
||||||
{
|
|
||||||
#region Shortcuts
|
|
||||||
|
|
||||||
#region CanvasGroup
|
|
||||||
|
|
||||||
/// <summary>Tweens a CanvasGroup's alpha color to the given value.
|
|
||||||
/// Also stores the canvasGroup as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOFade(this CanvasGroup target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<float, float, FloatOptions> t = DOTween.To(() => target.alpha, x => target.alpha = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Graphic
|
|
||||||
|
|
||||||
/// <summary>Tweens an Graphic's color to the given value.
|
|
||||||
/// Also stores the image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOColor(this Graphic target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.To(() => target.color, x => target.color = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens an Graphic's alpha color to the given value.
|
|
||||||
/// Also stores the image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOFade(this Graphic target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.ToAlpha(() => target.color, x => target.color = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Image
|
|
||||||
|
|
||||||
/// <summary>Tweens an Image's color to the given value.
|
|
||||||
/// Also stores the image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOColor(this Image target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.To(() => target.color, x => target.color = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens an Image's alpha color to the given value.
|
|
||||||
/// Also stores the image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOFade(this Image target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.ToAlpha(() => target.color, x => target.color = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens an Image's fillAmount to the given value.
|
|
||||||
/// Also stores the image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach (0 to 1)</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOFillAmount(this Image target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
if (endValue > 1) endValue = 1;
|
|
||||||
else if (endValue < 0) endValue = 0;
|
|
||||||
TweenerCore<float, float, FloatOptions> t = DOTween.To(() => target.fillAmount, x => target.fillAmount = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens an Image's colors using the given gradient
|
|
||||||
/// (NOTE 1: only uses the colors of the gradient, not the alphas - NOTE 2: creates a Sequence, not a Tweener).
|
|
||||||
/// Also stores the image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="gradient">The gradient to use</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static Sequence DOGradientColor(this Image target, Gradient gradient, float duration)
|
|
||||||
{
|
|
||||||
Sequence s = DOTween.Sequence();
|
|
||||||
GradientColorKey[] colors = gradient.colorKeys;
|
|
||||||
int len = colors.Length;
|
|
||||||
for (int i = 0; i < len; ++i) {
|
|
||||||
GradientColorKey c = colors[i];
|
|
||||||
if (i == 0 && c.time <= 0) {
|
|
||||||
target.color = c.color;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
float colorDuration = i == len - 1
|
|
||||||
? duration - s.Duration(false) // Verifies that total duration is correct
|
|
||||||
: duration * (i == 0 ? c.time : c.time - colors[i - 1].time);
|
|
||||||
s.Append(target.DOColor(c.color, colorDuration).SetEase(Ease.Linear));
|
|
||||||
}
|
|
||||||
s.SetTarget(target);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region LayoutElement
|
|
||||||
|
|
||||||
/// <summary>Tweens an LayoutElement's flexibleWidth/Height to the given value.
|
|
||||||
/// Also stores the LayoutElement as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOFlexibleSize(this LayoutElement target, Vector2 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => new Vector2(target.flexibleWidth, target.flexibleHeight), x => {
|
|
||||||
target.flexibleWidth = x.x;
|
|
||||||
target.flexibleHeight = x.y;
|
|
||||||
}, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens an LayoutElement's minWidth/Height to the given value.
|
|
||||||
/// Also stores the LayoutElement as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOMinSize(this LayoutElement target, Vector2 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => new Vector2(target.minWidth, target.minHeight), x => {
|
|
||||||
target.minWidth = x.x;
|
|
||||||
target.minHeight = x.y;
|
|
||||||
}, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens an LayoutElement's preferredWidth/Height to the given value.
|
|
||||||
/// Also stores the LayoutElement as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOPreferredSize(this LayoutElement target, Vector2 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => new Vector2(target.preferredWidth, target.preferredHeight), x => {
|
|
||||||
target.preferredWidth = x.x;
|
|
||||||
target.preferredHeight = x.y;
|
|
||||||
}, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Outline
|
|
||||||
|
|
||||||
/// <summary>Tweens a Outline's effectColor to the given value.
|
|
||||||
/// Also stores the Outline as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOColor(this Outline target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.To(() => target.effectColor, x => target.effectColor = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Outline's effectColor alpha to the given value.
|
|
||||||
/// Also stores the Outline as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOFade(this Outline target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.ToAlpha(() => target.effectColor, x => target.effectColor = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Outline's effectDistance to the given value.
|
|
||||||
/// Also stores the Outline as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOScale(this Outline target, Vector2 endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.effectDistance, x => target.effectDistance = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region RectTransform
|
|
||||||
|
|
||||||
/// <summary>Tweens a RectTransform's anchoredPosition to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOAnchorPos(this RectTransform target, Vector2 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.anchoredPosition, x => target.anchoredPosition = x, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a RectTransform's anchoredPosition X to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOAnchorPosX(this RectTransform target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.anchoredPosition, x => target.anchoredPosition = x, new Vector2(endValue, 0), duration);
|
|
||||||
t.SetOptions(AxisConstraint.X, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a RectTransform's anchoredPosition Y to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOAnchorPosY(this RectTransform target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.anchoredPosition, x => target.anchoredPosition = x, new Vector2(0, endValue), duration);
|
|
||||||
t.SetOptions(AxisConstraint.Y, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a RectTransform's anchoredPosition3D to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector3, Vector3, VectorOptions> DOAnchorPos3D(this RectTransform target, Vector3 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Vector3, VectorOptions> t = DOTween.To(() => target.anchoredPosition3D, x => target.anchoredPosition3D = x, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a RectTransform's anchoredPosition3D X to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector3, Vector3, VectorOptions> DOAnchorPos3DX(this RectTransform target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Vector3, VectorOptions> t = DOTween.To(() => target.anchoredPosition3D, x => target.anchoredPosition3D = x, new Vector3(endValue, 0, 0), duration);
|
|
||||||
t.SetOptions(AxisConstraint.X, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a RectTransform's anchoredPosition3D Y to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector3, Vector3, VectorOptions> DOAnchorPos3DY(this RectTransform target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Vector3, VectorOptions> t = DOTween.To(() => target.anchoredPosition3D, x => target.anchoredPosition3D = x, new Vector3(0, endValue, 0), duration);
|
|
||||||
t.SetOptions(AxisConstraint.Y, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a RectTransform's anchoredPosition3D Z to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector3, Vector3, VectorOptions> DOAnchorPos3DZ(this RectTransform target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector3, Vector3, VectorOptions> t = DOTween.To(() => target.anchoredPosition3D, x => target.anchoredPosition3D = x, new Vector3(0, 0, endValue), duration);
|
|
||||||
t.SetOptions(AxisConstraint.Z, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a RectTransform's anchorMax to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOAnchorMax(this RectTransform target, Vector2 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.anchorMax, x => target.anchorMax = x, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a RectTransform's anchorMin to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOAnchorMin(this RectTransform target, Vector2 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.anchorMin, x => target.anchorMin = x, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a RectTransform's pivot to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOPivot(this RectTransform target, Vector2 endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.pivot, x => target.pivot = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a RectTransform's pivot X to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOPivotX(this RectTransform target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.pivot, x => target.pivot = x, new Vector2(endValue, 0), duration);
|
|
||||||
t.SetOptions(AxisConstraint.X).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a RectTransform's pivot Y to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOPivotY(this RectTransform target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.pivot, x => target.pivot = x, new Vector2(0, endValue), duration);
|
|
||||||
t.SetOptions(AxisConstraint.Y).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a RectTransform's sizeDelta to the given value.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOSizeDelta(this RectTransform target, Vector2 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.sizeDelta, x => target.sizeDelta = x, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Punches a RectTransform's anchoredPosition towards the given direction and then back to the starting one
|
|
||||||
/// as if it was connected to the starting position via an elastic.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="punch">The direction and strength of the punch (added to the RectTransform's current position)</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="vibrato">Indicates how much will the punch vibrate</param>
|
|
||||||
/// <param name="elasticity">Represents how much (0 to 1) the vector will go beyond the starting position when bouncing backwards.
|
|
||||||
/// 1 creates a full oscillation between the punch direction and the opposite direction,
|
|
||||||
/// while 0 oscillates only between the punch and the start position</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static Tweener DOPunchAnchorPos(this RectTransform target, Vector2 punch, float duration, int vibrato = 10, float elasticity = 1, bool snapping = false)
|
|
||||||
{
|
|
||||||
return DOTween.Punch(() => target.anchoredPosition, x => target.anchoredPosition = x, punch, duration, vibrato, elasticity)
|
|
||||||
.SetTarget(target).SetOptions(snapping);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Shakes a RectTransform's anchoredPosition with the given values.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="strength">The shake strength</param>
|
|
||||||
/// <param name="vibrato">Indicates how much will the shake vibrate</param>
|
|
||||||
/// <param name="randomness">Indicates how much the shake will be random (0 to 180 - values higher than 90 kind of suck, so beware).
|
|
||||||
/// Setting it to 0 will shake along a single direction.</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
/// <param name="fadeOut">If TRUE the shake will automatically fadeOut smoothly within the tween's duration, otherwise it will not</param>
|
|
||||||
/// <param name="randomnessMode">Randomness mode</param>
|
|
||||||
public static Tweener DOShakeAnchorPos(this RectTransform target, float duration, float strength = 100, int vibrato = 10, float randomness = 90, bool snapping = false, bool fadeOut = true, ShakeRandomnessMode randomnessMode = ShakeRandomnessMode.Full)
|
|
||||||
{
|
|
||||||
return DOTween.Shake(() => target.anchoredPosition, x => target.anchoredPosition = x, duration, strength, vibrato, randomness, true, fadeOut, randomnessMode)
|
|
||||||
.SetTarget(target).SetSpecialStartupMode(SpecialStartupMode.SetShake).SetOptions(snapping);
|
|
||||||
}
|
|
||||||
/// <summary>Shakes a RectTransform's anchoredPosition with the given values.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="strength">The shake strength on each axis</param>
|
|
||||||
/// <param name="vibrato">Indicates how much will the shake vibrate</param>
|
|
||||||
/// <param name="randomness">Indicates how much the shake will be random (0 to 180 - values higher than 90 kind of suck, so beware).
|
|
||||||
/// Setting it to 0 will shake along a single direction.</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
/// <param name="fadeOut">If TRUE the shake will automatically fadeOut smoothly within the tween's duration, otherwise it will not</param>
|
|
||||||
/// <param name="randomnessMode">Randomness mode</param>
|
|
||||||
public static Tweener DOShakeAnchorPos(this RectTransform target, float duration, Vector2 strength, int vibrato = 10, float randomness = 90, bool snapping = false, bool fadeOut = true, ShakeRandomnessMode randomnessMode = ShakeRandomnessMode.Full)
|
|
||||||
{
|
|
||||||
return DOTween.Shake(() => target.anchoredPosition, x => target.anchoredPosition = x, duration, strength, vibrato, randomness, fadeOut, randomnessMode)
|
|
||||||
.SetTarget(target).SetSpecialStartupMode(SpecialStartupMode.SetShake).SetOptions(snapping);
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Special
|
|
||||||
|
|
||||||
/// <summary>Tweens a RectTransform's anchoredPosition to the given value, while also applying a jump effect along the Y axis.
|
|
||||||
/// Returns a Sequence instead of a Tweener.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param>
|
|
||||||
/// <param name="jumpPower">Power of the jump (the max height of the jump is represented by this plus the final Y offset)</param>
|
|
||||||
/// <param name="numJumps">Total number of jumps</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static Sequence DOJumpAnchorPos(this RectTransform target, Vector2 endValue, float jumpPower, int numJumps, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
if (numJumps < 1) numJumps = 1;
|
|
||||||
float startPosY = 0;
|
|
||||||
float offsetY = -1;
|
|
||||||
bool offsetYSet = false;
|
|
||||||
|
|
||||||
// Separate Y Tween so we can elaborate elapsedPercentage on that insted of on the Sequence
|
|
||||||
// (in case users add a delay or other elements to the Sequence)
|
|
||||||
Sequence s = DOTween.Sequence();
|
|
||||||
Tween yTween = DOTween.To(() => target.anchoredPosition, x => target.anchoredPosition = x, new Vector2(0, jumpPower), duration / (numJumps * 2))
|
|
||||||
.SetOptions(AxisConstraint.Y, snapping).SetEase(Ease.OutQuad).SetRelative()
|
|
||||||
.SetLoops(numJumps * 2, LoopType.Yoyo)
|
|
||||||
.OnStart(()=> startPosY = target.anchoredPosition.y);
|
|
||||||
s.Append(DOTween.To(() => target.anchoredPosition, x => target.anchoredPosition = x, new Vector2(endValue.x, 0), duration)
|
|
||||||
.SetOptions(AxisConstraint.X, snapping).SetEase(Ease.Linear)
|
|
||||||
).Join(yTween)
|
|
||||||
.SetTarget(target).SetEase(DOTween.defaultEaseType);
|
|
||||||
s.OnUpdate(() => {
|
|
||||||
if (!offsetYSet) {
|
|
||||||
offsetYSet = true;
|
|
||||||
offsetY = s.isRelative ? endValue.y : endValue.y - startPosY;
|
|
||||||
}
|
|
||||||
Vector2 pos = target.anchoredPosition;
|
|
||||||
pos.y += DOVirtual.EasedValue(0, offsetY, s.ElapsedDirectionalPercentage(), Ease.OutQuad);
|
|
||||||
target.anchoredPosition = pos;
|
|
||||||
});
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region ScrollRect
|
|
||||||
|
|
||||||
/// <summary>Tweens a ScrollRect's horizontal/verticalNormalizedPosition to the given value.
|
|
||||||
/// Also stores the ScrollRect as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static Tweener DONormalizedPos(this ScrollRect target, Vector2 endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
return DOTween.To(() => new Vector2(target.horizontalNormalizedPosition, target.verticalNormalizedPosition),
|
|
||||||
x => {
|
|
||||||
target.horizontalNormalizedPosition = x.x;
|
|
||||||
target.verticalNormalizedPosition = x.y;
|
|
||||||
}, endValue, duration)
|
|
||||||
.SetOptions(snapping).SetTarget(target);
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a ScrollRect's horizontalNormalizedPosition to the given value.
|
|
||||||
/// Also stores the ScrollRect as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static Tweener DOHorizontalNormalizedPos(this ScrollRect target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
return DOTween.To(() => target.horizontalNormalizedPosition, x => target.horizontalNormalizedPosition = x, endValue, duration)
|
|
||||||
.SetOptions(snapping).SetTarget(target);
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a ScrollRect's verticalNormalizedPosition to the given value.
|
|
||||||
/// Also stores the ScrollRect as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static Tweener DOVerticalNormalizedPos(this ScrollRect target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
return DOTween.To(() => target.verticalNormalizedPosition, x => target.verticalNormalizedPosition = x, endValue, duration)
|
|
||||||
.SetOptions(snapping).SetTarget(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Slider
|
|
||||||
|
|
||||||
/// <summary>Tweens a Slider's value to the given value.
|
|
||||||
/// Also stores the Slider as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<float, float, FloatOptions> DOValue(this Slider target, float endValue, float duration, bool snapping = false)
|
|
||||||
{
|
|
||||||
TweenerCore<float, float, FloatOptions> t = DOTween.To(() => target.value, x => target.value = x, endValue, duration);
|
|
||||||
t.SetOptions(snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Text
|
|
||||||
|
|
||||||
/// <summary>Tweens a Text's color to the given value.
|
|
||||||
/// Also stores the Text as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOColor(this Text target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.To(() => target.color, x => target.color = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Tweens a Text's text from one integer to another, with options for thousands separators
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="fromValue">The value to start from</param>
|
|
||||||
/// <param name="endValue">The end value to reach</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="addThousandsSeparator">If TRUE (default) also adds thousands separators</param>
|
|
||||||
/// <param name="culture">The <see cref="CultureInfo"/> to use (InvariantCulture if NULL)</param>
|
|
||||||
public static TweenerCore<int, int, NoOptions> DOCounter(
|
|
||||||
this Text target, int fromValue, int endValue, float duration, bool addThousandsSeparator = true, CultureInfo culture = null
|
|
||||||
){
|
|
||||||
int v = fromValue;
|
|
||||||
CultureInfo cInfo = !addThousandsSeparator ? null : culture ?? CultureInfo.InvariantCulture;
|
|
||||||
TweenerCore<int, int, NoOptions> t = DOTween.To(() => v, x => {
|
|
||||||
v = x;
|
|
||||||
target.text = addThousandsSeparator
|
|
||||||
? v.ToString("N0", cInfo)
|
|
||||||
: v.ToString();
|
|
||||||
}, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Text's alpha color to the given value.
|
|
||||||
/// Also stores the Text as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Color, Color, ColorOptions> DOFade(this Text target, float endValue, float duration)
|
|
||||||
{
|
|
||||||
TweenerCore<Color, Color, ColorOptions> t = DOTween.ToAlpha(() => target.color, x => target.color = x, endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Text's text to the given value.
|
|
||||||
/// Also stores the Text as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end string to tween to</param><param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="richTextEnabled">If TRUE (default), rich text will be interpreted correctly while animated,
|
|
||||||
/// otherwise all tags will be considered as normal text</param>
|
|
||||||
/// <param name="scrambleMode">The type of scramble mode to use, if any</param>
|
|
||||||
/// <param name="scrambleChars">A string containing the characters to use for scrambling.
|
|
||||||
/// Use as many characters as possible (minimum 10) because DOTween uses a fast scramble mode which gives better results with more characters.
|
|
||||||
/// Leave it to NULL (default) to use default ones</param>
|
|
||||||
public static TweenerCore<string, string, StringOptions> DOText(this Text target, string endValue, float duration, bool richTextEnabled = true, ScrambleMode scrambleMode = ScrambleMode.None, string scrambleChars = null)
|
|
||||||
{
|
|
||||||
if (endValue == null) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogWarning("You can't pass a NULL string to DOText: an empty string will be used instead to avoid errors");
|
|
||||||
endValue = "";
|
|
||||||
}
|
|
||||||
TweenerCore<string, string, StringOptions> t = DOTween.To(() => target.text, x => target.text = x, endValue, duration);
|
|
||||||
t.SetOptions(richTextEnabled, scrambleMode, scrambleChars)
|
|
||||||
.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Blendables
|
|
||||||
|
|
||||||
#region Graphic
|
|
||||||
|
|
||||||
/// <summary>Tweens a Graphic's color to the given value,
|
|
||||||
/// in a way that allows other DOBlendableColor tweens to work together on the same target,
|
|
||||||
/// instead than fight each other as multiple DOColor would do.
|
|
||||||
/// Also stores the Graphic as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The value to tween to</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static Tweener DOBlendableColor(this Graphic target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
endValue = endValue - target.color;
|
|
||||||
Color to = new Color(0, 0, 0, 0);
|
|
||||||
return DOTween.To(() => to, x => {
|
|
||||||
Color diff = x - to;
|
|
||||||
to = x;
|
|
||||||
target.color += diff;
|
|
||||||
}, endValue, duration)
|
|
||||||
.Blendable().SetTarget(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Image
|
|
||||||
|
|
||||||
/// <summary>Tweens a Image's color to the given value,
|
|
||||||
/// in a way that allows other DOBlendableColor tweens to work together on the same target,
|
|
||||||
/// instead than fight each other as multiple DOColor would do.
|
|
||||||
/// Also stores the Image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The value to tween to</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static Tweener DOBlendableColor(this Image target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
endValue = endValue - target.color;
|
|
||||||
Color to = new Color(0, 0, 0, 0);
|
|
||||||
return DOTween.To(() => to, x => {
|
|
||||||
Color diff = x - to;
|
|
||||||
to = x;
|
|
||||||
target.color += diff;
|
|
||||||
}, endValue, duration)
|
|
||||||
.Blendable().SetTarget(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Text
|
|
||||||
|
|
||||||
/// <summary>Tweens a Text's color BY the given value,
|
|
||||||
/// in a way that allows other DOBlendableColor tweens to work together on the same target,
|
|
||||||
/// instead than fight each other as multiple DOColor would do.
|
|
||||||
/// Also stores the Text as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The value to tween to</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static Tweener DOBlendableColor(this Text target, Color endValue, float duration)
|
|
||||||
{
|
|
||||||
endValue = endValue - target.color;
|
|
||||||
Color to = new Color(0, 0, 0, 0);
|
|
||||||
return DOTween.To(() => to, x => {
|
|
||||||
Color diff = x - to;
|
|
||||||
to = x;
|
|
||||||
target.color += diff;
|
|
||||||
}, endValue, duration)
|
|
||||||
.Blendable().SetTarget(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region Shapes
|
|
||||||
|
|
||||||
/// <summary>Tweens a RectTransform's anchoredPosition so that it draws a circle around the given center.
|
|
||||||
/// Also stores the RectTransform as the tween's target so it can be used for filtered operations.<para/>
|
|
||||||
/// IMPORTANT: SetFrom(value) requires a <see cref="Vector2"/> instead of a float, where the X property represents the "from degrees value"</summary>
|
|
||||||
/// <param name="center">Circle-center/pivot around which to rotate (in UI anchoredPosition coordinates)</param>
|
|
||||||
/// <param name="endValueDegrees">The end value degrees to reach (to rotate counter-clockwise pass a negative value)</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
/// <param name="relativeCenter">If TRUE the <see cref="center"/> coordinates will be considered as relative to the target's current anchoredPosition</param>
|
|
||||||
/// <param name="snapping">If TRUE the tween will smoothly snap all values to integers</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, CircleOptions> DOShapeCircle(
|
|
||||||
this RectTransform target, Vector2 center, float endValueDegrees, float duration, bool relativeCenter = false, bool snapping = false
|
|
||||||
)
|
|
||||||
{
|
|
||||||
TweenerCore<Vector2, Vector2, CircleOptions> t = DOTween.To(
|
|
||||||
CirclePlugin.Get(), () => target.anchoredPosition, x => target.anchoredPosition = x, center, duration
|
|
||||||
);
|
|
||||||
t.SetOptions(endValueDegrees, relativeCenter, snapping).SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
// █████████████████████████████████████████████████████████████████████████████████████████████████████████████████████
|
|
||||||
// ███ INTERNAL CLASSES ████████████████████████████████████████████████████████████████████████████████████████████████
|
|
||||||
// █████████████████████████████████████████████████████████████████████████████████████████████████████████████████████
|
|
||||||
|
|
||||||
public static class Utils
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Converts the anchoredPosition of the first RectTransform to the second RectTransform,
|
|
||||||
/// taking into consideration offset, anchors and pivot, and returns the new anchoredPosition
|
|
||||||
/// </summary>
|
|
||||||
public static Vector2 SwitchToRectTransform(RectTransform from, RectTransform to)
|
|
||||||
{
|
|
||||||
Vector2 localPoint;
|
|
||||||
Vector2 fromPivotDerivedOffset = new Vector2(from.rect.width * 0.5f + from.rect.xMin, from.rect.height * 0.5f + from.rect.yMin);
|
|
||||||
Vector2 screenP = RectTransformUtility.WorldToScreenPoint(null, from.position);
|
|
||||||
screenP += fromPivotDerivedOffset;
|
|
||||||
RectTransformUtility.ScreenPointToLocalPointInRectangle(to, screenP, null, out localPoint);
|
|
||||||
Vector2 pivotDerivedOffset = new Vector2(to.rect.width * 0.5f + to.rect.xMin, to.rect.height * 0.5f + to.rect.yMin);
|
|
||||||
return to.anchoredPosition + localPoint - pivotDerivedOffset;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: ae03d47bd5139624cac8ec684efb03ec
|
|
||||||
@@ -1,389 +0,0 @@
|
|||||||
// Author: Daniele Giardini - http://www.demigiant.com
|
|
||||||
// Created: 2018/07/13
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using UnityEngine;
|
|
||||||
using DG.Tweening.Core;
|
|
||||||
using DG.Tweening.Plugins.Options;
|
|
||||||
//#if UNITY_2018_1_OR_NEWER && (NET_4_6 || NET_STANDARD_2_0)
|
|
||||||
//using Task = System.Threading.Tasks.Task;
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
#pragma warning disable 1591
|
|
||||||
namespace DG.Tweening
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Shortcuts/functions that are not strictly related to specific Modules
|
|
||||||
/// but are available only on some Unity versions
|
|
||||||
/// </summary>
|
|
||||||
public static class DOTweenModuleUnityVersion
|
|
||||||
{
|
|
||||||
#region Material
|
|
||||||
|
|
||||||
/// <summary>Tweens a Material's color using the given gradient
|
|
||||||
/// (NOTE 1: only uses the colors of the gradient, not the alphas - NOTE 2: creates a Sequence, not a Tweener).
|
|
||||||
/// Also stores the image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="gradient">The gradient to use</param><param name="duration">The duration of the tween</param>
|
|
||||||
public static Sequence DOGradientColor(this Material target, Gradient gradient, float duration)
|
|
||||||
{
|
|
||||||
Sequence s = DOTween.Sequence();
|
|
||||||
GradientColorKey[] colors = gradient.colorKeys;
|
|
||||||
int len = colors.Length;
|
|
||||||
for (int i = 0; i < len; ++i) {
|
|
||||||
GradientColorKey c = colors[i];
|
|
||||||
if (i == 0 && c.time <= 0) {
|
|
||||||
target.color = c.color;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
float colorDuration = i == len - 1
|
|
||||||
? duration - s.Duration(false) // Verifies that total duration is correct
|
|
||||||
: duration * (i == 0 ? c.time : c.time - colors[i - 1].time);
|
|
||||||
s.Append(target.DOColor(c.color, colorDuration).SetEase(Ease.Linear));
|
|
||||||
}
|
|
||||||
s.SetTarget(target);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
/// <summary>Tweens a Material's named color property using the given gradient
|
|
||||||
/// (NOTE 1: only uses the colors of the gradient, not the alphas - NOTE 2: creates a Sequence, not a Tweener).
|
|
||||||
/// Also stores the image as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="gradient">The gradient to use</param>
|
|
||||||
/// <param name="property">The name of the material property to tween (like _Tint or _SpecColor)</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
public static Sequence DOGradientColor(this Material target, Gradient gradient, string property, float duration)
|
|
||||||
{
|
|
||||||
Sequence s = DOTween.Sequence();
|
|
||||||
GradientColorKey[] colors = gradient.colorKeys;
|
|
||||||
int len = colors.Length;
|
|
||||||
for (int i = 0; i < len; ++i) {
|
|
||||||
GradientColorKey c = colors[i];
|
|
||||||
if (i == 0 && c.time <= 0) {
|
|
||||||
target.SetColor(property, c.color);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
float colorDuration = i == len - 1
|
|
||||||
? duration - s.Duration(false) // Verifies that total duration is correct
|
|
||||||
: duration * (i == 0 ? c.time : c.time - colors[i - 1].time);
|
|
||||||
s.Append(target.DOColor(c.color, property, colorDuration).SetEase(Ease.Linear));
|
|
||||||
}
|
|
||||||
s.SetTarget(target);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region CustomYieldInstructions
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns a <see cref="CustomYieldInstruction"/> that waits until the tween is killed or complete.
|
|
||||||
/// It can be used inside a coroutine as a yield.
|
|
||||||
/// <para>Example usage:</para><code>yield return myTween.WaitForCompletion(true);</code>
|
|
||||||
/// </summary>
|
|
||||||
public static CustomYieldInstruction WaitForCompletion(this Tween t, bool returnCustomYieldInstruction)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return new DOTweenCYInstruction.WaitForCompletion(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns a <see cref="CustomYieldInstruction"/> that waits until the tween is killed or rewinded.
|
|
||||||
/// It can be used inside a coroutine as a yield.
|
|
||||||
/// <para>Example usage:</para><code>yield return myTween.WaitForRewind();</code>
|
|
||||||
/// </summary>
|
|
||||||
public static CustomYieldInstruction WaitForRewind(this Tween t, bool returnCustomYieldInstruction)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return new DOTweenCYInstruction.WaitForRewind(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns a <see cref="CustomYieldInstruction"/> that waits until the tween is killed.
|
|
||||||
/// It can be used inside a coroutine as a yield.
|
|
||||||
/// <para>Example usage:</para><code>yield return myTween.WaitForKill();</code>
|
|
||||||
/// </summary>
|
|
||||||
public static CustomYieldInstruction WaitForKill(this Tween t, bool returnCustomYieldInstruction)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return new DOTweenCYInstruction.WaitForKill(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns a <see cref="CustomYieldInstruction"/> that waits until the tween is killed or has gone through the given amount of loops.
|
|
||||||
/// It can be used inside a coroutine as a yield.
|
|
||||||
/// <para>Example usage:</para><code>yield return myTween.WaitForElapsedLoops(2);</code>
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="elapsedLoops">Elapsed loops to wait for</param>
|
|
||||||
public static CustomYieldInstruction WaitForElapsedLoops(this Tween t, int elapsedLoops, bool returnCustomYieldInstruction)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return new DOTweenCYInstruction.WaitForElapsedLoops(t, elapsedLoops);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns a <see cref="CustomYieldInstruction"/> that waits until the tween is killed
|
|
||||||
/// or has reached the given time position (loops included, delays excluded).
|
|
||||||
/// It can be used inside a coroutine as a yield.
|
|
||||||
/// <para>Example usage:</para><code>yield return myTween.WaitForPosition(2.5f);</code>
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="position">Position (loops included, delays excluded) to wait for</param>
|
|
||||||
public static CustomYieldInstruction WaitForPosition(this Tween t, float position, bool returnCustomYieldInstruction)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return new DOTweenCYInstruction.WaitForPosition(t, position);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns a <see cref="CustomYieldInstruction"/> that waits until the tween is killed or started
|
|
||||||
/// (meaning when the tween is set in a playing state the first time, after any eventual delay).
|
|
||||||
/// It can be used inside a coroutine as a yield.
|
|
||||||
/// <para>Example usage:</para><code>yield return myTween.WaitForStart();</code>
|
|
||||||
/// </summary>
|
|
||||||
public static CustomYieldInstruction WaitForStart(this Tween t, bool returnCustomYieldInstruction)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return new DOTweenCYInstruction.WaitForStart(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#if UNITY_2018_1_OR_NEWER
|
|
||||||
#region Unity 2018.1 or Newer
|
|
||||||
|
|
||||||
#region Material
|
|
||||||
|
|
||||||
/// <summary>Tweens a Material's named texture offset property with the given ID to the given value.
|
|
||||||
/// Also stores the material as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param>
|
|
||||||
/// <param name="propertyID">The ID of the material property to tween (also called nameID in Unity's manual)</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOOffset(this Material target, Vector2 endValue, int propertyID, float duration)
|
|
||||||
{
|
|
||||||
if (!target.HasProperty(propertyID)) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogMissingMaterialProperty(propertyID);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.GetTextureOffset(propertyID), x => target.SetTextureOffset(propertyID, x), endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Tweens a Material's named texture scale property with the given ID to the given value.
|
|
||||||
/// Also stores the material as the tween's target so it can be used for filtered operations</summary>
|
|
||||||
/// <param name="endValue">The end value to reach</param>
|
|
||||||
/// <param name="propertyID">The ID of the material property to tween (also called nameID in Unity's manual)</param>
|
|
||||||
/// <param name="duration">The duration of the tween</param>
|
|
||||||
public static TweenerCore<Vector2, Vector2, VectorOptions> DOTiling(this Material target, Vector2 endValue, int propertyID, float duration)
|
|
||||||
{
|
|
||||||
if (!target.HasProperty(propertyID)) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogMissingMaterialProperty(propertyID);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
TweenerCore<Vector2, Vector2, VectorOptions> t = DOTween.To(() => target.GetTextureScale(propertyID), x => target.SetTextureScale(propertyID, x), endValue, duration);
|
|
||||||
t.SetTarget(target);
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region .NET 4.6 or Newer
|
|
||||||
|
|
||||||
#if UNITY_2018_1_OR_NEWER && (NET_4_6 || NET_STANDARD_2_0)
|
|
||||||
|
|
||||||
#region Async Instructions
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns an async <see cref="System.Threading.Tasks.Task"/> that waits until the tween is killed or complete.
|
|
||||||
/// It can be used inside an async operation.
|
|
||||||
/// <para>Example usage:</para><code>await myTween.WaitForCompletion();</code>
|
|
||||||
/// </summary>
|
|
||||||
public static async System.Threading.Tasks.Task AsyncWaitForCompletion(this Tween t)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
while (t.active && !t.IsComplete()) await System.Threading.Tasks.Task.Yield();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns an async <see cref="System.Threading.Tasks.Task"/> that waits until the tween is killed or rewinded.
|
|
||||||
/// It can be used inside an async operation.
|
|
||||||
/// <para>Example usage:</para><code>await myTween.AsyncWaitForRewind();</code>
|
|
||||||
/// </summary>
|
|
||||||
public static async System.Threading.Tasks.Task AsyncWaitForRewind(this Tween t)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
while (t.active && (!t.playedOnce || t.position * (t.CompletedLoops() + 1) > 0)) await System.Threading.Tasks.Task.Yield();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns an async <see cref="System.Threading.Tasks.Task"/> that waits until the tween is killed.
|
|
||||||
/// It can be used inside an async operation.
|
|
||||||
/// <para>Example usage:</para><code>await myTween.AsyncWaitForKill();</code>
|
|
||||||
/// </summary>
|
|
||||||
public static async System.Threading.Tasks.Task AsyncWaitForKill(this Tween t)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
while (t.active) await System.Threading.Tasks.Task.Yield();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns an async <see cref="System.Threading.Tasks.Task"/> that waits until the tween is killed or has gone through the given amount of loops.
|
|
||||||
/// It can be used inside an async operation.
|
|
||||||
/// <para>Example usage:</para><code>await myTween.AsyncWaitForElapsedLoops();</code>
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="elapsedLoops">Elapsed loops to wait for</param>
|
|
||||||
public static async System.Threading.Tasks.Task AsyncWaitForElapsedLoops(this Tween t, int elapsedLoops)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
while (t.active && t.CompletedLoops() < elapsedLoops) await System.Threading.Tasks.Task.Yield();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns an async <see cref="System.Threading.Tasks.Task"/> that waits until the tween is killed or started
|
|
||||||
/// (meaning when the tween is set in a playing state the first time, after any eventual delay).
|
|
||||||
/// It can be used inside an async operation.
|
|
||||||
/// <para>Example usage:</para><code>await myTween.AsyncWaitForPosition();</code>
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="position">Position (loops included, delays excluded) to wait for</param>
|
|
||||||
public static async System.Threading.Tasks.Task AsyncWaitForPosition(this Tween t, float position)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
while (t.active && t.position * (t.CompletedLoops() + 1) < position) await System.Threading.Tasks.Task.Yield();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns an async <see cref="System.Threading.Tasks.Task"/> that waits until the tween is killed.
|
|
||||||
/// It can be used inside an async operation.
|
|
||||||
/// <para>Example usage:</para><code>await myTween.AsyncWaitForKill();</code>
|
|
||||||
/// </summary>
|
|
||||||
public static async System.Threading.Tasks.Task AsyncWaitForStart(this Tween t)
|
|
||||||
{
|
|
||||||
if (!t.active) {
|
|
||||||
if (Debugger.logPriority > 0) Debugger.LogInvalidTween(t);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
while (t.active && !t.playedOnce) await System.Threading.Tasks.Task.Yield();
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// █████████████████████████████████████████████████████████████████████████████████████████████████████████████████████
|
|
||||||
// ███ CLASSES █████████████████████████████████████████████████████████████████████████████████████████████████████████
|
|
||||||
// █████████████████████████████████████████████████████████████████████████████████████████████████████████████████████
|
|
||||||
|
|
||||||
public static class DOTweenCYInstruction
|
|
||||||
{
|
|
||||||
public class WaitForCompletion : CustomYieldInstruction
|
|
||||||
{
|
|
||||||
public override bool keepWaiting { get {
|
|
||||||
return t.active && !t.IsComplete();
|
|
||||||
}}
|
|
||||||
readonly Tween t;
|
|
||||||
public WaitForCompletion(Tween tween)
|
|
||||||
{
|
|
||||||
t = tween;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class WaitForRewind : CustomYieldInstruction
|
|
||||||
{
|
|
||||||
public override bool keepWaiting { get {
|
|
||||||
return t.active && (!t.playedOnce || t.position * (t.CompletedLoops() + 1) > 0);
|
|
||||||
}}
|
|
||||||
readonly Tween t;
|
|
||||||
public WaitForRewind(Tween tween)
|
|
||||||
{
|
|
||||||
t = tween;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class WaitForKill : CustomYieldInstruction
|
|
||||||
{
|
|
||||||
public override bool keepWaiting { get {
|
|
||||||
return t.active;
|
|
||||||
}}
|
|
||||||
readonly Tween t;
|
|
||||||
public WaitForKill(Tween tween)
|
|
||||||
{
|
|
||||||
t = tween;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class WaitForElapsedLoops : CustomYieldInstruction
|
|
||||||
{
|
|
||||||
public override bool keepWaiting { get {
|
|
||||||
return t.active && t.CompletedLoops() < elapsedLoops;
|
|
||||||
}}
|
|
||||||
readonly Tween t;
|
|
||||||
readonly int elapsedLoops;
|
|
||||||
public WaitForElapsedLoops(Tween tween, int elapsedLoops)
|
|
||||||
{
|
|
||||||
t = tween;
|
|
||||||
this.elapsedLoops = elapsedLoops;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class WaitForPosition : CustomYieldInstruction
|
|
||||||
{
|
|
||||||
public override bool keepWaiting { get {
|
|
||||||
return t.active && t.position * (t.CompletedLoops() + 1) < position;
|
|
||||||
}}
|
|
||||||
readonly Tween t;
|
|
||||||
readonly float position;
|
|
||||||
public WaitForPosition(Tween tween, float position)
|
|
||||||
{
|
|
||||||
t = tween;
|
|
||||||
this.position = position;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class WaitForStart : CustomYieldInstruction
|
|
||||||
{
|
|
||||||
public override bool keepWaiting { get {
|
|
||||||
return t.active && !t.playedOnce;
|
|
||||||
}}
|
|
||||||
readonly Tween t;
|
|
||||||
public WaitForStart(Tween tween)
|
|
||||||
{
|
|
||||||
t = tween;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loaded 100 of 171 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user