This commit is contained in:
SoulliesOfficial
2025-08-27 21:45:18 -04:00
parent 131b182f43
commit 4031b29245
266 changed files with 26272 additions and 18257 deletions

View File

@@ -14,7 +14,7 @@ namespace Ichni.Menu
public override void Initialize()
{
mainVolumeModifier.SetUp(gameSettings.masterVolume, 10, "Menu UI/Settings_MasterVolume");
mainVolumeModifier.SetUp(gameSettings.masterVolume, 10, "Menu UI/Settings_Master_Volume");
mainVolumeModifier.SetMinMax(0, 100);
mainVolumeModifier.updateValueAction = () =>
{
@@ -22,7 +22,7 @@ namespace Ichni.Menu
gameSettings.ApplyVolume();
};
musicVolumeModifier.SetUp(gameSettings.musicVolume, 10, "Menu UI/Settings_MusicVolume");
musicVolumeModifier.SetUp(gameSettings.musicVolume, 10, "Menu UI/Settings_Music_Volume");
musicVolumeModifier.SetMinMax(0, 100);
musicVolumeModifier.updateValueAction = () =>
{
@@ -30,7 +30,7 @@ namespace Ichni.Menu
gameSettings.ApplyVolume();
};
sfxVolumeModifier.SetUp(gameSettings.soundEffectVolume, 10, "Menu UI/Settings_SFXVolume");
sfxVolumeModifier.SetUp(gameSettings.soundEffectVolume, 10, "Menu UI/Settings_SFX_Volume");
sfxVolumeModifier.SetMinMax(0, 100);
sfxVolumeModifier.updateValueAction = () =>
{
@@ -38,7 +38,7 @@ namespace Ichni.Menu
gameSettings.ApplyVolume();
};
uiVolumeModifier.SetUp(gameSettings.uiVolume, 10, "Menu UI/Settings_UIVolume");
uiVolumeModifier.SetUp(gameSettings.uiVolume, 10, "Menu UI/Settings_UI_Volume");
uiVolumeModifier.SetMinMax(0, 100);
uiVolumeModifier.updateValueAction = () =>
{

View File

@@ -11,7 +11,7 @@ namespace Ichni.Menu
public override void Initialize()
{
debugModeSwitch.SetUp(gameSettings.debugMode, "Menu UI/Settings_DebugMode");
debugModeSwitch.SetUp(gameSettings.debugMode, "Menu UI/Settings_Debug_Mode");
debugModeSwitch.updateValueAction = () =>
{
gameSettings.debugMode = debugModeSwitch.GetValue();

View File

@@ -12,13 +12,14 @@ namespace Ichni.UI
public Dropdown languageDropdown;
public override void Initialize()
{
offsetEditorButton.SetUp("Menu UI/Settings_OffsetEditor", "", "Menu UI/Settings_Enter");
offsetEditorButton.SetUp("Menu UI/Settings_Offset_Editor", "", "Menu UI/Settings_Enter");
offsetEditorButton.updateValueAction = () =>
{
gameObject.SetActive(false);
MenuManager.instance.settingsUIPage.offsetEditor.gameObject.SetActive(true);
MenuManager.instance.settingsUIPage.offsetEditor.offsetEditingContainer.SetActive(true);
MenuManager.instance.settingsUIPage.offsetEditor.Play();
MenuManager.instance.settingsUIPage.settingsWindowController.buttonsContainer.gameObject.SetActive(false);
};
languageDropdown.SetUp(gameSettings.languageIndex, MenuManager.instance.displayLanguageList, "Menu UI/Settings_Language");

View File

@@ -12,7 +12,7 @@ namespace Ichni.Menu
public override void Initialize()
{
resolutionLevelModifier.SetUp(gameSettings.resolutionLevel, 1, "Menu UI/Settings_ResolutionLevel");
resolutionLevelModifier.SetUp(gameSettings.resolutionLevel, 1, "Menu UI/Settings_Resolution_Level");
resolutionLevelModifier.SetMinMax(0, 5);
resolutionLevelModifier.updateValueAction = () =>
{
@@ -20,7 +20,7 @@ namespace Ichni.Menu
gameSettings.ApplyGraphic();
};
targetFrameModifier.SetUp(gameSettings.targetFrame, 30, "Menu UI/Settings_TargetFrame");
targetFrameModifier.SetUp(gameSettings.targetFrame, 30, "Menu UI/Settings_Target_Frame");
targetFrameModifier.SetMinMax(30, 120);
targetFrameModifier.updateValueAction = () =>
{

View File

@@ -58,6 +58,7 @@ namespace Ichni.Menu
gameObject.SetActive(false);
MenuManager.instance.settingsUIPage.settingsWindowController.gameObject.SetActive(true);
MenuManager.instance.settingsUIPage.settingsWindowController.gameplayButton.onClick.Invoke();
MenuManager.instance.settingsUIPage.settingsWindowController.buttonsContainer.gameObject.SetActive(true);
});
}

View File

@@ -15,6 +15,7 @@ namespace Ichni.Menu
public CanvasGroup canvasGroup;
public RectTransform buttonsContainer;
public Button audioButton;
public Button graphicsButton;
public Button gameplayButton;
@@ -28,8 +29,6 @@ namespace Ichni.Menu
public DebugSettingsWindow debugSettingsWindow;
public SettingsWindow currentSettingsWindow;
public Button offsetEditorButton;
private void Awake()
{

View File

@@ -66,7 +66,7 @@ namespace Ichni.Menu
MenuManager.instance.songSelectionUIPage.difficultySelectionContainer.selectedButton?.Deselect();
MenuManager.instance.songSelectionUIPage.difficultySelectionContainer.selectedButton = this;
MenuManager.instance.songSelectionUIPage.currentSelectedDifficultyIndex = difficultyData.difficultyIndex;
MenuInformationRecorder.instance.GetRecordOfThisChapter().difficultyIndex = difficultyData.difficultyIndex;
gameObject.GetComponent<AudioContainer>().PlaySoundFX("SelectDifficluty");

View File

@@ -23,12 +23,14 @@ namespace Ichni.Menu
buttons[i].SetUp(difficulties[i]);
}
if (MenuManager.instance.songSelectionUIPage.currentSelectedDifficultyIndex >= difficultyCount)
SongSelectionRecord songSelectionRecord = MenuInformationRecorder.instance.GetRecordOfThisChapter();
if (songSelectionRecord.difficultyIndex >= difficultyCount)
{
MenuManager.instance.songSelectionUIPage.currentSelectedDifficultyIndex = difficultyCount - 1;
songSelectionRecord.difficultyIndex = difficultyCount - 1;
}
buttons[MenuManager.instance.songSelectionUIPage.currentSelectedDifficultyIndex].Select();
buttons[songSelectionRecord.difficultyIndex].Select();
}
}
}

View File

@@ -25,6 +25,13 @@ namespace Ichni.Menu
return;
}
if (MenuManager.instance.isEnteringGame)
{
return;
}
MenuManager.instance.isEnteringGame = true;
InformationTransistor.instance.SetInformation(
ChapterSelectionManager.instance.currentChapter,
MenuManager.instance.songSelectionUIPage.selectedSong,

View File

@@ -67,6 +67,7 @@ namespace Ichni.Menu
{
StartCoroutine(SnapToItem(songItems[songIndex], true));
}
closestTab = songItems[songIndex];
targetPosition = content.anchoredPosition;

View File

@@ -44,13 +44,22 @@ namespace Ichni.Menu
{
if (MenuManager.instance.songSelectionUIPage.songListController.selectedTab == this)
{
if (MenuManager.instance.isEnteringGame)
{
return;
}
MenuManager.instance.isEnteringGame = true;
InformationTransistor.instance.SetInformation(
ChapterSelectionManager.instance.currentChapter,
MenuManager.instance.songSelectionUIPage.selectedSong,
MenuManager.instance.songSelectionUIPage.selectedDifficulty);
MenuAudioManager.instance.audioContainer.PlaySoundFX("EnterToGame");
MenuAudioManager.instance.audioContainer.StopEvent("PlayPreview");
MenuManager.instance.transitionUIPage.FadeIn();
Observable.Timer(TimeSpan.FromSeconds(0.6f)).Subscribe(_ =>
{
MenuManager.instance.TestEnterGame();

View File

@@ -18,7 +18,7 @@ namespace Ichni.Menu
public PlaySongUI playSongUI;
public SongInfoUI songInfoUI;
public DifficultySelectionContainer difficultySelectionContainer;
public int currentSelectedDifficultyIndex;
//public int currentSelectedDifficultyIndex;
protected override void Awake()
{
@@ -54,7 +54,7 @@ namespace Ichni.Menu
private void Start()
{
currentSelectedDifficultyIndex = 0;
MenuInformationRecorder.instance.GetRecordOfThisChapter().difficultyIndex = 0;
Sequence framesSeq = DOTween.Sequence();
framesSeq.Append(DOTween.To(() => framePositionOffset, x => framePositionOffset = x, 1f, 1f)

View File

@@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using DG.Tweening;
using UnityEngine;
using UnityEngine.Serialization;
namespace Ichni.UI
{
@@ -12,12 +13,30 @@ namespace Ichni.UI
public List<ParticleSystem> logoParticles;
public ParticleSystem floatingParticles;
public GameObject peWarningWindow;
public GameObject contentWindow;
protected override void Awake()
{
base.Awake();
audioContainer = GetComponent<AudioContainer>();
}
private void Start()
{
Sequence peWarningSequence = DOTween.Sequence();
peWarningSequence.Append(peWarningWindow.GetComponent<CanvasGroup>().DOFade(1f, 0.5f));
peWarningSequence.AppendInterval(1f);
peWarningSequence.Append(peWarningWindow.GetComponent<CanvasGroup>().DOFade(0f, 0.5f).OnStart(() => contentWindow.SetActive(true)));
peWarningSequence.AppendCallback(() =>
{
peWarningWindow.SetActive(false);
logoParticles.ForEach(p => p.Play());
floatingParticles.Play();
});
peWarningSequence.Play();
}
public void TouchToStart()
{
audioContainer.PlaySoundFX("TouchToStart");