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

@@ -1,261 +1,249 @@
-using AxibugEmuOnline.Client.Manager;
+using AxibugEmuOnline.Client.Manager;
-using AxibugEmuOnline.Client.Network;
+using AxibugEmuOnline.Client.Network;
-using AxibugProtobuf;
+using AxibugProtobuf;
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.IO;
+using System.IO;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
-using UnityEngine;
+using UnityEngine;
-using static AxibugEmuOnline.Client.HttpAPI;
+using static AxibugEmuOnline.Client.HttpAPI;
-using static AxibugEmuOnline.Client.Manager.LogManager;
+using static AxibugEmuOnline.Client.Manager.LogManager;
-
+
-namespace AxibugEmuOnline.Client.ClientCore
+namespace AxibugEmuOnline.Client.ClientCore
-{
+{
-    public static class App
+    public static class App
-    {
+    {
-        public static string TokenStr;
+        public static string TokenStr;
-        public static string IP;
+        public static string IP;
-        public static int Port;
+        public static int Port;
-        public static LogManager log;
+        public static LogManager log;
-        public static NetworkHelper network;
+        public static NetworkHelper network;
-        public static AppLogin login;
+        public static AppLogin login;
-        public static AppChat chat;
+        public static AppChat chat;
-        public static UserDataManager user;
+        public static UserDataManager user;
-        public static AppEmu emu;
+        //public static AppNetGame netgame;
+        public static AppEmu emu;
         /// <summary>
         /// nes Rom库
-        /// </summary>
+        /// </summary>
-        public static RomLib nesRomLib;
+        public static RomLib nesRomLib;
         /// <summary>
         /// 收藏 Rom库
-        /// </summary>
+        /// </summary>
-        public static RomLib starRomLib;
+        public static RomLib starRomLib;
-        public static HttpAPI httpAPI;
+        public static HttpAPI httpAPI;
-        public static CacheManager CacheMgr;
+        public static CacheManager CacheMgr;
-        public static AppRoom roomMgr;
+        public static AppRoom roomMgr;
-        public static AppSettings settings;
+        public static AppSettings settings;
-        public static AppShare share;
+        public static AppShare share;
-        public static GamePadManager gamePadMgr;
+        private static object gameSavMgr;
-        private static object gameSavMgr;
+        static bool bTest;
-        static bool bTest;
+        static string mTestSrvIP;
-        static string mTestSrvIP;
+        #region Mono
-        #region Mono
+        public static TickLoop tickLoop;
-        public static TickLoop tickLoop;
+        private static CoroutineRunner coRunner;
-        private static CoroutineRunner coRunner;
+
-
+#if UNITY_PSP2
-#if UNITY_PSP2
+        public static SonyVitaCommonDialog sonyVitaCommonDialog;
-        public static SonyVitaCommonDialog sonyVitaCommonDialog;
+#endif
-#endif
+
-
+        #endregion
-        #endregion
+
-
+#if UNITY_PSP2 && !UNITY_EDITOR //PSV真机
-
+        public static string PersistentDataPath => "ux0:data/AxibugEmu";
-        static string s_persistentRoot =
+#else
-#if UNITY_PSP2 && !UNITY_EDITOR //PSV真机
+        public static string PersistentDataPath => Application.persistentDataPath;
-            "ux0:data/AxibugEmu";
+#endif
-#else
+        public static void Init(bool isTest = false, string testSrvIP = "", bool bUseLocalWebApi = false, string mLocalWebApi = "")
-            Application.persistentDataPath;
+        {
-#endif
+            log = new LogManager(OnLogOut);
-        public static string PersistentDataPath(RomPlatformType emuPlatform)
+
-        {
+            //其他平台必要的初始化
-            return s_persistentRoot + "/" + emuPlatform.ToString();
+            if (UnityEngine.Application.platform == RuntimePlatform.PSP2)
-        }
+            {
-        public static string PersistentDataRoot() => s_persistentRoot;
+                PSP2Init();
-
+            }
-        public static void Init(bool isTest = false, string testSrvIP = "", bool bUseLocalWebApi = false, string mLocalWebApi = "")
+
-        {
+            settings = new AppSettings();
-            log = new LogManager(OnLogOut);
+            network = new NetworkHelper();
-
+            login = new AppLogin();
-            //其他平台必要的初始化
+            chat = new AppChat();
-            if (UnityEngine.Application.platform == RuntimePlatform.PSP2)
+            user = new UserDataManager();
-            {
+            emu = new AppEmu();
-                PSP2Init();
+            //netgame = new AppNetGame();
-            }
+            httpAPI = new HttpAPI();
-
+            if (bUseLocalWebApi)
-            settings = new AppSettings();
+                httpAPI.WebHost = mLocalWebApi;
-            network = new NetworkHelper();
+            nesRomLib = new RomLib(RomPlatformType.Nes);
-            login = new AppLogin();
+            starRomLib = new RomLib();
-            chat = new AppChat();
+            CacheMgr = new CacheManager();
-            user = new UserDataManager();
+            roomMgr = new AppRoom();
-            emu = new AppEmu();
+            share = new AppShare();
-            httpAPI = new HttpAPI();
+            gameSavMgr = new AppGameSavMgr();
-            if (bUseLocalWebApi)
+            bTest = isTest;
-                httpAPI.WebHost = mLocalWebApi;
+            mTestSrvIP = testSrvIP;
-            nesRomLib = new RomLib(RomPlatformType.Nes);
+            var go = new GameObject("[AppAxibugEmuOnline]");
-            starRomLib = new RomLib();
+            GameObject.DontDestroyOnLoad(go);
-            CacheMgr = new CacheManager();
+            tickLoop = go.AddComponent<TickLoop>();
-            roomMgr = new AppRoom();
+            coRunner = go.AddComponent<CoroutineRunner>();
-            share = new AppShare();
+
-            gameSavMgr = new AppGameSavMgr();
+
-            gamePadMgr = new GamePadManager();
+            var importNode = GameObject.Find("IMPORTENT");
-
+            if (importNode != null) GameObject.DontDestroyOnLoad(importNode);
-            bTest = isTest;
+
-            mTestSrvIP = testSrvIP;
+            StartCoroutine(AppTickFlow());
-            var go = new GameObject("[AppAxibugEmuOnline]");
+            RePullNetInfo();
-            GameObject.DontDestroyOnLoad(go);
+        }
-            tickLoop = go.AddComponent<TickLoop>();
+
-            coRunner = go.AddComponent<CoroutineRunner>();
+
-
+        private static void PSP2Init()
-
+        {
-            var importNode = GameObject.Find("IMPORTENT");
+            //PSVita最好手动创建目录
-            if (importNode != null) GameObject.DontDestroyOnLoad(importNode);
+            if (!Directory.Exists(PersistentDataPath))
-
+                Directory.CreateDirectory(PersistentDataPath);
-            StartCoroutine(AppTickFlow());
+
-            RePullNetInfo();
+#if UNITY_PSP2
-        }
+            //创建PSV弹窗UI
-
+            sonyVitaCommonDialog = new GameObject().AddComponent<SonyVitaCommonDialog>();
-
+            //释放解码 FMV的26M内存，一般游戏用不上（PSP才用那破玩意儿）
-        private static void PSP2Init()
+            UnityEngine.PSVita.PSVitaVideoPlayer.TransferMemToMonoHeap();
-        {
+#endif
-            //PSVita最好手动创建目录
+
-            if (!Directory.Exists("ux0:data/AxibugEmu"))
+        }
-                Directory.CreateDirectory("ux0:data/AxibugEmu");
+
-
+        private static IEnumerator AppTickFlow()
-#if UNITY_PSP2
+        {
-            //创建PSV弹窗UI
+            while (true)
-            sonyVitaCommonDialog = new GameObject().AddComponent<SonyVitaCommonDialog>();
+            {
-            //释放解码 FMV的26M内存，一般游戏用不上（PSP才用那破玩意儿）
+                Tick();
-            UnityEngine.PSVita.PSVitaVideoPlayer.TransferMemToMonoHeap();
+                yield return null;
-#endif
+            }
-
+        }
-        }
+
-
+        public static void RePullNetInfo()
-        private static IEnumerator AppTickFlow()
+        {
-        {
+            StartCoroutine(StartNetInit());
-            while (true)
+        }
-            {
+
-                Tick();
+        static IEnumerator StartNetInit()
-                yield return null;
+        {
-            }
+            if (App.network.isConnected)
-        }
+                yield break;
-
+
-        public static void RePullNetInfo()
+            int platform = 0;
-        {
+            if (bTest)
-            StartCoroutine(StartNetInit());
+            {
-        }
+                yield return null;
-
+                Connect(mTestSrvIP, 10492);
-        static IEnumerator StartNetInit()
+                yield break;
-        {
+            }
-            if (App.network.isConnected)
+
-                yield break;
+            bool bHttpCheckDone = false;
-
+            Resp_CheckStandInfo resp = null;
-            int platform = 0;
+            while (true)
-            if (bTest)
+            {
-            {
+                AxiHttpProxy.SendWebRequestProxy request = AxiHttpProxy.Get($"{App.httpAPI.WebSiteApi}/CheckStandInfo?platform={platform}&version={Application.version}");
-                yield return null;
+                yield return request.SendWebRequest;
-                Connect(mTestSrvIP, 10492);
+                if (!request.downloadHandler.isDone)
-                yield break;
+                {
-            }
+                    bHttpCheckDone = false;
-
+                }
-            bool bHttpCheckDone = false;
+                else if (request.downloadHandler.bHadErr)
-            Resp_CheckStandInfo resp = null;
+                {
-            while (true)
+                    bHttpCheckDone = false;
-            {
+                    App.log.Error(request.downloadHandler.ErrInfo);
-                AxiHttpProxy.SendWebRequestProxy request = AxiHttpProxy.Get($"{App.httpAPI.WebSiteApi}/CheckStandInfo?platform={platform}&version={Application.version}");
+                }
-                yield return request.SendWebRequest;
+                else
-                if (!request.downloadHandler.isDone)
+                {
-                {
+                    try
-                    bHttpCheckDone = false;
+                    {
-                }
+                        resp = JsonUtility.FromJson<Resp_CheckStandInfo>(request.downloadHandler.text);
-                else if (request.downloadHandler.bHadErr)
+                        bHttpCheckDone = true;
-                {
+                    }
-                    bHttpCheckDone = false;
+                    catch (Exception ex)
-                    App.log.Error(request.downloadHandler.ErrInfo);
+                    {
-                }
+                        bHttpCheckDone = false;
-                else
+                        App.log.Error(ex.ToString());
-                {
+                    }
-                    try
+                }
-                    {
+
-                        resp = JsonUtility.FromJson<Resp_CheckStandInfo>(request.downloadHandler.text);
+                //请求成功
-                        bHttpCheckDone = true;
+                if (bHttpCheckDone)
-                    }
+                {
-                    catch (Exception ex)
+                    break;
-                    {
+                }
-                        bHttpCheckDone = false;
+                else
-                        App.log.Error(ex.ToString());
+                {
-                    }
+                    yield return new WaitForSeconds(1);
-                }
+                    App.log.Debug("请求失败，重试请求API...");
-
+                }
-                //请求成功
+            }
-                if (bHttpCheckDone)
+
-                {
+            /*UnityWebRequest request = UnityWebRequest.Get($"{App.httpAPI.WebSiteApi}/CheckStandInfo?platform={platform}&version={Application.version}");
-                    break;
+            yield return request.SendWebRequest();
-                }
+
-                else
+            if (request.result != UnityWebRequest.Result.Success)
-                {
+                yield break;
-                    yield return new WaitForSeconds(1);
+
-                    App.log.Debug("请求失败，重试请求API...");
+            App.log.Debug($"ApiResp => {request.downloadHandler.text}");
-                }
+            Resp_CheckStandInfo resp = JsonUtility.FromJson<Resp_CheckStandInfo>(request.downloadHandler.text);*/
-            }
+
-
+            //需要更新
-            /*UnityWebRequest request = UnityWebRequest.Get($"{App.httpAPI.WebSiteApi}/CheckStandInfo?platform={platform}&version={Application.version}");
+            if (resp.needUpdateClient == 1)
-            yield return request.SendWebRequest();
+            {
-
+                //TODO
-            if (request.result != UnityWebRequest.Result.Success)
+            }
-                yield break;
+
-
+            yield return null;
-            App.log.Debug($"ApiResp => {request.downloadHandler.text}");
+            //Connect("127.0.0.1", 10492);
-            Resp_CheckStandInfo resp = JsonUtility.FromJson<Resp_CheckStandInfo>(request.downloadHandler.text);*/
+            Connect(resp.serverIp, resp.serverPort);
-
+        }
-            //需要更新
+
-            if (resp.needUpdateClient == 1)
+        private static void Tick()
-            {
+        {
-                //TODO
+            nesRomLib.ExecuteFetchRomInfo();
-            }
+        }
-
+
-            yield return null;
+        public static Coroutine StartCoroutine(IEnumerator itor)
-            //Connect("127.0.0.1", 10492);
+        {
-            Connect(resp.serverIp, resp.serverPort);
+            return coRunner.StartCoroutine(itor);
-        }
+        }
-
+
-        private static void Tick()
+        public static void StopCoroutine(Coroutine cor)
-        {
+        {
-            nesRomLib.ExecuteFetchRomInfo();
+            coRunner.StopCoroutine(cor);
-            starRomLib.ExecuteFetchRomInfo();
+        }
-
+
-            gamePadMgr.Update();
+        public static void Connect(string IP, int port)
-        }
+        {
-
+            Task task = new Task(() =>
-        public static Coroutine StartCoroutine(IEnumerator itor)
+            {
-        {
+                network.Init(IP, port);
-            return coRunner.StartCoroutine(itor);
+            });
-        }
+            task.Start();
-
+        }
-        public static void StopCoroutine(Coroutine cor)
+
-        {
+        public static void Close()
-            coRunner.StopCoroutine(cor);
+        {
-        }
+            App.log.Info("停止");
-
+        }
-        public static void Connect(string IP, int port)
+        static void OnLogOut(int LogLevel, string msg)
-        {
+        {
-            Task task = new Task(() =>
+            E_LogType logType = (E_LogType)LogLevel;
-            {
+            switch (logType)
-                network.Init(IP, port);
+            {
-            });
+                case E_LogType.Debug:
-            task.Start();
+                case E_LogType.Info:
-        }
+                    Debug.Log("[AxiNet]:" + msg);
-
+                    break;
-        public static void Close()
+                case E_LogType.Warning:
-        {
+                    Debug.LogWarning("[AxiNet]:" + msg);
-            App.log.Info("停止");
+                    break;
-        }
+                case E_LogType.Error:
-        static void OnLogOut(int LogLevel, string msg)
+                    Debug.LogError("[AxiNet]:" + msg);
-        {
+                    break;
-            E_LogType logType = (E_LogType)LogLevel;
+            }
-            switch (logType)
+        }
-            {
+
-                case E_LogType.Debug:
+    }
-                case E_LogType.Info:
-                    Debug.Log("[AxiNet]:" + msg);
-                    break;
-                case E_LogType.Warning:
-                    Debug.LogWarning("[AxiNet]:" + msg);
-                    break;
-                case E_LogType.Error:
-                    Debug.LogError("[AxiNet]:" + msg);
-                    break;
-            }
-        }
-
-    }
 }

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

@@ -1,51 +1,50 @@
-using AxibugEmuOnline.Client.ClientCore;
+using AxibugEmuOnline.Client.ClientCore;
-using System.Text;
+using UnityEngine;
-using UnityEngine;
+
-
+namespace AxibugEmuOnline.Client
-namespace AxibugEmuOnline.Client
+{
-{
+    public class Initer : MonoBehaviour
-    public class Initer : MonoBehaviour
+    {
-    {
+        static GlobalRef m_refs;
-        static GlobalRef m_refs;
+        public static CanvasGroup FilterPreview => m_refs.FilterPreview;
-        public static CanvasGroup FilterPreview => m_refs.FilterPreview;
+        public static CanvasGroup XMBBg => m_refs.XMBBg;
-        public static CanvasGroup XMBBg => m_refs.XMBBg;
+
-
+        public static string dev_UUID;
-        public static string dev_UUID;
+
-
+        [SerializeField]
-        [SerializeField]
         GameObject IMPORTENT;
 
 
 
-#if UNITY_EDITOR
+#if UNITY_EDITOR
-        public bool bTestSkipWebApiToConServer = false;
+        public bool bTestSkipWebApiToConServer = false;
-        public string mTestSrvIP = "192.168.0.47";
+        public string mTestSrvIP = "192.168.0.47";
-        public bool bUseLocalWebApi = false;
+        public bool bUseLocalWebApi = false;
-        public string mLocalWebApi = "http://localhost:5051";
+        public string mLocalWebApi = "http://localhost:5051";
-        public bool bEditorUUID = false;
+        public bool bEditorUUID = false;
-#endif
+#endif
-
+
-        private void Awake()
+        private void Awake()
         {
-#if UNITY_EDITOR
+#if UNITY_EDITOR
-            App.Init(bTestSkipWebApiToConServer, mTestSrvIP, bUseLocalWebApi,mLocalWebApi);
+            App.Init(bTestSkipWebApiToConServer, mTestSrvIP, bUseLocalWebApi,mLocalWebApi);
-            dev_UUID = SystemInfo.deviceUniqueIdentifier;
+            dev_UUID = SystemInfo.deviceUniqueIdentifier;
             if (bEditorUUID)
-            {
+            {
-                dev_UUID += "_Editor";
+                dev_UUID += "_Editor";
-            }
+            }
-#else
+#else
-            App.Init(this);
+            App.Init(this);
-            dev_UUID = SystemInfo.deviceUniqueIdentifier;
+            dev_UUID = SystemInfo.deviceUniqueIdentifier;
-#endif
+#endif
-
+
             m_refs = Instantiate(IMPORTENT, transform).GetComponent<GlobalRef>();
-        }
+        }
-
+
         private void Start()
         {
             App.settings.Filter.ShutDownFilterPreview();
             App.settings.Filter.ShutDownFilter();
-        }
+        }
-    }
+    }
-}
+}

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterChainEffect.cs

