From e820d30a8b5bbe074fd79098d347e9072b384168 Mon Sep 17 00:00:00 2001 From: Game <35631295+Game260418@users.noreply.github.com> Date: Tue, 25 Aug 2026 20:13:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E7=A5=9E=E5=B1=95=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../display_wargod_in_14053_0_dev.prefab | 4 +- .../GeSiLa/display_FishEntry_4022.prefab | 2 +- .../MeiRenYu/display_FishEntry_6004.playable | 40 +--- .../MeiRenYu/display_FishEntry_6004.prefab | 14 +- .../display_wargod_14080_0_dev.prefab | 6 +- .../bg_dq_1/materials/bg_dq_beijing_1.mat | 191 ++++++++++-------- .../display_wargod_in_14053_0_dev.prefab | 96 ++++++++- .../MeiRenYu/display_FishEntry_6004.prefab | 34 ++++ 8 files changed, 248 insertions(+), 139 deletions(-) diff --git a/Assets/Art/FengLei/Boss/Display/DaQiao/display_wargod_in_14053_0_dev.prefab b/Assets/Art/FengLei/Boss/Display/DaQiao/display_wargod_in_14053_0_dev.prefab index 9fc572fc5..82bd18060 100644 --- a/Assets/Art/FengLei/Boss/Display/DaQiao/display_wargod_in_14053_0_dev.prefab +++ b/Assets/Art/FengLei/Boss/Display/DaQiao/display_wargod_in_14053_0_dev.prefab @@ -76474,7 +76474,7 @@ Camera: width: 1 height: 1 near clip plane: 0.05 - far clip plane: 600 + far clip plane: 1000 field of view: 50 orthographic: 0 orthographic size: 5 @@ -101579,7 +101579,7 @@ Camera: width: 1 height: 1 near clip plane: 0.05 - far clip plane: 600 + far clip plane: 1000 field of view: 50 orthographic: 0 orthographic size: 5 diff --git a/Assets/Art/FengLei/Boss/Display/GeSiLa/display_FishEntry_4022.prefab b/Assets/Art/FengLei/Boss/Display/GeSiLa/display_FishEntry_4022.prefab index 2d3daffab..f6ad43935 100644 --- a/Assets/Art/FengLei/Boss/Display/GeSiLa/display_FishEntry_4022.prefab +++ b/Assets/Art/FengLei/Boss/Display/GeSiLa/display_FishEntry_4022.prefab @@ -11922,7 +11922,7 @@ Camera: width: 1 height: 1 near clip plane: 0.099999994 - far clip plane: 40 + far clip plane: 100 field of view: 21.975962 orthographic: 0 orthographic size: 5 diff --git a/Assets/Art/FengLei/Boss/Display/MeiRenYu/display_FishEntry_6004.playable b/Assets/Art/FengLei/Boss/Display/MeiRenYu/display_FishEntry_6004.playable index 3abb361d8..55fad6cdd 100644 --- a/Assets/Art/FengLei/Boss/Display/MeiRenYu/display_FishEntry_6004.playable +++ b/Assets/Art/FengLei/Boss/Display/MeiRenYu/display_FishEntry_6004.playable @@ -1073,25 +1073,7 @@ MonoBehaviour: m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1118,25 +1100,7 @@ MonoBehaviour: m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Art/FengLei/Boss/Display/MeiRenYu/display_FishEntry_6004.prefab b/Assets/Art/FengLei/Boss/Display/MeiRenYu/display_FishEntry_6004.prefab index 5b92703b2..c84668022 100644 --- a/Assets/Art/FengLei/Boss/Display/MeiRenYu/display_FishEntry_6004.prefab +++ b/Assets/Art/FengLei/Boss/Display/MeiRenYu/display_FishEntry_6004.prefab @@ -70519,7 +70519,7 @@ Camera: width: 1 height: 1 near clip plane: 0.099999994 - far clip plane: 40 + far clip plane: 100 field of view: 42.554173 orthographic: 0 orthographic size: 1.6837744 @@ -236110,7 +236110,7 @@ Camera: width: 1 height: 1 near clip plane: 0.099999994 - far clip plane: 40 + far clip plane: 100 field of view: 49.426353 orthographic: 0 orthographic size: 3.400347 @@ -364464,7 +364464,7 @@ MonoBehaviour: m_Events: m_Signals: - {fileID: 11400000, guid: 002765bd145dc2a48be757c3c546b14c, type: 2} - - {fileID: 11400000, guid: 91ec1168340a168499ab038e4d6609ef, type: 2} + - {fileID: 0} m_Events: - m_PersistentCalls: m_Calls: @@ -364509,11 +364509,11 @@ MonoBehaviour: m_Events: m_Signals: - {fileID: 11400000, guid: 002765bd145dc2a48be757c3c546b14c, type: 2} - - {fileID: 11400000, guid: 91ec1168340a168499ab038e4d6609ef, type: 2} + - {fileID: 0} m_Events: - m_PersistentCalls: m_Calls: - - m_Target: {fileID: 7655997300433311361} + - m_Target: {fileID: 7953033694872114390} m_TargetAssemblyTypeName: TimelineJumper, Assembly-CSharp m_MethodName: JumpToFrame m_Mode: 1 @@ -417083,6 +417083,10 @@ PlayableDirector: value: {fileID: 188093398674264597} - key: {fileID: -1057346666486005993, guid: 06e22d0e281429447b20d2fbfb075972, type: 2} value: {fileID: 357634162364361530} + - key: {fileID: -6291054412629306117, guid: 06e22d0e281429447b20d2fbfb075972, type: 2} + value: {fileID: 0} + - key: {fileID: -5854594703988967651, guid: 06e22d0e281429447b20d2fbfb075972, type: 2} + value: {fileID: 0} m_ExposedReferences: m_References: - 972695d9de143354ab1542cea9682c8e: {fileID: 7073152987800559612} diff --git a/Assets/Art/FengLei/Boss/Display/XiongMao/display_wargod_14080_0_dev.prefab b/Assets/Art/FengLei/Boss/Display/XiongMao/display_wargod_14080_0_dev.prefab index 90705fe81..3ef2b78bf 100644 --- a/Assets/Art/FengLei/Boss/Display/XiongMao/display_wargod_14080_0_dev.prefab +++ b/Assets/Art/FengLei/Boss/Display/XiongMao/display_wargod_14080_0_dev.prefab @@ -173159,14 +173159,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6484606306514562742} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0.42261827, y: 0, z: 0, w: 0.9063079} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5300665937812909477} m_Father: {fileID: 2974972986085835541} - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: -50, y: -0, z: -0} --- !u!1 &6510244058543893860 GameObject: m_ObjectHideFlags: 0 @@ -185145,7 +185145,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7018613850427909376} serializedVersion: 2 - m_LocalRotation: {x: 0.27299556, y: 0.74377066, z: 0.60679746, w: -0.06383961} + m_LocalRotation: {x: 0.07106404, y: 0.7890955, z: 0.60262835, w: 0.09548442} m_LocalPosition: {x: -1.2034149, y: -4.150479, z: 3.3754418} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/scenes/bg_dq_1/materials/bg_dq_beijing_1.mat b/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/scenes/bg_dq_1/materials/bg_dq_beijing_1.mat index 84384fe9c..630031205 100644 --- a/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/scenes/bg_dq_1/materials/bg_dq_beijing_1.mat +++ b/Assets/Art/FengLei/ResLY/bydr/dataresources/model/fish/scenes/bg_dq_1/materials/bg_dq_beijing_1.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8499039342638468086 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -8,109 +21,113 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: bg_dq_beijing_1 - m_Shader: {fileID: 4800000, guid: 6738f71d6ce61f9458b8be51b9611803, type: 3} + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: - - _ALPHA_CLIP - - _DISORTION_ON - - _STREAMERCHANNEL_UVPOS + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2950 - stringTagMap: {} + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] - m_LockedProperties: + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _MainTex: + - _BaseMap: m_Texture: {fileID: 2800000, guid: 65f5d84faf8d1f54484ffbef0d617e82, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _texcoord: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 65f5d84faf8d1f54484ffbef0d617e82, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _texcoord: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: {} + m_Ints: [] m_Floats: - _AOScale: 0 - _Alpha: 1 - _AlphaClip: 0 - _AlphaClipEnable: 1 - _AlphaCutoff: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _CullMode: 0 - _Cutoff: 1 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DisortionEnable: 1 - _Disortion_X_Speed: 0 - _Disortion_X_Strength: 0 - _Disortion_Y_Speed: 0 - _Disortion_Y_Strength: 0 - _DstBlend: 10 - _DstBlendAlpha: 0 - _EmissionEnable: 0 - _EmissionMapEnable: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _MetalicRemapMax: 1 - _MetalicRemapMin: 0 - _Metallic: 0 - _MetallicScale: 0 - _Mode: 1 - _MultiSelfStreamer: 0 - _NormalMapEnable: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - _RoughnessRemapMax: 1 - _RoughnessRemapMin: 0 - _RoughnessScale: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _StencilComp: 8 - _StencilFailOp: 0 - _StencilPassOp: 0 - _StencilRef: 0 - _Streamer: 0 - _StreamerAlpha: 1 - _StreamerChannel: 0 - _StreamerNoiseSpeed: 1 - _StreamerScrollX: 1 - _StreamerScrollY: 0 - _Surface: 0 - _VertexWaveEnable: 0 - _WindSpeed: 11.6 - _WindStrength: 0.248 - _WorkflowMode: 1 - _ZWrite: 0 - __CullMode: 0 - __ZTest: 4 - __ZWrite: 0 - _opacity: 1 - _qd: 1 + - _AOScale: 0 + - _Alpha: 1 + - _AlphaClip: 0 + - _AlphaClipEnable: 1 + - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _CullMode: 0 + - _Cutoff: 1 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DisortionEnable: 1 + - _Disortion_X_Speed: 0 + - _Disortion_X_Strength: 0 + - _Disortion_Y_Speed: 0 + - _Disortion_Y_Strength: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EmissionEnable: 0 + - _EmissionMapEnable: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _MetalicRemapMax: 1 + - _MetalicRemapMin: 0 + - _Metallic: 0 + - _MetallicScale: 0 + - _Mode: 1 + - _MultiSelfStreamer: 0 + - _NormalMapEnable: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _RoughnessRemapMax: 1 + - _RoughnessRemapMin: 0 + - _RoughnessScale: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _StencilComp: 8 + - _StencilFailOp: 0 + - _StencilPassOp: 0 + - _StencilRef: 0 + - _Streamer: 0 + - _StreamerAlpha: 1 + - _StreamerChannel: 0 + - _StreamerNoiseSpeed: 1 + - _StreamerScrollX: 1 + - _StreamerScrollY: 0 + - _Surface: 0 + - _VertexWaveEnable: 0 + - _WindSpeed: 11.6 + - _WindStrength: 0.248 + - _WorkflowMode: 1 + - _ZWrite: 1 + - __CullMode: 0 + - __ZTest: 4 + - __ZWrite: 0 + - _opacity: 1 + - _qd: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.927298, g: 0.9471988, b: 0.98490566, a: 1} - _EmissionColor: {r: 0.3254717, g: 1, b: 0.4820429, a: 1} - _MainColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecularLightOffset: {r: 0, g: 0, b: 0, a: 0} - _StreamerColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0.3254717, g: 1, b: 0.4820429, a: 1} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _SpecularLightOffset: {r: 0, g: 0, b: 0, a: 0} + - _StreamerColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/MyGame/aa/Game/ZhanShen/DaQiao/display_wargod_in_14053_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/DaQiao/display_wargod_in_14053_0_dev.prefab index 67589f764..8d3024fe6 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/DaQiao/display_wargod_in_14053_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/DaQiao/display_wargod_in_14053_0_dev.prefab @@ -43,6 +43,11 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 94839928342248859, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 103527876642987978, guid: 947c6e603406a744cb3de57c401cc516, type: 3} propertyPath: m_Layer @@ -237,6 +242,11 @@ PrefabInstance: type: 3} propertyPath: m_Events.m_Events.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: + objectReference: {fileID: 586262465613916856} + - target: {fileID: 939141115923595100, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_Events.m_Events.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: JumpToFrame objectReference: {fileID: 0} - target: {fileID: 942804600492137576, guid: 947c6e603406a744cb3de57c401cc516, type: 3} @@ -273,6 +283,11 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 1004316953781476042, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1008911757426282425, guid: 947c6e603406a744cb3de57c401cc516, type: 3} propertyPath: m_Layer @@ -308,6 +323,41 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 1131677958382895707, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131677958382895707, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131677958382895707, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131677958382895707, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1131677958382895707, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1131677958382895707, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1131677958382895707, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_LocalRotation.z + value: -7.275958e-12 + objectReference: {fileID: 0} - target: {fileID: 1161101668921601199, guid: 947c6e603406a744cb3de57c401cc516, type: 3} propertyPath: m_Layer @@ -488,6 +538,11 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 1527042228237577210, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1528169578531024474, guid: 947c6e603406a744cb3de57c401cc516, type: 3} propertyPath: m_Layer @@ -643,6 +698,11 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 1966964969211901548, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1968972747107188785, guid: 947c6e603406a744cb3de57c401cc516, type: 3} propertyPath: m_Layer @@ -708,6 +768,11 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 2122877092926583133, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2127249140257568729, guid: 947c6e603406a744cb3de57c401cc516, type: 3} propertyPath: m_Layer @@ -1733,6 +1798,11 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 5331881158589423227, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5339068507004040903, guid: 947c6e603406a744cb3de57c401cc516, type: 3} propertyPath: m_Layer @@ -2013,6 +2083,11 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 6384823560532305821, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6398119808779644073, guid: 947c6e603406a744cb3de57c401cc516, type: 3} propertyPath: m_Layer @@ -2042,6 +2117,11 @@ PrefabInstance: type: 3} propertyPath: m_Events.m_Events.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: + objectReference: {fileID: 586262465613916856} + - target: {fileID: 6590580869299253208, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + propertyPath: m_Events.m_Events.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: JumpToFrame objectReference: {fileID: 0} - target: {fileID: 6619336644038753563, guid: 947c6e603406a744cb3de57c401cc516, type: 3} @@ -2743,9 +2823,7 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7060699892922166125, guid: 947c6e603406a744cb3de57c401cc516, type: 3} - - {fileID: 1881839632867299237, guid: 947c6e603406a744cb3de57c401cc516, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: @@ -2754,6 +2832,18 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 7631072287571022996} m_SourcePrefab: {fileID: 100100000, guid: 947c6e603406a744cb3de57c401cc516, type: 3} +--- !u!114 &586262465613916856 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7060699892922166125, guid: 947c6e603406a744cb3de57c401cc516, + type: 3} + m_PrefabInstance: {fileID: 7628666483438797269} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4400983289994395771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 273f645586cb88d4b9ae527e20eafb01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4400983289994395771 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6110568047410905518, guid: 947c6e603406a744cb3de57c401cc516, diff --git a/Assets/MyGame/aa/Game/ZhanShen/MeiRenYu/display_FishEntry_6004.prefab b/Assets/MyGame/aa/Game/ZhanShen/MeiRenYu/display_FishEntry_6004.prefab index cd10a3b93..228a00b32 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/MeiRenYu/display_FishEntry_6004.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/MeiRenYu/display_FishEntry_6004.prefab @@ -2067,6 +2067,23 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 4317400798197432912, guid: b0b2f211485160f47b509fd3e92cd465, + type: 3} + propertyPath: m_SceneBindings.Array.size + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 4317400798197432912, guid: b0b2f211485160f47b509fd3e92cd465, + type: 3} + propertyPath: m_SceneBindings.Array.data[33].key + value: + objectReference: {fileID: -6291054412629306117, guid: 06e22d0e281429447b20d2fbfb075972, + type: 2} + - target: {fileID: 4317400798197432912, guid: b0b2f211485160f47b509fd3e92cd465, + type: 3} + propertyPath: m_SceneBindings.Array.data[34].key + value: + objectReference: {fileID: -5854594703988967651, guid: 06e22d0e281429447b20d2fbfb075972, + type: 2} - target: {fileID: 4344440748941751652, guid: b0b2f211485160f47b509fd3e92cd465, type: 3} propertyPath: m_Layer @@ -2162,6 +2179,11 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 4558495479320800110, guid: b0b2f211485160f47b509fd3e92cd465, + type: 3} + propertyPath: m_Events.m_Events.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 8403537160108915102} - target: {fileID: 4589142590884852935, guid: b0b2f211485160f47b509fd3e92cd465, type: 3} propertyPath: m_Layer @@ -4118,3 +4140,15 @@ MonoBehaviour: laserStartAnim: laserLoopAnim: laserEndAnim: +--- !u!114 &8403537160108915102 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7953033694872114390, guid: b0b2f211485160f47b509fd3e92cd465, + type: 3} + m_PrefabInstance: {fileID: 1927970033502694728} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 273f645586cb88d4b9ae527e20eafb01, type: 3} + m_Name: + m_EditorClassIdentifier: