diff --git a/Assets/AssetCaches.asset b/Assets/AssetCaches.asset index 702d3a0a8..6c2b68da6 100644 --- a/Assets/AssetCaches.asset +++ b/Assets/AssetCaches.asset @@ -43,96 +43,6 @@ MonoBehaviour: - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} FilterEnum: 0 Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_9wej123.png - Address: UI/Common_atlas_9wej123 - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_dhevef.png - Address: UI/Common_atlas_dhevef - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_dheveg.png - Address: UI/Common_atlas_dheveg - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_dheveh.png - Address: UI/Common_atlas_dheveh - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png - Address: UI/Common_atlas_mbu9ye - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_obry17g.png - Address: UI/Common_atlas_obry17g - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - Path: Assets/ResRaw/Fgui/Common/Common_fui.bytes Address: UI/Common_fui Type: TextAsset @@ -22845,8 +22755,8 @@ MonoBehaviour: Filter: '*' Bundles: - Name: main/ui.bundle - Hash: 87fb02b0e4a45289b5e84b52150afd3f - Size: 15629341 + Hash: 40fee51e07cdc187f12eeddb4b2467b1 + Size: 3295167 Assets: - Path: Assets/ResRaw/Fgui/Common/Background - Gray (Light).png Address: UI/Background - Gray (Light) @@ -22878,96 +22788,6 @@ MonoBehaviour: - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} FilterEnum: 0 Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_9wej123.png - Address: UI/Common_atlas_9wej123 - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_dhevef.png - Address: UI/Common_atlas_dhevef - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_dheveg.png - Address: UI/Common_atlas_dheveg - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_dheveh.png - Address: UI/Common_atlas_dheveh - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_mbu9ye.png - Address: UI/Common_atlas_mbu9ye - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Fgui/Common/Common_atlas_obry17g.png - Address: UI/Common_atlas_obry17g - Type: Texture2D - Bundle: main/ui.bundle - Tags: - Group: - Name: UI - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: 064d656ec28baec4e984e51d3b9b7fc3, type: 3} - FilterEnum: 0 - Filter: '*' - Path: Assets/ResRaw/Fgui/Common/Common_fui.bytes Address: UI/Common_fui Type: TextAsset @@ -41478,8 +41298,8 @@ MonoBehaviour: Dependencies: [] Tags: - Name: main/plyaer.bundle - Hash: bbba633188707d96572ed1a4c0d88e63 - Size: 378832435 + Hash: 1f70b60ba723e3f184071aaf0a696ab9 + Size: 379451803 Assets: - Path: Assets/ResRaw/Prefabs/Line/fishing line float set.prefab Address: Plyaer/fishing line float set @@ -41511,53 +41331,8 @@ MonoBehaviour: - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} FilterEnum: 0 Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/FishingRopeLong.asset - Address: Plyaer/FishingRopeLong - Type: Missing - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/FishingRopeLong2.asset - Address: Plyaer/FishingRopeLong2 - Type: Missing - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset - Address: Plyaer/FishingRopeShort - Type: Missing - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/Float (4).prefab - Address: Plyaer/Float (4) + - Path: Assets/ResRaw/Prefabs/Line/LineHand1.prefab + Address: Plyaer/LineHand1 Type: GameObject Bundle: main/plyaer.bundle Tags: @@ -41586,36 +41361,6 @@ MonoBehaviour: - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} FilterEnum: 0 Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_4.asset - Address: Plyaer/RopeSegment_4 - Type: Missing - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - - Path: Assets/ResRaw/Prefabs/Line/Spool.mat - Address: Plyaer/Spool - Type: Material - Bundle: main/plyaer.bundle - Tags: - Group: - Name: Plyaer - Enable: 1 - BundleMode: 0 - AddressMode: 2 - Tags: - Collectors: - - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} - FilterEnum: 0 - Filter: '*' - Path: Assets/ResRaw/Prefabs/Player/Anim/AnimationClip/CameraCrouch.anim Address: Plyaer/CameraCrouch Type: AnimationClip diff --git a/Assets/ResRaw/Fgui/Common/Common_fui.bytes b/Assets/ResRaw/Fgui/Common/Common_fui.bytes index 506f93fe0..1bcb49ce0 100644 Binary files a/Assets/ResRaw/Fgui/Common/Common_fui.bytes and b/Assets/ResRaw/Fgui/Common/Common_fui.bytes differ diff --git a/Assets/ResRaw/Fgui/Main/Main_fui.bytes b/Assets/ResRaw/Fgui/Main/Main_fui.bytes index 1a8bcc5b7..7522bab0c 100644 Binary files a/Assets/ResRaw/Fgui/Main/Main_fui.bytes and b/Assets/ResRaw/Fgui/Main/Main_fui.bytes differ diff --git a/Assets/ResRaw/Prefabs/Player/Human_Male.prefab b/Assets/ResRaw/Prefabs/Player/Human_Male.prefab index f890a316d..1eee4fadb 100644 --- a/Assets/ResRaw/Prefabs/Player/Human_Male.prefab +++ b/Assets/ResRaw/Prefabs/Player/Human_Male.prefab @@ -1573,6 +1573,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3} insertIndex: -1 addedObject: {fileID: 408230832252209712} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3} + insertIndex: -1 + addedObject: {fileID: -8382053806685233489} - targetCorrespondingSourceObject: {fileID: -5151492872390713093, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3} insertIndex: -1 addedObject: {fileID: 8753856777003469895} @@ -2320,7 +2323,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animator: {fileID: 1327933454218635796} - capsule: {fileID: 0} useGravity: 1 ragdolling: 0 customizing: 0 @@ -2466,6 +2468,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::NBF.PlayerAnimator _Animator: {fileID: 0} +--- !u!114 &-8382053806685233489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127680710956633387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fe64f6594c24eef9fbaf147754871f8, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBF.PlayerDebug --- !u!4 &1133838163070727255 stripped Transform: m_CorrespondingSourceObject: {fileID: -8297027179297848275, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3} @@ -6015,6 +6029,7 @@ MonoBehaviour: - label: collider_brow position: {x: -0.09, y: -0.12, z: 0} mirror: 0 + colliderObjects: [] --- !u!1 &8441050652924648284 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8521822769418824486, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3} diff --git a/Assets/Scripts/Common/Assets/PlayerModelAsset.cs b/Assets/Scripts/Common/Assets/PlayerModelAsset.cs index 51be07e54..f6b9be3fd 100644 --- a/Assets/Scripts/Common/Assets/PlayerModelAsset.cs +++ b/Assets/Scripts/Common/Assets/PlayerModelAsset.cs @@ -1,4 +1,4 @@ -using System; +using System; using KINEMATION.MagicBlend.Runtime; using RootMotion.FinalIK; using UnityEngine; @@ -11,7 +11,7 @@ namespace NBF public PlayerIK IK { get; private set; } public PlayerAnimator PlayerAnimator { get; private set; } public MagicBlending MagicBlending { get; private set; } - + public PlayerDebug PlayerDebug { get; private set; } public Transform NeckTransform; public LookAtIK LookIk; @@ -43,6 +43,7 @@ namespace NBF MagicBlending = GetComponent(); IK = GetComponent(); PlayerAnimator = GetComponent(); + PlayerDebug = GetComponent(); } public void SetPlayer(Transform FppLook) diff --git a/Assets/Scripts/Fishing/New/Data/Player.cs b/Assets/Scripts/Fishing/New/Data/Player.cs index 670e284fa..ea7c12b25 100644 --- a/Assets/Scripts/Fishing/New/Data/Player.cs +++ b/Assets/Scripts/Fishing/New/Data/Player.cs @@ -70,6 +70,8 @@ namespace NBF /// public PlayerItem HandItem => Items.GetValueOrDefault(HandItemId); + public List TrajectoryPoints = new List(); + #region 初始化 public void InitPlayer(MapUnitInfo unitInfo) diff --git a/Assets/Scripts/Fishing/New/View/Player/Mono/PlayerDebug.cs b/Assets/Scripts/Fishing/New/View/Player/Mono/PlayerDebug.cs new file mode 100644 index 000000000..51f2cae50 --- /dev/null +++ b/Assets/Scripts/Fishing/New/View/Player/Mono/PlayerDebug.cs @@ -0,0 +1,26 @@ +using System; +using UnityEngine; + +namespace NBF +{ + public class PlayerDebug : PlayerMonoBehaviour + { + private void Update() + { + DrawLastTrajectory(); + } + + private void DrawLastTrajectory() + { + if (Player == null) return; + + + for (int i = 1; i < Player.TrajectoryPoints.Count; i++) + { + Debug.DrawLine(Player.TrajectoryPoints[i - 1], Player.TrajectoryPoints[i], Color.yellow); + } + + // Debug.DrawRay(Player.TrajectoryPoints[Player.TrajectoryPoints.Count], Vector3.up * 0.3f, Color.cyan); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/New/View/Player/Mono/PlayerDebug.cs.meta b/Assets/Scripts/Fishing/New/View/Player/Mono/PlayerDebug.cs.meta new file mode 100644 index 000000000..906fd4b37 --- /dev/null +++ b/Assets/Scripts/Fishing/New/View/Player/Mono/PlayerDebug.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0fe64f6594c24eef9fbaf147754871f8 +timeCreated: 1774445468 \ No newline at end of file diff --git a/Assets/Scripts/Fishing/New/View/Player/States/IPlayerThrowAnimation.cs b/Assets/Scripts/Fishing/New/View/Player/States/IPlayerThrowAnimation.cs index 8a4cd8df1..06a3a7ee7 100644 --- a/Assets/Scripts/Fishing/New/View/Player/States/IPlayerThrowAnimation.cs +++ b/Assets/Scripts/Fishing/New/View/Player/States/IPlayerThrowAnimation.cs @@ -4,6 +4,7 @@ namespace NBF { public interface IPlayerThrowAnimation { + Player Player { get; set; } bool IsPlaying { get; } void Play(ThrowAnimationRequest request); void Tick(float deltaTime); @@ -13,6 +14,7 @@ namespace NBF public struct ThrowAnimationRequest { public LureController Lure; + public Vector3 ThrowOriginPosition; public Vector3 StartPosition; public Vector3 Forward; public float ChargedProgress; diff --git a/Assets/Scripts/Fishing/New/View/Player/States/ParabolaPlayerThrowAnimation.cs b/Assets/Scripts/Fishing/New/View/Player/States/ParabolaPlayerThrowAnimation.cs index 546636ba8..1d0195944 100644 --- a/Assets/Scripts/Fishing/New/View/Player/States/ParabolaPlayerThrowAnimation.cs +++ b/Assets/Scripts/Fishing/New/View/Player/States/ParabolaPlayerThrowAnimation.cs @@ -4,10 +4,13 @@ namespace NBF { public class ParabolaPlayerThrowAnimation : IPlayerThrowAnimation { + public Player Player { get; set; } + private const int TrajectorySampleCount = 24; - private readonly float _minThrowDistance; - private readonly float _maxThrowDistance; + // + // private readonly float _minThrowDistance; + // private readonly float _maxThrowDistance; private readonly float _throwDuration; private readonly float _throwArcHeight; private readonly float _targetHeightOffset; @@ -24,15 +27,11 @@ namespace NBF public bool IsPlaying => _castingLure != null; public ParabolaPlayerThrowAnimation( - float minThrowDistance = 6f, - float maxThrowDistance = 25f, - float throwDuration = 0.65f, + float throwDuration = 0.45f, float throwArcHeight = 4f, float targetHeightOffset = 0f, AnimationCurve throwHeightCurve = null) { - _minThrowDistance = minThrowDistance; - _maxThrowDistance = maxThrowDistance; _throwDuration = throwDuration; _throwArcHeight = throwArcHeight; _targetHeightOffset = targetHeightOffset; @@ -55,15 +54,10 @@ namespace NBF var lureBody = request.Lure.RBody; _castStartPos = request.StartPosition; - Vector3 forward = request.Forward; - forward.y = 0f; - if (forward.sqrMagnitude < 0.001f) - { - forward = Vector3.forward; - } + Vector3 forward = GetHorizontalForward(request.Forward); - float distance = Mathf.Lerp(_minThrowDistance, _maxThrowDistance, _chargedProgress); - _castTargetPos = _castStartPos + forward.normalized * distance; + float distance = Mathf.Lerp(1, 8, _chargedProgress); + _castTargetPos = request.ThrowOriginPosition + forward * distance; _castTargetPos.y = _castStartPos.y + _targetHeightOffset; CacheTrajectoryPoints(); @@ -77,7 +71,6 @@ namespace NBF public void Tick(float deltaTime) { - DrawLastTrajectory(); UpdateCastAnimation(deltaTime); } @@ -131,6 +124,22 @@ namespace NBF } _hasLastTrajectory = true; + if (Player != null && Player.TrajectoryPoints != null) + { + Player.TrajectoryPoints.Clear(); + Player.TrajectoryPoints.AddRange(_lastTrajectoryPoints); + } + } + + private Vector3 GetHorizontalForward(Vector3 forward) + { + forward.y = 0f; + if (forward.sqrMagnitude < 0.001f) + { + return Vector3.forward; + } + + return forward.normalized; } private Vector3 EvaluateTrajectoryPosition(float progress) @@ -140,20 +149,5 @@ namespace NBF position.y += arc; return position; } - - private void DrawLastTrajectory() - { - if (!_hasLastTrajectory) - { - return; - } - - for (int i = 1; i <= TrajectorySampleCount; i++) - { - Debug.DrawLine(_lastTrajectoryPoints[i - 1], _lastTrajectoryPoints[i], Color.yellow); - } - - Debug.DrawRay(_lastTrajectoryPoints[TrajectorySampleCount], Vector3.up * 0.3f, Color.cyan); - } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Fishing/New/View/Player/States/PlayerStageViewThrow.cs b/Assets/Scripts/Fishing/New/View/Player/States/PlayerStageViewThrow.cs index 561ea6de8..a47e9c474 100644 --- a/Assets/Scripts/Fishing/New/View/Player/States/PlayerStageViewThrow.cs +++ b/Assets/Scripts/Fishing/New/View/Player/States/PlayerStageViewThrow.cs @@ -67,9 +67,11 @@ namespace NBF } _throwAnimation = CreateThrowAnimation(rod); + _throwAnimation.Player = Player; _throwAnimation?.Play(new ThrowAnimationRequest { Lure = rod.Line.Lure, + ThrowOriginPosition = PlayerView.Unity.transform.position, StartPosition = rod.Line.Lure.RBody.position, Forward = PlayerView.Unity.transform.forward, ChargedProgress = ChargedProgress diff --git a/Assets/Scripts/Init.cs b/Assets/Scripts/Init.cs index 3f07bafd9..3087bd94a 100644 --- a/Assets/Scripts/Init.cs +++ b/Assets/Scripts/Init.cs @@ -60,8 +60,8 @@ namespace NBF { // await Task.Delay(100); CommonTopPanel.Show(); - SettingPanel.Show(); - // LoginPanel.Show(); + // SettingPanel.Show(); + LoginPanel.Show(); // TestPanel.Show(); diff --git a/FGUIProject/assets/Common/Com/Back/UIBlurBackground2.xml b/FGUIProject/assets/Common/Com/Back/UIBlurBackground2.xml new file mode 100644 index 000000000..34bec50d9 --- /dev/null +++ b/FGUIProject/assets/Common/Com/Back/UIBlurBackground2.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/FGUIProject/assets/Common/Com/Tags/SubMenuLine.xml b/FGUIProject/assets/Common/Com/Tags/SubMenuLine.xml index 9522bc71a..4fe2b8876 100644 --- a/FGUIProject/assets/Common/Com/Tags/SubMenuLine.xml +++ b/FGUIProject/assets/Common/Com/Tags/SubMenuLine.xml @@ -1,7 +1,7 @@ - + diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml index 3aba6afb0..df757567b 100644 --- a/FGUIProject/assets/Common/package.xml +++ b/FGUIProject/assets/Common/package.xml @@ -423,6 +423,7 @@ + \ No newline at end of file diff --git a/FGUIProject/assets/Main/Settings/SettingPanel.xml b/FGUIProject/assets/Main/Settings/SettingPanel.xml index daa75f954..4190419f0 100644 --- a/FGUIProject/assets/Main/Settings/SettingPanel.xml +++ b/FGUIProject/assets/Main/Settings/SettingPanel.xml @@ -1,7 +1,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/Fishing2.sln.DotSettings.user b/Fishing2.sln.DotSettings.user index 21dc60b55..4a90ccf5f 100644 --- a/Fishing2.sln.DotSettings.user +++ b/Fishing2.sln.DotSettings.user @@ -48,6 +48,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded