diff --git a/Assets/Art/FengLei/Fish/26.prefab b/Assets/Art/FengLei/Fish/26.prefab index ded627f13..00d61d257 100644 --- a/Assets/Art/FengLei/Fish/26.prefab +++ b/Assets/Art/FengLei/Fish/26.prefab @@ -3708,6 +3708,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 11017 @@ -6471,7 +6473,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.09094388, y: 0.0026836607} @@ -6570,7 +6572,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.011890954, y: -0.11587703} @@ -6747,7 +6749,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.00041178055, y: 0.038354836} @@ -6846,7 +6848,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.01449635, y: -0.034345776} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab index 95e5e877d..33cd2e650 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 1203727572313894585} m_Layer: 6 m_Name: GameObject - m_TagString: Untagged + m_TagString: Fish m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -61,7 +61,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.09740026, y: -0.07302518} @@ -465,7 +465,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1536313179576152, guid: 9b5f1a7c326d71146b03297869d16dac, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1536313179576152, guid: 9b5f1a7c326d71146b03297869d16dac, type: 3} propertyPath: m_TagString @@ -959,6 +959,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 11038 diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab index 2562f4cae..d96dc2c65 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab @@ -9,9 +9,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5996987184439261184} + - component: {fileID: 1363895460790175153} m_Layer: 6 m_Name: GameObject - m_TagString: Untagged + m_TagString: Fish m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -31,6 +32,41 @@ Transform: m_Children: [] m_Father: {fileID: 3118873771312464526} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &1363895460790175153 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417744409048665480} + 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, y: 0} + serializedVersion: 2 + m_Radius: 0.5 --- !u!1001 &3118218862729865433 PrefabInstance: m_ObjectHideFlags: 0 @@ -43,6 +79,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1001862385612596, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1016180439538481, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -55,6 +95,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1027201713283633, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1041295858798927, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -75,6 +119,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1056790131508459, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1061089043132986, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -155,10 +203,18 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1232207149302178, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1244759774101114, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1244759774101114, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1245464033511315, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -187,6 +243,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1275589652943947, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1277288656886883, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -211,6 +271,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1332405304555723, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1336888522527273, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -219,6 +283,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1349799275273215, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1359441135457586, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -263,6 +331,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1477842867483799, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1479637704501929, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -275,10 +347,18 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1515086449667013, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1535709578602239, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1535709578602239, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1543359060809473, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -323,6 +403,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1660046985952811, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1678437564061211, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -341,7 +425,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1697762167430256, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1697762167430256, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_TagString @@ -367,6 +451,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1745688686051958, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1755221051662546, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -379,6 +467,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1770735565119910, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1784777412269984, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -391,6 +483,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1788176485012083, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1791229795799078, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -399,6 +495,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1791844913609282, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1835974529694214, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -407,6 +507,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1836137590347923, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1851165129407972, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -419,6 +523,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1865546267216570, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1865546267216570, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_TagString value: Fish @@ -451,14 +559,26 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1882462939724650, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1931934659884580, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1931934659884580, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1937205098090326, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1937205098090326, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1944555865446882, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -471,6 +591,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1960606208036859, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1961636283815648, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -487,6 +611,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1988242148939659, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1997697665250906, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_Layer value: 6 @@ -989,15 +1117,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4707758849810793, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_LocalScale.x - value: 25 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4707758849810793, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_LocalScale.y - value: 25 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4707758849810793, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_LocalScale.z - value: 25 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4707758849810793, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} propertyPath: m_LocalPosition.x @@ -1981,10 +2109,6 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 184598169913217837} - - targetCorrespondingSourceObject: {fileID: 1865546267216570, guid: 53fb934139b912d4eb7fc7e42ae84334, - type: 3} - insertIndex: -1 - addedObject: {fileID: 3808185397827919374} m_SourcePrefab: {fileID: 100100000, guid: 53fb934139b912d4eb7fc7e42ae84334, type: 3} --- !u!111 &3084212258959664462 stripped Animation: @@ -2034,6 +2158,8 @@ MonoBehaviour: end: {x: 0, y: 0} moveTime: 0 moveSpeed: 0 + cachedCamera: {fileID: 0} + cachedUirootRect: {fileID: 0} skeleton: {fileID: 0} isSpine: 1 fishTypeID: 11026 @@ -2123,51 +2249,6 @@ MonoBehaviour: isScoreStart: 0 isScoreEnd: 0 isGoldEffectStart: 0 ---- !u!61 &3808185397827919374 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3116635238185198179} - 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.012745678, y: 0.4404799} - 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: 0.6992023, y: 0.82095975} - m_EdgeRadius: 0 --- !u!4 &3118873771312464526 stripped Transform: m_CorrespondingSourceObject: {fileID: 4033710788930135, guid: 53fb934139b912d4eb7fc7e42ae84334, diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab index 42b7ee0ec..da0e47276 100644 --- a/Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab @@ -39,7 +39,7 @@ CircleCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6969988197811524220} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -1307,6 +1307,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 8539065519943029672} + - targetCorrespondingSourceObject: {fileID: 8610330805998888443, guid: d91ace63f3f1e264397418d302f4f473, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5426600233542271111} - targetCorrespondingSourceObject: {fileID: 8610161427682446461, guid: d91ace63f3f1e264397418d302f4f473, type: 3} insertIndex: -1 @@ -1347,6 +1351,47 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!1 &628797267950527423 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8610330805998888443, guid: d91ace63f3f1e264397418d302f4f473, + type: 3} + m_PrefabInstance: {fileID: 9207580813238453828} + m_PrefabAsset: {fileID: 0} +--- !u!58 &5426600233542271111 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628797267950527423} + 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: 1.608234, y: -5.696482} + serializedVersion: 2 + m_Radius: 22.53135 --- !u!1 &628979767387851321 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8610161427682446461, guid: d91ace63f3f1e264397418d302f4f473,