Alienjack/AxibugEmuOnline
1
0
Fork 0
forked from sin365/AxibugEmuOnline
Code Pull Requests Activity

移除EnumPlatform文件,统一使用RomPlatformType枚举来定义模拟器平台

Browse Source
This commit is contained in:
ALIENJACK\alien 2025-01-07 13:15:53 +08:00
parent 983bd36099
commit 14d2ae167e
18 changed files with 76 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
using AxibugEmuOnline.Client.Manager; using AxibugEmuOnline.Client.Manager;
using AxibugEmuOnline.Client.Network; using AxibugEmuOnline.Client.Network;
using AxibugProtobuf;
using System; using System;
using System.Collections; using System.Collections;
using System.IO; using System.IO;
@ -64,7 +65,7 @@ namespace AxibugEmuOnline.Client.ClientCore
emu = new AppEmu(); emu = new AppEmu();
//netgame = new AppNetGame(); //netgame = new AppNetGame();
httpAPI = new HttpAPI(); httpAPI = new HttpAPI();
nesRomLib = new RomLib(EnumSupportEmuPlatform.NES); nesRomLib = new RomLib(RomPlatformType.Nes);
CacheMgr = new CacheManager(); CacheMgr = new CacheManager();
roomMgr = new AppRoom(); roomMgr = new AppRoom();
share = new AppShare(); share = new AppShare();

5
AxibugEmuOnline.Client/Assets/Script/AppMain/IEmuCore.cs
View File

@ -1,4 +1,5 @@
using UnityEngine; using AxibugProtobuf;
using UnityEngine;
namespace AxibugEmuOnline.Client namespace AxibugEmuOnline.Client
{ {
@ -17,7 +18,7 @@ namespace AxibugEmuOnline.Client
void DoReset(); void DoReset();
IControllerSetuper GetControllerSetuper(); IControllerSetuper GetControllerSetuper();
EnumSupportEmuPlatform Platform { get; } RomPlatformType Platform { get; }
uint Frame { get; } uint Frame { get; }
} }

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

