diff --git a/Assets/Resources/Prefabs/Player/male.prefab b/Assets/Resources/Prefabs/Player/male.prefab index 0fd711f96..0b1e596f6 100644 --- a/Assets/Resources/Prefabs/Player/male.prefab +++ b/Assets/Resources/Prefabs/Player/male.prefab @@ -1132,6 +1132,123 @@ Transform: - {fileID: 9109764213862965057} m_Father: {fileID: 4133273732884046084} m_LocalEulerAnglesHint: {x: -88.92345, y: -89.99996, z: 0} +--- !u!1 &753024994258800546 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1704816065694412769} + m_Layer: 0 + m_Name: bait_connector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1704816065694412769 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 753024994258800546} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.000010902062, y: -0.015644342, z: 0.0037490055} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8773257899045581441} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} +--- !u!1 &764373856403783542 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3357105138556497831} + - component: {fileID: 8056488037058758383} + - component: {fileID: 6536437878709119544} + m_Layer: 0 + m_Name: c_hook_20790 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3357105138556497831 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764373856403783542} + 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: 2898178484720729032} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8056488037058758383 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764373856403783542} + m_Mesh: {fileID: 4300000, guid: 65154b2ac1f3c05478bb3b02f3bbf5c7, type: 2} +--- !u!23 &6536437878709119544 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764373856403783542} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ca46126d5cbc4c84a988fa712feec6f5, 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &790362574010081598 GameObject: m_ObjectHideFlags: 0 @@ -1163,6 +1280,37 @@ Transform: m_Children: [] m_Father: {fileID: 7556431583037137314} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} +--- !u!1 &812219067400607957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1847369539675360078} + m_Layer: 0 + m_Name: light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1847369539675360078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812219067400607957} + 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: 7989316057193859911} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &831312709705471046 GameObject: m_ObjectHideFlags: 0 @@ -1760,6 +1908,206 @@ Transform: - {fileID: 6330347182410542168} m_Father: {fileID: 2178557623618545730} m_LocalEulerAnglesHint: {x: -1.9362013e-27, y: -0.00092266063, z: -180} +--- !u!1 &1233722502511756045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8773257899045581441} + - component: {fileID: 8824327747835608573} + - component: {fileID: 2890832410022913850} + - component: {fileID: 8133179437166535336} + - component: {fileID: 1472835326182082991} + m_Layer: 0 + m_Name: c_hook_20790(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8773257899045581441 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1233722502511756045} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.026692433, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3511973910627305891} + - {fileID: 1704816065694412769} + m_Father: {fileID: 7989316057193859911} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} +--- !u!114 &8824327747835608573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1233722502511756045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6eea50c041f42d5bd95d9e56c3a9c6f, type: 3} + m_Name: + m_EditorClassIdentifier: + baitConnector: {fileID: 1704816065694412769} +--- !u!65 &2890832410022913850 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1233722502511756045} + 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: 0.005, y: 0.005, z: 0.005} + m_Center: {x: 0, y: -0.01, z: 0} +--- !u!54 &8133179437166535336 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1233722502511756045} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!153 &1472835326182082991 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1233722502511756045} + serializedVersion: 4 + m_ConnectedBody: {fileID: 0} + 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: 0 + m_YMotion: 0 + m_ZMotion: 0 + m_AngularXMotion: 2 + m_AngularYMotion: 2 + m_AngularZMotion: 2 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + 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: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + 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 &1260231247960113725 GameObject: m_ObjectHideFlags: 0 @@ -2909,6 +3257,37 @@ Transform: m_Children: [] m_Father: {fileID: 775476582679568209} m_LocalEulerAnglesHint: {x: 111.71363, y: 31.299614, z: 179.15817} +--- !u!1 &2064478293126781012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2752663265222090483} + m_Layer: 0 + m_Name: bait_connector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2752663265222090483 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2064478293126781012} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.000010902062, y: -0.015644342, z: 0.0037490055} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2898178484720729032} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} --- !u!1 &2246287374850370723 GameObject: m_ObjectHideFlags: 0 @@ -3701,6 +4080,37 @@ Transform: - {fileID: 5954427792876577410} m_Father: {fileID: 5809894746142683780} m_LocalEulerAnglesHint: {x: 4.943448e-14, y: 0.0000066800035, z: -9.157404} +--- !u!1 &2936006594889065768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3714722221536977277} + m_Layer: 0 + m_Name: camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3714722221536977277 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2936006594889065768} + 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: 7989316057193859911} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2983740994474689025 GameObject: m_ObjectHideFlags: 0 @@ -5232,6 +5642,92 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4317186098345368641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8993192904257705293} + - component: {fileID: 1191367977762292697} + - component: {fileID: 1938087298791990349} + m_Layer: 0 + m_Name: c_hook_20790 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8993192904257705293 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4317186098345368641} + 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: 3526371631881761278} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1191367977762292697 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4317186098345368641} + m_Mesh: {fileID: 4300000, guid: 65154b2ac1f3c05478bb3b02f3bbf5c7, type: 2} +--- !u!23 &1938087298791990349 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4317186098345368641} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ca46126d5cbc4c84a988fa712feec6f5, 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &4320907107528533032 GameObject: m_ObjectHideFlags: 0 @@ -7148,6 +7644,15 @@ Transform: - {fileID: 3225762559705175391} - {fileID: 8756703652439260241} - {fileID: 4521584281603830784} + - {fileID: 3802469815372229690} + - {fileID: 1493668633155761380} + - {fileID: 3526371631881761278} + - {fileID: 3714722221536977277} + - {fileID: 1847369539675360078} + - {fileID: 2898178484720729032} + - {fileID: 644094838857055484} + - {fileID: 3472848728189769762} + - {fileID: 8773257899045581441} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} --- !u!95 &523589534089097102 @@ -7357,12 +7862,11 @@ MonoBehaviour: lineCutTimer: 0 selectorRodSetting: 0 CameraRoot: {fileID: 5273066534610348271} - assignRod: {fileID: 0} - handPullUp: 0 PlayerAnimatorCtrl: {fileID: 0} Gears: {fileID: 0} LureTrajectorySimulator: {fileID: 0} Light: {fileID: 4424852676135480966} + BackSpine: {fileID: 2935101413777606001} --- !u!114 &8072573713298176091 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7564,7 +8068,7 @@ MonoBehaviour: _maxAcceleration: 20 _brakingDecelerationWalking: 20 _groundFriction: 8 - _canEverCrouch: 1 + _canEverCrouch: 0 _crouchedHeight: 1.25 _unCrouchedHeight: 2 _maxWalkSpeedCrouched: 3 @@ -7572,8 +8076,8 @@ MonoBehaviour: _brakingDecelerationFalling: 0 _fallingLateralFriction: 0.3 _airControl: 0.3 - _canEverJump: 1 - _canJumpWhileCrouching: 1 + _canEverJump: 0 + _canJumpWhileCrouching: 0 _jumpMaxCount: 1 _jumpImpulse: 5 _jumpMaxHoldTime: 0 @@ -7600,6 +8104,13 @@ MonoBehaviour: _standingDownwardForceScale: 1 _camera: {fileID: 0} cameraParent: {fileID: 8796494894830104914} + nextShowSlotIndex: -1 + invertLook: 1 + sensitivity: {x: 0.05, y: 0.05} + minPitch: -45 + maxPitch: 80 + handMaxAngle: {x: 25, y: -25} + IsSelf: 0 --- !u!1 &5575756112392514727 GameObject: m_ObjectHideFlags: 0 @@ -7973,6 +8484,68 @@ Transform: m_Children: [] m_Father: {fileID: 7989316057193859911} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6035876150686755945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3802469815372229690} + m_Layer: 0 + m_Name: camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3802469815372229690 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6035876150686755945} + 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: 7989316057193859911} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6169607351445641458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3472848728189769762} + m_Layer: 0 + m_Name: light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3472848728189769762 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6169607351445641458} + 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: 7989316057193859911} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6176636066937765209 GameObject: m_ObjectHideFlags: 0 @@ -8250,6 +8823,37 @@ Transform: - {fileID: 3131493112555954888} m_Father: {fileID: 7989316057193859911} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} +--- !u!1 &6345188298026307759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1493668633155761380} + m_Layer: 0 + m_Name: light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1493668633155761380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6345188298026307759} + 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: 7989316057193859911} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6350859951251349568 GameObject: m_ObjectHideFlags: 0 @@ -8482,6 +9086,206 @@ Transform: - {fileID: 2160407020129980440} m_Father: {fileID: 6330347182410542168} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} +--- !u!1 &6521179333745043815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2898178484720729032} + - component: {fileID: 2359779422859324736} + - component: {fileID: 878997933527614083} + - component: {fileID: 9089258772829003355} + - component: {fileID: 8080756859924904529} + m_Layer: 0 + m_Name: c_hook_20790(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2898178484720729032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6521179333745043815} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.026692433, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3357105138556497831} + - {fileID: 2752663265222090483} + m_Father: {fileID: 7989316057193859911} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} +--- !u!114 &2359779422859324736 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6521179333745043815} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6eea50c041f42d5bd95d9e56c3a9c6f, type: 3} + m_Name: + m_EditorClassIdentifier: + baitConnector: {fileID: 2752663265222090483} +--- !u!65 &878997933527614083 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6521179333745043815} + 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: 0.005, y: 0.005, z: 0.005} + m_Center: {x: 0, y: -0.01, z: 0} +--- !u!54 &9089258772829003355 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6521179333745043815} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!153 &8080756859924904529 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6521179333745043815} + serializedVersion: 4 + m_ConnectedBody: {fileID: 0} + 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: 0 + m_YMotion: 0 + m_ZMotion: 0 + m_AngularXMotion: 2 + m_AngularYMotion: 2 + m_AngularZMotion: 2 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + 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: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + 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 &6615003432683934148 GameObject: m_ObjectHideFlags: 0 @@ -9728,6 +10532,37 @@ Transform: - {fileID: 8183577633858037855} m_Father: {fileID: 1567761239455292317} m_LocalEulerAnglesHint: {x: 0, y: -0, z: 16.849472} +--- !u!1 &7303406278588193943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 644094838857055484} + m_Layer: 0 + m_Name: camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &644094838857055484 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7303406278588193943} + 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: 7989316057193859911} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7369824499701851528 GameObject: m_ObjectHideFlags: 0 @@ -10091,6 +10926,37 @@ Transform: m_Children: [] m_Father: {fileID: 7989316057193859911} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} +--- !u!1 &7519642932937144177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3381043125359209043} + m_Layer: 0 + m_Name: bait_connector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3381043125359209043 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7519642932937144177} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.000010902062, y: -0.015644342, z: 0.0037490055} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3526371631881761278} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} --- !u!1 &7680913651054783088 GameObject: m_ObjectHideFlags: 0 @@ -10451,6 +11317,206 @@ Transform: - {fileID: 7333364906082481097} m_Father: {fileID: 6903152012031127781} m_LocalEulerAnglesHint: {x: -1.2187976, y: 16.766983, z: 5.0560064} +--- !u!1 &7989051560176333516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3526371631881761278} + - component: {fileID: 5194239939924848424} + - component: {fileID: 3467276812542785119} + - component: {fileID: 1788655141899472066} + - component: {fileID: 3974645298807284515} + m_Layer: 0 + m_Name: c_hook_20790(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3526371631881761278 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989051560176333516} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.026692433, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8993192904257705293} + - {fileID: 3381043125359209043} + m_Father: {fileID: 7989316057193859911} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} +--- !u!114 &5194239939924848424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989051560176333516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6eea50c041f42d5bd95d9e56c3a9c6f, type: 3} + m_Name: + m_EditorClassIdentifier: + baitConnector: {fileID: 3381043125359209043} +--- !u!65 &3467276812542785119 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989051560176333516} + 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: 0.005, y: 0.005, z: 0.005} + m_Center: {x: 0, y: -0.01, z: 0} +--- !u!54 &1788655141899472066 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989051560176333516} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!153 &3974645298807284515 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989051560176333516} + serializedVersion: 4 + m_ConnectedBody: {fileID: 0} + 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: 0 + m_YMotion: 0 + m_ZMotion: 0 + m_AngularXMotion: 2 + m_AngularYMotion: 2 + m_AngularZMotion: 2 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + 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: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + 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 &8145990319650411591 GameObject: m_ObjectHideFlags: 0 @@ -11145,6 +12211,92 @@ Transform: - {fileID: 9094229649983337297} m_Father: {fileID: 8128073267674762116} m_LocalEulerAnglesHint: {x: 18.678028, y: 15.625682, z: -6.0307455} +--- !u!1 &8916801257543495101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3511973910627305891} + - component: {fileID: 1616404792019933165} + - component: {fileID: 8772724194950748393} + m_Layer: 0 + m_Name: c_hook_20790 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3511973910627305891 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8916801257543495101} + 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: 8773257899045581441} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1616404792019933165 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8916801257543495101} + m_Mesh: {fileID: 4300000, guid: 65154b2ac1f3c05478bb3b02f3bbf5c7, type: 2} +--- !u!23 &8772724194950748393 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8916801257543495101} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ca46126d5cbc4c84a988fa712feec6f5, 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &8945884039024485800 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Fishing/Player/FPlayer.cs b/Assets/Scripts/Fishing/Player/FPlayer.cs index 2e9d2e36b..49118b826 100644 --- a/Assets/Scripts/Fishing/Player/FPlayer.cs +++ b/Assets/Scripts/Fishing/Player/FPlayer.cs @@ -13,18 +13,10 @@ public partial class FPlayer : MonoBehaviour /// public Transform CameraRoot; - public Transform rHandRodJoiner => MainArm.RodContainer; - - public FRod assignRod; - - // [HideInInspector] public FRod currentRod; - private CCDIK interactionCCDIK; private float interactionTargetWeight; - [HideInInspector] public float handPullUp; - public Fsm Fsm { get; private set; } private PlayerArm[] Arms; @@ -41,6 +33,8 @@ public partial class FPlayer : MonoBehaviour public Transform Light; + public Transform BackSpine; + private void Awake() { PlayerAnimatorCtrl = gameObject.GetComponent(); @@ -78,14 +72,9 @@ public partial class FPlayer : MonoBehaviour if (data.PlayerID == GameModel.RoleID) { - // var mainSync = gameObject.AddComponent(); BaseCamera.Main.transform.SetParent(CameraRoot); BaseCamera.Main.transform.localPosition = Vector3.zero; } - else - { - // var otherSync = gameObject.AddComponent(); - } } #region 初始化相关 @@ -159,7 +148,6 @@ public partial class FPlayer : MonoBehaviour { if (Light) { - Light.localRotation = BaseCamera.Main.transform.localRotation; if (Light.gameObject.activeSelf != Data.openLight) { Light.gameObject.SetActive(Data.openLight); diff --git a/Assets/Scripts/Fishing/Player/PlayerCharacter/PlayerCharacter.cs b/Assets/Scripts/Fishing/Player/PlayerCharacter/PlayerCharacter.cs index 416a17dac..4e0fbe670 100644 --- a/Assets/Scripts/Fishing/Player/PlayerCharacter/PlayerCharacter.cs +++ b/Assets/Scripts/Fishing/Player/PlayerCharacter/PlayerCharacter.cs @@ -6,7 +6,6 @@ namespace NBF { public class PlayerCharacter : Character { - [Tooltip("The first person camera parent.")] public GameObject cameraParent; private float _cameraPitch; @@ -15,20 +14,26 @@ namespace NBF [Space(15.0f)] public bool invertLook = true; - [Tooltip("Look sensitivity")] public Vector2 sensitivity = new Vector2(0.05f, 0.05f); + [Tooltip("视角旋转敏感度")] public Vector2 sensitivity = new Vector2(0.05f, 0.05f); - [Space(15.0f)] [Tooltip("How far in degrees can you move the camera down.")] - public float minPitch = -80.0f; - - [Tooltip("How far in degrees can you move the camera up.")] + [Space(15.0f)] public float minPitch = -80.0f; public float maxPitch = 80.0f; + [Tooltip("手上下最大角度")] public Vector2 handMaxAngle = new Vector2(0, 0); + + public bool IsSelf; + protected override void Start() { base.Start(); - camera = BaseCamera.Main; _player = GetComponent(); + IsSelf = _player.Data.PlayerID == GameModel.RoleID; + cameraParent = _player.CameraRoot.gameObject; + if (IsSelf) + { + camera = BaseCamera.Main; + } transform.position = _player.Data.position; transform.rotation = _player.Data.rotation; @@ -42,8 +47,77 @@ namespace NBF private void Update() { - // Move + UpdatePlayerPositionAndRotation(); + UpdateGear(); + } + protected virtual void LateUpdate() + { + UpdateCameraParentRotation(); + UpdatePlayerHandView(); + } + + + protected override void Reset() + { + base.Reset(); + SetRotationMode(RotationMode.None); + } + + private void OnDestroy() + { + InputManager.OnQuickIndexAction -= OnQuickIndexAction; + InputManager.OnUseTorchAction -= OnUseTorchAction; + InputManager.OnUseTelescopeAction -= OnUseTelescopeAction; + } + + #region 肩膀控制 + + private void UpdatePlayerHandView() + { + // var backValue = 0f; + + var angle = cameraParent.transform.localEulerAngles.x; + angle = (angle > 180f) ? angle - 360f : angle; + angle *= -1; + if (angle > handMaxAngle.x) + { + angle = handMaxAngle.x; + } + else if (angle < handMaxAngle.y) + { + angle = handMaxAngle.y; + } + + Debug.Log(angle); + _player.BackSpine.localRotation *= Quaternion.Euler(0, 0, angle); + } + + #endregion + + #region 钓组控制 + + private void UpdateGear() + { + if (_player.CanChangeGear()) + { + if (nextShowSlotIndex > 0) + { + Debug.LogError("切换钓组========="); + var data = Fishing.Inst.Datasource; + data.SetSelfTestGear(nextShowSlotIndex); + nextShowSlotIndex = -1; + } + } + } + + #endregion + + #region 角色位移和旋转控制 + + private void UpdatePlayerPositionAndRotation() + { + // Move Vector2 movementInput = InputManager.GetMovementInput(); Vector3 movementDirection = Vector3.zero; @@ -57,32 +131,44 @@ namespace NBF SetMovementDirection(movementDirection); // Look - Vector2 lookInput = InputManager.GetLookInput() * sensitivity; AddControlYawInput(lookInput.x); AddControlPitchInput(invertLook ? -lookInput.y : lookInput.y, minPitch, maxPitch); - - - if (_player.CanChangeGear()) - { - if (nextShowSlotIndex > 0) - { - Debug.LogError("切换钓组========="); - var data = Fishing.Inst.Datasource; - data.SetSelfTestGear(nextShowSlotIndex); - nextShowSlotIndex = -1; - } - } } - private void OnDestroy() + /// + /// 添加输入（影响偏航）。 + /// 此操作应用于角色的旋转。 + /// + public virtual void AddControlYawInput(float value) { - InputManager.OnQuickIndexAction -= OnQuickIndexAction; - InputManager.OnUseTorchAction -= OnUseTorchAction; - InputManager.OnUseTelescopeAction -= OnUseTelescopeAction; + if (value != 0.0f) + AddYawInput(value); } + /// + /// 添加输入（影响俯仰）。 + /// 此操作应用于相机父级的本地旋转。 + /// + public virtual void AddControlPitchInput(float value, float minPitch = -80.0f, float maxPitch = 80.0f) + { + if (value != 0.0f) + _cameraPitch = MathLib.ClampAngle(_cameraPitch + value, minPitch, maxPitch); + } + + /// + /// 根据当前的 _cameraPitch 值更新 cameraParent 的本地旋转。 + /// + protected virtual void UpdateCameraParentRotation() + { + cameraParent.transform.localRotation = Quaternion.Euler(_cameraPitch, 0.0f, 0.0f); + } + + #endregion + + #region 按键输入事件 + private void OnQuickIndexAction(int index) { nextShowSlotIndex = index; @@ -105,55 +191,6 @@ namespace NBF } } - /// - /// Add input (affecting Yaw). - /// This is applied to the Character's rotation. - /// - public virtual void AddControlYawInput(float value) - { - if (value != 0.0f) - AddYawInput(value); - } - - /// - /// Add input (affecting Pitch). - /// This is applied to the cameraParent's local rotation. - /// - public virtual void AddControlPitchInput(float value, float minPitch = -80.0f, float maxPitch = 80.0f) - { - if (value != 0.0f) - _cameraPitch = MathLib.ClampAngle(_cameraPitch + value, minPitch, maxPitch); - } - - /// - /// Update cameraParent local rotation applying current _cameraPitch value. - /// - protected virtual void UpdateCameraParentRotation() - { - cameraParent.transform.localRotation = Quaternion.Euler(_cameraPitch, 0.0f, 0.0f); - } - - /// - /// If overriden, base method MUST be called. - /// - protected virtual void LateUpdate() - { - UpdateCameraParentRotation(); - } - - /// - /// If overriden, base method MUST be called. - /// - protected override void Reset() - { - // Call base method implementation - - base.Reset(); - - // Disable character's rotation, - // it is handled by the AddControlYawInput method - - SetRotationMode(RotationMode.None); - } + #endregion } } \ No newline at end of file