Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by origin/master(远端) version
#	Excel2Json/Excel/Language.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -38562,7 +38562,7 @@
     },
     {
       "ID": 10381,
-      "txt": "0"
+      "txt": "圆满"
     },
     {
       "ID": 10382,

Assets/Res/UI/HeroInformainPanel/HerYuanManSuccessPanel.prefab

@@ -0,0 +1,287 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &6015582386914595975
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8212670971040085124}
+  - component: {fileID: 4635955364539374710}
+  - component: {fileID: 4794340547222225426}
+  - component: {fileID: 7717169312912944238}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8212670971040085124
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4635955364539374710
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_CullTransparentMesh: 1
+--- !u!114 &4794340547222225426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.84313726}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7717169312912944238
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4794340547222225426}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &7371325538380333896
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 543116040436373444}
+  - component: {fileID: 4747113537948573547}
+  - component: {fileID: 4779532759236090049}
+  - component: {fileID: 2381540517331302103}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: 'Text_NextJIngjie '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &543116040436373444
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  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: 170.4965, y: 901.433}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4747113537948573547
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_CullTransparentMesh: 1
+--- !u!114 &4779532759236090049
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.95294124, g: 0.81568635, b: 0.47450984, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 98
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 100
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5706\u6EE1\u6210\u529F"
+--- !u!114 &2381540517331302103
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &8994874510214016950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9037135992368401232}
+  - component: {fileID: 4159330424245520485}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: HerYuanManSuccessPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9037135992368401232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8212670971040085124}
+  - {fileID: 543116040436373444}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  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: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4159330424245520485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Btn_Close
+    gameObject: {fileID: 7717169312912944238}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: 'Text_NextJIngjie '
+    gameObject: {fileID: 4779532759236090049}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0

Assets/Res/UI/HeroInformainPanel/HerYuanManSuccessPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DShLsyuuAilrZzyfbk6zz3yL57R7SuYlIQ88+Ws3EQcs/UlMgh1dk5vCKyG/
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: herobreakthroughsuccesspanel
+  assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3892,4 +3892,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: ItemRooot
+    gameObject: {fileID: 6548218187850094264}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -758,6 +758,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
         public int TaoismSkillId;
 
+        public bool isYuanMan;
+
         public List<int> ImmortalBond = new List<int>();
     }
 

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

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using Fort23.Core;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "HerYuanManSuccessPanel"  )]
+	public partial class HerYuanManSuccessPanel : UIPanel
+	{
+		private void Init()
+		{
+
+		}
+		protected override void AddEvent()
+		{
+
+		}
+		protected override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+		
+		public async static CTask<HerYuanManSuccessPanel> OpenPanel()
+		{
+			HerYuanManSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HerYuanManSuccessPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
+			return heroBreakthroughSuccessPanel;
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/HeroInformationPanel/HerYuanManSuccessPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CHNOtyirBi6GqXtIPYQ0nC90xyjL/MnynCSInXe7COiO6Heh5IQox75tM/28
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,40 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class HerYuanManSuccessPanel 
+	{
+	  #region 自定义数据 
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  private Text _Text_NextJIngjie ;
+	  public Text Text_NextJIngjie 
+	   {
+	   get{
+	      if (_Text_NextJIngjie  == null)
+	       {
+	         _Text_NextJIngjie   = GetUIUnit<Text>("Text_NextJIngjie "); 
+	       }
+	      return _Text_NextJIngjie ;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/HeroInformationPanel/HerYuanManSuccessPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: B30X43+kBn+DwfrMFRxMWnJVYOsSkDlERrAirolrVZfJlv0iy2RQCxadv3ty
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -68,155 +68,139 @@ namespace Fort23.Mono
                     return;
                 }
 
-                if (heroPowerUpConfig.DujieLevelbattleID != -1 && !PlayerManager.Instance.myHero.heroData.isCombat)
+                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == nextHeroInfo.powerUpConfig.jingjie1 ||
+                    !PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
-                    TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("没有破除心魔");
-                    return;
-                }
+                    if (heroPowerUpConfig.DujieLevelbattleID != -1 && !PlayerManager.Instance.myHero.heroData.isCombat)
+                    {
+                        TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("没有破除心魔");
+                        return;
+                    }
 
-                for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
-                {
-                    bool isHave = false;
-                    for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
+                    for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
                     {
-                        if (breakthroughItemWidgets[i1].itemInfo != null &&
-                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i] ==
-                            breakthroughItemWidgets[i1].itemInfo.itemID)
+                        bool isHave = false;
+                        for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
                         {
-                            isHave = true;
+                            if (breakthroughItemWidgets[i1].itemInfo != null &&
+                                PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i] ==
+                                breakthroughItemWidgets[i1].itemInfo.itemID)
+                            {
+                                isHave = true;
+                            }
+                        }
+
+                        if (!isHave)
+                        {
+                            ItemConfig itemConfig =
+                                ConfigComponent.Instance.Get<ItemConfig>(PlayerManager.Instance.myHero.powerUpConfig
+                                    .DujieMustItemIDs[i]);
+                            string tips = "缺少" + LanguageManager.Instance.Text(itemConfig.itemName);
+                            TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel(tips);
+                            return;
                         }
                     }
 
-                    if (!isHave)
+                    //先验证必须道具够不够 够了成功后扣除
+                    for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
                     {
-                        ItemConfig itemConfig =
-                            ConfigComponent.Instance.Get<ItemConfig>(PlayerManager.Instance.myHero.powerUpConfig
-                                .DujieMustItemIDs[i]);
-                        string tips = "缺少" + LanguageManager.Instance.Text(itemConfig.itemName);
-                        TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel(tips);
-                        return;
+                        if (!PlayerManager.Instance.BagController.IsEnough(
+                                PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i],
+                                1))
+                        {
+                            TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                            return;
+                        }
                     }
-                }
 
