From e19070a9638c43aaebbcf626b460bfabb7438f8e Mon Sep 17 00:00:00 2001 From: BobSong <605277374@qq.com> Date: Wed, 25 Mar 2026 22:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=9B=E7=AB=BF=E8=BF=90=E5=8A=A8=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/AssetCaches.asset | 267 +----------------- Assets/ResRaw/Fgui/Common/Common_fui.bytes | Bin 54972 -> 55181 bytes Assets/ResRaw/Fgui/Main/Main_fui.bytes | Bin 30780 -> 30789 bytes .../ResRaw/Prefabs/Player/Human_Male.prefab | 17 +- .../Scripts/Common/Assets/PlayerModelAsset.cs | 5 +- Assets/Scripts/Fishing/New/Data/Player.cs | 2 + .../New/View/Player/Mono/PlayerDebug.cs | 26 ++ .../New/View/Player/Mono/PlayerDebug.cs.meta | 3 + .../Player/States/IPlayerThrowAnimation.cs | 2 + .../States/ParabolaPlayerThrowAnimation.cs | 58 ++-- .../Player/States/PlayerStageViewThrow.cs | 2 + Assets/Scripts/Init.cs | 4 +- .../Common/Com/Back/UIBlurBackground2.xml | 6 + .../assets/Common/Com/Tags/SubMenuLine.xml | 2 +- FGUIProject/assets/Common/package.xml | 1 + .../assets/Main/Settings/SettingPanel.xml | 4 +- Fishing2.sln.DotSettings.user | 1 + 17 files changed, 99 insertions(+), 301 deletions(-) create mode 100644 Assets/Scripts/Fishing/New/View/Player/Mono/PlayerDebug.cs create mode 100644 Assets/Scripts/Fishing/New/View/Player/Mono/PlayerDebug.cs.meta create mode 100644 FGUIProject/assets/Common/Com/Back/UIBlurBackground2.xml 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 506f93fe061491c394be1812e8cbd0a3e379e530..1bcb49ce066bf58626361a90167ae9e268a672b4 100644 GIT binary patch delta 10678 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 n+Rvz6It`&QzhvID0nN2X%47cr9t)p7 delta 10655 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 TZE*jQoszqZSh;5CE6x4`)el^S delta 2893 zcmZ`*33yc16+VCNOy0x*31pijlR)-_kdOc&B!sMh*=Hss877m20J2%BqAe`~0<9IK z0>ZHrER?NQi-0U*Wsy~oRTdQi*#e4)0s$9Lko3F(0&V5Z_vX9ro^#JV_ul{f|J~7q zjZIkjf>~QkL@Vemo@h_yO=drBrF^fV)qK>PVOm4Oh`i}-4i1i0Yv~=%53a_)d2Vn4 z416*;A^cr&&euS`ltvlUld>qE^1Y~4^KEKF>m+6Xw+?U3BV)rj1)6EQqV=?aHuBRU zrFf4whs3K*ROp^MG}KSqEYY^mR!$48@!duS+D`8isf9$iMU3!ZiDTj|;;0*U&`v%c zT4Vfxc1geti%adMJ$xk~a8?%!|7_Rzpv6zyD-rk6e!gg_#D|;{wp2SHsU4(4+!WSd z9j1@CBz(B~n7r86e+fI=2dPi!2tU(46Q6Q}(VxA|p27!~3{<{AUt3 zhG&|?d8JX~ksT~J!BabwsFUO^k=F7I|8~3}A}sJ!^X)r7@h8IpMW^YE1UeisP-~>K zbdEmf%*ZhH1)b-b$kpmgy1+hB8}JqHjjF&!o{=5oL0@xvbVbNFRO#O5UX(`#60A2> z8uZX~i8~c0a#NClhZOp-VW6LOS$1a%UE#}x2^<|0h9=G_s>fAc6l2w{$%t?1JH8&% z$6IfopzmdiJMhhzWG)X0;44Lbrk@mDqaP&A*J7PZ9kcXm(2qljVB`%_izA zlU=79923{Y*w|~|zWvnvOS>~o;)uh%~PYul$>(jq=k9F#LpF& zl@}i2wjCYt=2gni7p-JSYqXJU=MZ@`@S#p2az-Xk_%z>!FW(GG^rB-5ZP5;Xe4(QY z{@gn;U6LG^7=-}d+CI!wr4Wc9n0ZH{Lq`yT1wm1rY$^nyJi1ec@;-lFw)z6(lgyfZ!T4U^lBqZ}osjmA@>3VHT;+>`7Vt89@3MyPUF zd3q095s@#f4hFnQ7JP1Zedb!1kWyXyAoCquf0MF^Km_&tMMDiqakv{~;L41zA?DhxiY} zaGskrPL06hZ0Wm_u@1L&vHg?AMdf!9*6PrzlO{5I^#Jv z=XK8W^U*C6Fj1AR#h-ahzFob9X}mwbPEE%QPAahBWp@S7#4Mg$-~jVgspnTji(2*Wul|DB zJgm0^e`WYuG-IT~9L(jjy$46!WlmW(nH9(+3KfV~rP>7%e-lK^dnl*cJuv@1soKNv z_q*uR_pyws1bZ$oERc*BVi6yDv<5o6xEu zmZfBCId@$Jipb`sV7!TCY%R5_ffR!Dt@BbpDy+mR;q#cX`?52wEKIGI zb4PgqZ!61EZwqixJ|Am&L3u6S;ala&&^XZ=C3YCSgaCaV)0IpvWc z4-xTHTec+nlr0LIgyPNE%*$8@F{$EcZV%TeHq{Lz`APn1FrM> zx}xwK61=V@RiRs|rn)mX2ZX7gW%a`c%=d15 z@{KLcGPs$}v2R1FfHA*8SLkOO5^>v&v9-Lp!DT?REH8XueK*o~!$U3(LIL{gRt!%H zq-pwh%QI10`Wr|udl0W27!)iY`U8XfO}zUC(ko&;bI0noh~WY29I^Ti3V_F&*g>(); 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