修改bug

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3371,7 +3371,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 210, y: 43.2862}
+  m_SizeDelta: {x: 0, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Scenes/testCombat.scene

@@ -2317,7 +2317,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanel.cs

@@ -19,6 +19,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
         public void CustomInit(int type, int xw)
@@ -40,7 +41,7 @@ namespace Fort23.Mono
         public static async CTask<HeroBreakthroughFailPanel> OpenPanel(int type, int xw)
         {
             HeroBreakthroughFailPanel heroBreakthroughFailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughFailPanel>(null, UILayer.Top);
-            heroBreakthroughFailPanel.CustomInit(type,xw);
+            heroBreakthroughFailPanel.CustomInit(type, xw);
             return heroBreakthroughFailPanel;
         }
     }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -4,6 +4,7 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat;
+using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
 using UnityEngine;
 using UnityEngine.UI;
@@ -175,6 +176,8 @@ namespace Fort23.Mono
                             RefenceSuccessProbability(PlayerManager.Instance.myHero);
                             // UIManager.Instance.ShowLastHindAllShowPanel();
                         }
+
+                        CombatController.ChangeState(CombatController.update);
                     });
             });
         }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -130,29 +130,50 @@ namespace Fort23.Mono
                         xianTuLogInfoData.id = eventConfig.ID;
                         xianTuLogInfoData.message = LanguageManager.Instance.Text(eventConfig.EventName);
                         showXianTuLogInfoData.Add(xianTuLogInfoData);
-                        foreach (var eventListSelectEventLinkId in eventList.selectEventLinkIds)
+                        for (var i = 0; i < eventList.selectEventLinkIds.Count; i++)
                         {
-                            EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventListSelectEventLinkId);
+                            EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.selectEventLinkIds[i]);
                             if (eventLinkConfig.LanID != null)
                             {
-                                foreach (var i in eventLinkConfig.LanID)
+                                for (var i1 = 0; i1 < eventLinkConfig.LanID.Length; i1++)
                                 {
                                     XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
                                     xianTuLogInfoData1.type = 3;
                                     xianTuLogInfoData1.id = eventConfig.ID;
                                     if (eventLinkConfig.NPCID != 0)
                                     {
-                                        xianTuLogInfoData1.message = $"<color=#A6A6A6>{LanguageManager.Instance.Text(i)}</color>";
+                                        xianTuLogInfoData1.message = $"<color=#A6A6A6>{LanguageManager.Instance.Text(eventLinkConfig.LanID[i1])}</color>";
                                     }
                                     else
                                     {
-                                        xianTuLogInfoData1.message = $"<color=#867169>{LanguageManager.Instance.Text(i)}</color>";
+                                        xianTuLogInfoData1.message = $"<color=#867169>{LanguageManager.Instance.Text(eventLinkConfig.LanID[i1])}</color>";
                                     }
 
 
                                     showXianTuLogInfoData.Add(xianTuLogInfoData1);
                                 }
                             }
+
+                            //选项文本
+                            if (eventLinkConfig.optionType == 1 && eventList.selectEventLinkIds.Count > i+1)
+                            {
+                                XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
+                                xianTuLogInfoData1.type = 3;
+                                xianTuLogInfoData1.id = eventConfig.ID;
+                                int index = eventLinkConfig.optionPara1.ToList().IndexOf(eventList.selectEventLinkIds[i+1]);
+                                if (eventLinkConfig.NPCID != 0)
+                                {
+                                    xianTuLogInfoData1.message = $"<color=#A6A6A6>选项：{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
+                                }
+                                else
+                                {
+                                    xianTuLogInfoData1.message = $"<color=#867169>选项：{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
+                                }
+                                
+                                showXianTuLogInfoData.Add(xianTuLogInfoData1);
+                            }
+                            
+                         
                         }
                     }
                 }