Alienjack/AxibugEmuOnline
1
0
Fork 0
forked from sin365/AxibugEmuOnline
Code Pull Requests Activity

IEmuCore接口变更,StartGame会返回初始化失败的情况

Browse Source
This commit is contained in:
ALIENJACK\alien 2025-01-06 16:48:48 +08:00
parent ef0ab9ccb1
commit ef1c43d3fc
5 changed files with 61 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AxibugEmuOnline.Client/Assets/Script/AppMain/IEmuCore.cs
View File

@ -13,7 +13,7 @@ namespace AxibugEmuOnline.Client
void Pause();
void Resume();
void SetupScheme();
void StartGame(RomFile romFile);
MsgBool StartGame(RomFile romFile);
void DoReset();
IControllerSetuper GetControllerSetuper();

10
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppEmu.cs
View File

@ -56,7 +56,9 @@ namespace AxibugEmuOnline.Client.Manager
break;
}
m_emuCore.StartGame(romFile);
var result = m_emuCore.StartGame(romFile);
if (result)
{
LaunchUI.Instance.HideMainMenu();
InGameUI.Instance.Show(romFile, m_emuCore);
@ -70,6 +72,12 @@ namespace AxibugEmuOnline.Client.Manager
Eventer.Instance.RegisterEvent(EEvent.OnRoomSlotDataChanged, OnSlotDataChanged);
}
else
{
StopGame();
OverlayManager.PopTip(result);
}
}
private void OnSlotDataChanged()
{

9
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/RomFile.cs
View File

@ -96,11 +96,12 @@ namespace AxibugEmuOnline.Client
if (Path.GetExtension(LocalFilePath).ToLower() == ".zip")
{
var zip = new ZipInputStream(new MemoryStream(bytes));
var entry = zip.GetNextEntry() as ZipEntry;
while (entry != null)
while (true)
{
if (!entry.Name.ToLower().EndsWith(".nes")) continue;
var currentEntry = zip.GetNextEntry();
if (currentEntry == null) break;
if (!currentEntry.Name.ToLower().EndsWith(".nes")) continue;
var buffer = new byte[1024];
MemoryStream output = new MemoryStream();

4
AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/NesEmulator.cs
View File

@ -63,7 +63,7 @@ namespace AxibugEmuOnline.Client
/// <summary>
/// 指定ROM开始游戏
/// </summary>
public void StartGame(RomFile rom)
public MsgBool StartGame(RomFile rom)
{
StopGame();
@ -76,11 +76,13 @@ namespace AxibugEmuOnline.Client
try
{
NesCore = new NES(rom.FileName);
return true;
}
catch (Exception ex)
{
NesCore = null;
App.log.Error(ex.ToString());
return ex.Message;
}
}