@ -1,5 +1,6 @@
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using AxibugEmuOnline.Client.Event; using AxibugEmuOnline.Client.Event;
using AxibugProtobuf;
using UnityEngine; using UnityEngine;
namespace AxibugEmuOnline.Client.Manager namespace AxibugEmuOnline.Client.Manager
@ -31,7 +32,7 @@ namespace AxibugEmuOnline.Client.Manager
if (!m_emuCore.IsNull()) StopGame(); if (!m_emuCore.IsNull()) StopGame();
var roomInfo = App.roomMgr.mineRoomMiniInfo; var roomInfo = App.roomMgr.mineRoomMiniInfo;
roomInfo.FetchRomFileInRoomInfo(EnumSupportEmuPlatform.NES, (_, romFile) => roomInfo.FetchRomFileInRoomInfo(RomPlatformType.Nes, (_, romFile) =>
{ {
if (!romFile.RomReady) //这个rom并没有下载,所以取消进入房间 if (!romFile.RomReady) //这个rom并没有下载,所以取消进入房间
{ {
@ -51,7 +52,7 @@ namespace AxibugEmuOnline.Client.Manager
switch (romFile.Platform) switch (romFile.Platform)
{ {
case EnumSupportEmuPlatform.NES: case RomPlatformType.Nes:
m_emuCore = GameObject.Instantiate(Resources.Load<GameObject>("NES/NesEmulator")).GetComponent<IEmuCore>(); m_emuCore = GameObject.Instantiate(Resources.Load<GameObject>("NES/NesEmulator")).GetComponent<IEmuCore>();
break; break;
} }

3
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterManager.cs
View File

@ -1,4 +1,5 @@
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -12,7 +13,7 @@ namespace AxibugEmuOnline.Client
public class FilterManager public class FilterManager
{ {
private List<Filter> m_filters; private List<Filter> m_filters;
private Dictionary<EnumSupportEmuPlatform, Filter> m_filterPlatforms = new Dictionary<EnumSupportEmuPlatform, Filter>(); private Dictionary<RomPlatformType, Filter> m_filterPlatforms = new Dictionary<RomPlatformType, Filter>();
private AlphaWraper m_previewFilterWraper; private AlphaWraper m_previewFilterWraper;
FilterRomSetting m_filterRomSetting; FilterRomSetting m_filterRomSetting;

13
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/ScreenScaler.cs
View File

@ -1,4 +1,5 @@
using UnityEngine; using AxibugProtobuf;
using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
namespace AxibugEmuOnline.Client namespace AxibugEmuOnline.Client
@ -22,7 +23,7 @@ namespace AxibugEmuOnline.Client
/// </summary> /// </summary>
/// <param name="platform"></param> /// <param name="platform"></param>
/// <returns></returns> /// <returns></returns>
public EnumScalerMode GetMode(EnumSupportEmuPlatform platform) public EnumScalerMode GetMode(RomPlatformType platform)
{ {
int setVal = PlayerPrefs.GetInt($"{nameof(ScreenScaler)}.PlatMode.{platform}", -1); int setVal = PlayerPrefs.GetInt($"{nameof(ScreenScaler)}.PlatMode.{platform}", -1);
if (setVal == -1) if (setVal == -1)
@ -36,10 +37,10 @@ namespace AxibugEmuOnline.Client
/// </summary> /// </summary>
/// <param name="m_rawImg"></param> /// <param name="m_rawImg"></param>
/// <param name="platform">不指定模拟器平台时,使用全局设置的缩放模式</param> /// <param name="platform">不指定模拟器平台时,使用全局设置的缩放模式</param>
public void CalcScale(RawImage rawImg, EnumSupportEmuPlatform? platform = null) public void CalcScale(RawImage rawImg, RomPlatformType? platform = null)
{ {
var targetMode = platform == null ? GlobalMode : GetMode(platform.Value); var targetMode = platform == null ? GlobalMode : GetMode(platform.Value);
var resolution = GetRawResolution(platform == null ? EnumSupportEmuPlatform.NES : platform.Value); var resolution = GetRawResolution(platform == null ? RomPlatformType.Nes : platform.Value);
var canvasRect = (rawImg.canvas.transform as RectTransform).rect; var canvasRect = (rawImg.canvas.transform as RectTransform).rect;
switch (targetMode) switch (targetMode)
{ {
@ -88,11 +89,11 @@ namespace AxibugEmuOnline.Client
} }
} }
public Vector2Int GetRawResolution(EnumSupportEmuPlatform platform) public Vector2Int GetRawResolution(RomPlatformType platform)
{ {
switch (platform) switch (platform)
{ {
case EnumSupportEmuPlatform.NES: return new Vector2Int(256, 240); case RomPlatformType.Nes: return new Vector2Int(256, 240);
default: return new Vector2Int(256, 240); default: return new Vector2Int(256, 240);
} }
} }

7
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/EnumPlatform.cs
View File

@ -1,7 +0,0 @@
namespace AxibugEmuOnline.Client
{
public enum EnumSupportEmuPlatform
{
NES
}
}

11
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/EnumPlatform.cs.meta
View File

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

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

@ -1,11 +1,10 @@
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using ICSharpCode.SharpZipLib.Zip; using ICSharpCode.SharpZipLib.Zip;
using System; using System;
using System.Collections; using System.Collections;
using System.IO; using System.IO;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking;
using static UnityEngine.EventSystems.EventTrigger;
namespace AxibugEmuOnline.Client namespace AxibugEmuOnline.Client
{ {
@ -13,7 +12,6 @@ namespace AxibugEmuOnline.Client
{ {
private HttpAPI.Resp_RomInfo webData; private HttpAPI.Resp_RomInfo webData;
private bool hasLocalFile; private bool hasLocalFile;
private EnumSupportEmuPlatform platform;
//private UnityWebRequest downloadRequest; //private UnityWebRequest downloadRequest;
private AxiHttpProxy.SendDownLoadProxy downloadRequest; private AxiHttpProxy.SendDownLoadProxy downloadRequest;
@ -22,8 +20,8 @@ namespace AxibugEmuOnline.Client
/// <summary> 指示该Rom文件的存放路径 </summary> /// <summary> 指示该Rom文件的存放路径 </summary>
public string LocalFilePath => public string LocalFilePath =>
IsUserRom ? IsUserRom ?
$"{App.PersistentDataPath}/UserRoms/{platform}/{FileName}" : $"{App.PersistentDataPath}/UserRoms/{Platform}/{FileName}" :
$"{App.PersistentDataPath}/RemoteRoms/{platform}/{FileName}"; $"{App.PersistentDataPath}/RemoteRoms/{Platform}/{FileName}";
/// <summary> 指示该Rom文件是否已下载完毕 </summary> /// <summary> 指示该Rom文件是否已下载完毕 </summary>
public bool RomReady => hasLocalFile; public bool RomReady => hasLocalFile;
@ -36,7 +34,7 @@ namespace AxibugEmuOnline.Client
public float Progress => IsDownloading ? downloadRequest.downloadHandler.DownLoadPr : 0; public float Progress => IsDownloading ? downloadRequest.downloadHandler.DownLoadPr : 0;
public EnumSupportEmuPlatform Platform => platform; public RomPlatformType Platform => webData != null ? (RomPlatformType)webData.ptype : RomPlatformType.Invalid;
/// <summary> 指示该Rom信息是否已填充 </summary> /// <summary> 指示该Rom信息是否已填充 </summary>
public bool InfoReady => webData != null; public bool InfoReady => webData != null;
/// <summary> 唯一标识 </summary> /// <summary> 唯一标识 </summary>
@ -61,9 +59,8 @@ namespace AxibugEmuOnline.Client
public event Action<RomFile> OnDownloadOver; public event Action<RomFile> OnDownloadOver;
public event Action OnInfoFilled; public event Action OnInfoFilled;
public RomFile(EnumSupportEmuPlatform platform, int index, int insidePage) public RomFile(int index, int insidePage)
{ {
this.platform = platform;
Index = index; Index = index;
Page = insidePage; Page = insidePage;
} }
@ -181,14 +178,5 @@ namespace AxibugEmuOnline.Client
OnInfoFilled?.Invoke(); OnInfoFilled?.Invoke();
} }
private RomFile() { }
public static RomFile CreateExistRom(EnumSupportEmuPlatform platform, string fileName)
{
var res = new RomFile();
res.IsUserRom = true;
res.FileName = fileName;
res.hasLocalFile = File.Exists(res.LocalFilePath);
return res;
}
} }
} }

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

@ -1,5 +1,6 @@
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using AxibugEmuOnline.Client.Common; using AxibugEmuOnline.Client.Common;
using AxibugProtobuf;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@ -19,30 +20,21 @@ namespace AxibugEmuOnline.Client
private Dictionary<string, RomFile> nesRomFileNameMapper = new Dictionary<string, RomFile>(); private Dictionary<string, RomFile> nesRomFileNameMapper = new Dictionary<string, RomFile>();
private HttpAPI.GetRomListAPI m_romGetFunc; private HttpAPI.GetRomListAPI m_romGetFunc;
private HttpAPI.SearchRomListAPI m_romSearchFunc; private HttpAPI.SearchRomListAPI m_romSearchFunc;
private EnumSupportEmuPlatform m_platform; private RomPlatformType m_platform;
private string lastSearchKey; private string lastSearchKey;
public RomLib(EnumSupportEmuPlatform platform) public RomLib(RomPlatformType platform)
{ {
m_platform = platform; m_platform = platform;
switch (platform) switch (platform)
{ {
case EnumSupportEmuPlatform.NES: case RomPlatformType.Nes:
m_romGetFunc = App.httpAPI.GetNesRomList; m_romGetFunc = App.httpAPI.GetNesRomList;
m_romSearchFunc = App.httpAPI.SearchNesRomList; m_romSearchFunc = App.httpAPI.SearchNesRomList;
break; break;
} }
} }
public RomFile GetExistRom(string fileName)
{
var res = RomFile.CreateExistRom(m_platform, fileName);
nesRomFileNameMapper[res.FileName] = res;
return res;
}
public RomFile GetRomFile(string romFileName) public RomFile GetRomFile(string romFileName)
{ {
RomFile romFile; RomFile romFile;
@ -89,15 +81,12 @@ namespace AxibugEmuOnline.Client
for (int i = 0; i < nesRomFetchList.Length; i++) for (int i = 0; i < nesRomFetchList.Length; i++)
{ {
//以后考虑用对象池实例化RomFile //以后考虑用对象池实例化RomFile
nesRomFetchList[i] = new RomFile(m_platform, i, i / PAGE_SIZE); nesRomFetchList[i] = new RomFile(i, i / PAGE_SIZE);
} }
SaveRomInfoFromWeb(romList); SaveRomInfoFromWeb(romList);
callback.Invoke(nesRomFetchList); callback.Invoke(nesRomFetchList);
}, }, m_platform, 0, PAGE_SIZE);
//TODO 平台参数
AxibugProtobuf.RomPlatformType.Nes
, 0, PAGE_SIZE);
} }
else else
{ {
@ -115,15 +104,12 @@ namespace AxibugEmuOnline.Client
for (int i = 0; i < nesRomFetchList.Length; i++) for (int i = 0; i < nesRomFetchList.Length; i++)
{ {
//以后考虑用对象池实例化RomFile //以后考虑用对象池实例化RomFile
nesRomFetchList[i] = new RomFile(m_platform, i, i / PAGE_SIZE); nesRomFetchList[i] = new RomFile(i, i / PAGE_SIZE);
} }
SaveRomInfoFromWeb(romList); SaveRomInfoFromWeb(romList);
callback.Invoke(nesRomFetchList); callback.Invoke(nesRomFetchList);
}, }, m_platform, searchKey, 0, PAGE_SIZE);
//TODO 平台参数
AxibugProtobuf.RomPlatformType.Nes
, searchKey, 0, PAGE_SIZE);
} }
} }

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

