This commit is contained in:
ALIENJACK\alien 2024-08-21 13:02:14 +08:00
commit 4e5fa23425
13 changed files with 3506 additions and 250 deletions

View File

@ -21,7 +21,8 @@ namespace AxibugEmuOnline.Client
{
if (wrapTex == null)
{
wrapTex = new Texture2D(272, 240, TextureFormat.BGRA32, false);
//wrapTex = new Texture2D(272, 240, TextureFormat.BGRA32, false);
wrapTex = new Texture2D(272, 240, TextureFormat.RGBA32, false);
wrapTex.filterMode = FilterMode.Point;
wrapTexBuffer = screenData;
@ -36,7 +37,8 @@ namespace AxibugEmuOnline.Client
TexBufferSize = wrapTexBuffer.Length * 4;
var palRaw = PaletteDefine.m_cnPalette[0];
pPal = new Texture2D(palRaw.Length, 1, TextureFormat.BGRA32, 1, true);
//pPal = new Texture2D(palRaw.Length, 1, TextureFormat.BGRA32, 1, true);
pPal = new Texture2D(palRaw.Length, 1, TextureFormat.RGBA32, false);
pPal.filterMode = FilterMode.Point;
for (int i = 0; i < palRaw.Length; i++)
{

View File

@ -111,7 +111,8 @@
half4 color = tex2D(_MainTex,mapUV);
float rawIndex = color.b;
//float rawIndex = color.b;
float rawIndex = color.r;
color = tex2D(_PalTex,float2(rawIndex,0.5));

View File

@ -9,10 +9,10 @@
<ItemGroup>
<Reference Include="Google.Protobuf">
<HintPath>..\..\Lib\Google.Protobuf.dll</HintPath>
<HintPath>..\Lib\Google.Protobuf.dll</HintPath>
</Reference>
<Reference Include="HaoYueNet.ServerNetwork">
<HintPath>..\..\Lib\HaoYueNet.ServerNetwork.dll</HintPath>
<HintPath>..\Lib\HaoYueNet.ServerNetwork.dll</HintPath>
</Reference>
</ItemGroup>

View File

@ -7,6 +7,7 @@ namespace AxibugEmuOnline.Server
public static class AppSrv
{
public static TickManager g_Tick;
public static ClientManager g_ClientMgr;
public static LogManager g_Log;
public static LoginManager g_Login;
@ -17,6 +18,7 @@ namespace AxibugEmuOnline.Server
public static void InitServer(int port)
{
g_Tick = new TickManager();
g_ClientMgr = new ClientManager();
g_ClientMgr.Init(45000, 120);
g_Log = new LogManager();

View File

@ -1,4 +1,6 @@
using AxibugProtobuf;
using AxibugEmuOnline.Server.Common;
using AxibugEmuOnline.Server.NetWork;
using AxibugProtobuf;
using System.Net.Sockets;
using System.Timers;
@ -12,8 +14,34 @@ namespace AxibugEmuOnline.Server.Manager
public Socket _socket { get; set; }
public bool IsOffline { get; set; } = false;
public DateTime LogOutDT { get; set; }
public DateTime LogInDT { get; set; }
public UserRoomState RoomState { get; set; } = new UserRoomState();
public TimeSpan LastStartPingTime { get; set; }
public int LastPingSeed { get; set; }
public double NetDelay { get; set; }
}
public class UserRoomState
{
public int RoomID { get; private set; }
public int PlayerIdx { get; private set; }
public UserRoomState()
{
ClearRoomData();
}
public void SetRoomData(int roomID,int playerIdx)
{
RoomID = roomID;
PlayerIdx = playerIdx;
}
public void ClearRoomData()
{
RoomID = -1;
PlayerIdx = -1;
}
}
public class ClientManager
@ -23,8 +51,10 @@ namespace AxibugEmuOnline.Server.Manager
private Dictionary<long?, ClientInfo> _DictUIDClient = new Dictionary<long?, ClientInfo>();
private long TestUIDSeed = 0;
private System.Timers.Timer _ClientCheckTimer;
private System.Timers.Timer clientCheckTimer;
private AutoResetEvent pingTickARE;
private long _RemoveOfflineCacheMin;
private Thread threadPingTick;
/// <summary>
/// 初始化并指定检查时间
/// </summary>
@ -32,13 +62,22 @@ namespace AxibugEmuOnline.Server.Manager
/// <param name="RemoveOfflineCache">清理掉线分钟数</param>
public void Init(long ticktime, long RemoveOfflineCacheMin)
{
NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdPing, OnCmdPing);
NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdPong, OnCmdPong);
pingTickARE = AppSrv.g_Tick.AddNewARE(TickManager.TickType.Interval_2000MS);
//换算成毫秒
_RemoveOfflineCacheMin = RemoveOfflineCacheMin;
_ClientCheckTimer = new System.Timers.Timer();
_ClientCheckTimer.Interval = ticktime;
_ClientCheckTimer.AutoReset = true;
_ClientCheckTimer.Elapsed += new ElapsedEventHandler(ClientCheckClearOffline_Elapsed);
_ClientCheckTimer.Enabled = true;
clientCheckTimer = new System.Timers.Timer();
clientCheckTimer.Interval = ticktime;
clientCheckTimer.AutoReset = true;
clientCheckTimer.Elapsed += new ElapsedEventHandler(ClientCheckClearOffline_Elapsed);
clientCheckTimer.Enabled = true;
pingTickARE = AppSrv.g_Tick.AddNewARE(TickManager.TickType.Interval_2000MS);
threadPingTick = new Thread(PingAllLoop);
threadPingTick.Start();
}
public long GetNextUID()
@ -192,11 +231,75 @@ namespace AxibugEmuOnline.Server.Manager
#endregion
#region Ping
void PingAllLoop()
{
while (true)
{
pingTickARE.WaitOne();
AppSrv.g_Log.Info("PingAll");
PingAll();
}
}
void PingAll()
{
List<ClientInfo> clientlist = GetOnlineClientList();
int randSeed = new Random().Next(0, int.MaxValue);
foreach (var _c in clientlist)
{
_c.LastPingSeed = randSeed;
_c.LastStartPingTime = AppSrv.g_Tick.sw.Elapsed;
Protobuf_Ping resp = new Protobuf_Ping()
{
Seed = randSeed,
};
AppSrv.g_ClientMgr.ClientSend(_c._socket, (int)CommandID.CmdPing, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp));
}
}
public void OnCmdPing(Socket sk, byte[] reqData)
{
AppSrv.g_Log.Debug($"OnCmdPing");
ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk);
Protobuf_Ping msg = ProtoBufHelper.DeSerizlize<Protobuf_Ping>(reqData);
//创建成功下行
Protobuf_Pong resp = new Protobuf_Pong()
{
Seed = msg.Seed,
};
AppSrv.g_ClientMgr.ClientSend(_c._socket, (int)CommandID.CmdPong, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp));
}
public void OnCmdPong(Socket sk, byte[] reqData)
{
AppSrv.g_Log.Debug($"OnCmdPong");
ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk);
Protobuf_Pong msg = ProtoBufHelper.DeSerizlize<Protobuf_Pong>(reqData);
if (_c.LastPingSeed == msg.Seed)
{
TimeSpan current = AppSrv.g_Tick.sw.Elapsed;
TimeSpan delta = current - _c.LastStartPingTime;
_c.NetDelay = delta.TotalSeconds;
}
}
#endregion
public void ClientSendALL(int CMDID, int ERRCODE, byte[] data, long SkipUID = -1)
{
ClientSend(ClientList, CMDID, ERRCODE, data, SkipUID);
}
public void ClientSend(List<long> UIDs,int CMDID, int ERRCODE, byte[] data, long SkipUID = -1)
{
for (int i = 0; i < UIDs.Count(); i++)
{
if (!GetClientByUID(UIDs[i], out ClientInfo _c, true))
continue;
AppSrv.g_SocketMgr.SendToSocket(_c._socket, CMDID, ERRCODE, data);
}
}
/// <summary>
/// 给一组用户发送数据
/// </summary>