-                //先验证必须道具够不够 够了成功后扣除
-                for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
-                {
-                    if (!PlayerManager.Instance.BagController.IsEnough(
-                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i],
-                            1))
+                    for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs.Length; i++)
                     {
-                        TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                        return;
+                        PlayerManager.Instance.BagController.DeductItem(
+                            PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1);
                     }
-                }
-                // 扣除道具
-                // foreach (var breakthroughItemWidget in breakthroughItemWidgets)
-                // {
-                //     if (breakthroughItemWidget.itemInfo != null)
-                //     {
-                //         if (!PlayerManager.Instance.BagController.IsEnough(breakthroughItemWidget.itemInfo.itemID, 1))
-                //         {
-                //             TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                //             return;
-                //         }
-                //     }
-                // }
-
-                // for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
-                // {
-                // foreach (var breakthroughItemWidget in breakthroughItemWidgets)
-                // {
-                //     if (breakthroughItemWidget.itemInfo != null && breakthroughItemWidget.itemInfo.itemID ==
-                //         PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i])
-                //     {
-                //         if (!PlayerManager.Instance.BagController.IsEnough(breakthroughItemWidget.itemInfo.itemID,
-                //                 1))
-                //         {
-                //             TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                //             return;
-                //         }
-                //     }
-                // }
-
-                // if (!PlayerManager.Instance.BagController.IsEnough(
-                //         PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
-                // {
-                //     TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                //     return;
-                // }
-                // }
-
-                for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs.Length; i++)
-                {
-                    PlayerManager.Instance.BagController.DeductItem(
-                        PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1);
-                }
 
-                HeroInformationPanel heroInformationPanel =
-                    UIManager.Instance.GetComponent<HeroInformationPanel>();
+                    HeroInformationPanel heroInformationPanel =
+                        UIManager.Instance.GetComponent<HeroInformationPanel>();
 
-                var list = GetBl();
+                    var list = GetBl();
 
 
-                int ramdomValue = Random.Range(1, 101);
-                int type1 = 2;
-                //突破成功
-                if (ramdomValue < list[0])
-                {
-                    bool isTuPoSuccess = true;
-                    if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
-                    {
-                        if (PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages != null &&
-                            PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages.Length > 1)
-                        {
-                            GObjectPoolInterface.SetActive(false);
-                            BackgroundPanel backgroundPanel = UIManager.Instance.GetComponent<BackgroundPanel>();
-                            backgroundPanel.GObjectPoolInterface.SetActive(false);
-
-                            type1 = 3;
-                            ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0],
-                                PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
-                            await heroInformationPanel.Dujie(ramdomValue);
-                            //渡劫失败
-                            if (ramdomValue >= PlayerManager.Instance.myHero.hp.Value)
-                            {
-                                isTuPoSuccess = false;
-                                RemoveHeroItem(list[1]);
-
-                                HeroBreakthroughFailPanel heroBreakthroughFailPanel =
-                                    await HeroBreakthroughFailPanel.OpenPanel(3, list[1]);
-                                await heroBreakthroughFailPanel.UIClosed();
-                                // TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("雷劫失败");
-                                // await tipMessage.UIClosed();
-                            }
-                        }
-                    }
-
-                    if (isTuPoSuccess)
+                    int ramdomValue = Random.Range(1, 101);
+                    int type1 = 2;
+                    //突破成功
+                    if (ramdomValue < list[0])
                     {
                         //渡劫成功扣除道具
-                        for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
+                        for (var i = 0;
+                             i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length;
+                             i++)
                         {
                             PlayerManager.Instance.BagController.DeductItem(
                                 PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1);
                         }
 
+                        if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
+                        {
+                            type1 = 4;
+                        }
+
                         AudioManager.Instance.PlayAudio("ui_tupo.wav");
                         await UpHero(type1);
                     }
