|
@@ -109,10 +109,25 @@ namespace BattleRoom
|
|
callbacks.Add(eProtocalCommand.CsBtStatus, On_BtStatus);
|
|
callbacks.Add(eProtocalCommand.CsBtStatus, On_BtStatus);
|
|
callbacks.Add(eProtocalCommand.CsBtPosition, On_BtPosition);
|
|
callbacks.Add(eProtocalCommand.CsBtPosition, On_BtPosition);
|
|
callbacks.Add(eProtocalCommand.CsBtBroadCast, On_BtBroadCast);
|
|
callbacks.Add(eProtocalCommand.CsBtBroadCast, On_BtBroadCast);
|
|
|
|
+ callbacks.Add(eProtocalCommand.CsBtPeopleList, On_PeopleList);
|
|
var t = Task.Run(MsgLoop);
|
|
var t = Task.Run(MsgLoop);
|
|
Open();
|
|
Open();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ void On_PeopleList(int peerId, sSocketData data)
|
|
|
|
+ {
|
|
|
|
+ var msg = CS_BT_PeopleList.Parser.ParseFrom(data._data);
|
|
|
|
+ if (ClientPeers.TryGetValue(peerId, out var peer))
|
|
|
|
+ {
|
|
|
|
+ Console.WriteLine($"{msg.Uid} 在请求队友列表.");
|
|
|
|
+ var info = new SC_BT_PeopleList() { NewerUid = "", Zoneid = msg.Zoneid };
|
|
|
|
+ info.PlayerUids.AddRange(PlayerUids);
|
|
|
|
+ peer.SendEvent(eProtocalCommand.ScBtPeopleList, info);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
void On_BtStatus(int peerId, sSocketData data)
|
|
void On_BtStatus(int peerId, sSocketData data)
|
|
{
|
|
{
|
|
var msg = CS_BT_Status.Parser.ParseFrom(data._data);
|
|
var msg = CS_BT_Status.Parser.ParseFrom(data._data);
|
|
@@ -136,7 +151,7 @@ namespace BattleRoom
|
|
var msg = CS_BT_BroadCast.Parser.ParseFrom(data._data);
|
|
var msg = CS_BT_BroadCast.Parser.ParseFrom(data._data);
|
|
if (ClientPeers.TryGetValue(peerId, out var peer))
|
|
if (ClientPeers.TryGetValue(peerId, out var peer))
|
|
{
|
|
{
|
|
- var info = new SC_BT_BroadCast() {Msg= msg.Msg, SenderUid = msg.SenderUid, Zoneid = msg.Zoneid };
|
|
|
|
|
|
+ var info = new SC_BT_BroadCast() { Msg = msg.Msg, SenderUid = msg.SenderUid, Zoneid = msg.Zoneid };
|
|
this.Broadcast(TargetType.Others, eProtocalCommand.CsBtStatus, info);
|
|
this.Broadcast(TargetType.Others, eProtocalCommand.CsBtStatus, info);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -146,7 +161,7 @@ namespace BattleRoom
|
|
var msg = CS_BT_Over.Parser.ParseFrom(data._data);
|
|
var msg = CS_BT_Over.Parser.ParseFrom(data._data);
|
|
if (ClientPeers.TryGetValue(peerId, out var peer))
|
|
if (ClientPeers.TryGetValue(peerId, out var peer))
|
|
{
|
|
{
|
|
- var info = new SC_BT_Over() { Msg= msg.Msg, SenderUid = msg.SenderUid, Zoneid = msg.Zoneid };
|
|
|
|
|
|
+ var info = new SC_BT_Over() { Msg = msg.Msg, SenderUid = msg.SenderUid, Zoneid = msg.Zoneid };
|
|
this.Broadcast(TargetType.Others, eProtocalCommand.CsBtStatus, info);
|
|
this.Broadcast(TargetType.Others, eProtocalCommand.CsBtStatus, info);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -233,15 +248,9 @@ namespace BattleRoom
|
|
p.room = this;
|
|
p.room = this;
|
|
this.ClientPeers.Add(p.Id, p);
|
|
this.ClientPeers.Add(p.Id, p);
|
|
}
|
|
}
|
|
- var list = new SC_MD_EnterRoom() { Uid = p.UID, Zoneid = p.zoneid };
|
|
|
|
-
|
|
|
|
- ClientPeers.Values.ToList().ForEach(c => list.PlayerUids.Add(c.UID));
|
|
|
|
- Broadcast(TargetType.All, eProtocalCommand.ScMdEnterRoom, list);
|
|
|
|
- Console.WriteLine("房间内广播进入房间事件!");
|
|
|
|
}
|
|
}
|
|
else
|
|
else
|
|
- {
|
|
|
|
-
|
|
|
|
|
|
+ {
|
|
WriteLine("游戏结束2 // 这里不应该执行到!!!");
|
|
WriteLine("游戏结束2 // 这里不应该执行到!!!");
|
|
p.SendEvent(eProtocalCommand.ScGameOver, new SC_MD_EnterRoom() { });
|
|
p.SendEvent(eProtocalCommand.ScGameOver, new SC_MD_EnterRoom() { });
|
|
p.Close();
|
|
p.Close();
|