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.Network;
using AxibugProtobuf;
using System;
using System.Collections;
using System.IO;
@ -64,7 +65,7 @@ namespace AxibugEmuOnline.Client.ClientCore
emu = new AppEmu();
//netgame = new AppNetGame();
httpAPI = new HttpAPI();
nesRomLib = new RomLib(EnumSupportEmuPlatform.NES);
nesRomLib = new RomLib(RomPlatformType.Nes);
CacheMgr = new CacheManager();
roomMgr = new AppRoom();
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
{
@ -17,7 +18,7 @@ namespace AxibugEmuOnline.Client
void DoReset();
IControllerSetuper GetControllerSetuper();
EnumSupportEmuPlatform Platform { get; }
RomPlatformType Platform { 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.Event;
using AxibugProtobuf;
using UnityEngine;
namespace AxibugEmuOnline.Client.Manager
@ -31,7 +32,7 @@ namespace AxibugEmuOnline.Client.Manager
if (!m_emuCore.IsNull()) StopGame();
var roomInfo = App.roomMgr.mineRoomMiniInfo;
roomInfo.FetchRomFileInRoomInfo(EnumSupportEmuPlatform.NES, (_, romFile) =>
roomInfo.FetchRomFileInRoomInfo(RomPlatformType.Nes, (_, romFile) =>
{
if (!romFile.RomReady) //这个rom并没有下载,所以取消进入房间
{
@ -51,7 +52,7 @@ namespace AxibugEmuOnline.Client.Manager
switch (romFile.Platform)
{
case EnumSupportEmuPlatform.NES:
case RomPlatformType.Nes:
m_emuCore = GameObject.Instantiate(Resources.Load<GameObject>("NES/NesEmulator")).GetComponent<IEmuCore>();
break;
}

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

@ -1,4 +1,5 @@
using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using System;
using System.Collections.Generic;
using System.Linq;
@ -12,7 +13,7 @@ namespace AxibugEmuOnline.Client
public class FilterManager
{
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;
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;
namespace AxibugEmuOnline.Client
@ -22,7 +23,7 @@ namespace AxibugEmuOnline.Client
/// </summary>
/// <param name="platform"></param>
/// <returns></returns>
public EnumScalerMode GetMode(EnumSupportEmuPlatform platform)
public EnumScalerMode GetMode(RomPlatformType platform)
{
int setVal = PlayerPrefs.GetInt($"{nameof(ScreenScaler)}.PlatMode.{platform}", -1);
if (setVal == -1)
@ -36,10 +37,10 @@ namespace AxibugEmuOnline.Client
/// </summary>
/// <param name="m_rawImg"></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 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;
switch (targetMode)
{
@ -88,11 +89,11 @@ namespace AxibugEmuOnline.Client
}
}
public Vector2Int GetRawResolution(EnumSupportEmuPlatform platform)
public Vector2Int GetRawResolution(RomPlatformType 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);
}
}

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 AxibugProtobuf;
using ICSharpCode.SharpZipLib.Zip;
using System;
using System.Collections;
using System.IO;
using UnityEngine;
using UnityEngine.Networking;
using static UnityEngine.EventSystems.EventTrigger;
namespace AxibugEmuOnline.Client
{
@ -13,7 +12,6 @@ namespace AxibugEmuOnline.Client
{
private HttpAPI.Resp_RomInfo webData;
private bool hasLocalFile;
private EnumSupportEmuPlatform platform;
//private UnityWebRequest downloadRequest;
private AxiHttpProxy.SendDownLoadProxy downloadRequest;
@ -22,8 +20,8 @@ namespace AxibugEmuOnline.Client
/// <summary> 指示该Rom文件的存放路径 </summary>
public string LocalFilePath =>
IsUserRom ?
$"{App.PersistentDataPath}/UserRoms/{platform}/{FileName}" :
$"{App.PersistentDataPath}/RemoteRoms/{platform}/{FileName}";
$"{App.PersistentDataPath}/UserRoms/{Platform}/{FileName}" :
$"{App.PersistentDataPath}/RemoteRoms/{Platform}/{FileName}";
/// <summary> 指示该Rom文件是否已下载完毕 </summary>
public bool RomReady => hasLocalFile;
@ -36,7 +34,7 @@ namespace AxibugEmuOnline.Client
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>
public bool InfoReady => webData != null;
/// <summary> 唯一标识 </summary>
@ -61,9 +59,8 @@ namespace AxibugEmuOnline.Client
public event Action<RomFile> OnDownloadOver;
public event Action OnInfoFilled;
public RomFile(EnumSupportEmuPlatform platform, int index, int insidePage)
public RomFile(int index, int insidePage)
{
this.platform = platform;
Index = index;
Page = insidePage;
}
@ -181,14 +178,5 @@ namespace AxibugEmuOnline.Client
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.Common;
using AxibugProtobuf;
using System;
using System.Collections.Generic;
using System.IO;
@ -19,30 +20,21 @@ namespace AxibugEmuOnline.Client
private Dictionary<string, RomFile> nesRomFileNameMapper = new Dictionary<string, RomFile>();
private HttpAPI.GetRomListAPI m_romGetFunc;
private HttpAPI.SearchRomListAPI m_romSearchFunc;
private EnumSupportEmuPlatform m_platform;
private RomPlatformType m_platform;
private string lastSearchKey;
public RomLib(EnumSupportEmuPlatform platform)
public RomLib(RomPlatformType platform)
{
m_platform = platform;
switch (platform)
{
case EnumSupportEmuPlatform.NES:
case RomPlatformType.Nes:
m_romGetFunc = App.httpAPI.GetNesRomList;
m_romSearchFunc = App.httpAPI.SearchNesRomList;
break;
}
}
public RomFile GetExistRom(string fileName)
{
var res = RomFile.CreateExistRom(m_platform, fileName);
nesRomFileNameMapper[res.FileName] = res;
return res;
}
public RomFile GetRomFile(string romFileName)
{
RomFile romFile;
@ -89,15 +81,12 @@ namespace AxibugEmuOnline.Client
for (int i = 0; i < nesRomFetchList.Length; i++)
{
//以后考虑用对象池实例化RomFile
nesRomFetchList[i] = new RomFile(m_platform, i, i / PAGE_SIZE);
nesRomFetchList[i] = new RomFile(i, i / PAGE_SIZE);
}
SaveRomInfoFromWeb(romList);
callback.Invoke(nesRomFetchList);
},
//TODO 平台参数
AxibugProtobuf.RomPlatformType.Nes
, 0, PAGE_SIZE);
}, m_platform, 0, PAGE_SIZE);
}
else
{
@ -115,15 +104,12 @@ namespace AxibugEmuOnline.Client
for (int i = 0; i < nesRomFetchList.Length; i++)
{
//以后考虑用对象池实例化RomFile
nesRomFetchList[i] = new RomFile(m_platform, i, i / PAGE_SIZE);
nesRomFetchList[i] = new RomFile(i, i / PAGE_SIZE);
}
SaveRomInfoFromWeb(romList);
callback.Invoke(nesRomFetchList);
},
//TODO 平台参数
AxibugProtobuf.RomPlatformType.Nes
, searchKey, 0, PAGE_SIZE);
}, m_platform, 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.Xml.Linq;
using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using UnityEditor;
using UnityEngine;
using VirtualNes.Core;
@ -58,7 +59,7 @@ namespace AxibugEmuOnline.Client
VideoProvider.ApplyFilterEffect();
}
public EnumSupportEmuPlatform Platform => EnumSupportEmuPlatform.NES;
public RomPlatformType Platform => RomPlatformType.Nes;
private CoreSupporter m_coreSupporter;
/// <summary>
/// 指定ROM开始游戏

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

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

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

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

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

