From 32f669ec6a2629dfe46f52f3c3e61dd7c0162392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Sun, 11 Oct 2026 16:51:07 +0800 Subject: [PATCH] 1 --- .../model/fish/s/4022/material/4022 1.mat | 69 +++- .../game/enemy/XJMHEnemy/PW_Enemy_1.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_1000.prefab | 12 +- .../game/enemy/XJMHEnemy/PW_Enemy_101.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_102.prefab | 2 +- .../game/enemy/XJMHEnemy/PW_Enemy_103.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_104.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_105.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_106.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_107.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_108.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_109.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_110.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_111.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_112.prefab | 12 +- .../game/enemy/XJMHEnemy/PW_Enemy_113.prefab | 12 +- .../game/enemy/XJMHEnemy/PW_Enemy_114.prefab | 7 +- .../game/enemy/XJMHEnemy/PW_Enemy_115.prefab | 9 +- .../game/enemy/XJMHEnemy/PW_Enemy_2.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_2000.prefab | 12 +- .../game/enemy/XJMHEnemy/PW_Enemy_3.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_3000.prefab | 12 +- .../game/enemy/XJMHEnemy/PW_Enemy_31.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_32.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_4.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_4000.prefab | 12 +- .../game/enemy/XJMHEnemy/PW_Enemy_5.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_5000.prefab | 12 +- .../game/enemy/XJMHEnemy/PW_Enemy_6.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_6000.prefab | 12 +- .../game/enemy/XJMHEnemy/PW_Enemy_7.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_8.prefab | 3 +- .../game/enemy/XJMHEnemy/PW_Enemy_9.prefab | 3 +- Assets/MyGame/Scenes/UIScene.unity | 2 +- Assets/MyGame/Scenes/XJMH.unity | 8 +- Assets/MyGame/Scripts/Turret/TurretData.cs | 12 + .../Game/DefaultDieEffect/Coin/CoinScript.cs | 4 +- .../MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab | 145 +++++++ .../XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab | 377 ++++++++++++++++-- .../aa/UI/Game/GameMainPanel_FishBase.cs | 114 ++++++ 40 files changed, 820 insertions(+), 88 deletions(-) diff --git a/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat b/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat index c058f6711..1f90dafbf 100644 --- a/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat +++ b/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/s/4022/material/4022 1.mat @@ -8,24 +8,24 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 4022 1 - m_Shader: {fileID: 4800000, guid: b4718caa1a00b5f448f74c5f56545772, type: 3} + m_Shader: {fileID: 4800000, guid: 40d1d1bdf1ce4704bbd337945e74d2ff, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _CUSTOMLIGHT_ADD - - _MATCAP_ON - - _USEINDIRSPECULAR_ON + m_ValidKeywords: [] m_InvalidKeywords: + - _CUSTOMLIGHT_ADD - _CUSTOMLIGHT_ON_ON - _DIRECTIONALFRESNEL_ON - _EMISSION_COLOR - _Hit_RIM + - _MATCAP_ON + - _USEINDIRSPECULAR_ON + - _USEUNITYINDIRSPECULAR_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque + m_CustomRenderQueue: -1 + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -63,6 +63,14 @@ Material: m_Texture: {fileID: 2800000, guid: 20fcdf3e22fb6c842a179350528030f7, type: 3} m_Scale: {x: 1.45, y: 1.3} m_Offset: {x: 0.46, y: 2.61} + - _GradientMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _HeightMap: + m_Texture: {fileID: 2800000, guid: 1c49757f009697444ac14538d9500d04, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IndirCubeMap: m_Texture: {fileID: 8900000, guid: b0a4cad9653bde841ae391342a330f1f, type: 3} m_Scale: {x: 1, y: 1} @@ -79,6 +87,14 @@ Material: m_Texture: {fileID: 2800000, guid: 09b3408148e3e50409a934eea467a268, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MetalSmoothTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 2800000, guid: 119073b3336f40b4eacdd1812fddd5f9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _NormalTex: m_Texture: {fileID: 2800000, guid: 119073b3336f40b4eacdd1812fddd5f9, type: 3} m_Scale: {x: 1, y: 1} @@ -94,6 +110,7 @@ Material: m_Ints: [] m_Floats: - _ACES_Enable: 0 + - _AOIntensity: 1 - _AOScale: 1 - _AlphaClip: 1 - _AlphaIgnoreMetallicEnable: 0 @@ -111,13 +128,16 @@ Material: - _ClearcoatSaturation: 1 - _ClearcoatSmooth: 0.25 - _ClearcoatThreshold: 0 + - _ClipOffset: 0 - _Contrast: 1.03 + - _CosMin: 0.01 - _CullMode: 2 - _CustomAddLightIntensity: 1 - _CustomMainLightIntensity: 1 - _DISSOLVE_ON: 0 - _DarkSmooth: 0.4 - _DarkThreshold: 0.3 + - _DirLightExposure: 0.8 - _DirectionalFresnel: 1 - _DissAmount: 0 - _DissolveSpread: 0.11 @@ -128,6 +148,7 @@ Material: - _EmissionChannel: 0 - _EmissionExposure: 1 - _EnablePersp: 0 + - _EnvExposure: 0.96 - _FalloffFactor: 0.5 - _FixBrightness: 1.05 - _FixContrast: 1.05 @@ -144,11 +165,13 @@ Material: - _FrozenEnable: 0 - _FrozenNormalMapScale: 1 - _FrozenSpecularPow: 5 + - _GradientOffset: 0.35 - _HalfLambertFactor: 0.5 - _HitRimHardness: 5 - _HitRimRange: 1.2 - _Hit_RIM: 1 - _IgnoreRoughness: 0 + - _IndirIntensity: 1 - _IndirPow: 1.26 - _IndirRadius: 0.1 - _Iridescence: 1 @@ -157,6 +180,7 @@ Material: - _IridescenceThickness2: 1 - _Iridescence_Enhance_On: 0 - _Iridescence_On: 0 + - _LightMapExposure: 1 - _LocalPositionRange: 0 - _MainTexMipmapBias: 0 - _MatcapEnable: 1 @@ -170,11 +194,15 @@ Material: - _MetalicRemapMax: 1 - _MetalicRemapMin: 0 - _MetallicScale: 1 + - _Metalness: 1 - _MipmapLevel: 2 - _Mode: 0 - _NometalReflProbeIntensity: 0.3 - _NormalScale: 1 - _ObejectUVSwitch: 0 + - _Parallax: 0.329 + - _PointLightExposure: 1 + - _PunctualLightSpecularExposure: 1 - _QueueOffset: 0 - _RIM_ON: 0 - _RealAlpha: 1 @@ -182,36 +210,55 @@ Material: - _ReflectThreshold: 0.3 - _RimHardness: 3.54 - _RimMultiSelfColor: 0 + - _RimPower: 2.1 - _RimRange: 0.91 + - _RotateAngle: 0 - _RotateAngleX: 250 - _RotateAngleY: 238 - _RotateSpeedX: 0 - _RotateSpeedY: 0 + - _Roughness: 1 - _RoughnessRemapMax: 1 - _RoughnessRemapMin: 0.9 - _RoughnessScale: 1 + - _SHExposure: 0.53 - _SSSEnable: 0 - _SSSStrength: 1 - _Saturation1: 0.8 + - _Scale: 4.58 - _SecondLobeWeight: 0.5 - _SelfShadowSwitch: 0 + - _ShadowDarkness: 0 + - _SkinSSSTransmission: 0.866 + - _SkinSSSfresnelMask: 0.128 - _SparkDensity: 20 - _SparkIntensity: 1 - _SparkRange: 0.5 + - _SpecSize: 0.488 - _SrcBlend: 1 - _ThicknessMax: 1 - _ThicknessMin: 0 + - _TransDistortion: 0.2 + - _TransLightScale: 2 + - _TransPower: 1 - _UseCompAO: 0 - _UseIndirSpecular: 1 - _UseLocalPosDissolve: 0 + - _UseUnityIndirSpecular: 1 - _VertexFragNormalSwitch: 0 + - _VertexOffsetIntensity: 44.6 + - _VertexOffsetNoise: 0 - _ZWrite: 1 + - _envBDRFFactor: 0.58 m_Colors: + - _ColorBottom: {r: 0, g: 1, b: 0, a: 1} + - _ColorTop: {r: 0, g: 1, b: 1, a: 1} - _CustomAddLightColor: {r: 1, g: 1, b: 1, a: 0} - _CustomAddLightDir: {r: 0, g: 0, b: -1, a: 1} - _CustomMainLightColor: {r: 1, g: 1, b: 1, a: 0} - _CustomMainLightDir: {r: 3.68, g: 45, b: -7.7, a: 0} - _DarkColor: {r: 0.5773585, g: 0.3823638, b: 0.5045992, a: 1} + - _DirLightColor: {r: 1, g: 1, b: 1, a: 0} - _EdgeColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0} - _EmissionCol: {r: 2.131138, g: 0.5640787, b: 3.98616, a: 0} - _FalloffColor: {r: 1, g: 1, b: 1, a: 1} @@ -221,6 +268,7 @@ Material: - _FrozenDiffuseSideColor: {r: 0, g: 0.27999997, b: 0.45999992, a: 1} - _FrozenDiffuseUpColor: {r: 0.72, g: 0.9, b: 1, a: 1} - _FrozenLight: {r: 1, g: 1, b: 1, a: 1} + - _HardRimColor: {r: 0, g: 0, b: 0, a: 1} - _HitRimDirection: {r: 0, g: 0, b: 0, a: 0} - _IndirColor: {r: 0, g: 0.35, b: 0.94716984, a: 1} - _LocalPosDir: {r: 0, g: 1, b: 0, a: 0} @@ -231,6 +279,11 @@ Material: - _RimColor: {r: 6.309434, g: 1.1376873, b: 0.17856781, a: 0} - _RimViewDirOffsetXYZ: {r: 0, g: 0, b: 5, a: 0} - _SSSColor: {r: 0.5, g: 0.28, b: 0.23, a: 0} + - _ShadowCol: {r: 0, g: 0, b: 0, a: 0} + - _SkinSSSScatterColor: {r: 1, g: 0.3161765, b: 0.3161765, a: 0} + - _SoftRimColor: {r: 0, g: 0, b: 0, a: 1} - _SpecularColor: {r: 0.8792453, g: 0.8404047, b: 0.781367, a: 0} + - _Tint: {r: 1, g: 1, b: 0, a: 1} - _TintColor: {r: 1.3, g: 1.3, b: 1.3, a: 1} + - _TransLightColor: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_1.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_1.prefab index a05f41d72..8b71ca308 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_1.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_1.prefab @@ -216,7 +216,7 @@ Transform: m_GameObject: {fileID: 1893201913410242} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.23, y: 2.34, z: 0} + m_LocalPosition: {x: -5.23, y: 2.34, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -274,6 +274,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_1000.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_1000.prefab index 975985e23..72c2bcb8c 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_1000.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_1000.prefab @@ -94451,7 +94451,7 @@ Transform: m_GameObject: {fileID: 1336453255160073} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.75, z: 0} + m_LocalPosition: {x: 0, y: 0.75, z: 3000} m_LocalScale: {x: 4, y: 4, z: 4} m_ConstrainProportionsScale: 1 m_Children: @@ -94509,14 +94509,19 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -94524,6 +94529,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 1 sortOrder2D: 1000 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u7206\u88C2\u91D1\u9CA8" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_101.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_101.prefab index 7cb3e6424..a64e72a84 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_101.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_101.prefab @@ -5136,7 +5136,7 @@ Transform: m_GameObject: {fileID: 1970034173585976} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.17, y: -2.63, z: 0} + m_LocalPosition: {x: -2.17, y: -2.63, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -5194,6 +5194,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_102.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_102.prefab index 658c68897..456170459 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_102.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_102.prefab @@ -2555,7 +2555,7 @@ Transform: m_GameObject: {fileID: 1617794741341412} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.37, y: 0.35, z: 0} + m_LocalPosition: {x: -2.37, y: 0.35, z: 3000} m_LocalScale: {x: 6, y: 6, z: 6} m_ConstrainProportionsScale: 1 m_Children: diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_103.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_103.prefab index 74347d127..3fbdcfc5f 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_103.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_103.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1014800976139257} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.14, y: -2.51, z: 0} + m_LocalPosition: {x: -0.14, y: -2.51, z: 3000} m_LocalScale: {x: 3.8, y: 3.8, z: 3.8} m_ConstrainProportionsScale: 1 m_Children: @@ -84,6 +84,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_104.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_104.prefab index 55cea3f70..d6caaf4d5 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_104.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_104.prefab @@ -150,7 +150,7 @@ Transform: m_GameObject: {fileID: 1189135907356786} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.87, y: -2.51, z: 0} + m_LocalPosition: {x: 1.87, y: -2.51, z: 3000} m_LocalScale: {x: 3.8, y: 3.8, z: 3.8} m_ConstrainProportionsScale: 1 m_Children: @@ -208,6 +208,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_105.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_105.prefab index 4296188af..a12fef587 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_105.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_105.prefab @@ -254,7 +254,7 @@ Transform: m_GameObject: {fileID: 1607132132862101} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.8, y: -2.51, z: 0} + m_LocalPosition: {x: 3.8, y: -2.51, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -312,6 +312,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_106.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_106.prefab index 4070b9197..5724bb718 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_106.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_106.prefab @@ -215,7 +215,7 @@ Transform: m_GameObject: {fileID: 1543303804360925} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.75, y: -1.06, z: 0} + m_LocalPosition: {x: -4.75, y: -1.06, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -273,6 +273,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_107.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_107.prefab index 2253b2141..ea5a9ed43 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_107.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_107.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1116875432254256} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.63, y: -1.06, z: 0} + m_LocalPosition: {x: -2.63, y: -1.06, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -84,6 +84,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_108.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_108.prefab index b4937182d..943eb4453 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_108.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_108.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1119730267851349} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.84, y: -1.06, z: 0} + m_LocalPosition: {x: -0.84, y: -1.06, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -84,6 +84,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_109.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_109.prefab index c38a73f3c..06afc1c36 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_109.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_109.prefab @@ -60,7 +60,7 @@ Transform: m_GameObject: {fileID: 1644044216525485} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.69, y: -1.06, z: 0} + m_LocalPosition: {x: 0.69, y: -1.06, z: 3000} m_LocalScale: {x: 3, y: 3, z: 3} m_ConstrainProportionsScale: 1 m_Children: @@ -118,6 +118,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_110.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_110.prefab index 939a2f4e2..d9b329c68 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_110.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_110.prefab @@ -4799,7 +4799,7 @@ Transform: m_GameObject: {fileID: 1436458902974276} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.67, y: -2.51, z: 0} + m_LocalPosition: {x: -4.67, y: -2.51, z: 3000} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 1 m_Children: @@ -4857,6 +4857,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_111.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_111.prefab index f6c1bebc6..2013d213a 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_111.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_111.prefab @@ -2487,7 +2487,7 @@ Transform: m_GameObject: {fileID: 1690019808329265} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.34, y: -1.07, z: 0} + m_LocalPosition: {x: 3.34, y: -1.07, z: 3000} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: @@ -2545,6 +2545,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_112.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_112.prefab index 52e4461a7..174a8cf53 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_112.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_112.prefab @@ -9903,7 +9903,7 @@ Transform: m_GameObject: {fileID: 1571987250107423} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.35, y: 0.67, z: 1} + m_LocalPosition: {x: -0.35, y: 0.67, z: 3000} m_LocalScale: {x: 7, y: 7, z: 7} m_ConstrainProportionsScale: 1 m_Children: @@ -9961,14 +9961,19 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -9976,6 +9981,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 1 sortOrder2D: 23 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u9ED1\u6D1E\u98DE\u8239" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_113.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_113.prefab index 1f61f5660..8efae0a68 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_113.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_113.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1294175085846565} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.6, y: 1.43, z: 0} + m_LocalPosition: {x: 1.6, y: 1.43, z: 3000} m_LocalScale: {x: 6.5, y: 6.5, z: 6.5} m_ConstrainProportionsScale: 1 m_Children: @@ -84,14 +84,19 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -99,6 +104,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 1 sortOrder2D: 113 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u5C0F\u4E11\u6251\u514B" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_114.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_114.prefab index 0fd4ce81b..3fb3466bb 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_114.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_114.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1110334844017110} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.64, y: 0.67, z: 0} + m_LocalPosition: {x: 4.64, y: 0.67, z: 3000} m_LocalScale: {x: 8, y: 8, z: 8} m_ConstrainProportionsScale: 1 m_Children: @@ -85,6 +85,7 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] @@ -95,6 +96,7 @@ MonoBehaviour: createVideoClip: {fileID: 0} rotationPY: 60 useMirrorCompensate: 1 + useRollSignFlip: 0 useRouteFlipX: 1 baseMmove: 0 isRotate: 0 @@ -103,6 +105,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 1 sortOrder2D: 114 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u5E78\u8FD0\u98DE\u789F" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_115.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_115.prefab index 0ca03054d..46e4e462d 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_115.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_115.prefab @@ -4736,7 +4736,7 @@ Transform: m_GameObject: {fileID: 1039882473692480} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.54, y: 0.15, z: 0} + m_LocalPosition: {x: 2.54, y: 0.15, z: 3000} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 1 m_Children: @@ -4794,6 +4794,7 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] @@ -4803,6 +4804,9 @@ MonoBehaviour: needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -4810,6 +4814,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 1 sortOrder2D: 115 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u70C8\u7130\u98CE\u66B4" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_2.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_2.prefab index 7cc2fae5b..819f0be97 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_2.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_2.prefab @@ -131,7 +131,7 @@ Transform: m_GameObject: {fileID: 1411577264078802} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.26, y: 2.34, z: 0} + m_LocalPosition: {x: -4.26, y: 2.34, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -189,6 +189,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_2000.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_2000.prefab index 1528797e5..a8138426a 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_2000.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_2000.prefab @@ -236,7 +236,7 @@ Transform: m_GameObject: {fileID: 1793210255177285} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2.2, z: 0} + m_LocalPosition: {x: 0, y: 2.2, z: 3000} m_LocalScale: {x: 7.5, y: 7.5, z: 7.5} m_ConstrainProportionsScale: 1 m_Children: @@ -294,14 +294,19 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -309,6 +314,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 1 sortOrder2D: 2000 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u5973\u9F99\u738B" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_3.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_3.prefab index 5a226a62f..b5de7c4ec 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_3.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_3.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1243416870742099} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.33, y: 2.34, z: 0} + m_LocalPosition: {x: -3.33, y: 2.34, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -84,6 +84,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_3000.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_3000.prefab index 13a1ea098..2682dd04d 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_3000.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_3000.prefab @@ -360,7 +360,7 @@ Transform: m_GameObject: {fileID: 1701611180882936} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 3000} m_LocalScale: {x: 7.5, y: 7.5, z: 7.5} m_ConstrainProportionsScale: 1 m_Children: @@ -418,14 +418,19 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -433,6 +438,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 1 sortOrder2D: 3000 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u673A\u68B0\u874E" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_31.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_31.prefab index 871307e14..20542f588 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_31.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_31.prefab @@ -4969,7 +4969,7 @@ Transform: m_GameObject: {fileID: 1466888770943193} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.16, y: 2.34, z: 0} + m_LocalPosition: {x: -1.16, y: 2.34, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -5027,6 +5027,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_32.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_32.prefab index 39385b61f..b8097148f 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_32.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_32.prefab @@ -2384,7 +2384,7 @@ Transform: m_GameObject: {fileID: 1097830300934538} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.26, y: 2.34, z: 0} + m_LocalPosition: {x: -0.26, y: 2.34, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -2442,6 +2442,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_4.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_4.prefab index 108510838..966875cae 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_4.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_4.prefab @@ -131,7 +131,7 @@ Transform: m_GameObject: {fileID: 1271264967226216} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.32, y: 2.34, z: 0} + m_LocalPosition: {x: -2.32, y: 2.34, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -189,6 +189,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_4000.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_4000.prefab index 0ab199445..94244efff 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_4000.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_4000.prefab @@ -111004,7 +111004,7 @@ Transform: m_GameObject: {fileID: 1658730911317380} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 3000} m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} m_ConstrainProportionsScale: 1 m_Children: @@ -111062,14 +111062,19 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -111077,6 +111082,9 @@ MonoBehaviour: depthOffset: 0 is2DFish: 1 sortOrder2D: 116 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u661F\u9645\u5DE1\u822A" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_5.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_5.prefab index 60247b212..f2f2ece1c 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_5.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_5.prefab @@ -131,7 +131,7 @@ Transform: m_GameObject: {fileID: 1763460844219721} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.2, y: 1.38, z: 0} + m_LocalPosition: {x: -5.2, y: 1.38, z: 3000} m_LocalScale: {x: 9, y: 9, z: 9} m_ConstrainProportionsScale: 1 m_Children: @@ -189,6 +189,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_5000.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_5000.prefab index 24324ad71..19607c1fb 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_5000.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_5000.prefab @@ -54241,7 +54241,7 @@ Transform: m_GameObject: {fileID: 1129806422034794} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.61} + m_LocalPosition: {x: 0, y: 0, z: 3000} m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 1 m_Children: @@ -54299,14 +54299,19 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -54314,6 +54319,9 @@ MonoBehaviour: depthOffset: -30 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u7834\u574F\u7403" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_6.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_6.prefab index 034c6a930..e382b68f3 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_6.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_6.prefab @@ -111,7 +111,7 @@ Transform: m_GameObject: {fileID: 1697917835105424} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.35, y: 1.38, z: 0} + m_LocalPosition: {x: -4.35, y: 1.38, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -169,6 +169,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_6000.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_6000.prefab index 1c8d2e3e6..6f91526c0 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_6000.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_6000.prefab @@ -173897,7 +173897,7 @@ Transform: m_GameObject: {fileID: 1854980488060401} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 10} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 6, y: 6, z: 6} m_ConstrainProportionsScale: 1 m_Children: @@ -173956,14 +173956,19 @@ MonoBehaviour: forwordXYZ: fishenum: 2 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 0 yzID: colliderList: [] lockPoint: {fileID: 0} - bingDongEffect: {fileID: 0} + bingDongEffect: + - {fileID: 0} needLockEvent: 0 createVideoClip: {fileID: 0} rotationPY: 60 + useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 0 @@ -173971,6 +173976,9 @@ MonoBehaviour: depthOffset: -50 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u5E78\u8FD0\u8F6E" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_7.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_7.prefab index ff92fc882..aab3303b3 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_7.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_7.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1476298559599357} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.4, y: 1.38, z: 0} + m_LocalPosition: {x: -3.4, y: 1.38, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -84,6 +84,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_8.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_8.prefab index c103772a9..4261c1507 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_8.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_8.prefab @@ -216,7 +216,7 @@ Transform: m_GameObject: {fileID: 1589144302589410} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.53, y: 1.38, z: 0} + m_LocalPosition: {x: -2.53, y: 1.38, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -274,6 +274,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_9.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_9.prefab index 073c5c528..6efef97fb 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_9.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_9.prefab @@ -2529,7 +2529,7 @@ Transform: m_GameObject: {fileID: 1740222003437572} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.57, y: 1.38, z: 0} + m_LocalPosition: {x: -1.57, y: 1.38, z: 3000} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 1 m_Children: @@ -2587,6 +2587,7 @@ MonoBehaviour: forwordXYZ: Z fishenum: 1 moveTime: 0 + yzGroupTimeOffset: 0 isyz: 1 yzID: colliderList: [] diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index 87c0c4136..4927f6231 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -4289,7 +4289,7 @@ MonoBehaviour: spawnList: [] isCreateFish: 0 isFrozen: 0 - debugSpawnFishNumber: 12025 + debugSpawnFishNumber: 11029 isleft: 0 debugSpawnAllLines: 0 fishList_All: [] diff --git a/Assets/MyGame/Scenes/XJMH.unity b/Assets/MyGame/Scenes/XJMH.unity index f1d7cb9de..5693a674d 100644 --- a/Assets/MyGame/Scenes/XJMH.unity +++ b/Assets/MyGame/Scenes/XJMH.unity @@ -245,7 +245,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: @@ -266,10 +266,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b9ab2bdb337a1342bb39163aba2f3eb, type: 3} m_Name: m_EditorClassIdentifier: - upV3: {x: 0, y: 0, z: 0} - centerV3: {x: 0, y: 0, z: 0} - downV3: {x: 0, y: 0, z: 0} speed: 3 + overlapPixels: 2 + bottomMargin: 0.05 + snapToPixel: 1 height: 0 --- !u!1 &1115207330 GameObject: diff --git a/Assets/MyGame/Scripts/Turret/TurretData.cs b/Assets/MyGame/Scripts/Turret/TurretData.cs index aaac63b90..c1cc8e376 100644 --- a/Assets/MyGame/Scripts/Turret/TurretData.cs +++ b/Assets/MyGame/Scripts/Turret/TurretData.cs @@ -158,10 +158,22 @@ public class TurretData : MonoBehaviour private void OnEnable() { + // ⭐ 状态缓存必须跟着 OnEnable 实际播的动画走：这里直接播 Idle（不走 ChangeState）， + // 所以必须手动把 currState 一起重置。否则反复激活（切炮台/座位隐藏恢复/对象池复用）后 + // currState 会停在 Attack，之后真正的 ChangeState(Attack) 被"同状态早退"吃掉 → + // 炮台停在错误状态（表现为该攻击时不出手 / 不该攻击时一直在攻击状态）。 + currState = TurretState.Idle; PlayState(TurretState.Idle); BindAddDownButtons(); // ⭐ XJMH 加减炮倍：炮台上的 +/- 绑定点击（每次激活重绑，幂等） } + /// + /// 当前动画状态（只读）。调用方（GameMainPanel）用它在"这一帧没开火"时判断要不要补发 Idle， + /// 避免每帧重复广播状态。注意：状态由 OnStateChange 指向的那个 TurretData 接收 + /// （战神装备中指向战神，见 SitPosData.LoadZhanShen）。 + /// + public TurretState CurrState => currState; + // ==================== XJMH 加减炮倍按钮绑定 ==================== // 炮台上的 obj_Add / obj_Down（物体名 Up / Down）在预制体里没有 Button 组件、也没有任何代码绑定 // → 点击无反应。这里在炮台激活时统一补 Button + 绑定： diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/Coin/CoinScript.cs b/Assets/MyGame/aa/Game/DefaultDieEffect/Coin/CoinScript.cs index d345f48b5..63be86fc6 100644 --- a/Assets/MyGame/aa/Game/DefaultDieEffect/Coin/CoinScript.cs +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/Coin/CoinScript.cs @@ -20,7 +20,9 @@ public class CoinScript : BJBase public override void SetCoinCount() { tMP_CoinCount.text = NumAdd(coinCount.ToString()); - + var v3 = transform.position; + v3.z = 0; + transform.position = v3; // 自己爆奖显示金，别人显示银（由 Ws_DieFish 在创建时设置 isLocalCoin） if (isLocalCoin) { diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab index d1838e934..235fdd2c2 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab @@ -428,6 +428,31 @@ PrefabInstance: propertyPath: m_TagString value: Fish objectReference: {fileID: 0} + - target: {fileID: 1023180166179066019, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 1023180166179066019, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 1023180166179066019, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 1023180166179066019, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -1628 + objectReference: {fileID: 0} + - target: {fileID: 1023180166179066019, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1030285415092834215, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_Layer @@ -633,6 +658,26 @@ PrefabInstance: propertyPath: m_TagString value: Fish objectReference: {fileID: 0} + - target: {fileID: 1889981257584575367, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.98265 + objectReference: {fileID: 0} + - target: {fileID: 1889981257584575367, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.98265 + objectReference: {fileID: 0} + - target: {fileID: 1889981257584575367, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.98265 + objectReference: {fileID: 0} + - target: {fileID: 1889981257584575367, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.3470459 + objectReference: {fileID: 0} - target: {fileID: 1963472460635600091, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_Layer @@ -688,6 +733,31 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 2314438954505263539, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 2314438954505263539, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 2314438954505263539, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 2314438954505263539, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 773 + objectReference: {fileID: 0} + - target: {fileID: 2314438954505263539, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2318183124294262580, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_Layer @@ -1193,6 +1263,31 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 4025161831505289402, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4025161831505289402, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4025161831505289402, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4025161831505289402, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -733 + objectReference: {fileID: 0} + - target: {fileID: 4025161831505289402, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4027612976084653271, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_Layer @@ -1353,6 +1448,31 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 4605851393792301454, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4605851393792301454, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4605851393792301454, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4605851393792301454, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1582 + objectReference: {fileID: 0} + - target: {fileID: 4605851393792301454, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4615874818981895372, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_Layer @@ -2098,6 +2218,11 @@ PrefabInstance: propertyPath: m_TagString value: Fish objectReference: {fileID: 0} + - target: {fileID: 7019837981395474506, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalPosition.y + value: 631 + objectReference: {fileID: 0} - target: {fileID: 7024333102479470366, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_LocalRotation.w @@ -2443,6 +2568,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7563543857993696468, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.x + value: 0.34603 + objectReference: {fileID: 0} + - target: {fileID: 7563543857993696468, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.y + value: 0.34603 + objectReference: {fileID: 0} + - target: {fileID: 7563543857993696468, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_LocalScale.z + value: 0.34603 + objectReference: {fileID: 0} + - target: {fileID: 7563543857993696468, guid: cf762c0a6428e1c42b456cb87803660f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.000030517578 + objectReference: {fileID: 0} - target: {fileID: 7623169449076234796, guid: cf762c0a6428e1c42b456cb87803660f, type: 3} propertyPath: m_Layer diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab index f088826fb..81e546b1b 100644 --- a/Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab +++ b/Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab @@ -8,13 +8,153 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1004353273167717, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1165772677007529, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1169127097139600, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1179614702416984, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1181121479881490, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1218478547074833, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1238351548574224, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1258810526246113, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1314175212193258, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1329618761509393, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1336297741536214, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1352794685984704, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1354619999995193, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1364624771792730, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1381186094423380, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1391594802400422, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1417498689064457, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1454280742772254, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1470285786072453, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1479430010367553, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1511507134860538, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1619667814616128, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1643851267144944, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1689175997537984, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1719774128631638, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1728875769317856, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1754675375815197, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1758313132038958, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1795491474416800, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1841677433750149, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1854980488060401, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_Name value: PW_Enemy_6000 objectReference: {fileID: 0} - target: {fileID: 1854980488060401, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1872340057581494, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1917890945172036, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1998166256066159, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4293248258535148, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_LocalPosition.y + value: 1.6 + objectReference: {fileID: 0} + - target: {fileID: 4314733925070486, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_LocalPosition.y + value: 1.6 objectReference: {fileID: 0} - target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_LocalScale.x @@ -38,7 +178,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_LocalPosition.z - value: 10 + value: 1000 objectReference: {fileID: 0} - target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_LocalRotation.w @@ -68,15 +208,24 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -0 objectReference: {fileID: 0} + - target: {fileID: 4838131004404418, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} + propertyPath: m_LocalPosition.y + value: 1.6 + objectReference: {fileID: 0} + - target: {fileID: 137299359221901207, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224079271934775309, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224079271934775309, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224079271934775309, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -93,15 +242,25 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 11.2 objectReference: {fileID: 0} + - target: {fileID: 224085209118316991, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224085209118316991, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224089915643505477, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224089915643505477, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224089915643505477, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -116,12 +275,12 @@ PrefabInstance: - target: {fileID: 224094389660654484, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224094389660654484, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224094389660654484, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -138,6 +297,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 8.4 objectReference: {fileID: 0} + - target: {fileID: 224095829210853046, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224095829210853046, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224123879893943815, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x @@ -158,6 +327,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 11.6 objectReference: {fileID: 0} + - target: {fileID: 224127493588344155, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224127493588344155, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224157341210399899, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x @@ -186,12 +365,12 @@ PrefabInstance: - target: {fileID: 224194052449599498, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224194052449599498, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224194052449599498, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -211,12 +390,12 @@ PrefabInstance: - target: {fileID: 224208227279843955, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224208227279843955, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224208227279843955, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -236,12 +415,12 @@ PrefabInstance: - target: {fileID: 224220233957873251, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224220233957873251, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224220233957873251, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -286,12 +465,12 @@ PrefabInstance: - target: {fileID: 224233303022329034, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224233303022329034, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224233303022329034, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -333,6 +512,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 9.8 objectReference: {fileID: 0} + - target: {fileID: 224275873760908674, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224275873760908674, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224304916920018316, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x @@ -361,12 +550,12 @@ PrefabInstance: - target: {fileID: 224364238266863369, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224364238266863369, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224364238266863369, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -386,12 +575,12 @@ PrefabInstance: - target: {fileID: 224401297619572947, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224401297619572947, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224401297619572947, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -408,15 +597,25 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 9.6 objectReference: {fileID: 0} + - target: {fileID: 224446703339761365, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224446703339761365, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224464130324260547, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224464130324260547, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224464130324260547, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -458,15 +657,25 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 9.2 objectReference: {fileID: 0} + - target: {fileID: 224499719709201516, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224499719709201516, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224515492303201892, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224515492303201892, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224515492303201892, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -486,12 +695,12 @@ PrefabInstance: - target: {fileID: 224524059831478637, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224524059831478637, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224524059831478637, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -511,12 +720,12 @@ PrefabInstance: - target: {fileID: 224531357351841093, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224531357351841093, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224531357351841093, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -533,15 +742,25 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 9.7 objectReference: {fileID: 0} + - target: {fileID: 224551216328668426, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224551216328668426, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224558578017312990, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224558578017312990, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224558578017312990, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -558,6 +777,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 10.9 objectReference: {fileID: 0} + - target: {fileID: 224589510863169142, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224589510863169142, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224600733503037073, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x @@ -586,12 +815,12 @@ PrefabInstance: - target: {fileID: 224628960764501137, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224628960764501137, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224628960764501137, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} @@ -608,6 +837,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 11 objectReference: {fileID: 0} + - target: {fileID: 224633673117753496, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224633673117753496, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224719011603975946, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224719011603975946, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224731419555135382, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224731419555135382, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224787038190511086, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x @@ -633,15 +892,65 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 10.1 objectReference: {fileID: 0} + - target: {fileID: 224855873501854270, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224855873501854270, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224880872205217661, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224880872205217661, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224912806478300606, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224912806478300606, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224962242747013248, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224962242747013248, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224971739042601045, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224971739042601045, guid: 9a0f98ba992183c48b8412576ab5f9e8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224991435449500841, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224991435449500841, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224991435449500841, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3} diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index 5bcd16b11..739dbf714 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -258,6 +258,12 @@ public class GameMainPanel_FishBase : GameMainPanel_Base [Header("攻击参数")] public float attackTime = 0.5f; + [Tooltip("远端座位攻击状态看门狗(秒)：最后收到某座位的攻击状态/开火消息后，超过这个时间还没有新消息，" + + "就判定这个座位已经不在攻击（典型：攻击中直接退出/掉线，永远不会再发待机包）→ 本地收回待机。\n" + + "实际等待时间 = max(本值, attackTime×3)，避免开火间隔比看门狗还长的配置被误判")] + public float remoteAttackIdleTimeout = 1.5f; + /// 远端座位最近一次"还在攻击"的心跳时间：收到该座位的攻击状态广播或开火消息时刷新 + private readonly Dictionary remoteAttackHeartbeat = new Dictionary(); [Header("人机参数")] public float botRotateSpeed = 80f; // 兜底旋转速度（BotConfig 为空时用） float clickTime = 0; @@ -1197,6 +1203,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base UpdateLockFX(); // 锁定图标跟随目标 RefreshTripleLockIcons(); + // ⭐ 远端攻击状态看门狗：对方攻击中退出/掉线时不会再发待机包，本地按"还有没有攻击心跳"收回待机 + UpdateRemoteTurretAttackTimeout(); + LoopLaser(); SettingClose(); DaoJiShi(); @@ -3029,6 +3038,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base CrossPlatformInput input = GetInput(); + // ⭐ 记录"开火键是否按住"：手动开火是"按下进 Attack、松手回 Idle"， + // 自动开火回收状态时要靠它区分"自动开火没开火"和"玩家正按住手动开火"（见 EnsureTurretIdle） + _firePointerDown = input.isPressed; + if (!input.isPressed && !input.wasPressedThisFrame && !input.wasReleasedThisFrame) return; if (input.wasPressedThisFrame) @@ -3518,6 +3531,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base if (sit == null || bullitIDs == null || bullitIDs.Count == 0) { Debug.LogWarning("[FireBullet] sit 或 bullitIDs 为空,跳过本次开火"); + // ⭐ 服务端这一发没回子弹（拒绝/异常）→ 本地不能再停在 Attack 空转： + // 攻击状态是开火请求发出前就切好的，不回滚就会一直循环攻击动画但一颗子弹都没有 + if (sit == currSitData) EnsureTurretIdle(); return; } @@ -3785,6 +3801,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base bool needAutoFire = currSitData.IsAutoAttackOn || (toggle_Lock.isOn && currSitData.isLock && currSitData.lockFX.gameObject.activeSelf); if (!needAutoFire) { + // ⭐ 自动开火条件不再满足（关自动攻击/松开锁定目标）：把还卡在 Attack 的炮台收回 Idle， + // 否则攻击动画一直循环但一颗子弹都不发射 + EnsureTurretIdle(); autoFireTimer = 0f; return; } @@ -3795,11 +3814,15 @@ public class GameMainPanel_FishBase : GameMainPanel_Base // ⭐ 本地金币校验：没钱直接返回，不切换攻击状态、不发送开炮请求 // autoFireTimer 保持满，金币恢复后立即开火 if (!HasEnoughGoldToFire(toggle_Three.isOn, toggle_Shuang != null && toggle_Shuang.isOn)) + { + EnsureTurretIdle(); // 打不出去就别停在攻击状态 return; + } // ⭐ 子弹上限校验（先于状态切换和扣费） if (IsBulletLimitReached(currSitData.user)) { + EnsureTurretIdle(); // 子弹已满打不出去，回收攻击状态（金币恢复/上限解除后下一轮会重新进 Attack） autoFireTimer = 0f; // 重置计时，下次再试 return; } @@ -3819,6 +3842,85 @@ public class GameMainPanel_FishBase : GameMainPanel_Base SyncFire(angle, isSanShe, isDouble, isLock); } + /// + /// ⭐ 打不出去时把炮台从 Attack 收回 Idle（只处理 Attack，不碰 LaserStart/LaserLoop）。 + /// 背景：攻击状态是在"按下/自动开火"那一刻就切好的（也要先把状态广播出去给其他客户端）， + /// 但真正出弹要等服务端 RoomFireNotice 回来。中间任何一环被跳过——自动开火条件不再满足、 + /// 金币不足、子弹上限、服务端没回子弹——以前都只 return 不收回状态，炮台就停在 Attack： + /// 攻击动画一直循环、一颗子弹都不发射（远端视角同样跟着卡住，因为状态是同步过去的）。 + /// 🔁 只在"当前不是 Idle"时切一次：ChangeState 同状态早退 + 这里的判断，保证不会每帧刷广播。 + /// + private void EnsureTurretIdle() + { + if (currSitData == null) return; + + // ⚠ 玩家正按住手动开火时不能抢：手动开火的状态是"按下进 Attack、松手才回 Idle"， + // 此时自动开火这一帧不开火（needAutoFire=false）不代表炮台不该是攻击状态。 + // 少了这道判断会在按下同一帧把手动 Attack 顶回 Idle → 表现为"根本切不到攻击状态"。 + if (IsManualFireActive) return; + + // 状态由 OnStateChange 指向的那个 TurretData 接收：战神装备中指向战神（见 SitPosData.LoadZhanShen） + var turret = currSitData.currentZhanShenData != null ? currSitData.currentZhanShenData : currSitData.currentTurret; + if (turret == null || turret.CurrState != TurretState.Attack) return; + + currSitData.ChangeState(TurretState.Idle); + SyncTurretState(TurretState.Idle); + } + + /// 开火键是否按住（HandleInput 每帧刷新） + private bool _firePointerDown; + + /// + /// ⭐ 远端攻击状态看门狗：别的座位停在 Attack 上时，靠"这个座位还在不在发攻击消息"判断它是不是真的在攻击。 + /// 为什么会卡：攻击状态是同步过来的，而"收回待机"也要等对方发待机包（changeTurretState=Idle）。 + /// 对方攻击中直接退出/掉线/被踢 → 既不会再攻击也不会再发待机包 → 本端炮台永远停在攻击动画。 + /// 这里按身份判定：开着战神时状态由战神接收（同 EnsureTurretIdle）。 + /// 🔁 只改本地表现，不再广播回去（否则多端会互相刷 Idle 包）。 + /// + private void UpdateRemoteTurretAttackTimeout() + { + if (list_Sits == null || list_Sits.Count == 0) return; + + float now = Time.time; + // 等待时间至少是开火间隔的 3 倍：配置把攻击间隔调大时看门狗不能比它短，否则会误收回正在攻击的座位 + float timeout = Mathf.Max(remoteAttackIdleTimeout, attackTime * 3f); + + foreach (var sit in list_Sits) + { + if (sit == null || sit == currSitData) continue; // 本地座位由本地开火/回收逻辑管 + + var turret = sit.currentZhanShenData != null ? sit.currentZhanShenData : sit.currentTurret; + if (turret == null || turret.CurrState != TurretState.Attack) continue; + + float last; + if (!remoteAttackHeartbeat.TryGetValue(sit.posID, out last)) + { + // 没收到过心跳（进房间前的残留状态等）→ 给一个完整等待窗口，不立刻收回 + remoteAttackHeartbeat[sit.posID] = now; + continue; + } + if (now - last <= timeout) continue; + + // 超过等待时间没有任何"还在攻击"的消息 → 这个座位已经不在攻击了，收回待机 + sit.ChangeState(TurretState.Idle); + } + } + + /// + /// 手动开火是否正在生效：手动开火只在"自动攻击关 + 锁定关"时才工作 + /// （TryFire 开头被这两个开关提前 return 拦掉，锁定模式下手动按住只旋转不开火）， + /// 此时 Attack 状态完全由按下/按住驱动，回收逻辑必须让位。 + /// + private bool IsManualFireActive + { + get + { + if (!_firePointerDown) return false; + if (currSitData != null && currSitData.IsAutoAttackOn) return false; + return toggle_Lock == null || !toggle_Lock.isOn; + } + } + @@ -5095,6 +5197,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base SitPosData sit = list_Sits.Find(s => s.user == sync.userId); if (sit == null) return; + // ⭐ 攻击心跳：这个座位刚发了开火消息（bot 的状态广播是节流的，只有开火消息每发都来） + remoteAttackHeartbeat[sit.posID] = Time.time; + // ⭐ 座位镜像：botLastAngle/botLastFireData 缓存的是"源角度"(下方座位系)； // 真人兜底用 sit.currentAngle(本端世界角度，无需转换) bool angleFromBotMemory = botLastAngle.TryGetValue(sync.userId, out float a); @@ -5135,6 +5240,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base } var targetSit = list_Sits[dispPos]; + // ⭐ 攻击心跳：这个座位刚发了开火消息（真人每发都走这里，等于"还在攻击"的心跳） + remoteAttackHeartbeat[targetSit.posID] = Time.time; + // ⭐⭐ 战神散射(三发+锁定)：发送端每发都带 isSanShe/isSuoDing 和3个激光目标GUID(monsterIDs) // → 其他玩家的座位跟着补齐3个锁位 + 刷新散射标记：3条激光 + 2个散射起点球 // (JGFXLeftParent/JGFXRightParent) 一起显示。 @@ -5276,6 +5384,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base var data = FrameDataParser.Parse(sync.frameData); var sit = list_Sits[dispPos]; + // ⭐ 攻击心跳：真人每次开火都会广播一次 Attack 状态（SyncTurretState(Attack) 在开火循环里）， + // 等于"这个座位还在攻击"的心跳。刷新它，看门狗就不会误收回正在攻击的座位。 + if (data.state == TurretState.Attack) + remoteAttackHeartbeat[sit.posID] = Time.time; + sit.ChangeState(data.state); } @@ -6115,6 +6228,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base botSkills.Remove(sit.posID); botLastAngle.Remove(sit.user); botLastFireData.Remove(sit.user); + remoteAttackHeartbeat.Remove(sit.posID); // 攻击心跳（看门狗用） // ⭐ bot 退出后转移房主,否则房主是已退出的 bot 会导致房主显示异常 // 1) 清除 bot 的房主引用(如果它是房主)