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

Compare commits

base: sin365:f705b947c3595a29e3c01ac6c8fd5ff5be1dabbc
Branches Tags
sin365:master
sin365:psv_VirtualNes.Core归档
sin365:bak_AlphaFristLove
sin365:dev_beforeShader
sin365:dev_4VirtualNes
sin365:dev_basemynes
sin365:bak_baseOnEmulator.NES
..
compare: sin365:7c1a2af6f06ebf7c1e4942f08af27fe43f0cbf0f
Branches Tags
sin365:master
sin365:psv_VirtualNes.Core归档
sin365:bak_AlphaFristLove
sin365:dev_beforeShader
sin365:dev_4VirtualNes
sin365:dev_basemynes
sin365:bak_baseOnEmulator.NES

No commits in common. "f705b947c3595a29e3c01ac6c8fd5ff5be1dabbc" and "7c1a2af6f06ebf7c1e4942f08af27fe43f0cbf0f" have entirely different histories.
f705b947c3 ... 7c1a2af6f0

31 changed files with 596 additions and 673 deletions
Show Stats Expand all files Collapse all files

24
AxibugEmuOnline.Client/Assets/Script/AppMain/App.cs
View File

@ -36,7 +36,7 @@ namespace AxibugEmuOnline.Client.ClientCore
private static CoroutineRunner coRunner; private static CoroutineRunner coRunner;
#endregion #endregion
#if UNITY_PSP2 && !UNITY_EDITOR //PSV真机 #if UNITY_PSP2
public static string PersistentDataPath => "ux0:data/AxibugEmu"; public static string PersistentDataPath => "ux0:data/AxibugEmu";
#else #else
public static string PersistentDataPath => Application.persistentDataPath; public static string PersistentDataPath => Application.persistentDataPath;
@ -45,12 +45,6 @@ namespace AxibugEmuOnline.Client.ClientCore
{ {
PlayerPrefs.DeleteAll(); PlayerPrefs.DeleteAll();
if (UnityEngine.Application.platform == RuntimePlatform.PSP2)
{
//PSV 等平台需要手动创建目录
PSP2Init();
}
settings = new AppSettings(); settings = new AppSettings();
log = new LogManager(); log = new LogManager();
@ -74,6 +68,11 @@ namespace AxibugEmuOnline.Client.ClientCore
tickLoop = go.AddComponent<TickLoop>(); tickLoop = go.AddComponent<TickLoop>();
coRunner = go.AddComponent<CoroutineRunner>(); coRunner = go.AddComponent<CoroutineRunner>();
if (UnityEngine.Application.platform == RuntimePlatform.PSP2)
{
//PSV 等平台需要手动创建目录
PersistentDataPathDir();
}
var importNode = GameObject.Find("IMPORTENT"); var importNode = GameObject.Find("IMPORTENT");
if (importNode != null) GameObject.DontDestroyOnLoad(importNode); if (importNode != null) GameObject.DontDestroyOnLoad(importNode);
@ -82,17 +81,12 @@ namespace AxibugEmuOnline.Client.ClientCore
RePullNetInfo(); RePullNetInfo();
} }
private static void PersistentDataPathDir()
private static void PSP2Init()
{ {
//PSVita最好手动创建目录
if (!Directory.Exists(PersistentDataPath)) if (!Directory.Exists(PersistentDataPath))
{
Directory.CreateDirectory(PersistentDataPath); Directory.CreateDirectory(PersistentDataPath);
}
#if UNITY_PSP2
//释放解码 FMV的26M内存，一般游戏用不上（PSP才用那破玩意儿）
UnityEngine.PSVita.PSVitaVideoPlayer.TransferMemToMonoHeap();
#endif
} }
private static IEnumerator AppTickFlow() private static IEnumerator AppTickFlow()

11
AxibugEmuOnline.Client/Assets/Script/AppMain/AxibugEmuOnline.Client.asmdef
View File

@ -1,12 +1,19 @@
{ {
"name": "AxibugEmuOnline.Client", "name": "AxibugEmuOnline.Client",
"rootNamespace": "AxibugEmuOnline.Client",
"references": [ "references": [
"VirtualNes.Core",
"UIEffect", "UIEffect",
"AxiReplay", "AxiReplay",
"Unity.Postprocessing.Runtime" "Unity.Postprocessing.Runtime"
], ],
"optionalUnityReferences": [],
"includePlatforms": [], "includePlatforms": [],
"excludePlatforms": [], "excludePlatforms": [],
"allowUnsafeCode": true "allowUnsafeCode": true,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
} }

12
AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/FixingPixelArtGrille/FixingPixelArtGrille.shader
View File

