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

Compare commits

base: sin365:f04c7e543d00daec3799d7c1cbc0c89101815c2f
Branches Tags
sin365:master
sin365:dev_mame_timercount
sin365:dev_audiomix
sin365:psv_VirtualNes.Core归档
sin365:bak_AlphaFristLove
sin365:dev_beforeShader
sin365:dev_4VirtualNes
sin365:dev_basemynes
sin365:bak_baseOnEmulator.NES
sin365:beforinputsystem
..
compare: sin365:54516d9482d1a568d0d7625f490ce6e7c31153dd
Branches Tags
sin365:master
sin365:dev_mame_timercount
sin365:dev_audiomix
sin365:psv_VirtualNes.Core归档
sin365:bak_AlphaFristLove
sin365:dev_beforeShader
sin365:dev_4VirtualNes
sin365:dev_basemynes
sin365:bak_baseOnEmulator.NES
sin365:beforinputsystem

No commits in common. "f04c7e543d00daec3799d7c1cbc0c89101815c2f" and "54516d9482d1a568d0d7625f490ce6e7c31153dd" have entirely different histories.
f04c7e543d ... 54516d9482

1 changed files with 5 additions and 31 deletions
Show Stats Expand all files Collapse all files

36
AxibugEmuOnline.Server/Manager/RoomManager.cs
View File

@ -707,13 +707,13 @@ namespace AxibugEmuOnline.Server
} }
} }
public bool GetSlotDataByUID(long uid, out Dictionary<uint, uint> slotIdx2JoyIdx) public Dictionary<uint, uint> GetSlotDataByUID(long uid)
{ {
slotIdx2JoyIdx = new Dictionary<uint, uint>(); Dictionary<uint, uint> slotIdx2JoyIdx = new Dictionary<uint, uint>();
var dataarr = PlayerSlot.Where(w => w.UID == uid).ToArray(); var dataarr = PlayerSlot.Where(w => w.UID == uid).ToArray();
foreach (var slot in dataarr) foreach (var slot in dataarr)
slotIdx2JoyIdx[slot.SlotIdx] = slot.LocalJoyIdx; slotIdx2JoyIdx[slot.SlotIdx] = slot.LocalJoyIdx;
return slotIdx2JoyIdx.Count > 0; return slotIdx2JoyIdx;
} }
/// <summary> /// <summary>
/// 按照SlotIdx设置Input /// 按照SlotIdx设置Input
@ -738,7 +738,7 @@ namespace AxibugEmuOnline.Server
var dataarr = PlayerSlot.Where(w => w.UID == uid).ToArray(); var dataarr = PlayerSlot.Where(w => w.UID == uid).ToArray();
foreach (var slot in dataarr) foreach (var slot in dataarr)
{ {
slot.Init(slot.SlotIdx); dataarr[slot.SlotIdx].Init(slot.SlotIdx);
ClearInputDataBySlotIdx(slot.SlotIdx); ClearInputDataBySlotIdx(slot.SlotIdx);
} }
} }
@ -832,7 +832,7 @@ namespace AxibugEmuOnline.Server
public void SetPlayerSlotData(ClientInfo _c, ref readonly Dictionary<uint, uint> newSlotIdx2JoyIdx) public void SetPlayerSlotData(ClientInfo _c, ref readonly Dictionary<uint, uint> newSlotIdx2JoyIdx)
{ {
GetSlotDataByUID(_c.UID, out Dictionary<uint, uint> oldSlotIdx2JoyIdx); Dictionary<uint, uint> oldSlotIdx2JoyIdx = GetSlotDataByUID(_c.UID);
HashSet<uint> diffSlotIdxs = ObjectPoolAuto.AcquireSet<uint>();// new HashSet<uint>(); HashSet<uint> diffSlotIdxs = ObjectPoolAuto.AcquireSet<uint>();// new HashSet<uint>();
foreach (var old in oldSlotIdx2JoyIdx) foreach (var old in oldSlotIdx2JoyIdx)
{ {
@ -1132,32 +1132,6 @@ namespace AxibugEmuOnline.Server
} }
break; break;
} }
//房主离线,自动选择延迟最低另一名玩家做房主
if (!GetSlotDataByUID(this.HostUID, out Dictionary<uint, uint> slotIdx2JoyIdx))
{
List<ClientInfo> userlist = ObjectPoolAuto.AcquireList<ClientInfo>();
GetAllPlayerClientList(ref userlist);
if (userlist.Count > 0)
{
ClientInfo? client = userlist.OrderBy(w => w.AveNetDelay).FirstOrDefault();
this.HostUID = client.UID;
AppSrv.g_Log.DebugCmd($"更换房主为{this.HostUID}");
bChanged = true;
}
ObjectPoolAuto.Release(userlist);
}
if (this.GameState > RoomGameState.OnlyHost && newPlayerCount == 1)
{
this.GameState = RoomGameState.OnlyHost;
AppSrv.g_Log.DebugCmd("回到OnlyHost状态");
bChanged = true;
}
return bChanged; return bChanged;
} }