@@ -1,160 +1,160 @@
-using Assets.Script.AppMain.Filter;
+using Assets.Script.AppMain.Filter;
-using AxibugEmuOnline.Client;
+using AxibugEmuOnline.Client;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
-using UnityEngine.Experimental.Rendering;
+using UnityEngine.Experimental.Rendering;
-
+
-public abstract class FilterChainEffect : FilterEffect
+public abstract class FilterChainEffect : FilterEffect
-{
+{
-    #region SealedForDisable
+    #region SealedForDisable
-    protected sealed override string ShaderName => null;
+    protected sealed override string ShaderName => null;
-    protected sealed override void OnInit(Material renderMat) { }
+    protected sealed override void OnInit(Material renderMat) { }
-
+
     public sealed override void Render(Texture src, RenderTexture result)
     {
-        OnRenderer(src, result);
+        OnRenderer(src, result);
-    }
+    }
-    protected sealed override void OnRenderer(Material renderMat, Texture src, RenderTexture result) { }
+    protected sealed override void OnRenderer(Material renderMat, Texture src, RenderTexture result) { }
-    #endregion
+    #endregion
-
+
-    List<PassDefine> m_passes = new List<PassDefine>();
+    List<PassDefine> m_passes = new List<PassDefine>();
-
+
-    static int Original;
+    static int Original;
-    static int OriginalSize;
+    static int OriginalSize;
-    static int Source;
+    static int Source;
-    static int SourceSize;
+    static int SourceSize;
-    static int FrameCount;
+    static int FrameCount;
-    static int OutputSize;
+    static int OutputSize;
-
+
-    List<int> m_passOutputTexNames = new List<int>();
+    List<int> m_passOutputTexNames = new List<int>();
-    List<int> m_passOutputTexSizes = new List<int>();
+    List<int> m_passOutputTexSizes = new List<int>();
-
+
-    static FilterChainEffect()
+    static FilterChainEffect()
-    {
+    {
-        Original = Shader.PropertyToID(nameof(Original));
+        Original = Shader.PropertyToID(nameof(Original));
-        OriginalSize = Shader.PropertyToID(nameof(OriginalSize));
+        OriginalSize = Shader.PropertyToID(nameof(OriginalSize));
-        Source = Shader.PropertyToID(nameof(Source));
+        Source = Shader.PropertyToID(nameof(Source));
-        SourceSize = Shader.PropertyToID(nameof(SourceSize));
+        SourceSize = Shader.PropertyToID(nameof(SourceSize));
-        FrameCount = Shader.PropertyToID(nameof(FrameCount));
+        FrameCount = Shader.PropertyToID(nameof(FrameCount));
-        OutputSize = Shader.PropertyToID(nameof(OutputSize));
+        OutputSize = Shader.PropertyToID(nameof(OutputSize));
-    }
+    }
-
+
-    protected sealed override void Init()
+    protected sealed override void Init()
-    {
+    {
-        DefinePasses(ref m_passes);
+        DefinePasses(ref m_passes);
-        for (int i = 0; i < m_passes.Count; i++)
+        for (int i = 0; i < m_passes.Count; i++)
-        {
+        {
-            m_passes[i].Init(i);
+            m_passes[i].Init(i);
-            m_passOutputTexNames.Add(Shader.PropertyToID(m_passes[i].NormalOutputTextureName));
+            m_passOutputTexNames.Add(Shader.PropertyToID(m_passes[i].NormalOutputTextureName));
-            m_passOutputTexSizes.Add(Shader.PropertyToID($"{m_passes[i].NormalOutputTextureName}Size"));
+            m_passOutputTexSizes.Add(Shader.PropertyToID($"{m_passes[i].NormalOutputTextureName}Size"));
             if (m_passes[i].AliasOutputTextureName != null)
             {
                 m_passOutputTexNames.Add(Shader.PropertyToID(m_passes[i].AliasOutputTextureName));
-                m_passOutputTexSizes.Add(Shader.PropertyToID($"{m_passes[i].AliasOutputTextureName}Size"));
+                m_passOutputTexSizes.Add(Shader.PropertyToID($"{m_passes[i].AliasOutputTextureName}Size"));
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    Dictionary<int, RenderTexture> m_outputCaches = new Dictionary<int, RenderTexture>();
+    Dictionary<int, RenderTexture> m_outputCaches = new Dictionary<int, RenderTexture>();
-    private void OnRenderer(Texture input, RenderTexture finalOut)
+    private void OnRenderer(Texture input, RenderTexture finalOut)
-    {
+    {
-        m_outputCaches.Clear();
+        m_outputCaches.Clear();
-
+
-        Vector4 originalSize = new Vector4(input.width, input.height, 1f / input.width, 1f / input.height);
+        Vector4 originalSize = new Vector4(input.width, input.height, 1f / input.width, 1f / input.height);
-
+
-        Texture lastoutput = input;
+        Texture lastoutput = input;
-        for (int i = 0; i < m_passes.Count; i++)
+        for (int i = 0; i < m_passes.Count; i++)
-        {
+        {
-            var pass = m_passes[i];
+            var pass = m_passes[i];
-            pass.OnRender();
+            pass.OnRender();
-
+
-            pass.Mat.SetTexture(Original, input);
+            pass.Mat.SetTexture(Original, input);
-            pass.Mat.SetVector(OriginalSize, originalSize);
+            pass.Mat.SetVector(OriginalSize, originalSize);
-            pass.Mat.SetTexture(Source, lastoutput);
+            pass.Mat.SetTexture(Source, lastoutput);
             pass.Mat.SetVector(SourceSize, new Vector4(lastoutput.width, lastoutput.height, 1f / lastoutput.width, 1f / lastoutput.height));
-            pass.Mat.SetFloat(FrameCount, Time.frameCount);
+            pass.Mat.SetFloat(FrameCount, Time.frameCount);
-
+
-            for (int index = 0; index < m_passOutputTexNames.Count; index++)
+            for (int index = 0; index < m_passOutputTexNames.Count; index++)
-            {
+            {
-                var existoutput = m_passOutputTexNames[index];
+                var existoutput = m_passOutputTexNames[index];
-                var existoutputSize = m_passOutputTexSizes[index];
+                var existoutputSize = m_passOutputTexSizes[index];
                 if (m_outputCaches.TryGetValue(existoutput, out var passOutput))
                 {
                     if (pass.Mat.HasTexture(existoutput))
                         pass.Mat.SetTexture(existoutput, passOutput);
                     if (pass.Mat.HasVector(existoutputSize))
-                        pass.Mat.SetVector(existoutputSize, new Vector4(passOutput.width, passOutput.height, 1f / passOutput.width, 1f / passOutput.height));
+                        pass.Mat.SetVector(existoutputSize, new Vector4(passOutput.width, passOutput.height, 1f / passOutput.width, 1f / passOutput.height));
-                }
+                }
-            }
+            }
-
+
             var output = pass.GetOutput(input, lastoutput, finalOut);
 
-            pass.Mat.SetVector(OutputSize, new Vector4(output.width, output.height, 1f / output.width, 1f / output.height));
+            pass.Mat.SetVector(OutputSize, new Vector4(output.width, output.height, 1f / output.width, 1f / output.height));
-
+
-            m_outputCaches[pass.NormalOutputTextureName_PID] = output;
+            m_outputCaches[pass.NormalOutputTextureName_PID] = output;
-            if (pass.AliasOutputTextureName != null) m_outputCaches[pass.AliasOutputTextureName_PID] = output;
+            if (pass.AliasOutputTextureName != null) m_outputCaches[pass.AliasOutputTextureName_PID] = output;
-
+
-            Graphics.Blit(lastoutput, output, pass.Mat);
+            Graphics.Blit(lastoutput, output, pass.Mat);
-
+
-            lastoutput = output;
+            lastoutput = output;
-        }
+        }
-
+
-        Graphics.Blit(lastoutput, finalOut);
+        Graphics.Blit(lastoutput, finalOut);
-
+
-        foreach (var rt in m_outputCaches.Values)
+        foreach (var rt in m_outputCaches.Values)
-            RenderTexture.ReleaseTemporary(rt);
+            RenderTexture.ReleaseTemporary(rt);
-    }
+    }
-
+
-    protected abstract void DefinePasses(ref List<PassDefine> passes);
+    protected abstract void DefinePasses(ref List<PassDefine> passes);
-
+
-    public class PassDefine
+    public class PassDefine
     {
-        public string ShaderName { get; private set; }
+        public string ShaderName { get; private set; }
-        public FilterMode FilterMode { get; private set; }
+        public FilterMode FilterMode { get; private set; }
-        public TextureWrapMode WrapMode { get; private set; }
+        public TextureWrapMode WrapMode { get; private set; }
         public EnumScaleMode ScaleModeX { get; private set; }
-        public EnumScaleMode ScaleModeY { get; private set; }
+        public EnumScaleMode ScaleModeY { get; private set; }
-        public float ScaleX { get; private set; }
+        public float ScaleX { get; private set; }
-        public float ScaleY { get; private set; }
+        public float ScaleY { get; private set; }
-        public string AliasOutputTextureName { get; private set; }
+        public string AliasOutputTextureName { get; private set; }
-        public int AliasOutputTextureName_PID { get; private set; }
+        public int AliasOutputTextureName_PID { get; private set; }
-        public string NormalOutputTextureName { get; private set; }
+        public string NormalOutputTextureName { get; private set; }
-        public int NormalOutputTextureName_PID { get; private set; }
+        public int NormalOutputTextureName_PID { get; private set; }
         public bool sRGB { get; private set; }
-
+
-        private PassDefine() { }
+        private PassDefine() { }
-
+
-        public static PassDefine Create(
+        public static PassDefine Create(
-            string shaderName,
+            string shaderName,
-            FilterMode filterMode = FilterMode.Point,
+            FilterMode filterMode = FilterMode.Point,
-            TextureWrapMode wrapMode = TextureWrapMode.Clamp,
+            TextureWrapMode wrapMode = TextureWrapMode.Clamp,
-            EnumScaleMode scaleModeX = EnumScaleMode.Source, EnumScaleMode scaleModeY = EnumScaleMode.Source, float scaleX = 1f, float scaleY = 1f,
+            EnumScaleMode scaleModeX = EnumScaleMode.Source, EnumScaleMode scaleModeY = EnumScaleMode.Source, float scaleX = 1f, float scaleY = 1f,
-            string outputAlias = null,
+            string outputAlias = null,
-            bool sRGB = false
+            bool sRGB = false
-            )
+            )
-        {
+        {
-            return new PassDefine()
+            return new PassDefine()
-            {
+            {
-                ShaderName = shaderName,
+                ShaderName = shaderName,
-                FilterMode = filterMode,
+                FilterMode = filterMode,
-                WrapMode = wrapMode,
+                WrapMode = wrapMode,
-                ScaleModeX = scaleModeX,
+                ScaleModeX = scaleModeX,
-                ScaleModeY = scaleModeY,
+                ScaleModeY = scaleModeY,
-                ScaleX = scaleX,
+                ScaleX = scaleX,
-                ScaleY = scaleY,
+                ScaleY = scaleY,
-                AliasOutputTextureName = outputAlias,
+                AliasOutputTextureName = outputAlias,
-                sRGB = sRGB,
+                sRGB = sRGB,
-            };
+            };
-        }
+        }
-
+
-        private Dictionary<string, FilterParameter> m_linkingParams = new Dictionary<string, FilterParameter>();
+        private Dictionary<string, FilterParameter> m_linkingParams = new Dictionary<string, FilterParameter>();
         public PassDefine SetParameters(string shaderValName, FilterParameter para)
         {
             m_linkingParams[shaderValName] = para;
             return this;
-        }
+        }
-
+
-        public int PassIndex { get; private set; }
+        public int PassIndex { get; private set; }
         public Material Mat { get; private set; }
 
         public void OnRender()
@@ -167,63 +167,63 @@ public abstract class FilterChainEffect : FilterEffect
                 if (valType == typeof(float))
                     Mat.SetFloat(paraName, (float)val);
             }
-        }
+        }
-        internal void Init(int passIndex)
+        internal void Init(int passIndex)
-        {
+        {
-            Mat = new Material(Shader.Find(ShaderName));
+            Mat = new Material(Shader.Find(ShaderName));
-            PassIndex = passIndex;
+            PassIndex = passIndex;
-            NormalOutputTextureName = $"PassOutput{passIndex}";
+            NormalOutputTextureName = $"PassOutput{passIndex}";
-            NormalOutputTextureName_PID = Shader.PropertyToID(NormalOutputTextureName);
+            NormalOutputTextureName_PID = Shader.PropertyToID(NormalOutputTextureName);
-
+
-            if (AliasOutputTextureName != null) AliasOutputTextureName_PID = Shader.PropertyToID(AliasOutputTextureName);
+            if (AliasOutputTextureName != null) AliasOutputTextureName_PID = Shader.PropertyToID(AliasOutputTextureName);
-        }
+        }
-
+
-        internal RenderTexture GetOutput(Texture original, Texture source, Texture final)
+        internal RenderTexture GetOutput(Texture original, Texture source, Texture final)
-        {
+        {
-            int width = 0;
+            int width = 0;
-            switch (ScaleModeX)
+            switch (ScaleModeX)
-            {
+            {
-                case EnumScaleMode.Viewport:
+                case EnumScaleMode.Viewport:
-                    width = (int)(final.width * ScaleX);
+                    width = (int)(final.width * ScaleX);
-                    break;
+                    break;
-                case EnumScaleMode.Source:
+                case EnumScaleMode.Source:
-                    width = (int)(source.width * ScaleX);
+                    width = (int)(source.width * ScaleX);
-                    break;
+                    break;
-                case EnumScaleMode.Absolute:
+                case EnumScaleMode.Absolute:
-                    width = (int)ScaleX;
+                    width = (int)ScaleX;
-                    break;
+                    break;
-            }
+            }
             int height = 0;
-            switch (ScaleModeY)
+            switch (ScaleModeY)
-            {
+            {
-                case EnumScaleMode.Viewport:
+                case EnumScaleMode.Viewport:
-                    height = (int)(final.height * ScaleY);
+                    height = (int)(final.height * ScaleY);
-                    break;
+                    break;
-                case EnumScaleMode.Source:
+                case EnumScaleMode.Source:
-                    height = (int)(source.height * ScaleY);
+                    height = (int)(source.height * ScaleY);
-                    break;
+                    break;
-                case EnumScaleMode.Absolute:
+                case EnumScaleMode.Absolute:
-                    height = (int)ScaleY;
+                    height = (int)ScaleY;
-                    break;
+                    break;
-            }
+            }
-
+
-            //if (sRGB) format = GraphicsFormat.R8G8B8A8_SRGB;
+            //if (sRGB) format = GraphicsFormat.R8G8B8A8_SRGB;
             var rt = RenderTexture.GetTemporary(width, height, 0, GraphicsFormat.R8G8B8A8_UNorm, 1);
 
-            rt.wrapMode = WrapMode;
+            rt.wrapMode = WrapMode;
-            rt.filterMode = FilterMode;
+            rt.filterMode = FilterMode;
-
+
-            return rt;
+            return rt;
-        }
+        }
-    }
+    }
-
+
-    public enum EnumScaleMode
+    public enum EnumScaleMode
-    {
+    {
-        /// <summary> 以输入源为缩放基准 </summary           
+        /// <summary> 以输入源为缩放基准 </summary           
-        Source,
+        Source,
-        /// <summary> 以分辨率作为缩放基准 </summary
+        /// <summary> 以分辨率作为缩放基准 </summary
-        Viewport,
+        Viewport,
-        /// <summary> 以固定值定义尺寸 </summary
+        /// <summary> 以固定值定义尺寸 </summary
-        Absolute
+        Absolute
-    }
+    }
-}
+}

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterEffect.cs

