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

4坐座位

Browse Source
This commit is contained in:
wz1531
2026-09-27 18:02:59 +08:00
parent 1a36f70de4
commit 4bc30fef04
30 changed files with 232 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+73 -43
View File
@@ -316,6 +316,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
RoomJoinNotice roomJoinNotice = v.arguments[0];
// ⭐ 座位镜像：进房第一时间确定本地服务端座位（2/3=上方 → 全桌上下镜像，本地永远看自己在下方）
SeatMirror.Setup(roomJoinNotice.Position);
// ⭐ paoBeiList 每次进入房间都重新根据当前场次+房间等级获取，
// 避免再次进入同一场次的不同等级房间时沿用旧 paoBeiList（例如先高级场后低级场）
{
@@ -356,7 +358,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
foreach (var item in list_Sits)
{
if (item.posID == roomJoinNotice.Position)
// ⭐ 座位镜像：本地玩家的显示座位 = 服务端座位转显示空间（上方座位翻转后落回下方）
if (item.posID == SeatMirror.ToDisplay(roomJoinNotice.Position))
{
currSitData = item;
// ⭐ 长按本地座位的 img_OpenPT 开关炮台面板（与 btn_ChangeTurret 同逻辑）
@@ -389,7 +392,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
else
{
var targetSit = list_Sits.Find(s => s.posID == roomJoinNotice.Position);
var targetSit = list_Sits.Find(s => s.posID == SeatMirror.ToDisplay(roomJoinNotice.Position));
// ⭐ 优先用后端 isBot 字段判断，兼容 userId.StartsWith("bot_")
bool isBotJoin = roomJoinNotice.IsBot ||
(!string.IsNullOrEmpty(roomJoinNotice.UserId) && roomJoinNotice.UserId.StartsWith("bot_"));
@@ -523,6 +526,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// 清除场景加载标记，下次进入可重新加载
Assets.MyGame.Scripts.Net.WebSocketReponseList.ClearLoadedGameScene(sceneName);
WebSocketManager.Instance.Close(SocketType.game);
// ⭐ 座位镜像状态清空，下次进房重新按新房间座位 Setup
SeatMirror.Clear();
// ⭐ 重置本地道具计数，下次进入房间重新从服务端读取
_localBaoZouCount = -1;
_localBingFengCount = -1;
@@ -962,7 +967,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// 同步给服务器：取消锁定
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.changeAutoTarget,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeAutoTarget { targetGuid = null }
@@ -1659,7 +1664,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// 广播给其他客户端
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.biaoQing,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_BiaoQing
@@ -1696,11 +1701,13 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
/// <summary>收到其他玩家发送表情的广播（biaoQing）：在对应座位显示</summary>
public void SyncGameData_BiaoQing(SyncGameData sync)
{
if (currSitData == null || sync.sitPos == currSitData.posID) return; // 本地座位已在发送时显示
// ⭐ 座位镜像：服务端座位转显示座位
int dispPos = SeatMirror.ToDisplay(sync.sitPos);
if (currSitData == null || dispPos == currSitData.posID) return; // 本地座位已在发送时显示
var data = FrameDataParser.Parse<FrameData_BiaoQing>(sync.frameData);
if (data == null) return;
ShowBiaoQing(sync.sitPos, data.biaoQingType, data.spineIndex, data.content);
ShowBiaoQing(dispPos, data.biaoQingType, data.spineIndex, data.content);
}
#endregion
@@ -4026,7 +4033,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.rotateTurrect,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_Rotate { angle = angle }
@@ -4057,7 +4064,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.fireBullet,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = fireData
@@ -4093,7 +4100,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.changeAutoTarget,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeAutoTarget
@@ -4108,7 +4115,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.changeTurretState,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_TurretState { state = state }
@@ -4120,7 +4127,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.changeTurret,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeTurret { turretIndex = turretNumber }
@@ -4133,7 +4140,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.changeWing,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeTurret { turretIndex = wingNumber }
@@ -4147,7 +4154,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.changeZhanShen,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeTurret { turretIndex = zhanShenNumber }
@@ -4160,7 +4167,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.freezeFish,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_FreezeFish { isFreeze = isFreeze }
@@ -4174,9 +4181,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
#region ⑦ 服务器广播处理（NetReceiveModule）
public void SyncGameData_Rotate(SyncGameData sync)
{
if (sync.sitPos == currSitData.posID) return;
// ⭐ 座位镜像：网络 sitPos 是服务端空间，先转显示座位再比较/索引
int dispPos = SeatMirror.ToDisplay(sync.sitPos);
if (dispPos == currSitData.posID) return;
var sit = list_Sits[sync.sitPos];
var sit = list_Sits[dispPos];
// ⭐ 房主不处理机器人旋转广播:房主在 RotateBotToTarget 里已直接旋转本地炮台,
// 再走 SmoothRotate 会和本地直接旋转冲突
if (sit != null && sit.isBot && currSitData == SitPosData.roomOwnerSit) return;
@@ -4235,13 +4244,15 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
var data = FrameDataParser.Parse<FrameData_FireBullet>(sync.extra.frameData);
// ⭐ 座位镜像：extra.sitPos 是发送方的服务端座位，转显示座位再索引
// ⭐ 边界检查:防止 sitPos 越界导致 IndexOutOfRangeException
if (sync.extra.sitPos < 0 || sync.extra.sitPos >= list_Sits.Count)
int dispPos = SeatMirror.ToDisplay(sync.extra.sitPos);
if (dispPos < 0 || dispPos >= list_Sits.Count)
{
Debug.LogWarning($"[SyncGameData_FireBullit] sitPos 越界: {sync.extra.sitPos}");
return;
}
var targetSit = list_Sits[sync.extra.sitPos];
var targetSit = list_Sits[dispPos];
FireBullet(targetSit, data.angle, data.isSanShe, data.twoRTruuect, data.isSuoDing, sync.bulletIds, data.monsterIDs, bulletGolds);
}
@@ -4252,9 +4263,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
public void SyncGameData_BotFireAngle(SyncGameData sync)
{
if (sync == null || sync.frameData == null) return;
if (sync.sitPos < 0 || sync.sitPos >= list_Sits.Count) return;
// ⭐ 座位镜像：bot 的服务端座位转显示座位
int dispPos = SeatMirror.ToDisplay(sync.sitPos);
if (dispPos < 0 || dispPos >= list_Sits.Count) return;
var sit = list_Sits[sync.sitPos];
var sit = list_Sits[dispPos];
if (sit == null || !sit.isBot) return;
var fireData = FrameDataParser.Parse<FrameData_FireBullet>(sync.frameData);
@@ -4266,13 +4279,15 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
public void SyncGameData_ChangeTargetMonster(SyncGameData sync)
{
if (sync.sitPos == currSitData.posID) return;
// ⭐ 座位镜像：网络 sitPos 是服务端空间，先转显示座位再比较/索引
int dispPos = SeatMirror.ToDisplay(sync.sitPos);
if (dispPos == currSitData.posID) return;
var data = FrameDataParser.Parse<FrameData_ChangeAutoTarget>(sync.frameData);
if (data.targetGuid == null)
{
list_Sits[sync.sitPos].ClearLock();
list_Sits[dispPos].ClearLock();
return;
}
@@ -4283,7 +4298,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// colliderList 顺序可能不一致,统一用"第一个活跃"更稳定
Transform hitPos = ResolveLockTransform(monster);
list_Sits[sync.sitPos].SetLockTarget(monster, hitPos);
list_Sits[dispPos].SetLockTarget(monster, hitPos);
}
public void SyncGameData_RendromDieFish(SyncGameData sync)
@@ -4291,7 +4306,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
var data = JsonConvert.DeserializeObject<FrameData_RandomDieFish>(sync.frameData.ToString());
// 用 sync.sitPos 判断是否本地玩家发的（服务器不会丢这个字段）
bool isLocalSender = sync.sitPos == currSitData.posID;
// ⭐ 座位镜像：服务端座位转显示座位后再与本地显示座位比较
bool isLocalSender = SeatMirror.ToDisplay(sync.sitPos) == currSitData.posID;
CreateFishManager.Instance.Id_DieListFish_FX(
data.guids,
@@ -4305,52 +4321,62 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
public void SyncGameData_TurretState(SyncGameData sync)
{
if (sync.sitPos == currSitData.posID) return;
// ⭐ 座位镜像：服务端座位转显示座位
int dispPos = SeatMirror.ToDisplay(sync.sitPos);
if (dispPos == currSitData.posID) return;
var data = FrameDataParser.Parse<FrameData_TurretState>(sync.frameData);
var sit = list_Sits[sync.sitPos];
var sit = list_Sits[dispPos];
sit.ChangeState(data.state);
}
public void SyncGameData_ChangeTurret(SyncGameData sync)
{
if (sync.sitPos == currSitData.posID) return;
// ⭐ 座位镜像：服务端座位转显示座位
int dispPos = SeatMirror.ToDisplay(sync.sitPos);
if (dispPos == currSitData.posID) return;
var data = FrameDataParser.Parse<FrameData_ChangeTurret>(sync.frameData);
list_Sits[sync.sitPos].LoadTurret(data.turretIndex);
list_Sits[dispPos].LoadTurret(data.turretIndex);
}
public void SyncGameData_ChangeWing(SyncGameData sync)
{
if (sync.sitPos == currSitData.posID) return;
// ⭐ 座位镜像：服务端座位转显示座位
int dispPos = SeatMirror.ToDisplay(sync.sitPos);
if (dispPos == currSitData.posID) return;
var data = FrameDataParser.Parse<FrameData_ChangeTurret>(sync.frameData);
// turretIndex<=0 = 卸下翅膀；>0 = 加载对应编号翅膀（与战神 changeZhanShen 同一约定）
if (data.turretIndex > 0)
list_Sits[sync.sitPos].LoadWing(data.turretIndex);
list_Sits[dispPos].LoadWing(data.turretIndex);
else
list_Sits[sync.sitPos].ClearWing();
list_Sits[dispPos].ClearWing();
}
public void SyncGameData_ChangeZhanShen(SyncGameData sync)
{
if (sync.sitPos == currSitData.posID) return;
// ⭐ 座位镜像：服务端座位转显示座位
int dispPos = SeatMirror.ToDisplay(sync.sitPos);
if (dispPos == currSitData.posID) return;
var data = FrameDataParser.Parse<FrameData_ChangeTurret>(sync.frameData);
// turretIndex<=0 = 卸下战神；>0 = 加载对应编号战神（内部会隐藏该座位的普通炮台）
if (data.turretIndex > 0)
list_Sits[sync.sitPos].LoadZhanShen(data.turretIndex);
list_Sits[dispPos].LoadZhanShen(data.turretIndex);
else
list_Sits[sync.sitPos].ClearZhanShen();
list_Sits[dispPos].ClearZhanShen();
}
public void SyncGameData_ChangeCannonMultiple(SyncGameData sync)
{
if (sync.sitPos == currSitData.posID) return;
// ⭐ 座位镜像：服务端座位转显示座位
int dispPos = SeatMirror.ToDisplay(sync.sitPos);
if (dispPos == currSitData.posID) return;
var data = FrameDataParser.Parse<FrameData_ChangeCannonMultiple>(sync.frameData);
var sit = list_Sits[sync.sitPos];
var sit = list_Sits[dispPos];
sit.consumeGoldNum = data.cannonMultiple;
sit.tMP_TurretConsumeNum.text = data.cannonMultiple.ToString();
}
@@ -4397,7 +4423,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (currSitData == null) return;
SyncGameData sgd = new SyncGameData
{
sitPos = currSitData.posID,
sitPos = SeatMirror.ToServer(currSitData.posID),
frameType = FrameDataType.changeCannonMultiple,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeCannonMultiple { cannonMultiple = consumeGold }
@@ -4551,9 +4577,13 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
public void JoinGame(int sitNum, long goldNum, long diamondNum, long consumeGold, int currentTurretIndex, string user = null, string cannonId = null, string wingId = null, string warGodId = null)
{
// ⭐ 座位镜像：调用方传的是服务端座位号（RoomJoinNotice.Position / players[].position），
// 转成本地视角的显示座位再匹配场景座位（本地在上方时 0↔2、1↔3 对调）
int displayPos = SeatMirror.ToDisplay(sitNum);
foreach (var sit in list_Sits)
{
if (sit.posID != sitNum) continue;
if (sit.posID != displayPos) continue;
// ⭐ 确保座位 GameObject 本身是激活的(可能被 HandleBotExit 隐藏或初始为 inactive)
if (!sit.gameObject.activeSelf)
@@ -4964,7 +4994,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// 接收端 SyncGameData_ChangeCannonMultiple 会根据 sitPos 更新对应座位
var sgd = new SyncGameData
{
sitPos = sit.posID,
sitPos = SeatMirror.ToServer(sit.posID),
frameType = FrameDataType.changeCannonMultiple,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeCannonMultiple { cannonMultiple = (int)sit.consumeGoldNum }
@@ -5345,7 +5375,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
SyncGameData sgd = new SyncGameData
{
sitPos = botSit.posID,
sitPos = SeatMirror.ToServer(botSit.posID),
frameType = FrameDataType.rotateTurrect,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_Rotate { angle = angle }
@@ -5374,7 +5404,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
SyncGameData sgd = new SyncGameData
{
sitPos = botSit.posID,
sitPos = SeatMirror.ToServer(botSit.posID),
frameType = FrameDataType.changeAutoTarget,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeAutoTarget
@@ -5403,7 +5433,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
SyncGameData sgd = new SyncGameData
{
sitPos = botSit.posID,
sitPos = SeatMirror.ToServer(botSit.posID),
frameType = FrameDataType.changeTurretState,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_TurretState { state = state }
@@ -5429,7 +5459,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
SyncGameData sgd = new SyncGameData
{
sitPos = botSit.posID,
sitPos = SeatMirror.ToServer(botSit.posID),
frameType = FrameDataType.fireBullet,
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = fireData