From 28642cdae37d74d1c91efcb3f78f5fc62ad32955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Mon, 28 Sep 2026 00:42:12 +0800 Subject: [PATCH] 1 --- .../MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab | 2 +- Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab index b9d88d190..53f269aa6 100644 --- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab @@ -208,7 +208,7 @@ MonoBehaviour: - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} - rotationPY: 0 + rotationPY: 90 useMirrorCompensate: 1 useRollSignFlip: 1 useRouteFlipX: 0 diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index 868b8ea44..8bb6aec50 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -2445,9 +2445,16 @@ public class GameMainPanel_FishBase : GameMainPanel_Base if (currSitData.currentTurret is FlyTurretData flyHold && flyHold.IsFlying) return; - // 锁定模式:不手动旋转/开火,交给 HandleAutoRotate + HandleAutoFire + // 锁定模式:不手动旋转,交给 HandleAutoRotate + HandleAutoFire // ⭐ 特殊鱼爆奖期间例外:自动锁定已禁用,玩家点击仍可手动旋转炮台瞄准发射方向 - if (toggle_Lock.isOn && !(currSitData != null && currSitData.isDrillActive)) return; + if (toggle_Lock.isOn && !(currSitData != null && currSitData.isDrillActive)) + { + // ⭐ 自动攻击开启时例外:按住屏幕(非UI)额外走 TryFire 手动开火, + // 与 HandleAutoFire 的自动开火叠加 = 双倍射速(clickTime/autoFireTimer 两条独立冷却) + if (currSitData != null && currSitData.IsAutoAttackOn && !IsPointerOverUI(input.position)) + TryFire(); + return; + } // UI 上不旋转不发射 if (IsPointerOverUI(input.position)) return;