diff --git a/SCHIZO/Resources/AssetBundles/Assets.cs b/SCHIZO/Resources/AssetBundles/Assets.cs index 5a73c4f3..83a45842 100644 --- a/SCHIZO/Resources/AssetBundles/Assets.cs +++ b/SCHIZO/Resources/AssetBundles/Assets.cs @@ -12,7 +12,7 @@ namespace SCHIZO.Resources; public static class Assets { - private const int _rnd = 1089945419; + private const int _rnd = -1924116224; private static readonly UnityEngine.AssetBundle _a = ResourceManager.GetAssetBundle("assets"); diff --git a/SCHIZO/Resources/AssetBundles/assets b/SCHIZO/Resources/AssetBundles/assets index dc91180a..49c51eaa 100644 Binary files a/SCHIZO/Resources/AssetBundles/assets and b/SCHIZO/Resources/AssetBundles/assets differ diff --git a/SCHIZO/SCHIZO.csproj b/SCHIZO/SCHIZO.csproj index d69eaaf6..ea15c191 100644 --- a/SCHIZO/SCHIZO.csproj +++ b/SCHIZO/SCHIZO.csproj @@ -61,9 +61,4 @@ %(FileName) - - - - - diff --git a/SCHIZO/_old/Creatures/Tutel/TutelBehaviour.cs b/SCHIZO/_old/Creatures/Tutel/TutelBehaviour.cs deleted file mode 100644 index f64b49d6..00000000 --- a/SCHIZO/_old/Creatures/Tutel/TutelBehaviour.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace SCHIZO.Creatures.Tutel; - -public sealed class TutelBehaviour : CaveCrawler -{ - private enum Emotion - { - Normal, - Smug, - Glad, - Susge, - Sad, - Pog - } - - private Animator _animator; - - private Emotion _currentEmotion = Emotion.Normal; - private readonly Queue _nextEmotions = new(); - private Coroutine _emotionSwitchCoroutine; - - private void Awake() - { - _animator = GetComponentInChildren(); - } - - private void LateUpdate() - { - if (_nextEmotions.Count > 0 && _emotionSwitchCoroutine == null) - { - _emotionSwitchCoroutine = StartCoroutine(SwitchEmotions(_nextEmotions.Dequeue())); - } - } - - private void SetEmotion(Emotion emotion) - { - _nextEmotions.Enqueue(emotion); - } - - private IEnumerator SwitchEmotions(Emotion newEmotion) - { - int currentEyesLayer = _animator.GetLayerIndex($"{_currentEmotion}/eyes"); - int currentMouthLayer = _animator.GetLayerIndex($"{_currentEmotion}/mouth"); - - int nextEyesLayer = _animator.GetLayerIndex($"{newEmotion}/eyes"); - int nextMouthLayer = _animator.GetLayerIndex($"{newEmotion}/mouth"); - - const float transitionDuration = 0.25f; - for (float f = 0; f < transitionDuration; f += Time.deltaTime) - { - _animator.SetLayerWeight(currentEyesLayer, 1 - f / transitionDuration); - _animator.SetLayerWeight(currentMouthLayer, 1 - f / transitionDuration); - _animator.SetLayerWeight(nextEyesLayer, f / transitionDuration); - _animator.SetLayerWeight(nextMouthLayer, f / transitionDuration); - - yield return null; - } - - _animator.SetLayerWeight(currentEyesLayer, 0); - _animator.SetLayerWeight(currentMouthLayer, 0); - _animator.SetLayerWeight(nextEyesLayer, 1); - _animator.SetLayerWeight(nextMouthLayer, 1); - - _currentEmotion = newEmotion; - - _emotionSwitchCoroutine = null; - } -}