diff --git a/Assets/Art/FengLei/Fish/1.prefab b/Assets/Art/FengLei/Fish/1.prefab index 0fd943c10..718aee3b8 100644 --- a/Assets/Art/FengLei/Fish/1.prefab +++ b/Assets/Art/FengLei/Fish/1.prefab @@ -1209,7 +1209,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.07676768, y: -0.04192242} diff --git a/Assets/Art/FengLei/Fish/10.prefab b/Assets/Art/FengLei/Fish/10.prefab index b3fafde58..f470536bb 100644 --- a/Assets/Art/FengLei/Fish/10.prefab +++ b/Assets/Art/FengLei/Fish/10.prefab @@ -555,7 +555,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.1191807, y: 0.015104849} @@ -698,7 +698,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8895144267851505211} - - component: {fileID: 7213782333366302781} - component: {fileID: 3456627678609309325} m_Layer: 6 m_Name: 10 @@ -725,27 +724,6 @@ Transform: - {fileID: 5263155180898369813} m_Father: {fileID: 7874624732079550046} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} ---- !u!65 &7213782333366302781 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4374091579394979583} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Size: {x: 0.28, y: 0.3, z: 0.61} - m_Center: {x: 0, y: 0.29, z: 0} --- !u!111 &3456627678609309325 Animation: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/12.prefab b/Assets/Art/FengLei/Fish/12.prefab index 9e3db67bc..24f4a0d1a 100644 --- a/Assets/Art/FengLei/Fish/12.prefab +++ b/Assets/Art/FengLei/Fish/12.prefab @@ -916,7 +916,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2575353513896150491} - - component: {fileID: 8670973752376306448} - component: {fileID: 1704050518285329560} m_Layer: 6 m_Name: 12 @@ -943,27 +942,6 @@ Transform: - {fileID: 3914546694199937231} m_Father: {fileID: 4608328855178707518} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} ---- !u!65 &8670973752376306448 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3783384196819677759} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Size: {x: 0.85, y: 0.66, z: 1.33} - m_Center: {x: 0, y: 0, z: -0.32} --- !u!111 &1704050518285329560 Animation: m_ObjectHideFlags: 0 @@ -1203,7 +1181,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.58041334, y: -0.21944839} diff --git a/Assets/Art/FengLei/Fish/14.prefab b/Assets/Art/FengLei/Fish/14.prefab index beea00ff4..b3977b858 100644 --- a/Assets/Art/FengLei/Fish/14.prefab +++ b/Assets/Art/FengLei/Fish/14.prefab @@ -65,7 +65,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.17936048, y: 0.0007607369} diff --git a/Assets/Art/FengLei/Fish/19.prefab b/Assets/Art/FengLei/Fish/19.prefab index d4809237c..d08335e41 100644 --- a/Assets/Art/FengLei/Fish/19.prefab +++ b/Assets/Art/FengLei/Fish/19.prefab @@ -5338,7 +5338,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.18871248, y: 0.26566958} diff --git a/Assets/Art/FengLei/Fish/20.prefab b/Assets/Art/FengLei/Fish/20.prefab index c35a0d963..694ad4974 100644 --- a/Assets/Art/FengLei/Fish/20.prefab +++ b/Assets/Art/FengLei/Fish/20.prefab @@ -5697,7 +5697,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.36343074, y: 0.28926766} diff --git a/Assets/Art/FengLei/Fish/21.prefab b/Assets/Art/FengLei/Fish/21.prefab index 7f43fb0a1..3d13260e0 100644 --- a/Assets/Art/FengLei/Fish/21.prefab +++ b/Assets/Art/FengLei/Fish/21.prefab @@ -1157,7 +1157,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.28011626, y: 0} @@ -1306,7 +1306,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5507249789953820377} - - component: {fileID: 9174730556781634695} - component: {fileID: 4889932815282285904} m_Layer: 6 m_Name: 21 @@ -1333,27 +1332,6 @@ Transform: - {fileID: 3816137431778387686} m_Father: {fileID: 7111204971889733956} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} ---- !u!65 &9174730556781634695 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6052521775343235464} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Size: {x: 0.34, y: 0.5, z: 1.01} - m_Center: {x: 0, y: 0.33, z: 0} --- !u!111 &4889932815282285904 Animation: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/22.prefab b/Assets/Art/FengLei/Fish/22.prefab index ba6fa5d09..f5c709cad 100644 --- a/Assets/Art/FengLei/Fish/22.prefab +++ b/Assets/Art/FengLei/Fish/22.prefab @@ -3024,7 +3024,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.021463893, y: 0.017284304} @@ -3257,7 +3257,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3089343959958404413} - - component: {fileID: 509267345977457788} - component: {fileID: 2474639078776657411} m_Layer: 6 m_Name: 22 @@ -3284,27 +3283,6 @@ Transform: - {fileID: 8333495036719816184} m_Father: {fileID: 7978123461670695739} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &509267345977457788 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7239873429150695493} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Size: {x: 0.28, y: 0.45, z: 0.49} - m_Center: {x: 0, y: 0, z: 0} --- !u!111 &2474639078776657411 Animation: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/24.prefab b/Assets/Art/FengLei/Fish/24.prefab index f761c1337..ffdeec04d 100644 --- a/Assets/Art/FengLei/Fish/24.prefab +++ b/Assets/Art/FengLei/Fish/24.prefab @@ -2961,7 +2961,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8852567793549804443} - - component: {fileID: 7908252022421155731} - component: {fileID: 2397062257072789892} m_Layer: 6 m_Name: 24 @@ -2988,27 +2987,6 @@ Transform: - {fileID: 2546764146363235897} m_Father: {fileID: 5039507599900344987} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &7908252022421155731 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3378806405839745718} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Size: {x: 0.26, y: 0.33, z: 0.64} - m_Center: {x: 0, y: 0, z: 0} --- !u!111 &2397062257072789892 Animation: m_ObjectHideFlags: 0 @@ -3124,7 +3102,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.13980204, y: 0} diff --git a/Assets/Art/FengLei/Fish/25.prefab b/Assets/Art/FengLei/Fish/25.prefab index 512a5e0b6..c6716987a 100644 --- a/Assets/Art/FengLei/Fish/25.prefab +++ b/Assets/Art/FengLei/Fish/25.prefab @@ -115,7 +115,7 @@ CircleCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1629801018240169} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -3169,7 +3169,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7746862646868157530} - - component: {fileID: 4505643288064859008} - component: {fileID: 3266294580306519833} m_Layer: 6 m_Name: 25 @@ -3196,27 +3195,6 @@ Transform: - {fileID: 2791296420975149600} m_Father: {fileID: 3856198244841969039} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &4505643288064859008 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2929894995988400250} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Size: {x: 0.5, y: 0.32, z: 0.6} - m_Center: {x: 0, y: 0, z: 0} --- !u!111 &3266294580306519833 Animation: m_ObjectHideFlags: 0 @@ -4213,7 +4191,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.3094905, y: 0} diff --git a/Assets/Art/FengLei/Fish/26.prefab b/Assets/Art/FengLei/Fish/26.prefab index 04703f03b..43881f674 100644 --- a/Assets/Art/FengLei/Fish/26.prefab +++ b/Assets/Art/FengLei/Fish/26.prefab @@ -6432,7 +6432,7 @@ GameObject: - component: {fileID: 3842568270010501509} m_Layer: 6 m_Name: GameObject - m_TagString: Untagged + m_TagString: Fish m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -6531,7 +6531,7 @@ GameObject: - component: {fileID: 4004404308693778402} m_Layer: 6 m_Name: GameObject - m_TagString: Untagged + m_TagString: Fish m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -6595,7 +6595,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6258223025056505649} - - component: {fileID: 1142100228069469170} m_Layer: 6 m_Name: GameObject m_TagString: Fish @@ -6618,51 +6617,6 @@ Transform: m_Children: [] m_Father: {fileID: 4316282737597189} m_LocalEulerAnglesHint: {x: 0, y: 71.68, z: 0} ---- !u!61 &1142100228069469170 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4334656083063590062} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.5296626, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 4.2871857, y: 1} - m_EdgeRadius: 0 --- !u!1 &6308394506541627293 GameObject: m_ObjectHideFlags: 0 @@ -6708,7 +6662,7 @@ GameObject: - component: {fileID: 5313613215699803829} m_Layer: 6 m_Name: GameObject - m_TagString: Untagged + m_TagString: Fish m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -6807,7 +6761,7 @@ GameObject: - component: {fileID: 1254774695710836626} m_Layer: 6 m_Name: GameObject - m_TagString: Untagged + m_TagString: Fish m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Art/FengLei/Fish/42.prefab b/Assets/Art/FengLei/Fish/42.prefab index 78f150b84..6ff68410f 100644 --- a/Assets/Art/FengLei/Fish/42.prefab +++ b/Assets/Art/FengLei/Fish/42.prefab @@ -5267,7 +5267,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -3.1590831, y: 1.9774317} diff --git a/Assets/Art/FengLei/Fish/45.prefab b/Assets/Art/FengLei/Fish/45.prefab index a4a198325..55ddd768c 100644 --- a/Assets/Art/FengLei/Fish/45.prefab +++ b/Assets/Art/FengLei/Fish/45.prefab @@ -115,7 +115,7 @@ CircleCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1011399550081363} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -632,6 +632,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5735260583413910674} + - component: {fileID: 6127612169893504032} m_Layer: 6 m_Name: Bone001 m_TagString: Fish @@ -690,6 +691,41 @@ Transform: - {fileID: 3445132051414017054} m_Father: {fileID: 8164725383347027367} m_LocalEulerAnglesHint: {x: -90, y: -0, z: 89.99997} +--- !u!58 &6127612169893504032 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971888585719540720} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.0126276035, y: -0.002544237} + serializedVersion: 2 + m_Radius: 0.24241264 --- !u!1 &1043768338758617328 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/48.prefab b/Assets/Art/FengLei/Fish/48.prefab index 67f7d6a9a..2c13bb951 100644 --- a/Assets/Art/FengLei/Fish/48.prefab +++ b/Assets/Art/FengLei/Fish/48.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 4561096802472947} - component: {fileID: 7965036302269272141} - - component: {fileID: -1529010931143686574} m_Layer: 6 m_Name: 48 m_TagString: Fish @@ -108,41 +107,6 @@ MonoBehaviour: drawMoveLine: 0 drawLineSegments: 60 drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} ---- !u!58 &-1529010931143686574 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1571740582362967} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.14126734, y: 0} - serializedVersion: 2 - m_Radius: 0.56780833 --- !u!1 &31746102754299363 GameObject: m_ObjectHideFlags: 0 @@ -248,7 +212,6 @@ GameObject: m_Component: - component: {fileID: 5317899020959005156} - component: {fileID: 6539587104325315538} - - component: {fileID: 1525620110287567792} m_Layer: 6 m_Name: 48 m_TagString: Fish @@ -290,27 +253,6 @@ Animation: m_PlayAutomatically: 1 m_AnimatePhysics: 0 m_CullingType: 1 ---- !u!65 &1525620110287567792 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1127975220257091206} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Size: {x: 0.27, y: 0.39, z: 0.63} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1921656328383235170 GameObject: m_ObjectHideFlags: 0 @@ -5695,6 +5637,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6464927967239605888} + - component: {fileID: 8522021063332231126} m_Layer: 6 m_Name: Bone_01 m_TagString: Fish @@ -5723,6 +5666,41 @@ Transform: - {fileID: 3757877029349175509} m_Father: {fileID: 1508851152944487142} m_LocalEulerAnglesHint: {x: -90.00001, y: -2.6926408, z: 76.00831} +--- !u!58 &8522021063332231126 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6270698359866613049} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.073961906, y: -0.024434714} + serializedVersion: 2 + m_Radius: 0.22351535 --- !u!1 &6405249834159638077 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Art/FengLei/Fish/53.prefab b/Assets/Art/FengLei/Fish/53.prefab index 95bf7d7f9..2655a9c75 100644 --- a/Assets/Art/FengLei/Fish/53.prefab +++ b/Assets/Art/FengLei/Fish/53.prefab @@ -8863,7 +8863,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0.2685161, y: 0.0023287518} diff --git a/Assets/Art/FengLei/Fish/61.prefab b/Assets/Art/FengLei/Fish/61.prefab index a2f10cb0c..3083559d1 100644 --- a/Assets/Art/FengLei/Fish/61.prefab +++ b/Assets/Art/FengLei/Fish/61.prefab @@ -5181,7 +5181,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0.12312939, y: 0.1817207} diff --git a/Assets/Art/FengLei/Fish/63.prefab b/Assets/Art/FengLei/Fish/63.prefab index cb1538650..e383e73ff 100644 --- a/Assets/Art/FengLei/Fish/63.prefab +++ b/Assets/Art/FengLei/Fish/63.prefab @@ -589,6 +589,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1992830037988175478} + - component: {fileID: 2287033984136505147} m_Layer: 6 m_Name: Bone014 m_TagString: Fish @@ -611,6 +612,41 @@ Transform: m_Children: [] m_Father: {fileID: 1335498514672683927} m_LocalEulerAnglesHint: {x: -63.497124, y: 39.61978, z: 5.540344} +--- !u!58 &2287033984136505147 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761630339588688769} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.04069904, y: -0.01996451} + serializedVersion: 2 + m_Radius: 0.07158326 --- !u!1 &1841756677245566216 GameObject: m_ObjectHideFlags: 0 @@ -651,7 +687,7 @@ CircleCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1841756677245566216} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: diff --git a/Assets/Art/FengLei/Fish/68.prefab b/Assets/Art/FengLei/Fish/68.prefab index dc115380e..7935bf4fe 100644 --- a/Assets/Art/FengLei/Fish/68.prefab +++ b/Assets/Art/FengLei/Fish/68.prefab @@ -684,7 +684,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0.13438182, y: -0.050591595} diff --git a/Assets/Art/FengLei/Fish/69.prefab b/Assets/Art/FengLei/Fish/69.prefab index ac7d5a39c..96c57b84c 100644 --- a/Assets/Art/FengLei/Fish/69.prefab +++ b/Assets/Art/FengLei/Fish/69.prefab @@ -95,7 +95,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.00014127578, y: -0.0037824272} @@ -172,7 +172,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0.00004643047, y: -0.0012221773} @@ -3194,7 +3194,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0.014348078, y: 0.0032240087} @@ -9213,7 +9213,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.0007781749, y: 0.015368845} diff --git a/Assets/Art/FengLei/Fish/71.prefab b/Assets/Art/FengLei/Fish/71.prefab index 846b5bf1f..20f1b8db6 100644 --- a/Assets/Art/FengLei/Fish/71.prefab +++ b/Assets/Art/FengLei/Fish/71.prefab @@ -8671,7 +8671,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} diff --git a/Assets/Art/FengLei/Fish/72.prefab b/Assets/Art/FengLei/Fish/72.prefab index 5e762a579..f81600866 100644 --- a/Assets/Art/FengLei/Fish/72.prefab +++ b/Assets/Art/FengLei/Fish/72.prefab @@ -237,7 +237,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.08157606, y: 0.0022427076} @@ -5387,7 +5387,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.02183569, y: -0.04931871} @@ -7939,6 +7939,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4813284136072406} + - component: {fileID: 445552485320461371} m_Layer: 6 m_Name: Bone032 m_TagString: Fish @@ -7962,6 +7963,41 @@ Transform: - {fileID: 4298099182112850} m_Father: {fileID: 4145610649257999} m_LocalEulerAnglesHint: {x: -0.54098666, y: -11.4124, z: 5.128113} +--- !u!58 &445552485320461371 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1628223060142332} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.04430822, y: -0.025595723} + serializedVersion: 2 + m_Radius: 0.064101785 --- !u!1 &1628936429114595 GameObject: m_ObjectHideFlags: 0 @@ -10751,6 +10787,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4245186079349381} + - component: {fileID: 3543405601901665119} m_Layer: 6 m_Name: Bone021 m_TagString: Fish @@ -10774,6 +10811,41 @@ Transform: - {fileID: 4386007907237152} m_Father: {fileID: 4023875916136523} m_LocalEulerAnglesHint: {x: 0.05924387, y: -2.548001, z: -66.492676} +--- !u!58 &3543405601901665119 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1852677679556097} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.1293873, y: 0.023473013} + serializedVersion: 2 + m_Radius: 0.14323306 --- !u!1 &1858309611184320 GameObject: m_ObjectHideFlags: 0 @@ -10814,7 +10886,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4847315332564756} - - component: {fileID: 7908702207844345560} + - component: {fileID: 2358335992029873304} m_Layer: 6 m_Name: Bone020 m_TagString: Fish @@ -10838,7 +10910,7 @@ Transform: - {fileID: 4285106108023238} m_Father: {fileID: 4542763161464795} m_LocalEulerAnglesHint: {x: -1.281936, y: -2.24863, z: -21.38273} ---- !u!58 &7908702207844345560 +--- !u!58 &2358335992029873304 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -10867,12 +10939,12 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -0.5159907, y: 0.9532649} + m_Offset: {x: 0.08647214, y: -0.066513285} serializedVersion: 2 - m_Radius: 0.22074515 + m_Radius: 0.09648448 --- !u!1 &1872873656517098 GameObject: m_ObjectHideFlags: 0 @@ -13432,7 +13504,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.07021094, y: 0.0024492014} @@ -13482,7 +13554,7 @@ GameObject: - component: {fileID: 7345558759607577454} m_Layer: 6 m_Name: GameObject - m_TagString: Untagged + m_TagString: Fish m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -13531,7 +13603,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0.02188687, y: -0.028797429} diff --git a/Assets/Art/FengLei/Fish/8.prefab b/Assets/Art/FengLei/Fish/8.prefab index ce08687d7..a0bb5d495 100644 --- a/Assets/Art/FengLei/Fish/8.prefab +++ b/Assets/Art/FengLei/Fish/8.prefab @@ -5293,7 +5293,7 @@ CircleCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.13431895, y: -0.026190763} diff --git a/Assets/Art/FengLei/Fish/Z_1.prefab b/Assets/Art/FengLei/Fish/Z_1.prefab index 19daebc89..65ca2c052 100644 --- a/Assets/Art/FengLei/Fish/Z_1.prefab +++ b/Assets/Art/FengLei/Fish/Z_1.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5223238392694687} - - component: {fileID: 7416975800075197} m_Layer: 6 m_Name: GameObject m_TagString: Fish @@ -32,51 +31,6 @@ Transform: m_Children: [] m_Father: {fileID: 1420790864982329365} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &7416975800075197 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2564128008921513} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 --- !u!1 &23267125243866503 GameObject: m_ObjectHideFlags: 0 @@ -3098,7 +3052,7 @@ GameObject: - component: {fileID: 4226566661747089} m_Layer: 14 m_Name: WZ_body - m_TagString: Untagged + m_TagString: Fish m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3153,7 +3107,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: -0.07676768, y: -0.04192242}