@ -4,6 +4,7 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Xml.Linq; using System.Xml.Linq;
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using VirtualNes.Core; using VirtualNes.Core;
@ -58,7 +59,7 @@ namespace AxibugEmuOnline.Client
VideoProvider.ApplyFilterEffect(); VideoProvider.ApplyFilterEffect();
} }
public EnumSupportEmuPlatform Platform => EnumSupportEmuPlatform.NES; public RomPlatformType Platform => RomPlatformType.Nes;
private CoreSupporter m_coreSupporter; private CoreSupporter m_coreSupporter;
/// <summary> /// <summary>
/// 指定ROM开始游戏 /// 指定ROM开始游戏

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

@ -1,4 +1,5 @@
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using UnityEngine; using UnityEngine;
@ -84,7 +85,7 @@ namespace AxibugEmuOnline.Client
public void ApplyScreenScaler() public void ApplyScreenScaler()
{ {
App.settings.ScreenScaler.CalcScale(Image, EnumSupportEmuPlatform.NES); App.settings.ScreenScaler.CalcScale(Image, RomPlatformType.Nes);
} }
private unsafe void PrepareUI(uint* screenData) private unsafe void PrepareUI(uint* screenData)

21
AxibugEmuOnline.Client/Assets/Script/AppMain/Protobuf/ProtobufAxibugEmuOnline.cs
View File

