AxibugEmuOnline.Client/Assets/Script/AppMain/App.cs

@@ -36,7 +36,7 @@ namespace AxibugEmuOnline.Client.ClientCore
         private static CoroutineRunner coRunner;
         #endregion
 
-#if UNITY_PSP2 && !UNITY_EDITOR //PSV真机
+#if UNITY_PSP2
         public static string PersistentDataPath => "ux0:data/AxibugEmu";
 #else
         public static string PersistentDataPath => Application.persistentDataPath;
@@ -45,13 +45,7 @@ namespace AxibugEmuOnline.Client.ClientCore
         {
             PlayerPrefs.DeleteAll();
 
-			if (UnityEngine.Application.platform == RuntimePlatform.PSP2)
+            settings = new AppSettings();
-			{
-				//PSV 等平台需要手动创建目录
-				PSP2Init();
-			}
-
-			settings = new AppSettings();
 
             log = new LogManager();
             LogManager.OnLog += OnNoSugarNetLog;
@@ -74,6 +68,11 @@ namespace AxibugEmuOnline.Client.ClientCore
             tickLoop = go.AddComponent<TickLoop>();
             coRunner = go.AddComponent<CoroutineRunner>();
 
+            if (UnityEngine.Application.platform == RuntimePlatform.PSP2)
+            {
+                //PSV 等平台需要手动创建目录
+                PersistentDataPathDir();
+            }
 
             var importNode = GameObject.Find("IMPORTENT");
             if (importNode != null) GameObject.DontDestroyOnLoad(importNode);
@@ -82,17 +81,12 @@ namespace AxibugEmuOnline.Client.ClientCore
             RePullNetInfo();
         }
 
-
+        private static void PersistentDataPathDir()
-        private static void PSP2Init()
         {
-            //PSVita最好手动创建目录
             if (!Directory.Exists(PersistentDataPath))
+            {
                 Directory.CreateDirectory(PersistentDataPath);
-
+            }
-#if UNITY_PSP2
-            //释放解码 FMV的26M内存，一般游戏用不上（PSP才用那破玩意儿）
-            UnityEngine.PSVita.PSVitaVideoPlayer.TransferMemToMonoHeap();
-#endif
         }
 
         private static IEnumerator AppTickFlow()

AxibugEmuOnline.Client/Assets/Script/AppMain/AxibugEmuOnline.Client.asmdef

@@ -1,12 +1,19 @@
 {
     "name": "AxibugEmuOnline.Client",
+    "rootNamespace": "AxibugEmuOnline.Client",
     "references": [
+        "VirtualNes.Core",
         "UIEffect",
         "AxiReplay",
         "Unity.Postprocessing.Runtime"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
-    "allowUnsafeCode": true
+    "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/FixingPixelArtGrille/FixingPixelArtGrille.shader

@@ -248,19 +248,7 @@ Shader "PostEffect/FixingPixcelArtGrille"
               if(pos.x<0.333)mask.r=_maskLight;
               else if(pos.x<0.666)mask.g=_maskLight;
               else mask.b=_maskLight;
-              return mask;} 
+              return mask;}   
-             #else
-            // VGA style shadow mask.
-            float3 Mask(float2 pos){
-              pos.xy=floor(pos.xy*float2(1.0,0.5));
-              pos.x+=pos.y*3.0;
-              float3 mask=float3(_maskDark,_maskDark,_maskDark);
-              pos.x=fract(pos.x/6.0);
-              if(pos.x<0.333)mask.r=_maskLight;
-              else if(pos.x<0.666)mask.g=_maskLight;
-              else mask.b=_maskLight;
-              return mask;} 
-
             #endif
 
 

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppEmu.cs

@@ -13,7 +13,7 @@ namespace AxibugEmuOnline.Client.Manager
         /// </summary>
         private IEmuCore m_emuCore;
 
-        private VirtualNes.Core.IControllerSetuper m_controllerSetuper;
+        private IControllerSetuper m_controllerSetuper;
 
         /// <summary>
         /// unity的c#实现有bug,以接口类型保存的monobehaviour引用,!=和==运算符没有调用到monobehaviour重写过的运算符
@@ -84,15 +84,10 @@ namespace AxibugEmuOnline.Client.Manager
             else //在房间中则使用服务器下发的手柄槽位信息分配本地手柄
             {
                 long selfUID = App.user.userdata.UID;
-                uint? con0Slot;
+                App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 0, out var con0Slot);
-				uint? con1Slot;
+                App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 1, out var con1Slot);
-				uint? con2Slot;
+                App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 2, out var con2Slot);
-				uint? con3Slot;
+                App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 3, out var con3Slot);
-
-				App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 0, out con0Slot);
-                App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 1, out con1Slot);
-                App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 2, out con2Slot);
-                App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 3, out con3Slot);
 
                 m_controllerSetuper.SetConnect(con0Slot, con1Slot, con2Slot, con3Slot);
             }

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/CacheManager.cs

@@ -62,13 +62,10 @@ namespace AxibugEmuOnline.Client
 
         private Dictionary<string, object> cachesInMemory = new Dictionary<string, object>();
         void GetCacheData<T>(string url, string path, Action<T, string> callback) where T : class
