剧情对话

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryController.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             }
             else
             {
-                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, null, true);
+                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW), true);
             }
             if (_curLvfirstPass)
             {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -4,6 +4,8 @@ using UI.Main;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using static Codice.CM.WorkspaceServer.WorkspaceTreeDataStore;
+
 namespace GFGGame
 {
     public delegate void OnCompleteStoryDialogCall(bool isSkip, object param);
@@ -97,10 +99,12 @@ namespace GFGGame
             {
                 _onCompleteStoryDialogCallParam = datas[3];
             }
-            if(LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
-            {
-                skipable = true;
-            }
+            //if(LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+            //{
+
+            //}
+            //临时设置都可以跳过对话
+            skipable = true;
             _ui.m_btnSkip.enabled = skipable;
             ShowNextStep(stroyStartID);
         }
@@ -254,6 +258,7 @@ namespace GFGGame
             PlayEffect(storyDialogCfg.effectInfoArr);
             PlayShake(storyDialogCfg.shakeInfoArr);
             string content = storyDialogCfg.content;
+            content = storyDialogCfg.content.Replace("self", RoleDataManager.roleName);
             if(content.IndexOf("//") >= 0)
             {
                 showList(content);
@@ -290,7 +295,8 @@ namespace GFGGame
         {
             _ui.m_btnAutoPlay.enabled = true;
             _ui.m_list.visible = false;
-            string words = storyDialogCfg.content;
+            var content = storyDialogCfg.content.Replace("self", RoleDataManager.roleName);
+            string words = content;
             string roleName = storyDialogCfg.name;
             string headRes = storyDialogCfg.head;
             if (roleName == "self")