@ -249,18 +249,6 @@ Shader "PostEffect/FixingPixcelArtGrille"
else if(pos.x<0.666)mask.g=_maskLight; else if(pos.x<0.666)mask.g=_maskLight;
else mask.b=_maskLight; else mask.b=_maskLight;
return mask;} return mask;}
#else
// VGA style shadow mask.
float3 Mask(float2 pos){
pos.xy=floor(pos.xy*float2(1.0,0.5));
pos.x+=pos.y*3.0;
float3 mask=float3(_maskDark,_maskDark,_maskDark);
pos.x=fract(pos.x/6.0);
if(pos.x<0.333)mask.r=_maskLight;
else if(pos.x<0.666)mask.g=_maskLight;
else mask.b=_maskLight;
return mask;}
#endif #endif

15
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppEmu.cs
View File

@ -13,7 +13,7 @@ namespace AxibugEmuOnline.Client.Manager
/// </summary> /// </summary>
private IEmuCore m_emuCore; private IEmuCore m_emuCore;
private VirtualNes.Core.IControllerSetuper m_controllerSetuper; private IControllerSetuper m_controllerSetuper;
/// <summary> /// <summary>
/// unity的c#实现有bug,以接口类型保存的monobehaviour引用,!=和==运算符没有调用到monobehaviour重写过的运算符 /// unity的c#实现有bug,以接口类型保存的monobehaviour引用,!=和==运算符没有调用到monobehaviour重写过的运算符
@ -84,15 +84,10 @@ namespace AxibugEmuOnline.Client.Manager
else //在房间中则使用服务器下发的手柄槽位信息分配本地手柄 else //在房间中则使用服务器下发的手柄槽位信息分配本地手柄
{ {
long selfUID = App.user.userdata.UID; long selfUID = App.user.userdata.UID;
uint? con0Slot; App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 0, out var con0Slot);
uint? con1Slot; App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 1, out var con1Slot);
uint? con2Slot; App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 2, out var con2Slot);
uint? con3Slot; App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 3, out var con3Slot);
App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 0, out con0Slot);
App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 1, out con1Slot);
App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 2, out con2Slot);
App.roomMgr.mineRoomMiniInfo.GetPlayerSlotIdxByUid(selfUID, 3, out con3Slot);
m_controllerSetuper.SetConnect(con0Slot, con1Slot, con2Slot, con3Slot); m_controllerSetuper.SetConnect(con0Slot, con1Slot, con2Slot, con3Slot);
} }

5
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/CacheManager.cs
View File

