Menu基本完成

This commit is contained in:
SoulliesOfficial
2025-06-14 14:42:49 -04:00
parent b9e6a9ab25
commit b19469976a
52 changed files with 1380 additions and 363 deletions

View File

@@ -14,7 +14,7 @@ namespace Ichni
public ChapterSelectionUIPage chapterSelectionUIPage;
public List<ChapterSelectionUnit> chapters;
public string currentChapter;
}
public partial class ChapterSelectionManager

View File

@@ -5,6 +5,7 @@ using System.Linq;
using AK.Wwise;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.Serialization;
namespace Ichni.Menu
{
@@ -28,13 +29,13 @@ namespace Ichni.Menu
{
if(song.difficultyDataList.All(d => d.difficultyName != "Easy"))
{
song.difficultyDataList.Add(new DifficultyData("Easy","", "",
song.difficultyDataList.Add(new DifficultyData("Easy","", 0, "",
new Color(0f, 0.7f, 0.2f, 1f)));
}
if (song.difficultyDataList.All(d => d.difficultyName != "Hard"))
{
song.difficultyDataList.Add(new DifficultyData("Hard", "", "",
song.difficultyDataList.Add(new DifficultyData("Hard", "", 0, "",
new Color(1f, 0.2f, 0.2f, 1f)));
}
}
@@ -52,8 +53,8 @@ namespace Ichni.Menu
[FoldoutGroup("$songName")]
public string displaySongName;
[FoldoutGroup("$songName")]
public string author;
[FormerlySerializedAs("author")] [FoldoutGroup("$songName")]
public string composer;
[FoldoutGroup("$songName")]
public bool isNewSong;
@@ -82,15 +83,16 @@ namespace Ichni.Menu
{
public string difficultyName;
public string displayDifficultyName;
public int difficultyValue;
public string designerName;
public Color color;
public DifficultyData(string difficultyName, string displayDifficultyName, string designerName, Color color)
public DifficultyData(string difficultyName, string displayDifficultyName, int difficultyValue, string designerName, Color color)
{
this.difficultyName = difficultyName;
this.displayDifficultyName = displayDifficultyName;
this.designerName = designerName;
this.difficultyValue = difficultyValue;
this.color = color;
}
}

View File

@@ -25,18 +25,18 @@ namespace Ichni
public Switch chapterSwitch;
public Switch musicSwitch;
private void Start()
private void Awake()
{
if (instance!=null && instance != this)
{
Destroy(gameObject);
}
else
if (instance == null)
{
instance = this;
DontDestroyOnLoad(gameObject);
isReturnedFromGame = false;
}
else
{
Destroy(gameObject);
}
}
public void SetInformation(string chapterName, string songName, string composerName,

View File

@@ -2,6 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using AK.Wwise;
using Ichni.Story.UI;
using Ichni.UI;
using Sirenix.OdinInspector;
using UnityEngine;
@@ -14,7 +15,12 @@ namespace Ichni
{
public static MenuManager instance;
[FormerlySerializedAs("preparePage")] public PrepareUIPage prepareUIPage;
public StartUIPage startUIPage;
public ChapterSelectionUIPage chapterSelectionUIPage;
public StoryUIPage storyUIPage;
public DialogUIPage dialogUIPage;
public SongSelectionUIPage songSelectionUIPage;
public PrepareUIPage prepareUIPage;
}
public partial class MenuManager
@@ -36,21 +42,8 @@ namespace Ichni
public partial class MenuManager
{
public Sprite testSprite;
public Switch testChapterSwitch;
public Switch testMusicSwitch;
public void TestEnterGame()
{
InformationTransistor.instance.SetInformation(
"Chapter 1",
"Chaos Zone",
"s/a_荒しそら & LaRin",
"Hard",
"None",
"Trader",
Color.red, testSprite,testChapterSwitch, testMusicSwitch);
asyncOperation.allowSceneActivation = true;
}

View File

@@ -1,13 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Ichni.RhythmGame
{
public class BeatmapSave
{
public float accuracy;
public bool isFullCombo;
public bool isAllPerfect;
}
}

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 6b751bb37660d844780656591830afff
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -2,6 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using Ichni.RhythmGame;
using Ichni.UI;
using Sirenix.OdinInspector;
using UnityEngine;
@@ -10,6 +11,8 @@ namespace Ichni.Menu
public partial class SongSelectionManager : SerializedMonoBehaviour
{
public static SongSelectionManager instance;
public SongSelectionUIPage songSelectionUIPage;
private void Awake()

View File

@@ -1,13 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Ichni.RhythmGame
{
public class SongStatusSave
{
public bool isCompleted;
public string additionalInfo;
public Dictionary<string, BeatmapSave> beatmapSaves;
}
}

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 0e15d295a0ae77041ad0269ab3801bc3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: