diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/mame/neogeo/Neogeo.cs b/AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/mame/neogeo/Neogeo.cs index 5fa7c27c..372125ed 100644 --- a/AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/mame/neogeo/Neogeo.cs +++ b/AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/mame/neogeo/Neogeo.cs @@ -378,9 +378,9 @@ namespace MAME.Core public static void nvram_handler_load_neogeo() { - if (MameMainMotion.IoSupport.File_Exists("nvram\\" + Machine.sName + ".nv")) + if (MameMainMotion.resource.getnvram(Machine.sName,out byte[] data)) { - MameMainMotion.IoSupport.File_ReadAllBytes("nvram\\" + Machine.sName + ".nv"); + mainram2_set = data; //FileStream fs1 = new FileStream("nvram\\" + Machine.sName + ".nv", FileMode.Open); //int n = (int)fs1.Length; //fs1.Read(mainram2, 0, n); diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/run_interface/IResources.cs b/AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/run_interface/IResources.cs index 5f48e0d2..1593699b 100644 --- a/AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/run_interface/IResources.cs +++ b/AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/run_interface/IResources.cs @@ -13,5 +13,6 @@ byte[] _1 { get; } byte[] readme { get; } string mame { get; } + bool getnvram(string sName,out byte[] data); } } diff --git a/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram.meta b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram.meta new file mode 100644 index 00000000..e150657d --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 866081b364edae242bc388b4f2fab6f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho2.nv.bytes b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho2.nv.bytes new file mode 100644 index 00000000..fd5a33d5 Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho2.nv.bytes differ diff --git a/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho2.nv.bytes.meta b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho2.nv.bytes.meta new file mode 100644 index 00000000..b8db81c8 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho2.nv.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 36b7809304e9e8b4890425b0441c3d65 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho3h.nv.bytes b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho3h.nv.bytes new file mode 100644 index 00000000..6d17cf9d Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho3h.nv.bytes differ diff --git a/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho3h.nv.bytes.meta b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho3h.nv.bytes.meta new file mode 100644 index 00000000..ce401dda --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Resources/MAME/emu/nvram/samsho3h.nv.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7d71b0c3073e6c043be8e55da918aed4 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/MameEmulator/UniInterface/UniResources.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/MameEmulator/UniInterface/UniResources.cs index 28aab6e6..6f9871ce 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/MameEmulator/UniInterface/UniResources.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/MameEmulator/UniInterface/UniResources.cs @@ -26,4 +26,16 @@ public class UniResources : IResources public byte[] readme => Resources.Load(ResourceRoot + "readme.txt").bytes; public string mame => Resources.Load(ResourceRoot + "mame.xml").text;//ok + + public bool getnvram(string sName, out byte[] data) + { + TextAsset asset = Resources.Load(ResourceRoot + "nvram/" + sName + ".nv"); + if (asset == null) + { + data = null; + return false; + } + data = asset.bytes; + return true; + } } \ No newline at end of file