@ -63,11 +63,8 @@ namespace AxibugEmuOnline.Client
private Dictionary<string, object> cachesInMemory = new Dictionary<string, object>(); private Dictionary<string, object> cachesInMemory = new Dictionary<string, object>();
void GetCacheData<T>(string url, string path, Action<T, string> callback) where T : class void GetCacheData<T>(string url, string path, Action<T, string> callback) where T : class
{ {
object cacheObj; if (cachesInMemory.TryGetValue(url, out var cacheObj) && cacheObj is T obj)
if (cachesInMemory.TryGetValue(url, out cacheObj) && cacheObj is T)
{ {
T obj = (T)cacheObj;
callback.Invoke(obj, url); callback.Invoke(obj, url);
return; return;
} }

41
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/FilterManager.cs
View File

@ -22,8 +22,6 @@ namespace AxibugEmuOnline.Client
public FilterManager(PostProcessVolume filterVolume, CanvasGroup filterPreview, CanvasGroup mainBg) public FilterManager(PostProcessVolume filterVolume, CanvasGroup filterPreview, CanvasGroup mainBg)
{ {
if (filterVolume == null)
return;
m_filterPorfile = filterVolume.profile; m_filterPorfile = filterVolume.profile;
m_filters = m_filterPorfile.settings.Where(setting => setting is FilterEffect).Select(setting => new Filter(setting as FilterEffect)).ToList(); m_filters = m_filterPorfile.settings.Where(setting => setting is FilterEffect).Select(setting => new Filter(setting as FilterEffect)).ToList();
var json = PlayerPrefs.GetString(nameof(FilterRomSetting)); var json = PlayerPrefs.GetString(nameof(FilterRomSetting));
@ -88,37 +86,20 @@ namespace AxibugEmuOnline.Client
/// </summary> /// </summary>
/// <param name="rom">rom对象</param> /// <param name="rom">rom对象</param>
/// <returns>此元组任意内任意成员都有可能为空</returns> /// <returns>此元组任意内任意成员都有可能为空</returns>
public GetFilterSetting_result GetFilterSetting(RomFile rom) public (Filter filter, FilterPreset preset) GetFilterSetting(RomFile rom)
{ {
var value = m_filterRomSetting.Get(rom); var value = m_filterRomSetting.Get(rom);
Filter filter = null; Filter filter = null;
FilterPreset preset = null; FilterPreset preset = null;
//filter = Filters.FirstOrDefault(f => f.Name == value.filterName); filter = Filters.FirstOrDefault(f => f.Name == value.filterName);
//if (filter != null)
//{
// string presetName = value.presetName;
// preset = filter.Presets.FirstOrDefault(p => p.Name == presetName);
//}
filter = Filters.FirstOrDefault(f => f.Name == value.Item1);
if (filter != null) if (filter != null)
{ {
string presetName = value.Item2; string presetName = value.presetName;
preset = filter.Presets.FirstOrDefault(p => p.Name == presetName); preset = filter.Presets.FirstOrDefault(p => p.Name == presetName);
} }
return new GetFilterSetting_result() return (filter, preset);
{
filter = filter,
preset = preset
};
}
public struct GetFilterSetting_result
{
public Filter filter;
public FilterPreset preset;
} }
public class Filter public class Filter
@ -242,8 +223,8 @@ namespace AxibugEmuOnline.Client
public string GetParamValueJson(string paramName) public string GetParamValueJson(string paramName)
{ {
prepareCache(); prepareCache();
string value;
m_paramName2ValueJson.TryGetValue(paramName, out value); m_paramName2ValueJson.TryGetValue(paramName, out var value);
return value; return value;
} }
@ -254,8 +235,7 @@ namespace AxibugEmuOnline.Client
if (valueType == typeof(float)) if (valueType == typeof(float))
{ {
float floatVal; float.TryParse(rawStr, out var floatVal);
float.TryParse(rawStr, out floatVal);
return floatVal; return floatVal;
} }
else if (valueType.IsEnum) else if (valueType.IsEnum)
@ -329,13 +309,12 @@ namespace AxibugEmuOnline.Client
return JsonUtility.ToJson(this); return JsonUtility.ToJson(this);
} }
public ValueTuple<string,string> Get(RomFile rom) public (string filterName, string presetName) Get(RomFile rom)
{ {
prepareCache(); prepareCache();
Item item; m_cache.TryGetValue(rom.ID, out var item);
m_cache.TryGetValue(rom.ID, out item); return (item.FilterName, item.PresetName);
return new ValueTuple<string, string>(item.FilterName, item.PresetName);
} }
private void prepareCache() private void prepareCache()

5
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/RomFile.cs
View File

@ -5,7 +5,6 @@ using System.Collections;
using System.IO; using System.IO;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
using static UnityEngine.EventSystems.EventTrigger;
namespace AxibugEmuOnline.Client namespace AxibugEmuOnline.Client
{ {
@ -96,9 +95,7 @@ namespace AxibugEmuOnline.Client
if (Path.GetExtension(LocalFilePath).ToLower() == ".zip") if (Path.GetExtension(LocalFilePath).ToLower() == ".zip")
{ {
var zip = new ZipInputStream(new MemoryStream(bytes)); var zip = new ZipInputStream(new MemoryStream(bytes));
var entry = zip.GetNextEntry() as ZipEntry; while (zip.GetNextEntry() is ZipEntry entry)
while (entry != null)
{ {
if (!entry.Name.ToLower().EndsWith(".nes")) continue; if (!entry.Name.ToLower().EndsWith(".nes")) continue;

6
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/UserDataManager.cs
View File

@ -154,16 +154,14 @@ namespace AxibugEmuOnline.Client.Manager
for (int i = 0; i < msg.UserList.Count; i++) for (int i = 0; i < msg.UserList.Count; i++)
{ {
UserMiniInfo mi = msg.UserList[i]; UserMiniInfo mi = msg.UserList[i];
bool isNewUser; UpdateOrAddUser(mi, out bool isNewUser);
UpdateOrAddUser(mi, out isNewUser);
} }
Eventer.Instance.PostEvent(EEvent.OnUserListAllUpdate); Eventer.Instance.PostEvent(EEvent.OnUserListAllUpdate);
} }
public void RecvCmdUserJoin(byte[] reqData) public void RecvCmdUserJoin(byte[] reqData)
{ {
Protobuf_UserJoin_RESP msg = ProtoBufHelper.DeSerizlize<Protobuf_UserJoin_RESP>(reqData); Protobuf_UserJoin_RESP msg = ProtoBufHelper.DeSerizlize<Protobuf_UserJoin_RESP>(reqData);
bool isNewUser; UpdateOrAddUser(msg.UserInfo, out bool isNewUser);
UpdateOrAddUser(msg.UserInfo, out isNewUser);
if (isNewUser) if (isNewUser)
{ {
Eventer.Instance.PostEvent(EEvent.OnUserLogin, msg.UserInfo.UID, msg.UserInfo.NickName); Eventer.Instance.PostEvent(EEvent.OnUserLogin, msg.UserInfo.UID, msg.UserInfo.NickName);

10
AxibugEmuOnline.Client/Assets/Script/AppMain/MsgBool.cs
View File

@ -6,7 +6,7 @@ public struct MsgBool
public string ErrorMsg; public string ErrorMsg;
public bool Value; public bool Value;
public override string ToString() public override readonly string ToString()
{ {
if (Value) if (Value)
{ {
@ -33,10 +33,10 @@ public struct MsgBool
return msgBool.Value; return msgBool.Value;
} }
//public static implicit operator (bool, string)(MsgBool msgBool) public static implicit operator (bool, string)(MsgBool msgBool)
//{ {
// return (msgBool.Value, msgBool.ErrorMsg); return (msgBool.Value, msgBool.ErrorMsg);
//} }
public static implicit operator string(MsgBool msgBool) public static implicit operator string(MsgBool msgBool)
{ {

6
AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/CoreSupporter.cs
View File

@ -1,5 +1,4 @@
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using AxiReplay;
using System; using System;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -103,8 +102,7 @@ namespace AxibugEmuOnline.Client
{ {
if (InGameUI.Instance.IsNetPlay) if (InGameUI.Instance.IsNetPlay)
{ {
int targetFrame; ReplayStep replayData; int frameDiff; bool inputDiff; if (App.roomMgr.netReplay.TryGetNextFrame((int)frameIndex, out var replayData, out int frameDiff, out bool inputDiff))
if (App.roomMgr.netReplay.TryGetNextFrame((int)frameIndex, out replayData, out frameDiff, out inputDiff))
{ {
if (inputDiff) if (inputDiff)
{ {
@ -114,7 +112,7 @@ namespace AxibugEmuOnline.Client
m_sampledState = FromNet(replayData); m_sampledState = FromNet(replayData);
} }
else m_sampledState = default(ControllerState); else m_sampledState = default;
var localState = ControllerMapper.CreateState(); var localState = ControllerMapper.CreateState();
var rawData = ToNet(localState); var rawData = ToNet(localState);

15
AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/NesControllerMapper.cs
View File

@ -5,10 +5,10 @@ namespace AxibugEmuOnline.Client
{ {
public class NesControllerMapper : IControllerSetuper public class NesControllerMapper : IControllerSetuper
{ {
public Controller Controller0 { get; } = new Controller(0); public Controller Controller0 { get; } = new(0);
public Controller Controller1 { get; } = new Controller(1); public Controller Controller1 { get; } = new(1);
public Controller Controller2 { get; } = new Controller(2); public Controller Controller2 { get; } = new(2);
public Controller Controller3 { get; } = new Controller(3); public Controller Controller3 { get; } = new(3);
private readonly EnumButtonType[] m_states = new EnumButtonType[4]; private readonly EnumButtonType[] m_states = new EnumButtonType[4];
@ -138,7 +138,7 @@ namespace AxibugEmuOnline.Client
} }
} }
public struct KeyListener public readonly struct KeyListener
{ {
private readonly KeyCode m_key; private readonly KeyCode m_key;
@ -152,8 +152,7 @@ namespace AxibugEmuOnline.Client
{ {
m_key = KeyCode.None; m_key = KeyCode.None;
int result; if (int.TryParse(confStr, out int result))
if (int.TryParse(confStr, out result))
m_key = (KeyCode)result; m_key = (KeyCode)result;
} }
@ -221,7 +220,7 @@ namespace AxibugEmuOnline.Client
break; break;
} }
return default(KeyListener); return default;
} }
} }

14
AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/NesEmulator_Screen.mat
View File

@ -2,19 +2,24 @@
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 8
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NesEmulator_Screen m_Name: NesEmulator_Screen
m_Shader: {fileID: 4800000, guid: b351396ff606116478d7f4412abe4e2e, type: 3} m_Shader: {fileID: 4800000, guid: b351396ff606116478d7f4412abe4e2e, type: 3}
m_ShaderKeywords: m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: {} stringTagMap: {}
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
@ -58,6 +63,7 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _BumpScale: 1 - _BumpScale: 1
- _ColorMask: 15 - _ColorMask: 15
@ -85,3 +91,5 @@ Material:
m_Colors: m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

7
AxibugEmuOnline.Client/Assets/Script/AppMain/Network/NetMsg.cs
View File

@ -13,7 +13,7 @@ namespace AxibugEmuOnline.Client.Network
private Dictionary<int, List<Delegate>> netEventDic = new Dictionary<int, List<Delegate>>(128); private Dictionary<int, List<Delegate>> netEventDic = new Dictionary<int, List<Delegate>>(128);
private Queue<ValueTuple<int, int, byte[]>> queueNetMsg = new Queue<ValueTuple<int, int, byte[]>>(); private Queue<(int, int, byte[])> queueNetMsg = new Queue<(int, int, byte[])>();
private NetMsg() { } private NetMsg() { }
@ -66,7 +66,7 @@ namespace AxibugEmuOnline.Client.Network
{ {
lock (lockQueueObj) lock (lockQueueObj)
{ {
queueNetMsg.Enqueue(new ValueTuple<int,int,byte[]>(cmd, ERRCODE, arg)); queueNetMsg.Enqueue((cmd, ERRCODE, arg));
} }
} }
@ -76,8 +76,7 @@ namespace AxibugEmuOnline.Client.Network
{ {
while (queueNetMsg.Count > 0) while (queueNetMsg.Count > 0)
{ {
(int, int, byte[]) msgData = queueNetMsg.Dequeue();
var msgData = queueNetMsg.Dequeue();
PostNetMsgEvent(msgData.Item1, msgData.Item2, msgData.Item3); PostNetMsgEvent(msgData.Item1, msgData.Item2, msgData.Item3);
} }
} }

2
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/UI_BgSettingItem_Color.cs
View File

@ -39,7 +39,7 @@ namespace AxibugEmuOnline.Client
public void SetDependencyProperty(object data) public void SetDependencyProperty(object data)
{ {
SetSelectState(data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index); SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
} }
public void Release() public void Release()

5
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/UI_FilterItem.cs
View File

@ -33,7 +33,7 @@ namespace AxibugEmuOnline.Client
public void SetDependencyProperty(object data) public void SetDependencyProperty(object data)
{ {
SetSelectState(data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index); SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
if (m_select) if (m_select)
{ {
@ -87,8 +87,7 @@ namespace AxibugEmuOnline.Client
OverlayManager.Input((presetName) => OverlayManager.Input((presetName) =>
{ {
FilterPreset newPreset; var result = m_filter.CreatePreset(presetName, out var newPreset);
var result = m_filter.CreatePreset(presetName, out newPreset);
if (!result) OverlayManager.PopTip(result); if (!result) OverlayManager.PopTip(result);
else optionUI.AddOptionMenuWhenPoping(new Opt_Presets(m_filter, newPreset)); else optionUI.AddOptionMenuWhenPoping(new Opt_Presets(m_filter, newPreset));
}, "为预设设置一个名称", string.Empty); }, "为预设设置一个名称", string.Empty);

4
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/GamesUI/RomItem.cs
View File

@ -37,12 +37,12 @@ namespace AxibugEmuOnline.Client
m_romlib.BeginFetchRomInfo(m_romfile); m_romlib.BeginFetchRomInfo(m_romfile);
} }
SetSelectState(data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index); SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
} }
public void SetDependencyProperty(object data) public void SetDependencyProperty(object data)
{ {
SetSelectState(data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index); SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
} }
public void Release() public void Release()

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

@ -11,7 +11,7 @@ namespace AxibugEmuOnline.Client
private object m_state; private object m_state;
private StepPerformer m_stepPerformer; private StepPerformer m_stepPerformer;
private readonly List<OptionMenu> menus = new List<OptionMenu>(); private readonly List<OptionMenu> menus = new();
public static InGameUI Instance { get; private set; } public static InGameUI Instance { get; private set; }
public RomFile RomFile { get; private set; } public RomFile RomFile { get; private set; }

3
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/InGameUI/InGameUI_FilterSetting.cs
View File

@ -1,6 +1,9 @@
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using UnityEditor.Presets;
using UnityEngine;
using VirtualNes.Core;
using static AxibugEmuOnline.Client.FilterManager; using static AxibugEmuOnline.Client.FilterManager;
namespace AxibugEmuOnline.Client namespace AxibugEmuOnline.Client

6
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/GameObjectPool.cs
View File

@ -39,10 +39,8 @@ public static class GameObjectPool
public static void Release(GameObject instance) public static void Release(GameObject instance)
{ {
GameObject src; s_instanceToSrc.TryGetValue(instance, out var src);
Queue<GameObject> pool; if (src != null && s_poolMap.TryGetValue(src, out var pool))
s_instanceToSrc.TryGetValue(instance, out src);
if (src != null && s_poolMap.TryGetValue(src, out pool))
{ {
pool.Enqueue(instance); pool.Enqueue(instance);
//instance.SetActive(false); //instance.SetActive(false);

3
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemPresent.cs
View File

@ -480,9 +480,8 @@ public class ItemPresent : GridLayoutGroup, IVirtualLayout
if (_dataList != null) if (_dataList != null)
_dataList.Clear(); _dataList.Clear();
} }
else if (dataList is IEnumerable) else if (dataList is IEnumerable ienumrable)
{ {
var ienumrable = (IEnumerable)dataList;
List<object> temp = new List<object>(); List<object> temp = new List<object>();
foreach (var item in ienumrable) foreach (var item in ienumrable)
{ {

35
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemProxy.cs
View File

@ -7,17 +7,17 @@ using UnityEngine.UI;
public interface IVirtualLayout public interface IVirtualLayout
{ {
Dictionary<GameObject, ScripteInterface> CacheItemScripts { get; } Dictionary<GameObject, ScripteInterface> CacheItemScripts { get; }
List<object> DataList { get; } public List<object> DataList { get; }
object DependencyProperty { get; } public object DependencyProperty { get; }
RectTransform RectTransform { get; } public RectTransform RectTransform { get; }
RectTransform GetTemplate(object data); public RectTransform GetTemplate(object data);
Vector2 GetItemAnchorePos(int index); public Vector2 GetItemAnchorePos(int index);
RectTransform GetItemUIIfExist(int index); public RectTransform GetItemUIIfExist(int index);
void UpdateProxyVisualState(); public void UpdateProxyVisualState();
void UpdateDependencyProperty(object dp); public void UpdateDependencyProperty(object dp);
void SetData(object dataList); public void SetData(object dataList);
void MoveToScrollViewCenter(ScrollRect scrollRect, int dataIndex); public void MoveToScrollViewCenter(ScrollRect scrollRect, int dataIndex);
} }
public class ItemProxy public class ItemProxy
@ -65,9 +65,7 @@ public class ItemProxy
{ {
if (_runtimeInstance == null) return null; if (_runtimeInstance == null) return null;
ScripteInterface lfi; _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface lfi);
_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out lfi);
return lfi; return lfi;
} }
@ -161,9 +159,7 @@ public class ItemProxy
_parent.CacheItemScripts[_runtimeInstance.gameObject] = newSI; _parent.CacheItemScripts[_runtimeInstance.gameObject] = newSI;
} }
ScripteInterface si; _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface si);
_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out si);
si.SetDataList(_parent.DataList[Index], Index); si.SetDataList(_parent.DataList[Index], Index);
if (_parent.DependencyProperty != null) if (_parent.DependencyProperty != null)
si.SetDependencyProperty(_parent.DependencyProperty); si.SetDependencyProperty(_parent.DependencyProperty);
@ -173,8 +169,8 @@ public class ItemProxy
public void UpdateDP() public void UpdateDP()
{ {
if (_runtimeInstance == null) return; if (_runtimeInstance == null) return;
ScripteInterface luaInterface;
_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out luaInterface); _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface luaInterface);
if (luaInterface == null) return; if (luaInterface == null) return;
if (_parent.DependencyProperty != null) if (_parent.DependencyProperty != null)
@ -195,8 +191,7 @@ public class ItemProxy
if (Application.isPlaying) if (Application.isPlaying)
{ {
ScripteInterface si; _parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out ScripteInterface si);
_parent.CacheItemScripts.TryGetValue(_runtimeInstance.gameObject, out si);
if (si != null) si.Release(); if (si != null) si.Release();
GameObjectPool.Release(_runtimeInstance.gameObject); GameObjectPool.Release(_runtimeInstance.gameObject);
_runtimeInstance = null; _runtimeInstance = null;

6
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI.cs
View File

@ -269,17 +269,15 @@ namespace AxibugEmuOnline.Client
private void CreateRuntimeMenuItem(OptionMenu menuData) private void CreateRuntimeMenuItem(OptionMenu menuData)
{ {
if (menuData is ExecuteMenu) if (menuData is ExecuteMenu executeMenu)
{ {
ExecuteMenu executeMenu = (ExecuteMenu)menuData;
var menuUI = Instantiate(TEMPLATE_EXECUTEITEM.gameObject, TEMPLATE_EXECUTEITEM.transform.parent).GetComponent<OptionUI_ExecuteItem>(); var menuUI = Instantiate(TEMPLATE_EXECUTEITEM.gameObject, TEMPLATE_EXECUTEITEM.transform.parent).GetComponent<OptionUI_ExecuteItem>();
menuUI.gameObject.SetActive(true); menuUI.gameObject.SetActive(true);
menuUI.SetData(this, executeMenu); menuUI.SetData(this, executeMenu);
m_runtimeMenuItems.Add(menuUI); m_runtimeMenuItems.Add(menuUI);
} }
else if (menuData is ValueSetMenu) else if (menuData is ValueSetMenu valueSetMenu)
{ {
var valueSetMenu = (ValueSetMenu)menuData;
var menuUI = Instantiate(TEMPLATE_VALUEEDITITEM.gameObject, TEMPLATE_VALUEEDITITEM.transform.parent).GetComponent<OptionUI_ValueEditItem>(); var menuUI = Instantiate(TEMPLATE_VALUEEDITITEM.gameObject, TEMPLATE_VALUEEDITITEM.transform.parent).GetComponent<OptionUI_ValueEditItem>();
menuUI.gameObject.SetActive(true); menuUI.gameObject.SetActive(true);
menuUI.SetData(this, valueSetMenu); menuUI.SetData(this, valueSetMenu);

3
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_ValueEditItem.cs
View File

@ -17,9 +17,8 @@ namespace AxibugEmuOnline.Client
com_floatEdit.gameObject.SetActive(false); com_floatEdit.gameObject.SetActive(false);
com_enumEdit.gameObject.SetActive(false); com_enumEdit.gameObject.SetActive(false);
if (menuData is ValueSetMenu) if (menuData is ValueSetMenu valueMenu)
{ {
var valueMenu = (ValueSetMenu)menuData;
if (valueMenu.ValueType == typeof(float)) if (valueMenu.ValueType == typeof(float))
{ {
m_currentCom = com_floatEdit; m_currentCom = com_floatEdit;

8
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/InputUI.cs
View File

@ -18,11 +18,11 @@ namespace AxibugEmuOnline.Client
protected override void OnShow(object param) protected override void OnShow(object param)
{ {
ValueTuple<Action<string>, string, string> t = (ValueTuple<Action<string>, string, string>)param; (Action<string> callback, string placeHolder, string defaultText) t = ((Action<string> callback, string placeHolder, string defaultText))param;
OnCommit = t.Item1; OnCommit = t.callback;
(m_input.placeholder as Text).text = t.Item2; (m_input.placeholder as Text).text = t.placeHolder;
m_input.text = t.Item3; m_input.text = t.defaultText;
} }
protected override void Update() protected override void Update()

2
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/OverlayManager.cs
View File

@ -22,7 +22,7 @@ namespace AxibugEmuOnline.Client
public static InputUI Input(Action<string> callback, string placeHolder, string defaultText) public static InputUI Input(Action<string> callback, string placeHolder, string defaultText)
{ {
s_ins.m_InputUI.Show(new ValueTuple<Action<string>, string, string>(callback, placeHolder, defaultText)); s_ins.m_InputUI.Show((callback, placeHolder, defaultText));
return s_ins.m_InputUI; return s_ins.m_InputUI;
} }

16
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/RoomUI/RoomItem.cs
View File

@ -32,8 +32,7 @@ namespace AxibugEmuOnline.Client
{ {
if (this.RoomID != roomID) return; if (this.RoomID != roomID) return;
Protobuf_Room_MiniInfo roomInfo; if (App.roomMgr.GetRoomListMiniInfo(roomID, out var roomInfo))
if (App.roomMgr.GetRoomListMiniInfo(roomID, out roomInfo))
UpdateUI(roomInfo); UpdateUI(roomInfo);
} }
@ -58,14 +57,13 @@ namespace AxibugEmuOnline.Client
} }
else else
{ {
Protobuf_Room_MiniInfo MiniInfo; if (!App.roomMgr.GetRoomListMiniInfo(RoomID, out Protobuf_Room_MiniInfo MiniInfo))
if (!App.roomMgr.GetRoomListMiniInfo(RoomID, out MiniInfo))
{ {
OverlayManager.PopTip("房间不存在"); OverlayManager.PopTip("房间不存在");
return false; return false;
} }
int[] freeSlots;
if (!MiniInfo.GetFreeSlot(out freeSlots)) if (!MiniInfo.GetFreeSlot(out var freeSlots))
{ {
OverlayManager.PopTip("无空闲位置"); OverlayManager.PopTip("无空闲位置");
return false; return false;
@ -79,9 +77,7 @@ namespace AxibugEmuOnline.Client
private void UpdateUI(Protobuf_Room_MiniInfo roomInfo) private void UpdateUI(Protobuf_Room_MiniInfo roomInfo)
{ {
var hostNick = roomInfo.GetHostNickName(); var hostNick = roomInfo.GetHostNickName();
int cur; int max; roomInfo.GetRoomPlayers(out var cur, out var max);
roomInfo.GetRoomPlayers(out cur, out max);
SetBaseInfo("--", $"<b>{hostNick}</b>的房间", $"{cur}/{max}"); SetBaseInfo("--", $"<b>{hostNick}</b>的房间", $"{cur}/{max}");
SetIcon(null); SetIcon(null);
@ -133,7 +129,7 @@ namespace AxibugEmuOnline.Client
public void SetDependencyProperty(object data) public void SetDependencyProperty(object data)
{ {
SetSelectState((data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index)); SetSelectState(data is ThirdMenuRoot tr && tr.SelectIndex == Index);
} }
public void Release() public void Release()

2
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/Selector.cs
View File

@ -44,7 +44,7 @@ namespace AxibugEmuOnline.Client
m_trackTween.Kill(); m_trackTween.Kill();
m_trackTween = null; m_trackTween = null;
} }
m_trackTween = DOTween.To(() => m_rect.position, (_value) => m_rect.position = _value, itemUIRect.position, 0.125f); m_trackTween = DOTween.To(() => m_rect.position, (value) => m_rect.position = value, itemUIRect.position, 0.125f);
m_trackTween.onComplete = () => m_trackTween = null; m_trackTween.onComplete = () => m_trackTween = null;
} }
} }

13
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/SubMenuItemGroup.cs
View File

@ -184,10 +184,6 @@ namespace AxibugEmuOnline.Client
private MenuItem Clone(MenuItem template, Transform parent) private MenuItem Clone(MenuItem template, Transform parent)
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
//========================套娃宏========================
#if UNITY_2019_1_OR_NEWER //新版Unity，因UNITY2018.2用不了这玩意儿，编辑器也罢
if (Application.isPlaying) if (Application.isPlaying)
{ {
var item = GameObject.Instantiate(template.gameObject, parent).GetComponent<MenuItem>(); var item = GameObject.Instantiate(template.gameObject, parent).GetComponent<MenuItem>();
@ -200,15 +196,6 @@ namespace AxibugEmuOnline.Client
clone.transform.localPosition = Vector3.zero; clone.transform.localPosition = Vector3.zero;
return clone.GetComponent<MenuItem>(); return clone.GetComponent<MenuItem>();
} }
#else
var item = GameObject.Instantiate(template.gameObject, parent).GetComponent<MenuItem>();
item.transform.localPosition = Vector3.zero;
return item;
#endif
//========================套娃宏 End========================
#else #else
return GameObject.Instantiate(SubMenuItemTemplate.gameObject, parent).GetComponent<MenuItem>(); return GameObject.Instantiate(SubMenuItemTemplate.gameObject, parent).GetComponent<MenuItem>();
#endif #endif

3
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/UITool.cs
View File

@ -9,8 +9,7 @@ namespace AxibugEmuOnline.Client
private static Dictionary<Graphic, Material> _caches = new Dictionary<Graphic, Material>(); private static Dictionary<Graphic, Material> _caches = new Dictionary<Graphic, Material>();
public static Material GetMaterial(this Graphic graphic) public static Material GetMaterial(this Graphic graphic)
{ {
Material material; if (_caches.TryGetValue(graphic, out var material))
if (_caches.TryGetValue(graphic, out material))
{ {
return material; return material;
} }

17
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/XMBTopGroupUI/XMBInfoBar.cs
View File

@ -34,10 +34,7 @@ public class XMBInfoBar : MonoBehaviour
RefreshFps(); RefreshFps();
} }
/// <summary> (uint lastFrame, float lastTime) m_lastFrameInfo;
/// (uint lastFrame, float lastTime)
/// </summary>
ValueTuple<uint,float> m_lastFrameInfo;
private void RefreshFps() private void RefreshFps()
{ {
if (App.emu.Core.IsNull()) if (App.emu.Core.IsNull())
@ -45,17 +42,13 @@ public class XMBInfoBar : MonoBehaviour
else else
{ {
FPS.gameObject.SetActiveEx(true); FPS.gameObject.SetActiveEx(true);
//var gap = App.emu.Core.Frame - m_lastFrameInfo.lastFrame; var gap = App.emu.Core.Frame - m_lastFrameInfo.lastFrame;
//var time = Time.realtimeSinceStartup - m_lastFrameInfo.lastTime; var time = Time.realtimeSinceStartup - m_lastFrameInfo.lastTime;
var gap = App.emu.Core.Frame - m_lastFrameInfo.Item1;
var time = Time.realtimeSinceStartup - m_lastFrameInfo.Item2;
var fps = gap / time; var fps = gap / time;
FPS.text = $"FPS:{fps:.#}"; FPS.text = $"FPS:{fps:.#}";
//m_lastFrameInfo.lastFrame = App.emu.Core.Frame; m_lastFrameInfo.lastFrame = App.emu.Core.Frame;
//m_lastFrameInfo.lastTime = Time.realtimeSinceStartup; m_lastFrameInfo.lastTime = Time.realtimeSinceStartup;
m_lastFrameInfo.Item1 = App.emu.Core.Frame;
m_lastFrameInfo.Item2 = Time.realtimeSinceStartup;
} }
} }

12
AxibugEmuOnline.Client/Assets/Script/AppMain/Utility.cs
View File

@ -36,9 +36,7 @@ namespace AxibugEmuOnline.Client
private static Dictionary<int, RomFile> s_RomFileCahcesInRoomInfo = new Dictionary<int, RomFile>(); private static Dictionary<int, RomFile> s_RomFileCahcesInRoomInfo = new Dictionary<int, RomFile>();
public static void FetchRomFileInRoomInfo(this Protobuf_Room_MiniInfo roomInfo, EnumPlatform platform, Action<Protobuf_Room_MiniInfo, RomFile> callback) public static void FetchRomFileInRoomInfo(this Protobuf_Room_MiniInfo roomInfo, EnumPlatform platform, Action<Protobuf_Room_MiniInfo, RomFile> callback)
{ {
RomFile romFile; if (s_RomFileCahcesInRoomInfo.TryGetValue(roomInfo.GameRomID, out RomFile romFile))
if (s_RomFileCahcesInRoomInfo.TryGetValue(roomInfo.GameRomID, out romFile))
{ {
callback.Invoke(roomInfo, romFile); callback.Invoke(roomInfo, romFile);
return; return;
@ -48,11 +46,11 @@ namespace AxibugEmuOnline.Client
case EnumPlatform.NES: case EnumPlatform.NES:
App.StartCoroutine(App.httpAPI.GetNesRomInfo(roomInfo.GameRomID, (romWebData) => App.StartCoroutine(App.httpAPI.GetNesRomInfo(roomInfo.GameRomID, (romWebData) =>
{ {
RomFile _romFile = new RomFile(EnumPlatform.NES, 0, 0); RomFile romFile = new RomFile(EnumPlatform.NES, 0, 0);
_romFile.SetWebData(romWebData); romFile.SetWebData(romWebData);
s_RomFileCahcesInRoomInfo[roomInfo.GameRomID] = _romFile; s_RomFileCahcesInRoomInfo[roomInfo.GameRomID] = romFile;
callback.Invoke(roomInfo, _romFile); callback.Invoke(roomInfo, romFile);
})); }));
break; break;
} }