This commit is contained in:
2026-07-24 02:08:49 +08:00
parent d5c7ad40e3
commit 40bfaf7b36
2 changed files with 15 additions and 8 deletions
@@ -3613,14 +3613,12 @@ MonoBehaviour:
toggle_BaoZou: {fileID: 6731404785578067400}
tmp_BaoZouCount: {fileID: 8854401047233665172}
img_BaoZou: {fileID: 5398658157976045972}
frenzyDuration: 5
currFrenzyTime: 0
toggle_BingFeng: {fileID: 3213021335351199576}
tmp_BingFengCount: {fileID: 6558852404690691716}
img_BingFeng: {fileID: 1284969899439567079}
bingFengEffect: {fileID: 1709254077376921, guid: a2a34db230a06c64c8d7cfad89a22d10,
type: 3}
bingFengDuration: 5
currBingFengTime: 0
btn_GuaGuaKa: {fileID: 6003315606206777066}
tmp_GGKCount: {fileID: 7353841231670185141}
@@ -3665,8 +3663,8 @@ RectTransform:
m_GameObject: {fileID: 5910028015393800118}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8441262843426643071}
m_Father: {fileID: 1879494577659713210}
@@ -6379,7 +6377,7 @@ PrefabInstance:
- target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
@@ -6389,7 +6387,7 @@ PrefabInstance:
- target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6114408877341087527, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
@@ -1083,10 +1083,16 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (currBingFengTime <= 0)
{
toggle_BingFeng.isOn = false;
toggle_BingFeng.SetIsOnWithoutNotify(false);
currBingFengTime = 0f;
if (img_BingFeng != null) img_BingFeng.fillAmount = 1f;
// 解冻由 toggle.onValueChanged(false) 触发,不在此重复
// ⭐ 冰冻结束:本地解冻 + 广播给其他客户端解冻
// 之前只设 toggle.isOn=false,但 onValueChanged 监听器 if(!on)return
// 导致解冻逻辑永远不执行,isFrozen 永远 true,之后永久不出鱼
CreateFishManager.Instance.UnfreezeAllFish();
ResumeAllFishAnimations();
SyncFreeze(false);
if (_bingFengInstance != null) _bingFengInstance.SetActive(false);
}
}
}
@@ -2061,6 +2067,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
CreateFishManager.Instance.FreezeAllFish();
PauseAllFishAnimations();
// ⭐ 广播冰冻给其他客户端(包括人机房主代发的场景)
// 之前只走 UsePropNotice 本地冻结,没广播 → 多人房间其他人不冻结
SyncFreeze(true);
break;
}
}