@@ -1,7 +1,6 @@
 using Assets.Script.AppMain.Filter;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using UnityEngine;
@@ -54,12 +53,12 @@ namespace AxibugEmuOnline.Client
                 var rangeAtt = param.GetCustomAttribute<RangeAttribute>();
                 float min = 0;
                 float max = 10;
-                if (rangeAtt != null) { min = rangeAtt.min; max = rangeAtt.max; }
+                if (rangeAtt != null)
-
+                {
-                var descrip = param.GetCustomAttribute<DescriptionAttribute>();
+                    min = rangeAtt.min; max = rangeAtt.max;
-                string name = descrip != null ? descrip.Description : param.Name;
+                }
 
-                var editableParam = new EditableParamerter(name, paramObj, min, max);
+                var editableParam = new EditableParamerter(param.Name, paramObj, min, max);
                 m_editableParamList.Add(editableParam);
             }
         }
@@ -87,23 +86,15 @@ namespace AxibugEmuOnline.Client
             public object MinValue { get; private set; }
             public object MaxValue { get; private set; }
 
-            public EditableParamerter(string name, FilterParameter paramObject, float minValue, float maxValue)
+            public EditableParamerter(string name, FilterParameter paramObject, object minValue, object maxValue)
             {
                 m_paramObject = paramObject;
                 Name = name;
 
                 var paramType = paramObject.GetType();
 
-                if (paramObject.ValueType == typeof(int))
+                MinValue = minValue;
-                {
+                MaxValue = maxValue;
-                    MinValue = (int)minValue;
-                    MaxValue = (int)maxValue;
-                }
-                else if (paramObject.ValueType == typeof(float))
-                {
-                    MinValue = minValue;
-                    MaxValue = maxValue;
-                }
             }
 
             public void ResetToDefault() => m_paramObject.Value = null;

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