+                    //失败
+                    else
+                    {
+                        RemoveHeroItem(list[1]);
+                        AudioManager.Instance.PlayAudio("ui_tuposhiba.wav");
+                        HeroBreakthroughFailPanel heroBreakthroughFailPanel =
+                            await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
+                        await heroBreakthroughFailPanel.UIClosed();
+                    }
+
+                    heroInformationPanel.RecoverDujie();
+                    UIManager.Instance.HideUIUIPanel(this);
                 }
-                //失败
                 else
                 {
-                    RemoveHeroItem(list[1]);
-                    AudioManager.Instance.PlayAudio("ui_tuposhiba.wav");
-                    HeroBreakthroughFailPanel heroBreakthroughFailPanel =
-                        await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
-                    await heroBreakthroughFailPanel.UIClosed();
-                }
+                    if (PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages != null &&
+                        PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages.Length > 1)
+                    {
+                        if (PlayerManager.Instance.myHero.hp.Value < heroPowerUpConfig.LeijieDamages[0])
+                        {
+                            TipMessagePanel.OpenTipMessagePanel("生命值不够！");
+                            return;
+                        }
 
-                heroInformationPanel.RecoverDujie();
-                UIManager.Instance.HideUIUIPanel(this);
+                        GObjectPoolInterface.SetActive(false);
+                        BackgroundPanel backgroundPanel = UIManager.Instance.GetComponent<BackgroundPanel>();
+                        backgroundPanel.GObjectPoolInterface.SetActive(false);
+                        HeroInformationPanel heroInformationPanel =
+                            UIManager.Instance.GetComponent<HeroInformationPanel>();
+
+                        int ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0],
+                            PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
+                        await heroInformationPanel.Dujie(ramdomValue);
+                        //渡劫失败
+                        if (ramdomValue >= PlayerManager.Instance.myHero.hp.Value)
+                        {
+                            AudioManager.Instance.PlayAudio("ui_tuposhiba.wav");
+                            RemoveHeroItem(100);
+
+                            HeroBreakthroughFailPanel heroBreakthroughFailPanel =
+                                await HeroBreakthroughFailPanel.OpenPanel(3, 100);
+                            await heroBreakthroughFailPanel.UIClosed();
+                        }
+                        else
+                        {
+                            AudioManager.Instance.PlayAudio("ui_tupo.wav");
+                            await UpHero(3);
+                        }
+
+
+                        heroInformationPanel.RecoverDujie();
+                        UIManager.Instance.HideUIUIPanel(this);
+                    }
+                }
             });
 
 
@@ -273,22 +257,39 @@ namespace Fort23.Mono
             {
                 heroAttributData =
                     HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
+                PlayerManager.Instance.myHero.Upgrade();
             }
             //大突破
             else if (type == 2)
             {
                 heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+                PlayerManager.Instance.myHero.Upgrade();
             }
             //渡劫
             else if (type == 3)
             {
                 heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+                PlayerManager.Instance.myHero.heroData.isYuanMan = false;
+            }
+            //圆满
+            else if (type == 4)
+            {
             }
 
-            PlayerManager.Instance.myHero.Upgrade();
-            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
-                await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
-            await heroBreakthroughSuccessPanel.UIClosed();
+
+            if (type != 4)
+            {
+                PlayerManager.Instance.myHero.Upgrade();
+                HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                    await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+                await heroBreakthroughSuccessPanel.UIClosed();
+            }
+            else
+            {
+                PlayerManager.Instance.myHero.heroData.isYuanMan = true;
+                HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
+                await herYuanManSuccessPanel.UIClosed();
+            }
         }
 
 
