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

Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline

Browse Source 
# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/App.cs
This commit is contained in:
ALIENJACK\alien 2024-11-21 17:19:11 +08:00
commit ecde8f6682
11 changed files with 83 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef Normal file
View File

@ -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
}

7
AxibugEmuOnline.Client/Assets/Plugins/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffect.Editor.asmdef.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f3ff4241c6de1c4479965d51b8a3808a
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
AxibugEmuOnline.Client/Assets/Script/App.cs
View File

@ -39,9 +39,11 @@ namespace AxibugEmuOnline.Client.ClientCore
public static string PersistentDataPath => Application.persistentDataPath;
#endif
[Preserve]
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
static void Init()
//[Preserve]
//[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
public static void Init()
{
settings = new AppSettings();

19
AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs Normal file
View File

@ -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;
}
}

11
AxibugEmuOnline.Client/Assets/Script/Common/PC_XBOXKEY.cs.meta Normal file
View File

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

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

@ -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;
}
}
}

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

@ -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;
}
}

6
AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesControllerMapper.cs
View File

@ -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()

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

@ -168,7 +168,7 @@ namespace AxibugEmuOnline.Client
NesCore.LoadState(st);
}
#if UNITY_EDITOR
/// <summary>
/// 编辑器用
/// </summary>
@ -196,6 +196,7 @@ namespace AxibugEmuOnline.Client
UnityEditor.EditorUtility.SetDirty(db);
UnityEditor.AssetDatabase.SaveAssets();
}
#endif
public uint Frame => NesCore.FrameCount;
}

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

@ -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;

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

@ -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
{