1
This commit is contained in:
@@ -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}
|
||||
|
||||
@@ -25,6 +25,8 @@ public class ShanDianFishControl : MonsterContral
|
||||
/// <summary>是否已触发回收(防重入)</summary>
|
||||
private bool _recycleStarted;
|
||||
|
||||
public Transform shandianStart;
|
||||
|
||||
public override void OnEnable()
|
||||
{
|
||||
base.OnEnable();
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
// ==================== 扇形切换:显示/更新/隐藏 ====================
|
||||
|
||||
/// <summary>长按炮台达到阈值后弹出扇形切换UI</summary>
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -228,7 +228,7 @@ public class UIHomeMain : UIBase
|
||||
{
|
||||
|
||||
base.OnShow(args);
|
||||
AudioManager.Instance.ChangeBG(69001);
|
||||
AudioManager.Instance.ChangeBG(61109);
|
||||
|
||||
UpdateUserData();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user