View File

@ -2,7 +2,6 @@
using AxibugEmuOnline.Server.Manager;
using AxibugEmuOnline.Server.NetWork;
using AxibugProtobuf;
using System.Net;
using System.Net.Sockets;
namespace AxibugEmuOnline.Server

View File

@ -26,7 +26,6 @@ namespace AxibugEmuOnline.Server.Manager
Token = "",
UID = cinfo.UID
});
}
}
}

View File

@ -2,9 +2,10 @@
using AxibugEmuOnline.Server.Manager;
using AxibugEmuOnline.Server.NetWork;
using AxibugProtobuf;
using System.Net;
using System;
using System.Net.Sockets;
using static System.Runtime.InteropServices.JavaScript.JSType;
using System.Runtime.InteropServices;
using System.Xml;
namespace AxibugEmuOnline.Server
{
@ -12,14 +13,22 @@ namespace AxibugEmuOnline.Server
public class RoomManager
{
Dictionary<int, Data_RoomData> mDictRoom = new Dictionary<int, Data_RoomData>();
List<int> mKeyRoomList = new List<int>();
AutoResetEvent roomTickARE;
Thread threadRoomTick;
int RoomIDSeed = 1;
public RoomManager()
{
NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdRoomList, OnCmdRoomList);
NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdRoomCreate, OnCmdRoomCreate);
NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdRoomJoin, OnCmdRoomJoin);
NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdRoomLeave, OnCmdRoomLeave);
NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdRoomSingelPlayerInput, OnSingelPlayerInput);
roomTickARE = AppSrv.g_Tick.AddNewARE(TickManager.TickType.Interval_16MS);
threadRoomTick = new Thread(UpdateLoopTick);
threadRoomTick.Start();
}
#region
@ -31,32 +40,33 @@ namespace AxibugEmuOnline.Server
void AddRoom(Data_RoomData data)
{
lock (mDictRoom)
lock (mDictRoom)
{
if (!mDictRoom.ContainsKey(data.RoomID))
{
mDictRoom.Add(data.RoomID, data);
mKeyRoomList.Remove(data.RoomID);
}
}
}
void RemoveRoom(int RoomID)
void RemoveRoom(int RoomID)
{
lock(mDictRoom)
lock (mDictRoom)
{
if (mDictRoom.ContainsKey(RoomID))
{
mDictRoom.Remove(RoomID);
mKeyRoomList.Remove(RoomID);
}
}
}
public Data_RoomData GetRoomData(int RoomID)
public Data_RoomData GetRoomData(int RoomID)
{
if (!mDictRoom.ContainsKey(RoomID))
if (!mDictRoom.TryGetValue(RoomID,out Data_RoomData data))
return null;
return mDictRoom[RoomID];
return data;
}
List<Data_RoomData> GetRoomList()
@ -105,7 +115,7 @@ namespace AxibugEmuOnline.Server
Protobuf_Room_List_RESP resp = new Protobuf_Room_List_RESP();
List<Data_RoomData> temp = GetRoomList();
foreach (var room in temp)
foreach (var room in temp)
resp.RoomMiniInfoList.Add(GetProtoDataRoom(room));
AppSrv.g_ClientMgr.ClientSend(_c, (int)CommandID.CmdChatmsg, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp));
}
@ -115,7 +125,7 @@ namespace AxibugEmuOnline.Server
/// </summary>
/// <param name="RoomID"></param>
/// <param name="type">//[0] 更新或新增 [1] 删除</param>
public void SendRoomUpdateToAll(int RoomID,int type)
public void SendRoomUpdateToAll(int RoomID, int type)
{
Data_RoomData room = GetRoomData(RoomID);
if (room == null)
@ -129,7 +139,7 @@ namespace AxibugEmuOnline.Server
AppSrv.g_ClientMgr.ClientSendALL((int)CommandID.CmdRoomListUpdate, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp));
}
public void OnCmdRoomCreate(Socket sk, byte[] reqData)
{
AppSrv.g_Log.Debug($"OnCmdRoomCreate ");
@ -137,7 +147,7 @@ namespace AxibugEmuOnline.Server
Protobuf_Room_Create msg = ProtoBufHelper.DeSerizlize<Protobuf_Room_Create>(reqData);
Data_RoomData newRoom = new Data_RoomData();
newRoom.Init(GetNewRoomID(), msg.GameRomID,msg.GameRomHash);
newRoom.Init(GetNewRoomID(), msg.GameRomID, msg.GameRomHash);
AddRoom(newRoom);
@ -203,6 +213,16 @@ namespace AxibugEmuOnline.Server
AppSrv.g_ClientMgr.ClientSend(_c, (int)CommandID.CmdRoomLeave, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp));
Protobuf_Room_MyRoom_State_Change(msg.RoomID);
}
public void OnSingelPlayerInput(Socket sk, byte[] reqData)
{
ClientInfo _c = AppSrv.g_ClientMgr.GetClientForSocket(sk);
Protobuf_Room_SinglePlayerInputData msg = ProtoBufHelper.DeSerizlize<Protobuf_Room_SinglePlayerInputData>(reqData);
Data_RoomData room = GetRoomData(_c.RoomState.RoomID);
if (room == null)
return;
room.SetPlayerInput(_c.RoomState.PlayerIdx, msg.FrameID, (ushort)msg.InputData);
}
/// <summary>
/// 广播房间状态变化
@ -221,9 +241,9 @@ namespace AxibugEmuOnline.Server
List<ClientInfo> userlist = room.GetAllPlayerClientList();
foreach(ClientInfo _c in userlist)
foreach (ClientInfo _c in userlist)
{
AppSrv.g_ClientMgr.ClientSend(_c,(int)CommandID.CmdRoomMyRoomStateChanged, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp));
AppSrv.g_ClientMgr.ClientSend(_c, (int)CommandID.CmdRoomMyRoomStateChanged, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp));
}
}
@ -236,7 +256,7 @@ namespace AxibugEmuOnline.Server
/// <param name="_c"></param>
/// <param name="errcode"></param>
/// <returns></returns>
bool Join(int RoomID,int PlayerNum,ClientInfo _c,out ErrorCode errcode)
bool Join(int RoomID, int PlayerNum, ClientInfo _c, out ErrorCode errcode)
{
Data_RoomData room = GetRoomData(RoomID);
if (room == null)
@ -252,7 +272,7 @@ namespace AxibugEmuOnline.Server
errcode = ErrorCode.ErrorRoomSlotReadlyHadPlayer;
return false;
}
room.Player1_UID = _c.UID;
room.SetPlayerUID(0,_c);
}
//其他玩家
else
@ -262,7 +282,7 @@ namespace AxibugEmuOnline.Server
errcode = ErrorCode.ErrorRoomSlotReadlyHadPlayer;
return false;
}
room.Player2_UID = _c.UID;
room.SetPlayerUID(1, _c);
}
//广播房间
@ -287,10 +307,7 @@ namespace AxibugEmuOnline.Server
return false;
}
if (room.Player1_UID == _c.UID)
room.Player1_UID = -1;
if (room.Player2_UID == _c.UID)
room.Player2_UID = -1;
room.RemovePlayer(_c);
if (room.PlayerState == RoomPlayerState.NonePlayerState)
{
@ -306,26 +323,108 @@ namespace AxibugEmuOnline.Server
return true;
}
#endregion
#region
void UpdateLoopTick()
{
while (true)
{
roomTickARE.WaitOne();
UpdateAllRoomLogic();
}
}
void UpdateAllRoomLogic()
{
for (int i = 0; i < mKeyRoomList.Count; i++)
{
int roomid = mKeyRoomList[i];
if (!mDictRoom.TryGetValue(roomid,out Data_RoomData room))
continue;
if (room.GameState > RoomGameState.InGame)
continue;
//更新帧
room.TakeFrame();
//广播
room.SynInputData();
}
}
#endregion
}
public class Data_RoomData
{
public int RoomID;
public int GameRomID;
public string RomHash;
public long Player1_UID;
public long Player2_UID;
public int RoomID { get; private set; }
public int GameRomID { get; private set; }
public string RomHash { get; private set; }
public bool bNeedLoadState { get; private set; }
public int LoadStateFrame { get; private set; }
public Google.Protobuf.ByteString LoadStateRaw { get; set; }
public long Player1_UID { get; private set; }
public long Player2_UID { get; private set; }
public long Player3_UID { get; private set; }
public long Player4_UID { get; private set; }
public bool[] PlayerReadyState { get; private set; }
public List<long> SynUIDs;
public RoomPlayerState PlayerState => getPlayerState();
public RoomGameState GameState;
public uint mCurrFrameId = 0;
public ServerInputSnapShot mCurrInputData;
public Queue<(uint, ServerInputSnapShot)> mInputQueue;
//TODO
public Dictionary<int, Queue<byte[]>> mDictPlayerIdx2SendQueue;
public void Init(int roomID,int gameRomID,string roomHash)
public void Init(int roomID, int gameRomID, string roomHash, bool bloadState = false)
{
RoomID = roomID;
GameRomID = gameRomID;
RomHash = roomHash;
Player1_UID = -1;
Player2_UID = -1;
Player3_UID = -1;
Player4_UID = -1;
SynUIDs = new List<long>();//广播角色列表
GameState = RoomGameState.NoneGameState;
mCurrInputData = new ServerInputSnapShot();
mInputQueue = new Queue<(uint, ServerInputSnapShot)>();
}
public void SetPlayerUID(int PlayerIdx,ClientInfo _c)
{
long oldUID = -1;
switch (PlayerIdx)
{
case 0: oldUID = Player1_UID; Player1_UID = _c.UID; break;
case 1: oldUID = Player2_UID; Player2_UID = _c.UID; break;
case 2: oldUID = Player3_UID; Player3_UID = _c.UID; break;
case 3: oldUID = Player4_UID; Player4_UID = _c.UID; break;
}
if(oldUID <= 0)
SynUIDs.Remove(oldUID);
SynUIDs.Add(_c.UID);
_c.RoomState.SetRoomData(this.RoomID, PlayerIdx);
}
public void RemovePlayer(ClientInfo _c)
{
int PlayerIdx = GetPlayerIdx(_c);
switch (PlayerIdx)
{
case 0: Player1_UID = -1; SynUIDs.Remove(_c.UID);break;
case 1: Player2_UID = -1; SynUIDs.Remove(_c.UID);break;
case 2: Player3_UID = -1; SynUIDs.Remove(_c.UID);break;
case 3: Player4_UID = -1; SynUIDs.Remove(_c.UID);break;
}
_c.RoomState.ClearRoomData();
}
int GetPlayerIdx(ClientInfo _c)
{
if (Player1_UID == _c.UID) return 0;
if (Player2_UID == _c.UID) return 1;
if (Player3_UID == _c.UID) return 2;
if (Player4_UID == _c.UID) return 3;
return -1;
}
RoomPlayerState getPlayerState()
@ -358,7 +457,7 @@ namespace AxibugEmuOnline.Server
foreach (long uid in Uids)
{
if (!AppSrv.g_ClientMgr.GetClientByUID(uid, out ClientInfo _c,true))
if (!AppSrv.g_ClientMgr.GetClientByUID(uid, out ClientInfo _c, true))
continue;
list.Add(_c);
@ -366,5 +465,65 @@ namespace AxibugEmuOnline.Server
return list;
}
public void SetPlayerInput(int PlayerIdx,long mFrameID,ushort input)
{
switch (PlayerIdx)
{
case 0: mCurrInputData.p1 = input; break;
case 1: mCurrInputData.p2 = input; break;
case 2: mCurrInputData.p3 = input; break;
case 3: mCurrInputData.p4 = input; break;
}
}
public void ClearPlayerInput(int PlayerIdx)
{
switch (PlayerIdx)
{
case 0: mCurrInputData.p1 = 0; break;
case 1: mCurrInputData.p2 = 0; break;
case 2: mCurrInputData.p3 = 0; break;
case 3: mCurrInputData.p4 = 0; break;
}
}
public void TakeFrame()
{
mInputQueue.Enqueue((mCurrFrameId, mCurrInputData));
mCurrFrameId++;
}
/// <summary>
/// 广播数据
/// </summary>
public void SynInputData()
{
while (mInputQueue.Count > 0)
{
(uint frameId, ServerInputSnapShot inputdata) data = mInputQueue.Dequeue();
Protobuf_Room_Syn_RoomFrameAllInput resp = new Protobuf_Room_Syn_RoomFrameAllInput()
{
FrameID = data.frameId,
InputData = data.inputdata.all
};
AppSrv.g_ClientMgr.ClientSendALL((int)CommandID.CmdRoomSyn, (int)ErrorCode.ErrorOk, ProtoBufHelper.Serizlize(resp));
}
}
}
[StructLayout(LayoutKind.Explicit)]
public struct ServerInputSnapShot
{
[FieldOffset(0)]
public UInt64 all;
[FieldOffset(0)]
public ushort p1;
[FieldOffset(2)]
public ushort p2;
[FieldOffset(4)]
public ushort p3;
[FieldOffset(6)]
public ushort p4;
}
}

