diff --git a/Assets/Framework/Tool/Camera/AddSubCamera.cs b/Assets/Framework/Tool/Camera/AddSubCamera.cs index 4482e1796..d5d8bb88d 100644 --- a/Assets/Framework/Tool/Camera/AddSubCamera.cs +++ b/Assets/Framework/Tool/Camera/AddSubCamera.cs @@ -7,6 +7,9 @@ public class AddSubCamera : MonoBehaviour { public Camera subCamera; + [Tooltip("true=鱼的相机(插入到子弹锁定层cam之前);false=鱼死亡爆奖相机(加到列表末尾,默认)")] + public bool isFishCamera = false; + private void Awake() { if (subCamera==null) @@ -17,13 +20,25 @@ public class AddSubCamera : MonoBehaviour private void Start() { UniversalAdditionalCameraData mainCameraData = GameManager.Instance.ZhuCam.GetUniversalAdditionalCameraData(); - mainCameraData.cameraStack.Add(subCamera); - // 把 GameManager 的 cam 移动到列表末尾 - Camera cam = GameManager.Instance.cam; - if (cam != null && mainCameraData.cameraStack.Remove(cam)) + if (isFishCamera) { - mainCameraData.cameraStack.Add(cam); + // 鱼相机:插到子弹锁定层(GameManager.cam)之前,即鱼和爆奖中间夹层的前面 + Camera cam = GameManager.Instance.cam; + int index = cam != null ? mainCameraData.cameraStack.IndexOf(cam) : -1; + if (index >= 0) + { + mainCameraData.cameraStack.Insert(index, subCamera); + } + else + { + mainCameraData.cameraStack.Add(subCamera); + } + } + else + { + // 爆奖相机:直接加到列表末尾(cam子弹层保持在它前面) + mainCameraData.cameraStack.Add(subCamera); } } } diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_1.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_1.prefab index 061c0fa36..b1bbdc20a 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_1.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_1.prefab @@ -1271,6 +1271,7 @@ MonoBehaviour: createVideoClip: {fileID: 0} rotationPY: 60 useMirrorCompensate: 1 + useRollSignFlip: 0 useRouteFlipX: 1 baseMmove: 0 isRotate: 1 @@ -1279,6 +1280,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: isToUI: 1 tMP_CurrBossScore: {fileID: 0} @@ -1311,3 +1315,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: subCamera: {fileID: 0} + isFishCamera: 1 diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052.prefab index 8b0df3558..7b30f0b47 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052.prefab @@ -3176,6 +3176,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.32725927 objectReference: {fileID: 0} + - target: {fileID: 2730555694560468819, guid: 4c90120c907d1d44e82867f7e8d196e2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.9987801 + objectReference: {fileID: 0} + - target: {fileID: 2730555694560468819, guid: 4c90120c907d1d44e82867f7e8d196e2, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.04938094 + objectReference: {fileID: 0} - target: {fileID: 2737501465241462677, guid: 4c90120c907d1d44e82867f7e8d196e2, type: 3} propertyPath: m_LocalPosition.x @@ -10577,6 +10587,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: subCamera: {fileID: 0} + isFishCamera: 1 --- !u!1 &2704485182280144155 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6178830404958369844, guid: 4c90120c907d1d44e82867f7e8d196e2, diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab index d2be2d6eb..052e4b901 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab @@ -5207,6 +5207,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: subCamera: {fileID: 0} + isFishCamera: 1 --- !u!1 &5282872600507429618 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5608013610277713051, guid: cf762c0a6428e1c42b456cb87803660f, @@ -6892,6 +6893,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/SSQL/7005.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/SSQL/7005.prefab index cd4679fe9..eca4c88f5 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/SSQL/7005.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/SSQL/7005.prefab @@ -13264,6 +13264,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: subCamera: {fileID: 0} + isFishCamera: 1 --- !u!1 &1010712136442984505 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3154699684453122447, guid: 1bcb895f3655d5548a9ffb4474b98605,