forked from sin365/AxibugEmuOnline
Compare commits
No commits in common. "ecde8f668210f167c221179553b31e3d3fe973b1" and "88ba7c189c6962efc18424682ebc3660ff995e37" have entirely different histories.
ecde8f6682
...
88ba7c189c
@ -1,18 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "UIEffect.Editor",
|
|
||||||
"rootNamespace": "",
|
|
||||||
"references": [
|
|
||||||
"GUID:085dc26d74e6f994a924d401ea41a5a8"
|
|
||||||
],
|
|
||||||
"includePlatforms": [
|
|
||||||
"Editor"
|
|
||||||
],
|
|
||||||
"excludePlatforms": [],
|
|
||||||
"allowUnsafeCode": false,
|
|
||||||
"overrideReferences": false,
|
|
||||||
"precompiledReferences": [],
|
|
||||||
"autoReferenced": true,
|
|
||||||
"defineConstraints": [],
|
|
||||||
"versionDefines": [],
|
|
||||||
"noEngineReferences": false
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: f3ff4241c6de1c4479965d51b8a3808a
|
|
||||||
AssemblyDefinitionImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -39,11 +39,9 @@ namespace AxibugEmuOnline.Client.ClientCore
|
|||||||
public static string PersistentDataPath => Application.persistentDataPath;
|
public static string PersistentDataPath => Application.persistentDataPath;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
[Preserve]
|
||||||
|
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
|
||||||
//[Preserve]
|
static void Init()
|
||||||
//[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
|
|
||||||
public static void Init()
|
|
||||||
{
|
{
|
||||||
settings = new AppSettings();
|
settings = new AppSettings();
|
||||||
|
|
||||||
|
|||||||
@ -1,19 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 4f6399baf2b2dca4688faf65f378d446
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -50,16 +50,6 @@ namespace AxibugEmuOnline.Client
|
|||||||
uiKeyMapper[Common.PSVitaKey.Cross] = EnumCommand.Back;
|
uiKeyMapper[Common.PSVitaKey.Cross] = EnumCommand.Back;
|
||||||
uiKeyMapper[Common.PSVitaKey.Triangle] = EnumCommand.OptionMenu;
|
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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,9 +14,6 @@ namespace AxibugEmuOnline.Client
|
|||||||
uiKeyMapper[Common.PSVitaKey.L] = EnumCommand.OptionMenu;
|
uiKeyMapper[Common.PSVitaKey.L] = EnumCommand.OptionMenu;
|
||||||
uiKeyMapper[Common.PSVitaKey.R] = EnumCommand.OptionMenu;
|
uiKeyMapper[Common.PSVitaKey.R] = EnumCommand.OptionMenu;
|
||||||
}
|
}
|
||||||
|
|
||||||
//PC XBOX
|
|
||||||
uiKeyMapper[Common.PC_XBOXKEY.Y] = EnumCommand.OptionMenu;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -25,12 +25,6 @@ namespace AxibugEmuOnline.Client
|
|||||||
Player1.A.keyCode = KeyCode.K;
|
Player1.A.keyCode = KeyCode.K;
|
||||||
Player1.SELECT.keyCode = KeyCode.V;
|
Player1.SELECT.keyCode = KeyCode.V;
|
||||||
Player1.START.keyCode = KeyCode.B;
|
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()
|
public void Save()
|
||||||
|
|||||||
@ -168,7 +168,7 @@ namespace AxibugEmuOnline.Client
|
|||||||
NesCore.LoadState(st);
|
NesCore.LoadState(st);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if UNITY_EDITOR
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 编辑器用
|
/// 编辑器用
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -196,7 +196,6 @@ namespace AxibugEmuOnline.Client
|
|||||||
UnityEditor.EditorUtility.SetDirty(db);
|
UnityEditor.EditorUtility.SetDirty(db);
|
||||||
UnityEditor.AssetDatabase.SaveAssets();
|
UnityEditor.AssetDatabase.SaveAssets();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
public uint Frame => NesCore.FrameCount;
|
public uint Frame => NesCore.FrameCount;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
using AxibugEmuOnline.Client.ClientCore;
|
|
||||||
using AxibugEmuOnline.Client.UI;
|
using AxibugEmuOnline.Client.UI;
|
||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
using DG.Tweening.Core;
|
using DG.Tweening.Core;
|
||||||
@ -29,7 +28,6 @@ namespace AxibugEmuOnline.Client
|
|||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
App.Init();
|
|
||||||
Instance = this;
|
Instance = this;
|
||||||
m_mainLayoutPosition = MainMenuRoot.anchoredPosition;
|
m_mainLayoutPosition = MainMenuRoot.anchoredPosition;
|
||||||
MainMenu.ListenControlAction = true;
|
MainMenu.ListenControlAction = true;
|
||||||
|
|||||||
@ -3,6 +3,8 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
using static UnityEditor.Graphs.Styles;
|
||||||
|
|
||||||
namespace AxibugEmuOnline.Client
|
namespace AxibugEmuOnline.Client
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,6 +1,9 @@
|
|||||||
using AxibugEmuOnline.Client.ClientCore;
|
using AxibugEmuOnline.Client.ClientCore;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
using static UnityEditor.Graphs.Styles;
|
||||||
|
|
||||||
namespace AxibugEmuOnline.Client
|
namespace AxibugEmuOnline.Client
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user