wz1531/5.24BuYu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wz1531
2026-07-12 00:26:17 +08:00
parent b080747b56
commit 7d90624a8a
8 changed files with 2819 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs
+16 -2
View File
@@ -113,8 +113,22 @@ namespace Assets.MyGame.Scripts.Net
break;
case "ReadyNotice":
//roomMainPanel.subUIManager.CloseAll();
roomMainPanel.InitRoomData();
{
// ReadyNotice arguments[0] 是用户ID字符串，不是房间对象
var userId = JsonConvert.DeserializeObject<WebSocketResponseBase<string>>(msg).arguments[0];
// 标记该玩家已准备
if (roomMainPanel.roomData != null && roomMainPanel.roomData.users != null)
{
var u = roomMainPanel.roomData.users.Find(x => x.userId == userId);
if (u != null) u.isReady = true;
// 只有双方都准备好才进入游戏
if (roomMainPanel.roomData.users.Count >= 2
&& roomMainPanel.roomData.users.TrueForAll(x => x.isReady))
{
roomMainPanel.InitRoomData();
}
}
}
break;
case "GameOperation":
{
Assets/MyGame/Scripts/Net/WebSocketReponseList.cs
+7
View File
@@ -156,6 +156,13 @@ namespace Assets.MyGame.Scripts.Net
}
public static void RoomKillNotice(string msg)
{
// 离开倒计时期间不触发击杀/爆奖特效
var panel = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelDefault)
?? UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelFLZY)
?? UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelYYSC)
?? UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelXJMH)
?? UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelHHWK);
if (panel != null && panel.IsLeavingCountdown()) return;
CreateFishManager.Instance.Ws_DieFish(msg);
}
public static void RoomFireNotice(string msg)