Alienjack/AxibugEmuOnline
1
0
Fork 0
forked from sin365/AxibugEmuOnline
Code Issues Pull Requests Projects Releases Wiki Activity

UI输入系统已接入InputSystem

Browse Source
This commit is contained in:
ALIENJACK\alien 2024-11-21 20:32:41 +08:00
parent 3d7142ec04
commit c316d77f6a
34 changed files with 805 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AxibugEmuOnline.Client/Assets/Resources/InputSystem.meta Normal file
View File

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

304
AxibugEmuOnline.Client/Assets/Resources/InputSystem/UI_InputSetting.inputactions Normal file
View File

@ -0,0 +1,304 @@
{
"name": "New Controls",
"maps": [
{
"name": "UI_Normal",
"id": "9a397a4f-4d88-492f-a918-bf9b8d3be756",
"actions": [
{
"name": "SelectItemLeft",
"type": "Button",
"id": "107019fe-240c-46ff-8c62-cb385ef8b9af",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "SelectItemRight",
"type": "Button",
"id": "826dd3f1-2cf8-4169-97c8-dfb56b850143",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "SelectItemUp",
"type": "Button",
"id": "505dabb4-91f7-430c-8696-092690269639",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "SelectItemDown",
"type": "Button",
"id": "b3da8633-7f50-44b3-8302-50706e589307",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Enter",
"type": "Button",
"id": "0bdf3154-e1db-4044-af50-cacb3764a07c",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Back",
"type": "Button",
"id": "68074d67-61a1-4a4d-bd68-8398b0e7afe3",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "OptionMenu",
"type": "Button",
"id": "64b67280-c530-4e38-b3ff-8d0177591396",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
{
"name": "",
"id": "fc724bf2-7736-419c-9f46-19bd45a0d276",
"path": "<Keyboard>/a",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "SelectItemLeft",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "02f4433e-4417-4fef-b178-a616e2941311",
"path": "<Keyboard>/leftArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "SelectItemLeft",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "cb874e72-d3db-4024-b9fb-37190acd9568",
"path": "<Keyboard>/d",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "SelectItemRight",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "646b923b-4d3d-4b5c-9dd2-0119e9d3e2c5",
"path": "<Keyboard>/rightArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "SelectItemRight",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "28fa0139-d5a2-4e26-87af-2043e01234e6",
"path": "<Keyboard>/w",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "SelectItemUp",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4474efdf-70ff-4826-883c-2fdf9f96e78e",
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "SelectItemUp",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "392a8cbc-71f6-4282-b945-4c7b3d17ba3a",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "SelectItemDown",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f30b6fb3-147e-4997-b628-fab3f635192b",
"path": "<Keyboard>/downArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "SelectItemDown",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "70c6db12-432b-482d-99a1-71e002c30157",
"path": "<Keyboard>/k",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Enter",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "48d5c450-6ac3-40fb-8ff4-66c7f3b3a00b",
"path": "<Keyboard>/enter",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Enter",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ef83ae7c-a809-4f23-a206-102199a5ede3",
"path": "<Keyboard>/l",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Back",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "14b503c8-80a1-458c-9e0f-a3fa38f314be",
"path": "<Keyboard>/backspace",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Back",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "e1e12f45-fb41-4b78-adbf-add2881bd4b1",
"path": "<Keyboard>/i",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "OptionMenu",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0b010e17-3581-42e6-90b1-f1bf728a3a0c",
"path": "<Keyboard>/shift",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "OptionMenu",
"isComposite": false,
"isPartOfComposite": false
}
]
},
{
"name": "UI_InGame",
"id": "2c8af03e-03e7-4553-81c6-dcff543cdcdc",
"actions": [
{
"name": "OptionMenu",
"type": "Button",
"id": "cab3c346-07e2-4c0c-8377-cb934dd28bd3",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
{
"name": "",
"id": "28d4d045-1070-4ea0-be35-b5ffb1c33bcb",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "OptionMenu",
"isComposite": false,
"isPartOfComposite": false
}
]
}
],
"controlSchemes": [
{
"name": "Keyboard",
"bindingGroup": "Keyboard",
"devices": [
{
"devicePath": "<Keyboard>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "UniversalGamePad",
"bindingGroup": "UniversalGamePad",
"devices": [
{
"devicePath": "<Gamepad>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Xbox Controller",
"bindingGroup": "Xbox Controller",
"devices": [
{
"devicePath": "<XInputController>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "PlayStation Controller",
"bindingGroup": "PlayStation Controller",
"devices": [
{
"devicePath": "<DualShockGamepad>",
"isOptional": false,
"isOR": false
}
]
}
]
}

14
AxibugEmuOnline.Client/Assets/Resources/InputSystem/UI_InputSetting.inputactions.meta Normal file
View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: eb413fd14a8483440af9652b7e4df5e1
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
generateWrapperCode: 0
wrapperCodePath:
wrapperClassName:
wrapperCodeNamespace: InputSystem

127
AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity
View File

@ -150,16 +150,25 @@ MonoBehaviour:
m_GameObject: {fileID: 74796456} m_GameObject: {fileID: 74796456}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal m_MoveRepeatDelay: 0.5
m_VerticalAxis: Vertical m_MoveRepeatRate: 0.1
m_SubmitButton: Submit m_XRTrackingOrigin: {fileID: 0}
m_CancelButton: Cancel m_ActionsAsset: {fileID: -944628639613478452, guid: eb413fd14a8483440af9652b7e4df5e1, type: 3}
m_InputActionsPerSecond: 10 m_PointAction: {fileID: 0}
m_RepeatDelay: 0.5 m_MoveAction: {fileID: 0}
m_ForceModuleActive: 0 m_SubmitAction: {fileID: 0}
m_CancelAction: {fileID: 0}
m_LeftClickAction: {fileID: 0}
m_MiddleClickAction: {fileID: 0}
m_RightClickAction: {fileID: 0}
m_ScrollWheelAction: {fileID: 0}
m_TrackedDevicePositionAction: {fileID: 0}
m_TrackedDeviceOrientationAction: {fileID: 0}
m_DeselectOnBackgroundClick: 1
m_PointerBehavior: 0
--- !u!114 &74796458 --- !u!114 &74796458
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2499,7 +2508,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1639091784002085428, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} - target: {fileID: 1639091784002085428, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1639091784002085428, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} - target: {fileID: 1639091784002085428, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -13565,6 +13574,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: m_Children:
- {fileID: 2073453794}
- {fileID: 1983793178} - {fileID: 1983793178}
- {fileID: 246947326} - {fileID: 246947326}
- {fileID: 1318590597} - {fileID: 1318590597}
@ -13665,6 +13675,99 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1639091784002085428, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} m_CorrespondingSourceObject: {fileID: 1639091784002085428, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
m_PrefabInstance: {fileID: 730698711} m_PrefabInstance: {fileID: 730698711}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &2073453793
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2073453794}
- component: {fileID: 2073453795}
m_Layer: 0
m_Name: UI_Input
m_TagString: UIInput
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2073453794
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2073453793}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10799.999}
m_LocalScale: {x: 108, y: 108, z: 108}
m_Children: []
m_Father: {fileID: 1599240741}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2073453795
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2073453793}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: eb413fd14a8483440af9652b7e4df5e1, type: 3}
m_NotificationBehavior: 3
m_UIInputModule: {fileID: 74796457}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls: []
m_ActionId: 107019fe-240c-46ff-8c62-cb385ef8b9af
m_ActionName: UI_Normal/SelectItemLeft
- m_PersistentCalls:
m_Calls: []
m_ActionId: 826dd3f1-2cf8-4169-97c8-dfb56b850143
m_ActionName: UI_Normal/SelectItemRight
- m_PersistentCalls:
m_Calls: []
m_ActionId: 505dabb4-91f7-430c-8696-092690269639
m_ActionName: UI_Normal/SelectItemUp
- m_PersistentCalls:
m_Calls: []
m_ActionId: b3da8633-7f50-44b3-8302-50706e589307
m_ActionName: UI_Normal/SelectItemDown
- m_PersistentCalls:
m_Calls: []
m_ActionId: 0bdf3154-e1db-4044-af50-cacb3764a07c
m_ActionName: UI_Normal/Enter
- m_PersistentCalls:
m_Calls: []
m_ActionId: 68074d67-61a1-4a4d-bd68-8398b0e7afe3
m_ActionName: UI_Normal/Back
- m_PersistentCalls:
m_Calls: []
m_ActionId: 64b67280-c530-4e38-b3ff-8d0177591396
m_ActionName: UI_Normal/OptionMenu
- m_PersistentCalls:
m_Calls: []
m_ActionId: cab3c346-07e2-4c0c-8377-cb934dd28bd3
m_ActionName: UI_InGame/OptionMenu
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme: Keyboard
m_DefaultActionMap: UI_Normal
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!1001 &1963501580473600373 --- !u!1001 &1963501580473600373
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -13682,7 +13785,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1963501579241001456, guid: 334eee9f85f308347844f8f5e99167c3, type: 3} - target: {fileID: 1963501579241001456, guid: 334eee9f85f308347844f8f5e99167c3, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1963501579241001456, guid: 334eee9f85f308347844f8f5e99167c3, type: 3} - target: {fileID: 1963501579241001456, guid: 334eee9f85f308347844f8f5e99167c3, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -13791,7 +13894,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3531919739338806919, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} - target: {fileID: 3531919739338806919, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 3 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3531919739338806919, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3} - target: {fileID: 3531919739338806919, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
@ -13944,7 +14047,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4478785627166277610, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3} - target: {fileID: 4478785627166277610, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4478785627166277610, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3} - target: {fileID: 4478785627166277610, guid: d3c2508a55398a24db5d68f68d2702ea, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x

3
AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef
View File

@ -4,7 +4,8 @@
"references": [ "references": [
"GUID:390a2c4058e5c304a87e8be70c84d80b", "GUID:390a2c4058e5c304a87e8be70c84d80b",
"GUID:085dc26d74e6f994a924d401ea41a5a8", "GUID:085dc26d74e6f994a924d401ea41a5a8",
"GUID:0a45db2096af23647aaafe5b70ccb4d7" "GUID:0a45db2096af23647aaafe5b70ccb4d7",
"GUID:75469ad4d38634e559750d17036d5f7c"
], ],
"includePlatforms": [], "includePlatforms": [],
"excludePlatforms": [], "excludePlatforms": [],

65
AxibugEmuOnline.Client/Assets/Script/ControlSchemes/ControlScheme.cs
View File

@ -1,65 +0,0 @@
using System.Collections.Generic;
using UnityEngine;
namespace AxibugEmuOnline.Client
{
public abstract class ControlScheme
{
private static ControlScheme m_current;
public static ControlScheme Current
{
get => m_current;
set
{
m_current = value;
Dictionary<KeyCode, EnumCommand> mapper = new Dictionary<KeyCode, EnumCommand>();
m_current.SetUIKeys(mapper);
CommandDispatcher.Instance.SetKeyMapper(mapper);
}
}
public string Name { get; private set; }
public virtual void SetUIKeys(Dictionary<KeyCode, EnumCommand> uiKeyMapper)
{
uiKeyMapper[KeyCode.A] = EnumCommand.SelectItemLeft;
uiKeyMapper[KeyCode.D] = EnumCommand.SelectItemRight;
uiKeyMapper[KeyCode.W] = EnumCommand.SelectItemUp;
uiKeyMapper[KeyCode.S] = EnumCommand.SelectItemDown;
uiKeyMapper[KeyCode.K] = EnumCommand.Enter;
uiKeyMapper[KeyCode.L] = EnumCommand.Back;
uiKeyMapper[KeyCode.I] = EnumCommand.OptionMenu;
uiKeyMapper[KeyCode.LeftArrow] = EnumCommand.SelectItemLeft;
uiKeyMapper[KeyCode.RightArrow] = EnumCommand.SelectItemRight;
uiKeyMapper[KeyCode.UpArrow] = EnumCommand.SelectItemUp;
uiKeyMapper[KeyCode.DownArrow] = EnumCommand.SelectItemDown;
uiKeyMapper[KeyCode.Return] = EnumCommand.Enter;
uiKeyMapper[KeyCode.Escape] = EnumCommand.Back;
uiKeyMapper[KeyCode.RightShift] = EnumCommand.OptionMenu;
uiKeyMapper[KeyCode.LeftShift] = EnumCommand.OptionMenu;
if (Application.platform == RuntimePlatform.PSP2)
{
uiKeyMapper[Common.PSVitaKey.Left] = EnumCommand.SelectItemLeft;
uiKeyMapper[Common.PSVitaKey.Right] = EnumCommand.SelectItemRight;
uiKeyMapper[Common.PSVitaKey.Up] = EnumCommand.SelectItemUp;
uiKeyMapper[Common.PSVitaKey.Down] = EnumCommand.SelectItemDown;
uiKeyMapper[Common.PSVitaKey.Circle] = EnumCommand.Enter;
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;
}
}
}

27
AxibugEmuOnline.Client/Assets/Script/ControlSchemes/NesGamingScheme.cs
View File

@ -1,27 +0,0 @@
using System.Collections.Generic;
using UnityEngine;
namespace AxibugEmuOnline.Client
{
public class NesGamingScheme : ControlScheme
{
public override void SetUIKeys(Dictionary<KeyCode, EnumCommand> uiKeyMapper)
{
uiKeyMapper[KeyCode.Escape] = EnumCommand.OptionMenu;
if (Application.platform == RuntimePlatform.PSP2)
{
uiKeyMapper[Common.PSVitaKey.L] = EnumCommand.OptionMenu;
uiKeyMapper[Common.PSVitaKey.R] = EnumCommand.OptionMenu;
}
//PC XBOX
uiKeyMapper[Common.PC_XBOXKEY.Y] = EnumCommand.OptionMenu;
}
}
public static partial class ControlSchemeSetts
{
public static NesGamingScheme NES { get; private set; } = new NesGamingScheme();
}
}

18
AxibugEmuOnline.Client/Assets/Script/ControlSchemes/NormalScheme.cs
View File

@ -1,18 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AxibugEmuOnline.Client
{
public class NormalScheme : ControlScheme
{
}
public static partial class ControlSchemeSetts
{
public static NormalScheme Normal { get; private set; } = new NormalScheme();
}
}

0
AxibugEmuOnline.Client/Assets/Script/ControlSchemes.meta → AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger.meta
View File

12
AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/CommandChanger.cs Normal file
View File

@ -0,0 +1,12 @@
using System.Collections.Generic;
using UnityEngine;
namespace AxibugEmuOnline.Client
{
public abstract class CommandChanger : IKeyMapperChanger
{
public string Name { get; private set; }
public abstract object GetConfig();
}
}

0
AxibugEmuOnline.Client/Assets/Script/ControlSchemes/ControlScheme.cs.meta → AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/CommandChanger.cs.meta
View File

10
AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/GamingChanger.cs Normal file
View File

@ -0,0 +1,10 @@
namespace AxibugEmuOnline.Client
{
public class GamingChanger : CommandChanger
{
public override object GetConfig()
{
return "UI_InGame";
}
}
}

2
AxibugEmuOnline.Client/Assets/Script/ControlSchemes/NormalScheme.cs.meta → AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/GamingChanger.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d43d5934b9afba14782405dc1b6eb455 guid: e5b6687e9412f174d82b2c15f1efc4a4
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

8
AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/Legacy.meta Normal file
View File

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

25
AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/Legacy/GamingChanger_Legacy.cs Normal file
View File

@ -0,0 +1,25 @@
using System.Collections.Generic;
using UnityEngine;
namespace AxibugEmuOnline.Client
{
public class GamingChanger_Legacy : CommandChanger
{
Dictionary<KeyCode, EnumCommand> m_uiKeyMapper = new Dictionary<KeyCode, EnumCommand>();
public GamingChanger_Legacy()
{
m_uiKeyMapper[KeyCode.Escape] = EnumCommand.OptionMenu;
if (Application.platform == RuntimePlatform.PSP2)
{
m_uiKeyMapper[Common.PSVitaKey.L] = EnumCommand.OptionMenu;
m_uiKeyMapper[Common.PSVitaKey.R] = EnumCommand.OptionMenu;
}
//PC XBOX
m_uiKeyMapper[Common.PC_XBOXKEY.Y] = EnumCommand.OptionMenu;
}
public override object GetConfig() => m_uiKeyMapper;
}
}

2
AxibugEmuOnline.Client/Assets/Script/ControlSchemes/NesGamingScheme.cs.meta → AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/Legacy/GamingChanger_Legacy.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a90914c97f6349a4e96302cc0ceeeed0 guid: c8339ffab20bfea4cbc7d3aa440c3fdb
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

58
AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/Legacy/NormalChanger_Legacy.cs Normal file
View File

@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
namespace AxibugEmuOnline.Client
{
public class NormalChanger_Legacy : CommandChanger
{
Dictionary<KeyCode, EnumCommand> m_uiKeyMapper = new Dictionary<KeyCode, EnumCommand>();
public NormalChanger_Legacy()
{
m_uiKeyMapper[KeyCode.A] = EnumCommand.SelectItemLeft;
m_uiKeyMapper[KeyCode.D] = EnumCommand.SelectItemRight;
m_uiKeyMapper[KeyCode.W] = EnumCommand.SelectItemUp;
m_uiKeyMapper[KeyCode.S] = EnumCommand.SelectItemDown;
m_uiKeyMapper[KeyCode.K] = EnumCommand.Enter;
m_uiKeyMapper[KeyCode.L] = EnumCommand.Back;
m_uiKeyMapper[KeyCode.I] = EnumCommand.OptionMenu;
m_uiKeyMapper[KeyCode.LeftArrow] = EnumCommand.SelectItemLeft;
m_uiKeyMapper[KeyCode.RightArrow] = EnumCommand.SelectItemRight;
m_uiKeyMapper[KeyCode.UpArrow] = EnumCommand.SelectItemUp;
m_uiKeyMapper[KeyCode.DownArrow] = EnumCommand.SelectItemDown;
m_uiKeyMapper[KeyCode.Return] = EnumCommand.Enter;
m_uiKeyMapper[KeyCode.Escape] = EnumCommand.Back;
m_uiKeyMapper[KeyCode.RightShift] = EnumCommand.OptionMenu;
m_uiKeyMapper[KeyCode.LeftShift] = EnumCommand.OptionMenu;
if (Application.platform == RuntimePlatform.PSP2)
{
m_uiKeyMapper[Common.PSVitaKey.Left] = EnumCommand.SelectItemLeft;
m_uiKeyMapper[Common.PSVitaKey.Right] = EnumCommand.SelectItemRight;
m_uiKeyMapper[Common.PSVitaKey.Up] = EnumCommand.SelectItemUp;
m_uiKeyMapper[Common.PSVitaKey.Down] = EnumCommand.SelectItemDown;
m_uiKeyMapper[Common.PSVitaKey.Circle] = EnumCommand.Enter;
m_uiKeyMapper[Common.PSVitaKey.Cross] = EnumCommand.Back;
m_uiKeyMapper[Common.PSVitaKey.Triangle] = EnumCommand.OptionMenu;
}
//PC XBOX
//m_uiKeyMapper[Common.PC_XBOXKEY.Left] = EnumCommand.SelectItemLeft;
//m_uiKeyMapper[Common.PSVitaKey.Right] = EnumCommand.SelectItemRight;
//m_uiKeyMapper[Common.PSVitaKey.Up] = EnumCommand.SelectItemUp;
//m_uiKeyMapper[Common.PSVitaKey.Down] = EnumCommand.SelectItemDown;
m_uiKeyMapper[Common.PC_XBOXKEY.MenuBtn] = EnumCommand.Enter;
m_uiKeyMapper[Common.PC_XBOXKEY.ViewBtn] = EnumCommand.Back;
m_uiKeyMapper[Common.PC_XBOXKEY.Y] = EnumCommand.OptionMenu;
}
public override object GetConfig() => m_uiKeyMapper;
}
}

11
AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/Legacy/NormalChanger_Legacy.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b8790f215d873d044aa8d00bacdee237
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

10
AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/NormalChanger.cs Normal file
View File

@ -0,0 +1,10 @@
namespace AxibugEmuOnline.Client
{
public class NormalChanger : CommandChanger
{
public override object GetConfig()
{
return "UI_Normal";
}
}
}

11
AxibugEmuOnline.Client/Assets/Script/IkeyMapperChanger/NormalChanger.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8aa965a6a15aa1a4195977111b1ec13b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs
View File

@ -71,7 +71,7 @@ namespace AxibugEmuOnline.Client.Manager
InGameUI.Instance.Hide(); InGameUI.Instance.Hide();
LaunchUI.Instance.ShowMainMenu(); LaunchUI.Instance.ShowMainMenu();
ControlScheme.Current = ControlSchemeSetts.Normal; CommandDispatcher.Instance.Current = CommandDispatcher.Instance.Normal;
} }
public void ResetGame() public void ResetGame()

2
AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator.cs
View File

@ -135,7 +135,7 @@ namespace AxibugEmuOnline.Client
public void SetupScheme() public void SetupScheme()
{ {
ControlScheme.Current = ControlSchemeSetts.NES; CommandDispatcher.Instance.Current = CommandDispatcher.Instance.Gaming;
} }
public void LoadState(object state) public void LoadState(object state)

70
AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/CommandDispatcher.cs
View File

@ -12,11 +12,47 @@ namespace AxibugEmuOnline.Client
/// <summary> 独占注册对象,指令会被列表中最后一个对象独占 </summary> /// <summary> 独占注册对象,指令会被列表中最后一个对象独占 </summary>
List<CommandExecuter> m_registerHigh = new List<CommandExecuter>(); List<CommandExecuter> m_registerHigh = new List<CommandExecuter>();
Dictionary<KeyCode, EnumCommand> m_keyMapper = new Dictionary<KeyCode, EnumCommand>(); ICommandListener m_listener;
/// <summary> 标准UI操作 </summary>
public IKeyMapperChanger Normal { get; private set; }
/// <summary> 游戏中UI操作 </summary>
public IKeyMapperChanger Gaming { get; private set; }
public bool LegacyInput;
private IKeyMapperChanger m_current;
public IKeyMapperChanger Current
{
get => m_current;
set
{
m_current = value;
SetKeyMapper(m_current);
}
}
private void Awake() private void Awake()
{ {
Instance = this; Instance = this;
//初始化command监视器
if (LegacyInput)
m_listener = new CommandListener_Legacy();
else
m_listener = new CommandListener();
//初始化键位修改器
if (LegacyInput)
{
Normal = new NormalChanger_Legacy();
Gaming = new GamingChanger_Legacy();
}
else
{
Normal = new NormalChanger();
Gaming = new GamingChanger();
}
} }
private void OnDestroy() private void OnDestroy()
@ -50,41 +86,22 @@ namespace AxibugEmuOnline.Client
readonly List<CommandExecuter> oneFrameRegister = new List<CommandExecuter>(); readonly List<CommandExecuter> oneFrameRegister = new List<CommandExecuter>();
private void Update() private void Update()
{
foreach (var item in m_keyMapper)
{ {
peekRegister(oneFrameRegister); peekRegister(oneFrameRegister);
m_listener.Update(oneFrameRegister);
if (Input.GetKeyDown(item.Key)) //键位映射在按键响应的堆栈结束后处理,防止迭代器修改问题
{
foreach (var controller in oneFrameRegister)
{
if (!controller.Enable) continue;
controller.ExecuteCommand(item.Value, false);
}
}
if (Input.GetKeyUp(item.Key))
{
foreach (var controller in oneFrameRegister)
{
if (!controller.Enable) continue;
controller.ExecuteCommand(item.Value, true);
}
}
}
//键位映射表需要在按键响应的堆栈结束后处理,防止迭代器修改问题
if (m_waitMapperSetting != null) if (m_waitMapperSetting != null)
{ {
m_keyMapper = m_waitMapperSetting; m_listener.ApplyKeyMapper(m_waitMapperSetting);
m_waitMapperSetting = null; m_waitMapperSetting = null;
} }
} }
private Dictionary<KeyCode, EnumCommand> m_waitMapperSetting = null; IKeyMapperChanger m_waitMapperSetting = null;
public void SetKeyMapper(Dictionary<KeyCode, EnumCommand> mapper) void SetKeyMapper(IKeyMapperChanger keyMapChanger)
{ {
m_waitMapperSetting = mapper; m_waitMapperSetting = keyMapChanger;
} }
private List<CommandExecuter> peekRegister(List<CommandExecuter> results) private List<CommandExecuter> peekRegister(List<CommandExecuter> results)
@ -114,7 +131,6 @@ namespace AxibugEmuOnline.Client
return results; return results;
} }
#if UNITY_EDITOR #if UNITY_EDITOR
public void GetRegisters(out IReadOnlyList<CommandExecuter> normal, out IReadOnlyList<CommandExecuter> alone) public void GetRegisters(out IReadOnlyList<CommandExecuter> normal, out IReadOnlyList<CommandExecuter> alone)
{ {

65
AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/CommandListener.cs Normal file
View File

@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.InputSystem;
namespace AxibugEmuOnline.Client
{
public class CommandListener : ICommandListener
{
private PlayerInput m_uiInput;
private IEnumerable<CommandExecuter> m_executers;
public CommandListener()
{
m_uiInput = GameObject.FindGameObjectWithTag("UIInput").GetComponent<PlayerInput>();
m_uiInput.onActionTriggered += M_uiInput_onActionTriggered;
}
public void Update(IEnumerable<CommandExecuter> executer)
{
m_executers = executer;
}
private void M_uiInput_onActionTriggered(InputAction.CallbackContext obj)
{
CommandState? cs = null;
switch (obj.action.phase)
{
case InputActionPhase.Started:
cs = new CommandState { Cancel = false, Cmd = ToCommandEnum(obj.action.name) };
break;
case InputActionPhase.Canceled:
cs = new CommandState { Cancel = true, Cmd = ToCommandEnum(obj.action.name) };
break;
}
if (!cs.HasValue) return;
foreach (var exec in m_executers)
{
if (!exec.Enable) continue;
exec.ExecuteCommand(cs.Value.Cmd, cs.Value.Cancel);
}
}
public void ApplyKeyMapper(IKeyMapperChanger changer)
{
var actionMapName = (string)changer.GetConfig();
m_uiInput.SwitchCurrentActionMap(actionMapName);
}
EnumCommand ToCommandEnum(string actionName)
{
return actionName switch
{
"SelectItemLeft" => EnumCommand.SelectItemLeft,
"SelectItemRight" => EnumCommand.SelectItemRight,
"SelectItemUp" => EnumCommand.SelectItemUp,
"SelectItemDown" => EnumCommand.SelectItemDown,
"Enter" => EnumCommand.Enter,
"Back" => EnumCommand.Back,
"OptionMenu" => EnumCommand.OptionMenu,
_ => throw new Exception("Not Support Action")
};
}
}
}

11
AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/CommandListener.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a493da4af70f32a43b3c558d94cf23a4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

38
AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/CommandListener_Legacy.cs Normal file
View File

@ -0,0 +1,38 @@
using System.Collections.Generic;
using UnityEngine;
namespace AxibugEmuOnline.Client
{
public class CommandListener_Legacy : ICommandListener
{
Dictionary<KeyCode, EnumCommand> m_keyMapper = new Dictionary<KeyCode, EnumCommand>();
List<CommandState> m_commands = new List<CommandState>();
IEnumerable<CommandState> GetCommand()
{
m_commands.Clear();
foreach (var item in m_keyMapper)
{
if (Input.GetKeyDown(item.Key)) m_commands.Add(new CommandState { Cmd = item.Value, Cancel = false });
if (Input.GetKeyUp(item.Key)) m_commands.Add(new CommandState { Cmd = item.Value, Cancel = true });
}
return m_commands;
}
public void ApplyKeyMapper(IKeyMapperChanger changer)
{
var cfg = (Dictionary<KeyCode, EnumCommand>)changer.GetConfig();
m_keyMapper = cfg;
}
public void Update(IEnumerable<CommandExecuter> executers)
{
foreach (var cmd in GetCommand())
{
foreach (var executer in executers)
{
executer.ExecuteCommand(cmd.Cmd, cmd.Cancel);
}
}
}
}
}

11
AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/CommandListener_Legacy.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0c54554335d283d4ca61e01335c58665
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

24
AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/ICommandListener.cs Normal file
View File

@ -0,0 +1,24 @@
using System.Collections.Generic;
namespace AxibugEmuOnline.Client
{
public interface IKeyMapperChanger
{
object GetConfig();
}
public interface ICommandListener
{
/// <summary>
/// 应用键位设置
/// </summary>
/// <param name="changer"></param>
void ApplyKeyMapper(IKeyMapperChanger changer);
void Update(IEnumerable<CommandExecuter> commands);
}
public struct CommandState
{
public EnumCommand Cmd;
public bool Cancel;
}
}

11
AxibugEmuOnline.Client/Assets/Script/UI/CommandDispatcher/ICommandListener.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 16e65b8db21c226419b57118ec1f56ff
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
AxibugEmuOnline.Client/Assets/Script/UI/InGameUI/InGameUI.cs
View File

@ -124,7 +124,7 @@ namespace AxibugEmuOnline.Client
App.roomMgr.SendLeavnRoom(); App.roomMgr.SendLeavnRoom();
App.emu.StopGame(); App.emu.StopGame();
ControlScheme.Current = ControlSchemeSetts.Normal; CommandDispatcher.Instance.Current = CommandDispatcher.Instance.Normal;
} }
} }
} }

