master #82

Merged
sin365 merged 5 commits from Alienjack/AxibugEmuOnline:master into master 2025-01-07 14:12:49 +08:00
4 changed files with 15 additions and 9 deletions
Showing only changes of commit 7acb2883e9 - Show all commits

View File

@ -32,6 +32,18 @@ namespace AxibugEmuOnline.Client
return (EnumScalerMode)setVal; return (EnumScalerMode)setVal;
} }
public bool IsSetMode(RomPlatformType platform)
{
int setVal = PlayerPrefs.GetInt($"{nameof(ScreenScaler)}.PlatMode.{platform}", -1);
return setVal != -1;
}
public void SetMode(RomPlatformType platform, EnumScalerMode? mode)
{
int setVal = mode == null ? -1 : (int)mode;
PlayerPrefs.SetInt($"{nameof(ScreenScaler)}.PlatMode.{platform}", setVal);
}
/// <summary> /// <summary>
/// 根据缩放模式设置UI的缩放 /// 根据缩放模式设置UI的缩放
/// </summary> /// </summary>

View File

@ -135,10 +135,7 @@ namespace AxibugEmuOnline.Client
{ {
FetchPageCmd.Remove(page); FetchPageCmd.Remove(page);
SaveRomInfoFromWeb(resp); SaveRomInfoFromWeb(resp);
}, }, m_platform, lastSearchKey, pageNo, PAGE_SIZE);
//TODO 平台参数
AxibugProtobuf.RomPlatformType.Nes,
lastSearchKey, pageNo, PAGE_SIZE);
} }
else else
{ {
@ -146,10 +143,7 @@ namespace AxibugEmuOnline.Client
{ {
FetchPageCmd.Remove(page); FetchPageCmd.Remove(page);
SaveRomInfoFromWeb(resp); SaveRomInfoFromWeb(resp);
}, }, m_platform, pageNo, PAGE_SIZE);
//TODO 平台参数
AxibugProtobuf.RomPlatformType.Nes,
pageNo, PAGE_SIZE);
} }
} }

View File

@ -1,6 +1,5 @@
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf; using AxibugProtobuf;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;

View File

@ -42,6 +42,7 @@ namespace AxibugEmuOnline.Client
m_stepPerformer = new StepPerformer(this); m_stepPerformer = new StepPerformer(this);
menus.Add(new InGameUI_FilterSetting(this)); menus.Add(new InGameUI_FilterSetting(this));
menus.Add(new InGameUI_Scaler(this));
menus.Add(new InGameUI_Reset(this)); menus.Add(new InGameUI_Reset(this));
menus.Add(new InGameUI_SaveState(this)); menus.Add(new InGameUI_SaveState(this));
menus.Add(new InGameUI_LoadState(this)); menus.Add(new InGameUI_LoadState(this));