-		{
+        {
-            object cacheObj;
+            if (cachesInMemory.TryGetValue(url, out var cacheObj) && cacheObj is T obj)
-
-			if (cachesInMemory.TryGetValue(url, out cacheObj) && cacheObj is T)
             {
-                T obj = (T)cacheObj;
+                callback.Invoke(obj, url);
-				callback.Invoke(obj, url);
                 return;
             }
 

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/FilterManager.cs

@@ -22,8 +22,6 @@ namespace AxibugEmuOnline.Client
 
         public FilterManager(PostProcessVolume filterVolume, CanvasGroup filterPreview, CanvasGroup mainBg)
         {
-            if (filterVolume == null)
-                return;
             m_filterPorfile = filterVolume.profile;
             m_filters = m_filterPorfile.settings.Where(setting => setting is FilterEffect).Select(setting => new Filter(setting as FilterEffect)).ToList();
             var json = PlayerPrefs.GetString(nameof(FilterRomSetting));
@@ -88,40 +86,23 @@ namespace AxibugEmuOnline.Client
         /// </summary>
         /// <param name="rom">rom对象</param>
         /// <returns>此元组任意内任意成员都有可能为空</returns>
-        public GetFilterSetting_result GetFilterSetting(RomFile rom)
+        public (Filter filter, FilterPreset preset) GetFilterSetting(RomFile rom)
         {
             var value = m_filterRomSetting.Get(rom);
             Filter filter = null;
             FilterPreset preset = null;
 
-			//filter = Filters.FirstOrDefault(f => f.Name == value.filterName);
+            filter = Filters.FirstOrDefault(f => f.Name == value.filterName);
-			//if (filter != null)
+            if (filter != null)
-			//{
-			//    string presetName = value.presetName;
-			//    preset = filter.Presets.FirstOrDefault(p => p.Name == presetName);
-			//}
-
-			filter = Filters.FirstOrDefault(f => f.Name == value.Item1);
-			if (filter != null)
-			{
-				string presetName = value.Item2;
-				preset = filter.Presets.FirstOrDefault(p => p.Name == presetName);
-			}
-
-			return new GetFilterSetting_result()
             {
-                filter = filter,
+                string presetName = value.presetName;
-                preset = preset
+                preset = filter.Presets.FirstOrDefault(p => p.Name == presetName);
-            };
+            }
+
+            return (filter, preset);
         }
 
-        public struct GetFilterSetting_result
+        public class Filter
-        {
-            public Filter filter;
-			public FilterPreset preset;
-		}
-
-		public class Filter
         {
             public string Name => m_setting.Name;
             public IReadOnlyCollection<EditableParamerter> Paramerters => m_setting.EditableParam;
@@ -242,8 +223,8 @@ namespace AxibugEmuOnline.Client
             public string GetParamValueJson(string paramName)
             {
                 prepareCache();
-                string value;
+
-				m_paramName2ValueJson.TryGetValue(paramName, out value);
+                m_paramName2ValueJson.TryGetValue(paramName, out var value);
                 return value;
             }
 
@@ -253,9 +234,8 @@ namespace AxibugEmuOnline.Client
                 if (rawStr == null) return null;
 
                 if (valueType == typeof(float))
-				{
+                {
-                    float floatVal;
+                    float.TryParse(rawStr, out var floatVal);
-					float.TryParse(rawStr, out floatVal);
                     return floatVal;
                 }
                 else if (valueType.IsEnum)
@@ -329,13 +309,12 @@ namespace AxibugEmuOnline.Client
                 return JsonUtility.ToJson(this);
             }
 
-            public ValueTuple<string,string> Get(RomFile rom)
+            public (string filterName, string presetName) Get(RomFile rom)
             {
                 prepareCache();
 
-                Item item;
+                m_cache.TryGetValue(rom.ID, out var item);
-				m_cache.TryGetValue(rom.ID, out item);
+                return (item.FilterName, item.PresetName);
-                return new ValueTuple<string, string>(item.FilterName, item.PresetName);
             }
 
             private void prepareCache()

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/RomFile.cs

@@ -5,7 +5,6 @@ using System.Collections;
 using System.IO;
 using UnityEngine;
 using UnityEngine.Networking;
-using static UnityEngine.EventSystems.EventTrigger;
 
 namespace AxibugEmuOnline.Client
 {
@@ -96,11 +95,9 @@ namespace AxibugEmuOnline.Client
             if (Path.GetExtension(LocalFilePath).ToLower() == ".zip")
             {
                 var zip = new ZipInputStream(new MemoryStream(bytes));
-                var entry = zip.GetNextEntry() as ZipEntry;
+                while (zip.GetNextEntry() is ZipEntry entry)
-
-				while (entry != null)
                 {
-					if (!entry.Name.ToLower().EndsWith(".nes")) continue;
+                    if (!entry.Name.ToLower().EndsWith(".nes")) continue;
 
                     var buffer = new byte[1024];
                     MemoryStream output = new MemoryStream();

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/UserDataManager.cs

@@ -154,16 +154,14 @@ namespace AxibugEmuOnline.Client.Manager
             for (int i = 0; i < msg.UserList.Count; i++)
             {
                 UserMiniInfo mi = msg.UserList[i];
-                bool isNewUser;
+                UpdateOrAddUser(mi, out bool isNewUser);
-				UpdateOrAddUser(mi, out isNewUser);
             }
             Eventer.Instance.PostEvent(EEvent.OnUserListAllUpdate);
         }
         public void RecvCmdUserJoin(byte[] reqData)
         {
             Protobuf_UserJoin_RESP msg = ProtoBufHelper.DeSerizlize<Protobuf_UserJoin_RESP>(reqData);
-            bool isNewUser;
+            UpdateOrAddUser(msg.UserInfo, out bool isNewUser);
-			UpdateOrAddUser(msg.UserInfo, out isNewUser);
             if (isNewUser)
             { 
                 Eventer.Instance.PostEvent(EEvent.OnUserLogin, msg.UserInfo.UID, msg.UserInfo.NickName);

AxibugEmuOnline.Client/Assets/Script/AppMain/MsgBool.cs

@@ -6,7 +6,7 @@ public struct MsgBool
     public string ErrorMsg;
     public bool Value;
 
-    public override string ToString()
+    public override readonly string ToString()
     {
         if (Value)
         {
@@ -33,10 +33,10 @@ public struct MsgBool
         return msgBool.Value;
     }
 
-    //public static implicit operator (bool, string)(MsgBool msgBool)
+    public static implicit operator (bool, string)(MsgBool msgBool)
-    //{
+    {
-    //    return (msgBool.Value, msgBool.ErrorMsg);
+        return (msgBool.Value, msgBool.ErrorMsg);
-    //}
+    }
 
     public static implicit operator string(MsgBool msgBool)
     {

AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/CoreSupporter.cs

@@ -1,5 +1,4 @@
 using AxibugEmuOnline.Client.ClientCore;
-using AxiReplay;
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -102,9 +101,8 @@ namespace AxibugEmuOnline.Client
         public void SampleInput(uint frameIndex)
         {
             if (InGameUI.Instance.IsNetPlay)
-			{
+            {
-                int targetFrame; ReplayStep replayData; int frameDiff; bool inputDiff;
+                if (App.roomMgr.netReplay.TryGetNextFrame((int)frameIndex, out var replayData, out int frameDiff, out bool inputDiff))
-				if (App.roomMgr.netReplay.TryGetNextFrame((int)frameIndex, out replayData, out frameDiff, out inputDiff))
                 {
                     if (inputDiff)
                     {
@@ -114,7 +112,7 @@ namespace AxibugEmuOnline.Client
 
                     m_sampledState = FromNet(replayData);
                 }
-                else m_sampledState = default(ControllerState);
+                else m_sampledState = default;
 
                 var localState = ControllerMapper.CreateState();
                 var rawData = ToNet(localState);

AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/NesControllerMapper.cs

@@ -5,10 +5,10 @@ namespace AxibugEmuOnline.Client
 {
     public class NesControllerMapper : IControllerSetuper
     {
-        public Controller Controller0 { get; } = new Controller(0);
+        public Controller Controller0 { get; } = new(0);
-        public Controller Controller1 { get; } = new Controller(1);
+        public Controller Controller1 { get; } = new(1);
-        public Controller Controller2 { get; } = new Controller(2);
+        public Controller Controller2 { get; } = new(2);
-        public Controller Controller3 { get; } = new Controller(3);
+        public Controller Controller3 { get; } = new(3);
 
         private readonly EnumButtonType[] m_states = new EnumButtonType[4];
 
@@ -138,7 +138,7 @@ namespace AxibugEmuOnline.Client
             }
         }
 
-        public struct KeyListener
+        public readonly struct KeyListener
         {
             private readonly KeyCode m_key;
 
@@ -152,8 +152,7 @@ namespace AxibugEmuOnline.Client
             {
                 m_key = KeyCode.None;
 
-                int result;
+                if (int.TryParse(confStr, out int result))
-				if (int.TryParse(confStr, out result))
                     m_key = (KeyCode)result;
             }
 
@@ -221,7 +220,7 @@ namespace AxibugEmuOnline.Client
                         break;
                 }
 
-                return default(KeyListener);
+                return default;
             }
         }
 

AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/NesEmulator_Screen.mat

@@ -2,19 +2,24 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: NesEmulator_Screen
   m_Shader: {fileID: 4800000, guid: b351396ff606116478d7f4412abe4e2e, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -58,6 +63,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _ColorMask: 15
@@ -85,3 +91,5 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

AxibugEmuOnline.Client/Assets/Script/AppMain/Network/NetMsg.cs

@@ -13,7 +13,7 @@ namespace AxibugEmuOnline.Client.Network
 
         private Dictionary<int, List<Delegate>> netEventDic = new Dictionary<int, List<Delegate>>(128);
 
-        private Queue<ValueTuple<int, int, byte[]>> queueNetMsg = new Queue<ValueTuple<int, int, byte[]>>();
+        private Queue<(int, int, byte[])> queueNetMsg = new Queue<(int, int, byte[])>();
 
         private NetMsg() { }
 
@@ -66,7 +66,7 @@ namespace AxibugEmuOnline.Client.Network
         {
             lock (lockQueueObj)
             {
-                queueNetMsg.Enqueue(new ValueTuple<int,int,byte[]>(cmd, ERRCODE, arg));
+                queueNetMsg.Enqueue((cmd, ERRCODE, arg));
             }
         }
 
@@ -76,8 +76,7 @@ namespace AxibugEmuOnline.Client.Network
             {
                 while (queueNetMsg.Count > 0)
                 {
-
+                    (int, int, byte[]) msgData = queueNetMsg.Dequeue();
-					var msgData = queueNetMsg.Dequeue();
                     PostNetMsgEvent(msgData.Item1, msgData.Item2, msgData.Item3);
                 }
             }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/UI_BgSettingItem_Color.cs

@@ -39,7 +39,7 @@ namespace AxibugEmuOnline.Client
 
         public void SetDependencyProperty(object data)
         {
-            SetSelectState(data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index);
+            SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
         }
 
         public void Release()

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/UI_FilterItem.cs

@@ -7,192 +7,191 @@ using UnityEngine;
 using static AxibugEmuOnline.Client.FilterManager;
 
 namespace AxibugEmuOnline.Client
-{
+{
-	/// <summary>
+    /// <summary>
-	/// 背景颜色设置UI
+    /// 背景颜色设置UI
-	/// </summary>
+    /// </summary>
-	public class UI_FilterItem : MenuItem, IVirtualItem
+    public class UI_FilterItem : MenuItem, IVirtualItem
-	{
+    {
-		public int Index { get; set; }
+        public int Index { get; set; }
-		public Filter Datacontext { get; private set; }
+        public Filter Datacontext { get; private set; }
+
+        public void SetData(object data)
+        {
+            Datacontext = data as Filter;
+
+            UpdateView();
+        }
+
+        private void UpdateView()
+        {
+            if (Datacontext == null)
+                SetBaseInfo("无", null, null);
+            else
+                SetBaseInfo(Datacontext.Name, $"参数数量:{Datacontext.Paramerters.Count}", null);
+        }
+
+        public void SetDependencyProperty(object data)
+        {
+            SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
+
+            if (m_select)
+            {
+                App.filter.EnableFilterPreview();
+                if (App.filter != null)
+                    App.filter.EnableFilter(Datacontext);
+                else
+                    App.filter.ShutDownFilter();
+            }
+        }
+
+        public void Release() { }
+
+        public override bool OnEnterItem()
+        {
+            if (Datacontext != null && Datacontext.Paramerters.Count > 0)
+            {
+                var opts = new List<OptionMenu>();
+                opts.Add(new Opt_CreatePreset(Datacontext));
+                opts.AddRange(Datacontext.Presets.Select(p => new Opt_Presets(Datacontext, p)));
 
-		public void SetData(object data)
+                OverlayManager.PopSideBar(opts, onClose: () =>
-		{
+                {
-			Datacontext = data as Filter;
+                    App.filter.EnableFilterPreview();
-
+                    Datacontext.ResetPreset();
-			UpdateView();
+                    App.filter.EnableFilter(Datacontext);
-		}
+                });
-
+            }
-		private void UpdateView()
+            return false;
-		{
+        }
-			if (Datacontext == null)
+
-				SetBaseInfo("无", null, null);
+
-			else
+        public class Opt_CreatePreset : ExecuteMenu
-				SetBaseInfo(Datacontext.Name, $"参数数量:{Datacontext.Paramerters.Count}", null);
+        {
-		}
+            private Filter m_filter;
-
+
-		public void SetDependencyProperty(object data)
+            public Opt_CreatePreset(Filter filter) : base("创建滤镜预设", Resources.LoadAll<Sprite>("Icons/XMB-Icons/misc")[0])
-		{
+            {
-			SetSelectState(data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index);
+                m_filter = filter;
-
+            }
-			if (m_select)
+
-			{
+            public override void OnFocus()
-				App.filter.EnableFilterPreview();
+            {
-				if (App.filter != null)
+                m_filter.ResetPreset();
-					App.filter.EnableFilter(Datacontext);
+                App.filter.EnableFilter(m_filter);
-				else
+            }
-					App.filter.ShutDownFilter();
+
-			}
+            public override void OnExcute(OptionUI optionUI, ref bool cancelHide)
-		}
+            {
-
+                cancelHide = true;
-		public void Release() { }
+
-
+                OverlayManager.Input((presetName) =>
-		public override bool OnEnterItem()
+                {
-		{
+                    var result = m_filter.CreatePreset(presetName, out var newPreset);
-			if (Datacontext != null && Datacontext.Paramerters.Count > 0)
+                    if (!result) OverlayManager.PopTip(result);
-			{
+                    else optionUI.AddOptionMenuWhenPoping(new Opt_Presets(m_filter, newPreset));
-				var opts = new List<OptionMenu>();
+                }, "为预设设置一个名称", string.Empty);
-				opts.Add(new Opt_CreatePreset(Datacontext));
+            }
-				opts.AddRange(Datacontext.Presets.Select(p => new Opt_Presets(Datacontext, p)));
+        }
-
+        public class Opt_Presets : ExpandMenu
-				OverlayManager.PopSideBar(opts, onClose: () =>
+        {
-				{
+            private Filter m_filter;
-					App.filter.EnableFilterPreview();
+            private FilterPreset m_preset;
-					Datacontext.ResetPreset();
+            private OptionUI_MenuItem m_ui;
-					App.filter.EnableFilter(Datacontext);
+            private List<OptionMenu> m_menu;
-				});
+
-			}
+            public Opt_Presets(Filter filter, FilterPreset preset) : base(preset.Name, null)
-			return false;
+            {
-		}
+                m_filter = filter;
-
+                m_preset = preset;
-
+
-		public class Opt_CreatePreset : ExecuteMenu
+                m_menu = new List<OptionMenu>();
-		{
+                m_menu.Add(new Opt_Delete(m_filter, m_preset));
-			private Filter m_filter;
+                foreach (var p in m_filter.Paramerters)
-
+                {
-			public Opt_CreatePreset(Filter filter) : base("创建滤镜预设", Resources.LoadAll<Sprite>("Icons/XMB-Icons/misc")[0])
+                    m_menu.Add(new Opt_ParamEditor(m_filter, p, m_preset));
-			{
+                }
-				m_filter = filter;
+            }
-			}
+
-
+            public override void OnShow(OptionUI_MenuItem ui)
-			public override void OnFocus()
+            {
-			{
+                EventInvoker.OnFilterPresetRemoved += EventInvoker_OnFilterPresetRemoved;
-				m_filter.ResetPreset();
+                m_ui = ui;
-				App.filter.EnableFilter(m_filter);
+                base.OnShow(ui);
-			}
+            }
-
+
-			public override void OnExcute(OptionUI optionUI, ref bool cancelHide)
+            public override void OnHide()
-			{
+            {
-				cancelHide = true;
+                EventInvoker.OnFilterPresetRemoved -= EventInvoker_OnFilterPresetRemoved;
-
+            }
-				OverlayManager.Input((presetName) =>
+
-				{
+            private void EventInvoker_OnFilterPresetRemoved(Filter filter, FilterPreset removedPreset)
-					FilterPreset newPreset;
+            {
-					var result = m_filter.CreatePreset(presetName, out newPreset);
+                if (filter != m_filter || m_preset != removedPreset) return;
-					if (!result) OverlayManager.PopTip(result);
+                m_ui.OptionUI.RemoveItem(m_ui);
-					else optionUI.AddOptionMenuWhenPoping(new Opt_Presets(m_filter, newPreset));
+            }
-				}, "为预设设置一个名称", string.Empty);
+
-			}
+            public override void OnFocus()
-		}
+            {
-		public class Opt_Presets : ExpandMenu
+                m_filter.ApplyPreset(m_preset);
-		{
+                App.filter.EnableFilter(m_filter);
-			private Filter m_filter;
+            }
-			private FilterPreset m_preset;
+
-			private OptionUI_MenuItem m_ui;
+            protected override List<OptionMenu> GetOptionMenus()
-			private List<OptionMenu> m_menu;
+            {
-
+                return m_menu;
-			public Opt_Presets(Filter filter, FilterPreset preset) : base(preset.Name, null)
+            }
-			{
+
-				m_filter = filter;
+            public class Opt_ParamEditor : ValueSetMenu
-				m_preset = preset;
+            {
-
+                private Filter m_filter;
-				m_menu = new List<OptionMenu>();
+                private FilterEffect.EditableParamerter m_param;
-				m_menu.Add(new Opt_Delete(m_filter, m_preset));
+                private FilterPreset m_preset;
-				foreach (var p in m_filter.Paramerters)
+
-				{
+                public override bool Visible => m_param.ValueType.IsEnum || m_param.ValueType == typeof(float);
-					m_menu.Add(new Opt_ParamEditor(m_filter, p, m_preset));
+
-				}
+                public Opt_ParamEditor(Filter filter, FilterEffect.EditableParamerter editParam, FilterPreset preset)
-			}
+                    : base(editParam.Name)
-
+                {
-			public override void OnShow(OptionUI_MenuItem ui)
+                    m_filter = filter;
-			{
+                    m_param = editParam;
-				EventInvoker.OnFilterPresetRemoved += EventInvoker_OnFilterPresetRemoved;
+                    m_preset = preset;
-				m_ui = ui;
+                }
-				base.OnShow(ui);
+
-			}
+                public override Type ValueType => m_param.ValueType;
-
+
-			public override void OnHide()
+                public override object ValueRaw => m_preset.GetParamValue(m_param.Name, ValueType) ?? m_param.Value;
-			{
+
-				EventInvoker.OnFilterPresetRemoved -= EventInvoker_OnFilterPresetRemoved;
+                public override void OnValueChanged(object newValue)
-			}
+                {
-
+                    m_preset.SetParamValue(m_param.Name, ValueType, newValue);
-			private void EventInvoker_OnFilterPresetRemoved(Filter filter, FilterPreset removedPreset)
+                    m_filter.SavePresets();
-			{
+                    m_param.Apply(newValue);
-				if (filter != m_filter || m_preset != removedPreset) return;
+                }
-				m_ui.OptionUI.RemoveItem(m_ui);
+
-			}
+                public override object Min => m_param.MinValue;
-
+
-			public override void OnFocus()
+                public override object Max => m_param.MaxValue;
-			{
+            }
-				m_filter.ApplyPreset(m_preset);
+
-				App.filter.EnableFilter(m_filter);
+            public class Opt_Delete : ExecuteMenu
-			}
+            {
-
+                private Filter m_filter;
-			protected override List<OptionMenu> GetOptionMenus()
+                private FilterPreset m_preset;
-			{
+
-				return m_menu;
+                public Opt_Delete(Filter filter, FilterPreset preset) : base("删除预设", null)
-			}
+                {
-
+                    m_filter = filter;
-			public class Opt_ParamEditor : ValueSetMenu
+                    m_preset = preset;
-			{
+                }
-				private Filter m_filter;
+
-				private FilterEffect.EditableParamerter m_param;
+                public override void OnExcute(OptionUI optionUI, ref bool cancelHide)
-				private FilterPreset m_preset;
+                {
-
+                    m_filter.RemovePreset(m_preset);
-				public override bool Visible => m_param.ValueType.IsEnum || m_param.ValueType == typeof(float);
+                }
-
+            }
-				public Opt_ParamEditor(Filter filter, FilterEffect.EditableParamerter editParam, FilterPreset preset)
+
-					: base(editParam.Name)
+
-				{
+        }
-					m_filter = filter;
+    }
-					m_param = editParam;
-					m_preset = preset;
-				}
-
-				public override Type ValueType => m_param.ValueType;
-
-				public override object ValueRaw => m_preset.GetParamValue(m_param.Name, ValueType) ?? m_param.Value;
-
-				public override void OnValueChanged(object newValue)
-				{
-					m_preset.SetParamValue(m_param.Name, ValueType, newValue);
-					m_filter.SavePresets();
-					m_param.Apply(newValue);
-				}
-
-				public override object Min => m_param.MinValue;
-
-				public override object Max => m_param.MaxValue;
-			}
-
-			public class Opt_Delete : ExecuteMenu
-			{
-				private Filter m_filter;
-				private FilterPreset m_preset;
-
-				public Opt_Delete(Filter filter, FilterPreset preset) : base("删除预设", null)
-				{
-					m_filter = filter;
-					m_preset = preset;
-				}
-
-				public override void OnExcute(OptionUI optionUI, ref bool cancelHide)
-				{
-					m_filter.RemovePreset(m_preset);
-				}
-			}
-
-
-		}
-	}
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/GamesUI/RomItem.cs

@@ -37,12 +37,12 @@ namespace AxibugEmuOnline.Client
                 m_romlib.BeginFetchRomInfo(m_romfile);
             }
 
-            SetSelectState(data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index);
+            SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
         }
 
         public void SetDependencyProperty(object data)
         {
-            SetSelectState(data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index);
+            SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
         }
 
         public void Release()

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/InGameUI/InGameUI.cs

@@ -11,7 +11,7 @@ namespace AxibugEmuOnline.Client
         private object m_state;
         private StepPerformer m_stepPerformer;
 
-        private readonly List<OptionMenu> menus = new List<OptionMenu>();
+        private readonly List<OptionMenu> menus = new();
         public static InGameUI Instance { get; private set; }
 
         public RomFile RomFile { get; private set; }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/InGameUI/InGameUI_FilterSetting.cs

@@ -1,11 +1,14 @@
 using AxibugEmuOnline.Client.ClientCore;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor.Presets;
+using UnityEngine;
+using VirtualNes.Core;
 using static AxibugEmuOnline.Client.FilterManager;
 
 namespace AxibugEmuOnline.Client
-{
+{
-	public class InGameUI_FilterSetting : ExpandMenu
+    public class InGameUI_FilterSetting : ExpandMenu
     {
         private InGameUI m_gameUI;
 

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/GameObjectPool.cs

@@ -39,10 +39,8 @@ public static class GameObjectPool
 
     public static void Release(GameObject instance)
     {
-        GameObject src;
+        s_instanceToSrc.TryGetValue(instance, out var src);
-        Queue<GameObject> pool;
+        if (src != null && s_poolMap.TryGetValue(src, out var pool))
-		s_instanceToSrc.TryGetValue(instance, out src);
-        if (src != null && s_poolMap.TryGetValue(src, out pool))
         {
             pool.Enqueue(instance);
             //instance.SetActive(false);

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemPresent.cs

@@ -480,10 +480,9 @@ public class ItemPresent : GridLayoutGroup, IVirtualLayout
             if (_dataList != null)
                 _dataList.Clear();
         }
-        else if (dataList is IEnumerable)
+        else if (dataList is IEnumerable ienumrable)
         {
-            var ienumrable = (IEnumerable)dataList;
+            List<object> temp = new List<object>();
-			List<object> temp = new List<object>();
             foreach (var item in ienumrable)
             {
                 temp.Add(item);

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemProxy.cs

@@ -6,245 +6,240 @@ using UnityEngine.UI;
 
 public interface IVirtualLayout
 {
-	Dictionary<GameObject, ScripteInterface> CacheItemScripts { get; }
+    Dictionary<GameObject, ScripteInterface> CacheItemScripts { get; }
-	List<object> DataList { get; }
+    public List<object> DataList { get; }
-	object DependencyProperty { get; }
+    public object DependencyProperty { get; }
-	RectTransform RectTransform { get; }
+    public RectTransform RectTransform { get; }
-	RectTransform GetTemplate(object data);
+    public RectTransform GetTemplate(object data);
-	Vector2 GetItemAnchorePos(int index);
+    public Vector2 GetItemAnchorePos(int index);
-	RectTransform GetItemUIIfExist(int index);
+    public RectTransform GetItemUIIfExist(int index);
 
-	void UpdateProxyVisualState();
+    public void UpdateProxyVisualState();
-	void UpdateDependencyProperty(object dp);
+    public void UpdateDependencyProperty(object dp);
-	void SetData(object dataList);
+    public void SetData(object dataList);
-	void MoveToScrollViewCenter(ScrollRect scrollRect, int dataIndex);
+    public void MoveToScrollViewCenter(ScrollRect scrollRect, int dataIndex);
 }
 
 public class ItemProxy
 {
-	public bool IsDestroyed;
+    public bool IsDestroyed;
-	public bool Visible = true;
+    public bool Visible = true;
-	public int Index;
+    public int Index;
-	public bool IsInViewRect;
+    public bool IsInViewRect;
 
-	public Vector2 Pivot => _template.pivot;
+    public Vector2 Pivot => _template.pivot;
-	public Vector2 AnchoredPosition;
+    public Vector2 AnchoredPosition;
 
-	public float Width;
+    public float Width;
-	public float Height;
+    public float Height;
 
-	private IVirtualLayout _parent;
+    private IVirtualLayout _parent;
 
-	private RectTransform _template => _parent.GetTemplate(_parent.DataList[Index]);
+    private RectTransform _template => _parent.GetTemplate(_parent.DataList[Index]);
-	private RectTransform _runtimeInstance;
+    private RectTransform _runtimeInstance;
-	private LayoutGroup _layoutElement;
+    private LayoutGroup _layoutElement;
 
-	public RectTransform RuntimeItemUI => _runtimeInstance;
+    public RectTransform RuntimeItemUI => _runtimeInstance;
-	public bool firstShow { get; private set; } = true;
+    public bool firstShow { get; private set; } = true;
 
-	public float PreferredWidth
+    public float PreferredWidth
-	{
+    {
-		get
+        get
-		{
+        {
-			if (_layoutElement == null) return 0;
+            if (_layoutElement == null) return 0;
 
-			return _layoutElement.preferredWidth;
+            return _layoutElement.preferredWidth;
-		}
+        }
-	}
+    }
-	public float PreferredHeight
+    public float PreferredHeight
-	{
+    {
-		get
+        get
-		{
+        {
-			if (_layoutElement == null) return 0;
+            if (_layoutElement == null) return 0;
 
-			return _layoutElement.preferredHeight;
+            return _layoutElement.preferredHeight;
-		}
+        }
-	}
+    }
 
-	public ScripteInterface GetLuaObj()
+    public ScripteInterface GetLuaObj()
-	{
+    {
-		if (_runtimeInstance == null) return null;
+        if (_runtimeInstance == null) return null;
 
-		ScripteInterface lfi;
+        _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface lfi);
 
-		_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out lfi);
+        return lfi;
+    }
 
-		return lfi;
+    public ItemProxy(IVirtualLayout parent)
-	}
+    {
+        _parent = parent;
+    }
 
-	public ItemProxy(IVirtualLayout parent)
+    public void Dispose()
-	{
+    {
-		_parent = parent;
+        if (_runtimeInstance != null)
-	}
+        {
+            if (Application.isPlaying)
+            {
+                GameObjectPool.Release(_runtimeInstance.gameObject);
+            }
+            else
+                GameObject.DestroyImmediate(_runtimeInstance.gameObject);
+        }
+    }
 
-	public void Dispose()
+    public bool NeedShow
-	{
+    {
-		if (_runtimeInstance != null)
+        get
-		{
+        {
-			if (Application.isPlaying)
+            if (IsInViewRect && _runtimeInstance == null) return true;
-			{
+            else
-				GameObjectPool.Release(_runtimeInstance.gameObject);
+            {
-			}
+                if (_runtimeInstance != null && IsInViewRect && _runtimeInstance.anchoredPosition != AnchoredPosition)
-			else
+                    return true;
-				GameObject.DestroyImmediate(_runtimeInstance.gameObject);
+                else
-		}
+                    return false;
-	}
+            }
+        }
 
-	public bool NeedShow
+    }
-	{
+    public bool NeedHide => !IsInViewRect && _runtimeInstance != null;
-		get
-		{
-			if (IsInViewRect && _runtimeInstance == null) return true;
-			else
-			{
-				if (_runtimeInstance != null && IsInViewRect && _runtimeInstance.anchoredPosition != AnchoredPosition)
-					return true;
-				else
-					return false;
-			}
-		}
 
-	}
+    public void UpdateView(bool force = false)
-	public bool NeedHide => !IsInViewRect && _runtimeInstance != null;
+    {
+        if (IsInViewRect)
+        {
+            if (_runtimeInstance == null)
+            {
+                _runtimeInstance = GetInstance();
+                _layoutElement = _runtimeInstance.GetComponent<LayoutGroup>();
+                UpdateViewData();
+            }
+            else if (force)
+            {
+                UpdateViewData();
+            }
 
-	public void UpdateView(bool force = false)
+            UpdateLayout();
-	{
+        }
-		if (IsInViewRect)
+        else
-		{
+        {
-			if (_runtimeInstance == null)
+            ReleaseInstance();
-			{
+        }
-				_runtimeInstance = GetInstance();
+    }
-				_layoutElement = _runtimeInstance.GetComponent<LayoutGroup>();
-				UpdateViewData();
-			}
-			else if (force)
-			{
-				UpdateViewData();
-			}
 
-			UpdateLayout();
+    public void UpdateLayout()
-		}
+    {
-		else
+        if (_runtimeInstance != null)
-		{
+        {
-			ReleaseInstance();
+            _runtimeInstance.gameObject.SetActive(true);
-		}
+            _runtimeInstance.anchorMax = Vector2.up;
-	}
+            _runtimeInstance.anchorMin = Vector2.up;
+            _runtimeInstance.anchoredPosition = AnchoredPosition;
+            _runtimeInstance.sizeDelta = new Vector2(Width, Height);
+        }
+        if (_layoutElement != null)
+        {
+            _layoutElement.CalculateLayoutInputHorizontal();
+            _layoutElement.CalculateLayoutInputVertical();
+            _layoutElement.SetLayoutHorizontal();
+            _layoutElement.SetLayoutVertical();
+        }
 
-	public void UpdateLayout()
+    }
-	{
-		if (_runtimeInstance != null)
-		{
-			_runtimeInstance.gameObject.SetActive(true);
-			_runtimeInstance.anchorMax = Vector2.up;
-			_runtimeInstance.anchorMin = Vector2.up;
-			_runtimeInstance.anchoredPosition = AnchoredPosition;
-			_runtimeInstance.sizeDelta = new Vector2(Width, Height);
-		}
-		if (_layoutElement != null)
-		{
-			_layoutElement.CalculateLayoutInputHorizontal();
-			_layoutElement.CalculateLayoutInputVertical();
-			_layoutElement.SetLayoutHorizontal();
-			_layoutElement.SetLayoutVertical();
-		}
 
-	}
+    private void UpdateViewData()
+    {
+        if (Application.isPlaying)
+        {
+            if (!_parent.CacheItemScripts.ContainsKey(_runtimeInstance.gameObject))
+            {
+                var vItem = _runtimeInstance.gameObject.GetComponent<IVirtualItem>();
+                ScripteInterface newSI = new ScripteInterface(vItem);
+                _parent.CacheItemScripts[_runtimeInstance.gameObject] = newSI;
+            }
 
-	private void UpdateViewData()
+            _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface si);
-	{
+            si.SetDataList(_parent.DataList[Index], Index);
-		if (Application.isPlaying)
+            if (_parent.DependencyProperty != null)
-		{
+                si.SetDependencyProperty(_parent.DependencyProperty);
-			if (!_parent.CacheItemScripts.ContainsKey(_runtimeInstance.gameObject))
+        }
-			{
+    }
-				var vItem = _runtimeInstance.gameObject.GetComponent<IVirtualItem>();
-				ScripteInterface newSI = new ScripteInterface(vItem);
-				_parent.CacheItemScripts[_runtimeInstance.gameObject] = newSI;
-			}
 
-			ScripteInterface si;
+    public void UpdateDP()
+    {
+        if (_runtimeInstance == null) return;
 
-			_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out si);
+        _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface luaInterface);
-			si.SetDataList(_parent.DataList[Index], Index);
+        if (luaInterface == null) return;
-			if (_parent.DependencyProperty != null)
-				si.SetDependencyProperty(_parent.DependencyProperty);
-		}
-	}
 
-	public void UpdateDP()
+        if (_parent.DependencyProperty != null)
-	{
+            luaInterface.SetDependencyProperty(_parent.DependencyProperty);
-		if (_runtimeInstance == null) return;
+    }
-		ScripteInterface luaInterface;
-		_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out luaInterface);
-		if (luaInterface == null) return;
 
-		if (_parent.DependencyProperty != null)
+    private RectTransform GetInstance()
-			luaInterface.SetDependencyProperty(_parent.DependencyProperty);
+    {
-	}
+        var res = GameObjectPool.GetInstance(_template.gameObject, _parent.RectTransform).GetComponent<RectTransform>();
+        return res;
+    }
 
-	private RectTransform GetInstance()
+    private void ReleaseInstance()
-	{
+    {
-		var res = GameObjectPool.GetInstance(_template.gameObject, _parent.RectTransform).GetComponent<RectTransform>();
+        if (_runtimeInstance == null) return;
-		return res;
-	}
 
-	private void ReleaseInstance()
+        _layoutElement = null;
-	{
-		if (_runtimeInstance == null) return;
 
-		_layoutElement = null;
+        if (Application.isPlaying)
-
+        {
-		if (Application.isPlaying)
+            _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface si);
-		{
+            if (si != null) si.Release();
-			ScripteInterface si;
+            GameObjectPool.Release(_runtimeInstance.gameObject);
-			_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out si);
+            _runtimeInstance = null;
-			if (si != null) si.Release();
+        }
-			GameObjectPool.Release(_runtimeInstance.gameObject);
+        else
-			_runtimeInstance = null;
+        {
-		}
+            GameObject.DestroyImmediate(_runtimeInstance.gameObject);
-		else
+            _runtimeInstance = null;
-		{
+        }
-			GameObject.DestroyImmediate(_runtimeInstance.gameObject);
+    }
-			_runtimeInstance = null;
-		}
-	}
 }
 
 public class ScripteInterface
 {
-	private IVirtualItem _itemInstance;
+    private IVirtualItem _itemInstance;
-	public IVirtualItem ItemInstance => _itemInstance;
+    public IVirtualItem ItemInstance => _itemInstance;
 
-	public ScripteInterface(IVirtualItem lc)
+    public ScripteInterface(IVirtualItem lc)
-	{
+    {
-		_itemInstance = lc;
+        _itemInstance = lc;
-	}
+    }
 
-	public void SetDataList(object dataItem, int index)
+    public void SetDataList(object dataItem, int index)
-	{
+    {
-		if (_itemInstance == null) return;
+        if (_itemInstance == null) return;
-		_itemInstance.Index = index;
+        _itemInstance.Index = index;
-		_itemInstance.SetData(dataItem);
+        _itemInstance.SetData(dataItem);
-	}
+    }
-	public void Release()
+    public void Release()
-	{
+    {
-		if (_itemInstance == null) return;
+        if (_itemInstance == null) return;
-		_itemInstance.Release();
+        _itemInstance.Release();
-	}
+    }
 
-	public void SetDependencyProperty(object dependencyProperty)
+    public void SetDependencyProperty(object dependencyProperty)
-	{
+    {
-		if (_itemInstance == null) return;
+        if (_itemInstance == null) return;
 
-		_itemInstance.SetDependencyProperty(dependencyProperty);
+        _itemInstance.SetDependencyProperty(dependencyProperty);
-	}
+    }
 
 }
 
 public interface IVirtualItem
 {
-	GameObject gameObject { get; }
+    GameObject gameObject { get; }
-	int Index { get; set; }
+    int Index { get; set; }
-	void SetData(object data);
+    void SetData(object data);
-	void SetDependencyProperty(object data);
+    void SetDependencyProperty(object data);
-	void Release();
+    void Release();
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI.cs

@@ -269,18 +269,16 @@ namespace AxibugEmuOnline.Client
 
         private void CreateRuntimeMenuItem(OptionMenu menuData)
         {
-            if (menuData is ExecuteMenu)
+            if (menuData is ExecuteMenu executeMenu)
             {
-				ExecuteMenu executeMenu = (ExecuteMenu)menuData;
+                var menuUI = Instantiate(TEMPLATE_EXECUTEITEM.gameObject, TEMPLATE_EXECUTEITEM.transform.parent).GetComponent<OptionUI_ExecuteItem>();
-				var menuUI = Instantiate(TEMPLATE_EXECUTEITEM.gameObject, TEMPLATE_EXECUTEITEM.transform.parent).GetComponent<OptionUI_ExecuteItem>();
                 menuUI.gameObject.SetActive(true);
                 menuUI.SetData(this, executeMenu);
                 m_runtimeMenuItems.Add(menuUI);
             }
-            else if (menuData is ValueSetMenu)
+            else if (menuData is ValueSetMenu valueSetMenu)
             {
-                var valueSetMenu = (ValueSetMenu)menuData;
+                var menuUI = Instantiate(TEMPLATE_VALUEEDITITEM.gameObject, TEMPLATE_VALUEEDITITEM.transform.parent).GetComponent<OptionUI_ValueEditItem>();
-				var menuUI = Instantiate(TEMPLATE_VALUEEDITITEM.gameObject, TEMPLATE_VALUEEDITITEM.transform.parent).GetComponent<OptionUI_ValueEditItem>();
                 menuUI.gameObject.SetActive(true);
                 menuUI.SetData(this, valueSetMenu);
                 m_runtimeMenuItems.Add(menuUI);

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_ValueEditItem.cs

@@ -17,10 +17,9 @@ namespace AxibugEmuOnline.Client
             com_floatEdit.gameObject.SetActive(false);
             com_enumEdit.gameObject.SetActive(false);
 
-            if (menuData is ValueSetMenu)
+            if (menuData is ValueSetMenu valueMenu)
             {
-                var valueMenu = (ValueSetMenu)menuData;
+                if (valueMenu.ValueType == typeof(float))
-				if (valueMenu.ValueType == typeof(float))
                 {
                     m_currentCom = com_floatEdit;
                 }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/InputUI.cs

@@ -18,11 +18,11 @@ namespace AxibugEmuOnline.Client
 
         protected override void OnShow(object param)
         {
-            ValueTuple<Action<string>, string, string> t = (ValueTuple<Action<string>, string, string>)param;
+            (Action<string> callback, string placeHolder, string defaultText) t = ((Action<string> callback, string placeHolder, string defaultText))param;
 
-            OnCommit = t.Item1;
+            OnCommit = t.callback;
-            (m_input.placeholder as Text).text = t.Item2;
+            (m_input.placeholder as Text).text = t.placeHolder;
-            m_input.text = t.Item3;
+            m_input.text = t.defaultText;
         }
 
         protected override void Update()

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/OverlayManager.cs

@@ -22,7 +22,7 @@ namespace AxibugEmuOnline.Client
 
         public static InputUI Input(Action<string> callback, string placeHolder, string defaultText)
         {
-            s_ins.m_InputUI.Show(new ValueTuple<Action<string>, string, string>(callback, placeHolder, defaultText));
+            s_ins.m_InputUI.Show((callback, placeHolder, defaultText));
 
             return s_ins.m_InputUI;
         }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/RoomUI/RoomItem.cs

@@ -9,136 +9,132 @@ using Debug = System.Diagnostics.Debug;
 
 namespace AxibugEmuOnline.Client
 {
-	public class RoomItem : MenuItem, IVirtualItem
+    public class RoomItem : MenuItem, IVirtualItem
-	{
+    {
-		[SerializeField] Image m_roomPreview;
+        [SerializeField] Image m_roomPreview;
-		[SerializeField] Slider m_downloadProgress;
+        [SerializeField] Slider m_downloadProgress;
-		[SerializeField] GameObject m_downloadingFlag;
+        [SerializeField] GameObject m_downloadingFlag;
-		[SerializeField] GameObject m_romReadyFlag;
+        [SerializeField] GameObject m_romReadyFlag;
 
-		private RomFile m_romFile;
+        private RomFile m_romFile;
 
-		public int Index { get; set; }
+        public int Index { get; set; }
-		public int RoomID { get; private set; }
+        public int RoomID { get; private set; }
 
-		protected override void Awake()
+        protected override void Awake()
-		{
+        {
-			base.Awake();
+            base.Awake();
 
-			Eventer.Instance.RegisterEvent<int>(EEvent.OnRoomListSingleUpdate, OnRoomSignelUpdate);
+            Eventer.Instance.RegisterEvent<int>(EEvent.OnRoomListSingleUpdate, OnRoomSignelUpdate);
-		}
+        }
 
-		private void OnRoomSignelUpdate(int roomID)
+        private void OnRoomSignelUpdate(int roomID)
-		{
+        {
-			if (this.RoomID != roomID) return;
+            if (this.RoomID != roomID) return;
 
-			Protobuf_Room_MiniInfo roomInfo;
+            if (App.roomMgr.GetRoomListMiniInfo(roomID, out var roomInfo))
-			if (App.roomMgr.GetRoomListMiniInfo(roomID, out roomInfo))
+                UpdateUI(roomInfo);
-				UpdateUI(roomInfo);
+        }
-		}
 
-		public void SetData(object data)
+        public void SetData(object data)
-		{
+        {
-			Debug.Assert(data is Protobuf_Room_MiniInfo);
+            Debug.Assert(data is Protobuf_Room_MiniInfo);
 
-			var roomInfo = (Protobuf_Room_MiniInfo)data;
+            var roomInfo = (Protobuf_Room_MiniInfo)data;
-			RoomID = roomInfo.RoomID;
+            RoomID = roomInfo.RoomID;
 
-			UpdateUI(roomInfo);
+            UpdateUI(roomInfo);
-		}
+        }
 
-		public override bool OnEnterItem()
+        public override bool OnEnterItem()
-		{
+        {
-			if (m_romFile == null) return false;
+            if (m_romFile == null) return false;
 
-			if (!m_romFile.RomReady)
+            if (!m_romFile.RomReady)
-			{
+            {
-				m_romFile.BeginDownload();
+                m_romFile.BeginDownload();
-				return false;
+                return false;
-			}
+            }
-			else
+            else
-			{
+            {
-				Protobuf_Room_MiniInfo MiniInfo;
+                if (!App.roomMgr.GetRoomListMiniInfo(RoomID, out Protobuf_Room_MiniInfo MiniInfo))
-				if (!App.roomMgr.GetRoomListMiniInfo(RoomID, out MiniInfo))
+                {
-				{
+                    OverlayManager.PopTip("房间不存在");
-					OverlayManager.PopTip("房间不存在");
+                    return false;
-					return false;
+                }
-				}
-				int[] freeSlots;
-				if (!MiniInfo.GetFreeSlot(out freeSlots))
-				{
-					OverlayManager.PopTip("无空闲位置");
-					return false;
-				}
 
-				App.roomMgr.SendJoinRoom(RoomID);
+                if (!MiniInfo.GetFreeSlot(out var freeSlots))
-				return true;
+                {
-			}
+                    OverlayManager.PopTip("无空闲位置");
-		}
+                    return false;
+                }
 
-		private void UpdateUI(Protobuf_Room_MiniInfo roomInfo)
+                App.roomMgr.SendJoinRoom(RoomID);
-		{
+                return true;
-			var hostNick = roomInfo.GetHostNickName();
+            }
-			int cur; int max;
+        }
 
-			roomInfo.GetRoomPlayers(out cur, out max);
+        private void UpdateUI(Protobuf_Room_MiniInfo roomInfo)
-			SetBaseInfo("--", $"<b>{hostNick}</b>的房间", $"{cur}/{max}");
+        {
-			SetIcon(null);
+            var hostNick = roomInfo.GetHostNickName();
+            roomInfo.GetRoomPlayers(out var cur, out var max);
+            SetBaseInfo("--", $"<b>{hostNick}</b>的房间", $"{cur}/{max}");
+            SetIcon(null);
 
-			roomInfo.FetchRomFileInRoomInfo(EnumPlatform.NES, (room, romFile) =>
+            roomInfo.FetchRomFileInRoomInfo(EnumPlatform.NES, (room, romFile) =>
-			{
+            {
-				if (room.RoomID != RoomID) return;
+                if (room.RoomID != RoomID) return;
 
-				m_romFile = romFile;
+                m_romFile = romFile;
-				Txt.text = romFile.Alias;
+                Txt.text = romFile.Alias;
 
-				UpdateRomInfoView();
+                UpdateRomInfoView();
-				App.CacheMgr.GetSpriteCache(romFile.ImageURL, OnGetRomImage);
+                App.CacheMgr.GetSpriteCache(romFile.ImageURL, OnGetRomImage);
-			});
+            });
-		}
+        }
 
-		protected override void Update()
+        protected override void Update()
-		{
+        {
-			UpdateRomInfoView();
+            UpdateRomInfoView();
-			base.Update();
+            base.Update();
-		}
+        }
 
-		private void UpdateRomInfoView()
+        private void UpdateRomInfoView()
-		{
+        {
-			float? downloadingProgress = null;
+            float? downloadingProgress = null;
-			bool romReady = false;
+            bool romReady = false;
 
-			if (m_romFile != null)
+            if (m_romFile != null)
-			{
+            {
-				if (m_romFile.IsDownloading)
+                if (m_romFile.IsDownloading)
-					downloadingProgress = m_romFile.Progress;
+                    downloadingProgress = m_romFile.Progress;
-				if (m_romFile.RomReady)
+                if (m_romFile.RomReady)
-					romReady = true;
+                    romReady = true;
-			}
+            }
 
-			m_downloadingFlag.SetActiveEx(downloadingProgress.HasValue);
+            m_downloadingFlag.SetActiveEx(downloadingProgress.HasValue);
-			if (downloadingProgress.HasValue)
+            if (downloadingProgress.HasValue)
-				m_downloadProgress.value = downloadingProgress.Value;
+                m_downloadProgress.value = downloadingProgress.Value;
 
-			m_romReadyFlag.SetActiveEx(romReady);
+            m_romReadyFlag.SetActiveEx(romReady);
-		}
+        }
 
-		private void OnGetRomImage(Sprite sprite, string url)
+        private void OnGetRomImage(Sprite sprite, string url)
-		{
+        {
-			if (m_romFile == null) return;
+            if (m_romFile == null) return;
-			if (m_romFile.ImageURL != url) return;
+            if (m_romFile.ImageURL != url) return;
 
-			SetIcon(sprite);
+            SetIcon(sprite);
-		}
+        }
 
-		public void SetDependencyProperty(object data)
+        public void SetDependencyProperty(object data)
-		{
+        {
-			SetSelectState((data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index));
+            SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
-		}
+        }
 
-		public void Release()
+        public void Release()
-		{
+        {
-			Reset();
+            Reset();
-		}
+        }
-	}
+    }
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/Selector.cs

@@ -44,7 +44,7 @@ namespace AxibugEmuOnline.Client
                     m_trackTween.Kill();
                     m_trackTween = null;
                 }
-                m_trackTween = DOTween.To(() => m_rect.position, (_value) => m_rect.position = _value, itemUIRect.position, 0.125f);
+                m_trackTween = DOTween.To(() => m_rect.position, (value) => m_rect.position = value, itemUIRect.position, 0.125f);
                 m_trackTween.onComplete = () => m_trackTween = null;
             }
         }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/SubMenuItemGroup.cs

@@ -184,10 +184,6 @@ namespace AxibugEmuOnline.Client
         private MenuItem Clone(MenuItem template, Transform parent)
         {
 #if UNITY_EDITOR
-
-			//========================套娃宏========================
-#if UNITY_2019_1_OR_NEWER //新版Unity，因UNITY2018.2用不了这玩意儿，编辑器也罢
-
             if (Application.isPlaying)
             {
                 var item = GameObject.Instantiate(template.gameObject, parent).GetComponent<MenuItem>();
@@ -201,17 +197,8 @@ namespace AxibugEmuOnline.Client
                 return clone.GetComponent<MenuItem>();
             }
 #else
-			var item = GameObject.Instantiate(template.gameObject, parent).GetComponent<MenuItem>();
+                return GameObject.Instantiate(SubMenuItemTemplate.gameObject, parent).GetComponent<MenuItem>();
-			item.transform.localPosition = Vector3.zero;
-			return item;
 #endif
-			//========================套娃宏 End========================
+        }
-
+    }
-
-
-#else
-            return GameObject.Instantiate(SubMenuItemTemplate.gameObject, parent).GetComponent<MenuItem>();
-#endif
-		}
-	}
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/UITool.cs

@@ -9,8 +9,7 @@ namespace AxibugEmuOnline.Client
         private static Dictionary<Graphic, Material> _caches = new Dictionary<Graphic, Material>();
         public static Material GetMaterial(this Graphic graphic)
         {
-            Material material;
+            if (_caches.TryGetValue(graphic, out var material))
-			if (_caches.TryGetValue(graphic, out material))
             {
                 return material;
             }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/XMBTopGroupUI/XMBInfoBar.cs

@@ -34,10 +34,7 @@ public class XMBInfoBar : MonoBehaviour
         RefreshFps();
     }
 
-	/// <summary>
+    (uint lastFrame, float lastTime) m_lastFrameInfo;
-	/// (uint lastFrame, float lastTime)
-	/// </summary>
-	ValueTuple<uint,float> m_lastFrameInfo;
     private void RefreshFps()
     {
         if (App.emu.Core.IsNull())
@@ -45,18 +42,14 @@ public class XMBInfoBar : MonoBehaviour
         else
         {
             FPS.gameObject.SetActiveEx(true);
-			//var gap = App.emu.Core.Frame - m_lastFrameInfo.lastFrame;
+            var gap = App.emu.Core.Frame - m_lastFrameInfo.lastFrame;
-			//var time = Time.realtimeSinceStartup - m_lastFrameInfo.lastTime;
+            var time = Time.realtimeSinceStartup - m_lastFrameInfo.lastTime;
-			var gap = App.emu.Core.Frame - m_lastFrameInfo.Item1;
+            var fps = gap / time;
-			var time = Time.realtimeSinceStartup - m_lastFrameInfo.Item2;
-			var fps = gap / time;
             FPS.text = $"FPS:{fps:.#}";
 
-			//m_lastFrameInfo.lastFrame = App.emu.Core.Frame;
+            m_lastFrameInfo.lastFrame = App.emu.Core.Frame;
-			//m_lastFrameInfo.lastTime = Time.realtimeSinceStartup;
+            m_lastFrameInfo.lastTime = Time.realtimeSinceStartup;
-			m_lastFrameInfo.Item1 = App.emu.Core.Frame;
+        }
-			m_lastFrameInfo.Item2 = Time.realtimeSinceStartup;
-		}
     }
 
     private void RefreshDelay()

AxibugEmuOnline.Client/Assets/Script/AppMain/Utility.cs

@@ -36,9 +36,7 @@ namespace AxibugEmuOnline.Client
         private static Dictionary<int, RomFile> s_RomFileCahcesInRoomInfo = new Dictionary<int, RomFile>();
         public static void FetchRomFileInRoomInfo(this Protobuf_Room_MiniInfo roomInfo, EnumPlatform platform, Action<Protobuf_Room_MiniInfo, RomFile> callback)
         {
-            RomFile romFile;
+            if (s_RomFileCahcesInRoomInfo.TryGetValue(roomInfo.GameRomID, out RomFile romFile))
-
-			if (s_RomFileCahcesInRoomInfo.TryGetValue(roomInfo.GameRomID, out romFile))
             {
                 callback.Invoke(roomInfo, romFile);
                 return;
@@ -48,11 +46,11 @@ namespace AxibugEmuOnline.Client
                 case EnumPlatform.NES:
                     App.StartCoroutine(App.httpAPI.GetNesRomInfo(roomInfo.GameRomID, (romWebData) =>
                     {
-                        RomFile _romFile = new RomFile(EnumPlatform.NES, 0, 0);
+                        RomFile romFile = new RomFile(EnumPlatform.NES, 0, 0);
-						_romFile.SetWebData(romWebData);
+                        romFile.SetWebData(romWebData);
-                        s_RomFileCahcesInRoomInfo[roomInfo.GameRomID] = _romFile;
+                        s_RomFileCahcesInRoomInfo[roomInfo.GameRomID] = romFile;
 
-                        callback.Invoke(roomInfo, _romFile);
+                        callback.Invoke(roomInfo, romFile);
                     }));
                     break;
             }