修改圆满一些描述

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -1884,6 +1884,7 @@ GameObject:
   - component: {fileID: 1432492683080054976}
   - component: {fileID: 2472998038259793952}
   - component: {fileID: 1921261895973411118}
+  - component: {fileID: 2735578299729744977}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Jingjie1
@@ -1903,13 +1904,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 3204115114962956502}
   m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -69.6}
-  m_SizeDelta: {x: 466.74, y: 103.5555}
+  m_SizeDelta: {x: 0, y: 103.5555}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1432492683080054976
 CanvasRenderer:
@@ -1968,6 +1970,20 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1.18, y: -2.87}
   m_UseGraphicAlpha: 1
+--- !u!114 &2735578299729744977
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3042626415887802354}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &3144742665046833747
 GameObject:
   m_ObjectHideFlags: 0
@@ -3045,7 +3061,6 @@ RectTransform:
   - {fileID: 3296466721338208283}
   - {fileID: 7447784581765122494}
   - {fileID: 8034867944299354957}
-  - {fileID: 3204115114962956502}
   - {fileID: 3039944541514686334}
   - {fileID: 4451187143981537632}
   - {fileID: 5496005517712940668}
@@ -5253,13 +5268,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2520275275624947179}
-  m_Father: {fileID: 2859865283014944201}
+  m_Father: {fileID: 7058732367293901820}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 136.1, y: -124.20001}
-  m_SizeDelta: {x: 35.2913, y: 35.291016}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 46, y: 0}
+  m_SizeDelta: {x: 35.291306, y: 35.291016}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &7653968165541700447
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -5354,7 +5369,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

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

@@ -321,8 +321,6 @@ namespace Fort23.Mono
                                         LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
                                         LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
 
-          
-
 
             if (heroPowerUpConfig.DujieLevelbattleID != -1)
             {
@@ -337,7 +335,7 @@ namespace Fort23.Mono
                 Text_CombatTitle.text =
                     $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
             }
-      
+
 
             if (heroPowerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
             {
@@ -347,17 +345,26 @@ namespace Fort23.Mono
                     Text_Affirm.text = LanguageManager.Instance.Text(10432);
                     Text_AffirmTips.text = LanguageManager.Instance.Text(10433);
                     Text_SucceedDesc.gameObject.SetActive(false);
+
+                    Text_CurrrentJIngjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
+                                                LanguageManager.Instance.Text(10429) +
+                                                LanguageManager.Instance.Text(10381);
+
                     Text_NextJinfjie.text = LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[0]) +
                                             LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[1]) +
                                             LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[2]);
                 }
                 else
                 {
-                    
-                    Text_NextJinfjie.text = LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[0]) +
+                    Text_CurrrentJIngjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
+                                                LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
+                                                LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
+
+
+                    Text_NextJinfjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
                                             LanguageManager.Instance.Text(10429) +
                                             LanguageManager.Instance.Text(10381);
-                    
+
                     Text_TitleName.text = LanguageManager.Instance.Text(10430);
                     Text_Affirm.text = LanguageManager.Instance.Text(10263);
                     Text_AffirmTips.text = LanguageManager.Instance.Text(10434);
@@ -388,6 +395,10 @@ namespace Fort23.Mono
             }
             else
             {
+                Text_CurrrentJIngjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
+                                            LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
+                                            LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
+
                 Text_NextJinfjie.text = LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[0]) +
                                         LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[1]) +
                                         LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[2]);
@@ -456,13 +467,13 @@ namespace Fort23.Mono
                     //必选道具
                     for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
                     {
-                        breakthroughItemWidgets[i ].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
+                        breakthroughItemWidgets[i].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
                     }
 
                     //可选道具
                     for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
                     {
-                        breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length ]
+                        breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length]
                             .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
                     }
 
@@ -560,8 +571,9 @@ namespace Fort23.Mono
                 string tips = "需要";
                 if (heroPowerUpConfig.DujieLevelbattleID != -1 && !hero.heroData.isCombat)
                 {
-                    tips +=  " 破除心魔";
+                    tips += " 破除心魔";
                 }
+
                 foreach (var dujieMustItemID in hero.powerUpConfig.DujieMustItemIDs)
                 {
                     ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dujieMustItemID);
@@ -599,7 +611,7 @@ namespace Fort23.Mono
             {
                 succesAllBl += heroPowerUpConfig.DujieRateviaBattle;
             }
-          
+
 
             foreach (var breakthroughItemWidget in breakthroughItemWidgets)
             {