@@ -331,18 +331,6 @@ namespace AxibugEmuOnline.Client
                     float.TryParse(rawStr, out floatVal);
                     return floatVal;
                 }
-                else if (valueType == typeof(int))
-                {
-                    int intVal;
-                    int.TryParse(rawStr, out intVal);
-                    return intVal;
-                }
-                else if (valueType == typeof(bool))
-                {
-                    bool boolVal;
-                    bool.TryParse(rawStr, out boolVal);
-                    return boolVal;
-                }
                 else if (valueType.IsEnum)
                 {
                     var names = Enum.GetNames(valueType);

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterParamerter.cs

@@ -13,7 +13,7 @@ namespace Assets.Script.AppMain.Filter
         {
             get => m_overrideValue ?? m_defaultValue;
             set => m_overrideValue = value;
-        }
+        }
     }
 
     public class FilterParameter<T> : FilterParameter
@@ -28,76 +28,21 @@ namespace Assets.Script.AppMain.Filter
         public FilterParameter(T defaultValue)
         {
             m_defaultValue = defaultValue;
-        }
-
-        public static implicit operator T(FilterParameter<T> value)
-        {
-            return value.GetValue();
-        }
-
-        public static implicit operator FilterParameter<T>(T value)
-        {
-            return new FilterParameter<T>(value);
         }
     }
 
     public class BoolParameter : FilterParameter<bool>
     {
         public BoolParameter(bool defaultValue) : base(defaultValue) { }
-
-        public static implicit operator bool(BoolParameter value)
-        {
-            return value.GetValue();
-        }
-
-        public static implicit operator BoolParameter(bool value)
-        {
-            return new BoolParameter(value);
-        }
     }
 
     public class Vector2Parameter : FilterParameter<Vector2>
     {
-        public Vector2Parameter(Vector2 defaultValue) : base(defaultValue) { }
+        public Vector2Parameter(Vector2 defaultValue) : base(defaultValue) { }
-
-        public static implicit operator Vector2(Vector2Parameter value)
-        {
-            return value.GetValue();
-        }
-
-        public static implicit operator Vector2Parameter(Vector2 value)
-        {
-            return new Vector2Parameter(value);
-        }
     }
 
     public class FloatParameter : FilterParameter<float>
     {
         public FloatParameter(float defaultValue) : base(defaultValue) { }
-
-        public static implicit operator float(FloatParameter value)
-        {
-            return value.GetValue();
-        }
-
-        public static implicit operator FloatParameter(float value)
-        {
-            return new FloatParameter(value);
-        }
-    }
-
-    public class IntParameter : FilterParameter<int>
-    {
-        public IntParameter(int defaultValue) : base(defaultValue) { }
-
-        public static implicit operator int(IntParameter value)
-        {
-            return value.GetValue();
-        }
-
-        public static implicit operator IntParameter(int value)
-        {
-            return new IntParameter(value);
-        }
     }
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/SimpleCRT.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 36463068bd4c2274cb302669fa552345
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/SimpleCRT/SimpleCRT.cs

