From 7ee6a1cd92daeaa91d09efcce76c2a07b1c68f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Tue, 9 Jun 2026 20:20:30 +0800 Subject: [PATCH] 1 --- Assets/Art/FengLei/Fish/1.prefab | 18 +-- Assets/Art/FengLei/Fish/10.prefab | 10 +- Assets/Art/FengLei/Fish/12.prefab | 10 +- Assets/Art/FengLei/Fish/14.prefab | 8 +- Assets/Art/FengLei/Fish/19.prefab | 8 +- Assets/Art/FengLei/Fish/20.prefab | 8 +- Assets/Art/FengLei/Fish/21.prefab | 10 +- Assets/Art/FengLei/Fish/22.prefab | 10 +- Assets/Art/FengLei/Fish/24.prefab | 10 +- Assets/Art/FengLei/Fish/25.prefab | 10 +- Assets/Art/FengLei/Fish/26.prefab | 10 +- Assets/Art/FengLei/Fish/42.prefab | 10 +- Assets/Art/FengLei/Fish/45.prefab | 6 +- Assets/Art/FengLei/Fish/48.prefab | 8 +- Assets/Art/FengLei/Fish/53.prefab | 4 +- Assets/Art/FengLei/Fish/61.prefab | 6 +- Assets/Art/FengLei/Fish/63.prefab | 6 +- Assets/Art/FengLei/Fish/68.prefab | 8 +- Assets/Art/FengLei/Fish/69.prefab | 6 +- Assets/Art/FengLei/Fish/71.prefab | 6 +- Assets/Art/FengLei/Fish/72.prefab | 6 +- Assets/Art/FengLei/Fish/8.prefab | 122 +----------------- .../Art/HHWK/prefab/fish/Game177_fish1.prefab | 7 +- Assets/MyGame/Scenes/FLZY.unity | 2 +- Assets/MyGame/Scenes/UIScene.unity | 4 +- .../Characters/Monster/MonsterContral.cs | 113 +++++++++++++--- .../MyGame/aa/Game/FLZY/BOSS/DLY/6012.prefab | 2 + .../MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab | 2 + .../MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab | 2 + .../MyGame/aa/Game/FLZY/BOSS/LLBT/192.prefab | 8 +- .../MyGame/aa/Game/FLZY/BOSS/PTS/182.prefab | 2 + .../MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab | 2 + .../MyGame/aa/Game/FLZY/BOSS/TSK/171.prefab | 26 ++-- .../MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab | 2 + 34 files changed, 253 insertions(+), 219 deletions(-) diff --git a/Assets/Art/FengLei/Fish/1.prefab b/Assets/Art/FengLei/Fish/1.prefab index 098e62450..ee0be5f7d 100644 --- a/Assets/Art/FengLei/Fish/1.prefab +++ b/Assets/Art/FengLei/Fish/1.prefab @@ -802,7 +802,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4659075296069922 Transform: m_ObjectHideFlags: 0 @@ -811,8 +811,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1445621218403147} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 6.286251, y: -98, z: -2.061573} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1.79} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: @@ -825,7 +825,7 @@ Transform: - {fileID: 4602871620977740} - {fileID: 5566352810725816449} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8522120771046664843 MonoBehaviour: m_ObjectHideFlags: 0 @@ -860,13 +860,15 @@ MonoBehaviour: currEffect_DieAward: {fileID: 0} isMove: 1 is3D: 1 - forwordXYZ: Z + forwordXYZ: -Z fishenum: 0 moveTime: 0 isyz: 0 yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 560 --- !u!1 &1470420886364660 GameObject: m_ObjectHideFlags: 0 @@ -924,8 +926,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1475268640368160} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0.00000016858739} - m_LocalPosition: {x: 0, y: 0, z: 560} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -560, y: 0, z: 0} m_LocalScale: {x: 1.4, y: 1.4, z: 1.4} m_ConstrainProportionsScale: 0 m_Children: @@ -933,7 +935,7 @@ Transform: - {fileID: 4349160784336160} - {fileID: 4442302019423268} m_Father: {fileID: 4659075296069922} - m_LocalEulerAnglesHint: {x: 180, y: -0.000019318692, z: -180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!111 &111407255110353167 Animation: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/10.prefab b/Assets/Art/FengLei/Fish/10.prefab index 0ab291f3f..d6ba8097c 100644 --- a/Assets/Art/FengLei/Fish/10.prefab +++ b/Assets/Art/FengLei/Fish/10.prefab @@ -116,7 +116,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4078363723584466 Transform: m_ObjectHideFlags: 0 @@ -125,14 +125,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1520778081668337} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5402973354752257021} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2784966270829531488 MonoBehaviour: m_ObjectHideFlags: 0 @@ -174,6 +174,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 0 --- !u!58 &5875499656228919181 CircleCollider2D: m_ObjectHideFlags: 0 @@ -916,7 +918,7 @@ Transform: m_GameObject: {fileID: 5576771128561197059} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 570} + m_LocalPosition: {x: -570, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Art/FengLei/Fish/12.prefab b/Assets/Art/FengLei/Fish/12.prefab index 1e8684929..c6fbdc505 100644 --- a/Assets/Art/FengLei/Fish/12.prefab +++ b/Assets/Art/FengLei/Fish/12.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4100999638978010 Transform: m_ObjectHideFlags: 0 @@ -26,14 +26,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1919709823105721} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 510189618584566419} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1198468216662936298 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75,6 +75,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 510 --- !u!58 &7588124470520715557 CircleCollider2D: m_ObjectHideFlags: 0 @@ -3528,7 +3530,7 @@ Transform: m_GameObject: {fileID: 5350638735978951586} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 510} + m_LocalPosition: {x: 0, y: -510, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Art/FengLei/Fish/14.prefab b/Assets/Art/FengLei/Fish/14.prefab index cfc43aefa..f04ceea92 100644 --- a/Assets/Art/FengLei/Fish/14.prefab +++ b/Assets/Art/FengLei/Fish/14.prefab @@ -2683,7 +2683,7 @@ Transform: m_GameObject: {fileID: 1327519865101969} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 460} + m_LocalPosition: {x: -460, y: 0, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} m_ConstrainProportionsScale: 0 m_Children: @@ -3136,7 +3136,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1518955388836188} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 @@ -3151,7 +3151,7 @@ Transform: - {fileID: 4909741189358609} - {fileID: 4878096523961812} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5566316568590797992 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3193,6 +3193,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 460 --- !u!58 &-629229860599313321 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/19.prefab b/Assets/Art/FengLei/Fish/19.prefab index 07af1ab58..dc05930c8 100644 --- a/Assets/Art/FengLei/Fish/19.prefab +++ b/Assets/Art/FengLei/Fish/19.prefab @@ -57,7 +57,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1035969607979976} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 @@ -72,7 +72,7 @@ Transform: - {fileID: 4875841909666889} - {fileID: 4553120499313586} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3780368797843437576 MonoBehaviour: m_ObjectHideFlags: 0 @@ -114,6 +114,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 450 --- !u!58 &-7404038563776321154 CircleCollider2D: m_ObjectHideFlags: 0 @@ -5629,7 +5631,7 @@ Transform: m_GameObject: {fileID: 1483013470714471} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 450} + m_LocalPosition: {x: -450, y: 0, z: 0} m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Art/FengLei/Fish/20.prefab b/Assets/Art/FengLei/Fish/20.prefab index fd63cb5b5..566a4907c 100644 --- a/Assets/Art/FengLei/Fish/20.prefab +++ b/Assets/Art/FengLei/Fish/20.prefab @@ -16,7 +16,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4160130377520515 Transform: m_ObjectHideFlags: 0 @@ -32,7 +32,7 @@ Transform: m_Children: - {fileID: 1555986309729892503} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6741873905331338212 MonoBehaviour: m_ObjectHideFlags: 0 @@ -74,6 +74,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 440 --- !u!1 &602233066434077788 GameObject: m_ObjectHideFlags: 0 @@ -1364,7 +1366,7 @@ Transform: m_GameObject: {fileID: 8280867837136048244} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -440, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Art/FengLei/Fish/21.prefab b/Assets/Art/FengLei/Fish/21.prefab index e7592bf06..73d14f717 100644 --- a/Assets/Art/FengLei/Fish/21.prefab +++ b/Assets/Art/FengLei/Fish/21.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4994900170473604 Transform: m_ObjectHideFlags: 0 @@ -26,14 +26,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1274441349196877} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6975737764667625116} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2899286559316909171 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75,6 +75,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 0 --- !u!58 &4613939489732361349 CircleCollider2D: m_ObjectHideFlags: 0 @@ -1080,7 +1082,7 @@ Transform: m_GameObject: {fileID: 4158437150925087428} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 600} + m_LocalPosition: {x: -600, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Art/FengLei/Fish/22.prefab b/Assets/Art/FengLei/Fish/22.prefab index d3aeae506..ca72f6cfd 100644 --- a/Assets/Art/FengLei/Fish/22.prefab +++ b/Assets/Art/FengLei/Fish/22.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4306706668887030 Transform: m_ObjectHideFlags: 0 @@ -26,14 +26,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1622319138710285} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 324278212077434549} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5347908797294633520 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75,6 +75,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 520 --- !u!58 &3685137847134021022 CircleCollider2D: m_ObjectHideFlags: 0 @@ -3408,7 +3410,7 @@ Transform: m_GameObject: {fileID: 8261004080136400705} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 520} + m_LocalPosition: {x: -520, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Art/FengLei/Fish/24.prefab b/Assets/Art/FengLei/Fish/24.prefab index 5e7728b40..391e55342 100644 --- a/Assets/Art/FengLei/Fish/24.prefab +++ b/Assets/Art/FengLei/Fish/24.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4132120083555546 Transform: m_ObjectHideFlags: 0 @@ -26,14 +26,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1107835332477205} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6696715820947037827} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7497834960692292019 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75,6 +75,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 550 --- !u!58 &4133188768899083157 CircleCollider2D: m_ObjectHideFlags: 0 @@ -356,7 +358,7 @@ Transform: m_GameObject: {fileID: 2054732514694136103} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 550} + m_LocalPosition: {x: -550, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Art/FengLei/Fish/25.prefab b/Assets/Art/FengLei/Fish/25.prefab index 6a946103d..8c121c942 100644 --- a/Assets/Art/FengLei/Fish/25.prefab +++ b/Assets/Art/FengLei/Fish/25.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4247756626059511 Transform: m_ObjectHideFlags: 0 @@ -26,14 +26,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1629801018240169} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5086558785257145822} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8100614694026913315 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75,6 +75,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 500 --- !u!58 &6080882259930068445 CircleCollider2D: m_ObjectHideFlags: 0 @@ -3384,7 +3386,7 @@ Transform: m_GameObject: {fileID: 3942455264122695782} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 500} + m_LocalPosition: {x: -500, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Art/FengLei/Fish/26.prefab b/Assets/Art/FengLei/Fish/26.prefab index 5b98cfc15..bec9d38d6 100644 --- a/Assets/Art/FengLei/Fish/26.prefab +++ b/Assets/Art/FengLei/Fish/26.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1000744976828961} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 430} + m_LocalPosition: {x: -430, y: 0, z: 0} m_LocalScale: {x: 3.5, y: 3.5, z: 3.5} m_ConstrainProportionsScale: 0 m_Children: @@ -3642,7 +3642,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4316282737597189 Transform: m_ObjectHideFlags: 0 @@ -3651,7 +3651,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1770618399549029} serializedVersion: 2 - m_LocalRotation: {x: -0.16727655, y: -0.7690976, z: 0.109644756, w: 0.6070301} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 @@ -3668,7 +3668,7 @@ Transform: - {fileID: 4839184613414529} - {fileID: 6258223025056505649} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -178.027, y: 76.165, z: -157.005} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2473705518758099591 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3710,6 +3710,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 430 --- !u!1 &1785410037514682 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/42.prefab b/Assets/Art/FengLei/Fish/42.prefab index be0a8f9fa..57129fe39 100644 --- a/Assets/Art/FengLei/Fish/42.prefab +++ b/Assets/Art/FengLei/Fish/42.prefab @@ -5297,7 +5297,7 @@ Transform: m_GameObject: {fileID: 1577077665663875} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 470} + m_LocalPosition: {x: 0, y: -470, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5402,7 +5402,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4687509073537306 Transform: m_ObjectHideFlags: 0 @@ -5411,7 +5411,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1896437551708697} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 @@ -5424,7 +5424,7 @@ Transform: - {fileID: 4531122316194804} - {fileID: 4058331271751996} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8037332194557063029 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5466,6 +5466,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 470 --- !u!58 &-2163087482749901798 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/45.prefab b/Assets/Art/FengLei/Fish/45.prefab index fbb8441b5..5dccee538 100644 --- a/Assets/Art/FengLei/Fish/45.prefab +++ b/Assets/Art/FengLei/Fish/45.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4245709332210029 Transform: m_ObjectHideFlags: 0 @@ -33,7 +33,7 @@ Transform: m_Children: - {fileID: 5139356319295488895} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2942178873987708113 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75,6 +75,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 490 --- !u!58 &-6866065024429339140 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/48.prefab b/Assets/Art/FengLei/Fish/48.prefab index a95475663..1e9ac828c 100644 --- a/Assets/Art/FengLei/Fish/48.prefab +++ b/Assets/Art/FengLei/Fish/48.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4561096802472947 Transform: m_ObjectHideFlags: 0 @@ -26,14 +26,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1571740582362967} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4036846393021004735} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7965036302269272141 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75,6 +75,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 540 --- !u!58 &-1529010931143686574 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/53.prefab b/Assets/Art/FengLei/Fish/53.prefab index 6058d0273..1521b0ed7 100644 --- a/Assets/Art/FengLei/Fish/53.prefab +++ b/Assets/Art/FengLei/Fish/53.prefab @@ -15663,7 +15663,7 @@ Transform: - {fileID: 4321846029186879} - {fileID: 4269242581144960} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3979651329238090483 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15705,6 +15705,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 370 --- !u!58 &542546102576673714 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/61.prefab b/Assets/Art/FengLei/Fish/61.prefab index 4f46583c1..d3a202d16 100644 --- a/Assets/Art/FengLei/Fish/61.prefab +++ b/Assets/Art/FengLei/Fish/61.prefab @@ -5032,7 +5032,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1443308515858107} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 @@ -5045,7 +5045,7 @@ Transform: - {fileID: 4989804905484985} - {fileID: 4568603430142055} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7263991628982252187 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5087,6 +5087,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 410 --- !u!58 &2294229368530505444 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/63.prefab b/Assets/Art/FengLei/Fish/63.prefab index 710fdee19..7f893978f 100644 --- a/Assets/Art/FengLei/Fish/63.prefab +++ b/Assets/Art/FengLei/Fish/63.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4838960281201077 Transform: m_ObjectHideFlags: 0 @@ -33,7 +33,7 @@ Transform: m_Children: - {fileID: 5419018304885451137} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6301178990003531122 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75,6 +75,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 480 --- !u!61 &5797039828989640439 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/68.prefab b/Assets/Art/FengLei/Fish/68.prefab index c6b197c79..041a62431 100644 --- a/Assets/Art/FengLei/Fish/68.prefab +++ b/Assets/Art/FengLei/Fish/68.prefab @@ -249,7 +249,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4826112363533313 Transform: m_ObjectHideFlags: 0 @@ -258,7 +258,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1329697773224981} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 @@ -270,7 +270,7 @@ Transform: - {fileID: 4521969692173736} - {fileID: 4726591611708022} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &136315372152364516 MonoBehaviour: m_ObjectHideFlags: 0 @@ -312,6 +312,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 530 --- !u!58 &-5738876038870129396 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/69.prefab b/Assets/Art/FengLei/Fish/69.prefab index 6a66db615..bd1af5991 100644 --- a/Assets/Art/FengLei/Fish/69.prefab +++ b/Assets/Art/FengLei/Fish/69.prefab @@ -8828,7 +8828,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1780455865526223} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 @@ -8840,7 +8840,7 @@ Transform: - {fileID: 4246008023531787} - {fileID: 4559516090300938} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &335438513529251162 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8882,6 +8882,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 360 --- !u!58 &-8047950558801873801 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/71.prefab b/Assets/Art/FengLei/Fish/71.prefab index b449539b2..b57ed5fab 100644 --- a/Assets/Art/FengLei/Fish/71.prefab +++ b/Assets/Art/FengLei/Fish/71.prefab @@ -5361,7 +5361,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490498420140201} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 @@ -5374,7 +5374,7 @@ Transform: - {fileID: 4846837542987979} - {fileID: 4375198399705453} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7919758367246967815 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5416,6 +5416,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 390 --- !u!58 &3545513974151402463 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/72.prefab b/Assets/Art/FengLei/Fish/72.prefab index d137baa4e..db1031ebb 100644 --- a/Assets/Art/FengLei/Fish/72.prefab +++ b/Assets/Art/FengLei/Fish/72.prefab @@ -88,7 +88,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085337162103255} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0.8208836, z: 0, w: 0.57109565} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 @@ -101,7 +101,7 @@ Transform: - {fileID: 4848180662614197} - {fileID: 4838565843250125} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 180, y: 69.65333, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7197332762272978495 MonoBehaviour: m_ObjectHideFlags: 0 @@ -143,6 +143,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 420 --- !u!61 &3852621092898274399 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/8.prefab b/Assets/Art/FengLei/Fish/8.prefab index e31189cbd..f448c83e4 100644 --- a/Assets/Art/FengLei/Fish/8.prefab +++ b/Assets/Art/FengLei/Fish/8.prefab @@ -27,14 +27,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1438665609007499} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4649375054619526726} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6194052780533312810 MonoBehaviour: m_ObjectHideFlags: 0 @@ -76,6 +76,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 580 --- !u!58 &4903674384446589839 CircleCollider2D: m_ObjectHideFlags: 0 @@ -454,9 +456,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4649375054619526726} - - component: {fileID: 3653161534081860061} - - component: {fileID: 3879733779077889882} - - component: {fileID: 6523482949786992459} m_Layer: 6 m_Name: 8 m_TagString: Fish @@ -473,7 +472,7 @@ Transform: m_GameObject: {fileID: 2140373513010887800} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 580} + m_LocalPosition: {x: -580, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -481,117 +480,6 @@ Transform: - {fileID: 6907454459912495361} m_Father: {fileID: 4211869767440078} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!114 &3653161534081860061 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140373513010887800} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5e5dca86a57fe2144a34f1f2ddb93962, type: 3} - m_Name: - m_EditorClassIdentifier: - beilv: 0 - guid: - monsterData: - die_Score: 0 - isDie: 0 - fishTypeConfig: - fishNumber: - fishName: - fishType: 0 - fishScore: 0 - killWeight: 0 - pathList: - skeleton: {fileID: 0} - isSpine: 1 - fishTypeID: 11002 - currState: 0 - HP: 5 - effect_Die: {fileID: 0} - effect_DieAward: {fileID: 0} - currEffect_DieAward: {fileID: 0} - isMove: 1 - is3D: 1 - forwordXYZ: Z - fishenum: 0 - moveTime: 0 - isyz: 0 - yzID: - colliderList: [] - isRotate: 1 ---- !u!58 &3879733779077889882 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140373513010887800} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.39 ---- !u!58 &6523482949786992459 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140373513010887800} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.5 --- !u!1 &2654640153174399479 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Art/HHWK/prefab/fish/Game177_fish1.prefab b/Assets/Art/HHWK/prefab/fish/Game177_fish1.prefab index 806c65a7e..3d904f2c0 100644 --- a/Assets/Art/HHWK/prefab/fish/Game177_fish1.prefab +++ b/Assets/Art/HHWK/prefab/fish/Game177_fish1.prefab @@ -533,7 +533,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4002669891404536 Transform: m_ObjectHideFlags: 0 @@ -607,6 +607,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e5dca86a57fe2144a34f1f2ddb93962, type: 3} m_Name: m_EditorClassIdentifier: + beilv: 0 guid: monsterData: die_Score: 0 @@ -625,6 +626,7 @@ MonoBehaviour: HP: 5 effect_Die: {fileID: 0} effect_DieAward: {fileID: 0} + currEffect_DieAward: {fileID: 0} isMove: 1 is3D: 0 forwordXYZ: X @@ -632,7 +634,10 @@ MonoBehaviour: moveTime: 0 isyz: 0 yzID: + colliderList: [] isRotate: 1 + ischild0: 0 + depthOffset: 0 --- !u!1 &1709867586078768 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/Scenes/FLZY.unity b/Assets/MyGame/Scenes/FLZY.unity index b0b12b38c..03f4f5492 100644 --- a/Assets/MyGame/Scenes/FLZY.unity +++ b/Assets/MyGame/Scenes/FLZY.unity @@ -147,7 +147,7 @@ Transform: m_GameObject: {fileID: 814180750} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1000} + m_LocalPosition: {x: 0, y: 0, z: 9000} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index 24cbe980e..e37559ecc 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -2321,7 +2321,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1096182886 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3266,7 +3266,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 3000 + far clip plane: 10000 field of view: 60 orthographic: 1 orthographic size: 25 diff --git a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs index 5829dc198..6ac7f8e22 100644 --- a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs +++ b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs @@ -347,45 +347,128 @@ public class MonsterContral : MonoBehaviour /// 为空时 2D 鱼用 up，3D 鱼用 forward。 /// /// 下一帧目标位置 + //private void ApplyFacingDirection(Vector2 nextPos) + //{ + // if (!isRotate) return; + + // Vector2 toNext = nextPos - (Vector2)transform.position; + + // if (toNext.sqrMagnitude < 0.0001f) return; // 避免零向量 + + // if (string.IsNullOrEmpty(forwordXYZ)) + // { + // if (!is3D) + // { + // // 2D 用 up，推荐用 Quaternion.AngleAxis + // float angle = Mathf.Atan2(toNext.y, toNext.x) * Mathf.Rad2Deg; + // transform.rotation = Quaternion.AngleAxis(angle - 90f, Vector3.forward); + // } + // else + // { + // // 3D 用 forward，推荐用 LookRotation + // transform.rotation = Quaternion.LookRotation(toNext.normalized, Vector3.up); + // } + // return; + // } + // if (monsterData.fishTypeConfig.fishNumber=="11024") + // { + + // } + // //if (ischild0) + // //{ + // // switch (forwordXYZ) + // // { + // // case "X": transform.GetChild(0).right = toNext.normalized; break; + // // case "-X": transform.GetChild(0).right = -toNext.normalized; break; + // // case "Y": transform.GetChild(0).up = toNext.normalized; break; + // // case "-Y": transform.GetChild(0).up = -toNext.normalized; break; + // // case "Z": transform.GetChild(0).forward = toNext.normalized; break; + // // case "-Z": transform.GetChild(0).forward = -toNext.normalized; break; + // // } + // //} + // //else + // { + // switch (forwordXYZ) + // { + // case "X": transform.right = toNext.normalized; break; + // case "-X": transform.right = -toNext.normalized; break; + // case "Y": transform.up = toNext.normalized; break; + // case "-Y": transform.up = -toNext.normalized; break; + // case "Z": transform.forward = toNext.normalized; break; + // case "-Z": transform.forward = -toNext.normalized; break; + // } + // } + + + //} private void ApplyFacingDirection(Vector2 nextPos) { if (!isRotate) return; Vector2 toNext = nextPos - (Vector2)transform.position; + if (toNext.sqrMagnitude < 0.0001f) return; - if (toNext.sqrMagnitude < 0.0001f) return; // 避免零向量 - + // 处理未指定朝向轴的情况（默认行为） if (string.IsNullOrEmpty(forwordXYZ)) { if (!is3D) { - // 2D 用 up，推荐用 Quaternion.AngleAxis float angle = Mathf.Atan2(toNext.y, toNext.x) * Mathf.Rad2Deg; transform.rotation = Quaternion.AngleAxis(angle - 90f, Vector3.forward); } else { - // 3D 用 forward，推荐用 LookRotation transform.rotation = Quaternion.LookRotation(toNext.normalized, Vector3.up); } return; } - if (monsterData.fishTypeConfig.fishNumber=="11024") + + // 是否为子物体单独控制朝向和深度 + if (ischild0) { - + Transform child = transform.GetChild(0); + Vector3 localPos = Vector3.zero; + + // 父物体朝向 + switch (forwordXYZ) + { + case "X": transform.right = toNext.normalized; break; + case "-X": transform.right = -toNext.normalized; break; + case "Y": transform.up = toNext.normalized; break; + case "-Y": transform.up = -toNext.normalized; break; + case "Z": transform.forward = toNext.normalized; break; + case "-Z": transform.forward = -toNext.normalized; break; + } + + // 子物体深度偏移：方向正 → 偏移正，方向负 → 偏移负 + switch (forwordXYZ) + { + case "X": localPos.z = depthOffset; break; + case "-X": localPos.z = -depthOffset; break; + case "Y": localPos.x = depthOffset; break; + case "-Y": localPos.x = -depthOffset; break; + case "Z": localPos.x = depthOffset; break; + case "-Z": localPos.x = -depthOffset; break; + } + + child.localPosition = localPos; } - switch (forwordXYZ) + else { - case "X": transform.right = toNext.normalized; break; - case "-X": transform.right = -toNext.normalized; break; - case "Y": transform.up = toNext.normalized; break; - case "-Y": transform.up = -toNext.normalized; break; - case "Z": transform.forward = toNext.normalized; break; - case "-Z": transform.forward = -toNext.normalized; break; + // 控制父物体自身朝向 + switch (forwordXYZ) + { + case "X": transform.right = toNext.normalized; break; + case "-X": transform.right = -toNext.normalized; break; + case "Y": transform.up = toNext.normalized; break; + case "-Y": transform.up = -toNext.normalized; break; + case "Z": transform.forward = toNext.normalized; break; + case "-Z": transform.forward = -toNext.normalized; break; + } } } - - + public bool ischild0 = false; + public int depthOffset; // ================================================================ // 动画 // ================================================================ diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/DLY/6012.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/DLY/6012.prefab index 6936bacb3..73f0ffd77 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/DLY/6012.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/DLY/6012.prefab @@ -600,6 +600,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 100 bossName: isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab index 964352fe9..efd71510d 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab @@ -902,6 +902,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 0 + ischild0: 1 + depthOffset: 50 bossName: "\u7984\u5B58\u661F\u541B" isToUI: 0 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab index ac2d003f2..c75f90c87 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab @@ -1795,6 +1795,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 0 + ischild0: 1 + depthOffset: 250 bossName: "\u805A\u5B9D\u76C6" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/192.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/192.prefab index cf84be491..5567d4eb8 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/192.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/192.prefab @@ -2320,6 +2320,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 0 + ischild0: 1 + depthOffset: 280 bossName: "\u66F2\u7EBF" isToUI: 1 tMP_CurrBossScore: {fileID: 0} @@ -4491,15 +4493,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4593764335355068, guid: ea90a670ee15ab0499ecc238704cc08f, type: 3} propertyPath: m_LocalScale.x - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4593764335355068, guid: ea90a670ee15ab0499ecc238704cc08f, type: 3} propertyPath: m_LocalScale.y - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4593764335355068, guid: ea90a670ee15ab0499ecc238704cc08f, type: 3} propertyPath: m_LocalScale.z - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4593764335355068, guid: ea90a670ee15ab0499ecc238704cc08f, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/PTS/182.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/PTS/182.prefab index 063569233..c9f6dea42 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/PTS/182.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/PTS/182.prefab @@ -243,6 +243,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 0 + ischild0: 1 + depthOffset: 180 bossName: "\u66F2\u7EBF" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab index 4fc6dbc2a..57f443b69 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/SLZP/1507.prefab @@ -179,6 +179,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 0 + ischild0: 1 + depthOffset: 210 bossName: "\u66F2\u7EBF" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/171.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/171.prefab index 11b851167..db3b53d9f 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/171.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/171.prefab @@ -296,7 +296,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1340477147762327, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1340477147762327, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_TagString @@ -556,15 +556,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalScale.x - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalScale.y - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalScale.z - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalPosition.x @@ -677,6 +677,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 300 bossName: "\u66F2\u7EBF" isToUI: 0 tMP_CurrBossScore: {fileID: 0} @@ -1096,15 +1098,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalScale.x - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalScale.y - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalScale.z - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalPosition.x @@ -1120,19 +1122,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalRotation.w - value: 0.70223415 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalRotation.y - value: -0.71194607 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1140,7 +1142,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90.787 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4481218116084082, guid: b8b9fc4bfcee1a44c83f2026292a62cd, type: 3} propertyPath: m_LocalEulerAnglesHint.z diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab index 5db3c5a11..96d89cb77 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab @@ -618,6 +618,8 @@ MonoBehaviour: yzID: colliderList: [] isRotate: 1 + ischild0: 1 + depthOffset: 180 bossName: "\u66F2\u7EBF" isToUI: 0 tMP_CurrBossScore: {fileID: 0}