@ -133,15 +133,15 @@ namespace AxibugProtobuf {
"U3dpdGNoSm95Q29uEAcSEgoOWEJPWDM2MENvbnRyb2wQCBISCg5YQk9YT05F", "U3dpdGNoSm95Q29uEAcSEgoOWEJPWDM2MENvbnRyb2wQCBISCg5YQk9YT05F",
"Q29udHJvbBAJEhEKDVBTVml0YUNvbnRyb2wQChISCg5XaWlVUGFkQ29udHJv", "Q29udHJvbBAJEhEKDVBTVml0YUNvbnRyb2wQChISCg5XaWlVUGFkQ29udHJv",
"bBALEhQKEFdpaVJlbW90ZUNvbnRyb2wQDBIWChJOaW50ZW5kbzNEU0NvbnRy", "bBALEhQKEFdpaVJlbW90ZUNvbnRyb2wQDBIWChJOaW50ZW5kbzNEU0NvbnRy",
"b2wQDSqUAQoPUm9tUGxhdGZvcm1UeXBlEgcKA0FsbBAAEgcKA05lcxABEhEK", "b2wQDSqiAQoPUm9tUGxhdGZvcm1UeXBlEgsKB0ludmFsaWQQABIHCgNOZXMQ",
"DU1hc3Rlcl9TeXN0ZW0QAhINCglHYW1lX0dlYXIQAxIMCghHYW1lX0JveRAE", "ARIRCg1NYXN0ZXJfU3lzdGVtEAISDQoJR2FtZV9HZWFyEAMSDAoIR2FtZV9C",
"EhIKDkdhbWVfQm95X0NvbG9yEAUSEQoNQ29sZWNvX1Zpc2lvbhAGEgsKB1ND", "b3kQBBISCg5HYW1lX0JveV9Db2xvchAFEhEKDUNvbGVjb19WaXNpb24QBhIL",
"XzMwMDAQBxILCgdTR18xMDAwEAgqcAoNUm9vbUdhbWVTdGF0ZRISCg5Ob25l", "CgdTQ18zMDAwEAcSCwoHU0dfMTAwMBAIEggKA0FsbBDnBypwCg1Sb29tR2Ft",
"X0dhbWVTdGF0ZRAAEgwKCE9ubHlIb3N0EAESEQoNV2FpdFJhd1VwZGF0ZRAC", "ZVN0YXRlEhIKDk5vbmVfR2FtZVN0YXRlEAASDAoIT25seUhvc3QQARIRCg1X",
"Eg0KCVdhaXRSZWFkeRADEgkKBVBhdXNlEAQSEAoMSW5PbmxpbmVHYW1lEAUq", "YWl0UmF3VXBkYXRlEAISDQoJV2FpdFJlYWR5EAMSCQoFUGF1c2UQBBIQCgxJ",
"TgoRTG9naW5SZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNfQmFz", "bk9ubGluZUdhbWUQBSpOChFMb2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJl",
"ZURlZmF1bHQQABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnByb3Rv", "c3VsdFN0YXR1c19CYXNlRGVmYXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVy",
"Mw==")); "chACQgJIAWIGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.GamePadType), typeof(global::AxibugProtobuf.RomPlatformType), typeof(global::AxibugProtobuf.RoomGameState), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.GamePadType), typeof(global::AxibugProtobuf.RomPlatformType), typeof(global::AxibugProtobuf.RoomGameState), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] {
@ -416,7 +416,7 @@ namespace AxibugProtobuf {
} }
public enum RomPlatformType { public enum RomPlatformType {
[pbr::OriginalName("All")] All = 0, [pbr::OriginalName("Invalid")] Invalid = 0,
[pbr::OriginalName("Nes")] Nes = 1, [pbr::OriginalName("Nes")] Nes = 1,
[pbr::OriginalName("Master_System")] MasterSystem = 2, [pbr::OriginalName("Master_System")] MasterSystem = 2,
[pbr::OriginalName("Game_Gear")] GameGear = 3, [pbr::OriginalName("Game_Gear")] GameGear = 3,
@ -425,6 +425,7 @@ namespace AxibugProtobuf {
[pbr::OriginalName("Coleco_Vision")] ColecoVision = 6, [pbr::OriginalName("Coleco_Vision")] ColecoVision = 6,
[pbr::OriginalName("SC_3000")] Sc3000 = 7, [pbr::OriginalName("SC_3000")] Sc3000 = 7,
[pbr::OriginalName("SG_1000")] Sg1000 = 8, [pbr::OriginalName("SG_1000")] Sg1000 = 8,
[pbr::OriginalName("All")] All = 999,
} }
public enum RoomGameState { public enum RoomGameState {

5
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/GamesUI/RomListMenuItem.cs
View File

@ -1,4 +1,5 @@
using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -8,7 +9,7 @@ namespace AxibugEmuOnline.Client
public class RomListMenuItem : VirtualSubMenuItem public class RomListMenuItem : VirtualSubMenuItem
{ {
[SerializeField] [SerializeField]
protected EnumSupportEmuPlatform Platform; protected RomPlatformType Platform;
private RomLib RomLib private RomLib RomLib
{ {
@ -16,7 +17,7 @@ namespace AxibugEmuOnline.Client
{ {
switch (Platform) switch (Platform)
{ {
case EnumSupportEmuPlatform.NES: case RomPlatformType.Nes:
return App.nesRomLib; return App.nesRomLib;
default: default:
throw new System.NotImplementedException($"未实现的平台 {Platform}"); throw new System.NotImplementedException($"未实现的平台 {Platform}");

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

@ -86,7 +86,7 @@ namespace AxibugEmuOnline.Client
SetBaseInfo("--", $"<b>{hostNick}</b>的房间", $"{cur}/{max}"); SetBaseInfo("--", $"<b>{hostNick}</b>的房间", $"{cur}/{max}");
SetIcon(null); SetIcon(null);
roomInfo.FetchRomFileInRoomInfo(EnumSupportEmuPlatform.NES, (room, romFile) => roomInfo.FetchRomFileInRoomInfo(RomPlatformType.Nes, (room, romFile) =>
{ {
if (room.RoomID != RoomID) return; if (room.RoomID != RoomID) return;

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

@ -34,7 +34,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, EnumSupportEmuPlatform platform, Action<Protobuf_Room_MiniInfo, RomFile> callback) public static void FetchRomFileInRoomInfo(this Protobuf_Room_MiniInfo roomInfo, RomPlatformType platform, Action<Protobuf_Room_MiniInfo, RomFile> callback)
{ {
RomFile romFile; RomFile romFile;
@ -45,10 +45,10 @@ namespace AxibugEmuOnline.Client
} }
switch (platform) switch (platform)
{ {
case EnumSupportEmuPlatform.NES: case RomPlatformType.Nes:
App.StartCoroutine(App.httpAPI.GetRomInfo(roomInfo.GameRomID, (romWebData) => App.StartCoroutine(App.httpAPI.GetRomInfo(roomInfo.GameRomID, (romWebData) =>
{ {
RomFile _romFile = new RomFile(EnumSupportEmuPlatform.NES, 0, 0); RomFile _romFile = new RomFile(0, 0);
_romFile.SetWebData(romWebData); _romFile.SetWebData(romWebData);
s_RomFileCahcesInRoomInfo[roomInfo.GameRomID] = _romFile; s_RomFileCahcesInRoomInfo[roomInfo.GameRomID] = _romFile;

21
AxibugEmuOnline.Server/Protobuf/ProtobufAxibugEmuOnline.cs
View File

@ -133,15 +133,15 @@ namespace AxibugProtobuf {
"U3dpdGNoSm95Q29uEAcSEgoOWEJPWDM2MENvbnRyb2wQCBISCg5YQk9YT05F", "U3dpdGNoSm95Q29uEAcSEgoOWEJPWDM2MENvbnRyb2wQCBISCg5YQk9YT05F",
"Q29udHJvbBAJEhEKDVBTVml0YUNvbnRyb2wQChISCg5XaWlVUGFkQ29udHJv", "Q29udHJvbBAJEhEKDVBTVml0YUNvbnRyb2wQChISCg5XaWlVUGFkQ29udHJv",
"bBALEhQKEFdpaVJlbW90ZUNvbnRyb2wQDBIWChJOaW50ZW5kbzNEU0NvbnRy", "bBALEhQKEFdpaVJlbW90ZUNvbnRyb2wQDBIWChJOaW50ZW5kbzNEU0NvbnRy",
"b2wQDSqUAQoPUm9tUGxhdGZvcm1UeXBlEgcKA0FsbBAAEgcKA05lcxABEhEK", "b2wQDSqiAQoPUm9tUGxhdGZvcm1UeXBlEgsKB0ludmFsaWQQABIHCgNOZXMQ",
"DU1hc3Rlcl9TeXN0ZW0QAhINCglHYW1lX0dlYXIQAxIMCghHYW1lX0JveRAE", "ARIRCg1NYXN0ZXJfU3lzdGVtEAISDQoJR2FtZV9HZWFyEAMSDAoIR2FtZV9C",
"EhIKDkdhbWVfQm95X0NvbG9yEAUSEQoNQ29sZWNvX1Zpc2lvbhAGEgsKB1ND", "b3kQBBISCg5HYW1lX0JveV9Db2xvchAFEhEKDUNvbGVjb19WaXNpb24QBhIL",
"XzMwMDAQBxILCgdTR18xMDAwEAgqcAoNUm9vbUdhbWVTdGF0ZRISCg5Ob25l", "CgdTQ18zMDAwEAcSCwoHU0dfMTAwMBAIEggKA0FsbBDnBypwCg1Sb29tR2Ft",
"X0dhbWVTdGF0ZRAAEgwKCE9ubHlIb3N0EAESEQoNV2FpdFJhd1VwZGF0ZRAC", "ZVN0YXRlEhIKDk5vbmVfR2FtZVN0YXRlEAASDAoIT25seUhvc3QQARIRCg1X",
"Eg0KCVdhaXRSZWFkeRADEgkKBVBhdXNlEAQSEAoMSW5PbmxpbmVHYW1lEAUq", "YWl0UmF3VXBkYXRlEAISDQoJV2FpdFJlYWR5EAMSCQoFUGF1c2UQBBIQCgxJ",
"TgoRTG9naW5SZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNfQmFz", "bk9ubGluZUdhbWUQBSpOChFMb2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJl",
"ZURlZmF1bHQQABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnByb3Rv", "c3VsdFN0YXR1c19CYXNlRGVmYXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVy",
"Mw==")); "chACQgJIAWIGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.GamePadType), typeof(global::AxibugProtobuf.RomPlatformType), typeof(global::AxibugProtobuf.RoomGameState), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.GamePadType), typeof(global::AxibugProtobuf.RomPlatformType), typeof(global::AxibugProtobuf.RoomGameState), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] {
@ -416,7 +416,7 @@ namespace AxibugProtobuf {
} }
public enum RomPlatformType { public enum RomPlatformType {
[pbr::OriginalName("All")] All = 0, [pbr::OriginalName("Invalid")] Invalid = 0,
[pbr::OriginalName("Nes")] Nes = 1, [pbr::OriginalName("Nes")] Nes = 1,
[pbr::OriginalName("Master_System")] MasterSystem = 2, [pbr::OriginalName("Master_System")] MasterSystem = 2,
[pbr::OriginalName("Game_Gear")] GameGear = 3, [pbr::OriginalName("Game_Gear")] GameGear = 3,
@ -425,6 +425,7 @@ namespace AxibugProtobuf {
[pbr::OriginalName("Coleco_Vision")] ColecoVision = 6, [pbr::OriginalName("Coleco_Vision")] ColecoVision = 6,
[pbr::OriginalName("SC_3000")] Sc3000 = 7, [pbr::OriginalName("SC_3000")] Sc3000 = 7,
[pbr::OriginalName("SG_1000")] Sg1000 = 8, [pbr::OriginalName("SG_1000")] Sg1000 = 8,
[pbr::OriginalName("All")] All = 999,
} }
public enum RoomGameState { public enum RoomGameState {

21
ProtobufCore/out/CS/ProtobufAxibugEmuOnline.cs
View File

@ -133,15 +133,15 @@ namespace AxibugProtobuf {
"U3dpdGNoSm95Q29uEAcSEgoOWEJPWDM2MENvbnRyb2wQCBISCg5YQk9YT05F", "U3dpdGNoSm95Q29uEAcSEgoOWEJPWDM2MENvbnRyb2wQCBISCg5YQk9YT05F",
"Q29udHJvbBAJEhEKDVBTVml0YUNvbnRyb2wQChISCg5XaWlVUGFkQ29udHJv", "Q29udHJvbBAJEhEKDVBTVml0YUNvbnRyb2wQChISCg5XaWlVUGFkQ29udHJv",
"bBALEhQKEFdpaVJlbW90ZUNvbnRyb2wQDBIWChJOaW50ZW5kbzNEU0NvbnRy", "bBALEhQKEFdpaVJlbW90ZUNvbnRyb2wQDBIWChJOaW50ZW5kbzNEU0NvbnRy",
"b2wQDSqUAQoPUm9tUGxhdGZvcm1UeXBlEgcKA0FsbBAAEgcKA05lcxABEhEK", "b2wQDSqiAQoPUm9tUGxhdGZvcm1UeXBlEgsKB0ludmFsaWQQABIHCgNOZXMQ",
"DU1hc3Rlcl9TeXN0ZW0QAhINCglHYW1lX0dlYXIQAxIMCghHYW1lX0JveRAE", "ARIRCg1NYXN0ZXJfU3lzdGVtEAISDQoJR2FtZV9HZWFyEAMSDAoIR2FtZV9C",
"EhIKDkdhbWVfQm95X0NvbG9yEAUSEQoNQ29sZWNvX1Zpc2lvbhAGEgsKB1ND", "b3kQBBISCg5HYW1lX0JveV9Db2xvchAFEhEKDUNvbGVjb19WaXNpb24QBhIL",
"XzMwMDAQBxILCgdTR18xMDAwEAgqcAoNUm9vbUdhbWVTdGF0ZRISCg5Ob25l", "CgdTQ18zMDAwEAcSCwoHU0dfMTAwMBAIEggKA0FsbBDnBypwCg1Sb29tR2Ft",
"X0dhbWVTdGF0ZRAAEgwKCE9ubHlIb3N0EAESEQoNV2FpdFJhd1VwZGF0ZRAC", "ZVN0YXRlEhIKDk5vbmVfR2FtZVN0YXRlEAASDAoIT25seUhvc3QQARIRCg1X",
"Eg0KCVdhaXRSZWFkeRADEgkKBVBhdXNlEAQSEAoMSW5PbmxpbmVHYW1lEAUq", "YWl0UmF3VXBkYXRlEAISDQoJV2FpdFJlYWR5EAMSCQoFUGF1c2UQBBIQCgxJ",
"TgoRTG9naW5SZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNfQmFz", "bk9ubGluZUdhbWUQBSpOChFMb2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJl",
"ZURlZmF1bHQQABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnByb3Rv", "c3VsdFN0YXR1c19CYXNlRGVmYXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVy",
"Mw==")); "chACQgJIAWIGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.GamePadType), typeof(global::AxibugProtobuf.RomPlatformType), typeof(global::AxibugProtobuf.RoomGameState), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.GamePadType), typeof(global::AxibugProtobuf.RomPlatformType), typeof(global::AxibugProtobuf.RoomGameState), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] {
@ -416,7 +416,7 @@ namespace AxibugProtobuf {
} }
public enum RomPlatformType { public enum RomPlatformType {
[pbr::OriginalName("All")] All = 0, [pbr::OriginalName("Invalid")] Invalid = 0,
[pbr::OriginalName("Nes")] Nes = 1, [pbr::OriginalName("Nes")] Nes = 1,
[pbr::OriginalName("Master_System")] MasterSystem = 2, [pbr::OriginalName("Master_System")] MasterSystem = 2,
[pbr::OriginalName("Game_Gear")] GameGear = 3, [pbr::OriginalName("Game_Gear")] GameGear = 3,
@ -425,6 +425,7 @@ namespace AxibugProtobuf {
[pbr::OriginalName("Coleco_Vision")] ColecoVision = 6, [pbr::OriginalName("Coleco_Vision")] ColecoVision = 6,
[pbr::OriginalName("SC_3000")] Sc3000 = 7, [pbr::OriginalName("SC_3000")] Sc3000 = 7,
[pbr::OriginalName("SG_1000")] Sg1000 = 8, [pbr::OriginalName("SG_1000")] Sg1000 = 8,
[pbr::OriginalName("All")] All = 999,
} }
public enum RoomGameState { public enum RoomGameState {

3
ProtobufCore/proto/protobuf_AxibugEmuOnline.proto
View File

@ -126,7 +126,7 @@ enum GamePadType //手柄类型
enum RomPlatformType enum RomPlatformType
{ {
All = 0; Invalid = 0;
Nes = 1; Nes = 1;
Master_System = 2; Master_System = 2;
Game_Gear = 3; Game_Gear = 3;
@ -135,6 +135,7 @@ enum RomPlatformType
Coleco_Vision = 6; Coleco_Vision = 6;
SC_3000 = 7; SC_3000 = 7;
SG_1000 = 8; SG_1000 = 8;
All = 999;
} }
//enum RoomPlayerState //enum RoomPlayerState