@@ -1,173 +0,0 @@
-using Assets.Script.AppMain.Filter;
-using AxibugEmuOnline.Client;
-using System.ComponentModel;
-using UnityEngine;
-using Random = UnityEngine.Random;
-
-
-public class SimpleCRT : FilterEffect
-{
-    public override string Name => nameof(SimpleCRT);
-
-    protected override string ShaderName => "Filter/yunoda-3DCG/SimpleCRT";
-
-    [Range(0, 1000)][Description("White Noise Freq")] public IntParameter whiteNoiseFrequency = new IntParameter(1);
-    [Range(0, 1)][Description("White Noise Time Left (sec)")] public FloatParameter whiteNoiseLength = new FloatParameter(0.1f);
-    private float whiteNoiseTimeLeft;
-
-    [Range(0, 1000)][Description("Screen Jump Freq")] public IntParameter screenJumpFrequency = 1;
-    [Range(0, 1f)][Description("Screen Jump Length")] public FloatParameter screenJumpLength = 0.2f;
-    [Range(0, 1f)][Description("Jump Min")] public FloatParameter screenJumpMinLevel = 0.1f;
-    [Range(0, 1f)][Description("Jump Max")] public FloatParameter screenJumpMaxLevel = 0.9f;
-    private float screenJumpTimeLeft;
-
-    [Range(0, 1f)][Description("Flickering Strength")] public FloatParameter flickeringStrength = 0.002f;
-    [Range(0, 333f)][Description("Flickering Cycle")] public FloatParameter flickeringCycle = 111f;
-
-    [Description("Slip Page")] public BoolParameter isSlippage = true;
-    [Description("Slip Noise")] public BoolParameter isSlippageNoise = true;
-    [Range(0, 1)][Description("Slip Strength")] public FloatParameter slippageStrength = 0.005f;
-    [Range(0, 100)][Description("Slip Intervalw")] public float slippageInterval = 1f;
-    [Range(0, 330)][Description("Slip Scroll Speed")] public float slippageScrollSpeed = 33f;
-    [Range(0, 100f)][Description("Slip Size")] public FloatParameter slippageSize = 11f;
-
-    [Range(0, 1f)][Description("Chromatic Aberration Strength")] public FloatParameter chromaticAberrationStrength = 0.005f;
-    [Description("Chromatic Aberration")] public bool isChromaticAberration = true;
-
-    [Description("Multiple Ghost")] public BoolParameter isMultipleGhost = true;
-    [Range(0, 1f)][Description("Multiple Ghost Strength")] public FloatParameter multipleGhostStrength = 0.01f;
-
-    [Description("Scanline")] public BoolParameter isScanline = true;
-    [Description("Monochrome")] public BoolParameter isMonochrome = false;
-
-    [Description("Letter Box")] public bool isLetterBox = false;
-    public bool isLetterBoxEdgeBlur = false;
-    [Description("Letter Box Type")] public FilterParameter<LeterBoxType> letterBoxType = default(LeterBoxType);
-    public enum LeterBoxType
-    {
-        Black,
-        Blur
-    }
-
-    #region Properties in shader
-    private int _WhiteNoiseOnOff;
-    private int _ScanlineOnOff;
-    private int _MonochormeOnOff;
-    private int _ScreenJumpLevel;
-    private int _FlickeringStrength;
-    private int _FlickeringCycle;
-    private int _SlippageStrength;
-    private int _SlippageSize;
-    private int _SlippageInterval;
-    private int _SlippageScrollSpeed;
-    private int _SlippageNoiseOnOff;
-    private int _SlippageOnOff;
-    private int _ChromaticAberrationStrength;
-    private int _ChromaticAberrationOnOff;
-    private int _MultipleGhostOnOff;
-    private int _MultipleGhostStrength;
-    private int _LetterBoxOnOff;
-    private int _LetterBoxType;
-    private int _LetterBoxEdgeBlurOnOff;
-    private int _DecalTex;
-    private int _DecalTexOnOff;
-    private int _DecalTexPos;
-    private int _DecalTexScale;
-    private int _FilmDirtOnOff;
-    private int _FilmDirtTex;
-    #endregion
-
-    protected override void OnInit(Material renderMat)
-    {
-        base.OnInit(renderMat);
-
-        _WhiteNoiseOnOff = Shader.PropertyToID("_WhiteNoiseOnOff");
-        _ScanlineOnOff = Shader.PropertyToID("_ScanlineOnOff");
-        _MonochormeOnOff = Shader.PropertyToID("_MonochormeOnOff");
-        _ScreenJumpLevel = Shader.PropertyToID("_ScreenJumpLevel");
-        _FlickeringStrength = Shader.PropertyToID("_FlickeringStrength");
-        _FlickeringCycle = Shader.PropertyToID("_FlickeringCycle");
-        _SlippageStrength = Shader.PropertyToID("_SlippageStrength");
-        _SlippageSize = Shader.PropertyToID("_SlippageSize");
-        _SlippageInterval = Shader.PropertyToID("_SlippageInterval");
-        _SlippageScrollSpeed = Shader.PropertyToID("_SlippageScrollSpeed");
-        _SlippageNoiseOnOff = Shader.PropertyToID("_SlippageNoiseOnOff");
-        _SlippageOnOff = Shader.PropertyToID("_SlippageOnOff");
-        _ChromaticAberrationStrength = Shader.PropertyToID("_ChromaticAberrationStrength");
-        _ChromaticAberrationOnOff = Shader.PropertyToID("_ChromaticAberrationOnOff");
-        _MultipleGhostOnOff = Shader.PropertyToID("_MultipleGhostOnOff");
-        _MultipleGhostStrength = Shader.PropertyToID("_MultipleGhostStrength");
-        _LetterBoxOnOff = Shader.PropertyToID("_LetterBoxOnOff");
-        _LetterBoxType = Shader.PropertyToID("_LetterBoxType");
-        _DecalTex = Shader.PropertyToID("_DecalTex");
-        _DecalTexOnOff = Shader.PropertyToID("_DecalTexOnOff");
-        _DecalTexPos = Shader.PropertyToID("_DecalTexPos");
-        _DecalTexScale = Shader.PropertyToID("_DecalTexScale");
-        _FilmDirtOnOff = Shader.PropertyToID("_FilmDirtOnOff");
-        _FilmDirtTex = Shader.PropertyToID("_FilmDirtTex");
-    }
-
-    protected override void OnRenderer(Material renderMat, Texture src, RenderTexture result)
-    {
-        SetShaderParameter(renderMat);
-
-        Graphics.Blit(src, result, renderMat);
-    }
-
-    private void SetShaderParameter(Material material)
-    {
-        ///////White noise
-        whiteNoiseTimeLeft -= 0.01f;
-        if (whiteNoiseTimeLeft <= 0)
-        {
-            if (Random.Range(0, 1000) < whiteNoiseFrequency)
-            {
-                material.SetInteger(_WhiteNoiseOnOff, 1);
-                whiteNoiseTimeLeft = whiteNoiseLength;
-            }
-            else
-            {
-                material.SetInteger(_WhiteNoiseOnOff, 0);
-            }
-        }
-        //////
-
-        material.SetInteger(_LetterBoxOnOff, isLetterBox ? 0 : 1);
-        //material.SetInteger(_LetterBoxEdgeBlurOnOff, isLetterBoxEdgeBlur ? 0 : 1); 
-        material.SetInteger(_LetterBoxType, (int)letterBoxType.GetValue());
-
-        material.SetInteger(_ScanlineOnOff, isScanline ? 1 : 0);
-        material.SetInteger(_MonochormeOnOff, isMonochrome ? 1 : 0);
-        material.SetFloat(_FlickeringStrength, flickeringStrength);
-        material.SetFloat(_FlickeringCycle, flickeringCycle);
-        material.SetFloat(_ChromaticAberrationStrength, chromaticAberrationStrength);
-        material.SetInteger(_ChromaticAberrationOnOff, isChromaticAberration ? 1 : 0);
-        material.SetInteger(_MultipleGhostOnOff, isMultipleGhost ? 1 : 0);
-        material.SetFloat(_MultipleGhostStrength, multipleGhostStrength);
-
-        //////Slippage
-        material.SetInteger(_SlippageOnOff, isSlippage ? 1 : 0);
-        material.SetFloat(_SlippageInterval, slippageInterval);
-        material.SetFloat(_SlippageNoiseOnOff, isSlippageNoise ? Random.Range(0, 1f) : 1);
-        material.SetFloat(_SlippageScrollSpeed, slippageScrollSpeed);
-        material.SetFloat(_SlippageStrength, slippageStrength);
-        material.SetFloat(_SlippageSize, slippageSize);
-        //////
-
-        //////Screen Jump Noise
-        screenJumpTimeLeft -= 0.01f;
-        if (screenJumpTimeLeft <= 0)
-        {
-            if (Random.Range(0, 1000) < screenJumpFrequency)
-            {
-                var level = Random.Range(screenJumpMinLevel, screenJumpMaxLevel);
-                material.SetFloat(_ScreenJumpLevel, level);
-                screenJumpTimeLeft = screenJumpLength;
-            }
-            else
-            {
-                material.SetFloat(_ScreenJumpLevel, 0);
-            }
-        }
-    }
-}

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/SimpleCRT/SimpleCRT.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: d4ffc7492874c2241827f1d70c24a1e3

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/SimpleCRT/SimpleCRT.shader

