This commit is contained in:
2026-07-29 22:59:26 +08:00
parent 61f490c4b4
commit b5ff32c7e1
19 changed files with 535 additions and 209 deletions
@@ -1389,10 +1389,36 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
UIManager.Instance.uiRoot.GetComponent<Canvas>());
var coinScript = award.GetComponent<BJBase>();
coinScript.Init(coinNum.Amount, v3Point);
coinScript.isBoss = true;
coinScript.isLocalCoin = isLocal;
coinScript.SetCoinCount();
if (coinScript != null)
{
// 普通爆奖(BJBase 体系)
coinScript.Init((int)coinNum.Amount, v3Point);
coinScript.isBoss = true;
coinScript.isLocalCoin = isLocal;
coinScript.SetCoinCount();
}
else
{
// 特殊鱼爆奖(DieEffect_TSY 体系:小鱼/Boss 模式互通)
var tsy = award.GetComponent<DieEffect_TSY>();
if (tsy != null)
{
tsy.startPoint = award.transform.position;
tsy.isLocalCoin = isLocal;
tsy.monster = monster;
tsy.coinCount = coinNum.Amount;
if (tsy.baoJiangMode == TSYBaoJiangMode.Boss爆奖)
{
var sit = currGameType.currSitData;
tsy.InitBossAward((int)coinNum.Amount,
sit != null ? sit.posID : 0,
sit != null ? (int)sit.consumeGoldNum : 1,
monster.monsterData.fishTypeConfig.fishScore, 1, null);
}
tsy.SetCoinCount();
}
}
}
//MonsterDieList.Instance.SmallHuangYiHuang(
@@ -1441,7 +1467,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
// 4. 设置 CoinScript 的终点为 targetWorldPos
var coinScript = award.GetComponent<CoinScript>();
coinScript.Init(coinNum.Amount, targetWorldPos);
coinScript.Init((int)coinNum.Amount, targetWorldPos);
coinScript.isBoss = true;
coinScript.isLocalCoin = isLocal;
coinScript.SetCoinCount();
@@ -1487,8 +1513,8 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
sitData.goldNum += goldToAdd; // 使用副本,不再依赖 killFish 对象
sitData.tMP_GoldNum.text = sitData.goldNum.ToString();
AudioManager.Instance.PlayerFX(audioID);
// ⭐ 记录金币流水:杀鱼获得金币
GameManager.LogGoldFlow("KillFish", $"击中鱼原有金币={oldGold} 增加金币=+{goldToAdd} 剩余金币={sitData.goldNum} 鱼ID={fishId} 座位={sitData.posID} 房间={GameManager.Instance.gameData?.roomInfo?.roomId}");
// ⭐ 记录金币流水:已加钱(杀鱼获得,本地已执行)
GameManager.LogGoldFlowAppliedGain("KillFish", $"击中鱼原有金币={oldGold} 增加金币=+{goldToAdd} 剩余金币={sitData.goldNum} 鱼ID={fishId} 座位={sitData.posID} 房间={GameManager.Instance.gameData?.currRoomData?.roomId}");
};
//// 加分回调(在金币/加分面板飞完后执行)
//Action<int> onScoreAdd = (audioID) =>
@@ -1614,13 +1640,40 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
var coinScript = award.GetComponent<BJBase>();
coinScript.startPoint = award.transform.position;
coinScript.Init(killFish.gold, sitData.transform.position, killFish.userId, sitData.posID, killFish.param);
coinScript.isLocalCoin = sitData.user == GameManager.Instance.user.id;
coinScript.startPoint = award.transform.position;
coinScript.isBoss = false;
coinScript.JiaFen = onScoreAdd;
coinScript.SetCoinCount();
if (coinScript != null)
{
// 普通爆奖(BJBase 体系)
coinScript.startPoint = award.transform.position;
coinScript.Init(killFish.gold, sitData.transform.position, killFish.userId, sitData.posID, killFish.param);
coinScript.isLocalCoin = sitData.user == GameManager.Instance.user.id;
coinScript.isBoss = false;
coinScript.JiaFen = onScoreAdd;
coinScript.SetCoinCount();
}
else
{
// 特殊鱼爆奖(DieEffect_TSY 体系:小鱼/Boss 模式互通)
var tsy = award.GetComponent<DieEffect_TSY>();
if (tsy != null)
{
tsy.startPoint = award.transform.position;
tsy.isLocalCoin = sitData.user == GameManager.Instance.user.id;
tsy.monster = monster;
tsy.coinCount = killFish.gold;
if (tsy.baoJiangMode == TSYBaoJiangMode.Boss爆奖)
{
tsy.InitBossAward(killFish.gold, sitData.posID,
(int)sitData.consumeGoldNum,
monster.monsterData.fishTypeConfig.fishScore, 1, onScoreAdd);
}
else
{
tsy.JiaFenEx = onScoreAdd;
}
tsy.SetCoinCount();
}
}
// // Boss 鱼:显示浮动分数文本