wz1531/5.24BuYu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wz1531
2026-09-28 20:19:27 +08:00
parent d396870d37
commit 106c48cf82
12 changed files with 154 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/aa/Game/ZhanShen/Game/display_14080_0_DaTing.prefab
+2 -1
View File
@@ -1878,4 +1878,5 @@ MonoBehaviour:
selfOffsetJGStart: {x: -17, y: 130}
buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0}
topOffsetZSRotateInit: {x: -125, y: 0, z: 0}
laserAudio: {fileID: 8300000, guid: 3242c49d65ce5ea46a2e08223f9efdbf, type: 3}
laserAudio: {fileID: 8300000, guid: cec3a7ee6689f0447813cc27f500f9cf, type: 3}
bulletAudio: {fileID: 8300000, guid: 3242c49d65ce5ea46a2e08223f9efdbf, type: 3}
Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab
+2 -1
View File
@@ -643,4 +643,5 @@ MonoBehaviour:
selfOffsetJGStart: {x: 0, y: 180}
buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0}
topOffsetZSRotateInit: {x: -100, y: 0, z: 0}
laserAudio: {fileID: 8300000, guid: 1f29c336b73e6564894ad13386c25caa, type: 3}
laserAudio: {fileID: 8300000, guid: 9c84d32017426c64b89da338ac6e3267, type: 3}
bulletAudio: {fileID: 8300000, guid: 1f29c336b73e6564894ad13386c25caa, type: 3}
Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_6004.prefab
+2 -1
View File
@@ -1187,4 +1187,5 @@ MonoBehaviour:
selfOffsetJGStart: {x: 13, y: 203}
buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0}
topOffsetZSRotateInit: {x: -125, y: 0, z: 0}
laserAudio: {fileID: 8300000, guid: ec13aff0d55799149ad4623aa6a4c8be, type: 3}
laserAudio: {fileID: 8300000, guid: 1c60a8863ed13294c90a5917617006d8, type: 3}
bulletAudio: {fileID: 8300000, guid: ec13aff0d55799149ad4623aa6a4c8be, type: 3}
Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab
+2 -1
View File
@@ -1562,7 +1562,8 @@ MonoBehaviour:
selfOffsetJGStart: {x: 30, y: 170}
buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0}
topOffsetZSRotateInit: {x: -125, y: 0, z: 0}
laserAudio: {fileID: 8300000, guid: 67a9f36f11a381e4b8e2f31e62212364, type: 3}
laserAudio: {fileID: 8300000, guid: 3940837f653cae04896b7f69dd9c273e, type: 3}
bulletAudio: {fileID: 8300000, guid: 67a9f36f11a381e4b8e2f31e62212364, type: 3}
--- !u!95 &8661363738911940257 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 8284544360685858346, guid: ffe5b917cd8f21941adf54c437e9a701,
Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab
+2 -1
View File
@@ -3797,7 +3797,8 @@ MonoBehaviour:
selfOffsetJGStart: {x: 15, y: 150}
buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0}
topOffsetZSRotateInit: {x: -125, y: 0, z: 0}
laserAudio: {fileID: 8300000, guid: 018b5393a4a0d0447af5d15e34d66fab, type: 3}
laserAudio: {fileID: 8300000, guid: f8def02954a080746aaccdc0f6513725, type: 3}
bulletAudio: {fileID: 8300000, guid: 018b5393a4a0d0447af5d15e34d66fab, type: 3}
--- !u!95 &3827418405087986554 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 2725459927999047066, guid: 83f830ab856bfc642b235330651c6513,
Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab
+2 -1
View File
@@ -973,4 +973,5 @@ MonoBehaviour:
selfOffsetJGStart: {x: 40, y: 200}
buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0}
topOffsetZSRotateInit: {x: -125, y: 0, z: 0}
laserAudio: {fileID: 8300000, guid: 1d9f388857aa12f46b206c224734d00a, type: 3}
laserAudio: {fileID: 8300000, guid: d62315dc349b8a24e9185f0f0c4c5e11, type: 3}
bulletAudio: {fileID: 8300000, guid: 1d9f388857aa12f46b206c224734d00a, type: 3}
Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs
+3 -1
View File
@@ -19,6 +19,8 @@ public class ZhanShenTurretData : TurretData
[Tooltip("上方座位战神初始旋转（欧拉角，直接设置，覆盖该战神预制体原始旋转）。上下视角不一样分开设置。全0=保持默认朝向")]
public Vector3 topOffsetZSRotateInit;
[Tooltip("战神激光开火音效：激光声音与普通开火不同，锁定时每发激光用 AudioManager.PlayFX(AudioClip) 直接播放；为空则回退普通开火音效")]
[Tooltip("战神激光音效（锁定中）：声音较长，锁定时循环播放，松开锁定/激光消失即停止；为空则逐发回退 bulletAudio/bulletClip")]
public AudioClip laserAudio;
[Tooltip("战神普通开火音效（未锁定时）：不锁定开炮时逐发播放；为空则回退普通炮台音效 bulletClip")]
public AudioClip bulletAudio;
}
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+24 -8
View File
@@ -939,6 +939,15 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// ⭐ 清理未完成的 not-self 爆奖 pending（避免悬空引用）
BaoJiangNotSelfHandler.ClearAll();
// ⭐ 清理冰冻特效实例:Instantiate 无父对象 → 挂在场景根,面板销毁不会带走,
// 冰冻中切房会残留一块冰冻蒙皮,必须手动销毁
if (_bingFengInstance != null)
{
Destroy(_bingFengInstance);
_bingFengInstance = null;
}
_frozenAnimSpeeds.Clear();
}
public virtual void Start()
{
@@ -3004,8 +3013,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
if (sit.posID==currSitData.posID)
{
AudioManager.Instance.PlayFX(bulletClip);
// ⭐ 战神普通开火音效（未锁定）：优先读战神配置的 bulletAudio，未配置回退普通炮台音效 bulletClip
var zsData = sit.currentZhanShenData as ZhanShenTurretData;
AudioClip clip = (zsData != null && zsData.bulletAudio != null) ? zsData.bulletAudio : bulletClip;
if (clip != null)
AudioManager.Instance.PlayFX(clip);
}
}
@@ -3058,12 +3070,16 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (sit.posID == currSitData.posID)
{
// ⭐ 战神激光音效：激光声音与普通开火不同——直接读战神配置的 laserAudio 播放
// （AudioManager.PlayFX 的 AudioClip 重载）；未配置时回退普通开火音效 bulletClip
AudioClip laserClip = (sit.currentZhanShenData as ZhanShenTurretData)?.laserAudio;
if (laserClip == null) laserClip = bulletClip;
if (laserClip != null)
AudioManager.Instance.PlayFX(laserClip);
// ⭐ 战神激光音效：配置了 laserAudio 的战神，激光音效由 SitPosData 用循环 AudioSource 播放
// （长音频循环，避免逐发播放重叠），此处不再逐发播；
// 未配置 laserAudio 时逐发回退：优先战神 bulletAudio，再退普通炮台 bulletClip
var zsData = sit.currentZhanShenData as ZhanShenTurretData;
if (zsData == null || zsData.laserAudio == null)
{
AudioClip clip = (zsData != null && zsData.bulletAudio != null) ? zsData.bulletAudio : bulletClip;
if (clip != null)
AudioManager.Instance.PlayFX(clip);
}
}
}