改名引导修改

ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs

@@ -104,7 +104,7 @@ public partial class UIManager
         _WindowMeta(UINameConst.UI_GuideTip, UIWindowLayer.Guide);
         _WindowMeta(UINameConst.UI_ChoosePerson, UIWindowLayer.Normal, UIOpenType.FullScreen);
         _WindowMeta(UINameConst.UI_WriteName, UIWindowLayer.Normal, UIOpenType.FullScreen);
-        _WindowMeta(UINameConst.UI_NameConfirmWindow, UIWindowLayer.Normal);
+        _WindowMeta(UINameConst.UI_NameConfirmWindow, UIWindowLayer.Normal, UIOpenType.FullScreen);
     }
 
 

ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs

@@ -40,10 +40,6 @@ namespace Gameplay.Guide
         /// </summary>
         public bool IsChangeName = true;
         /// <summary>
-        /// 是否跳过剧情
-        /// </summary>
-        public bool IsSkipStory = false;
-        /// <summary>
         /// 指定地板索引
         /// </summary>
         public int FloorIndex = -1;

ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Story/UIStoryMainController.cs

@@ -305,7 +305,8 @@ public class UIStoryMainController : UIWindow
 	{
 		if (GuideManager.Instance.IsGuiding && !GuideManager.Instance.IsChangeName)
 		{
-			GuideManager.Instance.IsSkipStory = true;
+			StoryManager.instance.timelineManager.ForceToTime(30.24233f);
+
 			EventManager.Instance.Send(EventManager.EventName.STORY_OPEN_NAME_PANEL);
 		}
 		else

ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_WriteNameController.cs

@@ -78,17 +78,22 @@ public class UI_WriteNameController : UIWindow
     /// <param name="name"></param>
     private void SetName(string name)
     {
-        NetHelper.SetPlayerName(name);
-
-        OnClose();
+        try
+        {
+            NetHelper.SetPlayerName(name);
+        }
+        catch (Exception e)
+        {
+            DebugUtil.LogError(e);
+        }
 
         if (GuideManager.Instance.IsGuiding)
         {
-            if(GuideManager.Instance.IsSkipStory)
-                EventManager.Instance.Send(EventManager.EventName.STORY_CLICK_SKIP);
-            else if (GameStateManager.Instance.GetCurState() is GameStateStory gameStateStory)
+            if (GameStateManager.Instance.GetCurState() is GameStateStory gameStateStory)
                 gameStateStory.IsReady = true;
         }
+
+        OnClose();
     }
 
     #region 回调方法