From 7ed40210fdf37cea0364290727f039385dbb04c8 Mon Sep 17 00:00:00 2001 From: "ALIENJACK\\alien" Date: Sun, 26 Jan 2025 14:50:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=88=B0=E6=88=BF=E9=97=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8E=E4=B8=8D=E5=86=8D=E5=88=A4=E6=96=ADslot?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=AF=E5=90=A6=E6=94=B9=E5=8F=98,?= =?UTF-8?q?=E5=85=A8=E9=87=8F=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Script/AppMain/Manager/AppRoom.cs | 112 +++++++++--------- 1 file changed, 54 insertions(+), 58 deletions(-) diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppRoom.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppRoom.cs index c06d86f6..043a14d6 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppRoom.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppRoom.cs @@ -331,7 +331,6 @@ namespace AxibugEmuOnline.Client.Manager Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, newJoin); } - bool bChangeSlot = false; for (int i = 0; i < 4; i++) { var oldSlot = oldslotArr[i]; @@ -344,68 +343,65 @@ namespace AxibugEmuOnline.Client.Manager oldSlot.PlayerLocalJoyIdx != newSlot.PlayerLocalJoyIdx ) { - bChangeSlot = true; if (newSlot.PlayerUID > 0) { OverlayManager.PopTip($"[{newSlot.PlayerNickName}]使用:P{i}"); } } - } - - if (bChangeSlot) - { - Eventer.Instance.PostEvent(EEvent.OnRoomSlotDataChanged); - } - - //for (int i = 0; i < 4; i++) - //{ - // long OldPlayer = oldRoomPlayer[i]; - // long NewPlayer = newRoomPlayer[i]; - // if (OldPlayer == NewPlayer) - // continue; - - // //位置之前有人，但是离开了 - // if (OldPlayer > 0) - // { - // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerLeavnRoom, i, OldPlayer); - // UserDataBase oldplayer = App.user.GetUserByUid(OldPlayer); - // string oldPlayName = oldplayer != null ? oldplayer.NickName : "Player"; - // OverlayManager.PopTip($"[{oldPlayName}]离开房间,手柄位:P{i}"); - // if (NewPlayer > 0)//而且害换了一个玩家 - // { - // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer); - // mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName); - // OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}"); - // } - // } - // else //之前没人 - // { - // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer); - // mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName); - // OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}"); - // } - - // //位置之前有人，但是离开了 - // if (OldPlayer > 0) - // { - // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerLeavnRoom, i, OldPlayer); - // UserDataBase oldplayer = App.user.GetUserByUid(OldPlayer); - // string oldPlayName = oldplayer != null ? oldplayer.NickName : "Player"; - // OverlayManager.PopTip($"[{oldPlayName}]离开房间,手柄位:P{i}"); - // if (NewPlayer > 0)//而且害换了一个玩家 - // { - // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer); - // mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName); - // OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}"); - // } - // } - // else //之前没人 - // { - // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer); - // mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName); - // OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}"); - // } - //} + } + + Eventer.Instance.PostEvent(EEvent.OnRoomSlotDataChanged); + + + //for (int i = 0; i < 4; i++) + //{ + // long OldPlayer = oldRoomPlayer[i]; + // long NewPlayer = newRoomPlayer[i]; + // if (OldPlayer == NewPlayer) + // continue; + + // //位置之前有人，但是离开了 + // if (OldPlayer > 0) + // { + // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerLeavnRoom, i, OldPlayer); + // UserDataBase oldplayer = App.user.GetUserByUid(OldPlayer); + // string oldPlayName = oldplayer != null ? oldplayer.NickName : "Player"; + // OverlayManager.PopTip($"[{oldPlayName}]离开房间,手柄位:P{i}"); + // if (NewPlayer > 0)//而且害换了一个玩家 + // { + // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer); + // mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName); + // OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}"); + // } + // } + // else //之前没人 + // { + // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer); + // mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName); + // OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}"); + // } + + // //位置之前有人，但是离开了 + // if (OldPlayer > 0) + // { + // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerLeavnRoom, i, OldPlayer); + // UserDataBase oldplayer = App.user.GetUserByUid(OldPlayer); + // string oldPlayName = oldplayer != null ? oldplayer.NickName : "Player"; + // OverlayManager.PopTip($"[{oldPlayName}]离开房间,手柄位:P{i}"); + // if (NewPlayer > 0)//而且害换了一个玩家 + // { + // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer); + // mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName); + // OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}"); + // } + // } + // else //之前没人 + // { + // Eventer.Instance.PostEvent(EEvent.OnOtherPlayerJoinRoom, i, NewPlayer); + // mineRoomMiniInfo.GetPlayerNameByPlayerIdx((uint)i, out string PlayerName); + // OverlayManager.PopTip($"[{PlayerName}]进入房间,手柄位:P{i}"); + // } + //} } ///