View File

@ -0,0 +1,72 @@
using System.Diagnostics;
namespace AxibugEmuOnline.Server.Manager
{
public class TickManager
{
public Stopwatch sw;
public enum TickType
{
Interval_16MS,
Interval_32MS,
Interval_2000MS,
}
System.Timers.Timer mTimer16ms;
System.Timers.Timer mTimer32ms;
System.Timers.Timer mTimer2000ms;
List<AutoResetEvent> mAREList16ms;
List<AutoResetEvent> mAREList32ms;
List<AutoResetEvent> mAREList2000ms;
public TickManager()
{
sw = Stopwatch.StartNew();
mAREList16ms = new List<AutoResetEvent>();
mAREList32ms = new List<AutoResetEvent>();
mAREList2000ms = new List<AutoResetEvent>();
mTimer16ms = new System.Timers.Timer(16);//实例化Timer类设置间隔时间为10000毫秒
mTimer16ms.Elapsed += new System.Timers.ElapsedEventHandler((source, e) => { UpdateARE(mAREList16ms); });//到达时间的时候执行事件;
mTimer16ms.AutoReset = true;//设置是执行一次false还是一直执行(true)
mTimer16ms.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件
mTimer16ms.Start();
mTimer32ms = new System.Timers.Timer(32);//实例化Timer类设置间隔时间为10000毫秒
mTimer32ms.Elapsed += new System.Timers.ElapsedEventHandler((source, e) => { UpdateARE(mAREList32ms); });//到达时间的时候执行事件;
mTimer32ms.AutoReset = true;//设置是执行一次false还是一直执行(true)
mTimer32ms.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件
mTimer32ms.Start();
mTimer2000ms = new System.Timers.Timer(2000);//实例化Timer类设置间隔时间为10000毫秒
mTimer2000ms.Elapsed += new System.Timers.ElapsedEventHandler((source, e) => { UpdateARE(mAREList2000ms); });//到达时间的时候执行事件;
mTimer2000ms.AutoReset = true;//设置是执行一次false还是一直执行(true)
mTimer2000ms.Enabled = true;//是否执行System.Timers.Timer.Elapsed事件
mTimer2000ms.Start();
}
public AutoResetEvent AddNewARE(TickType tikeType)
{
AutoResetEvent are = new AutoResetEvent(false);
switch (tikeType)
{
case TickType.Interval_16MS:
mAREList16ms.Add(are);
break;
case TickType.Interval_32MS:
mAREList32ms.Add(are);
break;
case TickType.Interval_2000MS:
mAREList2000ms.Add(are);
break;
}
return are;
}
public void UpdateARE(List<AutoResetEvent> are)
{
for (int i = 0; i < are.Count; i++)
are[i].Set();
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -12,5 +12,5 @@ for /f "delims=" %%i in ('dir /b proto "proto/*.proto"') do (
echo "==>>build finish"
echo "==>>copy cs"
copy %cd%\out\CS\ ..\AxibugEmuOnline.Server\AxibugEmuOnline.Server\Protobuf
copy %cd%\out\CS\ ..\AxibugEmuOnline.Server\Protobuf
pause

File diff suppressed because it is too large Load Diff

View File

@ -6,26 +6,54 @@ enum CommandID
{
CMD_DEFAUL = 0;//使
//ping请求 ->->->->
CMD_PING = 1; //Ping | Protobuf_Ping
CMD_PONG = 2; //Pong | Protobuf_Pong
CMD_LOGIN = 2001; // | Protobuf_Login | Protobuf_Login_RESP
CMD_CHATMSG = 4001; //广 | Protobuf_ChatMsg | Protobuf_ChatMsg_RESP
//
//
CMD_Room_List = 5001; // | Protobuf_Room_List | Protobuf_Room_List_RESP
CMD_Room_List_Update = 5002; // Protobuf_Room_Update_RESP
//
CMD_Room_Create = 5101; // Protobuf_Room_Create | Protobuf_Room_Create_RESP
CMD_Room_Create = 5101; // Protobuf_Room_Create | Protobuf_Room_Create_RESP
CMD_Room_Join = 5105; // Protobuf_Room_Join | Protobuf_Room_Join_RESP
CMD_Room_Leave = 5106; // Protobuf_Room_Leave | Protobuf_Room_Leave_RESP
CMD_Room_MyRoom_State_Changed = 5110; // Protobuf_Room_MyRoom_State_Change
CMD_Room_Join = 5105; // Protobuf_Room_Join | Protobuf_Room_Join_RESP
CMD_Room_Leave = 5106; // Protobuf_Room_Leave | Protobuf_Room_Leave_RESP
CMD_Room_MyRoom_State_Changed = 5110; // Protobuf_Room_MyRoom_State_Change;
//5201 ~ 5204 ~ 5208
//
//
//
//
//
// Step0广"等待-主机上报即使存档" CMD_Room_WaitStep WaitStep=[0] ---> )
// CMD_Room_HostPlayer_UpdateStateRaw消息
// Step1
//
// Step1广"等待-全员加载即时存档" CMD_Room_WaitStep WaitStep=[1] ---> )
// ROM和即时存档 CMD_Room_Player_Ready
// Ready之后FrameStep2
//
// Step2广"开始" CMD_Room_WaitStep WaitStep=[2] --->
//
//
// PS[] CMD_Room_HostPlayer_UpdateStateRaw
// Step1走流程
//
CMD_Room_WaitStep = 5201; //Step通知 Protobuf_Room_WaitStep_RESP
CMD_Room_HostPlayer_UpdateStateRaw = 5204; // Protobuf_Room_HostPlayer_UpdateStateRaw
CMD_Room_Player_Ready = 5208; // Protobuf_Room_Player_Ready
//
CMD_Screen = 6001; // | 广 Protobuf_Screnn_Frame
CMD_Room_Singel_PlayerInput = 6010; // Protobuf_Room_SinglePlayerInputData
CMD_ROOM_SYN = 6015; // Protobuf_Room_Syn_RoomFrameAllInput
//
CMD_Screen = 7001; // | 广 Protobuf_Screnn_Frame
}
enum ErrorCode
@ -62,8 +90,12 @@ enum RoomPlayerState
enum RoomGameState
{
None_GameState = 0;//
InGame = 1;//
Pause = 2;//
OnlyHost = 1;//
ReadyStep_0 = 2;//ReadyStep0
ReadyStep_1 = 3;//ReadyStep1
ReadyStep_2 = 4;//ReadyStep2
Pause = 5;//
InGame = 6;//
}
@ -88,6 +120,15 @@ message Protobuf_ChatMsg_RESP
int64 Date = 3;//
}
message Protobuf_Ping
{
int32 Seed = 1;//
}
message Protobuf_Pong
{
int32 Seed = 1;//
}
//
message Protobuf_Login
@ -101,14 +142,14 @@ message Protobuf_Login
//
message Protobuf_Login_RESP
{
string Token = 1;//
string LastLoginDate = 2;//
string RegDate = 3;//
LoginResultStatus Status = 4;// [1][0]
int64 UID = 5;
string DeviceUUID = 1;//
string Token = 2;//
string LastLoginDate = 3;//
string RegDate = 4;//
LoginResultStatus Status = 5;// [1][0]
int64 UID = 6;
}
message Protobuf_Room_List
{
@ -146,6 +187,18 @@ message Protobuf_Screnn_Frame
bytes RawBitmap = 3;//
}
message Protobuf_Room_SinglePlayerInputData
{
uint32 FrameID = 1;//
uint32 InputData = 2;//
}
message Protobuf_Room_Syn_RoomFrameAllInput
{
uint32 FrameID = 1;//
uint64 InputData = 2;//
}
message Protobuf_Room_Create
{
int32 GameRomID = 1;
@ -181,4 +234,20 @@ message Protobuf_Room_Leave_RESP
message Protobuf_Room_MyRoom_State_Change
{
Protobuf_Room_MiniInfo RoomMiniInfo = 1;//
}
message Protobuf_Room_WaitStep_RESP
{
int32 WaitStep = 1;// [0] [1] [2]
}
message Protobuf_Room_HostPlayer_UpdateStateRaw
{
int32 ReadyFrame = 1;// (0
bytes LoadStateRaw = 2;//byte数据
}
message Protobuf_Room_Player_Ready
{
}