Skip to content

Commit

Permalink
Apply formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Kiuh committed May 23, 2024
1 parent 067dbe2 commit aa3678f
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 58 deletions.
25 changes: 0 additions & 25 deletions Fantasy-Quest/Assets/AddressableAssetsData/link.xml

This file was deleted.

7 changes: 0 additions & 7 deletions Fantasy-Quest/Assets/AddressableAssetsData/link.xml.meta

This file was deleted.

10 changes: 8 additions & 2 deletions Fantasy-Quest/Assets/Scripts/Dialogue/DialogueSpeaker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ public class DialogueSpeaker : MonoBehaviour, ISpeakable

public void UpdateFFirstTrySpeechReplica(int index, string text)
{
if(index < 0 || index >= FirstTrySpeech.Count)
if (index < 0 || index >= FirstTrySpeech.Count)
{
return;
}

FirstTrySpeech[index].UpdateString(text);
if (currentReplica == FirstTrySpeech[index])
{
Expand All @@ -44,8 +47,11 @@ public void UpdateFFirstTrySpeechReplica(int index, string text)

public void UpdateFAlternativeSpeechReplica(int index, string text)
{
if(index < 0 || index >= AlternativeSpeech.Count)
if (index < 0 || index >= AlternativeSpeech.Count)
{
return;
}

AlternativeSpeech[index].UpdateString(text);
if (currentReplica == AlternativeSpeech[index])
{
Expand Down
2 changes: 1 addition & 1 deletion Fantasy-Quest/Assets/Scripts/Transition/End/Controller.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using Configs;
using Sirenix.OdinInspector;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ private void SubscribeToSliderSwap(Button button)
{
if (previousButton != null)
{
EffectModel.IndicatorsButtons.Left.onClick.RemoveListener(previousSlider.MoveLeftWithAnimation);
EffectModel.IndicatorsButtons.Left.onClick.RemoveListener(
previousSlider.MoveLeftWithAnimation
);
EffectModel.IndicatorsButtons.Left.onClick.RemoveListener(
EffectModel.SlideSound.PlayClip
);
Expand All @@ -51,11 +53,15 @@ private void SubscribeToSliderSwap(Button button)

if (button.TryGetComponent(out IHorizontalSlider slider))
{
EffectModel.IndicatorsButtons.Left.onClick.AddListener(slider.MoveLeftWithAnimation);
EffectModel.IndicatorsButtons.Left.onClick.AddListener(
slider.MoveLeftWithAnimation
);
EffectModel.IndicatorsButtons.Left.onClick.AddListener(
EffectModel.SlideSound.PlayClip
);
EffectModel.IndicatorsButtons.Right.onClick.AddListener(slider.MoveRightWithAnimation);
EffectModel.IndicatorsButtons.Right.onClick.AddListener(
slider.MoveRightWithAnimation
);
EffectModel.IndicatorsButtons.Right.onClick.AddListener(
EffectModel.SlideSound.PlayClip
);
Expand Down
16 changes: 6 additions & 10 deletions Fantasy-Quest/Assets/Scripts/UI/LanguageSliderListener.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,17 +107,13 @@ public int FromCanvasGroup(CanvasGroup canvasGroup)

public CanvasGroup FromIndex(int index)
{
switch (index)
return index switch
{
case 0:
return belarusian;
case 1:
return english;
case 2:
return russian;
default:
return russian;
}
0 => belarusian,
1 => english,
2 => russian,
_ => russian,
};
}
}
}
14 changes: 4 additions & 10 deletions Fantasy-Quest/Assets/Scripts/UI/Pages/Buttons/HorizontalSlider.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using DG.Tweening;
using UnityEngine;

Expand All @@ -23,7 +22,7 @@ public class HorizontalSlider : MonoBehaviour, IHorizontalSlider

[SerializeField]
private List<RectTransform> elementsTransform;

public List<CanvasGroup> ElementsCanvasGroup => elementsCanvasGroup;

[SerializeField]
Expand Down Expand Up @@ -61,7 +60,6 @@ private void OnEnable()

private void PutOnStart()
{

if (CurrentElementIndex < 0 || CurrentElementIndex >= elementsCanvasGroup.Count)
{
CurrentElementIndex = 0;
Expand Down Expand Up @@ -91,7 +89,7 @@ public void MoveLeftImmediately()
DecreaseElementIndex(1);
ShowElement(localPoints.StartPoint.position, CurrentElementIndex, 0);
}

public void MoveRightWithAnimation()
{
HideElement(localPoints.StartPoint.position, CurrentElementIndex, duration);
Expand All @@ -108,17 +106,13 @@ public void MoveLeftWithAnimation()

private void HideElement(Vector3 endPosition, int index, float duration)
{
_ = elementsTransform[index]
.DOMove(endPosition, duration)
.SetUpdate(true);
_ = elementsTransform[index].DOMove(endPosition, duration).SetUpdate(true);
_ = elementsCanvasGroup[index].DOFade(minFade, duration).SetUpdate(true);
}

private void ShowElement(Vector3 startPosition, int index, float duration)
{
_ = elementsTransform[index]
.DOMove(startPosition, 0)
.SetUpdate(true);
_ = elementsTransform[index].DOMove(startPosition, 0).SetUpdate(true);
_ = elementsTransform[index]
.DOMove(localPoints.MiddlePoint.position, duration)
.SetUpdate(true);
Expand Down

0 comments on commit aa3678f

Please sign in to comment.