From 25375047e2cb9fb2af0b3c07d5ea40b0cb853d32 Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Thu, 21 Nov 2024 17:18:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=89=8D=E5=BD=92=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Editor/UIEffect.Editor.asmdef | 18 ++++++++++++++++++ .../Editor/UIEffect.Editor.asmdef.meta | 7 +++++++ AxibugEmuOnline.Client/Assets/Script/App.cs | 8 ++++++-- .../Assets/Script/Common/PC_XBOXKEY.cs | 19 +++++++++++++++++++ .../Assets/Script/Common/PC_XBOXKEY.cs.meta | 11 +++++++++++ .../Script/ControlSchemes/ControlScheme.cs | 10 ++++++++++ .../Script/ControlSchemes/NesGamingScheme.cs | 3 +++ .../Script/NesEmulator/NesControllerMapper.cs | 6 ++++++ .../Assets/Script/NesEmulator/NesEmulator.cs | 3 ++- .../Assets/Script/UI/LaunchUI.cs | 2 ++ .../Assets/Script/UI/OptionUI/OptionUI.cs | 2 -- .../Assets/Script/UI/XMBBgChanger.cs | 3 --- .../Assets/VirtualNes.Core/ApuEX/APU_N106.cs | 7 +------ .../Assets/VirtualNes.Core/MMU.cs | 3 +-- .../VirtualNes.Core/Mapper/Mapper173.cs | 1 - .../Assets/VirtualNes.Core/NES.cs | 5 ----- .../Assets/VirtualNes.Core/PAD.cs | 4 +--- .../Assets/VirtualNes.Core/PPU.cs | 5 +---- .../Assets/VirtualNes.Core/State/CTRSTAT.cs | 5 +---- 19 files changed, 89 insertions(+), 33 deletions(-) create mode 100644 AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef create mode 100644 AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef.meta create mode 100644 AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs create mode 100644 AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs.meta diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef new file mode 100644 index 0000000..f9459cf --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef @@ -0,0 +1,18 @@ +{ + "name": "UIEffect.Editor", + "rootNamespace": "", + "references": [ + "GUID:085dc26d74e6f994a924d401ea41a5a8" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef.meta b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef.meta new file mode 100644 index 0000000..4947fd2 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f3ff4241c6de1c4479965d51b8a3808a +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Script/App.cs b/AxibugEmuOnline.Client/Assets/Script/App.cs index 6ec7b73..3afd984 100644 --- a/AxibugEmuOnline.Client/Assets/Script/App.cs +++ b/AxibugEmuOnline.Client/Assets/Script/App.cs @@ -5,6 +5,7 @@ using System.IO; using System.Threading.Tasks; using UnityEngine; using UnityEngine.Networking; +using UnityEngine.Scripting; using static AxibugEmuOnline.Client.HttpAPI; using static AxibugEmuOnline.Client.Manager.LogManager; @@ -38,8 +39,11 @@ namespace AxibugEmuOnline.Client.ClientCore public static string PersistentDataPath => Application.persistentDataPath; #endif - [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)] - static void Init() + + + //[Preserve] + //[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)] + public static void Init() { settings = new AppSettings(); diff --git a/AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs b/AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs new file mode 100644 index 0000000..282032e --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs @@ -0,0 +1,19 @@ +using UnityEngine; + +namespace AxibugEmuOnline.Client.Common +{ + public static class PC_XBOXKEY + { + public static KeyCode A => KeyCode.Joystick1Button0; + public static KeyCode B => KeyCode.Joystick1Button1; + public static KeyCode X => KeyCode.Joystick1Button2; + public static KeyCode Y => KeyCode.Joystick1Button3; + public static KeyCode LB => KeyCode.Joystick1Button4; + public static KeyCode RR => KeyCode.Joystick1Button5; + public static KeyCode ViewBtn => KeyCode.Joystick1Button6; + public static KeyCode MenuBtn => KeyCode.Joystick1Button7; + public static KeyCode L3 => KeyCode.Joystick1Button8; + public static KeyCode R3 => KeyCode.Joystick1Button9; + public static KeyCode L => KeyCode.Joystick1Button10; + } +} diff --git a/AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs.meta b/AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs.meta new file mode 100644 index 0000000..d29f291 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4f6399baf2b2dca4688faf65f378d446 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Script/ControlSchemes/ControlScheme.cs b/AxibugEmuOnline.Client/Assets/Script/ControlSchemes/ControlScheme.cs index 30b57d0..957a0e1 100644 --- a/AxibugEmuOnline.Client/Assets/Script/ControlSchemes/ControlScheme.cs +++ b/AxibugEmuOnline.Client/Assets/Script/ControlSchemes/ControlScheme.cs @@ -50,6 +50,16 @@ namespace AxibugEmuOnline.Client uiKeyMapper[Common.PSVitaKey.Cross] = EnumCommand.Back; uiKeyMapper[Common.PSVitaKey.Triangle] = EnumCommand.OptionMenu; } + + //PC XBOX + + //uiKeyMapper[Common.PC_XBOXKEY.Left] = EnumCommand.SelectItemLeft; + //uiKeyMapper[Common.PSVitaKey.Right] = EnumCommand.SelectItemRight; + //uiKeyMapper[Common.PSVitaKey.Up] = EnumCommand.SelectItemUp; + //uiKeyMapper[Common.PSVitaKey.Down] = EnumCommand.SelectItemDown; + uiKeyMapper[Common.PC_XBOXKEY.MenuBtn] = EnumCommand.Enter; + uiKeyMapper[Common.PC_XBOXKEY.ViewBtn] = EnumCommand.Back; + uiKeyMapper[Common.PC_XBOXKEY.Y] = EnumCommand.OptionMenu; } } } diff --git a/AxibugEmuOnline.Client/Assets/Script/ControlSchemes/NesGamingScheme.cs b/AxibugEmuOnline.Client/Assets/Script/ControlSchemes/NesGamingScheme.cs index 3707112..d66360b 100644 --- a/AxibugEmuOnline.Client/Assets/Script/ControlSchemes/NesGamingScheme.cs +++ b/AxibugEmuOnline.Client/Assets/Script/ControlSchemes/NesGamingScheme.cs @@ -14,6 +14,9 @@ namespace AxibugEmuOnline.Client uiKeyMapper[Common.PSVitaKey.L] = EnumCommand.OptionMenu; uiKeyMapper[Common.PSVitaKey.R] = EnumCommand.OptionMenu; } + + //PC XBOX + uiKeyMapper[Common.PC_XBOXKEY.Y] = EnumCommand.OptionMenu; } } diff --git a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesControllerMapper.cs b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesControllerMapper.cs index e6adeee..0a61ff0 100644 --- a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesControllerMapper.cs +++ b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesControllerMapper.cs @@ -25,6 +25,12 @@ namespace AxibugEmuOnline.Client Player1.A.keyCode = KeyCode.K; Player1.SELECT.keyCode = KeyCode.V; Player1.START.keyCode = KeyCode.B; + + //PC XBOX + //Player1.B.keyCode = Common.PC_XBOXKEY.A; + //Player1.A.keyCode = Common.PC_XBOXKEY.B; + //Player1.SELECT.keyCode = Common.PC_XBOXKEY.ViewBtn; + //Player1.START.keyCode = Common.PC_XBOXKEY.MenuBtn; } public void Save() diff --git a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator.cs b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator.cs index 5ff5c18..d84123e 100644 --- a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator.cs +++ b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator.cs @@ -168,7 +168,7 @@ namespace AxibugEmuOnline.Client NesCore.LoadState(st); } - +#if UNITY_EDITOR /// /// ±à¼­Æ÷Óà /// @@ -196,6 +196,7 @@ namespace AxibugEmuOnline.Client UnityEditor.EditorUtility.SetDirty(db); UnityEditor.AssetDatabase.SaveAssets(); } +#endif public uint Frame => NesCore.FrameCount; } diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs b/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs index eaf597d..c191e3b 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs @@ -1,3 +1,4 @@ +using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.UI; using DG.Tweening; using DG.Tweening.Core; @@ -28,6 +29,7 @@ namespace AxibugEmuOnline.Client private void Awake() { + App.Init(); Instance = this; m_mainLayoutPosition = MainMenuRoot.anchoredPosition; MainMenu.ListenControlAction = true; diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/OptionUI/OptionUI.cs b/AxibugEmuOnline.Client/Assets/Script/UI/OptionUI/OptionUI.cs index 494c212..e6f4d05 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/OptionUI/OptionUI.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/OptionUI/OptionUI.cs @@ -3,8 +3,6 @@ using System; using System.Collections.Generic; using System.Linq; using UnityEngine; -using UnityEngine.UI; -using static UnityEditor.Graphs.Styles; namespace AxibugEmuOnline.Client { diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/XMBBgChanger.cs b/AxibugEmuOnline.Client/Assets/Script/UI/XMBBgChanger.cs index 414e2ba..0ba54bf 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/XMBBgChanger.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/XMBBgChanger.cs @@ -1,9 +1,6 @@ using AxibugEmuOnline.Client.ClientCore; -using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using static UnityEditor.Graphs.Styles; namespace AxibugEmuOnline.Client { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_N106.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_N106.cs index f9ea4e6..c85b8f8 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_N106.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_N106.cs @@ -1,9 +1,4 @@ -using Codice.CM.Client.Differences; -using System; -using RECTANGLE = VirtualNes.Core.APU_VRC6.RECTANGLE; -using SAWTOOTH = VirtualNes.Core.APU_VRC6.SAWTOOTH; - -namespace VirtualNes.Core +namespace VirtualNes.Core { public class APU_N106 : APU_INTERFACE { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/MMU.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/MMU.cs index ee95c16..1f50ab7 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/MMU.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/MMU.cs @@ -1,5 +1,4 @@ -using Codice.CM.Client.Differences; -using VirtualNes.Core; +using VirtualNes.Core; namespace VirtualNes { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper173.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper173.cs index fb1fd60..da129bb 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper173.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper173.cs @@ -1,7 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // Mapper173 Subor // ////////////////////////////////////////////////////////////////////////// -using Codice.CM.Client.Differences; using VirtualNes.Core.Debug; using static VirtualNes.MMU; using BYTE = System.Byte; diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/NES.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/NES.cs index 7303287..5316a21 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/NES.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/NES.cs @@ -1,12 +1,7 @@ -using Codice.CM.Client.Differences; using System; using System.Collections.Generic; using System.IO; -using System.Runtime.ConstrainedExecution; -using System.Runtime.InteropServices.ComTypes; -using System.Security.Cryptography; using System.Text; -using UnityEngine; using VirtualNes.Core.Debug; namespace VirtualNes.Core diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PAD.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PAD.cs index 0c4acd7..2b2e5b4 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PAD.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PAD.cs @@ -1,6 +1,4 @@ -using Codice.CM.Client.Differences; -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace VirtualNes.Core { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PPU.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PPU.cs index c26f10c..e995475 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PPU.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PPU.cs @@ -1,8 +1,5 @@ -using Codice.CM.Client.Differences; -using System; -using System.Runtime.CompilerServices; +using System; using System.Runtime.InteropServices; -using UnityEngine.UIElements; namespace VirtualNes.Core { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/CTRSTAT.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/CTRSTAT.cs index 2718c07..0f9e29d 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/CTRSTAT.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/CTRSTAT.cs @@ -1,7 +1,4 @@ -using Codice.CM.Client.Differences; -using System; - -namespace VirtualNes.Core +namespace VirtualNes.Core { public struct CTRSTAT : IStateBufferObject {