This commit is contained in:
2026-07-23 01:51:07 +08:00
parent ea98a770fc
commit 83699675e1
23 changed files with 1844 additions and 138 deletions
@@ -1664,8 +1664,10 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
/// <summary>
/// 随机选取 count 条小鱼/黄金鱼,通知服务器同步死亡,并返回 guid 列表。
/// </summary>
/// <param name="killerSitPos">击杀者座位 ID。Boss 爆奖连锁杀鱼时传 Boss 击杀者座位
/// (含人机);-1 表示用本地 currSitData.posID(普通玩家直接击杀场景).</param>
public List<string> SyncGameData_SendRendromDieFishID(
int count, List<RedPacketRecord> coinNum, Vector3 v3Point)
int count, List<RedPacketRecord> coinNum, Vector3 v3Point, int killerSitPos = -1)
{
var guids = new List<string>(count);
var tempKeys = fishDatas_hashCodekey_Small.Keys.ToList();
@@ -1685,7 +1687,9 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
}
}
int posID = currGameType.currSitData.posID;
// ⭐ sitPos 用击杀者座位(含人机);房主代人机击杀 Boss 时,这里传人机座位,
// 否则所有客户端都会判定为房主击杀 → 房主自己看金色(错)
int posID = killerSitPos >= 0 ? killerSitPos : currGameType.currSitData.posID;
var sgd = new SyncGameData
{
sitPos = posID,
@@ -1903,6 +1907,8 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
bossCtrl.v3 = sitData.transform.position;
bossCtrl.JiaFen = onScoreAdd; // 先设置 JiaFen,DieFish 的 lambda 才能捕获到
bossCtrl.isLocalCoin = sitData.user == GameManager.Instance.user.id; // ⭐ 金/银区分
bossCtrl.killerSitPos = sitData.posID; // ⭐ 爆奖杀小鱼用击杀者座位(含人机)
monster.DieFish(killFish); // Boss 重写 action_effect_DieAward,捕获上面的 JiaFen
dieFishCalled = true;
@@ -2009,6 +2015,8 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
bossCtrl.v3 = sitData.transform.position;
bossCtrl.JiaFen = onScoreAdd; // 先设置 JiaFen
bossCtrl.isLocalCoin = sitData.user == GameManager.Instance.user.id; // ⭐ 金/银区分
bossCtrl.killerSitPos = sitData.posID; // ⭐ 爆奖杀小鱼用击杀者座位(含人机)
monster.DieFish(killFish); // Boss 重写 action_effect_DieAward
dieFishCalled = true;