From aa3678f4c7a269592bf35d2c663fd848b973a5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9=20=D0=A5=D0=B8?=
=?UTF-8?q?=D0=BC=D0=B8=D1=87?= <30412223+Kiuh@users.noreply.github.com>
Date: Thu, 23 May 2024 20:38:44 +0300
Subject: [PATCH] Apply formatting
---
.../Assets/AddressableAssetsData/link.xml | 25 -------------------
.../AddressableAssetsData/link.xml.meta | 7 ------
.../Scripts/Dialogue/DialogueSpeaker.cs | 10 ++++++--
.../Scripts/Transition/End/Controller.cs | 2 +-
.../Behaviours/IndicatorsMouseBehaviour.cs | 12 ++++++---
.../Scripts/UI/LanguageSliderListener.cs | 16 +++++-------
.../UI/Pages/Buttons/HorizontalSlider.cs | 14 +++--------
7 files changed, 28 insertions(+), 58 deletions(-)
delete mode 100644 Fantasy-Quest/Assets/AddressableAssetsData/link.xml
delete mode 100644 Fantasy-Quest/Assets/AddressableAssetsData/link.xml.meta
diff --git a/Fantasy-Quest/Assets/AddressableAssetsData/link.xml b/Fantasy-Quest/Assets/AddressableAssetsData/link.xml
deleted file mode 100644
index 66763552..00000000
--- a/Fantasy-Quest/Assets/AddressableAssetsData/link.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Fantasy-Quest/Assets/AddressableAssetsData/link.xml.meta b/Fantasy-Quest/Assets/AddressableAssetsData/link.xml.meta
deleted file mode 100644
index c4a7bf34..00000000
--- a/Fantasy-Quest/Assets/AddressableAssetsData/link.xml.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 20759a81230d6834f828264fe15a86be
-TextScriptImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Fantasy-Quest/Assets/Scripts/Dialogue/DialogueSpeaker.cs b/Fantasy-Quest/Assets/Scripts/Dialogue/DialogueSpeaker.cs
index fee5e207..41051e57 100644
--- a/Fantasy-Quest/Assets/Scripts/Dialogue/DialogueSpeaker.cs
+++ b/Fantasy-Quest/Assets/Scripts/Dialogue/DialogueSpeaker.cs
@@ -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])
{
@@ -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])
{
diff --git a/Fantasy-Quest/Assets/Scripts/Transition/End/Controller.cs b/Fantasy-Quest/Assets/Scripts/Transition/End/Controller.cs
index abce4935..51a224bd 100644
--- a/Fantasy-Quest/Assets/Scripts/Transition/End/Controller.cs
+++ b/Fantasy-Quest/Assets/Scripts/Transition/End/Controller.cs
@@ -1,4 +1,4 @@
- using System.Collections;
+using System.Collections;
using System.Collections.Generic;
using Configs;
using Sirenix.OdinInspector;
diff --git a/Fantasy-Quest/Assets/Scripts/UI/Indicators/Behaviours/IndicatorsMouseBehaviour.cs b/Fantasy-Quest/Assets/Scripts/UI/Indicators/Behaviours/IndicatorsMouseBehaviour.cs
index 2fd144fd..122333f5 100644
--- a/Fantasy-Quest/Assets/Scripts/UI/Indicators/Behaviours/IndicatorsMouseBehaviour.cs
+++ b/Fantasy-Quest/Assets/Scripts/UI/Indicators/Behaviours/IndicatorsMouseBehaviour.cs
@@ -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
);
@@ -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
);
diff --git a/Fantasy-Quest/Assets/Scripts/UI/LanguageSliderListener.cs b/Fantasy-Quest/Assets/Scripts/UI/LanguageSliderListener.cs
index e49d4b97..2caafee4 100644
--- a/Fantasy-Quest/Assets/Scripts/UI/LanguageSliderListener.cs
+++ b/Fantasy-Quest/Assets/Scripts/UI/LanguageSliderListener.cs
@@ -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,
+ };
}
}
}
diff --git a/Fantasy-Quest/Assets/Scripts/UI/Pages/Buttons/HorizontalSlider.cs b/Fantasy-Quest/Assets/Scripts/UI/Pages/Buttons/HorizontalSlider.cs
index efa5ae91..aa3c6f98 100644
--- a/Fantasy-Quest/Assets/Scripts/UI/Pages/Buttons/HorizontalSlider.cs
+++ b/Fantasy-Quest/Assets/Scripts/UI/Pages/Buttons/HorizontalSlider.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using DG.Tweening;
using UnityEngine;
@@ -23,7 +22,7 @@ public class HorizontalSlider : MonoBehaviour, IHorizontalSlider
[SerializeField]
private List elementsTransform;
-
+
public List ElementsCanvasGroup => elementsCanvasGroup;
[SerializeField]
@@ -61,7 +60,6 @@ private void OnEnable()
private void PutOnStart()
{
-
if (CurrentElementIndex < 0 || CurrentElementIndex >= elementsCanvasGroup.Count)
{
CurrentElementIndex = 0;
@@ -91,7 +89,7 @@ public void MoveLeftImmediately()
DecreaseElementIndex(1);
ShowElement(localPoints.StartPoint.position, CurrentElementIndex, 0);
}
-
+
public void MoveRightWithAnimation()
{
HideElement(localPoints.StartPoint.position, CurrentElementIndex, duration);
@@ -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);