diff --git a/Assets/MyGame/Scripts/fishResources/Resources/tbaudio.json b/Assets/MyGame/Scripts/fishResources/Resources/tbaudio.json
index e758f12ed..ff524a068 100644
--- a/Assets/MyGame/Scripts/fishResources/Resources/tbaudio.json
+++ b/Assets/MyGame/Scripts/fishResources/Resources/tbaudio.json
@@ -926,5 +926,137 @@
{
"AudioID": 61216,
"AudioResourcesPath": "PW_Settle_NvShen"
+ },
+ {
+ "AudioID": 62001,
+ "AudioResourcesPath": "FLZY_AOEElectricSound"
+ },
+ {
+ "AudioID": 62002,
+ "AudioResourcesPath": "FLZY_cc144"
+ },
+ {
+ "AudioID": 62003,
+ "AudioResourcesPath": "FLZY_AOEElectricSkill"
+ },
+ {
+ "AudioID": 62004,
+ "AudioResourcesPath": "FLZY_ElectricDragonDie"
+ },
+ {
+ "AudioID": 62005,
+ "AudioResourcesPath": "FLZY_SpineAwardLight"
+ },
+ {
+ "AudioID": 62006,
+ "AudioResourcesPath": "FLZY_cc136"
+ },
+ {
+ "AudioID": 62007,
+ "AudioResourcesPath": "FLZY_DragonSpineAward"
+ },
+ {
+ "AudioID": 62008,
+ "AudioResourcesPath": "FLZY_DragonEffect2"
+ },
+ {
+ "AudioID": 62009,
+ "AudioResourcesPath": "FLZY_HundredMillion"
+ },
+ {
+ "AudioID": 62010,
+ "AudioResourcesPath": "FLZY_ScratchCard"
+ },
+ {
+ "AudioID": 62011,
+ "AudioResourcesPath": "FLZY_JBPFlashNum"
+ },
+ {
+ "AudioID": 62012,
+ "AudioResourcesPath": "FLZY_Tskbaojiang"
+ },
+ {
+ "AudioID": 62013,
+ "AudioResourcesPath": "FLZY_BOSSdasi1"
+ },
+ {
+ "AudioID": 62014,
+ "AudioResourcesPath": "FLZY_BOSSdasi1_2"
+ },
+ {
+ "AudioID": 62015,
+ "AudioResourcesPath": "FLZY_BOSSdasi1_3"
+ },
+ {
+ "AudioID": 62016,
+ "AudioResourcesPath": "FLZY_BOSSdasi1"
+ },
+ {
+ "AudioID": 62017,
+ "AudioResourcesPath": "FLZY_BOSSdasi2_2"
+ },
+ {
+ "AudioID": 62018,
+ "AudioResourcesPath": "FLZY_BOSSdasi1_3"
+ },
+ {
+ "AudioID": 62019,
+ "AudioResourcesPath": "FLZY_BOSSdasi1"
+ },
+ {
+ "AudioID": 62020,
+ "AudioResourcesPath": "FLZY_BOSSdasi3_2"
+ },
+ {
+ "AudioID": 62021,
+ "AudioResourcesPath": "FLZY_BOSSdasi1_3"
+ },
+ {
+ "AudioID": 62022,
+ "AudioResourcesPath": "FLZY_Shuzidijia"
+ },
+ {
+ "AudioID": 62023,
+ "AudioResourcesPath": "FLZY_xiaoyujinbi"
+ },
+ {
+ "AudioID": 62024,
+ "AudioResourcesPath": "FLZY_bgm_default"
+ },
+ {
+ "AudioID": 62025,
+ "AudioResourcesPath": "FLZY_bgm_20"
+ },
+ {
+ "AudioID": 69001,
+ "AudioResourcesPath": "sound_ui_gow_bgm"
+ },
+ {
+ "AudioID": 69002,
+ "AudioResourcesPath": "click_card"
+ },
+ {
+ "AudioID": 69003,
+ "AudioResourcesPath": "dt_bubble"
+ },
+ {
+ "AudioID": 69004,
+ "AudioResourcesPath": "huode"
+ },
+ {
+ "AudioID": 69005,
+ "AudioResourcesPath": "cf_fruitmachine"
+ },
+ {
+ "AudioID": 69006,
+ "AudioResourcesPath": "click"
+ },
+ {
+ "AudioID": 69007,
+ "AudioResourcesPath": "dakai"
+ },
+ {
+ "AudioID": 69008,
+ "AudioResourcesPath": "tanchuang01"
}
]
\ No newline at end of file
diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab
index c1b2ddd60..9414702c4 100644
--- a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab
+++ b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab
@@ -61,7 +61,7 @@ PrefabInstance:
- target: {fileID: 3446050555171211319, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e,
type: 3}
propertyPath: m_LocalRotation.w
- value: 1
+ value: 0.92387956
objectReference: {fileID: 0}
- target: {fileID: 3446050555171211319, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e,
type: 3}
@@ -76,7 +76,7 @@ PrefabInstance:
- target: {fileID: 3446050555171211319, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e,
type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: 0.38268343
objectReference: {fileID: 0}
- target: {fileID: 3446050555171211319, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e,
type: 3}
@@ -91,7 +91,7 @@ PrefabInstance:
- target: {fileID: 3446050555171211319, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 0
+ value: 45
objectReference: {fileID: 0}
- target: {fileID: 3446050555171211319, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e,
type: 3}
@@ -176,6 +176,12 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 2164187165272308971}
m_SourcePrefab: {fileID: 100100000, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e, type: 3}
+--- !u!4 &4782796877071577010 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6173675881365040242, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e,
+ type: 3}
+ m_PrefabInstance: {fileID: 1725624033583170496}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &4811798164641830632 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6139625675193079080, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e,
@@ -306,12 +312,14 @@ MonoBehaviour:
- {fileID: 7412479869810849339}
needLockEvent: 0
createVideoClip: {fileID: 0}
- rotationPY: 60
+ rotationPY: 45
+ useMirrorCompensate: 1
baseMmove: 0
isRotate: 1
isNot1: 0
- ischild0: 0
+ ischild0: 1
depthOffset: 0
is2DFish: 0
sortOrder2D: 0
keepAliveTime: 1
+ shandianStart: {fileID: 4782796877071577010}
diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/ShanDianFishControl.cs b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/ShanDianFishControl.cs
index 9eea6f7d7..973422dbc 100644
--- a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/ShanDianFishControl.cs
+++ b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/ShanDianFishControl.cs
@@ -25,6 +25,8 @@ public class ShanDianFishControl : MonsterContral
/// 是否已触发回收（防重入）
private bool _recycleStarted;
+ public Transform shandianStart;
+
public override void OnEnable()
{
base.OnEnable();
diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/ShanDian_DieEvent.cs b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/ShanDian_DieEvent.cs
index 6484861b3..73e7d92e2 100644
--- a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/ShanDian_DieEvent.cs
+++ b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/ShanDian_DieEvent.cs
@@ -76,7 +76,14 @@ public class ShanDian_DieEvent : DieEffect_TSY
}
private IEnumerator LightningRoutine()
{
- Vector3 startPos = startPoint != Vector3.zero ? startPoint : transform.position;
+ // ⭐ 闪电起点：优先用闪电鱼本体上配置的 shandianStart（ShanDianFishControl），
+ // 未配置或宿主不是闪电鱼控制脚本时，回退原来的死亡位置逻辑
+ Vector3 startPos;
+ var sdFish = monster as ShanDianFishControl;
+ if (sdFish != null && sdFish.shandianStart != null)
+ startPos = sdFish.shandianStart.position;
+ else
+ startPos = startPoint != Vector3.zero ? startPoint : transform.position;
startPos.z = 0;
_gizmoCenter = startPos;
@@ -182,6 +189,10 @@ public class ShanDian_DieEvent : DieEffect_TSY
lockedFish.Add(fishList[i]);
frozen.Add(false);
+ // ⭐ 电到的鱼定身：闪电期间停止移动
+ // （鱼被炸死后回池，重新生成时 MonsterContral.OnEnable 会恢复 isMove=baseMmove）
+ fishList[i].isMove = false;
+
// 雷电命中点特效：命中鱼身时播，强化打击感（没配跳过）
if (hitFxPrefab != null)
{
diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs
index 8d3afb4cf..1d2695eb5 100644
--- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs
+++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs
@@ -39,7 +39,11 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase
{
base.Start();
}
-
+ protected override void OnShow(object args = null)
+ {
+ base.OnShow(args);
+ AudioManager.Instance.ChangeBG(60001);
+ }
// ==================== 扇形切换：显示/更新/隐藏 ====================
/// 长按炮台达到阈值后弹出扇形切换UI
diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs
index 111dbd5b8..3ccc95b56 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs
+++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs
@@ -210,6 +210,8 @@ public class UIHome_BY_SelectRoomLevelPanel : SubUIBase
case GameType.ZGXQ:
break;
case GameType.XJMH:
+ AudioManager.Instance.ChangeBG(60001);
+
break;
case GameType.HHWK:
AudioManager.Instance.ChangeBG(61001);
diff --git a/Assets/MyGame/aa/UI/Home/UIHomeMain.cs b/Assets/MyGame/aa/UI/Home/UIHomeMain.cs
index f50f5da0a..c9303756a 100644
--- a/Assets/MyGame/aa/UI/Home/UIHomeMain.cs
+++ b/Assets/MyGame/aa/UI/Home/UIHomeMain.cs
@@ -228,7 +228,7 @@ public class UIHomeMain : UIBase
{
base.OnShow(args);
- AudioManager.Instance.ChangeBG(69001);
+ AudioManager.Instance.ChangeBG(61109);
UpdateUserData();
}