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

跟随的更改

Browse Source
This commit is contained in:
sin365 2025-09-22 14:09:17 +08:00
parent 07d53bb916
commit 3d20db977a
4 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,7 +213,7 @@ namespace AxibugEmuOnline.Client.ClientCore
else if (request.downloadHandler.bHadErr) else if (request.downloadHandler.bHadErr)
{ {
bHttpCheckDone = false; bHttpCheckDone = false;
App.log.Error(request.downloadHandler.ErrInfo); App.log.Error(request.downloadHandler.errInfo);
} }
else else
{ {

40
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/HttpAPI.cs
View File

@ -28,18 +28,9 @@ namespace AxibugEmuOnline.Client
if (!string.IsNullOrEmpty(searchKey)) if (!string.IsNullOrEmpty(searchKey))
{ {
string oldsearch = searchKey; string oldsearch = searchKey;
//searchKey = System.Net.WebUtility.UrlEncode(searchKey);
searchKey = AxiHttp.UrlEncode(searchKey); searchKey = AxiHttp.UrlEncode(searchKey);
App.log.Info($"search->{oldsearch} ->{searchKey}"); App.log.Info($"search->{oldsearch} ->{searchKey}");
//searchKey = HttpUtility.UrlDecode(searchKey);
} }
//避免特殊字符和个别文字编码问题
//byte[] gb2312Bytes = Encoding.Default.GetBytes(searchKey);
//byte[] utf8Bytes = Encoding.Convert(Encoding.Default, Encoding.UTF8, gb2312Bytes);
//// 将UTF-8编码的字节数组转换回字符串（此时是UTF-8编码的字符串）
//string utf8String = Encoding.UTF8.GetString(utf8Bytes);
//searchKey = UrlEncode(utf8String);
//App.log.Info($"search->{utf8String} ->{searchKey}");
string url = $"{WebSiteApi}/RomList?Page={page}&PageSize={pageSize}&PType={(int)platform}&SearchKey={searchKey}&Token={App.user.Token}"; string url = $"{WebSiteApi}/RomList?Page={page}&PageSize={pageSize}&PType={(int)platform}&SearchKey={searchKey}&Token={App.user.Token}";
App.log.Info($"GetRomList=>{url}"); App.log.Info($"GetRomList=>{url}");
AxiHttpProxy.SendWebRequestProxy request = AxiHttpProxy.Get(url); AxiHttpProxy.SendWebRequestProxy request = AxiHttpProxy.Get(url);
@ -57,19 +48,8 @@ namespace AxibugEmuOnline.Client
yield break; yield break;
} }
App.log.Error(request.downloadHandler.ErrInfo); App.log.Error(request.downloadHandler.errInfo);
callback.Invoke(page, null); callback.Invoke(page, null);
/*
UnityWebRequest request = UnityWebRequest.Get($"{WebSiteApi}/NesRomList?Page={page}&PageSize={pageSize}&SearchKey={searchKey}");
yield return request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success)
{
callback.Invoke(null);
yield break;
}*/
} }
private IEnumerator GetRomListFlow(AxibugProtobuf.RomPlatformType platform, int page, int pageSize, Action<int, Resp_GameList> callback) private IEnumerator GetRomListFlow(AxibugProtobuf.RomPlatformType platform, int page, int pageSize, Action<int, Resp_GameList> callback)
{ {
@ -91,18 +71,8 @@ namespace AxibugEmuOnline.Client
yield break; yield break;
} }
App.log.Error(request.downloadHandler.ErrInfo); App.log.Error(request.downloadHandler.errInfo);
callback.Invoke(page, null); callback.Invoke(page, null);
/*
UnityWebRequest request = UnityWebRequest.Get($"{WebSiteApi}/NesRomList?Page={page}&PageSize={pageSize}");
yield return request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success)
{
callback.Invoke(null);
yield break;
}
*/
} }
public void GetMarkList(Action<int, Resp_GameList> callback, AxibugProtobuf.RomPlatformType platform, int page, int pageSize = 10) public void GetMarkList(Action<int, Resp_GameList> callback, AxibugProtobuf.RomPlatformType platform, int page, int pageSize = 10)
@ -147,7 +117,7 @@ namespace AxibugEmuOnline.Client
yield break; yield break;
} }
App.log.Error(request.downloadHandler.ErrInfo); App.log.Error(request.downloadHandler.errInfo);
callback.Invoke(page, null); callback.Invoke(page, null);
/* /*
@ -181,7 +151,7 @@ namespace AxibugEmuOnline.Client
yield break; yield break;
} }
App.log.Error(request.downloadHandler.ErrInfo); App.log.Error(request.downloadHandler.errInfo);
callback.Invoke(page, null); callback.Invoke(page, null);
/* /*
UnityWebRequest request = UnityWebRequest.Get($"{WebSiteApi}/NesRomList?Page={page}&PageSize={pageSize}"); UnityWebRequest request = UnityWebRequest.Get($"{WebSiteApi}/NesRomList?Page={page}&PageSize={pageSize}");
@ -215,7 +185,7 @@ namespace AxibugEmuOnline.Client
yield break; yield break;
} }
App.log.Error(request.downloadHandler.ErrInfo); App.log.Error(request.downloadHandler.errInfo);
callback.Invoke(null); callback.Invoke(null);
/* /*

4
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/FileDownloader.cs
View File

@ -23,7 +23,7 @@ namespace AxibugEmuOnline.Client
m_downloadingTasks.TryGetValue(url, out var proxy); m_downloadingTasks.TryGetValue(url, out var proxy);
if (proxy == null) return null; if (proxy == null) return null;
return Mathf.Clamp01(proxy.downloadHandler.DownLoadPr); return Mathf.Clamp01(proxy.downloadHandler.downLoadPr);
} }
HashSet<string> temp = new HashSet<string>(); HashSet<string> temp = new HashSet<string>();
@ -53,7 +53,7 @@ namespace AxibugEmuOnline.Client
} }
else else
{ {
Debug.LogError($"{overTask.downloadHandler.ErrInfo}:{overTask.downloadHandler.url}"); Debug.LogError($"{overTask.downloadHandler.errInfo}:{overTask.downloadHandler.url}");
} }
} }
} }

4
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/SaveSlotManager/SaveFileSyncStates/DownloadingState.cs
View File

@ -43,7 +43,7 @@ namespace AxibugEmuOnline.Client
if (m_downloadTask.downloadHandler.bHadErr) //下载失败 if (m_downloadTask.downloadHandler.bHadErr) //下载失败
{ {
FSM.GetState<SyncFailedState>().Error = m_downloadTask.downloadHandler.ErrInfo; FSM.GetState<SyncFailedState>().Error = m_downloadTask.downloadHandler.errInfo;
FSM.ChangeState<SyncFailedState>(); FSM.ChangeState<SyncFailedState>();
return; return;
} }
@ -52,7 +52,7 @@ namespace AxibugEmuOnline.Client
if (m_downloadTaskImg.downloadHandler.bHadErr) //下载失败 if (m_downloadTaskImg.downloadHandler.bHadErr) //下载失败
{ {
FSM.GetState<SyncFailedState>().Error = m_downloadTaskImg.downloadHandler.ErrInfo; FSM.GetState<SyncFailedState>().Error = m_downloadTaskImg.downloadHandler.errInfo;
FSM.ChangeState<SyncFailedState>(); FSM.ChangeState<SyncFailedState>();
return; return;
} }