From e94f0cd799bb5a0dd88e52c46cbe3b2a24335a91 Mon Sep 17 00:00:00 2001 From: BobSong <605277374@qq.com> Date: Sat, 24 Jan 2026 21:00:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Line/FishingRopeShort.asset | 795 ++++++++++++------ Assets/ResRaw/Prefabs/Line/LineSolver.prefab | 2 +- .../Line/fishing line float set.prefab | 12 +- .../Prefabs/Line/fishing line spinning.prefab | 6 +- Assets/Scenes/RopeTest.unity | 198 +---- Assets/Scripts/Fishing/Tackle/FRod.cs | 23 +- 6 files changed, 573 insertions(+), 463 deletions(-) diff --git a/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset b/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset index 9430c6dc0..4c3fe7ad7 100644 --- a/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset +++ b/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset @@ -26,7 +26,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 775ad4994fda946d1a5936c7e2dfc785, type: 3} m_Name: p1 m_EditorClassIdentifier: Obi::Obi.ObiParticleGroup - particleIndices: 02000000 + particleIndices: 09000000 m_Blueprint: {fileID: 11400000} --- !u!114 &-2515171973132415257 MonoBehaviour: @@ -40,7 +40,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 775ad4994fda946d1a5936c7e2dfc785, type: 3} m_Name: end m_EditorClassIdentifier: - particleIndices: 07000000 + particleIndices: 18000000 m_Blueprint: {fileID: 11400000} --- !u!114 &11400000 MonoBehaviour: @@ -54,23 +54,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8f7e67b5626124d0db9886e6cd2aacff, type: 3} m_Name: FishingRopeShort m_EditorClassIdentifier: - m_Checksum: 773001558 + m_Checksum: 2502310086 m_Empty: 0 m_Edited: 0 - m_ActiveParticleCount: 8 - m_InitialActiveParticleCount: 8 + m_ActiveParticleCount: 25 + m_InitialActiveParticleCount: 25 _bounds: - m_Center: {x: 0, y: -0.05, z: 0} - m_Extent: {x: 0, y: 0.05, z: 0} + m_Center: {x: 0, y: -0.25, z: 0} + m_Extent: {x: 0, y: 0.25, z: 0} positions: - {x: 0, y: 0, z: 0} - - {x: 0, y: -0.0125, z: 0} - - {x: 0, y: -0.025, z: 0} - - {x: 0, y: -0.0375, z: 0} - - {x: 0, y: -0.05, z: 0} - - {x: 0, y: -0.0625, z: 0} - - {x: 0, y: -0.075, z: 0} - - {x: 0, y: -0.1, z: 0} + - {x: 0, y: -0.022047479, z: 0} + - {x: 0, y: -0.044319704, z: 0} + - {x: 0, y: -0.06663675, z: 0} + - {x: 0, y: -0.08886463, z: 0} + - {x: 0, y: -0.11113536, z: 0} + - {x: 0, y: -0.13336325, z: 0} + - {x: 0, y: -0.15568028, z: 0} + - {x: 0, y: -0.17795253, z: 0} + - {x: 0, y: -0.2, z: 0} + - {x: 0, y: -0.21999247, z: 0} + - {x: 0, y: -0.23999393, z: 0} + - {x: 0, y: -0.2600061, z: 0} + - {x: 0, y: -0.2800075, z: 0} + - {x: 0, y: -0.3, z: 0} + - {x: 0, y: -0.31999254, z: 0} + - {x: 0, y: -0.33999392, z: 0} + - {x: 0, y: -0.3600061, z: 0} + - {x: 0, y: -0.3800075, z: 0} + - {x: 0, y: -0.4, z: 0} + - {x: 0, y: -0.41999254, z: 0} + - {x: 0, y: -0.43999392, z: 0} + - {x: 0, y: -0.4600061, z: 0} + - {x: 0, y: -0.48000747, z: 0} + - {x: 0, y: -0.5, z: 0} - {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0} @@ -173,13 +190,30 @@ MonoBehaviour: - {x: 0, y: 0, z: 0} restPositions: - {x: 0, y: 0, z: 0, w: 1} - - {x: 0, y: -0.0125, z: 0, w: 1} - - {x: 0, y: -0.025, z: 0, w: 1} - - {x: 0, y: -0.0375, z: 0, w: 1} - - {x: 0, y: -0.05, z: 0, w: 1} - - {x: 0, y: -0.0625, z: 0, w: 1} - - {x: 0, y: -0.075, z: 0, w: 1} - - {x: 0, y: -0.1, z: 0, w: 1} + - {x: 0, y: -0.022047479, z: 0, w: 1} + - {x: 0, y: -0.044319704, z: 0, w: 1} + - {x: 0, y: -0.06663675, z: 0, w: 1} + - {x: 0, y: -0.08886463, z: 0, w: 1} + - {x: 0, y: -0.11113536, z: 0, w: 1} + - {x: 0, y: -0.13336325, z: 0, w: 1} + - {x: 0, y: -0.15568028, z: 0, w: 1} + - {x: 0, y: -0.17795253, z: 0, w: 1} + - {x: 0, y: -0.2, z: 0, w: 1} + - {x: 0, y: -0.21999247, z: 0, w: 1} + - {x: 0, y: -0.23999393, z: 0, w: 1} + - {x: 0, y: -0.2600061, z: 0, w: 1} + - {x: 0, y: -0.2800075, z: 0, w: 1} + - {x: 0, y: -0.3, z: 0, w: 1} + - {x: 0, y: -0.31999254, z: 0, w: 1} + - {x: 0, y: -0.33999392, z: 0, w: 1} + - {x: 0, y: -0.3600061, z: 0, w: 1} + - {x: 0, y: -0.3800075, z: 0, w: 1} + - {x: 0, y: -0.4, z: 0, w: 1} + - {x: 0, y: -0.41999254, z: 0, w: 1} + - {x: 0, y: -0.43999392, z: 0, w: 1} + - {x: 0, y: -0.4600061, z: 0, w: 1} + - {x: 0, y: -0.48000747, z: 0, w: 1} + - {x: 0, y: -0.5, z: 0, w: 1} - {x: 0, y: 0, z: 0, w: 0} - {x: 0, y: 0, z: 0, w: 0} - {x: 0, y: 0, z: 0, w: 0} @@ -392,15 +426,49 @@ MonoBehaviour: - {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} angularVelocities: [] invMasses: - 999.99994 + - 999.99994 + - 999.99994 - 999.9998 - 999.9998 - 999.9998 - 999.9998 - 999.9998 - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.9998 + - 999.99994 + - 999.99994 - 999.99994 - 0 - 0 @@ -503,11 +571,28 @@ MonoBehaviour: - 0 - 0 invRotationalMasses: [] - filters: 020000000200000002000000020000000200000002000000020000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + filters: 0200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000002000000020000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 principalRadii: - {x: 0.0007, y: 0.0007, z: 0.0007} - {x: 0.0007, y: 0.0007, z: 0.0007} - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.00070000003, y: 0.00070000003, z: 0.00070000003} + - {x: 0.00070000003, y: 0.00070000003, z: 0.00070000003} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} + - {x: 0.0007, y: 0.0007, z: 0.0007} - {x: 0.0007, y: 0.0007, z: 0.0007} - {x: 0.0007, y: 0.0007, z: 0.0007} - {x: 0.0007, y: 0.0007, z: 0.0007} @@ -615,12 +700,29 @@ MonoBehaviour: - {x: 0, y: 0, z: 0} colors: - {r: 1, g: 1, b: 1, a: 1} - - {r: 1.1675394, g: 1.1675394, b: 1.1675394, a: 1} + - {r: 1.0369382, g: 1.0369382, b: 1.0369382, a: 1} + - {r: 1.074253, g: 1.074253, b: 1.074253, a: 1} + - {r: 1.1116428, g: 1.1116428, b: 1.1116428, a: 1.0000001} + - {r: 1.1488832, g: 1.1488832, b: 1.1488832, a: 1.0000001} + - {r: 1.1861954, g: 1.1861954, b: 1.1861954, a: 1.0000001} + - {r: 1.2234359, g: 1.2234359, b: 1.2234359, a: 1.0000001} + - {r: 1.2608256, g: 1.2608256, b: 1.2608256, a: 1.0000001} + - {r: 1.2981404, g: 1.2981404, b: 1.2981404, a: 1.0000001} - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} + - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} + - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} + - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} + - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} + - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} + - {r: 1.3350786, g: 1.3350786, b: 1.3350786, a: 1.0000001} + - {r: 1.268088, g: 1.268088, b: 1.268088, a: 1.0000001} + - {r: 1.2010677, g: 1.2010677, b: 1.2010677, a: 1.0000001} + - {r: 1.134011, g: 1.134011, b: 1.134011, a: 1.0000001} + - {r: 1.0669907, g: 1.0669907, b: 1.0669907, a: 1.0000001} - {r: 1.0000001, g: 1.0000001, b: 1.0000001, a: 1.0000001} - {r: 0, g: 0, b: 0, a: 0} - {r: 0, g: 0, b: 0, a: 0} @@ -723,27 +825,35 @@ MonoBehaviour: - {r: 0, g: 0, b: 0, a: 0} - {r: 0, g: 0, b: 0, a: 0} points: - edges: 0000000001000000010000000200000002000000030000000300000004000000040000000500000005000000060000000600000007000000 + edges: 000000000100000001000000020000000200000003000000030000000400000004000000050000000500000006000000060000000700000007000000080000000800000009000000090000000a0000000a0000000b0000000b0000000c0000000c0000000d0000000d0000000e0000000e0000000f0000000f0000001000000010000000110000001100000012000000120000001300000013000000140000001400000015000000150000001600000016000000170000001700000018000000 triangles: distanceConstraintsData: batches: - - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000 - m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000 - m_ConstraintCount: 54 - m_ActiveConstraintCount: 4 - m_InitialActiveConstraintCount: 4 + - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d000000 + m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d000000 + m_ConstraintCount: 62 + m_ActiveConstraintCount: 12 + m_InitialActiveConstraintCount: 12 particleIndices: - serializedContents: 000000000100000002000000030000000400000005000000060000000700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + serializedContents: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_AlignBytes: 16 lambdas: serializedContents: [] m_AlignBytes: 16 restLengths: serializedContents: - - 0.0125 - - 0.012500001 - - 0.012499999 - - 0.024999999 + - 0.022047479 + - 0.022317044 + - 0.022270732 + - 0.022317037 + - 0.022047475 + - 0.020001456 + - 0.020001411 + - 0.01999253 + - 0.02001217 + - 0.0199925 + - 0.020001382 + - 0.020001382 - 0 - 0 - 0 @@ -851,23 +961,40 @@ MonoBehaviour: - {x: 0, y: 0} - {x: 0, y: 0} - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} m_AlignBytes: 16 - - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f0000003000000031000000320000003300000034000000 - m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f0000003000000031000000320000003300000034000000 - m_ConstraintCount: 53 - m_ActiveConstraintCount: 3 - m_InitialActiveConstraintCount: 3 + - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d000000 + m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d000000 + m_ConstraintCount: 62 + m_ActiveConstraintCount: 12 + m_InitialActiveConstraintCount: 12 particleIndices: - serializedContents: 01000000020000000300000004000000050000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + serializedContents: 0100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_AlignBytes: 16 lambdas: serializedContents: [] m_AlignBytes: 16 restLengths: serializedContents: - - 0.0125 - - 0.012499999 - - 0.012500003 + - 0.022272225 + - 0.022227883 + - 0.022227883 + - 0.022272244 + - 0.01999247 + - 0.02001217 + - 0.0199925 + - 0.020001382 + - 0.020001411 + - 0.01999253 + - 0.02001217 + - 0.01999253 - 0 - 0 - 0 @@ -974,16 +1101,25 @@ MonoBehaviour: - {x: 0, y: 0} - {x: 0, y: 0} - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} m_AlignBytes: 16 bendConstraintsData: batches: - - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000 - m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000 - m_ConstraintCount: 36 - m_ActiveConstraintCount: 2 - m_InitialActiveConstraintCount: 2 + - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000 + m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000 + m_ConstraintCount: 41 + m_ActiveConstraintCount: 8 + m_InitialActiveConstraintCount: 8 particleIndices: - serializedContents: 000000000200000001000000030000000500000004000000060000000800000007000000090000000b0000000a0000000c0000000e0000000d0000000f0000001100000010000000120000001400000013000000150000001700000016000000180000001a000000190000001b0000001d0000001c0000001e000000200000001f0000002100000023000000220000002400000026000000250000002700000029000000280000002a0000002c0000002b0000002d0000002f0000002e000000300000003200000031000000330000003500000034000000360000003800000037000000390000003b0000003a0000003c0000003e0000003d0000003f0000004100000040000000420000004400000043000000450000004700000046000000480000004a000000490000004b0000004d0000004c0000004e000000500000004f0000005100000053000000520000005400000056000000550000005700000059000000580000005a0000005c0000005b0000005d0000005f0000005e000000600000006200000061000000630000006500000064000000660000006800000067000000690000006b0000006a000000 + serializedContents: 000000000200000001000000030000000500000004000000060000000800000007000000090000000b0000000a0000000c0000000e0000000d0000000f0000001100000010000000120000001400000013000000150000001700000016000000180000001a000000190000001b0000001d0000001c0000001e000000200000001f0000002100000023000000220000002400000026000000250000002700000029000000280000002a0000002c0000002b0000002d0000002f0000002e000000300000003200000031000000330000003500000034000000360000003800000037000000390000003b0000003a0000003c0000003e0000003d0000003f0000004100000040000000420000004400000043000000450000004700000046000000480000004a000000490000004b0000004d0000004c0000004e000000500000004f0000005100000053000000520000005400000056000000550000005700000059000000580000005a0000005c0000005b0000005d0000005f0000005e000000600000006200000061000000630000006500000064000000660000006800000067000000690000006b0000006a0000006c0000006e0000006d0000006f0000007100000070000000720000007400000073000000750000007700000076000000780000007a00000079000000 m_AlignBytes: 16 lambdas: serializedContents: [] @@ -1026,6 +1162,11 @@ MonoBehaviour: - 0 - 0 - 0 + - 0 + - 0 + - 0 + - 0 + - 0 m_AlignBytes: 16 bendingStiffnesses: serializedContents: @@ -1065,6 +1206,11 @@ MonoBehaviour: - {x: 0, y: 0} - {x: 0, y: 0} - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} m_AlignBytes: 16 plasticity: serializedContents: @@ -1104,14 +1250,19 @@ MonoBehaviour: - {x: 0, y: 0} - {x: 0, y: 0} - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} m_AlignBytes: 16 - - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000 - m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000 - m_ConstraintCount: 35 - m_ActiveConstraintCount: 2 - m_InitialActiveConstraintCount: 2 + - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000 + m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000 + m_ConstraintCount: 41 + m_ActiveConstraintCount: 8 + m_InitialActiveConstraintCount: 8 particleIndices: - serializedContents: 0100000003000000020000000400000006000000050000000700000009000000080000000a0000000c0000000b0000000d0000000f0000000e000000100000001200000011000000130000001500000014000000160000001800000017000000190000001b0000001a0000001c0000001e0000001d0000001f0000002100000020000000220000002400000023000000250000002700000026000000280000002a000000290000002b0000002d0000002c0000002e000000300000002f0000003100000033000000320000003400000036000000350000003700000039000000380000003a0000003c0000003b0000003d0000003f0000003e000000400000004200000041000000430000004500000044000000460000004800000047000000490000004b0000004a0000004c0000004e0000004d0000004f0000005100000050000000520000005400000053000000550000005700000056000000580000005a000000590000005b0000005d0000005c0000005e000000600000005f000000610000006300000062000000640000006600000065000000670000006900000068000000 + serializedContents: 0100000003000000020000000400000006000000050000000700000009000000080000000a0000000c0000000b0000000d0000000f0000000e000000100000001200000011000000130000001500000014000000160000001800000017000000190000001b0000001a0000001c0000001e0000001d0000001f0000002100000020000000220000002400000023000000250000002700000026000000280000002a000000290000002b0000002d0000002c0000002e000000300000002f0000003100000033000000320000003400000036000000350000003700000039000000380000003a0000003c0000003b0000003d0000003f0000003e000000400000004200000041000000430000004500000044000000460000004800000047000000490000004b0000004a0000004c0000004e0000004d0000004f0000005100000050000000520000005400000053000000550000005700000056000000580000005a000000590000005b0000005d0000005c0000005e000000600000005f0000006100000063000000620000006400000066000000650000006700000069000000680000006a0000006c0000006b0000006d0000006f0000006e000000700000007200000071000000730000007500000074000000760000007800000077000000790000007b0000007a000000 m_AlignBytes: 16 lambdas: serializedContents: [] @@ -1153,6 +1304,12 @@ MonoBehaviour: - 0 - 0 - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 m_AlignBytes: 16 bendingStiffnesses: serializedContents: @@ -1191,6 +1348,12 @@ MonoBehaviour: - {x: 0, y: 0} - {x: 0, y: 0} - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} m_AlignBytes: 16 plasticity: serializedContents: @@ -1229,14 +1392,20 @@ MonoBehaviour: - {x: 0, y: 0} - {x: 0, y: 0} - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} m_AlignBytes: 16 - - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000 - m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000 - m_ConstraintCount: 35 - m_ActiveConstraintCount: 2 - m_InitialActiveConstraintCount: 2 + - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000 + m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000 + m_ConstraintCount: 41 + m_ActiveConstraintCount: 7 + m_InitialActiveConstraintCount: 7 particleIndices: - serializedContents: 020000000400000003000000050000000700000006000000080000000a000000090000000b0000000d0000000c0000000e000000100000000f0000001100000013000000120000001400000016000000150000001700000019000000180000001a0000001c0000001b0000001d0000001f0000001e000000200000002200000021000000230000002500000024000000260000002800000027000000290000002b0000002a0000002c0000002e0000002d0000002f0000003100000030000000320000003400000033000000350000003700000036000000380000003a000000390000003b0000003d0000003c0000003e000000400000003f0000004100000043000000420000004400000046000000450000004700000049000000480000004a0000004c0000004b0000004d0000004f0000004e000000500000005200000051000000530000005500000054000000560000005800000057000000590000005b0000005a0000005c0000005e0000005d0000005f0000006100000060000000620000006400000063000000650000006700000066000000680000006a00000069000000 + serializedContents: 020000000400000003000000050000000700000006000000080000000a000000090000000b0000000d0000000c0000000e000000100000000f0000001100000013000000120000001400000016000000150000001700000019000000180000001a0000001c0000001b0000001d0000001f0000001e000000200000002200000021000000230000002500000024000000260000002800000027000000290000002b0000002a0000002c0000002e0000002d0000002f0000003100000030000000320000003400000033000000350000003700000036000000380000003a000000390000003b0000003d0000003c0000003e000000400000003f0000004100000043000000420000004400000046000000450000004700000049000000480000004a0000004c0000004b0000004d0000004f0000004e000000500000005200000051000000530000005500000054000000560000005800000057000000590000005b0000005a0000005c0000005e0000005d0000005f0000006100000060000000620000006400000063000000650000006700000066000000680000006a000000690000006b0000006d0000006c0000006e000000700000006f0000007100000073000000720000007400000076000000750000007700000079000000780000007a0000007c0000007b000000 m_AlignBytes: 16 lambdas: serializedContents: [] @@ -1278,6 +1447,12 @@ MonoBehaviour: - 0 - 0 - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 m_AlignBytes: 16 bendingStiffnesses: serializedContents: @@ -1316,6 +1491,12 @@ MonoBehaviour: - {x: 0, y: 0} - {x: 0, y: 0} - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} m_AlignBytes: 16 plasticity: serializedContents: @@ -1354,6 +1535,12 @@ MonoBehaviour: - {x: 0, y: 0} - {x: 0, y: 0} - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} + - {x: 0, y: 0} m_AlignBytes: 16 skinConstraintsData: batches: [] @@ -1367,13 +1554,13 @@ MonoBehaviour: batches: [] aerodynamicConstraintsData: batches: - - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b000000 - m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b000000 - m_ConstraintCount: 108 - m_ActiveConstraintCount: 8 - m_InitialActiveConstraintCount: 8 + - m_IDs: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c000000 + m_IDToIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c000000 + m_ConstraintCount: 125 + m_ActiveConstraintCount: 25 + m_InitialActiveConstraintCount: 25 particleIndices: - serializedContents: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b000000 + serializedContents: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c000000 m_AlignBytes: 16 lambdas: serializedContents: [] @@ -1389,6 +1576,57 @@ MonoBehaviour: - 0.0014 - 1 - 1 + - 0.0014000001 + - 1 + - 1 + - 0.0014000001 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 + - 0.0014 + - 1 + - 1 - 0.0014 - 1 - 1 @@ -1730,19 +1968,19 @@ MonoBehaviour: outTangent: {x: 0, y: 0, z: 0} - tangentMode: 0 inTangent: {x: -0, y: 0, z: -0} - position: {x: 0, y: -0.025, z: 0} + position: {x: 0, y: -0.2, z: 0} outTangent: {x: -0, y: -0, z: -0} - tangentMode: 0 inTangent: {x: -0, y: 0, z: -0} - position: {x: 0, y: -0.05, z: 0} + position: {x: 0, y: -0.3, z: 0} outTangent: {x: -0, y: -0, z: -0} - tangentMode: 0 inTangent: {x: 0, y: 0, z: 0} - position: {x: 0, y: -0.075, z: 0} + position: {x: 0, y: -0.4, z: 0} outTangent: {x: -0, y: -0, z: -0} - tangentMode: 0 - inTangent: {x: 0, y: -0.000000007450581, z: 0} - position: {x: 0, y: -0.1, z: 0} + inTangent: {x: 0, y: 0, z: 0} + position: {x: 0, y: -0.5, z: 0} outTangent: {x: -0, y: -0, z: -0} m_Normals: data: @@ -1784,91 +2022,91 @@ MonoBehaviour: m_Closed: 0 m_ArcLengthTable: - 0 - - 0.00016466905 - - 0.0006370803 - - 0.0013848399 - - 0.0023755536 - - 0.0035768277 - - 0.0049562687 - - 0.0064814817 - - 0.008120074 - - 0.00983965 - - 0.011607817 - - 0.013392183 - - 0.01516035 - - 0.016879927 - - 0.018518519 - - 0.020043733 - - 0.021423172 - - 0.022624446 - - 0.02361516 - - 0.024362918 - - 0.02483533 - - 0.024999999 - - 0.025164668 - - 0.025637079 - - 0.026384838 - - 0.027375551 - - 0.028576825 - - 0.029956266 - - 0.03148148 - - 0.03312007 - - 0.034839645 - - 0.036607813 - - 0.03839218 - - 0.040160347 - - 0.041879922 - - 0.043518513 - - 0.045043726 - - 0.046423167 - - 0.047624443 - - 0.048615158 - - 0.049362916 - - 0.049835328 - - 0.049999997 - - 0.050164666 - - 0.050637078 - - 0.051384836 - - 0.05237555 - - 0.053576827 - - 0.05495627 - - 0.05648148 - - 0.058120072 - - 0.059839647 - - 0.061607815 - - 0.06339218 - - 0.06516034 - - 0.06687992 - - 0.06851851 - - 0.07004373 - - 0.071423166 - - 0.07262444 - - 0.07361515 - - 0.07436291 - - 0.07483532 - - 0.074999996 - - 0.07516467 - - 0.07563708 - - 0.07638484 - - 0.07737555 - - 0.078576826 - - 0.07995626 - - 0.08148148 - - 0.08312007 - - 0.08483965 - - 0.086607814 - - 0.08839218 - - 0.09016035 - - 0.09187993 - - 0.09351852 - - 0.09504373 - - 0.09642317 - - 0.09762444 - - 0.098615155 - - 0.09936291 - - 0.09983532 - - 0.09999999 - m_TotalSplineLenght: 0.09999999 + - 0.0013173524 + - 0.0050966423 + - 0.011078719 + - 0.019004429 + - 0.028614622 + - 0.03965015 + - 0.051851854 + - 0.06496059 + - 0.0787172 + - 0.09286254 + - 0.107137464 + - 0.1212828 + - 0.13503942 + - 0.14814815 + - 0.16034986 + - 0.17138538 + - 0.18099557 + - 0.18892127 + - 0.19490334 + - 0.19868264 + - 0.19999999 + - 0.20065866 + - 0.20254831 + - 0.20553935 + - 0.2095022 + - 0.21430731 + - 0.21982507 + - 0.22592592 + - 0.23248029 + - 0.23935859 + - 0.24643126 + - 0.2535687 + - 0.26064137 + - 0.26751968 + - 0.27407405 + - 0.2801749 + - 0.28569266 + - 0.29049775 + - 0.2944606 + - 0.29745165 + - 0.2993413 + - 0.29999998 + - 0.30065867 + - 0.30254832 + - 0.30553937 + - 0.3095022 + - 0.3143073 + - 0.31982505 + - 0.32592592 + - 0.33248028 + - 0.3393586 + - 0.34643126 + - 0.3535687 + - 0.36064136 + - 0.36751968 + - 0.37407404 + - 0.3801749 + - 0.38569266 + - 0.39049774 + - 0.3944606 + - 0.39745164 + - 0.3993413 + - 0.39999998 + - 0.40065867 + - 0.4025483 + - 0.40553936 + - 0.4095022 + - 0.4143073 + - 0.41982505 + - 0.4259259 + - 0.43248028 + - 0.4393586 + - 0.44643125 + - 0.4535687 + - 0.46064135 + - 0.46751967 + - 0.47407404 + - 0.4801749 + - 0.48569265 + - 0.49049774 + - 0.49446058 + - 0.49745163 + - 0.49934128 + - 0.49999997 + m_TotalSplineLenght: 0.49999997 OnPathChanged: m_PersistentCalls: m_Calls: [] @@ -1883,118 +2121,135 @@ MonoBehaviour: m_Calls: [] thickness: 0.01 resolution: 0.4 - m_InterParticleDistance: 0.0142857125 - totalParticles: 108 - m_RestLength: 1.5285692 - deformableEdges: 0000000001000000010000000200000002000000030000000300000004000000040000000500000005000000060000000600000007000000 + m_InterParticleDistance: 0.020833332 + totalParticles: 125 + m_RestLength: 2.5833325 + deformableEdges: 000000000100000001000000020000000200000003000000030000000400000004000000050000000500000006000000060000000700000007000000080000000800000009000000090000000a0000000a0000000b0000000b0000000c0000000c0000000d0000000d0000000e0000000e0000000f0000000f0000001000000010000000110000001100000012000000120000001300000013000000140000001400000015000000150000001600000016000000170000001700000018000000 restLengths: - - 0.0125 - - 0.0125 - - 0.012500001 - - 0.012499999 - - 0.012499999 - - 0.012500003 - - 0.024999999 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 - - 0.0142857125 + - 0.022047479 + - 0.022272225 + - 0.022317044 + - 0.022227883 + - 0.022270732 + - 0.022227883 + - 0.022317037 + - 0.022272244 + - 0.022047475 + - 0.01999247 + - 0.020001456 + - 0.02001217 + - 0.020001411 + - 0.0199925 + - 0.01999253 + - 0.020001382 + - 0.02001217 + - 0.020001411 + - 0.0199925 + - 0.01999253 + - 0.020001382 + - 0.02001217 + - 0.020001382 + - 0.01999253 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 + - 0.020833332 - 0 pooledParticles: 100 --- !u!114 &1381639909112863482 @@ -2009,7 +2264,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 775ad4994fda946d1a5936c7e2dfc785, type: 3} m_Name: p3 m_EditorClassIdentifier: Obi::Obi.ObiParticleGroup - particleIndices: 06000000 + particleIndices: 13000000 m_Blueprint: {fileID: 11400000} --- !u!114 &3228123398279903720 MonoBehaviour: @@ -2023,5 +2278,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 775ad4994fda946d1a5936c7e2dfc785, type: 3} m_Name: p2 m_EditorClassIdentifier: Obi::Obi.ObiParticleGroup - particleIndices: 04000000 + particleIndices: 0e000000 m_Blueprint: {fileID: 11400000} diff --git a/Assets/ResRaw/Prefabs/Line/LineSolver.prefab b/Assets/ResRaw/Prefabs/Line/LineSolver.prefab index dad1b4bee..b7d528469 100644 --- a/Assets/ResRaw/Prefabs/Line/LineSolver.prefab +++ b/Assets/ResRaw/Prefabs/Line/LineSolver.prefab @@ -99,7 +99,7 @@ MonoBehaviour: synchronousSpatialQueries: 0 distanceConstraintParameters: evaluationOrder: 0 - iterations: 1 + iterations: 5 SORFactor: 1 enabled: 1 bendingConstraintParameters: diff --git a/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab b/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab index 45ec79009..4ff786df6 100644 --- a/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab +++ b/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab @@ -405,7 +405,7 @@ Transform: m_GameObject: {fileID: 1035052809208993} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.6, z: 0} + m_LocalPosition: {x: 0, y: -1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -463,7 +463,7 @@ ConfigurableJoint: spring: 0 damper: 0 m_LinearLimit: - limit: 0.1 + limit: 0.5 bounciness: 0 contactDistance: 0 m_AngularXLimitSpring: @@ -530,7 +530,7 @@ ConfigurableJoint: maximumForce: 3.4028233e+38 useAcceleration: 0 m_ProjectionMode: 1 - m_ProjectionDistance: 0.1 + m_ProjectionDistance: 0 m_ProjectionAngle: 0 m_ConfiguredInWorldSpace: 0 m_SwapBodies: 0 @@ -555,12 +555,12 @@ SphereCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 1 + m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 5.19 - m_Center: {x: 0, y: 0, z: 0} + m_Radius: 0.003 + m_Center: {x: 0, y: -0.0015, z: 0} --- !u!114 &1923684598771359451 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ResRaw/Prefabs/Line/fishing line spinning.prefab b/Assets/ResRaw/Prefabs/Line/fishing line spinning.prefab index e1d380c82..7be0b7542 100644 --- a/Assets/ResRaw/Prefabs/Line/fishing line spinning.prefab +++ b/Assets/ResRaw/Prefabs/Line/fishing line spinning.prefab @@ -636,12 +636,12 @@ SphereCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 1 + m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 2 - m_Center: {x: 0, y: 0, z: 0} + m_Radius: 0.03 + m_Center: {x: 0, y: -0.15, z: 0} --- !u!114 &5042341991661386448 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/RopeTest.unity b/Assets/Scenes/RopeTest.unity index 8d9eb305c..a0410872f 100644 --- a/Assets/Scenes/RopeTest.unity +++ b/Assets/Scenes/RopeTest.unity @@ -335,7 +335,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Obi::Obi.ObiRope solverIndices: - serializedContents: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c0000007d0000007e0000007f000000800000008100000082000000830000008400000085000000860000008700000088000000890000008a0000008b0000008c0000008d0000008e0000008f00000090000000910000009200000093000000940000009500000096000000 + serializedContents: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c000000 m_AlignBytes: 16 groupID: 1 m_CollisionMaterial: {fileID: 0} @@ -346,258 +346,128 @@ MonoBehaviour: elements: - particle1: 0 particle2: 1 - restLength: 0.01 + restLength: 0.022047479 constraintForce: 0 tearResistance: 1 - particle1: 1 particle2: 2 - restLength: 0.01 + restLength: 0.022272225 constraintForce: 0 tearResistance: 1 - particle1: 2 particle2: 3 - restLength: 0.01 + restLength: 0.022317044 constraintForce: 0 tearResistance: 1 - particle1: 3 particle2: 4 - restLength: 0.01 + restLength: 0.022227883 constraintForce: 0 tearResistance: 1 - particle1: 4 particle2: 5 - restLength: 0.010000002 + restLength: 0.022270732 constraintForce: 0 tearResistance: 1 - particle1: 5 particle2: 6 - restLength: 0.009999998 + restLength: 0.022227883 constraintForce: 0 tearResistance: 1 - particle1: 6 particle2: 7 - restLength: 0.010000002 + restLength: 0.022317037 constraintForce: 0 tearResistance: 1 - particle1: 7 particle2: 8 - restLength: 0.009999998 + restLength: 0.022272244 constraintForce: 0 tearResistance: 1 - particle1: 8 particle2: 9 - restLength: 0.010000005 + restLength: 0.022047475 constraintForce: 0 tearResistance: 1 - particle1: 9 particle2: 10 - restLength: 0.009999998 + restLength: 0.01999247 constraintForce: 0 tearResistance: 1 - particle1: 10 particle2: 11 - restLength: 0.009999998 + restLength: 0.020001456 constraintForce: 0 tearResistance: 1 - particle1: 11 particle2: 12 - restLength: 0.009999998 + restLength: 0.02001217 constraintForce: 0 tearResistance: 1 - particle1: 12 particle2: 13 - restLength: 0.009999998 + restLength: 0.020001411 constraintForce: 0 tearResistance: 1 - particle1: 13 particle2: 14 - restLength: 0.010000005 + restLength: 0.0199925 constraintForce: 0 tearResistance: 1 - particle1: 14 particle2: 15 - restLength: 0.010000005 + restLength: 0.01999253 constraintForce: 0 tearResistance: 1 - particle1: 15 particle2: 16 - restLength: 0.00999999 + restLength: 0.020001382 constraintForce: 0 tearResistance: 1 - particle1: 16 particle2: 17 - restLength: 0.010000005 + restLength: 0.02001217 constraintForce: 0 tearResistance: 1 - particle1: 17 particle2: 18 - restLength: 0.010000005 + restLength: 0.020001411 constraintForce: 0 tearResistance: 1 - particle1: 18 particle2: 19 - restLength: 0.00999999 + restLength: 0.0199925 constraintForce: 0 tearResistance: 1 - particle1: 19 particle2: 20 - restLength: 0.010000005 + restLength: 0.01999253 constraintForce: 0 tearResistance: 1 - particle1: 20 particle2: 21 - restLength: 0.00999999 + restLength: 0.020001382 constraintForce: 0 tearResistance: 1 - particle1: 21 particle2: 22 - restLength: 0.010000005 + restLength: 0.02001217 constraintForce: 0 tearResistance: 1 - particle1: 22 particle2: 23 - restLength: 0.010000005 + restLength: 0.020001382 constraintForce: 0 tearResistance: 1 - particle1: 23 particle2: 24 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 24 - particle2: 25 - restLength: 0.010000005 - constraintForce: 0 - tearResistance: 1 - - particle1: 25 - particle2: 26 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 26 - particle2: 27 - restLength: 0.01000002 - constraintForce: 0 - tearResistance: 1 - - particle1: 27 - particle2: 28 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 28 - particle2: 29 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 29 - particle2: 30 - restLength: 0.01000002 - constraintForce: 0 - tearResistance: 1 - - particle1: 30 - particle2: 31 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 31 - particle2: 32 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 32 - particle2: 33 - restLength: 0.01000002 - constraintForce: 0 - tearResistance: 1 - - particle1: 33 - particle2: 34 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 34 - particle2: 35 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 35 - particle2: 36 - restLength: 0.01000002 - constraintForce: 0 - tearResistance: 1 - - particle1: 36 - particle2: 37 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 37 - particle2: 38 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 38 - particle2: 39 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 39 - particle2: 40 - restLength: 0.01000002 - constraintForce: 0 - tearResistance: 1 - - particle1: 40 - particle2: 41 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 41 - particle2: 42 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 42 - particle2: 43 - restLength: 0.01000002 - constraintForce: 0 - tearResistance: 1 - - particle1: 43 - particle2: 44 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 44 - particle2: 45 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 45 - particle2: 46 - restLength: 0.01000002 - constraintForce: 0 - tearResistance: 1 - - particle1: 46 - particle2: 47 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 47 - particle2: 48 - restLength: 0.00999999 - constraintForce: 0 - tearResistance: 1 - - particle1: 48 - particle2: 49 - restLength: 0.01000002 - constraintForce: 0 - tearResistance: 1 - - particle1: 49 - particle2: 50 - restLength: 0.00999999 + restLength: 0.01999253 constraintForce: 0 tearResistance: 1 _aerodynamicsEnabled: 1 _drag: 0.05 _lift: 0.02 - m_RopeBlueprint: {fileID: 11400000, guid: c29a67f2195883840b049b2c2a54a55c, type: 2} + m_RopeBlueprint: {fileID: 11400000, guid: c70c206ebccc14c4eb6a0cdbe80779f7, type: 2} tearingEnabled: 0 tearResistanceMultiplier: 1000 tearRate: 1 @@ -747,7 +617,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1842296209 +--- !u!1 &1830790625 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -755,8 +625,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1842296211} - - component: {fileID: 1842296210} + - component: {fileID: 1830790627} + - component: {fileID: 1830790626} m_Layer: 0 m_Name: BurstCollisionWorld m_TagString: Untagged @@ -764,13 +634,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1842296210 +--- !u!114 &1830790626 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1842296209} + m_GameObject: {fileID: 1830790625} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3} @@ -778,13 +648,13 @@ MonoBehaviour: m_EditorClassIdentifier: Obi::Obi.BurstColliderWorld cellSpans: m_AlignBytes: 16 ---- !u!4 &1842296211 +--- !u!4 &1830790627 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1842296209} + m_GameObject: {fileID: 1830790625} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -865,4 +735,4 @@ SceneRoots: - {fileID: 961739753} - {fileID: 203844589} - {fileID: 5634959157749674791} - - {fileID: 1842296211} + - {fileID: 1830790627} diff --git a/Assets/Scripts/Fishing/Tackle/FRod.cs b/Assets/Scripts/Fishing/Tackle/FRod.cs index 5c586e496..5d55cedbf 100644 --- a/Assets/Scripts/Fishing/Tackle/FRod.cs +++ b/Assets/Scripts/Fishing/Tackle/FRod.cs @@ -89,8 +89,8 @@ namespace NBF SceneSettings.Instance.GearNode.position = Player.transform.position; yield return 1; var obj = new GameObject($"rod_{itemInfo.Id}_{itemInfo.ConfigId}"); - // obj.transform.SetParent(SceneSettings.Instance.GearNode); - obj.transform.SetParent(player.transform); + obj.transform.SetParent(SceneSettings.Instance.GearNode); + // obj.transform.SetParent(player.transform); // obj.transform.localPosition = Vector3.zero; obj.transform.position = player.transform.position; obj.transform.rotation = player.transform.rotation; @@ -103,7 +103,7 @@ namespace NBF ItemInfo lineItemInfo = null; - + CreateFishingHandler(); // children.Sort(); foreach (var child in children) { @@ -150,8 +150,6 @@ namespace NBF } } - yield return 1; - CreateFishingHandler(); yield return 1; if (Reel) { @@ -218,21 +216,17 @@ namespace NBF public void CreateObiFishingLine(int currentLineTypeIndex) { - // if ((bool)Owner.Gears.Reel && !currentLineHandler) if (!Line) { - //Assets/ResRaw/Prefabs/Line/LineSolver.prefab var lineSolverPrefab = Assets.Load("Assets/ResRaw/Prefabs/Line/LineSolver.prefab"); var solver = Instantiate(lineSolverPrefab, GearRoot); solver.transform.position = Asset.lineConnector.position; solver.transform.rotation = Asset.lineConnector.rotation; - // var indexNames = new[] { "FFishingLine_0", "FFishingLine_1" }; var indexNames = new[] { "fishing line float set", "fishing line spinning" }; var path = - $"Assets/ResRaw/Prefabs/Line/{indexNames[currentLineTypeIndex]}.prefab"; //$"GameItemsPrefabs/Lines/{indexNames[currentLineTypeIndex]}"; + $"Assets/ResRaw/Prefabs/Line/{indexNames[currentLineTypeIndex]}.prefab"; var prefab = Assets.Load(path); - // var toRodConnector = rodAsset.lineConnector.GetComponent(); GameObject obj = Instantiate(prefab, solver.transform); obj.transform.localPosition = Vector3.zero; obj.transform.localScale = Vector3.one; @@ -241,15 +235,6 @@ namespace NBF Line = obj.GetComponent(); Line.transform.position = Asset.lineConnector.position; Line.Init(this.Player, this); - - // lineHandler = obj.GetComponent(); - // // lineHandler.transform.SetParent(toRodConnector.transform); - // lineHandler.transform.position = Asset.lineConnector.position; - // lineHandler.LineConnector_0.target = Asset.lineConnector; //.GetComponent(); - // lineHandler.Rod = this; - // // lineHandler.startParticleAttachment.target = Asset.lineConnector; - var obiSolver = solver.GetComponent(); - // SceneSettings.Instance.obiFixedUpdater.solvers.Add(obiSolver); } }