@ -1,4 +1,5 @@
using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using System;
using System.Collections.Generic;
using UnityEngine;
@ -8,7 +9,7 @@ namespace AxibugEmuOnline.Client
public class RomListMenuItem : VirtualSubMenuItem
{
[SerializeField]
protected EnumSupportEmuPlatform Platform;
protected RomPlatformType Platform;
private RomLib RomLib
{
@ -16,7 +17,7 @@ namespace AxibugEmuOnline.Client
{
switch (Platform)
{
case EnumSupportEmuPlatform.NES:
case RomPlatformType.Nes:
return App.nesRomLib;
default:
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}");
SetIcon(null);
roomInfo.FetchRomFileInRoomInfo(EnumSupportEmuPlatform.NES, (room, romFile) =>
roomInfo.FetchRomFileInRoomInfo(RomPlatformType.Nes, (room, romFile) =>
{
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>();
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;
@ -45,10 +45,10 @@ namespace AxibugEmuOnline.Client
}
switch (platform)
{
case EnumSupportEmuPlatform.NES:
case RomPlatformType.Nes:
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);
s_RomFileCahcesInRoomInfo[roomInfo.GameRomID] = _romFile;

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

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

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

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

3
ProtobufCore/proto/protobuf_AxibugEmuOnline.proto
View File

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