@@ -322,13 +323,26 @@ namespace Fort23.Mono
 
             if (heroPowerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
             {
-                Text_TitleName.text = "渡<size=94>劫</size>";
-                Text_Affirm.text = "逆天而行";
-                Text_AffirmTips.text = "是否确认渡劫";
+                if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+                {
+                    Text_TitleName.text = "渡<size=94>劫</size>";
+                    Text_Affirm.text = "逆天而行";
+                    Text_AffirmTips.text = "是否确认渡劫";
+                    Text_SucceedDesc.gameObject.SetActive(false);
+                }
+                else
+                {
+                    Text_TitleName.text = "圆<size=94>满</size>";
+                    Text_Affirm.text = "逆天而行";
+                    Text_AffirmTips.text = "是否确认圆满";
+                    Text_SucceedDesc.gameObject.SetActive(true);
+                }
+
 
                 if (heroPowerUpConfig.LeijieDamages != null && heroPowerUpConfig.LeijieDamages.Length > 1)
                 {
-                    LeiJieRooot.gameObject.SetActive(true);
+                    // if(PlayerManager.Instance.myHero.heroData.isYuanMan)
+                    LeiJieRooot.gameObject.SetActive(PlayerManager.Instance.myHero.heroData.isYuanMan);
                     Text_LeiJieHarm.text = $"{heroPowerUpConfig.LeijieDamages[0]}-{heroPowerUpConfig.LeijieDamages[1]}";
                     Text_HeroHp.text = PlayerManager.Instance.myHero.hp.Value.ToString();
 
@@ -352,10 +366,17 @@ namespace Fort23.Mono
                 Text_Affirm.text = "突破";
                 Text_TitleName.text = "突<size=94>破</size>";
                 LeiJieRooot.gameObject.SetActive(false);
+                Text_SucceedDesc.gameObject.SetActive(true);
             }
 
+            if (heroPowerUpConfig.jingjie1 == nextHeroInfo.powerUpConfig.jingjie1 ||
+                !PlayerManager.Instance.myHero.heroData.isYuanMan)
+            {
+            }
 
-            if (heroPowerUpConfig.DujieLevelbattleID != -1)
+            if (heroPowerUpConfig.DujieLevelbattleID != -1 &&
+                (heroPowerUpConfig.jingjie1 == nextHeroInfo.powerUpConfig.jingjie1 ||
+                 !PlayerManager.Instance.myHero.heroData.isYuanMan))
             {
                 CombatRoot.gameObject.SetActive(true);
                 if (PlayerManager.Instance.myHero.heroData.isCombat)
@@ -380,46 +401,54 @@ namespace Fort23.Mono
 
             Btn_Affirm.transform.RecoverColor();
 
-
-            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
-                   new CTaskAwaitBuffer<BreakthroughItemWidget>())
+            if (heroPowerUpConfig.jingjie1 == nextHeroInfo.powerUpConfig.jingjie1 ||
+                !PlayerManager.Instance.myHero.heroData.isYuanMan)
             {
-                for (int i = 0;
-                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
-                     i++)
+                ItemRooot.SetActive(true);
+                using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
+                       new CTaskAwaitBuffer<BreakthroughItemWidget>())
                 {
-                    cTaskAwaitBuffer.AddTask(
-                        UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
-                }
+                    for (int i = 0;
+                         i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                         i++)
+                    {
+                        cTaskAwaitBuffer.AddTask(
+                            UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
+                    }
 
-                breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
+                    breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
 
-                breakthroughItemWidgets[0].CustomInit(1, 0, false);
+                    breakthroughItemWidgets[0].CustomInit(1, 0, false);
 
 
-                //必选道具
-                for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
-                {
-                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
-                }
+                    //必选道具
+                    for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
+                    {
+                        breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
+                    }
 
-                //可选道具
-                for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
-                {
-                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
-                        .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
-                }
+                    //可选道具
+                    for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
+                    {
+                        breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
+                            .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
+                    }
 
-                for (var i = 0; i < breakthroughItemWidgets.Count; i++)
-                {
-                    breakthroughItemWidgets[i].transform.anchoredPosition =
-                        new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
-                }
+                    for (var i = 0; i < breakthroughItemWidgets.Count; i++)
+                    {
+                        breakthroughItemWidgets[i].transform.anchoredPosition =
+                            new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
+                    }
 
-                Content.sizeDelta =
-                    new Vector2(
-                        (breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count,
-                        200);
+                    Content.sizeDelta =
+                        new Vector2(
+                            (breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count,
+                            200);
+                }
+            }
+            else
+            {
+                ItemRooot.SetActive(false);
             }
         }
 
@@ -427,40 +456,48 @@ namespace Fort23.Mono
         {
             bool isCan = true;
 
-            if (heroPowerUpConfig.DujieLevelbattleID != -1 && !hero.heroData.isCombat)
+            int failXw = 0;
+            float failbl = 0;
+            int successBl = 0;
+            if (!PlayerManager.Instance.myHero.heroData.isYuanMan)
             {
-                isCan = false;
-            }
+                if (heroPowerUpConfig.DujieLevelbattleID != -1 && !hero.heroData.isCombat)
+                {
+                    isCan = false;
+                }
 
-            for (var i = 0; i < hero.powerUpConfig.DujieMustItemIDs.Length; i++)
-            {
-                bool isHave = false;
-                for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
+                for (var i = 0; i < hero.powerUpConfig.DujieMustItemIDs.Length; i++)
                 {
-                    if (breakthroughItemWidgets[i1].itemInfo != null && hero.powerUpConfig.DujieMustItemIDs[i] ==
-                        breakthroughItemWidgets[i1].itemInfo.itemID)
+                    bool isHave = false;
+                    for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
                     {
-                        isHave = true;
+                        if (breakthroughItemWidgets[i1].itemInfo != null && hero.powerUpConfig.DujieMustItemIDs[i] ==
+                            breakthroughItemWidgets[i1].itemInfo.itemID)
+                        {
+                            isHave = true;
+                        }
                     }
-                }
 
-                if (!isHave)
-                {
-                    isCan = false;
-                    break;
+                    if (!isHave)
+                    {
+                        isCan = false;
+                        break;
+                    }
                 }
-            }
 
-            int failXw = 0;
-            float failbl = 0;
-            int successBl = 0;
 
-            var list = GetBl();
+                var list = GetBl();
+
+                failbl = list[1] == 0
+                    ? hero.powerUpConfig.FailureExpReduce
+                    : (float)(hero.powerUpConfig.FailureExpReduce * list[1] * 0.01f);
+                successBl = list[0];
+            }
+            // else
+            // {
+            //     isCan 
+            // }
 
-            failbl = list[1] == 0
-                ? hero.powerUpConfig.FailureExpReduce
-                : (float)(hero.powerUpConfig.FailureExpReduce * list[1] * 0.01f);
-            successBl = list[0];
 
             if (isCan)
             {
@@ -471,7 +508,14 @@ namespace Fort23.Mono
 
                 if (hero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
                 {
-                    Text_AffirmTips.text = "是否确认渡劫";
+                    if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+                    {
+                        Text_AffirmTips.text = "是否确认渡劫";
+                    }
+                    else
+                    {
+                        Text_AffirmTips.text = "是否确认圆满";
+                    }
                 }
                 else
                 {

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

@@ -217,6 +217,17 @@ namespace Fort23.Mono
 	      return _Text_Combat;
 	     }
 	   }
+	  private GameObject _ItemRooot;
+	  public GameObject ItemRooot
+	   {
+	   get{
+	      if (_ItemRooot == null)
+	       {
+	         _ItemRooot  = GetUIUnit<GameObject>("ItemRooot"); 
+	       }
+	      return _ItemRooot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -262,8 +262,17 @@ namespace Fort23.Mono
             // heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             // heroAttributeWidget.CustomInit("生命", PlayerManager.Instance.myHero.hp.Value.ToString(), (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToString());
             // HeroAttributeWidgets.Add(heroAttributeWidget);
-            Text_Jingjie1.text =
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]);
+            if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+            {
+                Text_Jingjie1.text =
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +  LanguageManager.Instance.Text(10381);
+            }
+            else
+            {
+                Text_Jingjie1.text =
+                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]);
+            }
+           
             string jingjie =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
@@ -318,13 +327,28 @@ namespace Fort23.Mono
             Text_exp.text =
                 $"{(int)PlayerManager.Instance.myHero.exp.Value + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
-            if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
+            if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
+                PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
             {
                 Text_TuPo.text = LanguageManager.Instance.Text(10228);
             }
+            else if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
+                     PlayerManager.Instance.myHero.powerUpConfig.jingjie2 != heroInfo.powerUpConfig.jingjie2)
+            {
+                Text_TuPo.text = "破镜";
+            }
+
             else
             {
-                Text_TuPo.text = LanguageManager.Instance.Text(10229);
+                if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+                {
+                    Text_TuPo.text = LanguageManager.Instance.Text(10229);
+                  
+                }
+                else
+                {
+                    Text_TuPo.text = LanguageManager.Instance.Text(10228);
+                }
             }
         }