diff --git a/Assets/Art/FengLei/PaoTai/DaQiao/gun_barrel_14053_multy.prefab b/Assets/Art/FengLei/PaoTai/DaQiao/gun_barrel_14053_multy.prefab
index 43b018bf8..2217baa52 100644
--- a/Assets/Art/FengLei/PaoTai/DaQiao/gun_barrel_14053_multy.prefab
+++ b/Assets/Art/FengLei/PaoTai/DaQiao/gun_barrel_14053_multy.prefab
@@ -2291,7 +2291,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494234707578104387}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -4595,7 +4595,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 760182340641898647}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -7069,7 +7069,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1014753423823835432}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -9471,7 +9471,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1236741116192336365}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -11887,7 +11887,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1803867238783368140}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -12033,24 +12033,29 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &4664318836278377348
-Transform:
+--- !u!224 &4664318836278377348
+RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2223497904095183553}
- serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 2.5, y: 2.5, z: 2.5}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 9207363445735846178}
- {fileID: 7582444702170264948}
- {fileID: 6841077629081366055}
+ - {fileID: 5624067686912457030}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2592020815870996122
GameObject:
m_ObjectHideFlags: 0
@@ -14388,7 +14393,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2592020815870996122}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -16761,7 +16766,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2938162400293616889}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -16827,6 +16832,106 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1
m_MeshWeighting3: 1
m_MaskInteraction: 0
+--- !u!1 &3157133647896034349
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5624067686912457030}
+ - component: {fileID: 6336978144514539787}
+ - component: {fileID: 2201484809661355291}
+ m_Layer: 5
+ m_Name: UIParticle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5624067686912457030
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3157133647896034349}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 4664318836278377348}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 412.49884, y: 281.41678}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6336978144514539787
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3157133647896034349}
+ m_CullTransparentMesh: 1
+--- !u!114 &2201484809661355291
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3157133647896034349}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_IsTrail: 0
+ m_IgnoreCanvasScaler: 0
+ m_AbsoluteMode: 0
+ m_Scale3D: {x: 10, y: 10, z: 10}
+ m_AnimatableProperties: []
+ m_Particles:
+ - {fileID: 7692182423004071311}
+ - {fileID: 7615887539037383415}
+ - {fileID: 3686025388463316546}
+ - {fileID: 7670134633758976007}
+ - {fileID: 3736882194495927825}
+ - {fileID: 7802003362552244257}
+ - {fileID: 2692048900833098860}
+ - {fileID: 684953548297751951}
+ - {fileID: 8209758808733506621}
+ - {fileID: 4050171891632414345}
+ - {fileID: 5523669461891788190}
+ - {fileID: 5506091714289378173}
+ - {fileID: 1701292068236287765}
+ - {fileID: 1000081457106916756}
+ - {fileID: 8569484242200925147}
+ - {fileID: 2698621696118426289}
+ - {fileID: 471953736328483890}
+ - {fileID: 3743637804810783213}
+ - {fileID: 7092954658731373328}
+ - {fileID: 222632967186918634}
+ m_MeshSharing: 0
+ m_GroupId: 0
+ m_GroupMaxId: 0
+ m_PositionMode: 0
+ m_AutoScaling: 0
+ m_AutoScalingMode: 2
+ m_UseCustomView: 0
+ m_CustomViewSize: 10
+ m_TimeScaleMultiplier: 1
--- !u!1 &3346798514668940967
GameObject:
m_ObjectHideFlags: 0
@@ -19179,7 +19284,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4346518522259042616}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -21550,7 +21655,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4386286690428151355}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -21673,7 +21778,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4472234060413001850}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -21681,7 +21786,7 @@ Transform:
- {fileID: 1860688179928784385}
- {fileID: 3246241239386057283}
m_Father: {fileID: 4664318836278377348}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!1 &4500387841170311837
GameObject:
m_ObjectHideFlags: 0
@@ -23974,7 +24079,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4500387841170311837}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -26354,7 +26459,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528567602532664708}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -26437,7 +26542,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &6951485952356758512
Transform:
m_ObjectHideFlags: 0
@@ -28694,7 +28799,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5023892184917264298}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -31096,7 +31201,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5278698810987208020}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -33498,7 +33603,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5464782977823108834}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -35931,7 +36036,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5757055448459572125}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -38432,7 +38537,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6924775690501107454}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -40782,7 +40887,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7951842094608057670}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -43236,7 +43341,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8602581216586918499}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -45576,7 +45681,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8748074441418465861}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -47969,7 +48074,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9138251475774129805}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
diff --git a/Assets/Art/FengLei/PaoTai/GeSiLa/gun_barrel_14082_multy.prefab b/Assets/Art/FengLei/PaoTai/GeSiLa/gun_barrel_14082_multy.prefab
index 5fd340152..d0714e215 100644
--- a/Assets/Art/FengLei/PaoTai/GeSiLa/gun_barrel_14082_multy.prefab
+++ b/Assets/Art/FengLei/PaoTai/GeSiLa/gun_barrel_14082_multy.prefab
@@ -2358,7 +2358,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 534502389996952288}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -4929,7 +4929,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2109440758155345125}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -7336,7 +7336,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2188071315803893262}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -7761,7 +7761,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &1605344189043184008
Transform:
m_ObjectHideFlags: 0
@@ -9995,7 +9995,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6673921404640189530}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -10110,6 +10110,91 @@ Animation:
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
+--- !u!1 &7731907390449797535
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2293393451766763578}
+ - component: {fileID: 507142165043789011}
+ - component: {fileID: 4032161400455383466}
+ m_Layer: 5
+ m_Name: UIParticle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2293393451766763578
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7731907390449797535}
+ m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 0.6410267}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 7003098710454334343}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0.6409912, y: 0.000091552734}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &507142165043789011
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7731907390449797535}
+ m_CullTransparentMesh: 1
+--- !u!114 &4032161400455383466
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7731907390449797535}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_IsTrail: 0
+ m_IgnoreCanvasScaler: 0
+ m_AbsoluteMode: 0
+ m_Scale3D: {x: 10, y: 10, z: 10}
+ m_AnimatableProperties: []
+ m_Particles:
+ - {fileID: 980791080742381955}
+ - {fileID: 2025812185600470297}
+ - {fileID: 2719634699090011743}
+ - {fileID: 2178057810726539230}
+ - {fileID: 8817797577400191408}
+ m_MeshSharing: 0
+ m_GroupId: 0
+ m_GroupMaxId: 0
+ m_PositionMode: 0
+ m_AutoScaling: 0
+ m_AutoScalingMode: 2
+ m_UseCustomView: 0
+ m_CustomViewSize: 10
+ m_TimeScaleMultiplier: 1
--- !u!1 &8032007950086953392
GameObject:
m_ObjectHideFlags: 0
@@ -12459,7 +12544,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8032007950086953392}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -12605,20 +12690,25 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &7003098710454334343
-Transform:
+--- !u!224 &7003098710454334343
+RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8826976359845876549}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
+ m_LocalScale: {x: 2.5, y: 2.5, z: 2.5}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 5064986807920631215}
- {fileID: 1849677743057548085}
+ - {fileID: 2293393451766763578}
m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
diff --git a/Assets/Art/FengLei/PaoTai/MeiRenYu/gun_barrel_14081_multy.prefab b/Assets/Art/FengLei/PaoTai/MeiRenYu/gun_barrel_14081_multy.prefab
index aa74ea588..e3b617d62 100644
--- a/Assets/Art/FengLei/PaoTai/MeiRenYu/gun_barrel_14081_multy.prefab
+++ b/Assets/Art/FengLei/PaoTai/MeiRenYu/gun_barrel_14081_multy.prefab
@@ -1,5 +1,94 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &246457154703240431
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 442416087321852183}
+ - component: {fileID: 50451945535041259}
+ - component: {fileID: 7770007813087753372}
+ m_Layer: 7
+ m_Name: UIParticle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &442416087321852183
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 246457154703240431}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2972287193865663416}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 20, y: 20}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &50451945535041259
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 246457154703240431}
+ m_CullTransparentMesh: 1
+--- !u!114 &7770007813087753372
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 246457154703240431}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_IsTrail: 0
+ m_IgnoreCanvasScaler: 0
+ m_AbsoluteMode: 0
+ m_Scale3D: {x: 10, y: 10, z: 10}
+ m_AnimatableProperties: []
+ m_Particles:
+ - {fileID: 245258487391381194}
+ - {fileID: 3815666402655289734}
+ - {fileID: 6137624029128042824}
+ - {fileID: 3721102235797468070}
+ - {fileID: 2160919024008050567}
+ - {fileID: 8558923311392507694}
+ - {fileID: 5981156211161317974}
+ - {fileID: 3051180914531824573}
+ - {fileID: 7199758345520702119}
+ m_MeshSharing: 0
+ m_GroupId: 0
+ m_GroupMaxId: 0
+ m_PositionMode: 0
+ m_AutoScaling: 0
+ m_AutoScalingMode: 2
+ m_UseCustomView: 0
+ m_CustomViewSize: 10
+ m_TimeScaleMultiplier: 1
--- !u!1 &288868395331580219
GameObject:
m_ObjectHideFlags: 0
@@ -9,7 +98,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4829149970892234714}
- m_Layer: 13
+ m_Layer: 7
m_Name: fire
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -42,7 +131,7 @@ GameObject:
- component: {fileID: 6170493564125504254}
- component: {fileID: 8558923311392507694}
- component: {fileID: 5322782168130574073}
- m_Layer: 13
+ m_Layer: 7
m_Name: yu
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2293,7 +2382,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 597158234728978625}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -2368,7 +2457,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6779198936319576107}
- m_Layer: 13
+ m_Layer: 7
m_Name: gunInfo
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2403,7 +2492,7 @@ GameObject:
- component: {fileID: 6200304316837698881}
- component: {fileID: 245258487391381194}
- component: {fileID: 8223954187954767186}
- m_Layer: 13
+ m_Layer: 7
m_Name: zhuti
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -4728,7 +4817,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 927729067074341069}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -4805,7 +4894,7 @@ GameObject:
- component: {fileID: 8890458020402656277}
- component: {fileID: 5834961603864556595}
- component: {fileID: 2157350874231378759}
- m_Layer: 13
+ m_Layer: 7
m_Name: gunInfo_1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -4888,7 +4977,7 @@ GameObject:
- component: {fileID: 2358216259289883703}
- component: {fileID: 6137624029128042824}
- component: {fileID: 4996608834169976387}
- m_Layer: 13
+ m_Layer: 7
m_Name: shandian
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -7121,7 +7210,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1610217298961396262}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -7196,7 +7285,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 589142682342108326}
- m_Layer: 13
+ m_Layer: 7
m_Name: paoshen
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -7230,7 +7319,7 @@ GameObject:
- component: {fileID: 175877770964566762}
- component: {fileID: 2160919024008050567}
- component: {fileID: 4190907638583882167}
- m_Layer: 13
+ m_Layer: 7
m_Name: shandianxulie_01
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9481,7 +9570,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2838539071188046071}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -9557,7 +9646,7 @@ GameObject:
m_Component:
- component: {fileID: 4954962259879171383}
- component: {fileID: 5572757408954325573}
- m_Layer: 13
+ m_Layer: 7
m_Name: gunInfo_2
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9605,7 +9694,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7611788325469440612}
- m_Layer: 13
+ m_Layer: 7
m_Name: paoshen
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9638,7 +9727,7 @@ GameObject:
m_Component:
- component: {fileID: 4950858441111654579}
- component: {fileID: 4762985029040019272}
- m_Layer: 13
+ m_Layer: 7
m_Name: eff_fs
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9686,7 +9775,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5820194299576918036}
- m_Layer: 13
+ m_Layer: 7
m_Name: equipment_game_14081_multy
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9701,14 +9790,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4396446834666694885}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8316173538903882812}
m_Father: {fileID: 2972287193865663416}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_LocalEulerAnglesHint: {x: -90, y: -0, z: -0}
--- !u!1 &5231972868284677812
GameObject:
m_ObjectHideFlags: 0
@@ -9718,7 +9807,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2972287193865663416}
- m_Layer: 13
+ m_Layer: 7
m_Name: gun_barrel_14081_multy
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9735,13 +9824,14 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
+ m_LocalScale: {x: 2, y: 2, z: 2}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 1015605849030302123}
- {fileID: 5820194299576918036}
+ - {fileID: 442416087321852183}
m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5661642598525705985
GameObject:
m_ObjectHideFlags: 0
@@ -9753,7 +9843,7 @@ GameObject:
- component: {fileID: 2584218039270945547}
- component: {fileID: 3721102235797468070}
- component: {fileID: 7918042950767280704}
- m_Layer: 13
+ m_Layer: 7
m_Name: glow
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -12025,7 +12115,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5661642598525705985}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -12102,7 +12192,7 @@ GameObject:
- component: {fileID: 3129062424554725976}
- component: {fileID: 3815666402655289734}
- component: {fileID: 3550620980407921450}
- m_Layer: 13
+ m_Layer: 7
m_Name: glow
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -14383,7 +14473,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5716646623227088454}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -14460,7 +14550,7 @@ GameObject:
- component: {fileID: 5480059425452882980}
- component: {fileID: 3051180914531824573}
- component: {fileID: 1774238141065053275}
- m_Layer: 13
+ m_Layer: 7
m_Name: quan
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -16709,7 +16799,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5725760248708428246}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -16784,7 +16874,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8316173538903882812}
- m_Layer: 13
+ m_Layer: 7
m_Name: root
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -16820,7 +16910,7 @@ GameObject:
- component: {fileID: 6145830265884808835}
- component: {fileID: 8389910927477606989}
- component: {fileID: 8589541596666262137}
- m_Layer: 13
+ m_Layer: 7
m_Name: gunInfo_1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -16902,7 +16992,7 @@ GameObject:
m_Component:
- component: {fileID: 2415289599942596755}
- component: {fileID: 5539422442032217322}
- m_Layer: 13
+ m_Layer: 7
m_Name: gunInfo_1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -16950,7 +17040,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3618307526356716511}
- m_Layer: 13
+ m_Layer: 7
m_Name: eff_tx
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -16987,7 +17077,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1015605849030302123}
- m_Layer: 13
+ m_Layer: 7
m_Name: gun_scale
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -17019,7 +17109,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4279901169762748923}
- m_Layer: 13
+ m_Layer: 7
m_Name: eff_cx
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -17055,7 +17145,7 @@ GameObject:
- component: {fileID: 6733025771840640941}
- component: {fileID: 7199758345520702119}
- component: {fileID: 7267047202830085668}
- m_Layer: 13
+ m_Layer: 7
m_Name: lizi
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -19313,7 +19403,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8405019172042192469}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -19390,7 +19480,7 @@ GameObject:
- component: {fileID: 7184790031884725995}
- component: {fileID: 5981156211161317974}
- component: {fileID: 4548004594541794795}
- m_Layer: 13
+ m_Layer: 7
m_Name: glow
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -21648,7 +21738,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8877035606272254863}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
diff --git a/Assets/Art/FengLei/PaoTai/SunWuKong/gun_barrel_14902_multy.prefab b/Assets/Art/FengLei/PaoTai/SunWuKong/gun_barrel_14902_multy.prefab
index 81525f0b8..cc2281305 100644
--- a/Assets/Art/FengLei/PaoTai/SunWuKong/gun_barrel_14902_multy.prefab
+++ b/Assets/Art/FengLei/PaoTai/SunWuKong/gun_barrel_14902_multy.prefab
@@ -47,23 +47,28 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &2460959557783592271
-Transform:
+--- !u!224 &2460959557783592271
+RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 437630652280502677}
- serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 2.5, y: 2.5, z: 2.5}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2725821479889784993}
- {fileID: 4021848712052300005}
+ - {fileID: 8996008300045535276}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &518021978737703253
GameObject:
m_ObjectHideFlags: 0
@@ -2327,7 +2332,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 787752385267308909}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -4814,7 +4819,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2330410238574603380}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -7348,7 +7353,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3120181040528873521}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -9773,7 +9778,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3418343297316285625}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -12269,7 +12274,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4344892120816291080}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -14662,7 +14667,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4920464463809806164}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -17112,7 +17117,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6683715287655230229}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -19496,7 +19501,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8196821596721682812}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -21876,7 +21881,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9100572383601126316}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -21942,3 +21947,92 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1
m_MeshWeighting3: 1
m_MaskInteraction: 0
+--- !u!1 &9200443202653183835
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8996008300045535276}
+ - component: {fileID: 6618501636212858380}
+ - component: {fileID: 5063483845585310774}
+ m_Layer: 5
+ m_Name: UIParticle (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8996008300045535276
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9200443202653183835}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2460959557783592271}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 39.02406, y: -2.8532968}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6618501636212858380
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9200443202653183835}
+ m_CullTransparentMesh: 1
+--- !u!114 &5063483845585310774
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9200443202653183835}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_IsTrail: 0
+ m_IgnoreCanvasScaler: 0
+ m_AbsoluteMode: 0
+ m_Scale3D: {x: 10, y: 10, z: 10}
+ m_AnimatableProperties: []
+ m_Particles:
+ - {fileID: 7028489125818735055}
+ - {fileID: 4346071895342720970}
+ - {fileID: 25600557144547425}
+ - {fileID: 2651184926999411872}
+ - {fileID: 590552862674948848}
+ - {fileID: 1487169387598285618}
+ - {fileID: 6032664856325819608}
+ - {fileID: 8482345212245912756}
+ - {fileID: 3283803330975591598}
+ m_MeshSharing: 0
+ m_GroupId: 0
+ m_GroupMaxId: 0
+ m_PositionMode: 0
+ m_AutoScaling: 0
+ m_AutoScalingMode: 2
+ m_UseCustomView: 0
+ m_CustomViewSize: 10
+ m_TimeScaleMultiplier: 1
diff --git a/Assets/Art/FengLei/PaoTai/XiongMao/gun_barrel_14080_multy.prefab b/Assets/Art/FengLei/PaoTai/XiongMao/gun_barrel_14080_multy.prefab
index 3fda129aa..84754348b 100644
--- a/Assets/Art/FengLei/PaoTai/XiongMao/gun_barrel_14080_multy.prefab
+++ b/Assets/Art/FengLei/PaoTai/XiongMao/gun_barrel_14080_multy.prefab
@@ -2292,7 +2292,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 344127664869181364}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -4627,7 +4627,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114484048961365713}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -7060,7 +7060,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1402073029737945843}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -9400,7 +9400,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1624677347117327575}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -11793,7 +11793,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770534511820902034}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -14088,7 +14088,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1942241928147034026}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -14243,11 +14243,12 @@ RectTransform:
m_GameObject: {fileID: 3774533120367730850}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
+ m_LocalScale: {x: 2.5, y: 2.5, z: 2.5}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 9051910067101164211}
- {fileID: 5010675526231036134}
+ - {fileID: 3490028313455901527}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -16567,7 +16568,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5012536189732367151}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -18916,7 +18917,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5409947224001648805}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -21435,7 +21436,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6297624202066476235}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -24096,7 +24097,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8260459685158596211}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@@ -24243,6 +24244,97 @@ Animation:
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
+--- !u!1 &8548417501045465294
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3490028313455901527}
+ - component: {fileID: 8178357414834833421}
+ - component: {fileID: 2692144189500075935}
+ m_Layer: 5
+ m_Name: UIParticle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3490028313455901527
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8548417501045465294}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 7274721101021965849}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 87.69881, y: 131.4168}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8178357414834833421
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8548417501045465294}
+ m_CullTransparentMesh: 1
+--- !u!114 &2692144189500075935
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8548417501045465294}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_IsTrail: 0
+ m_IgnoreCanvasScaler: 0
+ m_AbsoluteMode: 0
+ m_Scale3D: {x: 10, y: 10, z: 10}
+ m_AnimatableProperties: []
+ m_Particles:
+ - {fileID: 8719717890413543699}
+ - {fileID: 7663915474117320682}
+ - {fileID: 8708423262884295769}
+ - {fileID: 2011742932420378068}
+ - {fileID: 5889779031386014228}
+ - {fileID: 3748269152729105834}
+ - {fileID: 7870407413933851088}
+ - {fileID: 5372700382959566028}
+ - {fileID: 7417307564021833423}
+ - {fileID: 7762935119138424596}
+ - {fileID: 7417192202654181459}
+ m_MeshSharing: 0
+ m_GroupId: 0
+ m_GroupMaxId: 0
+ m_PositionMode: 0
+ m_AutoScaling: 0
+ m_AutoScalingMode: 2
+ m_UseCustomView: 0
+ m_CustomViewSize: 10
+ m_TimeScaleMultiplier: 1
--- !u!1 &8981768654061387909
GameObject:
m_ObjectHideFlags: 0
@@ -26504,7 +26596,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9105801768594421848}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
diff --git a/Assets/Art/FengLei/PaoTai/XiongMao/laser.prefab b/Assets/Art/FengLei/PaoTai/XiongMao/laser.prefab
index b74c43c59..8a4608d05 100644
--- a/Assets/Art/FengLei/PaoTai/XiongMao/laser.prefab
+++ b/Assets/Art/FengLei/PaoTai/XiongMao/laser.prefab
@@ -79,7 +79,7 @@ LineRenderer:
- {x: 0, y: 0, z: 0}
m_Parameters:
serializedVersion: 3
- widthMultiplier: 5
+ widthMultiplier: 15
widthCurve:
serializedVersion: 2
m_Curve:
diff --git a/Assets/Art/FengLei/PaoTai/YangJian/gun_barrel_14901_multy.prefab b/Assets/Art/FengLei/PaoTai/YangJian/gun_barrel_14901_multy.prefab
index d377d2c6b..cddb43414 100644
--- a/Assets/Art/FengLei/PaoTai/YangJian/gun_barrel_14901_multy.prefab
+++ b/Assets/Art/FengLei/PaoTai/YangJian/gun_barrel_14901_multy.prefab
@@ -2381,7 +2381,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 268630265903693139}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -2447,6 +2447,95 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1
m_MeshWeighting3: 1
m_MaskInteraction: 0
+--- !u!1 &1342118598067250190
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2826291771310781170}
+ - component: {fileID: 6299257699251680631}
+ - component: {fileID: 5176732891755268105}
+ m_Layer: 5
+ m_Name: UIParticle (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2826291771310781170
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1342118598067250190}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 8223493439014318215}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 39.02406, y: -2.8532968}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6299257699251680631
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1342118598067250190}
+ m_CullTransparentMesh: 1
+--- !u!114 &5176732891755268105
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1342118598067250190}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_IsTrail: 0
+ m_IgnoreCanvasScaler: 0
+ m_AbsoluteMode: 0
+ m_Scale3D: {x: 10, y: 10, z: 10}
+ m_AnimatableProperties: []
+ m_Particles:
+ - {fileID: 5788484145113566424}
+ - {fileID: 7788214804363084519}
+ - {fileID: 2869745842393946165}
+ - {fileID: 2371632679064916965}
+ - {fileID: 8885838943056206645}
+ - {fileID: 6827414813987616782}
+ - {fileID: 4328330888670117982}
+ - {fileID: 7473548767807473036}
+ - {fileID: 8343677857915037889}
+ m_MeshSharing: 0
+ m_GroupId: 0
+ m_GroupMaxId: 0
+ m_PositionMode: 0
+ m_AutoScaling: 0
+ m_AutoScalingMode: 2
+ m_UseCustomView: 0
+ m_CustomViewSize: 10
+ m_TimeScaleMultiplier: 1
--- !u!1 &1482267876903877469
GameObject:
m_ObjectHideFlags: 0
@@ -2522,11 +2611,12 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
+ m_LocalScale: {x: 2.5, y: 2.5, z: 2.5}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 197662430289101878}
- {fileID: 1981340736255027452}
+ - {fileID: 2826291771310781170}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!1 &2479486549035994066
@@ -4948,7 +5038,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2597476128985493786}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -7586,7 +7676,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5588286336026077028}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -9921,7 +10011,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5833900628454788486}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -12265,7 +12355,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6298165326571752070}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -14669,7 +14759,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7454342797302155631}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -17107,7 +17197,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8211215532581698278}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -19451,7 +19541,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8577284601698599570}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -21876,7 +21966,7 @@ ParticleSystemRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8808445110538360561}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
diff --git a/Assets/Art/JABY/Fish/JiGuangControl.cs b/Assets/Art/JABY/Fish/JiGuangControl.cs
index b49f91ef6..4316daf2b 100644
--- a/Assets/Art/JABY/Fish/JiGuangControl.cs
+++ b/Assets/Art/JABY/Fish/JiGuangControl.cs
@@ -39,6 +39,34 @@ public static class JiGuangControl
JiGuangCreateCore(prefab, startPos, targets, fxList, parent, z);
}
+ ///
+ /// 多起点创建：startPositions 与 targets 一一对应（每条激光独立起点），
+ /// 生成位置强制使用指定 Z。起点数量不足时复用最后一个起点。
+ /// （如战神激光：第0条=座位点+偏移的主起点，第1/2条=散射左右父对象起点）
+ ///
+ public static void JiGuangCreate(GameObject prefab, List startPositions, List targets, List fxList, Transform parent, float z)
+ {
+ if (prefab == null || startPositions == null || startPositions.Count == 0
+ || targets == null || fxList == null)
+ return;
+
+ for (int i = 0; i < fxList.Count; i++)
+ if (fxList[i] != null)
+ Object.Destroy(fxList[i].gameObject);
+ fxList.Clear();
+
+ for (int i = 0; i < targets.Count; i++)
+ {
+ if (targets[i] == null) continue;
+
+ Vector3 spawnPos = startPositions[Mathf.Min(i, startPositions.Count - 1)];
+ spawnPos.z = z;
+ GameObject go = Object.Instantiate(prefab, spawnPos, Quaternion.identity, parent);
+ go.name = prefab.name + "_" + i;
+ fxList.Add(go.transform);
+ }
+ }
+
private static void JiGuangCreateCore(GameObject prefab, Vector3 startPos, List targets, List fxList, Transform parent, float? forcedZ)
{
if (prefab == null || targets == null || fxList == null)
@@ -90,6 +118,35 @@ public static class JiGuangControl
JiGuangDirectionCore(startPos, targets, fxList, z);
}
+ ///
+ /// 多起点朝向：startPositions 与 targets/fxList 一一对应（每条激光独立起点），
+ /// 起点和终点强制使用指定 Z（同层）。起点数量不足时复用最后一个起点。
+ ///
+ public static void JiGuangDirection(List startPositions, List targets, List fxList, float z)
+ {
+ if (startPositions == null || startPositions.Count == 0
+ || targets == null || fxList == null || fxList.Count == 0)
+ return;
+
+ int fxIndex = 0;
+ for (int i = 0; i < targets.Count; i++)
+ {
+ if (targets[i] == null) continue;
+ if (fxIndex >= fxList.Count) break;
+
+ Vector3 startPos = startPositions[Mathf.Min(i, startPositions.Count - 1)];
+ Vector3 endPos = targets[i].position;
+ startPos.z = z;
+ endPos.z = z;
+ Vector3 dir = endPos - startPos;
+
+ if (dir.sqrMagnitude > 0.0001f)
+ fxList[fxIndex].rotation = Quaternion.LookRotation(dir);
+
+ fxIndex++;
+ }
+ }
+
private static void JiGuangDirectionCore(Vector3 startPos, List targets, List fxList, float? forcedZ)
{
if (targets == null || fxList == null || fxList.Count == 0)
@@ -144,6 +201,35 @@ public static class JiGuangControl
JiGuangLengthCore(startPos, targets, fxList, fxBaseScale, lengthCorrect, z);
}
+ ///
+ /// 多起点长度：startPositions 与 targets/fxList 一一对应（每条激光独立起点），
+ /// 起点和终点强制使用指定 Z（同层）。起点数量不足时复用最后一个起点。
+ ///
+ public static void JiGuangLength(List startPositions, List targets, List fxList, Vector3 fxBaseScale, float lengthCorrect, float z)
+ {
+ if (startPositions == null || startPositions.Count == 0
+ || targets == null || fxList == null || fxList.Count == 0)
+ return;
+
+ int fxIndex = 0;
+ for (int i = 0; i < targets.Count; i++)
+ {
+ if (targets[i] == null) continue;
+ if (fxIndex >= fxList.Count) break;
+
+ Vector3 startPos = startPositions[Mathf.Min(i, startPositions.Count - 1)];
+ Vector3 endPos = targets[i].position;
+ startPos.z = z;
+ endPos.z = z;
+ float distance = (endPos - startPos).magnitude;
+ Vector3 scale = fxBaseScale;
+ scale.z = distance * fxBaseScale.z * lengthCorrect;
+ fxList[fxIndex].localScale = scale;
+
+ fxIndex++;
+ }
+ }
+
private static void JiGuangLengthCore(Vector3 startPos, List targets, List fxList, Vector3 fxBaseScale, float lengthCorrect, float? forcedZ)
{
if (targets == null || fxList == null || fxList.Count == 0)
diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity
index e7c9919fd..14b173f68 100644
--- a/Assets/MyGame/Scenes/UIScene.unity
+++ b/Assets/MyGame/Scenes/UIScene.unity
@@ -6718,7 +6718,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: afce420be78fe7e45bf80ca49529e276, type: 3}
m_Name:
m_EditorClassIdentifier:
- enableBot: 1
+ enableBot: 0
botConfig:
enabled: 1
aiState: active
@@ -7080,7 +7080,7 @@ MonoBehaviour:
spawnList: []
isCreateFish: 0
isFrozen: 0
- debugSpawnFishNumber: 11023
+ debugSpawnFishNumber: 11033
fishList_All: []
fishList_Small: []
fishList_Boss: []
diff --git a/Assets/MyGame/Scripts/Turret/SitPosData.cs b/Assets/MyGame/Scripts/Turret/SitPosData.cs
index 92bc81d12..85a816120 100644
--- a/Assets/MyGame/Scripts/Turret/SitPosData.cs
+++ b/Assets/MyGame/Scripts/Turret/SitPosData.cs
@@ -58,6 +58,13 @@ public class SitPosData : MonoBehaviour
public bool isDrillActive;
[Tooltip("激光锁定：true=激光发射期间炮台锁定方向，SetRotation 不生效（原方向打到爆奖结束）")]
public bool isLaserLocked;
+
+ ///
+ /// 散射激光模式中（GameMainPanel 每帧刷新：三发+锁定+已锁目标）。
+ /// ⭐ 激活左右起点球父对象用这个标记，不依赖实际锁定点数量（目标不足2个时散射模式开着也要显示起点球）
+ ///
+ [System.NonSerialized]
+ public bool isScatterLaserOn;
// -------------------------
// 炮台管理（动态克隆）
// -------------------------
@@ -92,12 +99,14 @@ public class SitPosData : MonoBehaviour
// - laserPrefab 非空 → 预制体形态：JiGuangControl 工具类驱动（克隆激光预制体，方向/长度每帧刷新）
// - laserPrefab 为空 → LineRenderer 兜底形态：直接新建 GameObject + LineRenderer
// -------------------------
- /// LineRenderer 形态激光列表（起点=子弹创建位置，终点=锁定鱼的位置）。三发锁定=3条
+ /// LineRenderer 形态激光列表。三发锁定=3条。起点：0=主激光(座位点+selfOffsetJGStart)，1/2=散射左右(JGFX父对象位置)
private readonly List _zhanShenLasers = new List();
/// 预制体形态激光实例列表（世界空间，由 JiGuangControl.JiGuangCreate 按目标数量重建）
private readonly List _laserFx = new List();
/// 预制体形态激光的基准缩放（重建时取自 laserPrefab.transform.localScale）
private Vector3 _laserFxBaseScale = Vector3.one;
+ /// 每条激光的起点缓存（索引与 _laserTargets 对齐，每帧复用避免 GC）
+ private readonly List _laserStarts = new List();
// -------------------------
// XJMH 炮台列表（星际迷航专用）
@@ -154,7 +163,9 @@ public class SitPosData : MonoBehaviour
public Button btn_TurretMinus;
[Header("激光效果父对象")]
+ [Tooltip("散射激光左起点球的父对象：出场/换战神时克隆 ZhanShenTurretData.JGQiuStartPrefab 到它下面，散射激光激活时显示。不拖也没关系：Awake 会自动创建兜底节点")]
public Transform JGFXLeftParent;
+ [Tooltip("散射激光右起点球的父对象：出场/换战神时克隆 ZhanShenTurretData.JGQiuStartPrefab 到它下面，散射激光激活时显示。不拖也没关系：Awake 会自动创建兜底节点")]
public Transform JGFXRightParent;
private void Awake()
@@ -164,6 +175,10 @@ public class SitPosData : MonoBehaviour
if (btn_TurretMinus != null)
btn_TurretMinus.onClick.AddListener(() => ChangeTurretMinusConsumeNum());
+ // ⭐ 散射起点球父对象兜底：预制体没拖引用就自动创建（挂 beij 下，炮台两侧），
+ // 保证 UpdateJGFXParentsActive 永远有对象可激活，不依赖 Inspector 配置
+ EnsureJGFXParents();
+
// XJMH 模式：隐藏钻石显示（只显示金币）
if (turretControlMode == TurretControlMode.XJMH && tMP_DiamondNum != null)
tMP_DiamondNum.gameObject.SetActive(false);
@@ -174,6 +189,39 @@ public class SitPosData : MonoBehaviour
InitXJMHTurret();
}
+ ///
+ /// 散射起点球父对象兜底：Inspector 没拖引用时自动创建两个 RectTransform
+ /// （挂在 turretRotate 的父节点 beij 下，炮台左右两侧 ±50），并写回字段。
+ /// 拖了引用（预制体配置的座位）则什么都不做。
+ ///
+ private void EnsureJGFXParents()
+ {
+ if (JGFXLeftParent != null && JGFXRightParent != null) return;
+
+ // 挂载点：turretRotate 的父节点（beij）；拿不到就挂座位根
+ Transform attach = turretRotate != null && turretRotate.parent != null
+ ? turretRotate.parent
+ : transform;
+
+ if (JGFXLeftParent == null)
+ JGFXLeftParent = CreateJGFXParent(attach, "JGFXLeftParent", -50f);
+ if (JGFXRightParent == null)
+ JGFXRightParent = CreateJGFXParent(attach, "JGFXRightParent", 50f);
+ }
+
+ /// 创建一个散射起点球父节点（beij 下，x 偏移 ±50、y 100，默认隐藏）
+ private static RectTransform CreateJGFXParent(Transform parent, string name, float xOffset)
+ {
+ GameObject go = new GameObject(name, typeof(RectTransform));
+ RectTransform rt = (RectTransform)go.transform;
+ rt.SetParent(parent, false);
+ rt.anchorMin = rt.anchorMax = new Vector2(0.5f, 0.5f);
+ rt.sizeDelta = new Vector2(44f, 37f);
+ rt.anchoredPosition = new Vector2(xOffset, 100f);
+ go.SetActive(false);
+ return rt;
+ }
+
///
/// XJMH 模式：炮台是座位自带子对象，预制体里已摆好激活状态，不需要 LoadTurret 加载。
/// 此方法只做引用初始化：从 取第一个激活的炮台赋给 currentTurret，
@@ -234,6 +282,11 @@ public class SitPosData : MonoBehaviour
}
// 座位禁用时清理战神激光（世界空间对象，不随座位隐藏）
DestroyZhanShenLaser();
+ // 散射起点父对象藏起来（子对象保留，下次出场/换战神时重建）
+ if (JGFXLeftParent != null)
+ JGFXLeftParent.gameObject.SetActive(false);
+ if (JGFXRightParent != null)
+ JGFXRightParent.gameObject.SetActive(false);
}
private void Update()
@@ -244,8 +297,12 @@ public class SitPosData : MonoBehaviour
// ==================== 战神激光（锁定时显示） ====================
///
- /// 战神锁定时显示激光：起点=创建子弹的位置(GetBulletStartPos)，终点=锁定鱼的位置，Z 统一压到 -50 显示层。
+ /// 战神锁定时显示激光，Z 统一压到 -50 显示层。
/// ⭐ 一个锁定点一条激光：单发锁定=1条，三发锁定=3条（主目标+2个三发目标）。
+ /// ⭐ 每条激光独立起点：第0条(主锁定)=turretRotate 子对象偏移 selfOffsetJGStart（⭐跟随炮台旋转），
+ /// 第1/2条(散射左右)=JGFXLeftParent/JGFXRightParent 的位置（座位 UI 上的起点球父对象）。
+ /// ⭐ 使用散射激光时激活 JGFXLeftParent/JGFXRightParent 显示起点球，否则隐藏：
+ /// 本地座位=三发+锁定开着(isScatterLaserOn，面板每帧刷新)；远程/bot座位=锁定点>1(三发目标凑满)。
/// ⭐ 两种形态：laserPrefab 非空 → 预制体形态(JiGuangControl 工具类)；为空 → LineRenderer 兜底形态。
/// ⭐ 只是视觉表现：打中鱼仍按正常攻击频率由子弹完成（HandleAutoFire 以 attackTime 发射锁定子弹）。
/// 普通炮台没有此效果（currentZhanShenData 为 null 时不显示）。
@@ -274,6 +331,15 @@ public class SitPosData : MonoBehaviour
}
}
+ // ⭐ 散射激光使用中就激活左右起点父对象显示起点球：
+ // isScatterLaserOn=三发+锁定开着(面板每帧刷新，本地座位)；锁定点>1=三发目标已凑满(远程/bot座位)
+ // 两个条件满足其一即激活——散射模式开着但目标不足时也要显示起点球
+ UpdateJGFXParentsActive(currentZhanShenData != null && (_laserTargets.Count > 1 || isScatterLaserOn));
+
+#if UNITY_EDITOR
+ DebugJGFXState();
+#endif
+
// 没有锁定点：隐藏所有激光
if (_laserTargets.Count == 0)
{
@@ -306,43 +372,42 @@ public class SitPosData : MonoBehaviour
///
/// 预制体形态（laserPrefab 非空）：JiGuangControl 工具类驱动。
/// 目标数量变化时全量重建（JiGuangCreate），每帧刷新位置/朝向/长度（JiGuangDirection/JiGuangLength，Z 强制 -50）。
+ /// ⭐ 每条激光独立起点（多起点重载）：0=主锁定(座位点+偏移)，1/2=散射左右(JGFX父对象位置)。
///
private void UpdateZhanShenLaserFx()
{
var zsData = currentZhanShenData;
- // 起点：创建子弹的位置（Z=-50，战神激光显示层，和 FireBullet 的 startPos 同源仅 Z 不同）
- Vector3 startPos = GetBulletStartPos();
- startPos.z = -50f;
+ // 收集每条激光的起点（与 _laserTargets 一一对应）
+ _laserStarts.Clear();
+ for (int i = 0; i < _laserTargets.Count; i++)
+ _laserStarts.Add(GetZhanShenLaserStart(i));
// 目标数量变化时全量重建（锁定建立/解除/三发目标增减时触发），并刷新基准缩放
if (_laserFx.Count != _laserTargets.Count)
{
_laserFxBaseScale = zsData.laserPrefab.transform.localScale;
- JiGuangControl.JiGuangCreate(zsData.laserPrefab, startPos, _laserTargets, _laserFx, null, -50f);
+ JiGuangControl.JiGuangCreate(zsData.laserPrefab, _laserStarts, _laserTargets, _laserFx, null, -50f);
}
- // 炮口随炮台旋转会移动，位置需每帧同步；隐藏中的重新激活
+ // 起点需每帧同步（座位布局/起点球位置变化）；隐藏中的重新激活
for (int i = 0; i < _laserFx.Count; i++)
{
if (_laserFx[i] == null) continue;
if (!_laserFx[i].gameObject.activeSelf)
_laserFx[i].gameObject.SetActive(true);
- _laserFx[i].position = startPos;
+ if (i < _laserStarts.Count)
+ _laserFx[i].position = _laserStarts[i];
}
- // 朝向 + 长度（指定 Z=-50 的重载：起终点同层）
- JiGuangControl.JiGuangDirection(startPos, _laserTargets, _laserFx, -50f);
- JiGuangControl.JiGuangLength(startPos, _laserTargets, _laserFx, _laserFxBaseScale, zsData.laserLengthCorrect, -50f);
+ // 朝向 + 长度（多起点重载：起终点同层 Z=-50）
+ JiGuangControl.JiGuangDirection(_laserStarts, _laserTargets, _laserFx, -50f);
+ JiGuangControl.JiGuangLength(_laserStarts, _laserTargets, _laserFx, _laserFxBaseScale, zsData.laserLengthCorrect, -50f);
}
- /// LineRenderer 兜底形态（laserPrefab 为空）：按需创建、多余的隐藏
+ /// LineRenderer 兜底形态（laserPrefab 为空）：按需创建、多余的隐藏。每条激光独立起点
private void UpdateZhanShenLaserLine()
{
- // 起点：创建子弹的位置（Z=-50，战神激光显示层，和 FireBullet 的 startPos 同源仅 Z 不同）
- Vector3 start = GetBulletStartPos();
- start.z = -50f;
-
// 需要几条就创建几条（三发=3个 LineRenderer），多余的隐藏
for (int i = 0; i < _laserTargets.Count; i++)
{
@@ -351,6 +416,8 @@ public class SitPosData : MonoBehaviour
if (!line.gameObject.activeSelf)
line.gameObject.SetActive(true);
+ // 起点：第0条=主锁定(座位点+偏移)，1/2=散射左右(JGFX父对象位置)，Z=-50
+ Vector3 start = GetZhanShenLaserStart(i);
// 终点：该条锁定鱼的位置（Z=-50，与起点同层）
Vector3 end = _laserTargets[i].position;
end.z = -50f;
@@ -412,6 +479,186 @@ public class SitPosData : MonoBehaviour
_laserFx.Clear();
}
+ // ==================== 战神激光起点（每条激光独立起点） ====================
+
+ ///
+ /// 战神激光第 index 条的起点（鱼群世界坐标，Z=-50 显示层）：
+ /// - 第 0 条（主锁定）：turretRotate 子对象偏移（selfOffsetJGStart 是 turretRotate 的本地偏移，
+ /// ⭐ 跟随炮台旋转：炮口转向时起点绕炮台中心跟着转）
+ /// - 第 1 条（散射左）：JGFXLeftParent 的位置
+ /// - 第 2 条（散射右）：JGFXRightParent 的位置
+ /// - 越界/未配置：回退子弹炮口位置（旧版行为）
+ ///
+ private Vector3 GetZhanShenLaserStart(int index)
+ {
+ var zs = currentZhanShenData as ZhanShenTurretData;
+
+ // 主起点：turretRotate 的子对象偏移（炮台旋转时该点跟着转，TransformPoint 含旋转+缩放）
+ if (index == 0 && zs != null)
+ {
+ Vector3 offset = new Vector3(zs.selfOffsetJGStart.x, zs.selfOffsetJGStart.y, 0f);
+ Vector3 startPoint = turretRotate != null
+ ? turretRotate.TransformPoint(offset)
+ : transform.position + offset;
+ return SeatUIToFishWorld(startPoint, -50f);
+ }
+ // 散射左右起点：座位上左右两个起点球父对象的位置
+ if (index == 1 && JGFXLeftParent != null)
+ return SeatUIToFishWorld(JGFXLeftParent.position, -50f);
+ if (index == 2 && JGFXRightParent != null)
+ return SeatUIToFishWorld(JGFXRightParent.position, -50f);
+
+ // 回退：子弹炮口（旧版行为，未配置左右父对象/未挂 ZhanShenTurretData 时）
+ Vector3 fallback = GetBulletStartPos();
+ fallback.z = -50f;
+ return fallback;
+ }
+
+ ///
+ /// 座位 UI 上的世界坐标（座位根节点/座位子节点位置）→ 鱼群世界坐标（子弹/激光所在空间）。
+ /// 与 TurretData.GetBulletStartWorldPos 同一套换算（UI→屏幕→世界），Z 压到指定显示层。
+ ///
+ private Vector3 SeatUIToFishWorld(Vector3 uiWorldPos, float z)
+ {
+ Canvas canvas = UIManager.Instance != null && UIManager.Instance.uiRoot != null
+ ? UIManager.Instance.uiRoot.GetComponent