diff --git a/MAME.Core/MAME - Backup.Core.csproj b/MAME.Core/MAME - Backup.Core.csproj new file mode 100644 index 0000000..3cff39f --- /dev/null +++ b/MAME.Core/MAME - Backup.Core.csproj @@ -0,0 +1,13 @@ + + + + netstandard2.0 + True + + + + + + + + diff --git a/MAME.Core/MAME.Core.csproj.user b/MAME.Core/MAME.Core.csproj.user new file mode 100644 index 0000000..07a0af4 --- /dev/null +++ b/MAME.Core/MAME.Core.csproj.user @@ -0,0 +1,6 @@ + + + + <_LastSelectedProfileId>G:\Sin365\MAME.Core\MAME.Core\Properties\PublishProfiles\FolderProfile.pubxml + + \ No newline at end of file diff --git a/MAME.Core/Properties/PublishProfiles/FolderProfile.pubxml b/MAME.Core/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 0000000..659e1ee --- /dev/null +++ b/MAME.Core/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,13 @@ + + + + + Release + Any CPU + bin\Release\netstandard2.0\publish\ + FileSystem + <_TargetId>Folder + + \ No newline at end of file diff --git a/MAME.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/MAME.Core/Properties/PublishProfiles/FolderProfile.pubxml.user new file mode 100644 index 0000000..937d72e --- /dev/null +++ b/MAME.Core/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -0,0 +1,10 @@ + + + + + True|2024-08-07T10:02:59.4096796Z||;False|2024-08-07T18:02:44.0239078+08:00||;True|2024-07-31T17:00:23.0585720+08:00||;True|2024-07-31T17:00:19.8123170+08:00||;True|2024-07-30T20:51:40.9773933+08:00||;True|2024-07-30T17:04:12.3440051+08:00||;True|2024-07-30T17:01:28.0849009+08:00||;True|2024-07-30T10:36:57.5301145+08:00||; + + + \ No newline at end of file diff --git a/MAME.Core/bin/Debug/netstandard2.0/MAME.Core.deps.json b/MAME.Core/bin/Debug/netstandard2.0/MAME.Core.deps.json new file mode 100644 index 0000000..04fac1f --- /dev/null +++ b/MAME.Core/bin/Debug/netstandard2.0/MAME.Core.deps.json @@ -0,0 +1,47 @@ +{ + "runtimeTarget": { + "name": ".NETStandard,Version=v2.0/", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETStandard,Version=v2.0": {}, + ".NETStandard,Version=v2.0/": { + "MAME.Core/1.0.0": { + "dependencies": { + "NETStandard.Library": "2.0.3" + }, + "runtime": { + "MAME.Core.dll": {} + } + }, + "Microsoft.NETCore.Platforms/1.1.0": {}, + "NETStandard.Library/2.0.3": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + } + } + }, + "libraries": { + "MAME.Core/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.NETCore.Platforms/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", + "path": "microsoft.netcore.platforms/1.1.0", + "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" + }, + "NETStandard.Library/2.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "path": "netstandard.library/2.0.3", + "hashPath": "netstandard.library.2.0.3.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/MAME.Core/bin/Debug/netstandard2.0/MAME.Core.dll b/MAME.Core/bin/Debug/netstandard2.0/MAME.Core.dll new file mode 100644 index 0000000..45c8d20 Binary files /dev/null and b/MAME.Core/bin/Debug/netstandard2.0/MAME.Core.dll differ diff --git a/MAME.Core/bin/Debug/netstandard2.0/MAME.Core.pdb b/MAME.Core/bin/Debug/netstandard2.0/MAME.Core.pdb new file mode 100644 index 0000000..a57d14e Binary files /dev/null and b/MAME.Core/bin/Debug/netstandard2.0/MAME.Core.pdb differ diff --git a/MAME.Core/bin/Release/netstandard2.0/MAME.Core.deps.json b/MAME.Core/bin/Release/netstandard2.0/MAME.Core.deps.json new file mode 100644 index 0000000..04fac1f --- /dev/null +++ b/MAME.Core/bin/Release/netstandard2.0/MAME.Core.deps.json @@ -0,0 +1,47 @@ +{ + "runtimeTarget": { + "name": ".NETStandard,Version=v2.0/", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETStandard,Version=v2.0": {}, + ".NETStandard,Version=v2.0/": { + "MAME.Core/1.0.0": { + "dependencies": { + "NETStandard.Library": "2.0.3" + }, + "runtime": { + "MAME.Core.dll": {} + } + }, + "Microsoft.NETCore.Platforms/1.1.0": {}, + "NETStandard.Library/2.0.3": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + } + } + }, + "libraries": { + "MAME.Core/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.NETCore.Platforms/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", + "path": "microsoft.netcore.platforms/1.1.0", + "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" + }, + "NETStandard.Library/2.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "path": "netstandard.library/2.0.3", + "hashPath": "netstandard.library.2.0.3.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/MAME.Core/bin/Release/netstandard2.0/MAME.Core.dll b/MAME.Core/bin/Release/netstandard2.0/MAME.Core.dll new file mode 100644 index 0000000..9850f25 Binary files /dev/null and b/MAME.Core/bin/Release/netstandard2.0/MAME.Core.dll differ diff --git a/MAME.Core/bin/Release/netstandard2.0/MAME.Core.pdb b/MAME.Core/bin/Release/netstandard2.0/MAME.Core.pdb new file mode 100644 index 0000000..fa95dcc Binary files /dev/null and b/MAME.Core/bin/Release/netstandard2.0/MAME.Core.pdb differ diff --git a/MAME.Core/bin/Release/netstandard2.0/publish/MAME.Core.deps.json b/MAME.Core/bin/Release/netstandard2.0/publish/MAME.Core.deps.json new file mode 100644 index 0000000..04fac1f --- /dev/null +++ b/MAME.Core/bin/Release/netstandard2.0/publish/MAME.Core.deps.json @@ -0,0 +1,47 @@ +{ + "runtimeTarget": { + "name": ".NETStandard,Version=v2.0/", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETStandard,Version=v2.0": {}, + ".NETStandard,Version=v2.0/": { + "MAME.Core/1.0.0": { + "dependencies": { + "NETStandard.Library": "2.0.3" + }, + "runtime": { + "MAME.Core.dll": {} + } + }, + "Microsoft.NETCore.Platforms/1.1.0": {}, + "NETStandard.Library/2.0.3": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + } + } + }, + "libraries": { + "MAME.Core/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.NETCore.Platforms/1.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", + "path": "microsoft.netcore.platforms/1.1.0", + "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" + }, + "NETStandard.Library/2.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "path": "netstandard.library/2.0.3", + "hashPath": "netstandard.library.2.0.3.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/MAME.Core/bin/Release/netstandard2.0/publish/MAME.Core.dll b/MAME.Core/bin/Release/netstandard2.0/publish/MAME.Core.dll new file mode 100644 index 0000000..9850f25 Binary files /dev/null and b/MAME.Core/bin/Release/netstandard2.0/publish/MAME.Core.dll differ diff --git a/MAME.Core/bin/Release/netstandard2.0/publish/MAME.Core.pdb b/MAME.Core/bin/Release/netstandard2.0/publish/MAME.Core.pdb new file mode 100644 index 0000000..fa95dcc Binary files /dev/null and b/MAME.Core/bin/Release/netstandard2.0/publish/MAME.Core.pdb differ diff --git a/MAME.Core/emu/Motion.cs b/MAME.Core/emu/Motion.cs index 1449d8c..31ab8c3 100644 --- a/MAME.Core/emu/Motion.cs +++ b/MAME.Core/emu/Motion.cs @@ -1,7 +1,5 @@ using MAME.Core.Common; using MAME.Core.run_interface; -using UnityEngine; -using static UnityEngine.GraphicsBuffer; namespace mame { diff --git a/MAME.Core/obj/Debug/netstandard2.0/.NETStandard,Version=v2.0.AssemblyAttributes.cs b/MAME.Core/obj/Debug/netstandard2.0/.NETStandard,Version=v2.0.AssemblyAttributes.cs new file mode 100644 index 0000000..8bf3a42 --- /dev/null +++ b/MAME.Core/obj/Debug/netstandard2.0/.NETStandard,Version=v2.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.0", FrameworkDisplayName = ".NET Standard 2.0")] diff --git a/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.AssemblyInfo.cs b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.AssemblyInfo.cs new file mode 100644 index 0000000..12107fe --- /dev/null +++ b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("MAME.Core")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+660ce05d0cc8307149cef0876b10ed5ee20fed3c")] +[assembly: System.Reflection.AssemblyProductAttribute("MAME.Core")] +[assembly: System.Reflection.AssemblyTitleAttribute("MAME.Core")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.AssemblyInfoInputs.cache b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.AssemblyInfoInputs.cache new file mode 100644 index 0000000..92b39cb --- /dev/null +++ b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +77ce91edd56b2fd167de86bb75374dd8d30279942840c61e820d889fd28cd1c0 diff --git a/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.GeneratedMSBuildEditorConfig.editorconfig b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..b6e1721 --- /dev/null +++ b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,5 @@ +is_global = true +build_property.RootNamespace = MAME.Core +build_property.ProjectDir = G:\Sin365\MAME.Core\MAME.Core\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.assets.cache b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.assets.cache new file mode 100644 index 0000000..ad02a40 Binary files /dev/null and b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.assets.cache differ diff --git a/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.csproj.AssemblyReference.cache b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.csproj.AssemblyReference.cache new file mode 100644 index 0000000..78debca Binary files /dev/null and b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.csproj.AssemblyReference.cache differ diff --git a/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.csproj.CoreCompileInputs.cache b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..6185613 --- /dev/null +++ b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +d355b7647ac06a7022513c4119bb417cb4b1dab7372e4985dae061c20e7d0802 diff --git a/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.csproj.FileListAbsolute.txt b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..46bae34 --- /dev/null +++ b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.csproj.FileListAbsolute.txt @@ -0,0 +1,10 @@ +G:\Sin365\MAME.Core\MAME.Core\obj\Debug\netstandard2.0\MAME.Core.csproj.AssemblyReference.cache +G:\Sin365\MAME.Core\MAME.Core\obj\Debug\netstandard2.0\MAME.Core.GeneratedMSBuildEditorConfig.editorconfig +G:\Sin365\MAME.Core\MAME.Core\obj\Debug\netstandard2.0\MAME.Core.AssemblyInfoInputs.cache +G:\Sin365\MAME.Core\MAME.Core\obj\Debug\netstandard2.0\MAME.Core.AssemblyInfo.cs +G:\Sin365\MAME.Core\MAME.Core\obj\Debug\netstandard2.0\MAME.Core.csproj.CoreCompileInputs.cache +G:\Sin365\MAME.Core\MAME.Core\bin\Debug\netstandard2.0\MAME.Core.deps.json +G:\Sin365\MAME.Core\MAME.Core\bin\Debug\netstandard2.0\MAME.Core.dll +G:\Sin365\MAME.Core\MAME.Core\bin\Debug\netstandard2.0\MAME.Core.pdb +G:\Sin365\MAME.Core\MAME.Core\obj\Debug\netstandard2.0\MAME.Core.dll +G:\Sin365\MAME.Core\MAME.Core\obj\Debug\netstandard2.0\MAME.Core.pdb diff --git a/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.dll b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.dll new file mode 100644 index 0000000..45c8d20 Binary files /dev/null and b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.dll differ diff --git a/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.pdb b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.pdb new file mode 100644 index 0000000..a57d14e Binary files /dev/null and b/MAME.Core/obj/Debug/netstandard2.0/MAME.Core.pdb differ diff --git a/MAME.Core/obj/MAME.Core.csproj.nuget.dgspec.json b/MAME.Core/obj/MAME.Core.csproj.nuget.dgspec.json new file mode 100644 index 0000000..74260bf --- /dev/null +++ b/MAME.Core/obj/MAME.Core.csproj.nuget.dgspec.json @@ -0,0 +1,76 @@ +{ + "format": 1, + "restore": { + "G:\\Sin365\\MAME.Core\\MAME.Core\\MAME.Core.csproj": {} + }, + "projects": { + "G:\\Sin365\\MAME.Core\\MAME.Core\\MAME.Core.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "G:\\Sin365\\MAME.Core\\MAME.Core\\MAME.Core.csproj", + "projectName": "MAME.Core", + "projectPath": "G:\\Sin365\\MAME.Core\\MAME.Core\\MAME.Core.csproj", + "packagesPath": "C:\\Users\\35337\\.nuget\\packages\\", + "outputPath": "G:\\Sin365\\MAME.Core\\MAME.Core\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "F:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], + "configFilePaths": [ + "C:\\Users\\35337\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "netstandard2.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netstandard2.0": { + "targetAlias": "netstandard2.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "netstandard2.0": { + "targetAlias": "netstandard2.0", + "dependencies": { + "NETStandard.Library": { + "suppressParent": "All", + "target": "Package", + "version": "[2.0.3, )", + "autoReferenced": true + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.303\\RuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/MAME.Core/obj/MAME.Core.csproj.nuget.g.props b/MAME.Core/obj/MAME.Core.csproj.nuget.g.props new file mode 100644 index 0000000..48cbbf3 --- /dev/null +++ b/MAME.Core/obj/MAME.Core.csproj.nuget.g.props @@ -0,0 +1,16 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + $(UserProfile)\.nuget\packages\ + C:\Users\35337\.nuget\packages\;F:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + PackageReference + 6.10.1 + + + + + + \ No newline at end of file diff --git a/MAME.Core/obj/MAME.Core.csproj.nuget.g.targets b/MAME.Core/obj/MAME.Core.csproj.nuget.g.targets new file mode 100644 index 0000000..868c101 --- /dev/null +++ b/MAME.Core/obj/MAME.Core.csproj.nuget.g.targets @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/MAME.Core/obj/Release/netstandard2.0/.NETStandard,Version=v2.0.AssemblyAttributes.cs b/MAME.Core/obj/Release/netstandard2.0/.NETStandard,Version=v2.0.AssemblyAttributes.cs new file mode 100644 index 0000000..8bf3a42 --- /dev/null +++ b/MAME.Core/obj/Release/netstandard2.0/.NETStandard,Version=v2.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.0", FrameworkDisplayName = ".NET Standard 2.0")] diff --git a/MAME.Core/obj/Release/netstandard2.0/MAME.Core.AssemblyInfo.cs b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.AssemblyInfo.cs new file mode 100644 index 0000000..240f2ba --- /dev/null +++ b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("MAME.Core")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3a0e28a68ff210f4c84fda2dd30cca1f920342c4")] +[assembly: System.Reflection.AssemblyProductAttribute("MAME.Core")] +[assembly: System.Reflection.AssemblyTitleAttribute("MAME.Core")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/MAME.Core/obj/Release/netstandard2.0/MAME.Core.AssemblyInfoInputs.cache b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.AssemblyInfoInputs.cache new file mode 100644 index 0000000..e3e744e --- /dev/null +++ b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +1f1faa42c422bed6b1fdf899b80e232925f9184e7a770c58aadef89fcab309c2 diff --git a/MAME.Core/obj/Release/netstandard2.0/MAME.Core.GeneratedMSBuildEditorConfig.editorconfig b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..b6e1721 --- /dev/null +++ b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,5 @@ +is_global = true +build_property.RootNamespace = MAME.Core +build_property.ProjectDir = G:\Sin365\MAME.Core\MAME.Core\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/MAME.Core/obj/Release/netstandard2.0/MAME.Core.assets.cache b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.assets.cache new file mode 100644 index 0000000..a1e1b3b Binary files /dev/null and b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.assets.cache differ diff --git a/MAME.Core/obj/Release/netstandard2.0/MAME.Core.csproj.AssemblyReference.cache b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.csproj.AssemblyReference.cache new file mode 100644 index 0000000..78debca Binary files /dev/null and b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.csproj.AssemblyReference.cache differ diff --git a/MAME.Core/obj/Release/netstandard2.0/MAME.Core.csproj.CoreCompileInputs.cache b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..8677942 --- /dev/null +++ b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +f502c7bc5e5f02f5976c3b570b6a67f457f2add0f756d154bea5334074197b2c diff --git a/MAME.Core/obj/Release/netstandard2.0/MAME.Core.csproj.FileListAbsolute.txt b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..58f05c7 --- /dev/null +++ b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.csproj.FileListAbsolute.txt @@ -0,0 +1,10 @@ +G:\Sin365\MAME.Core\MAME.Core\bin\Release\netstandard2.0\MAME.Core.deps.json +G:\Sin365\MAME.Core\MAME.Core\bin\Release\netstandard2.0\MAME.Core.dll +G:\Sin365\MAME.Core\MAME.Core\bin\Release\netstandard2.0\MAME.Core.pdb +G:\Sin365\MAME.Core\MAME.Core\obj\Release\netstandard2.0\MAME.Core.csproj.AssemblyReference.cache +G:\Sin365\MAME.Core\MAME.Core\obj\Release\netstandard2.0\MAME.Core.GeneratedMSBuildEditorConfig.editorconfig +G:\Sin365\MAME.Core\MAME.Core\obj\Release\netstandard2.0\MAME.Core.AssemblyInfoInputs.cache +G:\Sin365\MAME.Core\MAME.Core\obj\Release\netstandard2.0\MAME.Core.AssemblyInfo.cs +G:\Sin365\MAME.Core\MAME.Core\obj\Release\netstandard2.0\MAME.Core.csproj.CoreCompileInputs.cache +G:\Sin365\MAME.Core\MAME.Core\obj\Release\netstandard2.0\MAME.Core.dll +G:\Sin365\MAME.Core\MAME.Core\obj\Release\netstandard2.0\MAME.Core.pdb diff --git a/MAME.Core/obj/Release/netstandard2.0/MAME.Core.dll b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.dll new file mode 100644 index 0000000..9850f25 Binary files /dev/null and b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.dll differ diff --git a/MAME.Core/obj/Release/netstandard2.0/MAME.Core.pdb b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.pdb new file mode 100644 index 0000000..fa95dcc Binary files /dev/null and b/MAME.Core/obj/Release/netstandard2.0/MAME.Core.pdb differ diff --git a/MAME.Core/obj/Release/netstandard2.0/PublishOutputs.941c2df60c.txt b/MAME.Core/obj/Release/netstandard2.0/PublishOutputs.941c2df60c.txt new file mode 100644 index 0000000..91e8ba4 --- /dev/null +++ b/MAME.Core/obj/Release/netstandard2.0/PublishOutputs.941c2df60c.txt @@ -0,0 +1,3 @@ +G:\Sin365\MAME.Core\MAME.Core\bin\Release\netstandard2.0\publish\MAME.Core.dll +G:\Sin365\MAME.Core\MAME.Core\bin\Release\netstandard2.0\publish\MAME.Core.deps.json +G:\Sin365\MAME.Core\MAME.Core\bin\Release\netstandard2.0\publish\MAME.Core.pdb diff --git a/MAME.Core/obj/project.assets.json b/MAME.Core/obj/project.assets.json new file mode 100644 index 0000000..1f7d27a --- /dev/null +++ b/MAME.Core/obj/project.assets.json @@ -0,0 +1,254 @@ +{ + "version": 3, + "targets": { + ".NETStandard,Version=v2.0": { + "Microsoft.NETCore.Platforms/1.1.0": { + "type": "package", + "compile": { + "lib/netstandard1.0/_._": {} + }, + "runtime": { + "lib/netstandard1.0/_._": {} + } + }, + "NETStandard.Library/2.0.3": { + "type": "package", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + }, + "compile": { + "lib/netstandard1.0/_._": {} + }, + "runtime": { + "lib/netstandard1.0/_._": {} + }, + "build": { + "build/netstandard2.0/NETStandard.Library.targets": {} + } + } + } + }, + "libraries": { + "Microsoft.NETCore.Platforms/1.1.0": { + "sha512": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", + "type": "package", + "path": "microsoft.netcore.platforms/1.1.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "lib/netstandard1.0/_._", + "microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "microsoft.netcore.platforms.nuspec", + "runtime.json" + ] + }, + "NETStandard.Library/2.0.3": { + "sha512": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "type": "package", + "path": "netstandard.library/2.0.3", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "build/netstandard2.0/NETStandard.Library.targets", + "build/netstandard2.0/ref/Microsoft.Win32.Primitives.dll", + "build/netstandard2.0/ref/System.AppContext.dll", + "build/netstandard2.0/ref/System.Collections.Concurrent.dll", + "build/netstandard2.0/ref/System.Collections.NonGeneric.dll", + "build/netstandard2.0/ref/System.Collections.Specialized.dll", + "build/netstandard2.0/ref/System.Collections.dll", + "build/netstandard2.0/ref/System.ComponentModel.Composition.dll", + "build/netstandard2.0/ref/System.ComponentModel.EventBasedAsync.dll", + "build/netstandard2.0/ref/System.ComponentModel.Primitives.dll", + "build/netstandard2.0/ref/System.ComponentModel.TypeConverter.dll", + "build/netstandard2.0/ref/System.ComponentModel.dll", + "build/netstandard2.0/ref/System.Console.dll", + "build/netstandard2.0/ref/System.Core.dll", + "build/netstandard2.0/ref/System.Data.Common.dll", + "build/netstandard2.0/ref/System.Data.dll", + "build/netstandard2.0/ref/System.Diagnostics.Contracts.dll", + "build/netstandard2.0/ref/System.Diagnostics.Debug.dll", + "build/netstandard2.0/ref/System.Diagnostics.FileVersionInfo.dll", + "build/netstandard2.0/ref/System.Diagnostics.Process.dll", + "build/netstandard2.0/ref/System.Diagnostics.StackTrace.dll", + "build/netstandard2.0/ref/System.Diagnostics.TextWriterTraceListener.dll", + "build/netstandard2.0/ref/System.Diagnostics.Tools.dll", + "build/netstandard2.0/ref/System.Diagnostics.TraceSource.dll", + "build/netstandard2.0/ref/System.Diagnostics.Tracing.dll", + "build/netstandard2.0/ref/System.Drawing.Primitives.dll", + "build/netstandard2.0/ref/System.Drawing.dll", + "build/netstandard2.0/ref/System.Dynamic.Runtime.dll", + "build/netstandard2.0/ref/System.Globalization.Calendars.dll", + "build/netstandard2.0/ref/System.Globalization.Extensions.dll", + "build/netstandard2.0/ref/System.Globalization.dll", + "build/netstandard2.0/ref/System.IO.Compression.FileSystem.dll", + "build/netstandard2.0/ref/System.IO.Compression.ZipFile.dll", + "build/netstandard2.0/ref/System.IO.Compression.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.DriveInfo.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.Primitives.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.Watcher.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.dll", + "build/netstandard2.0/ref/System.IO.IsolatedStorage.dll", + "build/netstandard2.0/ref/System.IO.MemoryMappedFiles.dll", + "build/netstandard2.0/ref/System.IO.Pipes.dll", + "build/netstandard2.0/ref/System.IO.UnmanagedMemoryStream.dll", + "build/netstandard2.0/ref/System.IO.dll", + "build/netstandard2.0/ref/System.Linq.Expressions.dll", + "build/netstandard2.0/ref/System.Linq.Parallel.dll", + "build/netstandard2.0/ref/System.Linq.Queryable.dll", + "build/netstandard2.0/ref/System.Linq.dll", + "build/netstandard2.0/ref/System.Net.Http.dll", + "build/netstandard2.0/ref/System.Net.NameResolution.dll", + "build/netstandard2.0/ref/System.Net.NetworkInformation.dll", + "build/netstandard2.0/ref/System.Net.Ping.dll", + "build/netstandard2.0/ref/System.Net.Primitives.dll", + "build/netstandard2.0/ref/System.Net.Requests.dll", + "build/netstandard2.0/ref/System.Net.Security.dll", + "build/netstandard2.0/ref/System.Net.Sockets.dll", + "build/netstandard2.0/ref/System.Net.WebHeaderCollection.dll", + "build/netstandard2.0/ref/System.Net.WebSockets.Client.dll", + "build/netstandard2.0/ref/System.Net.WebSockets.dll", + "build/netstandard2.0/ref/System.Net.dll", + "build/netstandard2.0/ref/System.Numerics.dll", + "build/netstandard2.0/ref/System.ObjectModel.dll", + "build/netstandard2.0/ref/System.Reflection.Extensions.dll", + "build/netstandard2.0/ref/System.Reflection.Primitives.dll", + "build/netstandard2.0/ref/System.Reflection.dll", + "build/netstandard2.0/ref/System.Resources.Reader.dll", + "build/netstandard2.0/ref/System.Resources.ResourceManager.dll", + "build/netstandard2.0/ref/System.Resources.Writer.dll", + "build/netstandard2.0/ref/System.Runtime.CompilerServices.VisualC.dll", + "build/netstandard2.0/ref/System.Runtime.Extensions.dll", + "build/netstandard2.0/ref/System.Runtime.Handles.dll", + "build/netstandard2.0/ref/System.Runtime.InteropServices.RuntimeInformation.dll", + "build/netstandard2.0/ref/System.Runtime.InteropServices.dll", + "build/netstandard2.0/ref/System.Runtime.Numerics.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Formatters.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Json.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Primitives.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Xml.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.dll", + "build/netstandard2.0/ref/System.Runtime.dll", + "build/netstandard2.0/ref/System.Security.Claims.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Algorithms.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Csp.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Encoding.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Primitives.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.X509Certificates.dll", + "build/netstandard2.0/ref/System.Security.Principal.dll", + "build/netstandard2.0/ref/System.Security.SecureString.dll", + "build/netstandard2.0/ref/System.ServiceModel.Web.dll", + "build/netstandard2.0/ref/System.Text.Encoding.Extensions.dll", + "build/netstandard2.0/ref/System.Text.Encoding.dll", + "build/netstandard2.0/ref/System.Text.RegularExpressions.dll", + "build/netstandard2.0/ref/System.Threading.Overlapped.dll", + "build/netstandard2.0/ref/System.Threading.Tasks.Parallel.dll", + "build/netstandard2.0/ref/System.Threading.Tasks.dll", + "build/netstandard2.0/ref/System.Threading.Thread.dll", + "build/netstandard2.0/ref/System.Threading.ThreadPool.dll", + "build/netstandard2.0/ref/System.Threading.Timer.dll", + "build/netstandard2.0/ref/System.Threading.dll", + "build/netstandard2.0/ref/System.Transactions.dll", + "build/netstandard2.0/ref/System.ValueTuple.dll", + "build/netstandard2.0/ref/System.Web.dll", + "build/netstandard2.0/ref/System.Windows.dll", + "build/netstandard2.0/ref/System.Xml.Linq.dll", + "build/netstandard2.0/ref/System.Xml.ReaderWriter.dll", + "build/netstandard2.0/ref/System.Xml.Serialization.dll", + "build/netstandard2.0/ref/System.Xml.XDocument.dll", + "build/netstandard2.0/ref/System.Xml.XPath.XDocument.dll", + "build/netstandard2.0/ref/System.Xml.XPath.dll", + "build/netstandard2.0/ref/System.Xml.XmlDocument.dll", + "build/netstandard2.0/ref/System.Xml.XmlSerializer.dll", + "build/netstandard2.0/ref/System.Xml.dll", + "build/netstandard2.0/ref/System.dll", + "build/netstandard2.0/ref/mscorlib.dll", + "build/netstandard2.0/ref/netstandard.dll", + "build/netstandard2.0/ref/netstandard.xml", + "lib/netstandard1.0/_._", + "netstandard.library.2.0.3.nupkg.sha512", + "netstandard.library.nuspec" + ] + } + }, + "projectFileDependencyGroups": { + ".NETStandard,Version=v2.0": [ + "NETStandard.Library >= 2.0.3" + ] + }, + "packageFolders": { + "C:\\Users\\35337\\.nuget\\packages\\": {}, + "F:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "G:\\Sin365\\MAME.Core\\MAME.Core\\MAME.Core.csproj", + "projectName": "MAME.Core", + "projectPath": "G:\\Sin365\\MAME.Core\\MAME.Core\\MAME.Core.csproj", + "packagesPath": "C:\\Users\\35337\\.nuget\\packages\\", + "outputPath": "G:\\Sin365\\MAME.Core\\MAME.Core\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "F:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], + "configFilePaths": [ + "C:\\Users\\35337\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "netstandard2.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netstandard2.0": { + "targetAlias": "netstandard2.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "netstandard2.0": { + "targetAlias": "netstandard2.0", + "dependencies": { + "NETStandard.Library": { + "suppressParent": "All", + "target": "Package", + "version": "[2.0.3, )", + "autoReferenced": true + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.303\\RuntimeIdentifierGraph.json" + } + } + } +} \ No newline at end of file diff --git a/MAME.Core/obj/project.nuget.cache b/MAME.Core/obj/project.nuget.cache new file mode 100644 index 0000000..8cfd420 --- /dev/null +++ b/MAME.Core/obj/project.nuget.cache @@ -0,0 +1,11 @@ +{ + "version": 2, + "dgSpecHash": "2aLhkGvnbAM=", + "success": true, + "projectFilePath": "G:\\Sin365\\MAME.Core\\MAME.Core\\MAME.Core.csproj", + "expectedPackageFiles": [ + "C:\\Users\\35337\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Users\\35337\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512" + ], + "logs": [] +} \ No newline at end of file diff --git a/MAME.Unity/Assets/Plugins/MAME.Core.dll b/MAME.Unity/Assets/Plugins/MAME.Core.dll index b6b1f84..9850f25 100644 Binary files a/MAME.Unity/Assets/Plugins/MAME.Core.dll and b/MAME.Unity/Assets/Plugins/MAME.Core.dll differ diff --git a/MAME.Unity/Assets/Resources/Texture.meta b/MAME.Unity/Assets/Resources/MAME.meta similarity index 77% rename from MAME.Unity/Assets/Resources/Texture.meta rename to MAME.Unity/Assets/Resources/MAME.meta index 9f5451d..e4690ce 100644 --- a/MAME.Unity/Assets/Resources/Texture.meta +++ b/MAME.Unity/Assets/Resources/MAME.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f304a38a6537eb49bf6b57529406911 +guid: 61f0db825f947a34b8a0fbd5817485ae folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/MAME.Unity/Assets/Resources/emu.meta b/MAME.Unity/Assets/Resources/MAME/emu.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu.meta rename to MAME.Unity/Assets/Resources/MAME/emu.meta diff --git a/MAME.Unity/Assets/Resources/emu/000-lo.lo.bytes b/MAME.Unity/Assets/Resources/MAME/emu/000-lo.lo.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/000-lo.lo.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/000-lo.lo.bytes diff --git a/MAME.Unity/Assets/Resources/emu/000-lo.lo.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/000-lo.lo.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/000-lo.lo.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/000-lo.lo.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/1.png.bytes b/MAME.Unity/Assets/Resources/MAME/emu/1.png.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/1.png.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/1.png.bytes diff --git a/MAME.Unity/Assets/Resources/emu/1.png.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/1.png.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/1.png.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/1.png.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/cus64-64a1.mcu.bytes b/MAME.Unity/Assets/Resources/MAME/emu/cus64-64a1.mcu.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/cus64-64a1.mcu.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/cus64-64a1.mcu.bytes diff --git a/MAME.Unity/Assets/Resources/emu/cus64-64a1.mcu.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/cus64-64a1.mcu.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/cus64-64a1.mcu.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/cus64-64a1.mcu.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/mame.xml.bytes b/MAME.Unity/Assets/Resources/MAME/emu/mame.xml.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/mame.xml.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/mame.xml.bytes diff --git a/MAME.Unity/Assets/Resources/emu/mame.xml.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/mame.xml.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/mame.xml.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/mame.xml.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/neogeo_mainbios.rom.bytes b/MAME.Unity/Assets/Resources/MAME/emu/neogeo_mainbios.rom.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/neogeo_mainbios.rom.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/neogeo_mainbios.rom.bytes diff --git a/MAME.Unity/Assets/Resources/emu/neogeo_mainbios.rom.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/neogeo_mainbios.rom.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/neogeo_mainbios.rom.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/neogeo_mainbios.rom.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/pgm_m01s.rom.bytes b/MAME.Unity/Assets/Resources/MAME/emu/pgm_m01s.rom.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/pgm_m01s.rom.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/pgm_m01s.rom.bytes diff --git a/MAME.Unity/Assets/Resources/emu/pgm_m01s.rom.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/pgm_m01s.rom.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/pgm_m01s.rom.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/pgm_m01s.rom.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/pgm_mainbios.rom.bytes b/MAME.Unity/Assets/Resources/MAME/emu/pgm_mainbios.rom.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/pgm_mainbios.rom.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/pgm_mainbios.rom.bytes diff --git a/MAME.Unity/Assets/Resources/emu/pgm_mainbios.rom.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/pgm_mainbios.rom.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/pgm_mainbios.rom.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/pgm_mainbios.rom.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/pgm_t01s.rom.bytes b/MAME.Unity/Assets/Resources/MAME/emu/pgm_t01s.rom.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/pgm_t01s.rom.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/pgm_t01s.rom.bytes diff --git a/MAME.Unity/Assets/Resources/emu/pgm_t01s.rom.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/pgm_t01s.rom.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/pgm_t01s.rom.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/pgm_t01s.rom.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/readme.txt.bytes b/MAME.Unity/Assets/Resources/MAME/emu/readme.txt.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/readme.txt.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/readme.txt.bytes diff --git a/MAME.Unity/Assets/Resources/emu/readme.txt.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/readme.txt.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/readme.txt.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/readme.txt.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/sfix.sfix.bytes b/MAME.Unity/Assets/Resources/MAME/emu/sfix.sfix.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/sfix.sfix.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/sfix.sfix.bytes diff --git a/MAME.Unity/Assets/Resources/emu/sfix.sfix.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/sfix.sfix.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/sfix.sfix.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/sfix.sfix.bytes.meta diff --git a/MAME.Unity/Assets/Resources/emu/sm1.sm1.bytes b/MAME.Unity/Assets/Resources/MAME/emu/sm1.sm1.bytes similarity index 100% rename from MAME.Unity/Assets/Resources/emu/sm1.sm1.bytes rename to MAME.Unity/Assets/Resources/MAME/emu/sm1.sm1.bytes diff --git a/MAME.Unity/Assets/Resources/emu/sm1.sm1.bytes.meta b/MAME.Unity/Assets/Resources/MAME/emu/sm1.sm1.bytes.meta similarity index 100% rename from MAME.Unity/Assets/Resources/emu/sm1.sm1.bytes.meta rename to MAME.Unity/Assets/Resources/MAME/emu/sm1.sm1.bytes.meta diff --git a/MAME.Unity/Assets/Resources/Texture/Cps1_RenderTexture.renderTexture b/MAME.Unity/Assets/Resources/Texture/Cps1_RenderTexture.renderTexture deleted file mode 100644 index 6a8da1c..0000000 --- a/MAME.Unity/Assets/Resources/Texture/Cps1_RenderTexture.renderTexture +++ /dev/null @@ -1,38 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Cps1_RenderTexture - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_IsAlphaChannelOptional: 0 - serializedVersion: 3 - m_Width: 384 - m_Height: 264 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 8 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/MAME.Unity/Assets/Resources/Texture/Cps1_RenderTexture.renderTexture.meta b/MAME.Unity/Assets/Resources/Texture/Cps1_RenderTexture.renderTexture.meta deleted file mode 100644 index 30ea411..0000000 --- a/MAME.Unity/Assets/Resources/Texture/Cps1_RenderTexture.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 67a05302b678f2b48b2961dbcb403fc6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MAME.Unity/Assets/Resources/Texture/NeoGeo_RenderTexture.renderTexture b/MAME.Unity/Assets/Resources/Texture/NeoGeo_RenderTexture.renderTexture deleted file mode 100644 index cf3e366..0000000 --- a/MAME.Unity/Assets/Resources/Texture/NeoGeo_RenderTexture.renderTexture +++ /dev/null @@ -1,38 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: NeoGeo_RenderTexture - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_IsAlphaChannelOptional: 0 - serializedVersion: 3 - m_Width: 384 - m_Height: 264 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 8 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/MAME.Unity/Assets/Resources/Texture/NeoGeo_RenderTexture.renderTexture.meta b/MAME.Unity/Assets/Resources/Texture/NeoGeo_RenderTexture.renderTexture.meta deleted file mode 100644 index d8035c9..0000000 --- a/MAME.Unity/Assets/Resources/Texture/NeoGeo_RenderTexture.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6645567e4c11d9447b1aee2406f681c5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MAME.Unity/Assets/Resources/UMAME.prefab b/MAME.Unity/Assets/Resources/UMAME.prefab index 3edcf67..5364f6b 100644 --- a/MAME.Unity/Assets/Resources/UMAME.prefab +++ b/MAME.Unity/Assets/Resources/UMAME.prefab @@ -1,5 +1,84 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &350621326082629303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1073199567762496054} + - component: {fileID: 5252255417159097524} + - component: {fileID: 4685162666721017635} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1073199567762496054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350621326082629303} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 175721420956369396} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5252255417159097524 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350621326082629303} + m_CullTransparentMesh: 1 +--- !u!114 &4685162666721017635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350621326082629303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.7882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 71 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 156 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ABC --- !u!1 &735973971104927243 GameObject: m_ObjectHideFlags: 0 @@ -426,7 +505,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: OpenDir + m_Text: STOP --- !u!1 &3141505760941311097 GameObject: m_ObjectHideFlags: 0 @@ -505,7 +584,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Option A + m_Text: "\u8BF7\u9009\u62E9\u6E38\u620F" --- !u!1 &3471319444171359706 GameObject: m_ObjectHideFlags: 0 @@ -536,11 +615,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3471319446025011658} - - {fileID: 3471319445290242363} - {fileID: 3471319444327146586} - {fileID: 6218974894225195416} - {fileID: 3471319445208116032} - - {fileID: 3471319445695551499} - {fileID: 4817073881051249870} m_Father: {fileID: 3471319444310732615} m_RootOrder: 0 @@ -606,7 +683,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3471319444242429643 RectTransform: m_ObjectHideFlags: 0 @@ -758,9 +835,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mFPS: {fileID: 0} - btnOpenRomPath: {fileID: 1268518242613896174} + btnStop: {fileID: 1268518242613896174} btnStart: {fileID: 3471319445208116035} - btnRomDir: {fileID: 3471319445695551502} + btnRomDir: {fileID: 0} mChangeRomName: mslug3 --- !u!114 &3471319444260926879 MonoBehaviour: @@ -806,6 +883,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 3471319444171359701} + - {fileID: 3471319445290242363} m_Father: {fileID: 3471319446102792544} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -984,7 +1062,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3471319444171359701} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1488,12 +1566,12 @@ RectTransform: m_Children: - {fileID: 3471319444533317885} m_Father: {fileID: 3471319444171359701} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -330.864, y: -51} - m_SizeDelta: {x: 201.0003, y: 79.6129} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 112, y: -51} + m_SizeDelta: {x: 201.00024, y: 79.6129} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3471319445208116061 CanvasRenderer: @@ -1612,10 +1690,11 @@ RectTransform: - {fileID: 3471319444242429643} - {fileID: 809123066073945339} - {fileID: 5041497614654165726} + - {fileID: 175721420956369396} - {fileID: 3471319446131231223} - {fileID: 3471319446251103890} - {fileID: 4705889093872201058} - m_Father: {fileID: 3471319444171359701} + m_Father: {fileID: 3471319444310732615} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1641,7 +1720,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3471319445309129977 RectTransform: m_ObjectHideFlags: 0 @@ -2013,7 +2092,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 76 + m_FontSize: 70 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 @@ -2092,7 +2171,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 76 + m_FontSize: 70 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 @@ -2106,206 +2185,6 @@ MonoBehaviour: m_Text: 'Coin ' ---- !u!1 &3471319445694973428 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3471319445694973431} - - component: {fileID: 3471319445694973425} - - component: {fileID: 3471319445694973430} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3471319445694973431 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3471319445694973428} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3471319445695551499} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3471319445694973425 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3471319445694973428} - m_CullTransparentMesh: 1 ---- !u!114 &3471319445694973430 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3471319445694973428} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.7882353} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 107 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: RomDir ---- !u!1 &3471319445695551503 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3471319445695551499} - - component: {fileID: 3471319445695551496} - - component: {fileID: 3471319445695551497} - - component: {fileID: 3471319445695551502} - m_Layer: 5 - m_Name: btnDir - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3471319445695551499 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3471319445695551503} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3471319445694973431} - m_Father: {fileID: 3471319444171359701} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -119, y: -51} - m_SizeDelta: {x: 201.0003, y: 79.6129} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3471319445695551496 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3471319445695551503} - m_CullTransparentMesh: 1 ---- !u!114 &3471319445695551497 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3471319445695551503} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.33333334} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3471319445695551502 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3471319445695551503} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 3471319445695551497} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &3471319445832287871 GameObject: m_ObjectHideFlags: 0 @@ -2496,10 +2375,10 @@ RectTransform: m_Father: {fileID: 3471319444171359701} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -24.200012} - m_SizeDelta: {x: -630.4839, y: 221.3115} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1862.1006, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3471319446025011652 CanvasRenderer: @@ -2522,14 +2401,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 8400000, guid: 6645567e4c11d9447b1aee2406f681c5, type: 2} + m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 x: 0 @@ -2678,12 +2557,12 @@ RectTransform: m_Children: - {fileID: 3471319445650276455} m_Father: {fileID: 3471319445290242363} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 149.26733, y: -133.69995} - m_SizeDelta: {x: 263.145, y: 85.7727} + m_AnchoredPosition: {x: 107.12451, y: -133.69995} + m_SizeDelta: {x: 178.8592, y: 85.7727} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3471319446131231216 CanvasRenderer: @@ -2763,7 +2642,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 3471319445446949006} + m_TargetGraphic: {fileID: 3471319446131231217} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -3044,12 +2923,12 @@ RectTransform: m_Children: - {fileID: 3471319445650701432} m_Father: {fileID: 3471319445290242363} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -140, y: -146} - m_SizeDelta: {x: 248.61023, y: 85.772705} + m_AnchoredPosition: {x: -101.68823, y: -146} + m_SizeDelta: {x: 171.9867, y: 85.7727} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3471319446251103983 CanvasRenderer: @@ -3129,7 +3008,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 3471319445446949006} + m_TargetGraphic: {fileID: 3471319446251103980} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -3246,7 +3125,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -205.0232, y: 632} + m_AnchoredPosition: {x: -205.0232, y: 413.6266} m_SizeDelta: {x: 162.8603, y: 169.5713} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &178831137505647964 @@ -3514,12 +3393,12 @@ RectTransform: m_Children: - {fileID: 4705889095025944828} m_Father: {fileID: 3471319445290242363} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 960, y: 645} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 140, y: 136} + m_SizeDelta: {x: -1818, y: -639} m_Pivot: {x: 0, y: 0} --- !u!222 &4705889093872201056 CanvasRenderer: @@ -3582,6 +3461,7 @@ MonoBehaviour: InputForEmu: {x: 0, y: 0} mImgBg: {fileID: 0} mImgHandle: {fileID: 0} + mImgArrow: {fileID: 0} mIsMounseDown: 0 --- !u!1 &4705889095025944829 GameObject: @@ -3673,7 +3553,7 @@ GameObject: - component: {fileID: 8510611466862851496} - component: {fileID: 1268518242613896174} m_Layer: 5 - m_Name: btnOpenRomPath + m_Name: btnStop m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3692,12 +3572,12 @@ RectTransform: m_Children: - {fileID: 463116617999830540} m_Father: {fileID: 3471319444171359701} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -534, y: -51} - m_SizeDelta: {x: 201.0003, y: 79.6129} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 311, y: -51} + m_SizeDelta: {x: 201.00024, y: 79.6129} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3174268075294018647 CanvasRenderer: @@ -3817,7 +3697,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -440, y: 632} + m_AnchoredPosition: {x: -440, y: 413.6266} m_SizeDelta: {x: 162.8603, y: 169.5713} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7501161557533366582 @@ -4383,12 +4263,12 @@ RectTransform: - {fileID: 3601399255798847723} - {fileID: 4470767732898190461} m_Father: {fileID: 3471319444171359701} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -841, y: -51} - m_SizeDelta: {x: 136.90552, y: 30} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -154.32263, y: -51} + m_SizeDelta: {x: 112.45386, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8557132758972819746 CanvasRenderer: @@ -4477,11 +4357,7 @@ MonoBehaviour: m_Value: 0 m_Options: m_Options: - - m_Text: Option A - m_Image: {fileID: 0} - - m_Text: Option B - m_Image: {fileID: 0} - - m_Text: Option C + - m_Text: "\u8BF7\u9009\u62E9\u6E38\u620F" m_Image: {fileID: 0} m_OnValueChanged: m_PersistentCalls: @@ -4565,7 +4441,7 @@ GameObject: - component: {fileID: 1237114201775963130} - component: {fileID: 4559785566430918469} m_Layer: 5 - m_Name: Image + m_Name: imgArrow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4743,6 +4619,128 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -0.000030517578} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &8871832016231223404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 175721420956369396} + - component: {fileID: 627418819150274141} + - component: {fileID: 64495308950279277} + - component: {fileID: 7776672835082144683} + m_Layer: 5 + m_Name: btnABC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &175721420956369396 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8871832016231223404} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1073199567762496054} + m_Father: {fileID: 3471319445290242363} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -205.0232, y: 625} + m_SizeDelta: {x: 162.8603, y: 169.5713} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &627418819150274141 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8871832016231223404} + m_CullTransparentMesh: 1 +--- !u!114 &64495308950279277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8871832016231223404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.33333334} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7776672835082144683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8871832016231223404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce5791c690e1b11489049aab664fb925, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 64495308950279277} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + Key: --- !u!1 &8975338110634819875 GameObject: m_ObjectHideFlags: 0 diff --git a/MAME.Unity/Assets/Scenes/SampleScene.unity b/MAME.Unity/Assets/Scenes/SampleScene.unity index 2021911..37fa1fa 100644 --- a/MAME.Unity/Assets/Scenes/SampleScene.unity +++ b/MAME.Unity/Assets/Scenes/SampleScene.unity @@ -213,6 +213,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3471319444242429640, guid: 1cb6308e67105bf48aea153ebcdb2d76, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3471319444260926850, guid: 1cb6308e67105bf48aea153ebcdb2d76, type: 3} propertyPath: m_Name value: UMAME @@ -261,5 +265,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3471319444260926877, guid: 1cb6308e67105bf48aea153ebcdb2d76, type: 3} + propertyPath: mChangeRomName + value: mslug2 + objectReference: {fileID: 0} + - target: {fileID: 3471319445309129982, guid: 1cb6308e67105bf48aea153ebcdb2d76, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1cb6308e67105bf48aea153ebcdb2d76, type: 3} diff --git a/MAME.Unity/Assets/FloatingJoystick.cs b/MAME.Unity/Assets/Script/UMAME/FloatingJoystick.cs similarity index 81% rename from MAME.Unity/Assets/FloatingJoystick.cs rename to MAME.Unity/Assets/Script/UMAME/FloatingJoystick.cs index ae1c1ab..f595b8d 100644 --- a/MAME.Unity/Assets/FloatingJoystick.cs +++ b/MAME.Unity/Assets/Script/UMAME/FloatingJoystick.cs @@ -6,13 +6,12 @@ public class FloatingJoystick : Joystick { public Image mImgBg; public Image mImgHandle; + public Image mImgArrow; public bool mIsMounseDown = false; - public static Color ShowColor = Color.white; - //public static Color HideColor = new Color(1F, 1f, 1F, 0.f); - public static Color HideColor = new Color(1F, 1f, 1F, 0.5f); - + public static Color ShowColor = new Color(1F, 1f, 1F, 0.7f); + public static Color HideColor = new Color(1F, 1f, 1F, 0.3f); //一次新的摇杆移动 public static bool bNewTouchWithSkill = false; @@ -28,26 +27,26 @@ public class FloatingJoystick : Joystick mImgBg = background.transform.GetComponent(); mImgHandle = background.transform.Find("Handle").GetComponent(); mArrow = transform.Find("Background/Arrow").GetComponent(); - + mImgArrow = transform.Find("Background/Arrow/imgArrow").GetComponent(); mArrow.gameObject.SetActive(false); //background.gameObject.SetActive(false); background.gameObject.SetActive(true); background.transform.localPosition = new Vector3(256f, 256f, 0); mImgBg.color = HideColor; mImgHandle.color = HideColor; + mImgArrow.color = HideColor; mIsMounseDown = false; } public override void OnPointerDown(PointerEventData eventData) { - background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position); + //background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position); //background.gameObject.SetActive(true); mImgBg.color = ShowColor; mImgHandle.color = ShowColor; + mImgArrow.color = ShowColor; mIsMounseDown = true; - base.OnPointerDown(eventData); - bNewTouchWithSkill = true; } @@ -55,7 +54,6 @@ public class FloatingJoystick : Joystick { //background.gameObject.SetActive(false); PointerUp(); - bNewTouchWithSkill = false; } diff --git a/MAME.Unity/Assets/FloatingJoystick.cs.meta b/MAME.Unity/Assets/Script/UMAME/FloatingJoystick.cs.meta similarity index 100% rename from MAME.Unity/Assets/FloatingJoystick.cs.meta rename to MAME.Unity/Assets/Script/UMAME/FloatingJoystick.cs.meta diff --git a/MAME.Unity/Assets/Joystick.cs b/MAME.Unity/Assets/Script/UMAME/Joystick.cs similarity index 79% rename from MAME.Unity/Assets/Joystick.cs rename to MAME.Unity/Assets/Script/UMAME/Joystick.cs index 554e66b..e35a7af 100644 --- a/MAME.Unity/Assets/Joystick.cs +++ b/MAME.Unity/Assets/Script/UMAME/Joystick.cs @@ -79,7 +79,6 @@ public class Joystick : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoint OnDrag(eventData); } - Vector2 mArrowTop = new Vector2(0,1); public void OnDrag(PointerEventData eventData) { @@ -140,48 +139,6 @@ public class Joystick : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoint InputForEmu.y = 0; } - //private void FormatInput() - //{ - // if (axisOptions == AxisOptions.Horizontal) - // input = new Vector2(input.x, 0f); - // else if (axisOptions == AxisOptions.Vertical) - // input = new Vector2(0f, input.y); - //} - - private float SnapFloat(float value, AxisOptions snapAxis) - { - if (value == 0) - return value; - - if (axisOptions == AxisOptions.Both) - { - float angle = Vector2.Angle(input, Vector2.up); - if (snapAxis == AxisOptions.Horizontal) - { - if (angle < 22.5f || angle > 157.5f) - return 0; - else - return (value > 0) ? 1 : -1; - } - else if (snapAxis == AxisOptions.Vertical) - { - if (angle > 67.5f && angle < 112.5f) - return 0; - else - return (value > 0) ? 1 : -1; - } - return value; - } - else - { - if (value > 0) - return 1; - if (value < 0) - return -1; - } - return 0; - } - public virtual void OnPointerUp(PointerEventData eventData) { PointerUp(); diff --git a/MAME.Unity/Assets/Joystick.cs.meta b/MAME.Unity/Assets/Script/UMAME/Joystick.cs.meta similarity index 100% rename from MAME.Unity/Assets/Joystick.cs.meta rename to MAME.Unity/Assets/Script/UMAME/Joystick.cs.meta diff --git a/MAME.Unity/Assets/Script/UMAME/UMAME.cs b/MAME.Unity/Assets/Script/UMAME/UMAME.cs index 7a127b3..0f79f7d 100644 --- a/MAME.Unity/Assets/Script/UMAME/UMAME.cs +++ b/MAME.Unity/Assets/Script/UMAME/UMAME.cs @@ -1,5 +1,6 @@ using mame; using MAME.Core.Common; +using System; using System.Collections; using System.Collections.Generic; using System.IO; @@ -19,7 +20,7 @@ public class UMAME : MonoBehaviour UniResources mUniResources; public Text mFPS; - public Button btnOpenRomPath; + public Button btnStop; public Button btnStart; public Button btnRomDir; public Dictionary ALLGame; @@ -42,7 +43,7 @@ public class UMAME : MonoBehaviour #endif - public string mChangeRomName = "mslug3"; + public string mChangeRomName = string.Empty; private void Awake() { mFPS = GameObject.Find("FPS").GetComponent(); @@ -55,32 +56,23 @@ public class UMAME : MonoBehaviour mUniKeyboard = this.gameObject.AddComponent(); mUniResources = new UniResources(); - if (mainMotion.t1 != null) - { - mainMotion.t1.Abort(); - } mainmotion.Init(RomPath, mUniLog, mUniResources, mUniVideoPlayer, mUniSoundPlayer, mUniKeyboard, mUniMouse); ALLGame = mainmotion.GetGameList(); Debug.Log($"ALLGame:{ALLGame.Count}"); + GetHadRomList(); } void OnEnable() { - btnOpenRomPath.onClick.AddListener(OpenFolderRomPath); + btnStop.onClick.AddListener(StopGame); btnStart.onClick.AddListener(LoadGame); - btnRomDir.onClick.AddListener(() => GetHadRomList()); } void LoadGame() { - if (mainMotion.t1 != null) - { - mainMotion.t1.Abort(); - } - mChangeRomName = HadGameList[optionDropdown.value].Name; - + StopGame(); mainmotion.LoadRom(mChangeRomName); if (Machine.bRom) { @@ -111,12 +103,23 @@ public class UMAME : MonoBehaviour return; } mUniSoundPlayer.Initialize(); - mainmotion.GetGameScreenSize(out int _width, out int _height); - mUniVideoPlayer.Initialize(_width, _height); + mainmotion.GetGameScreenSize(out int _width, out int _height, out IntPtr _framePtr); + mUniVideoPlayer.Initialize(_width, _height, _framePtr); Mame.mame_pause(false); bStart = true; } + void StopGame() + { + //ѾеϷʹͷ + if (bStart || Machine.bRom) + { + bStart = false; + Mame.exit_pending = true; + Thread.Sleep(100); + } + } + void GetHadRomList() { HadGameList.Clear(); diff --git a/MAME.Unity/Assets/Script/UMAME/UniInterface/UniKeyboard.cs b/MAME.Unity/Assets/Script/UMAME/UniInterface/UniKeyboard.cs index ac2d06e..abc99eb 100644 --- a/MAME.Unity/Assets/Script/UMAME/UniInterface/UniKeyboard.cs +++ b/MAME.Unity/Assets/Script/UMAME/UniInterface/UniKeyboard.cs @@ -8,6 +8,7 @@ public class UniKeyboard : MonoBehaviour, IKeyboard Dictionary dictKeyCfgs = new Dictionary(); KeyCode[] CheckList; MotionKey[] mCurrKey = new MotionKey[0]; + List temp = new List(); #region public UILongClickButton btnP1; @@ -20,7 +21,7 @@ public class UniKeyboard : MonoBehaviour, IKeyboard public UILongClickButton btnF; public UILongClickButton btnAB; public UILongClickButton btnCD; - + public UILongClickButton btnABC; FloatingJoystick mJoystick; #endregion @@ -40,6 +41,10 @@ public class UniKeyboard : MonoBehaviour, IKeyboard btnF = GameObject.Find("btnF").GetComponent(); btnAB = GameObject.Find("btnAB").GetComponent(); btnCD = GameObject.Find("btnCD").GetComponent(); + btnABC = GameObject.Find("btnABC").GetComponent(); + + btnE.gameObject.SetActive(false); + btnF.gameObject.SetActive(false); dictKeyCfgs.Add(KeyCode.P, MotionKey.EMU_PAUSED); @@ -78,6 +83,7 @@ public class UniKeyboard : MonoBehaviour, IKeyboard btnAB.Key = new MotionKey[] { MotionKey.P1_BTN_1, MotionKey.P1_BTN_2 }; btnCD.Key = new MotionKey[] { MotionKey.P1_BTN_3, MotionKey.P1_BTN_4 }; + btnABC.Key = new MotionKey[] { MotionKey.P1_BTN_1, MotionKey.P1_BTN_2, MotionKey.P1_BTN_3 }; mUIBtns.Add(btnP1); mUIBtns.Add(btnCoin1); @@ -89,6 +95,7 @@ public class UniKeyboard : MonoBehaviour, IKeyboard mUIBtns.Add(btnF); mUIBtns.Add(btnAB); mUIBtns.Add(btnCD); + mUIBtns.Add(btnABC); } void OnEnable() @@ -102,7 +109,7 @@ public class UniKeyboard : MonoBehaviour, IKeyboard void Update() { - List temp = new List(); + temp.Clear(); for (int i = 0; i < CheckList.Length; i++) { if (Input.GetKey(CheckList[i])) @@ -124,5 +131,15 @@ public class UniKeyboard : MonoBehaviour, IKeyboard if (inputV2.y > 0) temp.Add(MotionKey.P1_UP); else if (inputV2.y < 0) temp.Add(MotionKey.P1_DOWN); mCurrKey = temp.ToArray(); + +#if UNITY_EDITOR + string TempStr = ""; + foreach (var item in mCurrKey) + { + TempStr += $"{item.ToString()}|"; + } + if(!string.IsNullOrEmpty(TempStr)) + Debug.Log(TempStr); +#endif } } \ No newline at end of file diff --git a/MAME.Unity/Assets/Script/UMAME/UniInterface/UniResources.cs b/MAME.Unity/Assets/Script/UMAME/UniInterface/UniResources.cs index 1114160..b7a4f65 100644 --- a/MAME.Unity/Assets/Script/UMAME/UniInterface/UniResources.cs +++ b/MAME.Unity/Assets/Script/UMAME/UniInterface/UniResources.cs @@ -3,7 +3,7 @@ using UnityEngine; public class UniResources : IResources { - const string ResourceRoot = "emu/"; + const string ResourceRoot = "MAME/emu/"; public byte[] mcu => Resources.Load(ResourceRoot + "cus64-64a1.mcu").bytes; diff --git a/MAME.Unity/Assets/Script/UMAME/UniInterface/UniSoundPlayer.cs b/MAME.Unity/Assets/Script/UMAME/UniInterface/UniSoundPlayer.cs index 841fe36..08aa422 100644 --- a/MAME.Unity/Assets/Script/UMAME/UniInterface/UniSoundPlayer.cs +++ b/MAME.Unity/Assets/Script/UMAME/UniInterface/UniSoundPlayer.cs @@ -14,13 +14,18 @@ public class UniSoundPlayer : MonoBehaviour, ISoundPlayer public double audioFPS { get; private set; } float lastData = 0; - public void Initialize() + + void Awake() { AudioClip dummy = AudioClip.Create("dummy", 1, 1, AudioSettings.outputSampleRate, false); - dummy.SetData(new float[] { 1,1 }, 0); + dummy.SetData(new float[] { 1, 1 }, 0); m_as.clip = dummy; m_as.loop = true; m_as.spatialBlend = 1; + } + + public void Initialize() + { m_as.Play(); } @@ -101,6 +106,9 @@ public class UniSoundPlayer : MonoBehaviour, ISoundPlayer public void SetVolume(int Vol) { + if (m_as) + return; + m_as.volume = Vol; } } diff --git a/MAME.Unity/Assets/Script/UMAME/UniInterface/UniVideoPlayer.cs b/MAME.Unity/Assets/Script/UMAME/UniInterface/UniVideoPlayer.cs index 7734c50..f5f7f6e 100644 --- a/MAME.Unity/Assets/Script/UMAME/UniInterface/UniVideoPlayer.cs +++ b/MAME.Unity/Assets/Script/UMAME/UniInterface/UniVideoPlayer.cs @@ -1,4 +1,3 @@ -using mame; using MAME.Core.run_interface; using System; using UnityEngine; @@ -11,11 +10,15 @@ public class UniVideoPlayer : MonoBehaviour, IVideoPlayer [SerializeField] private int mHeight; [SerializeField] + private int mDataLenght; + [SerializeField] private Texture2D m_rawBufferWarper; [SerializeField] private RawImage m_drawCanvas; + [SerializeField] + private RectTransform m_drawCanvasrect; int[] mFrameData; - Color32[] result; + IntPtr mFrameDataPtr; private TimeSpan lastElapsed; public double videoFPS { get; private set; } @@ -24,39 +27,36 @@ public class UniVideoPlayer : MonoBehaviour, IVideoPlayer private void Awake() { m_drawCanvas = GameObject.Find("GameRawImage").GetComponent(); + m_drawCanvasrect = m_drawCanvas.GetComponent(); } - public void Initialize(int width,int height) + public void Initialize(int width, int height,IntPtr framePtr) { + m_drawCanvas.color = Color.white; //384 * 264 mWidth = width; mHeight = height; - m_rawBufferWarper = new Texture2D(mWidth, mHeight); + mDataLenght = width * height * 4; + mFrameDataPtr = framePtr; + //m_rawBufferWarper = new Texture2D(mWidth, mHeight,TextureFormat.RGBA32,false); + //MAMEBGRA32úú + m_rawBufferWarper = new Texture2D(mWidth, mHeight, TextureFormat.BGRA32, false); + m_rawBufferWarper.filterMode = FilterMode.Point; + + m_drawCanvas.texture = m_rawBufferWarper; mFrameData = new int[mWidth * mHeight]; - result = new Color32[mFrameData.Length]; bInitTexture = true; + + float targetWidth = ((float)mWidth / mHeight) * m_drawCanvasrect.rect.height ; + m_drawCanvasrect.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, targetWidth); } void Update() { if (!bInitTexture) return; - var colors = GetUnityColor(mFrameData); - m_rawBufferWarper.SetPixels32(colors); + + //m_rawBufferWarper.LoadRawTextureData(mFrameDataPtr, mFrameData.Length * 4); + m_rawBufferWarper.LoadRawTextureData(mFrameDataPtr, mDataLenght); m_rawBufferWarper.Apply(); - Graphics.Blit(m_rawBufferWarper, m_drawCanvas.texture as RenderTexture); - } - - - public Color32[] GetUnityColor(int[] mFrameData) - { - for (int i = 0; i < mFrameData.Length; i++) - { - int argb = mFrameData[i]; - result[i].a = (byte)((argb >> 24) & 0xFF); - result[i].r = (byte)((argb >> 16) & 0xFF); - result[i].g = (byte)((argb >> 8) & 0xFF); - result[i].b = (byte)(argb & 0xFF); - } - return result; } public void SubmitVideo(int[] data) @@ -65,8 +65,6 @@ public class UniVideoPlayer : MonoBehaviour, IVideoPlayer var delta = current - lastElapsed; lastElapsed = current; videoFPS = 1d / delta.TotalSeconds; - mFrameData = data; } - }