@@ -1,237 +0,0 @@
-Shader "Filter/yunoda-3DCG/SimpleCRT"
-{
-    Properties
-    {
-        _MainTex ("Texture", 2D) = "white" {}
-        _DecalTex ("Decal Texture", 2D) = "white" {}
-        _FilmDirtTex ("Dirt Texture", 2D) = "white" {}
-    }
-    SubShader
-    {        
-        Pass
-        {
-            CGPROGRAM
-            #include "UnityCG.cginc"
-
-            #pragma vertex vert
-            #pragma fragment frag
-
-            struct appdata
-            {
-                float4 vertex : POSITION;
-                float2 uv : TEXCOORD0;
-            };
-
-            struct v2f
-            {
-                float2 uv : TEXCOORD0;
-                float2 decaluv : TEXCOORD1;
-                float4 vertex : SV_POSITION;
-            };
-
-            sampler2D _MainTex;
-            float4 _MainTex_ST;
-            float4 _MainTex_TexelSize;
-
-            int _WhiteNoiseOnOff;
-            int _ScanlineOnOff;
-            int _MonochormeOnOff;
-
-            int _LetterBoxOnOff;
-            int _LetterBoxEdgeBlur;
-            int _LetterBoxType;
-            
-            float _ScreenJumpLevel;
-            
-            float _FlickeringStrength;
-            float _FlickeringCycle;
-            
-            int _SlippageOnOff;
-            float _SlippageStrength;
-            float _SlippageInterval;
-            float _SlippageScrollSpeed;
-            float _SlippageNoiseOnOff;
-            float _SlippageSize;
-
-            float _ChromaticAberrationStrength;
-            int _ChromaticAberrationOnOff;
-
-            int _MultipleGhostOnOff;
-            float _MultipleGhostStrength;
-
-            sampler2D _DecalTex;
-            float4 _DecalTex_ST;
-            int _DecalTexOnOff;
-            float2 _DecalTexPos;
-            float2 _DecalTexScale;
-
-            int _FilmDirtOnOff;
-            sampler2D _FilmDirtTex;
-            float4 _FilmDirtTex_ST;
-
-            float GetRandom(float x);
-            float EaseIn(float t0, float t1, float t);
-
-            v2f vert (appdata v)
-            {
-                v2f o;
-                o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-                o.decaluv = TRANSFORM_TEX(v.uv, _DecalTex);
-                return o;
-            }
-
-            fixed4 frag (v2f i) : SV_Target
-            {
-                float2 uv = i.uv;
-
-                /////Jump noise
-                uv.y = frac(uv.y + _ScreenJumpLevel);
-                /////
-
-                /////frickering
-                float flickeringNoise = GetRandom(_Time.y);
-                float flickeringMask = pow(abs(sin(i.uv.y * _FlickeringCycle + _Time.y)), 10);
-                uv.x = uv.x + (flickeringNoise * _FlickeringStrength * flickeringMask); 
-                /////
-
-                /////slippage
-                float scrollSpeed = _Time.x * _SlippageScrollSpeed;
-                float slippageMask = pow(abs(sin(i.uv.y * _SlippageInterval + scrollSpeed)), _SlippageSize);
-                float stepMask = round(sin(i.uv.y * _SlippageInterval + scrollSpeed - 1));
-                uv.x = uv.x + (_SlippageNoiseOnOff * _SlippageStrength * slippageMask * stepMask) * _SlippageOnOff; 
-                /////
-
-                /////Chromatic Aberration
-                float red = tex2D(_MainTex, float2(uv.x - _ChromaticAberrationStrength * _ChromaticAberrationOnOff, uv.y)).r;
-                float green = tex2D(_MainTex, float2(uv.x, uv.y)).g;
-                float blue = tex2D(_MainTex, float2(uv.x + _ChromaticAberrationStrength * _ChromaticAberrationOnOff, uv.y)).b; 
-                float4 color = float4(red, green, blue, 1);
-                /////
-
-                /////Multiple Ghost
-                float4 ghost1st = tex2D(_MainTex, uv - float2(1, 0) * _MultipleGhostStrength * _MultipleGhostOnOff);
-                float4 ghost2nd = tex2D(_MainTex, uv - float2(1, 0) * _MultipleGhostStrength * 2 * _MultipleGhostOnOff);
-                color = color * 0.8 + ghost1st * 0.15 + ghost2nd * 0.05;
-                /////
-
-                /////File dirt
-                float2 pp = -1.0 + 2.0 * uv;
-                float time = _Time.x;
-                float aaRad = 0.1;
-                float2 nseLookup2 = pp + time * 1000;
-                float3 nse2 =
-                    tex2D(_FilmDirtTex, 0.1 * nseLookup2.xy).xyz +
-                    tex2D(_FilmDirtTex, 0.01 * nseLookup2.xy).xyz +
-                    tex2D(_FilmDirtTex, 0.004 * nseLookup2.xy).xyz;
-                float thresh = 0.6;
-                float mul1 = smoothstep(thresh - aaRad, thresh + aaRad, nse2.x);
-                float mul2 = smoothstep(thresh - aaRad, thresh + aaRad, nse2.y);
-                float mul3 = smoothstep(thresh - aaRad, thresh + aaRad, nse2.z);
-                
-                float seed = tex2D(_FilmDirtTex, float2(time * 0.35, time)).x;
-                
-                float result = clamp(0, 1, seed + 0.7);
-                
-                result += 0.06 * EaseIn(19.2, 19.4, time);
-
-                float band = 0.05;
-                if(_FilmDirtOnOff == 1)
-                {
-                if( 0.3 < seed && 0.3 + band > seed )
-                    color *=  mul1 * result;
-                else if( 0.6 < seed && 0.6 + band > seed )
-                    color *= mul2 * result;
-                else if( 0.9 < seed && 0.9 + band > seed )
-                    color *= mul3 * result;
-                }
-                /////
-
-                /////Letter box
-                float band_uv = fmod(_MainTex_TexelSize.z, 640) / _MainTex_TexelSize.z / 2;
-                if(i.uv.x < band_uv || 1 - band_uv < i.uv.x)
-                {
-                    float pi = 6.28318530718; 
-                    float directions = 16.0; 
-                    float quality = 3.0; 
-                    float size = 8.0; 
-                
-                    float2 Radius = size * _MainTex_ST.zw;
-                    float4 samplingColor = tex2D(_MainTex, uv);
-                    
-                    for(float d = 0.0; d < pi; d += pi / directions)
-                    {
-                        for(float i = 1.0 / quality; i <= 1.0; i += 1.0 / quality)
-                        {
-                            samplingColor += tex2D(_MainTex, uv + float2(cos(d), sin(d)) * 0.015 * i);		
-                        }
-                    }
-                    samplingColor /= quality * directions - 15.0;
-                    
-                    if(_LetterBoxOnOff == 1)
-                    {
-                        color = color;
-                    }
-                    else if(_LetterBoxType == 0) // LetterBox is Black
-                    {
-                        color = 0;
-                    }
-                    else if(_LetterBoxType == 1) // LetterBox is Blur
-                    {
-                        color = samplingColor;
-                    }
-                }
-                /////
-
-                /////White noise
-                if(_WhiteNoiseOnOff == 1)
-                {
-                    return frac(sin(dot(i.uv, float2(12.9898, 78.233)) + _Time.x) * 43758.5453);
-                }
-                /////
-
-                /////Decal texture
-                float4 decal = tex2D(_DecalTex, (i.decaluv - _DecalTexPos) * _DecalTexScale) * _DecalTexOnOff;
-                color = color * (1 - decal.a) + decal;
-                /////
-
-                /////Scanline
-                float scanline = sin((i.uv.y + _Time.x) * 800.0) * 0.04;
-                color -= scanline * _ScanlineOnOff;
-                /////
-
-                //////scanline noise
-                float noiseAlpha = 1;
-                if(pow(sin(uv.y + _Time.y * 2), 200) >= 0.999)
-                {
-                    noiseAlpha = GetRandom(uv.y);
-                    //color *= noiseAlpha;
-                }
-                //////
-
-                //////Monochorome
-                if(_MonochormeOnOff == 1)
-                {
-                    color.xyz = 0.299f * color.r + 0.587f * color.g + 0.114f * color.b;
-                }
-                //////
-
-                return color;
-            }
-
-            float GetRandom(float x)
-            {
-                return frac(sin(dot(x, float2(12.9898, 78.233))) * 43758.5453);
-            }
-
-            float EaseIn(float t0, float t1, float t)
-            {
-                return 2.0 * smoothstep(t0, 2.0 * t1 - t0, t);
-            }
-            ENDCG
-        }
-    }
-}
-
-
-

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/SimpleCRT/SimpleCRT.shader.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: fdf9f1937116ab84c97a58a4cf82fbf8
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -9,7 +9,7 @@ namespace AxibugEmuOnline.Client
 {
     public class CacheManager
     {
-        static readonly string CacheDirPath = $"{App.PersistentDataRoot()}/Caches";
+        static readonly string CacheDirPath = $"{App.PersistentDataPath}/Caches";
         static readonly string TextureCacheDirPath = $"{CacheDirPath}/Texture";
 
         public void GetSpriteCache(string url, Action<Sprite, string> callback)

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/GamePadManager.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5fe26f58ab822c44888b86305c5326e0
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/GamePadManager/GamePad.cs

@@ -1,26 +0,0 @@
-namespace AxibugEmuOnline.Client.Manager
-{
-    public partial class GamePadManager
-    {
-        /// <summary>
-        /// 被Unity所识别的通用GamePad类
-        /// </summary>
-        public class GamePad
-        {
-            internal GamePadInfo m_info;
-            public int Index => m_info.Index;
-            public string Name => m_info.Name;
-            public bool Offline { get; internal set; }
-
-            internal GamePad(GamePadInfo info)
-            {
-                m_info = info;
-            }
-
-            public override string ToString()
-            {
-                return $"{Index}:{Name}{(Offline ? "(Offline)" : string.Empty)}";
-            }
-        }
-    }
-}

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/GamePadManager/GamePad.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: c2c0a06020f65a747af5490a6112361b

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

@@ -1,121 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-
-namespace AxibugEmuOnline.Client.Manager
-{
-    public partial class GamePadManager
-    {
-        #region Events
-        public delegate void GamePadConnectedHandle(GamePad newConnectGamePad);
-        /// <summary> 当一个手柄连接时触发 </summary>
-        public event GamePadConnectedHandle OnGamePadConnected;
-
-        public delegate void GamePadDisConnectedHandle(GamePad disConnectGamePad);
-        /// <summary> 当一个手柄断开时触发 </summary>
-        public event GamePadDisConnectedHandle OnGamePadDisConnected;
-        #endregion
-
-        Dictionary<GamePadInfo, GamePad> m_gamePads = new Dictionary<GamePadInfo, GamePad>();
-        HashSet<GamePadInfo> m_temp = new HashSet<GamePadInfo>();
-
-        public void Update()
-        {
-            m_temp.Clear();
-            foreach (var info in m_gamePads.Keys)
-                m_temp.Add(info); //记录需要被移除的手柄
-
-            var devices = Input.GetJoystickNames();
-            for (int i = 0; i < devices.Length; i++)
-            {
-                var info = new GamePadInfo { Index = i, Name = devices[i] };
-                m_temp.Remove(info);
-
-                if (!m_gamePads.ContainsKey(info))
-                {
-                    m_gamePads[info] = new GamePad(info);
-                    OnGamePadConnected?.Invoke(m_gamePads[info]);
-                };
-            }
-
-            foreach (var info in m_temp)
-            {
-                if (m_gamePads.TryGetValue(info, out GamePad gp))
-                {
-                    m_gamePads.Remove(info);
-                    gp.Offline = true;
-                    OnGamePadDisConnected?.Invoke(gp);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 获取所有已连接的手柄,返回的结果顺序与手柄序号无关
-        /// </summary>
-        /// <returns></returns>
-        public GamePad[] GetGamePads()
-        {
-            return m_gamePads.Values.ToArray();
-        }
-
-        internal struct GamePadInfo : IEquatable<GamePadInfo>, IComparable<GamePadInfo>
-        {
-            internal int Index;
-            internal string Name;
-
-            public override bool Equals(object obj)
-            {
-                if (obj is GamePadInfo)
-                {
-                    return Equals((GamePadInfo)obj);
-                }
-                return false;
-            }
-
-            public bool Equals(GamePadInfo other)
-            {
-                return Index == other.Index && Name == other.Name;
-            }
-
-            public override int GetHashCode()
-            {
-                // Custom hash code implementation without HashCombine
-                int hash = 17;
-                hash = hash * 31 + Index.GetHashCode();
-                hash = hash * 31 + (Name != null ? Name.GetHashCode() : 0);
-                return hash;
-            }
-
-            public int CompareTo(GamePadInfo other)
-            {
-                int indexComparison = Index.CompareTo(other.Index);
-                if (indexComparison != 0)
-                {
-                    return indexComparison;
-                }
-                return string.Compare(Name, other.Name, StringComparison.Ordinal);
-            }
-
-            public static bool operator ==(GamePadInfo left, GamePadInfo right)
-            {
-                return left.Equals(right);
-            }
-
-            public static bool operator !=(GamePadInfo left, GamePadInfo right)
-            {
-                return !(left == right);
-            }
-
-            public static bool operator <(GamePadInfo left, GamePadInfo right)
-            {
-                return left.CompareTo(right) < 0;
-            }
-
-            public static bool operator >(GamePadInfo left, GamePadInfo right)
-            {
-                return left.CompareTo(right) > 0;
-            }
-        }
-    }
-}

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/GamePadManager/GamePadManager.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: ce4d215abea527e4a8cf1103cbfecf6b

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

@@ -21,8 +21,8 @@ namespace AxibugEmuOnline.Client
         /// <summary> 指示该Rom文件的存放路径 </summary>
         public string LocalFilePath =>
                                     IsUserRom ?
-                                    $"{App.PersistentDataPath(Platform)}/UserRoms/{FileName}" :
+                                    $"{App.PersistentDataPath}/UserRoms/{Platform}/{FileName}" :
-                                    $"{App.PersistentDataPath(Platform)}/RemoteRoms/{FileName}";
+                                    $"{App.PersistentDataPath}/RemoteRoms/{Platform}/{FileName}";
 
         /// <summary> 指示该Rom文件是否已下载完毕 </summary>
         public bool RomReady => hasLocalFile;

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

@@ -43,8 +43,6 @@ namespace AxibugEmuOnline.Client
 
         private void OnRomStarStateChanged(int romID, bool star)
         {
-            if (nesRomFetchList == null) return;
-
             var targetRom = nesRomFetchList.FirstOrDefault(rom => rom.ID == romID);
             if (targetRom == null) return;
 
@@ -61,7 +59,7 @@ namespace AxibugEmuOnline.Client
         /// <summary> 清除所有下载的Rom文件 </summary>
         public void ClearRomFile()
         {
-            var path = $"{App.PersistentDataPath(m_platform)}/RemoteRoms";
+            var path = $"{App.PersistentDataPath}/RemoteRoms/{m_platform}";
             if (Directory.Exists(path)) Directory.Delete(path, true);
         }
 

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

@@ -48,7 +48,7 @@ namespace AxibugEmuOnline.Client
 
         public void SaveSRAMToFile(byte[] sramContent, string romName)
         {
-            string sramDirectoryPath = $"{App.PersistentDataPath(AxibugProtobuf.RomPlatformType.Nes)}/{Config.path.szSavePath}";
+            string sramDirectoryPath = $"{App.PersistentDataPath}/sav";
             Directory.CreateDirectory(sramDirectoryPath);
             romName = Path.GetFileNameWithoutExtension(romName);
             File.WriteAllBytes($"{sramDirectoryPath}/{romName}.sav", sramContent);
@@ -56,7 +56,7 @@ namespace AxibugEmuOnline.Client
 
         public void SaveDISKToFile(byte[] diskFileContent, string romName)
         {
-            string diskFileDirectoryPath = $"{App.PersistentDataPath(AxibugProtobuf.RomPlatformType.Nes)}/dsv";
+            string diskFileDirectoryPath = $"{App.PersistentDataPath}/dsv";
             Directory.CreateDirectory(diskFileDirectoryPath);
             romName = Path.GetFileNameWithoutExtension(romName);
             File.WriteAllBytes($"{diskFileDirectoryPath}/{romName}.dsv", diskFileContent);
@@ -65,14 +65,14 @@ namespace AxibugEmuOnline.Client
         public EmulatorConfig Config { get; private set; } = new EmulatorConfig();
         public void PrepareDirectory(string directPath)
         {
-            Directory.CreateDirectory($"{App.PersistentDataPath(AxibugProtobuf.RomPlatformType.Nes)}/{directPath}");
+            Directory.CreateDirectory($"{App.PersistentDataPath}/{directPath}");
         }
 
         public void SaveFile(byte[] fileData, string directPath, string fileName)
         {
             PrepareDirectory(directPath);
 
-            var fileFullpath = $"{App.PersistentDataPath(AxibugProtobuf.RomPlatformType.Nes)}/{directPath}/{fileName}";
+            var fileFullpath = $"{App.PersistentDataPath}/{directPath}/{fileName}";
             File.WriteAllBytes(fileFullpath, fileData);
         }
 
@@ -80,8 +80,7 @@ namespace AxibugEmuOnline.Client
         {
             try
             {
-                var path = $"{App.PersistentDataPath(AxibugProtobuf.RomPlatformType.Nes)}/{directPath}/{fileName}";
+                var data = File.ReadAllBytes($"{App.PersistentDataPath}/{directPath}/{fileName}");
-                var data = File.ReadAllBytes(path);
                 if (data == null) return null;
                 return new MemoryStream(data);
             }
@@ -89,6 +88,7 @@ namespace AxibugEmuOnline.Client
             {
                 return null;
             }
+
         }
 
         public bool TryGetMapperNo(ROM rom, out int mapperNo)

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

@@ -5,6 +5,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Xml.Linq;
+using UnityEditor;
 using UnityEngine;
 using VirtualNes.Core;
 using VirtualNes.Core.Debug;
@@ -178,17 +179,6 @@ namespace AxibugEmuOnline.Client
 
 
             return true;
-        }
-
-
-        public IControllerSetuper GetControllerSetuper()
-        {
-            return ControllerMapper;
-        }
-
-        public void Dispose()
-        {
-            StopGame();
         }
 
 #if UNITY_EDITOR
@@ -217,9 +207,15 @@ namespace AxibugEmuOnline.Client
                 db.AddInfo(new RomDB.RomInfo { CRC = crc, Mapper = mapper });
             }
 
-            UnityEditor.EditorUtility.SetDirty(db);
+            EditorUtility.SetDirty(db);
-            UnityEditor.AssetDatabase.SaveAssets();
+            AssetDatabase.SaveAssets();
         }
 #endif
+        public IControllerSetuper GetControllerSetuper()
+        {
+            return ControllerMapper;
+        }
+
+        public void Dispose() { }
     }
 }

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

@@ -153,7 +153,7 @@ namespace AxibugEmuOnline.Client
                 private FilterEffect.EditableParamerter m_param;
                 private FilterPreset m_preset;
 
-                public override bool Visible => true;
+                public override bool Visible => m_param.ValueType.IsEnum || m_param.ValueType == typeof(float);
 
                 public override string Name => m_param.Name;
                 public Opt_ParamEditor(Filter filter, FilterEffect.EditableParamerter editParam, FilterPreset preset)

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

@@ -139,7 +139,6 @@ namespace AxibugEmuOnline.Client
         {
             DownloadingFlag.SetActiveEx(false);
             FileReadyFlag.SetActiveEx(false);
-            Star.SetActiveEx(IsStar);
 
             if (m_romfile == null) return;
             if (!m_romfile.InfoReady) return;

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

@@ -8,10 +8,6 @@ namespace AxibugEmuOnline.Client
         [SerializeField]
         OptionUI_ValueEditItem_FloatEdit com_floatEdit;
         [SerializeField]
-        OptionUI_ValueEditItem_IntEdit com_intEdit;
-        [SerializeField]
-        OptionUI_ValueEditItem_BoolEdit com_boolEdit;
-        [SerializeField]
         OptionUI_ValueEditItem_EnumEdit com_enumEdit;
 
         IValueEditControl m_currentCom;
@@ -19,8 +15,6 @@ namespace AxibugEmuOnline.Client
         protected override void OnSetData(OptionMenu menuData)
         {
             com_floatEdit.gameObject.SetActive(false);
-            com_intEdit.gameObject.SetActive(false);
-            com_boolEdit.gameObject.SetActive(false);
             com_enumEdit.gameObject.SetActive(false);
 
             if (menuData is ValueSetMenu)
@@ -30,21 +24,13 @@ namespace AxibugEmuOnline.Client
                 {
                     m_currentCom = com_floatEdit;
                 }
-                else if(valueMenu.ValueType == typeof(int))
-                {
-                    m_currentCom = com_intEdit;
-                }
-                else if(valueMenu.ValueType == typeof(bool))
-                {
-                    m_currentCom = com_boolEdit;
-                }
                 else if (valueMenu.ValueType.IsEnum)
                 {
                     m_currentCom = com_enumEdit;
                 }
                 else
                 {
-                    App.log.Error($"尚未支持的数据类型:{valueMenu.ValueType}");
+                    App.log.Warning($"尚未支持的数据类型:{valueMenu.ValueType}");
                     return;
                 }
 

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

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace AxibugEmuOnline.Client
-{
-    public class OptionUI_ValueEditItem_BoolEdit : MonoBehaviour, IValueEditControl
-    {
-        [SerializeField]
-        Text txt_value;
-
-        private ValueSetMenu m_valueMenu;
-
-        public void SetData(ValueSetMenu valueMenu)
-        {
-            m_valueMenu = valueMenu;
-            txt_value.text = valueMenu.ValueRaw.ToString();
-        }
-
-        public void OnLeft()
-        {
-            OnExecute();
-        }
-
-        public void OnRight()
-        {
-            OnExecute();
-        }
-
-        public void OnExecute()
-        {
-            var value = (bool)m_valueMenu.ValueRaw;
-            value = !value;
-            txt_value.text = value.ToString();
-            m_valueMenu.OnValueChanged(value);
-        }
-    }
-}

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

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: c864ef7d3920dfc4cb69a86ef3af426b

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

@@ -1,58 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace AxibugEmuOnline.Client
-{
-    public class OptionUI_ValueEditItem_IntEdit : MonoBehaviour, IValueEditControl
-    {
-        [SerializeField]
-        Slider slider;
-        [SerializeField]
-        Text txt_value;
-
-        int m_step;
-        private ValueSetMenu m_valueMenu;
-
-        private void Awake()
-        {
-            slider.onValueChanged.AddListener(OnSliderValueChanged);
-        }
-
-        private void OnSliderValueChanged(float value)
-        {
-            int intValue = (int)value;
-            txt_value.text = $"{intValue}";
-
-            if (!m_dataSetting) m_valueMenu.OnValueChanged(intValue);
-        }
-
-        bool m_dataSetting;
-        public void SetData(ValueSetMenu valueMenu)
-        {
-            m_dataSetting = true;
-            m_valueMenu = valueMenu;
-            slider.minValue = (int)valueMenu.Min;
-            slider.maxValue = (int)valueMenu.Max;
-            slider.value = (int)valueMenu.ValueRaw;
-            slider.wholeNumbers = true;
-            m_step = 1;
-            m_dataSetting = false;
-        }
-
-        public void OnLeft()
-        {
-            var newValue = Mathf.Clamp(slider.value - m_step, slider.minValue, slider.maxValue);
-            slider.value = newValue;
-        }
-
-        public void OnRight()
-        {
-            var newValue = Mathf.Clamp(slider.value + m_step, slider.minValue, slider.maxValue);
-            slider.value = newValue;
-        }
-
-        public void OnExecute()
-        {
-        }
-    }
-}

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

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: abad743de1574354f99efc5054aa6b43

AxibugEmuOnline.Client/Assets/VirtualNes.Core/APU.cs

@@ -319,12 +319,6 @@ namespace VirtualNes.Core
             return false;
         }
 
-        internal void QueueClear()
-        {
-            queue.Clear();
-            exqueue.Clear();
-        }
-
         private void QueueFlush()
         {
             while (queue.wrptr != queue.rdptr)
@@ -657,11 +651,5 @@ namespace VirtualNes.Core
         public int rdptr;
         public int wrptr;
         public QUEUEDATA[] data = new QUEUEDATA[8192];
-
-        public void Clear()
-        {
-            rdptr = 0;wrptr = 0;
-            data = new QUEUEDATA[8192];
-        }
     }
 }

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

@@ -355,7 +355,6 @@ namespace VirtualNes.Core
         private void LoadDISK()
         {
             //todo : 磁碟机读取支持
-            Debuger.LogError($"磁碟机尚未支持");
         }
 
         private void LoadSRAM()
@@ -1071,10 +1070,6 @@ namespace VirtualNes.Core
 
         public void Dispose()
         {
-            SaveSRAM();
-            SaveDISK();
-            SaveTurboFile();
-
             cpu?.Dispose();
             ppu?.Dispose();
             apu?.Dispose();
@@ -1086,7 +1081,7 @@ namespace VirtualNes.Core
         {
             int i;
             if (rom.IsNSF()) return;
-            if (!rom.IsSAVERAM()) return;
+            if (rom.IsSAVERAM()) return;
 
             for (i = 0; i < SAVERAM_SIZE; i++)
             {
@@ -1846,11 +1841,10 @@ namespace VirtualNes.Core
                 );
 
 
+                cpu.SetDmaCycles(state.reg.cpureg.DMA_cycles);
                 emul_cycles = state.reg.cpureg.emul_cycles;
                 base_cycles = state.reg.cpureg.base_cycles;
 
-                cpu.SetDmaCycles(state.reg.cpureg.DMA_cycles);
-
                 // LOAD PPU STATE
                 MMU.PPUREG[0] = state.reg.ppureg.reg0;
                 MMU.PPUREG[1] = state.reg.ppureg.reg1;
@@ -1863,8 +1857,6 @@ namespace VirtualNes.Core
                 MMU.PPU56Toggle = state.reg.ppureg.toggle56;
             }
 
-            apu.QueueClear();
-
             //RAM STATE
             {
                 // SAVE RAM STATE

AxibugEmuOnline.Client/Assets/VirtualNes.Core/ROM.cs

@@ -244,11 +244,11 @@ namespace VirtualNes.Core
 
                         FileNameCheck(fname);
 
-                        //if (Supporter.S.TryGetMapperNo(this, out int mapperNo))
+                        if (Supporter.S.TryGetMapperNo(this, out int mapperNo))
-                        //{
+                        {
-                        //    Debuger.Log($"ROMDB Set Mapper #{mapper:000} to #{mapperNo:000}");
+                            Debuger.Log($"ROMDB Set Mapper #{mapper:000} to #{mapperNo:000}");
-                        //    mapper = mapperNo;
+                            mapper = mapperNo;
-                        //}
+                        }
 
                         RomPatch.DoPatch(ref crc, ref lpPRG, ref lpCHR, ref mapper, ref header);
 

AxibugEmuOnline.Client/Assets/VirtualNes.Core/Supporter/EmulatorConfig/CfgPath.cs

@@ -12,7 +12,7 @@
         public bool bIpsPath = true;
 
         public string szRomPath = "roms";
-        public string szSavePath = "sav";
+        public string szSavePath = "save";
         public string szStatePath = "state";
         public string szSnapshotPath = "snapshot";
         public string szMoviePath = "movie";

AxibugEmuOnline.Client/ProjectSettings/ProjectSettings.asset

@@ -12,7 +12,7 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: AlienTechnology
+  companyName: DefaultCompany
   productName: AxibugEmuOnline.Client
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
@@ -164,7 +164,7 @@ PlayerSettings:
   androidMinAspectRatio: 1
   applicationIdentifier:
     Android: com.DefaultCompany.AxibugEmuOnline.Client
-    Standalone: com.AlienTechnology.AxibugEmuOnline.Client
+    Standalone: com.DefaultCompany.AxibugEmuOnline.Client
   buildNumber:
     Standalone: 0
     VisionOS: 0