diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/JiGuang/1594.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/JiGuang/1594.prefab index 0371d6c32..78dc729a0 100644 --- a/Assets/MyGame/aa/Game/FLZY/TSY/JiGuang/1594.prefab +++ b/Assets/MyGame/aa/Game/FLZY/TSY/JiGuang/1594.prefab @@ -750,7 +750,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 6818756221169439484, guid: f1685d81cefee4b4dafefd5ede53f340, type: 3} insertIndex: -1 - addedObject: {fileID: 8121534825862151463} + addedObject: {fileID: 4751913687077465196} m_SourcePrefab: {fileID: 100100000, guid: f1685d81cefee4b4dafefd5ede53f340, type: 3} --- !u!1 &146665198272556726 stripped GameObject: @@ -841,6 +841,8 @@ MonoBehaviour: createVideoClip: {fileID: 0} rotationPY: 60 useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 0 isNot1: 1 @@ -848,6 +850,9 @@ MonoBehaviour: depthOffset: 330 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u66F2\u7EBF" isToUI: 1 tMP_CurrBossScore: {fileID: 0} @@ -867,7 +872,7 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1267099389304390425} m_PrefabAsset: {fileID: 0} ---- !u!61 &8121534825862151463 +--- !u!61 &4751913687077465196 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -896,10 +901,10 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.090075165, y: 0.96891683} + m_Offset: {x: 0.08356807, y: 1.2422167} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -910,7 +915,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1.7741594, y: 1.9250966} + m_Size: {x: 1.3967457, y: 2.9922664} m_EdgeRadius: 0 --- !u!1 &8832533760399969207 stripped GameObject: diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab index 3b7c6ec71..4ec1f742f 100644 --- a/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab +++ b/Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab @@ -18,6 +18,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0.16699992 objectReference: {fileID: 0} + - target: {fileID: 1348465538482317270, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e, + type: 3} + propertyPath: m_TagString + value: Fish + objectReference: {fileID: 0} - target: {fileID: 1688248704305440693, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e, type: 3} propertyPath: m_LocalPosition.y @@ -186,11 +191,72 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: -7037909265895460180} + - targetCorrespondingSourceObject: {fileID: 1348465538482317270, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6500740394562702178} - targetCorrespondingSourceObject: {fileID: 6139625675193079080, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e, type: 3} insertIndex: -1 addedObject: {fileID: 2164187165272308971} m_SourcePrefab: {fileID: 100100000, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e, type: 3} +--- !u!1 &379449886057309206 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1348465538482317270, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e, + type: 3} + m_PrefabInstance: {fileID: 1725624033583170496} + m_PrefabAsset: {fileID: 0} +--- !u!61 &6500740394562702178 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 379449886057309206} + 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.6913536, y: 0.028593734} + 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.9087595, y: 0.7244129} + m_EdgeRadius: 0 +--- !u!4 &4290921164306212976 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3206228661614635952, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e, + type: 3} + m_PrefabInstance: {fileID: 1725624033583170496} + m_PrefabAsset: {fileID: 0} --- !u!4 &4782796877071577010 stripped Transform: m_CorrespondingSourceObject: {fileID: 6173675881365040242, guid: 825a3a493d3f44b409fbd4cc5eeb4e9e, @@ -210,7 +276,7 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4811798164641830632} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -321,7 +387,7 @@ MonoBehaviour: isyz: 0 yzID: colliderList: [] - lockPoint: {fileID: 0} + lockPoint: {fileID: 4290921164306212976} bingDongEffect: - {fileID: 6212950634639225829} - {fileID: 7412479869810849339} @@ -329,6 +395,7 @@ MonoBehaviour: createVideoClip: {fileID: 0} rotationPY: 45 useMirrorCompensate: 1 + useRollSignFlip: 0 useRouteFlipX: 1 baseMmove: 0 isRotate: 1 @@ -337,5 +404,8 @@ MonoBehaviour: depthOffset: 350 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} keepAliveTime: 1 shandianStart: {fileID: 4782796877071577010} diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/1595.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/1595.prefab index c67770073..758f00764 100644 --- a/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/1595.prefab +++ b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/1595.prefab @@ -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.10530109, y: 1.3965414} @@ -3088,6 +3088,8 @@ MonoBehaviour: createVideoClip: {fileID: 0} rotationPY: 60 useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 @@ -3095,6 +3097,9 @@ MonoBehaviour: depthOffset: 340 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u66F2\u7EBF" isToUI: 1 tMP_CurrBossScore: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/ZuanTou/1596.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/ZuanTou/1596.prefab index 33c287640..b8d6fcf4d 100644 --- a/Assets/MyGame/aa/Game/FLZY/TSY/ZuanTou/1596.prefab +++ b/Assets/MyGame/aa/Game/FLZY/TSY/ZuanTou/1596.prefab @@ -129,7 +129,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5074584353305122566, guid: 134dfb0972baa29498b0eb8c5f6cb852, type: 3} insertIndex: -1 - addedObject: {fileID: 8186676110549305893} + addedObject: {fileID: 6871787223218025850} m_SourcePrefab: {fileID: 100100000, guid: 134dfb0972baa29498b0eb8c5f6cb852, type: 3} --- !u!1 &240086355211438042 stripped GameObject: @@ -209,6 +209,8 @@ MonoBehaviour: createVideoClip: {fileID: 0} rotationPY: 60 useMirrorCompensate: 1 + useRollSignFlip: 0 + useRouteFlipX: 1 baseMmove: 0 isRotate: 1 isNot1: 0 @@ -216,6 +218,9 @@ MonoBehaviour: depthOffset: 320 is2DFish: 0 sortOrder2D: 0 + drawMoveLine: 0 + drawLineSegments: 60 + drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} bossName: "\u66F2\u7EBF" isToUI: 1 tMP_CurrBossScore: {fileID: 0} @@ -229,7 +234,7 @@ MonoBehaviour: v3: {x: 0, y: 0, z: 0} isLocalCoin: 0 killerSitPos: -1 ---- !u!61 &8186676110549305893 +--- !u!61 &6871787223218025850 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -258,10 +263,10 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.05703628, y: 1.7829137} + m_Offset: {x: -0.09254229, y: 0.8922411} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -272,7 +277,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 3.6743615, y: 4.5658264} + m_Size: {x: 2.5593207, y: 2.7844818} m_EdgeRadius: 0 --- !u!1 &3332271933964885491 stripped GameObject: