sin365/AxibugEmuOnline
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

修复一些拉取rom列表的bug #80

Merged
sin365 merged 5 commits from Alienjack/AxibugEmuOnline:master into master 2025-01-06 20:31:47 +08:00
Conversation 0 Commits 5 Files Changed 10 +61 -50
5 changed files with 61 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ef1c43d3fc - Show all commits

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

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

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

@ -56,19 +56,27 @@ namespace AxibugEmuOnline.Client.Manager
break; break;
} }
m_emuCore.StartGame(romFile); var result = m_emuCore.StartGame(romFile);
LaunchUI.Instance.HideMainMenu(); if (result)
InGameUI.Instance.Show(romFile, m_emuCore); {
LaunchUI.Instance.HideMainMenu();
InGameUI.Instance.Show(romFile, m_emuCore);
m_emuCore.SetupScheme(); m_emuCore.SetupScheme();
m_controllerSetuper = m_emuCore.GetControllerSetuper(); m_controllerSetuper = m_emuCore.GetControllerSetuper();
//自动分配0号手柄到0号手柄位 //自动分配0号手柄到0号手柄位
m_controllerSetuper.SetConnect(con0ToSlot: 0); m_controllerSetuper.SetConnect(con0ToSlot: 0);
Eventer.Instance.PostEvent(EEvent.OnControllerConnectChanged); Eventer.Instance.PostEvent(EEvent.OnControllerConnectChanged);
Eventer.Instance.RegisterEvent(EEvent.OnRoomSlotDataChanged, OnSlotDataChanged); Eventer.Instance.RegisterEvent(EEvent.OnRoomSlotDataChanged, OnSlotDataChanged);
}
else
{
StopGame();
OverlayManager.PopTip(result);
}
} }
private void OnSlotDataChanged() private void OnSlotDataChanged()

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

@ -96,11 +96,12 @@ namespace AxibugEmuOnline.Client
if (Path.GetExtension(LocalFilePath).ToLower() == ".zip") if (Path.GetExtension(LocalFilePath).ToLower() == ".zip")
{ {
var zip = new ZipInputStream(new MemoryStream(bytes)); var zip = new ZipInputStream(new MemoryStream(bytes));
var entry = zip.GetNextEntry() as ZipEntry; while (true)
while (entry != null)
{ {
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]; var buffer = new byte[1024];
MemoryStream output = new MemoryStream(); MemoryStream output = new MemoryStream();
@ -126,36 +127,36 @@ namespace AxibugEmuOnline.Client
{ {
downloadRequest = AxiHttpProxy.GetDownLoad($"{App.httpAPI.WebHost}/{webData.url}"); downloadRequest = AxiHttpProxy.GetDownLoad($"{App.httpAPI.WebHost}/{webData.url}");
while (!downloadRequest.downloadHandler.isDone) while (!downloadRequest.downloadHandler.isDone)
{ {
yield return null; yield return null;
Debug.Log($"下载进度：{downloadRequest.downloadHandler.DownLoadPr} ->{downloadRequest.downloadHandler.loadedLenght}/{downloadRequest.downloadHandler.NeedloadedLenght}"); Debug.Log($"下载进度：{downloadRequest.downloadHandler.DownLoadPr} ->{downloadRequest.downloadHandler.loadedLenght}/{downloadRequest.downloadHandler.NeedloadedLenght}");
} }
AxiHttpProxy.ShowAxiHttpDebugInfo(downloadRequest.downloadHandler); AxiHttpProxy.ShowAxiHttpDebugInfo(downloadRequest.downloadHandler);
var request = downloadRequest; var request = downloadRequest;
downloadRequest = null; downloadRequest = null;
if (!request.downloadHandler.bHadErr) if (!request.downloadHandler.bHadErr)
callback(request.downloadHandler.data); callback(request.downloadHandler.data);
else else
callback(null); callback(null);
//downloadRequest = UnityWebRequest.Get($"{App.httpAPI.WebHost}/{webData.url}"); //downloadRequest = UnityWebRequest.Get($"{App.httpAPI.WebHost}/{webData.url}");
//yield return downloadRequest.SendWebRequest(); //yield return downloadRequest.SendWebRequest();
//var request = downloadRequest; //var request = downloadRequest;
//downloadRequest = null; //downloadRequest = null;
//if (request.result != UnityWebRequest.Result.Success) //if (request.result != UnityWebRequest.Result.Success)
//{ //{
// callback(null); // callback(null);
//} //}
//else //else
//{ //{
// callback(request.downloadHandler.data); // callback(request.downloadHandler.data);
//} //}
} }
public void SetWebData(HttpAPI.Resp_RomInfo resp_RomInfo) public void SetWebData(HttpAPI.Resp_RomInfo resp_RomInfo)
{ {

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

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