From d2dbb4a70aa8daf6c7400ca4b1787cc6f642bb78 Mon Sep 17 00:00:00 2001 From: "Bob.Song" <605277374@qq.com> Date: Fri, 8 May 2026 15:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ResRaw/Prefabs/Line/LineHand1.prefab | 63 +- Assets/Scenes/RopeTest.unity | 1296 ++++++++--------- .../Player/States/PlayerStageViewFight.cs | 11 + .../Player/States/PlayerStageViewFishing.cs | 9 +- UserSettings/EditorUserSettings.asset | 8 +- 5 files changed, 726 insertions(+), 661 deletions(-) diff --git a/Assets/ResRaw/Prefabs/Line/LineHand1.prefab b/Assets/ResRaw/Prefabs/Line/LineHand1.prefab index f1dffb462..62f488b75 100644 --- a/Assets/ResRaw/Prefabs/Line/LineHand1.prefab +++ b/Assets/ResRaw/Prefabs/Line/LineHand1.prefab @@ -492,6 +492,7 @@ GameObject: - component: {fileID: 54298866000586118} - component: {fileID: 4367274852511404246} - component: {fileID: 8491405271793597799} + - component: {fileID: 6946262978138518655} m_Layer: 16 m_Name: Float m_TagString: Untagged @@ -658,6 +659,66 @@ MonoBehaviour: NodeType: 1 rope: {fileID: 114581403422500557} preRigidbody: {fileID: 5597807613657979793} +--- !u!114 &6946262978138518655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858052053854210} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dedfafdc2d747d98c682cde3e28e513, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::BobberPresentationController + fallbackWaterLevel: 0 + waterRenderer: {fileID: 0} + waterCollisionLayer: 1 + waterQueryObjectWidth: 0.5 + waterProviderBehaviour: {fileID: 0} + enterWaterDepth: 0.002 + exitWaterDepth: -0.01 + floatHeight: 0.08 + bottomOffsetLocalY: 0 + baseSubmergeRatio: 0.28 + ySmoothTime: 0.08 + maxYSpeed: 2 + yDeadZone: 0.0005 + enableSurfaceBobbing: 1 + surfaceBobAmplitude: 0.0015 + surfaceBobFrequency: 1.2 + lockXZAroundAnchor: 1 + xzSmoothTime: 0.15 + maxPlanarOffset: 0.15 + downForceToSink: 0.0025 + maxExtraSink: 0.08 + enableBottomTouchAdjust: 1 + bottomTouchLift: 0.01 + lureBody: {fileID: 0} + referenceLength: 0.3 + minSubmergeToStand: 0.16 + verticalLieThreshold: 0.18 + verticalUprightThreshold: 0.75 + planarTiltThreshold: 0.3 + planarDominanceMultiplier: 1.2 + postureHysteresis: 0.04 + postureConfirmTime: 0.08 + postureSwitchCooldown: 0.1 + tiltedAngle: 38 + lyingAngle: 88 + uprightMaxTiltAngle: 8 + planarTiltFactor: 120 + planarDirectionDeadZone: 0.01 + planarDirectionLerpSpeed: 10 + rotationLerpSpeed: 8 + debugResetKey: 1 + debugTapKey: 1 + debugSlowSinkKey: 1 + debugLiftKey: 1 + debugBlackDriftKey: 1 + drawDebug: 0 + UseTestPosture: 0 + TestPosture: 0 --- !u!1 &1933124697579601 GameObject: m_ObjectHideFlags: 0 @@ -731,7 +792,7 @@ MonoBehaviour: groundInterpolate: 1 groundUpdateEvery: 1 groundPostConstraintIterations: 2 - constrainToWaterSurface: 1 + constrainToWaterSurface: 0 waterLevelY: 0 waterSurfaceOffset: 0.002 waterSampleStep: 2 diff --git a/Assets/Scenes/RopeTest.unity b/Assets/Scenes/RopeTest.unity index dce1feb3a..2103badb0 100644 --- a/Assets/Scenes/RopeTest.unity +++ b/Assets/Scenes/RopeTest.unity @@ -246,230 +246,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &214732434 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 214732435} - - component: {fileID: 214732438} - - component: {fileID: 214732437} - - component: {fileID: 214732436} - m_Layer: 16 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &214732435 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 214732434} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8546719391357413194} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &214732436 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 214732434} - 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: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &214732437 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 214732434} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &214732438 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 214732434} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &294783593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 294783594} - - component: {fileID: 294783597} - - component: {fileID: 294783596} - - component: {fileID: 294783595} - m_Layer: 16 - m_Name: Cube (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &294783594 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 294783593} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8539487053238402906} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &294783595 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 294783593} - 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: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &294783596 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 294783593} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &294783597 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 294783593} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &961739749 GameObject: m_ObjectHideFlags: 0 @@ -764,148 +540,28 @@ MonoBehaviour: pullFirstKey: 273 relaxFirstKey: 274 fixedKey: 102 + debugKey: 100 extendAmount: 0.5 holdAdjustSpeed: 1 transitionSpeed: 2 smoothTransition: 1 - line: {fileID: 8582028183207551749} ---- !u!114 &241958692992380625 + line: {fileID: 1921081117151860946} +--- !u!114 &342562328918315197 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8541795635327073204} + m_GameObject: {fileID: 1963509428400450752} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7f840e1966fd4c2aafe2f37ca260cdd2, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::NBF.FLineLogicNode - NodeType: 1 - rope: {fileID: 8582461285149390203} - preRigidbody: {fileID: 4261386430389782567} ---- !u!4 &668442936098321219 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7198294632156736780} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8539708880563407196} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &2039604589660568666 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5001286766090116550} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8539900447009199770} - - {fileID: 8539544250705060574} - m_Father: {fileID: 8539708880563407196} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3318894070145238174 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543250826356217623} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1de1bec90e454664a860c5248170ff95, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::NBF.JointPinchController - moveSpeed: 5 - snapDistance: 0.1 ---- !u!145 &3866138628488200559 -SpringJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543250826356217623} - serializedVersion: 4 - m_ConnectedBody: {fileID: 8524466075409708592} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_Spring: 10000 - m_Damper: 1 - m_MinDistance: 0 - m_MaxDistance: 0.1 - m_Tolerance: 0.025 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 1 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 ---- !u!54 &4261386430389782567 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7198294632156736780} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!145 &4713240155175287072 -SpringJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8541795635327073204} - serializedVersion: 4 - m_ConnectedBody: {fileID: 4261386430389782567} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_Spring: 10000 - m_Damper: 1 - m_MinDistance: 0 - m_MaxDistance: 0.1 - m_Tolerance: 0.025 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 1 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 ---- !u!1 &5001286766090116550 + NodeType: 3 + rope: {fileID: 1921533924591776788} + preRigidbody: {fileID: 2016641265547857383} +--- !u!1 &1032743666851747547 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -913,40 +569,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2039604589660568666} - m_Layer: 0 - m_Name: Ropes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &5081183067076465810 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7198294632156736780} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7f840e1966fd4c2aafe2f37ca260cdd2, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::NBF.FLineLogicNode - NodeType: 0 - rope: {fileID: 0} - preRigidbody: {fileID: 0} ---- !u!1 &7198294632156736780 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 668442936098321219} - - component: {fileID: 4261386430389782567} - - component: {fileID: 5081183067076465810} + - component: {fileID: 7275206206568024212} + - component: {fileID: 6238343453940102128} + - component: {fileID: 3112986956475445061} m_Layer: 0 m_Name: Start m_TagString: Untagged @@ -954,29 +579,14 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &7597984541624331114 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543250826356217623} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7f840e1966fd4c2aafe2f37ca260cdd2, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::NBF.FLineLogicNode - NodeType: 3 - rope: {fileID: 8582410482329161667} - preRigidbody: {fileID: 8524466075409708592} ---- !u!120 &8085851239807627402 +--- !u!120 &1657038842219191169 LineRenderer: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8541861840809227239} + m_GameObject: {fileID: 1963562169755917780} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -1079,241 +689,13 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 ---- !u!54 &8524466075409708592 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8541795635327073204} - serializedVersion: 5 - m_Mass: 0.1 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 0.001, y: 0.001, z: 0.001} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 0 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 2 ---- !u!54 &8524846404008770003 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543250826356217623} - serializedVersion: 5 - m_Mass: 0.05 - m_LinearDamping: 1 - m_AngularDamping: 1 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 0.001, y: 0.001, z: 0.001} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 0 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 2 ---- !u!4 &8539487053238402906 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543250826356217623} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 294783594} - m_Father: {fileID: 8539708880563407196} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &8539544250705060574 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8541861840809227239} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2039604589660568666} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &8539708880563407196 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8541351597693171935} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.00351, y: 0.00056, z: -0.00352} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2039604589660568666} - - {fileID: 668442936098321219} - - {fileID: 8546719391357413194} - - {fileID: 8539487053238402906} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &8539900447009199770 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543198008026883587} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2039604589660568666} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8541351597693171935 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8539708880563407196} - - component: {fileID: 8582028183207551749} - m_Layer: 0 - m_Name: LineHand1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &8541795635327073204 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8546719391357413194} - - component: {fileID: 8524466075409708592} - - component: {fileID: 4713240155175287072} - - component: {fileID: 241958692992380625} - m_Layer: 16 - m_Name: Float - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &8541861840809227239 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8539544250705060574} - - component: {fileID: 8582410482329161667} - - component: {fileID: 8085851239807627402} - m_Layer: 0 - m_Name: Line2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &8543198008026883587 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8539900447009199770} - - component: {fileID: 8582461285149390203} - - component: {fileID: 8885193308293947478} - m_Layer: 19 - m_Name: Line1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &8543250826356217623 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8539487053238402906} - - component: {fileID: 8524846404008770003} - - component: {fileID: 8605967449857364438} - - component: {fileID: 3866138628488200559} - - component: {fileID: 7597984541624331114} - - component: {fileID: 3318894070145238174} - m_Layer: 7 - m_Name: End - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8546719391357413194 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8541795635327073204} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 214732435} - m_Father: {fileID: 8539708880563407196} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8582028183207551749 +--- !u!114 &1921081117151860946 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8541351597693171935} + m_GameObject: {fileID: 1961469606258361096} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c0403ffd74ce46fab8bd4ef057e51432, type: 3} @@ -1323,9 +705,9 @@ MonoBehaviour: LineType: 0 anchorTransform: {fileID: 2055159199} lineNodes: - - {fileID: 5081183067076465810} - - {fileID: 241958692992380625} - - {fileID: 7597984541624331114} + - {fileID: 3112986956475445061} + - {fileID: 7992741547208004870} + - {fileID: 342562328918315197} positionCorrectionForce: 100 dampingCoefficient: 10 constraintIterations: 10 @@ -1333,24 +715,20 @@ MonoBehaviour: showDebugInfo: 1 defaultTransitionSpeed: 2 LinelenghtDiferent: 0 - lengthLimitTolerance: 0.01 - breakStretchThreshold: 0.3 - breakStretchPercentMinThreshold: 0.06 - breakLimitDuration: 3 ---- !u!114 &8582410482329161667 +--- !u!114 &1921533924591776788 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8541861840809227239} + m_GameObject: {fileID: 1962085262747224112} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 98ba9d435a0e49c9bb527c34cc91894d, type: 3} m_Name: m_EditorClassIdentifier: - startAnchor: {fileID: 8524466075409708592} - endAnchor: {fileID: 8524846404008770003} + startAnchor: {fileID: 2016641265547857383} + endAnchor: {fileID: 2017092098314158596} LineMultiple: 5 physicsSegmentLen: 0.2 minPhysicsNodes: 2 @@ -1377,7 +755,7 @@ MonoBehaviour: groundInterpolate: 1 groundUpdateEvery: 1 groundPostConstraintIterations: 2 - constrainToWaterSurface: 1 + constrainToWaterSurface: 0 waterLevelY: 0 waterSurfaceOffset: 0.002 waterSampleStep: 2 @@ -1397,20 +775,20 @@ MonoBehaviour: visibilityViewportPadding: 0.08 airDrag: 0.9 airDragXZ: 0.6 ---- !u!114 &8582461285149390203 +--- !u!114 &1921760653432393388 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543198008026883587} + m_GameObject: {fileID: 1963562169755917780} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 98ba9d435a0e49c9bb527c34cc91894d, type: 3} m_Name: m_EditorClassIdentifier: - startAnchor: {fileID: 4261386430389782567} - endAnchor: {fileID: 8524466075409708592} + startAnchor: {fileID: 6238343453940102128} + endAnchor: {fileID: 2016641265547857383} LineMultiple: 5 physicsSegmentLen: 0.1 minPhysicsNodes: 2 @@ -1457,13 +835,13 @@ MonoBehaviour: visibilityViewportPadding: 0.08 airDrag: 0.2 airDragXZ: 0.6 ---- !u!135 &8605967449857364438 +--- !u!135 &1936259752046930433 SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543250826356217623} + m_GameObject: {fileID: 1963509428400450752} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -1478,14 +856,241 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.003 m_Center: {x: 0, y: -0.0015, z: 0} ---- !u!120 &8885193308293947478 +--- !u!4 &1958076491119664285 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962159792748281955} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1960002396391027339} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1959675018093020301 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963509428400450752} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1960002396391027339} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1959908547600259337 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962085262747224112} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8214092525188630413} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1960002396391027339 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961469606258361096} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.216, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8214092525188630413} + - {fileID: 7275206206568024212} + - {fileID: 1958076491119664285} + - {fileID: 1959675018093020301} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1960088405561371981 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963562169755917780} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8214092525188630413} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1961469606258361096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1960002396391027339} + - component: {fileID: 1921081117151860946} + m_Layer: 0 + m_Name: LineHand1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1962085262747224112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1959908547600259337} + - component: {fileID: 1921533924591776788} + - component: {fileID: 2127606592564398941} + m_Layer: 0 + m_Name: Line2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1962159792748281955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1958076491119664285} + - component: {fileID: 2016641265547857383} + - component: {fileID: 2857473880858327223} + - component: {fileID: 7992741547208004870} + - component: {fileID: 8888541524238834718} + m_Layer: 16 + m_Name: Float + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1963509428400450752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1959675018093020301} + - component: {fileID: 2017092098314158596} + - component: {fileID: 1936259752046930433} + - component: {fileID: 3731733783259200246} + - component: {fileID: 342562328918315197} + - component: {fileID: 4881731169497808713} + m_Layer: 7 + m_Name: End + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1963562169755917780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1960088405561371981} + - component: {fileID: 1921760653432393388} + - component: {fileID: 1657038842219191169} + m_Layer: 19 + m_Name: Line1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!54 &2016641265547857383 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962159792748281955} + serializedVersion: 5 + m_Mass: 0.1 + m_LinearDamping: 1 + m_AngularDamping: 0.1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 0.001, y: 0.001, z: 0.001} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 0 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 2 +--- !u!54 &2017092098314158596 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963509428400450752} + serializedVersion: 5 + m_Mass: 0.01 + m_LinearDamping: 1 + m_AngularDamping: 0.1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 0.001, y: 0.001, z: 0.001} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 0 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 2 +--- !u!120 &2127606592564398941 LineRenderer: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543198008026883587} + m_GameObject: {fileID: 1962085262747224112} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -1588,6 +1193,389 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!153 &2857473880858327223 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962159792748281955} + serializedVersion: 4 + m_ConnectedBody: {fileID: 6238343453940102128} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 0 + m_ConnectedAnchor: {x: 0, y: -0.01, z: 0} + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 2 + m_AngularYMotion: 2 + m_AngularZMotion: 2 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0.5 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 1 + m_ProjectionDistance: 0 + m_ProjectionAngle: 0 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 +--- !u!1 &2943194578500445713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8214092525188630413} + m_Layer: 0 + m_Name: Ropes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &3112986956475445061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1032743666851747547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f840e1966fd4c2aafe2f37ca260cdd2, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBF.FLineLogicNode + NodeType: 0 + rope: {fileID: 0} + preRigidbody: {fileID: 0} +--- !u!153 &3731733783259200246 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963509428400450752} + serializedVersion: 4 + m_ConnectedBody: {fileID: 2016641265547857383} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 0, y: 0, z: 0} + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 2 + m_AngularYMotion: 2 + m_AngularZMotion: 2 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0.5 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 1 + m_ProjectionDistance: 0 + m_ProjectionAngle: 0 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 +--- !u!114 &4881731169497808713 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963509428400450752} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1de1bec90e454664a860c5248170ff95, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBF.JointPinchController + moveSpeed: 5 + snapDistance: 0.1 +--- !u!54 &6238343453940102128 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1032743666851747547} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!4 &7275206206568024212 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1032743666851747547} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1960002396391027339} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7992741547208004870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962159792748281955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f840e1966fd4c2aafe2f37ca260cdd2, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBF.FLineLogicNode + NodeType: 1 + rope: {fileID: 1921760653432393388} + preRigidbody: {fileID: 6238343453940102128} +--- !u!4 &8214092525188630413 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2943194578500445713} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1960088405561371981} + - {fileID: 1959908547600259337} + m_Father: {fileID: 1960002396391027339} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8888541524238834718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962159792748281955} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dedfafdc2d747d98c682cde3e28e513, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::BobberPresentationController + fallbackWaterLevel: 0 + waterRenderer: {fileID: 0} + waterCollisionLayer: 1 + waterQueryObjectWidth: 0.5 + waterProviderBehaviour: {fileID: 0} + enterWaterDepth: 0.002 + exitWaterDepth: -0.01 + floatHeight: 0.08 + bottomOffsetLocalY: 0 + baseSubmergeRatio: 0.28 + ySmoothTime: 0.08 + maxYSpeed: 2 + yDeadZone: 0.0005 + enableSurfaceBobbing: 1 + surfaceBobAmplitude: 0.0015 + surfaceBobFrequency: 1.2 + lockXZAroundAnchor: 1 + xzSmoothTime: 0.15 + maxPlanarOffset: 0.15 + downForceToSink: 0.0025 + maxExtraSink: 0.08 + enableBottomTouchAdjust: 1 + bottomTouchLift: 0.01 + lureBody: {fileID: 0} + referenceLength: 0.3 + minSubmergeToStand: 0.16 + verticalLieThreshold: 0.18 + verticalUprightThreshold: 0.75 + planarTiltThreshold: 0.3 + planarDominanceMultiplier: 1.2 + postureHysteresis: 0.04 + postureConfirmTime: 0.08 + postureSwitchCooldown: 0.1 + tiltedAngle: 38 + lyingAngle: 88 + uprightMaxTiltAngle: 8 + planarTiltFactor: 120 + planarDirectionDeadZone: 0.01 + planarDirectionLerpSpeed: 10 + rotationLerpSpeed: 8 + debugResetKey: 1 + debugTapKey: 1 + debugSlowSinkKey: 1 + debugLiftKey: 1 + debugBlackDriftKey: 1 + drawDebug: 0 + UseTestPosture: 0 + TestPosture: 0 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1595,4 +1583,4 @@ SceneRoots: - {fileID: 961739753} - {fileID: 203844589} - {fileID: 2055159199} - - {fileID: 8539708880563407196} + - {fileID: 1960002396391027339} diff --git a/Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs index 1e50f0860..97ecffc37 100644 --- a/Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs +++ b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs @@ -4,10 +4,21 @@ { protected override void OnEnter() { + // Player.ro + if (Player.HandItem is FRod rod) + { + rod.Line.EndNode.Rigidbody.isKinematic = true; + // rod.Line.ChangeMode(LineMode.Constraint); + } } protected override void OnExit() { + if (Player.HandItem is FRod rod) + { + rod.Line.EndNode.Rigidbody.isKinematic = false; + // rod.Line.ChangeMode(LineMode.Joint); + } } protected override void OnUpdate() diff --git a/Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs index 3b7026b80..62e87bd2e 100644 --- a/Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs +++ b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs @@ -25,6 +25,11 @@ namespace NBF ret = CheckTackFish(); } + if (Input.GetKeyDown(KeyCode.F)) + { + ret = PlayerState.Fight; + } + if (ret != PlayerState.None) { Player.ChangeState(ret); @@ -100,8 +105,8 @@ namespace NBF private PlayerState CheckTackFish() { - // return PlayerState.Idle; - return PlayerState.Fight; + return PlayerState.Idle; + // return PlayerState.Fight; } #endregion diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 032946b82..ba38bc249 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -33,14 +33,14 @@ EditorUserSettings: value: 0257035f51050d090f0f5d734521094414164e797e7a20667d7a4536e0e36461 flags: 0 RecentlyUsedSceneGuid-6: - value: 07060c5454040c0a545b547240700a441216417e7f2e7268752c4966b4b0663d - flags: 0 - RecentlyUsedSceneGuid-7: value: 54070c5452075002590c0871127b5a4443161c2f797176312c2f1e6bb1b4353d flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-7: value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a flags: 0 + RecentlyUsedSceneGuid-8: + value: 07060c5454040c0a545b547240700a441216417e7f2e7268752c4966b4b0663d + flags: 0 RecentlyUsedSceneGuid-9: value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e flags: 0