2
AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs
View File

@ -36,7 +36,7 @@ namespace AxibugEmuOnline.Client
private void Start() private void Start()
{ {
ControlScheme.Current = ControlSchemeSetts.Normal; CommandDispatcher.Instance.Current = CommandDispatcher.Instance.Normal;
} }
public void HideMainMenu() public void HideMainMenu()

8
AxibugEmuOnline.Client/Assets/Script/UI/OptionUI/OptionUI.cs
View File

@ -125,7 +125,7 @@ namespace AxibugEmuOnline.Client
} }
} }
ControlScheme m_lastCS; IKeyMapperChanger m_lastCS;
public void Pop<T>(List<T> menus, int defaultIndex = 0) where T : OptionMenu public void Pop<T>(List<T> menus, int defaultIndex = 0) where T : OptionMenu
{ {
ReleaseRuntimeMenus(); ReleaseRuntimeMenus();
@ -160,8 +160,8 @@ namespace AxibugEmuOnline.Client
0.3f 0.3f
).SetEase(Ease.OutCubic); ).SetEase(Ease.OutCubic);
m_lastCS = ControlScheme.Current; m_lastCS = CommandDispatcher.Instance.Current;
ControlScheme.Current = ControlSchemeSetts.Normal; CommandDispatcher.Instance.Current = CommandDispatcher.Instance.Normal;
} }
} }
@ -192,7 +192,7 @@ namespace AxibugEmuOnline.Client
m_bPoped = false; m_bPoped = false;
ControlScheme.Current = m_lastCS; CommandDispatcher.Instance.Current = m_lastCS;
OnHide?.Invoke(); OnHide?.Invoke();
} }

2
AxibugEmuOnline.Client/ProjectSettings/ProjectSettings.asset
View File

@ -744,7 +744,7 @@ PlayerSettings:
m_VersionCode: 1 m_VersionCode: 1
m_VersionName: m_VersionName:
apiCompatibilityLevel: 3 apiCompatibilityLevel: 3
activeInputHandler: 0 activeInputHandler: 2
cloudProjectId: cloudProjectId:
framebufferDepthMemorylessMode: 0 framebufferDepthMemorylessMode: 0
qualitySettingsNames: [] qualitySettingsNames: []

3
AxibugEmuOnline.Client/ProjectSettings/TagManager.asset
View File

@ -3,7 +3,8 @@
--- !u!78 &1 --- !u!78 &1
TagManager: TagManager:
serializedVersion: 2 serializedVersion: 2
tags: [] tags:
- UIInput
layers: layers:
- Default - Default
- TransparentFX - TransparentFX