Skip to content

Commit cf5bce5

Browse files
committed
[+] Black screen notice
1 parent 37f7f63 commit cf5bce5

File tree

4 files changed

+50
-3
lines changed

4 files changed

+50
-3
lines changed

AquaMai.Core/Resources/Locale.Designer.cs

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AquaMai.Core/Resources/Locale.resx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,14 @@
125125
<data name="NoCamera" xml:space="preserve">
126126
<value>No camera detected</value>
127127
</data>
128+
<data name="NoAmDaemonAlertTitle" xml:space="preserve">
129+
<value>Black screen, huh? Why?</value>
130+
</data>
131+
<data name="NoAmDaemonAlertMessage" xml:space="preserve">
132+
<value>Did you double-click Sinmai.exe directly? That's not how it works. There should be something called "start.bat" or "启动.bat", and you need to use it to start.
133+
Check if your AMDaemon is still alive (look for a command line window called AMDaemon.exe running in the background).
134+
If the window has disappeared, then there might be some issues with your configuration. Please check your segatools.ini carefully.
135+
Maybe the window is there, but it's constantly scrolling errors. If that's the case, then there might also be some configuration issues.
136+
You can try to solve it yourself. If not, then ask your friends in the community or someone nearby who knows how to fix it.</value>
137+
</data>
128138
</root>

AquaMai.Core/Resources/Locale.zh.resx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,14 @@
118118
<data name="NoCamera" xml:space="preserve">
119119
<value>没有找到任何摄像头</value>
120120
</data>
121+
<data name="NoAmDaemonAlertMessage" xml:space="preserve">
122+
<value>你是不是直接双击了 Sinmai.exe?这样是不行的,应该有一个东西叫做“启动.bat”或者“start.bat”,你需要用它来启动
123+
检查一下,你的 AMDaemon 还活着吗(看看有没有一个叫做 AMDaemon.exe 的命令行窗口在后台跑着)
124+
如果窗口消失了的话,那大概是你在配置上有一些问题,仔细检查一下你的 segatools.ini 吧
125+
也许窗口是在的,但是上面在不断滚动错误。如果是这样的话那大概也是配置有一些问题
126+
可以尝试自己解决一下。如果不行的话…那就问问群友或者身边会的人吧</value>
127+
</data>
128+
<data name="NoAmDaemonAlertTitle" xml:space="preserve">
129+
<value>黑屏,是吗?为什么呢?</value>
130+
</data>
121131
</root>

AquaMai.Mods/UX/OneKeyEntryEnd.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ public static void DoQuickSkip()
4242

4343
foreach (ProcessManager.ProcessControle process in processList)
4444
{
45+
#if DEBUG
46+
MelonLogger.Msg($"[QuickSkip] {process.Process}");
47+
#endif
4548
switch (process.Process.ToString())
4649
{
4750
// After login
@@ -61,13 +64,15 @@ public static void DoQuickSkip()
6164
SoundManager.PlayBGM(Cue.BGM_COLLECTION, 2);
6265
if (ConfigLoader.Config.GetSectionState(typeof(ExitToSave)).Enabled)
6366
{
64-
SharedInstances.ProcessDataContainer.processManager.AddProcess(new FadeProcess(SharedInstances.ProcessDataContainer, process.Process, new DataSaveProcess(SharedInstances.ProcessDataContainer)));
67+
SharedInstances.ProcessDataContainer.processManager.AddProcess(new FadeProcess(SharedInstances.ProcessDataContainer, process.Process,
68+
new DataSaveProcess(SharedInstances.ProcessDataContainer)));
6569
// Fix crash
6670
SharedInstances.ProcessDataContainer.processManager.PrepareTimer(0, 0, false, null, false);
6771
}
6872
else
6973
{
70-
SharedInstances.ProcessDataContainer.processManager.AddProcess(new FadeProcess(SharedInstances.ProcessDataContainer, process.Process, new UnlockMusicProcess(SharedInstances.ProcessDataContainer)));
74+
SharedInstances.ProcessDataContainer.processManager.AddProcess(new FadeProcess(SharedInstances.ProcessDataContainer, process.Process,
75+
new UnlockMusicProcess(SharedInstances.ProcessDataContainer)));
7176
}
7277
break;
7378
}
@@ -76,7 +81,8 @@ public static void DoQuickSkip()
7681
if (processToRelease != null)
7782
{
7883
GameManager.SetMaxTrack();
79-
SharedInstances.ProcessDataContainer.processManager.AddProcess(new FadeProcess(SharedInstances.ProcessDataContainer, processToRelease, new MusicSelectProcess(SharedInstances.ProcessDataContainer)));
84+
SharedInstances.ProcessDataContainer.processManager.AddProcess(new FadeProcess(SharedInstances.ProcessDataContainer, processToRelease,
85+
new MusicSelectProcess(SharedInstances.ProcessDataContainer)));
8086
}
8187
}
8288
}

0 commit comments

Comments
 (0)