From 6f9d77704e3da7a2ac7d346010269d2f866f32a8 Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Thu, 6 Mar 2025 23:23:21 +0800 Subject: [PATCH] InputNameSpace --- .../AppMain/AxiInputSP/AxiInputUGUICenter.cs.meta | 2 -- .../AppMain/AxiInputSP/AxiInputUGUIHandle.cs.meta | 2 -- .../Assets/Script/AppMain/AxiInputSP/Axis.meta | 8 ++++++++ .../Script/AppMain/AxiInputSP/PC_XBOXKEY.cs.meta | 2 ++ .../Script/AppMain/AxiInputSP/PSVitaKey.cs.meta | 2 ++ .../Assets/Script/AppMain/AxiInputSP/UGUI.meta | 8 ++++++++ .../AxiInputSP/UGUI/AxiInputUGUICenter.cs.meta | 2 ++ .../AxiInputSP/UGUI/AxiInputUGUIHandle.cs.meta | 2 ++ .../AppMain/AxiInputSP/UGUI/AxiIptButton.cs.meta | 2 ++ .../Assets/Script/AppMain/Common/PC_XBOXKEY.cs.meta | 11 ----------- .../Assets/Script/AppMain/Common/PSVitaKey.cs.meta | 11 ----------- .../EssgeeEmulator/UEssgeeInterface/UEGKeyboard.cs | 3 +-- .../Emulator/MameEmulator/UniInterface/UniKeyboard.cs | 2 +- 13 files changed, 28 insertions(+), 29 deletions(-) delete mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/AxiInputUGUICenter.cs.meta delete mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/AxiInputUGUIHandle.cs.meta create mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/Axis.meta create mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/PC_XBOXKEY.cs.meta create mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/PSVitaKey.cs.meta create mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI.meta create mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiInputUGUICenter.cs.meta create mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiInputUGUIHandle.cs.meta create mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiIptButton.cs.meta delete mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/Common/PC_XBOXKEY.cs.meta delete mode 100644 AxibugEmuOnline.Client/Assets/Script/AppMain/Common/PSVitaKey.cs.meta diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/AxiInputUGUICenter.cs.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/AxiInputUGUICenter.cs.meta deleted file mode 100644 index 2b840ebb..00000000 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/AxiInputUGUICenter.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 0a5bf14cd30c06b498fda45eb5f4ac2a \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/AxiInputUGUIHandle.cs.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/AxiInputUGUIHandle.cs.meta deleted file mode 100644 index ba860ba4..00000000 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/AxiInputUGUIHandle.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: c9c6bc9404053b24ba77a0f86ad1daa8 \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/Axis.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/Axis.meta new file mode 100644 index 00000000..d24f904a --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/Axis.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6967eb9aa9b7db5469e783c448b4bd1d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/PC_XBOXKEY.cs.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/PC_XBOXKEY.cs.meta new file mode 100644 index 00000000..afd5ea09 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/PC_XBOXKEY.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f4f41e8fe714bee4fb3033c71e97978d \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/PSVitaKey.cs.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/PSVitaKey.cs.meta new file mode 100644 index 00000000..379a025e --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/PSVitaKey.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 281ca718d5ffcf846983748ad0816a70 \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI.meta new file mode 100644 index 00000000..dcc8e575 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8507295440ae4d4a949ac69008894ed +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiInputUGUICenter.cs.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiInputUGUICenter.cs.meta new file mode 100644 index 00000000..3836a184 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiInputUGUICenter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e41586af52faf33488c59e2608f9ff7b \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiInputUGUIHandle.cs.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiInputUGUIHandle.cs.meta new file mode 100644 index 00000000..f11acfb4 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiInputUGUIHandle.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e4ca40659ca235846b10ee28305147dd \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiIptButton.cs.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiIptButton.cs.meta new file mode 100644 index 00000000..d52e73a5 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/AxiInputSP/UGUI/AxiIptButton.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4fef3a6d187a23b499db9c251aa7d822 \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/Common/PC_XBOXKEY.cs.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/Common/PC_XBOXKEY.cs.meta deleted file mode 100644 index d29f2911..00000000 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/Common/PC_XBOXKEY.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4f6399baf2b2dca4688faf65f378d446 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/Common/PSVitaKey.cs.meta b/AxibugEmuOnline.Client/Assets/Script/AppMain/Common/PSVitaKey.cs.meta deleted file mode 100644 index a4f1fe53..00000000 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/Common/PSVitaKey.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 71934f91b4b95184a966ac2b316bfddf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/EssgeeEmulator/UEssgeeInterface/UEGKeyboard.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/EssgeeEmulator/UEssgeeInterface/UEGKeyboard.cs index ba77e66a..f4bcea1f 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/EssgeeEmulator/UEssgeeInterface/UEGKeyboard.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/EssgeeEmulator/UEssgeeInterface/UEGKeyboard.cs @@ -1,14 +1,13 @@ -using Assets.Script.AppMain.AxiInput.Settings; using AxibugEmuOnline.Client; using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.Event; using AxibugEmuOnline.Client.Manager; +using AxiInputSP.Setting; using AxiReplay; using System; using System.Collections.Generic; using System.Linq; using UnityEngine; -using static Assets.Script.AppMain.AxiInput.Settings.MasterSystemMultiKeysSetting; public class UEGKeyboard : MonoBehaviour { diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/MameEmulator/UniInterface/UniKeyboard.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/MameEmulator/UniInterface/UniKeyboard.cs index 6a032731..2bec3163 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/MameEmulator/UniInterface/UniKeyboard.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/MameEmulator/UniInterface/UniKeyboard.cs @@ -1,7 +1,7 @@ -using Assets.Script.AppMain.AxiInput.Settings; using AxibugEmuOnline.Client; using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.Event; +using AxiInputSP.Setting; using AxiReplay; using MAME.Core; using System;