1

2026-08-28 18:57:36 +08:00
parent 5e162fa05c
commit d75eacd1e6
37 changed files with 7567 additions and 8989 deletions
@@ -1412,6 +1412,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
    #region ③ 攻击系统（FireModule）
    private void TryFire()
    {
+        // ⭐ 特殊鱼炮台(钻头)活动期间禁用普通开火，点击只发射钻头
+        if (currSitData != null && currSitData.isDrillActive) return;
+
        clickTime += Time.deltaTime;
        if (clickTime < attackTime) return;

@@ -1566,6 +1569,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
        if (currSitData == null) return;
        // ⭐ 退出倒计时期间屏蔽本地玩家自动开火,其他玩家和机器人不受影响
        if (_isLeavingCountdown) return;
+        // ⭐ 特殊鱼炮台(钻头)活动期间禁用普通自动开火
+        if (currSitData.isDrillActive) return;

        bool needAutoFire = toggle_SkillAuto.isOn || (toggle_Lock.isOn && currSitData.isLock && currSitData.lockFX.gameObject.activeSelf);
        if (!needAutoFire)
@@ -314,7 +314,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1403499693239075355}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -120}
+  m_LocalPosition: {x: 0, y: 0, z: -480}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@@ -1160,7 +1160,7 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2938809947538131009}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
  m_ConstrainProportionsScale: 1
@@ -1170,7 +1170,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 3248, y: 1500}
+  m_SizeDelta: {x: 3248, y: 6000}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5503466365916676941
 CanvasRenderer:
@@ -2522,6 +2522,9 @@ MonoBehaviour:
  tMP_DiamondNum: {fileID: 9208482097770273619}
  tMP_TurretConsumeNum: {fileID: 6996998917093333593}
  wingParent: {fileID: 5982321734877658021}
+  zhanShenParent: {fileID: 3297566421429981692}
+  tSYPTParent: {fileID: 2724832172110457149}
+  isDrillActive: 0
  turretParent: {fileID: 5516422369603436267}
  turretRotate: {fileID: 2732244402854446462}
  turretControlMode: 0
@@ -15,7 +15,7 @@ RenderTexture:
  m_IsAlphaChannelOptional: 0
  serializedVersion: 5
  m_Width: 3248
-  m_Height: 1500
+  m_Height: 6000
  m_AntiAliasing: 1
  m_MipCount: -1
  m_DepthStencilFormat: 94
@@ -15,7 +15,7 @@ RenderTexture:
  m_IsAlphaChannelOptional: 0
  serializedVersion: 5
  m_Width: 3248
-  m_Height: 1500
+  m_Height: 6000
  m_AntiAliasing: 1
  m_MipCount: -1
  m_DepthStencilFormat: 94
@@ -15,7 +15,7 @@ RenderTexture:
  m_IsAlphaChannelOptional: 0
  serializedVersion: 5
  m_Width: 3248
-  m_Height: 1500
+  m_Height: 6000
  m_AntiAliasing: 1
  m_MipCount: -1
  m_DepthStencilFormat: 94
@@ -15,7 +15,7 @@ RenderTexture:
  m_IsAlphaChannelOptional: 0
  serializedVersion: 5
  m_Width: 3248
-  m_Height: 1500
+  m_Height: 6000
  m_AntiAliasing: 1
  m_MipCount: -1
  m_DepthStencilFormat: 94