AxibugEmuOnline.Client.Transplant/Assets/VirtualNes.Core/NES.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -249,7 +249,7 @@ namespace VirtualNes.Core
                 LoadDISK();
 
                 {
-                    // Padクラス内だと初期化タイミングが遅いのでここで
+                    // Pad･ｯ･鬣ｹﾄﾚ､ﾀ､ﾈｳ<EFBFBD>ﾚｻｯ･ｿ･､･ﾟ･<EFBFBD>ｰ､ｬﾟW､､､ﾎ､ﾇ､ｳ､ｳ､ﾇ
                     uint crc = rom.GetPROM_CRC();
                     if (
                         crc == 0xe792de94       // Best Play - Pro Yakyuu (New) (J)
@@ -275,7 +275,7 @@ namespace VirtualNes.Core
 
                 LoadTurboFile();
 
-                // VS-Unisystemのデフォルト設定
+                // VS-Unisystem､ﾎ･ﾇ･ﾕ･ｩ･<EFBFBD>ﾈﾔOｶｨ
                 if (rom.IsVSUNISYSTEM())
                 {
                     uint crc = rom.GetPROM_CRC();
@@ -286,13 +286,13 @@ namespace VirtualNes.Core
 
                 Reset();
 
-                // ゲーム固有のデフォルトオプションを設定(設定戻す時に使う為)
+                // ･ｲｩ`･犹ﾌﾓﾐ､ﾎ･ﾇ･ﾕ･ｩ･<EFBDA9>ﾈ･ｪ･ﾗ･ｷ･逾<EFBDA5><E980BE>Oｶｨ(ﾔOｶｨ諾､ｹ瓶､ﾋﾊｹ､ｦ樣)
                 GameOption.defRenderMethod = (int)GetRenderMethod();
                 GameOption.defIRQtype = GetIrqType();
                 GameOption.defFrameIRQ = GetFrameIRQmode();
                 GameOption.defVideoMode = GetVideoMode();
 
-                // 設定をロードして設定する(エントリが無ければデフォルトが入る)
+                // ﾔOｶｨ､<EFBFBD>愰`･ﾉ､ｷ､ﾆﾔOｶｨ､ｹ､<EFBDB9>(･ｨ･<EFBDA8>ﾈ･熙ｬ殪､ｱ､<EFBDB1>ﾐ･ﾇ･ﾕ･ｩ･<EFBDA9>ﾈ､ｬﾈ<EFBDAC><EFBE88>)
                 if (rom.GetMapperNo() != 20)
                 {
                     GameOption.Load(rom.GetPROM_CRC());
@@ -331,12 +331,12 @@ namespace VirtualNes.Core
             {
                 if (fp == null)
                 {
-                    // xxx ファイルを開けません
+                    // xxx ･ﾕ･｡･､･<EFBFBD><EFBFBD>_､ｱ､ﾞ､ｻ､<EFBFBD>
                     throw new Exception($"Can Not Open File [TurboFile.vtf]");
                 }
 
                 long size = fp.Length;
-                // ファイルサイズ取得
+                // ･ﾕ･｡･､･<EFBFBD>ｵ･､･ｺﾈ｡ｵﾃ
                 if (size > 32 * 1024)
                 {
                     size = 32 * 1024;
@@ -354,7 +354,7 @@ namespace VirtualNes.Core
 
         private void LoadDISK()
         {
-            //todo : 磁碟机读取支持
+            //todo : ｴﾅｵ忞巐ﾁﾈ｡ﾖｧｳﾖ
         }
 
         private void LoadSRAM()
@@ -400,7 +400,7 @@ namespace VirtualNes.Core
         {
             int i;
 
-            // 儊儌儕僋儕傾
+            // メモリクリア
             MemoryUtility.ZEROMEMORY(MMU.RAM, MMU.RAM.Length);
             MemoryUtility.ZEROMEMORY(MMU.WRAM, MMU.WRAM.Length);
             MemoryUtility.ZEROMEMORY(MMU.DRAM, MMU.DRAM.Length);
@@ -420,11 +420,11 @@ namespace VirtualNes.Core
 
             MMU.PROM = MMU.VROM = null;
 
-            // 0 彍嶼杊巭懳嶔
+            // 0 除算防止対策
             MMU.PROM_8K_SIZE = MMU.PROM_16K_SIZE = MMU.PROM_32K_SIZE = 1;
             MMU.VROM_1K_SIZE = MMU.VROM_2K_SIZE = MMU.VROM_4K_SIZE = MMU.VROM_8K_SIZE = 1;
 
-            // 僨僼僅儖僩僶儞僋愝掕
+            // デフォルトバンク設定
             for (i = 0; i < 8; i++)
             {
                 MMU.CPU_MEM_BANK[i] = null;
@@ -432,11 +432,11 @@ namespace VirtualNes.Core
                 MMU.CPU_MEM_PAGE[i] = 0;
             }
 
-            // 撪憻RAM/WRAM
+            // 内臓RAM/WRAM
             MMU.SetPROM_Bank(0, MMU.RAM, MMU.BANKTYPE_RAM);
             MMU.SetPROM_Bank(3, MMU.WRAM, MMU.BANKTYPE_RAM);
 
-            // 僟儈乕
+            // ダミー
             MMU.SetPROM_Bank(1, MMU.XRAM, MMU.BANKTYPE_ROM);
             MMU.SetPROM_Bank(2, MMU.XRAM, MMU.BANKTYPE_ROM);
 
@@ -522,7 +522,7 @@ namespace VirtualNes.Core
                                     }
                                 }
                             }
-                            ppu.ScanlineNext();                // 偙傟偺埵抲偱儔僗僞乕宯偼夋柺偑堘偆
+                            ppu.ScanlineNext();                // これの位置でラスター系は画面が違う
                             if (RenderMethod == EnumRenderMethod.PRE_ALL_RENDER)
                                 EmulationCPU(nescfg.ScanlineCycles);
 
@@ -583,7 +583,7 @@ namespace VirtualNes.Core
                     {
                         pad.VSync();
 
-                        // VBLANK婜娫
+                        // VBLANK期間
                         if (scanline == nescfg.TotalScanlines - 1)
                         {
                             ppu.VBlankEnd();
@@ -642,7 +642,7 @@ namespace VirtualNes.Core
 
                     if (scanline == 0)
                     {
-                        // 僟儈乕僗僉儍儞儔僀儞
+                        // ダミースキャンライン
                         // H-Draw (4fetches*32)
                         EmulationCPU(FETCH_CYCLES * 128);
                         ppu.FrameStart();
@@ -655,7 +655,7 @@ namespace VirtualNes.Core
                     }
                     else if (scanline < 240)
                     {
-                        // 僗僋儕乕儞昤夋(Scanline 1乣239)
+                        // スクリーン描画(Scanline 1～239)
                         if (bDraw)
                         {
                             ppu.Scanline(scanline, Supporter.Config.graphics.bAllSprite, Supporter.Config.graphics.bLeftClip);
@@ -707,7 +707,7 @@ namespace VirtualNes.Core
                     }
                     else if (scanline == 240)
                     {
-                        // 僟儈乕僗僉儍儞儔僀儞 (Scanline 240)
+                        // ダミースキャンライン (Scanline 240)
                         mapper.VSync();
 
                         EmulationCPU(nescfg.HDrawCycles);
@@ -720,7 +720,7 @@ namespace VirtualNes.Core
                     {
                         pad.VSync();
 
-                        // VBLANK婜娫
+                        // VBLANK期間
                         if (scanline == nescfg.TotalScanlines - 1)
                         {
                             ppu.VBlankEnd();
@@ -864,7 +864,7 @@ namespace VirtualNes.Core
             MMU.VROM_4K_SIZE = rom.GetVROM_SIZE() * 2;
             MMU.VROM_8K_SIZE = rom.GetVROM_SIZE();
 
-            // 僨僼僅儖僩僶儞僋
+            // デフォルトバンク
             if (MMU.VROM_8K_SIZE != 0)
             {
                 MMU.SetVROM_8K_Bank(0);
@@ -874,7 +874,7 @@ namespace VirtualNes.Core
                 MMU.SetCRAM_8K_Bank(0);
             }
 
-            // 儈儔乕
+            // ミラー
             if (rom.Is4SCREEN())
             {
                 MMU.SetVRAM_Mirror(MMU.VRAM_MIRROR4);
@@ -976,13 +976,13 @@ namespace VirtualNes.Core
                     reg.S = 0xFF;
                     reg.P = CPU.Z_FLAG | CPU.R_FLAG | CPU.I_FLAG;
 
-                    // 埨慡懳嶔傪寭偹偰偁偊偰儖乕僾偵(1昩暘)
+                    // 安全対策を兼ねてあえてループに(1秒分)
                     for (int i = 0; i < nescfg.TotalScanlines * 60; i++)
                     {
                         EmulationCPU(nescfg.ScanlineCycles);
                         cpu.GetContext(ref reg);
 
-                        // 柍尷儖乕僾偵擖偭偨偙偲傪妋擣偟偨傜敳偗傞
+                        // 無限ループに入ったことを確認したら抜ける
                         if (reg.PC == 0x4700)
                         {
                             break;
@@ -993,7 +993,7 @@ namespace VirtualNes.Core
                 }
 
                 cpu.GetContext(ref reg);
-                // 柍尷儖乕僾偵擖偭偰偄偨傜嵞愝掕偡傞
+                // 無限ループに入っていたら再設定する
                 if (reg.PC == 0x4700)
                 {
                     reg.PC = 0x4720;    // Play Address
@@ -1009,7 +1009,7 @@ namespace VirtualNes.Core
             else
             {
                 cpu.GetContext(ref reg);
-                reg.PC = 0x4700;    // 柍尷儖乕僾
+                reg.PC = 0x4700;    // 無限ループ
                 reg.S = 0xFF;
 
                 EmulationCPU(nescfg.ScanlineCycles * nescfg.TotalScanlines);
@@ -1186,7 +1186,7 @@ namespace VirtualNes.Core
                 if (m_BarcodeCycles > 1000)
                 {
                     m_BarcodeCycles = 0;
-                    // 掆巭丠
+                    // 停止？
                     if (m_BarcodeData[m_BarcodePtr] != 0xFF)
                     {
                         m_BarcodeOut = m_BarcodeData[m_BarcodePtr++];
@@ -1227,7 +1227,7 @@ namespace VirtualNes.Core
                 return;
 
             m_TapeCycles += (nescfg.CpuClock / 32000.0);
-            //	m_TapeCycles += (nescfg.CpuClock / 22050.0);	// 抶偡偓偰僟儊偭傐偄
+            //	m_TapeCycles += (nescfg.CpuClock / 22050.0);	// 遅すぎてダメっぽい
 
             if (m_bTapePlay)
             {
@@ -1293,7 +1293,7 @@ namespace VirtualNes.Core
                     return MMU.CPU_MEM_BANK[addr >> 13][addr & 0x1FFF];
             }
 
-            return 0x00;    // Warning梊杊
+            return 0x00;    // Warning予防
         }
 
         private byte ReadReg(ushort addr)
@@ -1504,7 +1504,7 @@ namespace VirtualNes.Core
                     pad.Write(addr, data);
                     apu.Write(addr, data);
                     break;
-                // VirtuaNES屌桳億乕僩
+                // VirtuaNES固有ポート
                 case 0x18:
                     apu.Write(addr, data);
                     break;
@@ -1596,7 +1596,7 @@ namespace VirtualNes.Core
                     ref state.reg.cpureg.FrameIRQ_type,
                     ref state.reg.cpureg.FrameIRQ,
                     ref state.reg.cpureg.FrameIRQ_occur);
-                state.reg.cpureg.FrameIRQ_cycles = cycles;	// 参照がINTな為（ぉ
+                state.reg.cpureg.FrameIRQ_cycles = cycles;	// ｲﾎﾕﾕ､ｬINT､ﾊ樣｣ｨ､ｩ
 
                 state.reg.cpureg.DMA_cycles = cpu.GetDmaCycles();
                 state.reg.cpureg.emul_cycles = emul_cycles;
@@ -1625,7 +1625,7 @@ namespace VirtualNes.Core
                 MemoryUtility.memcpy(state.ram.SPPAL, MMU.SPPAL, state.ram.SPPAL.Length);
                 MemoryUtility.memcpy(state.ram.SPRAM, MMU.SPRAM, state.ram.SPRAM.Length);
 
-                // S-RAM STATE(使用/未使用に関わらず存在すればセーブする)
+                // S-RAM STATE(ﾊｹﾓﾃ/ﾎｴﾊｹﾓﾃ､ﾋ騅､<E9A885>鬢ｺｴ贇ﾚ､ｹ､<EFBDB9>ﾐ･ｻｩ`･ﾖ､ｹ､<EFBDB9>)
                 if (rom.IsSAVERAM())
                 {
                     size = (uint)SAVERAM_SIZE;
@@ -1649,9 +1649,9 @@ namespace VirtualNes.Core
                 uint size = 0;
 
                 // SAVE CPU MEMORY BANK DATA
-                // BANK0,1,2はバンクセーブに関係なし
+                // BANK0,1,2､ﾏ･ﾐ･<EFBFBD>ｯ･ｻｩ`･ﾖ､ﾋ騅４､ﾊ､ｷ
-                // VirtuaNES0.30から
+                // VirtuaNES0.30､ｫ､<EFBFBD>
-                // バンク３はSRAM使用に関わらずセーブ
+                // ･ﾐ･<EFBFBD>ｯ｣ｳ､ﾏSRAMﾊｹﾓﾃ､ﾋ騅､<EFBFBD>鬢ｺ･ｻｩ`･ﾖ
                 for (int i = 3; i < 8; i++)
                 {
                     state.mmu.CPU_MEM_TYPE[i] = MMU.CPU_MEM_TYPE[i];
@@ -1696,7 +1696,7 @@ namespace VirtualNes.Core
                     }
                 }
 
-                // WRITE VRAM MEMORY(常に4K分すべて書き込む)
+                // WRITE VRAM MEMORY(ｳ｣､ﾋ4Kｷﾖ､ｹ､ﾙ､ﾆ抱､ｭﾞz､<EFBFBD>)
                 state.VRAM = new byte[4 * 1024];
                 Array.Copy(MMU.VRAM, state.VRAM, state.VRAM.Length);
 
@@ -1764,7 +1764,7 @@ namespace VirtualNes.Core
                 int DiskSize = 16 + 65500 * rom.GetDiskNo();
 
 
-                // 相違数をカウント
+                // ﾏ珀`ﾊ<>､<EFBFBD>ｫ･ｦ･<EFBDA6>ﾈ
                 for (int i = 16; i < DiskSize; i++)
                 {
                     if (lpWrite[i] != 0)
@@ -1874,9 +1874,9 @@ namespace VirtualNes.Core
             //BANK STATE
             {
                 // SAVE CPU MEMORY BANK DATA
-                // BANK0,1,2はバンクセーブに関係なし
+                // BANK0,1,2､ﾏ･ﾐ･<EFBFBD>ｯ･ｻｩ`･ﾖ､ﾋ騅４､ﾊ､ｷ
-                // VirtuaNES0.30から
+                // VirtuaNES0.30､ｫ､<EFBFBD>
-                // バンク３はSRAM使用に関わらずセーブ
+                // ･ﾐ･<EFBFBD>ｯ｣ｳ､ﾏSRAMﾊｹﾓﾃ､ﾋ騅､<EFBFBD>鬢ｺ･ｻｩ`･ﾖ
                 for (byte i = 3; i < 8; i++)
                 {
                     MMU.CPU_MEM_TYPE[i] = state.mmu.CPU_MEM_TYPE[i];

AxibugEmuOnline.Client.Transplant/Assets/VirtualNes.Core/Supporter/ControllerState.cs

@@ -2,7 +2,7 @@
 
 namespace VirtualNes.Core
 {
-    public struct ControllerState : IEquatable<ControllerState>
+    public struct ControllerState
     {
         public uint raw0;
         public uint raw1;
@@ -11,73 +11,19 @@ namespace VirtualNes.Core
 
         public bool valid;
 
-        public ControllerState(EnumButtonType[] states)
+        public ControllerState(
+            EnumButtonType player0_buttons,
+            EnumButtonType player1_buttons,
+            EnumButtonType player2_buttons,
+            EnumButtonType player3_buttons)
         {
-            raw0 = (uint)states[0];
+            raw0 = (uint)player0_buttons;
-            raw1 = (uint)states[1];
+            raw1 = (uint)player1_buttons;
-            raw2 = (uint)states[2];
+            raw2 = (uint)player2_buttons;
-            raw3 = (uint)states[3];
+            raw3 = (uint)player3_buttons;
             valid = true;
         }
 
-        public bool HasButton(int player, EnumButtonType button)
-        {
-            uint raw;
-
-			switch (player)
-            {
-                case 0: raw = raw0; break;
-				case 1: raw = raw1; break;
-				case 2: raw = raw2; break;
-				case 3: raw = raw3; break;
-                default:
-                    raw = 0;
-                    break;
-			}
-            return (raw & (uint)button) == (uint)button;
-        }
-
-        public override string ToString()
-        {
-            return $"{raw0}|{raw1}|{raw2}|{raw3}";
-        }
-
-        #region Impl_Equals
-        public bool Equals(ControllerState other)
-        {
-            return raw0 == other.raw0 && raw1 == other.raw1 && raw2 == other.raw2 && raw3 == other.raw3 && valid == other.valid;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return obj is ControllerState other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            //return HashCode.Combine(raw0, raw1, raw2, raw3, valid);
-            return ComputeHashCode(raw0, raw1, raw2, raw3, valid);
-		}
-
-		public static int ComputeHashCode(uint raw0, uint raw1, uint raw2, uint raw3, bool valid)
-		{
-			unchecked // 允许溢出，使得哈希码计算更加合理
-			{
-				int hash = 17; // 选择一个非零的初始值
-
-				// 将每个 uint 类型的值转换为 int 并合并到哈希码中
-				hash = hash * 31 + (int)raw0;
-				hash = hash * 31 + (int)raw1;
-				hash = hash * 31 + (int)raw2;
-				hash = hash * 31 + (int)raw3;
-
-				// 将 bool 类型的值转换为 int 并合并到哈希码中
-				hash = hash * 31 + (valid ? 1 : 0);
-
-				return hash;
-			}
-		}
-
         public static bool operator ==(ControllerState left, ControllerState right)
         {
             return
@@ -91,7 +37,24 @@ namespace VirtualNes.Core
         {
             return !(left == right);
         }
-        #endregion
+
+        public override string ToString()
+        {
+            return $"{raw0}|{raw1}|{raw2}|{raw3}";
+        }
+
+        public bool HasButton(int player, EnumButtonType button)
+        {
+            uint raw = 0;
+            switch (player)
+            {
+                case 0: raw = raw0; break;
+                case 1: raw = raw1; break;
+                case 2: raw = raw2; break;
+                case 3: raw = raw3; break;
+            }
+            return (raw & (uint)button) == (uint)button;
+        }
     }
 
     [Flags]

AxibugEmuOnline.Client.Transplant/Assets/VirtualNes.Core/Supporter/Supporter.cs

@@ -5,7 +5,6 @@ namespace VirtualNes.Core
     public static class Supporter
     {
         private static ISupporterImpl s_support;
-
         public static void Setup(ISupporterImpl supporter)
         {
             s_support = supporter;
@@ -45,7 +44,6 @@ namespace VirtualNes.Core
         {
             s_support.SaveFile(fileData, directPath, fileName);
         }
-
         public static Stream OpenFile(string directPath, string fileName)
         {
             return s_support.OpenFile(directPath, fileName);
@@ -66,11 +64,6 @@ namespace VirtualNes.Core
             s_support.SampleInput(frameCount);
         }
 
-        public static IControllerSetuper GetControllerSetuper()
-        {
-            return s_support.GetControllerSetuper();
-        }
-
         public static EmulatorConfig Config => s_support.Config;
     }
 
@@ -89,21 +82,5 @@ namespace VirtualNes.Core
         bool TryGetMapperNo(ROM rom, out int mapperNo);
         ControllerState GetControllerState();
         void SampleInput(uint frameCount);
-        IControllerSetuper GetControllerSetuper();
-    }
-
-    /// <summary>
-    /// 负责管理本地控制器与具体游戏之间的槽位分配
-    /// </summary>
-    public interface IControllerSetuper
-    {
-        /// <summary>
-        /// 设置本地手柄与游戏手柄槽位的映射
-        /// </summary>
-        void SetConnect(
-            uint? con0ToSlot = null,
-            uint? con1ToSlot = null,
-            uint? con2ToSlot = null,
-            uint? con3ToSlot = null);
     }
 }

AxibugEmuOnline.Client/Assets/AxiProjectTools/Editors/AxiProjectTools.cs

@@ -86,7 +86,7 @@ public class AxiProjectTools : EditorWindow
     static void LoopPrefabNode(string rootPath, GameObject trans, int depth)
     {
         string nodename = $"{rootPath}>{trans.name}";
-#if UNITY_5_4_OR_NEWER && !UNITY_2018_4_OR_NEWER
+
         GameObject prefabRoot = trans.gameObject;
         int comCount = prefabRoot.GetComponentCount();
         for (int i = 0; i < comCount; i++)
@@ -130,9 +130,6 @@ public class AxiProjectTools : EditorWindow
         //遍历
         foreach (Transform child in trans.transform)
             LoopPrefabNode(nodename, child.gameObject, depth + 1);
-#else
-		Debug.Log("低版本不要执行本函数");
-#endif
     }
 
     [MenuItem("Axibug移植工具/[2]生成中间脚本代码")]

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,12 +45,6 @@ namespace AxibugEmuOnline.Client.ClientCore
         {
             PlayerPrefs.DeleteAll();
 
-			if (UnityEngine.Application.platform == RuntimePlatform.PSP2)
-			{
-				//PSV 等平台需要手动创建目录
-				PSP2Init();
-			}
-
             settings = new AppSettings();
 
             log = new LogManager();
@@ -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

@@ -249,18 +249,6 @@ Shader "PostEffect/FixingPixcelArtGrille"
               else if(pos.x<0.666)mask.g=_maskLight;
               else mask.b=_maskLight;
               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

@@ -63,11 +63,8 @@ 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);
                 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,37 +86,20 @@ 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)
-			//{
-			//    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;
+                string presetName = value.presetName;
                 preset = filter.Presets.FirstOrDefault(p => p.Name == presetName);
             }
 
-			return new GetFilterSetting_result()
+            return (filter, preset);
-            {
-                filter = filter,
-                preset = preset
-            };
-        }
-
-        public struct GetFilterSetting_result
-        {
-            public Filter filter;
-			public FilterPreset preset;
         }
 
         public class Filter
@@ -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;
             }
 
@@ -254,8 +235,7 @@ namespace AxibugEmuOnline.Client
 
                 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,9 +95,7 @@ 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;
 

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,10 +6,7 @@ public struct MsgBool
     public string ErrorMsg;
     public bool Value;
 
-    //low C# readonly
+    public override readonly string ToString()
-	//public override readonly string ToString()
-
-	public override string ToString()
     {
         if (Value)
         {
@@ -36,11 +33,10 @@ public struct MsgBool
         return msgBool.Value;
     }
 
-	//low C# 
+    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;
@@ -103,8 +102,7 @@ namespace AxibugEmuOnline.Client
         {
             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];
 
@@ -137,10 +137,8 @@ namespace AxibugEmuOnline.Client
                 m_keyListener = Controller.GetKey(m_hostController.ControllerIndex, m_buttonType);
             }
         }
-		//low C# readonly
-		//public readonly struct KeyListener
 
-		public struct KeyListener
+        public readonly struct KeyListener
         {
             private readonly KeyCode m_key;
 
@@ -154,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;
             }
 
@@ -223,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

@@ -33,7 +33,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);
 
             if (m_select)
             {
@@ -87,8 +87,7 @@ namespace AxibugEmuOnline.Client
 
                 OverlayManager.Input((presetName) =>
                 {
-					FilterPreset newPreset;
+                    var result = m_filter.CreatePreset(presetName, out var newPreset);
-					var result = m_filter.CreatePreset(presetName, out newPreset);
                     if (!result) OverlayManager.PopTip(result);
                     else optionUI.AddOptionMenuWhenPoping(new Opt_Presets(m_filter, newPreset));
                 }, "为预设设置一个名称", string.Empty);

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,6 +1,9 @@
 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

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,9 +480,8 @@ 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>();
             foreach (var item in ienumrable)
             {

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

@@ -7,17 +7,17 @@ using UnityEngine.UI;
 public interface IVirtualLayout
 {
     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
@@ -65,9 +65,7 @@ public class ItemProxy
     {
         if (_runtimeInstance == null) return null;
 
-		ScripteInterface lfi;
+        _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface lfi);
-
-		_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out lfi);
 
         return lfi;
     }
@@ -161,9 +159,7 @@ public class ItemProxy
                 _parent.CacheItemScripts[_runtimeInstance.gameObject] = newSI;
             }
 
-			ScripteInterface si;
+            _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface si);
-
-			_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out si);
             si.SetDataList(_parent.DataList[Index], Index);
             if (_parent.DependencyProperty != null)
                 si.SetDependencyProperty(_parent.DependencyProperty);
@@ -173,8 +169,8 @@ public class ItemProxy
     public void UpdateDP()
     {
         if (_runtimeInstance == null) return;
-		ScripteInterface luaInterface;
+
-		_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out luaInterface);
+        _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface luaInterface);
         if (luaInterface == null) return;
 
         if (_parent.DependencyProperty != null)
@@ -195,8 +191,7 @@ public class ItemProxy
 
         if (Application.isPlaying)
         {
-			ScripteInterface si;
+            _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface si);
-			_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out si);
             if (si != null) si.Release();
             GameObjectPool.Release(_runtimeInstance.gameObject);
             _runtimeInstance = null;

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

@@ -269,17 +269,15 @@ 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>();
                 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>();
                 menuUI.gameObject.SetActive(true);
                 menuUI.SetData(this, valueSetMenu);

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

@@ -17,9 +17,8 @@ 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))
                 {
                     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

@@ -32,8 +32,7 @@ namespace AxibugEmuOnline.Client
         {
             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);
         }
 
@@ -58,14 +57,13 @@ namespace AxibugEmuOnline.Client
             }
             else
             {
-				Protobuf_Room_MiniInfo MiniInfo;
+                if (!App.roomMgr.GetRoomListMiniInfo(RoomID, out Protobuf_Room_MiniInfo MiniInfo))
-				if (!App.roomMgr.GetRoomListMiniInfo(RoomID, out MiniInfo))
                 {
                     OverlayManager.PopTip("房间不存在");
                     return false;
                 }
-				int[] freeSlots;
+
-				if (!MiniInfo.GetFreeSlot(out freeSlots))
+                if (!MiniInfo.GetFreeSlot(out var freeSlots))
                 {
                     OverlayManager.PopTip("无空闲位置");
                     return false;
@@ -79,9 +77,7 @@ namespace AxibugEmuOnline.Client
         private void UpdateUI(Protobuf_Room_MiniInfo roomInfo)
         {
             var hostNick = roomInfo.GetHostNickName();
-			int cur; int max;
+            roomInfo.GetRoomPlayers(out var cur, out var max);
-
-			roomInfo.GetRoomPlayers(out cur, out max);
             SetBaseInfo("--", $"<b>{hostNick}</b>的房间", $"{cur}/{max}");
             SetIcon(null);
 
@@ -133,7 +129,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/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>();
@@ -200,15 +196,6 @@ namespace AxibugEmuOnline.Client
                 clone.transform.localPosition = Vector3.zero;
                 return clone.GetComponent<MenuItem>();
             }
-#else
-			var item = GameObject.Instantiate(template.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,17 +42,13 @@ 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 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;
         }
     }
 

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;
             }