diff --git a/.idea/.idea.HalloweenGameJam2023/.idea/workspace.xml b/.idea/.idea.HalloweenGameJam2023/.idea/workspace.xml index e3c8c4e..9a7ab38 100644 --- a/.idea/.idea.HalloweenGameJam2023/.idea/workspace.xml +++ b/.idea/.idea.HalloweenGameJam2023/.idea/workspace.xml @@ -2,34 +2,13 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + - - diff --git a/Assets/CodeBase/Infrastructure/Factory/GameFactory/GameFactory.cs b/Assets/CodeBase/Infrastructure/Factory/GameFactory/GameFactory.cs index aee0add..2168265 100644 --- a/Assets/CodeBase/Infrastructure/Factory/GameFactory/GameFactory.cs +++ b/Assets/CodeBase/Infrastructure/Factory/GameFactory/GameFactory.cs @@ -10,6 +10,7 @@ using CodeBase.Services.GameLoopService; using CodeBase.Services.GameScoreService; using CodeBase.Services.Input; +using CodeBase.Services.InteractiveObject; using CodeBase.Services.PersistentProgress; using CodeBase.Services.StaticData; using CodeBase.Services.StaticData.Interactive; @@ -30,10 +31,11 @@ public class GameFactory : IGameFactory private readonly IGameScoreService _gameScoreService; private readonly IDisplayInputService _displayInputService; private readonly IGameTimer _gameTimer; + private readonly IInteractive _interactive; private GameObject _hero; public GameFactory(IAssetProvider assets, IStaticDataService staticData, IInputService inputService, - IGameScoreService gameScoreService, IDisplayInputService displayInputService, IGameTimer gameTimer) + IGameScoreService gameScoreService, IDisplayInputService displayInputService, IGameTimer gameTimer, IInteractive interactive) { _assets = assets; _staticData = staticData; @@ -41,6 +43,7 @@ public GameFactory(IAssetProvider assets, IStaticDataService staticData, IInputS _gameScoreService = gameScoreService; _displayInputService = displayInputService; _gameTimer = gameTimer; + _interactive = interactive; } public void Cleanup() @@ -102,7 +105,7 @@ public async Task CreateInteractiveObject(InteractiveID id, Transfor GameObject prefab = await _assets.Load(interactiveStaticData.PrefabReference); GameObject interactive = Object.Instantiate(prefab, parent.position, Quaternion.identity, parent); interactive.GetComponent() - .Constructor(_inputService, _gameScoreService, _displayInputService); + .Constructor(_inputService, _gameScoreService, _displayInputService, _interactive); return interactive; } diff --git a/Assets/CodeBase/Infrastructure/States/BootstrapState.cs b/Assets/CodeBase/Infrastructure/States/BootstrapState.cs index 2e32fef..e072122 100644 --- a/Assets/CodeBase/Infrastructure/States/BootstrapState.cs +++ b/Assets/CodeBase/Infrastructure/States/BootstrapState.cs @@ -12,6 +12,7 @@ using CodeBase.UI.Services.Factory; using CodeBase.UI.Services.Windows; using CodeBase.Services.Input; +using CodeBase.Services.InteractiveObject; using UnityEngine; namespace CodeBase.Infrastructure.States @@ -44,6 +45,8 @@ private void RegisterServices() { _services.RegisterSingle( implementation: InputService()); + _services.RegisterSingle( + implementation: new Interactive()); _services.RegisterSingle( implementation: new DisplayInputService()); _services.RegisterSingle( @@ -66,7 +69,8 @@ private void RegisterServices() inputService: _services.Single(), gameScoreService: _services.Single(), displayInputService: _services.Single(), - gameTimer: _services.Single())); + gameTimer: _services.Single(), + interactive: _services.Single())); _services.RegisterSingle(new AudioPlayer( gameFactory: _services.Single(), staticData: _services.Single(), @@ -81,7 +85,8 @@ private void RegisterServices() inputService: _services.Single(), displayInputService: _services.Single(), gameTimer: _services.Single(), - audioPlayer: _services.Single())); + audioPlayer: _services.Single(), + interactive: _services.Single())); _services.RegisterSingle(new WindowService( uiFactory: _services.Single())); _services.RegisterSingle(new SaveLoadService( diff --git a/Assets/CodeBase/InteractiveObjects/Base/BaseInteractiveObject.cs b/Assets/CodeBase/InteractiveObjects/Base/BaseInteractiveObject.cs index b8686ca..f56e392 100644 --- a/Assets/CodeBase/InteractiveObjects/Base/BaseInteractiveObject.cs +++ b/Assets/CodeBase/InteractiveObjects/Base/BaseInteractiveObject.cs @@ -4,6 +4,8 @@ using CodeBase.InteractiveObjects.Logic; using CodeBase.Services.GameScoreService; using CodeBase.Services.Input; +using CodeBase.Services.InteractiveObject; +using UnityEditor; using UnityEngine; namespace CodeBase.InteractiveObjects.Base @@ -16,6 +18,7 @@ public abstract class BaseInteractiveObject : MonoBehaviour [SerializeField] private Sprite _destroySprite; [SerializeField] private int _costHappyScore; [SerializeField] private float _waitToDestroy = 0.5f; + private IInteractive _interactive; private IGameScoreService _gameScoreService; private bool _isDestroy; [HideInInspector] public HeroMove HeroMove; @@ -27,10 +30,11 @@ private void OnDestroy() => OnDestroyAction(); public virtual void Constructor(IInputService inputService, IGameScoreService gameScoreService, - IDisplayInputService displayInputService) + IDisplayInputService displayInputService, IInteractive interactive) { _interactiveDetector.Constructor(inputService, displayInputService); _gameScoreService = gameScoreService; + _interactive = interactive; } protected virtual void OnAwake() => @@ -43,9 +47,6 @@ protected virtual void ChangeToDestroySprite() { if (_isDestroy) return; - _gameScoreService.MinusHappyScore(_costHappyScore); - _spriteRenderer.sprite = _destroySprite; - _isDestroy = true; StartCoroutine(StopMoveHero()); } @@ -54,7 +55,16 @@ private IEnumerator StopMoveHero() if (HeroMove == null) yield break; HeroMove.StopMove(); - yield return new WaitForSeconds(_waitToDestroy); + float waitCount = 0; + while (waitCount < _waitToDestroy) + { + waitCount++; + _interactive.EventActionBraking(waitCount < _waitToDestroy, waitCount, _waitToDestroy); + yield return null; + } + _gameScoreService.MinusHappyScore(_costHappyScore); + _spriteRenderer.sprite = _destroySprite; + _isDestroy = true; HeroMove.enabled = true; } } diff --git a/Assets/CodeBase/NPC/NPCMove.cs b/Assets/CodeBase/NPC/NPCMove.cs index 57c591e..bc9666a 100644 --- a/Assets/CodeBase/NPC/NPCMove.cs +++ b/Assets/CodeBase/NPC/NPCMove.cs @@ -96,13 +96,18 @@ private void SpeedCorrector(bool agro) _currentSpeed = _defaultMovementSpeed; } } - private void Flip(Vector3 movementVector) + private void Flip(Vector3 targetPoint) { - if (movementVector.x < transform.position.x) - _spriteFlip.localScale = _spriteFlip.localScale.WithToX(Mathf.Abs(_spriteFlip.localScale.x)); - else + Vector3 toTarget = (targetPoint - transform.position).normalized; + Vector3 forward = transform.right; + float dotProduct = Vector3.Dot(forward, toTarget); + + if (dotProduct < 0) _spriteFlip.localScale = _spriteFlip.localScale.WithToX(-Mathf.Abs(_spriteFlip.localScale.x)); + else + _spriteFlip.localScale = _spriteFlip.localScale.WithToX(Mathf.Abs(_spriteFlip.localScale.x)); } + public void ResetVelocity() { _rigidbody2D.velocity = Vector2.zero; diff --git a/Assets/CodeBase/NPC/NPCPoliceKill.cs b/Assets/CodeBase/NPC/NPCPoliceKill.cs index 9ace0d2..415881d 100644 --- a/Assets/CodeBase/NPC/NPCPoliceKill.cs +++ b/Assets/CodeBase/NPC/NPCPoliceKill.cs @@ -11,6 +11,7 @@ public class NPCPoliceKill : MonoBehaviour { [SerializeField] private NPCAgroZone _npcAgroZone; [SerializeField] private NPCScore _npcScore; + [SerializeField] private NPCAnimator _npcAnimator; [SerializeField] private int _touch = 3; [SerializeField] private NPCMove _npcMove; private int _currentTouch; @@ -39,6 +40,7 @@ private void Update() _isTouch = false; _npcMove.ResetVelocity(); _npcMove.enabled = false; + _npcAnimator.SetIdle(); Sequence seq = DOTween.Sequence(); seq.Append(transform.DOScale(_defaultScale * 1.1f, 0.2f)); seq.Append(transform.DOScale(_defaultScale, 0.2f)); diff --git a/Assets/CodeBase/Services/InteractiveObject.meta b/Assets/CodeBase/Services/InteractiveObject.meta new file mode 100644 index 0000000..13e6a10 --- /dev/null +++ b/Assets/CodeBase/Services/InteractiveObject.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 33531b6dd9c747e8b6d85261a8af2739 +timeCreated: 1698609392 \ No newline at end of file diff --git a/Assets/CodeBase/Services/InteractiveObject/IInteractive.cs b/Assets/CodeBase/Services/InteractiveObject/IInteractive.cs new file mode 100644 index 0000000..fcc07cb --- /dev/null +++ b/Assets/CodeBase/Services/InteractiveObject/IInteractive.cs @@ -0,0 +1,10 @@ +using System; + +namespace CodeBase.Services.InteractiveObject +{ + public interface IInteractive : IService + { + public event Action OnBraking; + void EventActionBraking(bool active, float start, float end); + } +} \ No newline at end of file diff --git a/Assets/CodeBase/Services/InteractiveObject/IInteractive.cs.meta b/Assets/CodeBase/Services/InteractiveObject/IInteractive.cs.meta new file mode 100644 index 0000000..c70e07c --- /dev/null +++ b/Assets/CodeBase/Services/InteractiveObject/IInteractive.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6fcd4b4b32a143029b57e9b40f739a71 +timeCreated: 1698609413 \ No newline at end of file diff --git a/Assets/CodeBase/Services/InteractiveObject/Interactive.cs b/Assets/CodeBase/Services/InteractiveObject/Interactive.cs new file mode 100644 index 0000000..6247516 --- /dev/null +++ b/Assets/CodeBase/Services/InteractiveObject/Interactive.cs @@ -0,0 +1,11 @@ +using System; + +namespace CodeBase.Services.InteractiveObject +{ + public class Interactive : IInteractive + { + public void EventActionBraking(bool active, float start, float end) => + OnBraking?.Invoke(active, start, end); + public event Action OnBraking; + } +} \ No newline at end of file diff --git a/Assets/CodeBase/Services/InteractiveObject/Interactive.cs.meta b/Assets/CodeBase/Services/InteractiveObject/Interactive.cs.meta new file mode 100644 index 0000000..b8174b9 --- /dev/null +++ b/Assets/CodeBase/Services/InteractiveObject/Interactive.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a89722c67a4d4b30a8880b9bd957407f +timeCreated: 1698609690 \ No newline at end of file diff --git a/Assets/CodeBase/UI/Elements/ActorGameHud.cs b/Assets/CodeBase/UI/Elements/ActorGameHud.cs index 4de06d9..8cf6541 100644 --- a/Assets/CodeBase/UI/Elements/ActorGameHud.cs +++ b/Assets/CodeBase/UI/Elements/ActorGameHud.cs @@ -3,7 +3,9 @@ using CodeBase.Services.GameLoopService; using CodeBase.Services.GameScoreService; using CodeBase.Services.Input; +using CodeBase.Services.InteractiveObject; using CodeBase.Services.PersistentProgress; +using CodeBase.Services.StaticData; using DG.Tweening; using TMPro; using UnityEngine; @@ -14,6 +16,8 @@ namespace CodeBase.UI.Elements public class ActorGameHud : MonoBehaviour { [SerializeField] private Slider _slider; + [SerializeField] private GameObject _brakingObj; + [SerializeField] private Slider _sliderBraking; [SerializeField] private GameObject _pressF; [SerializeField] private TextMeshProUGUI _pressEText; [SerializeField][Multiline(2)] private string _activeEText; @@ -24,6 +28,7 @@ public class ActorGameHud : MonoBehaviour private IGameScoreService _gameScoreService; private IDisplayInputService _displayInputService; private IGameTimer _gameTimer; + private IInteractive _interactive; private void OnDestroy() { @@ -31,23 +36,33 @@ private void OnDestroy() _displayInputService.PressF -= DisplayF; _displayInputService.PressE -= DisplayE; _gameTimer.OnUpdateTime -= UpdateTimeText; + _interactive.OnBraking -= UpdateSliderBraking; } public void Construct(IGameStateMachine stateMachine, IPersistentProgressService progressService, - IGameScoreService gameScoreService, IDisplayInputService displayInputService, IGameTimer gameTimer) + IGameScoreService gameScoreService, IDisplayInputService displayInputService, IGameTimer gameTimer, + IInteractive interactive) { _stateMachine = stateMachine; _progressService = progressService; _gameScoreService = gameScoreService; _displayInputService = displayInputService; _gameTimer = gameTimer; + _interactive = interactive; _gameScoreService.ChangeHappyScore += UpdateDisplayScore; _displayInputService.PressE += DisplayE; _displayInputService.PressF += DisplayF; _gameTimer.OnUpdateTime += UpdateTimeText; + _interactive.OnBraking += UpdateSliderBraking; _slider.value = _gameScoreService.HappyScore; } + private void UpdateSliderBraking(bool active, float start, float end) + { + _brakingObj.SetActive(active); + _sliderBraking.value = start / end; + } + private void UpdateTimeText(float time) => _timeText.text = time.ToString("0"); diff --git a/Assets/CodeBase/UI/Services/Factory/UIFactory.cs b/Assets/CodeBase/UI/Services/Factory/UIFactory.cs index b0f102c..15d8cfa 100644 --- a/Assets/CodeBase/UI/Services/Factory/UIFactory.cs +++ b/Assets/CodeBase/UI/Services/Factory/UIFactory.cs @@ -6,6 +6,7 @@ using CodeBase.Services.GameLoopService; using CodeBase.Services.GameScoreService; using CodeBase.Services.Input; +using CodeBase.Services.InteractiveObject; using CodeBase.Services.PersistentProgress; using CodeBase.Services.StaticData; using CodeBase.UI.Elements; @@ -33,12 +34,13 @@ public class UIFactory : IUIFactory private readonly IDisplayInputService _displayInputService; private readonly IGameTimer _gameTimer; private readonly IAudioPlayer _audioPlayer; + private readonly IInteractive _interactive; private Transform _uiRoot; public UIFactory(IGameStateMachine stateMachine, IAssetProvider assets, IStaticDataService staticData, IPersistentProgressService progressService, IGameScoreService gameScoreService, IGameFactory gameFactory, IInputService inputService, IDisplayInputService displayInputService, IGameTimer gameTimer, - IAudioPlayer audioPlayer) + IAudioPlayer audioPlayer, IInteractive interactive) { _stateMachine = stateMachine; _assets = assets; @@ -50,6 +52,7 @@ public UIFactory(IGameStateMachine stateMachine, IAssetProvider assets, IStaticD _displayInputService = displayInputService; _gameTimer = gameTimer; _audioPlayer = audioPlayer; + _interactive = interactive; } public async Task CreateUIRoot() @@ -63,6 +66,7 @@ public async Task CreateMenuUI() GameObject menuUi = await _assets.Instantiate(MenuUIPath); menuUi.GetComponent().Construct(_stateMachine, _progressService, _audioPlayer); } + public async Task CreateGuideUI() { GameObject guideUI = await _assets.Instantiate(MenuGuideUI); @@ -86,7 +90,8 @@ public async Task CreateGameHud() { GameObject hud = await _assets.Instantiate(GameHud); hud.GetComponent() - .Construct(_stateMachine, _progressService, _gameScoreService, _displayInputService, _gameTimer); + .Construct(_stateMachine, _progressService, + _gameScoreService, _displayInputService, _gameTimer, _interactive); } public async Task CreateAbilityUI() diff --git a/Assets/Resources/Animations/Cauldron.anim b/Assets/Resources/Animations/Cauldron.anim index 5ba8aec..687656c 100644 --- a/Assets/Resources/Animations/Cauldron.anim +++ b/Assets/Resources/Animations/Cauldron.anim @@ -122,7 +122,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.091, y: 0.075, z: 0} + value: {x: -0.091, y: 0.075, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -131,13 +131,22 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 0.063, y: 0.029, z: 0} + value: {x: 0.063, y: 0.029, z: -1} inSlope: {x: 0, y: -0.112500004, z: 0} outSlope: {x: 0, y: -0.112500004, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: -0.013999991, y: 0.009812501, z: -1} + inSlope: {x: -0.693, y: -0.102375, z: 0} + outSlope: {x: -0.693, y: -0.102375, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 value: {x: -0.091, y: 0, z: 0} @@ -149,7 +158,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: -0.091, y: 0.075, z: 0} + value: {x: -0.091, y: 0.075, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -165,7 +174,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.048, y: 0.009, z: 0} + value: {x: -0.048, y: 0.009, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -174,16 +183,25 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 0.081, y: 0.067, z: 0} + value: {x: 0.081, y: 0.067, z: -1} inSlope: {x: 0, y: 0.13049999, z: 0} outSlope: {x: 0, y: 0.13049999, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.65 + value: {x: -0.10265876, y: 0.09589306, z: -1} + inSlope: {x: -0.15817545, y: 0.012723796, z: 0} + outSlope: {x: -0.15817545, y: 0.012723796, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: -0.104, y: 0.096, z: 0} + value: {x: -0.104, y: 0.096, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -192,7 +210,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: -0.048, y: 0.009, z: 0} + value: {x: -0.048, y: 0.009, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1263,7 +1281,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1272,7 +1290,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 0 + value: -1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1290,7 +1317,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1497,7 +1524,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1506,7 +1533,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 0 + value: -1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.65 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1515,7 +1551,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1524,7 +1560,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Animations/NPC.controller b/Assets/Resources/Animations/NPC.controller index ca0b55a..2281749 100644 --- a/Assets/Resources/Animations/NPC.controller +++ b/Assets/Resources/Animations/NPC.controller @@ -388,7 +388,7 @@ AnimatorStateMachine: m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 310, y: 190, z: 0} + m_AnyStatePosition: {x: 380, y: 180, z: 0} m_EntryPosition: {x: 10, y: 130, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} diff --git a/Assets/Resources/Animations/NPCscare.anim b/Assets/Resources/Animations/NPCscare.anim index ab74693..6c9ab84 100644 --- a/Assets/Resources/Animations/NPCscare.anim +++ b/Assets/Resources/Animations/NPCscare.anim @@ -122,7 +122,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.1, y: 0.05, z: 0} + value: {x: 0.1, y: 0.05, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -131,7 +131,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0.1, y: 0.05, z: 0} + value: {x: 0.1, y: 0.05, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -355,7 +355,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.1, y: 0.05, z: 0} + value: {x: 0.1, y: 0.05, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -364,7 +364,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0.1, y: 0.05, z: 0} + value: {x: 0.1, y: 0.05, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -721,7 +721,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -730,7 +730,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1729,7 +1729,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1738,7 +1738,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Animations/NPCwalk.anim b/Assets/Resources/Animations/NPCwalk.anim index f113f55..1e0567e 100644 --- a/Assets/Resources/Animations/NPCwalk.anim +++ b/Assets/Resources/Animations/NPCwalk.anim @@ -88,7 +88,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.081, y: -0.0006, z: 0} + value: {x: 0.081, y: -0.0006, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0.081, y: -0.0006, z: 0} + value: {x: 0.081, y: -0.0006, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -301,7 +301,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.078, y: 0, z: 0} + value: {x: 0.078, y: 0, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -325,6 +325,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 1, y: 1, z: -1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -402,8 +411,8 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 3190323848 - attribute: 1 + path: 1122643453 + attribute: 3 script: {fileID: 0} typeID: 4 customType: 0 @@ -411,7 +420,7 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 1122643453 + path: 3190323848 attribute: 1 script: {fileID: 0} typeID: 4 @@ -421,7 +430,7 @@ AnimationClip: isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1122643453 - attribute: 3 + attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 @@ -516,7 +525,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -525,7 +534,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1466,8 +1475,17 @@ AnimationClip: outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1524,7 +1542,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Animations/Whip.anim b/Assets/Resources/Animations/Whip.anim index 8bbc3a5..801a45a 100644 --- a/Assets/Resources/Animations/Whip.anim +++ b/Assets/Resources/Animations/Whip.anim @@ -120,7 +120,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.08, y: 0.03, z: 0} + value: {x: -0.08, y: 0.03, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -129,7 +129,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.083333336 - value: {x: 0.123, y: 0.037, z: 0} + value: {x: 0.123, y: 0.037, z: -1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.21666667 + value: {x: 0.123, y: 0.037, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -138,7 +147,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.25 - value: {x: 0.123, y: 0.037, z: 0} + value: {x: 0.123, y: 0.037, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -156,7 +165,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.41666666 - value: {x: -0.122, y: 0.035185184, z: 0} + value: {x: -0.122, y: 0.035185184, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -165,7 +174,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: -0.08, y: 0.03, z: 0} + value: {x: -0.08, y: 0.03, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -181,7 +190,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.08, y: 0.03, z: 0} + value: {x: 0.08, y: 0.03, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -190,7 +199,25 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.083333336 - value: {x: 0.12, y: 0.03, z: 0} + value: {x: 0.12, y: 0.03, z: -1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0.12, y: 0.03, z: -1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.21666667 + value: {x: 0.12, y: 0.03, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -208,7 +235,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: -0.122, y: 0.03, z: 0} + value: {x: -0.122, y: 0.03, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -217,7 +244,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.41666666 - value: {x: -0.122, y: 0.03, z: 0} + value: {x: -0.122, y: 0.03, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -226,7 +253,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 0.08, y: 0.03, z: 0} + value: {x: 0.08, y: 0.03, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1117,7 +1144,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1126,7 +1153,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: 0 + value: -1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1135,7 +1171,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1153,7 +1189,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.41666666 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1162,7 +1198,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1405,7 +1441,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1414,7 +1450,25 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: 0 + value: -1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1432,7 +1486,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1441,7 +1495,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.41666666 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1450,7 +1504,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Animations/idle.anim b/Assets/Resources/Animations/idle.anim index 36d8c1f..433d26f 100644 --- a/Assets/Resources/Animations/idle.anim +++ b/Assets/Resources/Animations/idle.anim @@ -190,7 +190,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.077, y: -0.0006, z: 0} + value: {x: -0.077, y: -0.0006, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -199,7 +199,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: -0.077, y: -0.0006, z: 0} + value: {x: -0.077, y: -0.0006, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -215,7 +215,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.078, y: 0, z: 0} + value: {x: 0.078, y: 0, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -224,7 +224,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0.078, y: 0, z: 0} + value: {x: 0.078, y: 0, z: -1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -1015,7 +1015,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1024,7 +1024,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1105,7 +1105,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1114,7 +1114,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Audio/F2.wav b/Assets/Resources/Audio/F2.wav new file mode 100644 index 0000000..0502460 Binary files /dev/null and b/Assets/Resources/Audio/F2.wav differ diff --git a/Assets/Resources/Audio/F2.wav.meta b/Assets/Resources/Audio/F2.wav.meta new file mode 100644 index 0000000..482007f --- /dev/null +++ b/Assets/Resources/Audio/F2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: fa5b9c7c26c06024f84984606e33b495 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Hud/EndCurtain.prefab b/Assets/Resources/Hud/EndCurtain.prefab index 47e0030..453a839 100644 --- a/Assets/Resources/Hud/EndCurtain.prefab +++ b/Assets/Resources/Hud/EndCurtain.prefab @@ -166,7 +166,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8689470995543033060} - - {fileID: 4421779991854439771} m_Father: {fileID: 8493594776518678520} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -224,140 +223,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!1 &4052273154138830928 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4421779991854439771} - - component: {fileID: 5012037581662436409} - - component: {fileID: 8098869771009818487} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4421779991854439771 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4052273154138830928} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3.1744, y: 3.1744, z: 3.1744} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8202506778357423673} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1057, y: -448} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5012037581662436409 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4052273154138830928} - m_CullTransparentMesh: 1 ---- !u!114 &8098869771009818487 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4052273154138830928} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: ... - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4686c11c1c2fd4c47a96396dab035552, type: 2} - m_sharedMaterial: {fileID: -2741469803356114790, guid: 4686c11c1c2fd4c47a96396dab035552, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7396065986361562650 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/StaticData/Levels/Main.asset b/Assets/Resources/StaticData/Levels/Main.asset index 7a934aa..a7365ec 100644 --- a/Assets/Resources/StaticData/Levels/Main.asset +++ b/Assets/Resources/StaticData/Levels/Main.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Main m_EditorClassIdentifier: LevelKey: Main - SceneClip: {fileID: 8300000, guid: aa75e76510aba1c4c86c28c2540ca5a6, type: 3} + SceneClip: {fileID: 8300000, guid: fa5b9c7c26c06024f84984606e33b495, type: 3} HeroSpawnPoint: {x: 1.6, y: -2.2, z: 0} InteractiveSpawnMarker: - Id: Main_7b70fc1f-c1ee-4391-b784-1c066b5c8f19 diff --git a/Assets/Resources_moved/Ability/Cauldron.prefab b/Assets/Resources_moved/Ability/Cauldron.prefab index ddfaeb7..934214a 100644 --- a/Assets/Resources_moved/Ability/Cauldron.prefab +++ b/Assets/Resources_moved/Ability/Cauldron.prefab @@ -278,7 +278,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 272860bf21774ac46a11163c9622d8c2, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -376,7 +376,6 @@ MonoBehaviour: m_EditorClassIdentifier: _abilityID: 0 timeToComplete: 2 - cooldown: 1.2 countToDestroy: 1 removeHappyBySoul: 5 npcWithSouls: [] diff --git a/Assets/Resources_moved/Ability/Kites.prefab b/Assets/Resources_moved/Ability/Kites.prefab index 882d6fb..4d9ff4a 100644 --- a/Assets/Resources_moved/Ability/Kites.prefab +++ b/Assets/Resources_moved/Ability/Kites.prefab @@ -662,7 +662,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 550985851, guid: 2e4bdaefaeda3b7448c9491e7478a03e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Resources_moved/Ability/Stitck.prefab b/Assets/Resources_moved/Ability/Stitck.prefab index a7b2ad8..b0c4903 100644 --- a/Assets/Resources_moved/Ability/Stitck.prefab +++ b/Assets/Resources_moved/Ability/Stitck.prefab @@ -448,7 +448,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 550985851, guid: 2e4bdaefaeda3b7448c9491e7478a03e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Resources_moved/Hero/Hero.prefab b/Assets/Resources_moved/Hero/Hero.prefab index 9f5cad6..3ffc0d0 100644 --- a/Assets/Resources_moved/Hero/Hero.prefab +++ b/Assets/Resources_moved/Hero/Hero.prefab @@ -72,7 +72,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: 81db09c8a4eccaf4dbc3074bf5fa8dbb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -156,7 +156,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: 23bfc0ad4b5ed5647b998cb5f41a8259, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -248,7 +248,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: 5cd1149241c7e924789d043a147230a3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -439,7 +439,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: 81db09c8a4eccaf4dbc3074bf5fa8dbb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -523,7 +523,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: 23bfc0ad4b5ed5647b998cb5f41a8259, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Resources_moved/Hud/GameHud.prefab b/Assets/Resources_moved/Hud/GameHud.prefab index a85313d..7269626 100644 --- a/Assets/Resources_moved/Hud/GameHud.prefab +++ b/Assets/Resources_moved/Hud/GameHud.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4811113365899656233 CanvasRenderer: @@ -563,7 +563,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -613,8 +613,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_AnchoredPosition: {x: -0.000030517578, y: 0} + m_SizeDelta: {x: -0.000030518, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3720195466397927948 GameObject: @@ -1838,7 +1838,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -1858,7 +1858,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_SelectedTrigger: Selected m_DisabledTrigger: Disabled - m_Interactable: 1 + m_Interactable: 0 m_TargetGraphic: {fileID: 0} m_FillRect: {fileID: 619704353632393935} m_HandleRect: {fileID: 0} @@ -2061,6 +2061,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _slider: {fileID: 8159907626530169001} + _brakingObj: {fileID: 5067155537912399481} + _sliderBraking: {fileID: 7860961857937443470} _pressF: {fileID: 6509943545282944209} _pressEText: {fileID: 3817980906239987562} _activeEText: "\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u0415 \u0447\u0442\u043E\u0431\u044B diff --git a/Assets/Resources_moved/Interactive/Bench.prefab b/Assets/Resources_moved/Interactive/Bench.prefab index 9f6c13d..af749e7 100644 --- a/Assets/Resources_moved/Interactive/Bench.prefab +++ b/Assets/Resources_moved/Interactive/Bench.prefab @@ -104,7 +104,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 901668210589667068} _destroySprite: {fileID: 856648436, guid: 7e5414a44598f9843ad1c92cffa6c858, type: 3} _costHappyScore: 7 - _waitToDestroy: 1.4 + _waitToDestroy: 140 HeroMove: {fileID: 0} --- !u!114 &-2586321375830892969 MonoBehaviour: diff --git a/Assets/Resources_moved/Interactive/Camp.prefab b/Assets/Resources_moved/Interactive/Camp.prefab index 3cf6ba0..4d5a6f8 100644 --- a/Assets/Resources_moved/Interactive/Camp.prefab +++ b/Assets/Resources_moved/Interactive/Camp.prefab @@ -104,7 +104,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 901668210589667068} _destroySprite: {fileID: 1424845526, guid: 7e5414a44598f9843ad1c92cffa6c858, type: 3} _costHappyScore: 8 - _waitToDestroy: 1.7 + _waitToDestroy: 170 HeroMove: {fileID: 0} --- !u!114 &-2586321375830892969 MonoBehaviour: diff --git a/Assets/Resources_moved/Interactive/Lamp.prefab b/Assets/Resources_moved/Interactive/Lamp.prefab index dbd24ba..2287ac6 100644 --- a/Assets/Resources_moved/Interactive/Lamp.prefab +++ b/Assets/Resources_moved/Interactive/Lamp.prefab @@ -104,7 +104,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 901668210589667068} _destroySprite: {fileID: -671994777, guid: 7e5414a44598f9843ad1c92cffa6c858, type: 3} _costHappyScore: 9 - _waitToDestroy: 1.8 + _waitToDestroy: 180 HeroMove: {fileID: 0} --- !u!114 &-2586321375830892969 MonoBehaviour: diff --git a/Assets/Resources_moved/Interactive/SandCastel.prefab b/Assets/Resources_moved/Interactive/SandCastel.prefab index 05d57d1..431a233 100644 --- a/Assets/Resources_moved/Interactive/SandCastel.prefab +++ b/Assets/Resources_moved/Interactive/SandCastel.prefab @@ -104,7 +104,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 901668210589667068} _destroySprite: {fileID: -331057323, guid: 7e5414a44598f9843ad1c92cffa6c858, type: 3} _costHappyScore: 4 - _waitToDestroy: 0.4 + _waitToDestroy: 40 HeroMove: {fileID: 0} --- !u!114 &-2586321375830892969 MonoBehaviour: diff --git a/Assets/Resources_moved/Interactive/SunLounger.prefab b/Assets/Resources_moved/Interactive/SunLounger.prefab index 2386863..5aa284f 100644 --- a/Assets/Resources_moved/Interactive/SunLounger.prefab +++ b/Assets/Resources_moved/Interactive/SunLounger.prefab @@ -104,7 +104,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 901668210589667068} _destroySprite: {fileID: 2135414597, guid: 7e5414a44598f9843ad1c92cffa6c858, type: 3} _costHappyScore: 6 - _waitToDestroy: 0.7 + _waitToDestroy: 70 HeroMove: {fileID: 0} --- !u!114 &-2586321375830892969 MonoBehaviour: diff --git a/Assets/Resources_moved/Interactive/SunUmbrella.prefab b/Assets/Resources_moved/Interactive/SunUmbrella.prefab index 7fd6cf5..f1e41ce 100644 --- a/Assets/Resources_moved/Interactive/SunUmbrella.prefab +++ b/Assets/Resources_moved/Interactive/SunUmbrella.prefab @@ -104,7 +104,7 @@ MonoBehaviour: _spriteRenderer: {fileID: 901668210589667068} _destroySprite: {fileID: -1892874690, guid: 7e5414a44598f9843ad1c92cffa6c858, type: 3} _costHappyScore: 4 - _waitToDestroy: 0.4 + _waitToDestroy: 40 HeroMove: {fileID: 0} --- !u!114 &-2586321375830892969 MonoBehaviour: diff --git a/Assets/Resources_moved/NPC/DefaultNPC.prefab b/Assets/Resources_moved/NPC/DefaultNPC.prefab index 7f49992..bac80c6 100644 --- a/Assets/Resources_moved/NPC/DefaultNPC.prefab +++ b/Assets/Resources_moved/NPC/DefaultNPC.prefab @@ -196,7 +196,7 @@ Transform: m_GameObject: {fileID: 1816286976259517183} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.08, y: 0, z: 0} + m_LocalPosition: {x: 0.08, y: 0, z: -1.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -242,7 +242,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 8198b4084cd606e40a2474f861d93eec, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -410,7 +410,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 6464592715c587f41984b7c314e5d849, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -494,7 +494,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 6464592715c587f41984b7c314e5d849, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -581,7 +581,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 6a9800ae0590ff74d9a36d56a05d5b5f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -907,7 +907,7 @@ Transform: m_GameObject: {fileID: 5290085188329464954} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.322, y: -0.1564, z: 0} + m_LocalPosition: {x: -0.322, y: -0.1564, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -954,7 +954,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 1fc56a7a7853fd9478418004ecf26a1c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1062,7 +1062,7 @@ Transform: m_GameObject: {fileID: 8725073040622620768} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.0806, y: -0.0006, z: 0} + m_LocalPosition: {x: -0.0806, y: -0.0006, z: -1.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1108,7 +1108,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 8198b4084cd606e40a2474f861d93eec, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1146,7 +1146,7 @@ Transform: m_GameObject: {fileID: 9128189900559899705} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.3207, y: -0.1564, z: 0} + m_LocalPosition: {x: 0.3207, y: -0.1564, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1193,7 +1193,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 1fc56a7a7853fd9478418004ecf26a1c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Resources_moved/NPC/PoliceNPC.prefab b/Assets/Resources_moved/NPC/PoliceNPC.prefab index 5cc9ba1..2d091f0 100644 --- a/Assets/Resources_moved/NPC/PoliceNPC.prefab +++ b/Assets/Resources_moved/NPC/PoliceNPC.prefab @@ -160,6 +160,7 @@ MonoBehaviour: _spriteFlip: {fileID: 2761199543253937149} _npcScore: {fileID: 1170995646991623000} _timeToAddHappyScore: 0.3 + _npcAgroZone: {fileID: 5028711785293731832} --- !u!114 &8046188771746184523 MonoBehaviour: m_ObjectHideFlags: 0 @@ -174,6 +175,7 @@ MonoBehaviour: m_EditorClassIdentifier: _npcAgroZone: {fileID: 5028711785293731832} _npcScore: {fileID: 1170995646991623000} + _npcAnimator: {fileID: 4129790399767469062} _touch: 3 _npcMove: {fileID: 1160101550819042736} --- !u!114 &1170995646991623000