修改bug

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -179,6 +179,7 @@ namespace Fort23.Mono
                 DialgueType3.gameObject.SetActive(false);
                 showText = message;
                 shownextIcon = nextIcon;
+                messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             }
             else if (eventConditionConfig.DialogueType == 2)
             {
@@ -187,6 +188,7 @@ namespace Fort23.Mono
                 DialgueType2.gameObject.SetActive(true);
                 showText = message2;
                 shownextIcon = nextIcon2;
+                messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             }
             else if (eventConditionConfig.DialogueType == 3)
             {
@@ -195,6 +197,7 @@ namespace Fort23.Mono
                 DialgueType3.gameObject.SetActive(true);
                 showText = message3;
                 shownextIcon = nextIcon3;
+                messageShowType = ShowDialogueEventData.MessageShowType.Default;
             }
 
             if (eventConditionConfig.NPCID == 100)

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -427,7 +427,6 @@ namespace Fort23.Mono
 
         private void ShengShiOnClick(IEventData e)
         {
-            Debug.Log("click sheng shi");
             Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
             ChagneShenshiBtnActive();
             CreatShengShiEvent();

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs

@@ -86,7 +86,7 @@ namespace Fort23.Mono
 
         public void UpdateXian()
         {
-            if (lastSentimentWidget.sentimentProperty.level >= sentimentEffectConfig.unlockLevel)
+            if (lastSentimentWidget == null || lastSentimentWidget.sentimentProperty.level >= sentimentEffectConfig.unlockLevel )
             {
                 foreach (var sentimentXianWidget in _sentimentXianWidgets)
                 {

Assets/Scripts/GameUI/UI/TowerPanel/TowerPanel.cs

@@ -27,12 +27,14 @@ namespace Fort23.Mono
             isAddStack = true;
             // IsShowAppBar = false;
         }
+
         public override CTask GetFocus()
         {
             TitlePanel.ClosePanel();
             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
+
         protected override void AddEvent()
         {
         }
@@ -45,35 +47,45 @@ namespace Fort23.Mono
         {
             Btn_Start.onClick.AddListener(async () =>
             {
-                if ((currentLevelWidget.lastTowerLevelData == null ||
-                     !currentLevelWidget.lastTowerLevelData.finish) &&
-                    currentLevelWidget._towerInfoConfig.ID != 1)
+                TowerInfoConfig towerInfoConfig = ConfigComponent.Instance.Get<TowerInfoConfig>(ulockId);
+                if (towerInfoConfig.ID == 0)
+                    return;
+
+                var currentTowerLevelData = _towerData.towerLevelDatas.FirstOrDefault(t => t.id == ulockId);
+
+                var lastTowerLevelData = _towerData.towerLevelDatas.FirstOrDefault(t => t.id == ulockId - 1);
+
+
+                if ((lastTowerLevelData == null ||
+                     !lastTowerLevelData.finish) &&
+                    ulockId != 1)
                 {
                     TipMessagePanel.OpenTipMessagePanel("上一关还没有解锁！");
                     return;
                 }
 
 
-                if (currentLevelWidget.towerLevelData == null)
+                if (currentTowerLevelData == null)
                 {
                     AccountFileInfo.TowerLevelData towerLevelData = new AccountFileInfo.TowerLevelData();
-                    towerLevelData.id = currentLevelWidget._towerInfoConfig.ID;
+                    towerLevelData.id = towerInfoConfig.ID;
                     _towerData.towerLevelDatas.Add(towerLevelData);
-                    currentLevelWidget.towerLevelData = towerLevelData;
+                    // currentLevelWidget.towerLevelData = towerLevelData;
                     AccountFileInfo.Instance.SavePlayerData();
                 }
 
-                CombatDrive.Instance.LoadLevelBattleCombat(currentLevelWidget._towerInfoConfig.typeValue[0], true,-1,
+                CombatDrive.Instance.LoadLevelBattleCombat(towerInfoConfig.typeValue[0], true, -1,
                     delegate(bool isWin)
                     {
                         LogTool.Log("战斗完成" + isWin);
                         if (isWin)
                         {
-                            currentLevelWidget.towerLevelData.finish = true;
+                            currentTowerLevelData.finish = true;
                             AccountFileInfo.Instance.SavePlayerData();
 
                             CustomInit();
                         }
+
                         CombatController.currActiveCombat.ChangeState(CombatController.update);
                     });
             });
@@ -132,7 +144,8 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel(int id)
         {
-            TowerPanel towerPanel = await UIManager.Instance.LoadAndOpenPanel<TowerPanel>(null, uiData: new object[] { id });
+            TowerPanel towerPanel =
+                await UIManager.Instance.LoadAndOpenPanel<TowerPanel>(null, uiData: new object[] { id });
         }
 
         public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)