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

Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -213,6 +213,85 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u73A9\u5BB6\u540D\u5B57abc"
+--- !u!1 &2101627383138380086
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2107881186586094397}
+  - component: {fileID: 6810255387448364759}
+  - component: {fileID: 7001003909149159411}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2107881186586094397
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101627383138380086}
+  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: 6621496081363742987}
+  m_Father: {fileID: 9196989220798282629}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &6810255387448364759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101627383138380086}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 17.08
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &7001003909149159411
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101627383138380086}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &2181361454889025035
 GameObject:
   m_ObjectHideFlags: 0
@@ -465,6 +544,205 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &3353139664593309628
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9196989220798282629}
+  - component: {fileID: 2293165026425466776}
+  - component: {fileID: 8545604472448881592}
+  - component: {fileID: 3692671169387541901}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9196989220798282629
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3353139664593309628}
+  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: 2107881186586094397}
+  m_Father: {fileID: 600135753646096457}
+  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: -17}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &2293165026425466776
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3353139664593309628}
+  m_CullTransparentMesh: 1
+--- !u!114 &8545604472448881592
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3353139664593309628}
+  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: 1, g: 1, b: 1, a: 1}
+  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: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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 &3692671169387541901
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3353139664593309628}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &3613677709189601665
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 600135753646096457}
+  - component: {fileID: 5608414052690259127}
+  - component: {fileID: 7743823936933894136}
+  - component: {fileID: 8149853243948555800}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &600135753646096457
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3613677709189601665}
+  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: 9196989220798282629}
+  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: 7.4873, y: 126.1155}
+  m_SizeDelta: {x: 664.9747, y: 873.769}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5608414052690259127
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3613677709189601665}
+  m_CullTransparentMesh: 1
+--- !u!114 &7743823936933894136
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3613677709189601665}
+  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: 1, g: 1, b: 1, a: 0}
+  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: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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 &8149853243948555800
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3613677709189601665}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 2107881186586094397}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 9196989220798282629}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3920575755887200971
 GameObject:
   m_ObjectHideFlags: 0
@@ -661,7 +939,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8980393, g: 0.9294118, b: 0.9490197, a: 1}
+  m_Color: {r: 0.9106727, g: 0.9490196, b: 0.8980392, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -893,6 +1171,7 @@ RectTransform:
   - {fileID: 6686121261652367940}
   - {fileID: 2816985101069546935}
   - {fileID: 620873362179252296}
+  - {fileID: 600135753646096457}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -933,4 +1212,141 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Content
+    gameObject: {fileID: 2107881186586094397}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: HeroAttributeWidgetGam
+    gameObject: {fileID: 2355528429671428504}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
+--- !u!1001 &7912834985569492392
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2107881186586094397}
+    m_Modifications:
+    - target: {fileID: 2854060935180710084, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_Color.b
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2854060935180710084, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_Color.g
+      value: 0.64280605
+      objectReference: {fileID: 0}
+    - target: {fileID: 2854060935180710084, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 642.9692
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31.4433
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 321.4846
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -15.72165
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5575612326490483760, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_Name
+      value: HeroAttributeWidgetGam
+      objectReference: {fileID: 0}
+    - target: {fileID: 5575612326490483760, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5850466370090942673, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 150.0857
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+--- !u!1 &2355528429671428504 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5575612326490483760, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+  m_PrefabInstance: {fileID: 7912834985569492392}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &6621496081363742987 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3905833519111515299, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+  m_PrefabInstance: {fileID: 7912834985569492392}
+  m_PrefabAsset: {fileID: 0}

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -251,6 +251,16 @@ namespace GameLogic.Combat.CombatTool
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkill, CombatUseSkillEventData);
         }
 
+        public void CombatFinishDispose()
+        {
+            for (int i = 0; i < enemyHero.Count; i++)
+            {
+                enemyHero[i].Dispose();
+            }
+            enemyHero.Clear();
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkill, CombatUseSkillEventData);
+        }
+
         public Vector3 GetFollowPos(CombatHeroEntity combatHeroEntity)
         {
             int index = combatHeroEntity.number - followTarget.number;

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -241,8 +241,10 @@ public class CombatHeroInfo
     protected void CalBasicAttribute()
     {
         _AttributeCacheValue.Clear();
+        modelID=modelConfig.ID;
         if (isMonster)
         {
+           
             unLockSkills.Clear();
             hp = (EncryptionLong)(modelConfig.hp * MonsterPowerUpConfig.HPFactor);
             defense = (EncryptionLong)(modelConfig.def * MonsterPowerUpConfig.DEFFactor);

Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs

@@ -54,7 +54,7 @@ namespace GameLogic.Hero
             }
             else
             {
-                LogTool.Error("找不到法宝技能id：" + (FabaoConfig.SkillGroupID * 10 + FabaoPowerupConfig.SkillLevel - 1));
+                LogTool.Error("找不到法宝技能id：" + id);
             }
             
             

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -63,7 +63,7 @@ namespace GameLogic.Combat
             StartCombatInfo startCombatInfo = new StartCombatInfo();
             startCombatInfo.CombatType = CombatType.CombatType.LevelBattle;
             await StartCombat(startCombatInfo);
-            levelBattleId = 100004;
+
             LevelBattleCombatType levelBattleCombatType = CombatController.CombatTypeBasic as LevelBattleCombatType;
             if (levelBattleCombatType != null)
             {
@@ -114,6 +114,10 @@ namespace GameLogic.Combat
         /// <param name="isWin"></param>
         public void CombatToStage(bool isWin)
         {
+          
+            CombatController.CombatHeroController.CombatFinishDispose();
+            CombatController.DisposeOneCombatInfo();
+            
             caombatFinish?.Invoke(isWin);
             UIManager.Instance.ShowLastHindAllShowPanel();
         }

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Fort23.Core;
+using GameLogic.Hero;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 
 namespace Fort23.Mono
@@ -21,6 +22,7 @@ namespace Fort23.Mono
         protected override void DelEvent()
         {
         }
+
         public override CTask GetFocus()
         {
             AppBarPanel.OpenPanel(this);
@@ -33,6 +35,10 @@ namespace Fort23.Mono
             return base.LoseFocus();
         }
 
+        private HeroInfo heroInfo;
+
+        private List<HeroAttributeWidget> HeroAttributeWidgets = new List<HeroAttributeWidget>();
+
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
@@ -48,6 +54,46 @@ namespace Fort23.Mono
                 btnFaBaoWidget.OnClick = OnClick;
                 btnFaBaoWidgets.Add(btnFaBaoWidget);
             }
+
+            heroInfo = PlayerManager.Instance.myHero;
+
+
+            HeroAttributeWidget heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam,null, Content,isInstance:true);
+            heroAttributeWidget.CustomInit(new HeroAttributeData("生命", "", PlayerManager.Instance.myHero.hp.Value.ToString()));
+            HeroAttributeWidgets.Add(heroAttributeWidget);
+
+            heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam,null, Content,isInstance:true);
+            heroAttributeWidget.CustomInit(new HeroAttributeData("攻击", "", PlayerManager.Instance.myHero.attack.Value.ToString()));
+            HeroAttributeWidgets.Add(heroAttributeWidget);
+
+            heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam,null, Content,isInstance:true);
+            heroAttributeWidget.CustomInit(new HeroAttributeData("防御", "", PlayerManager.Instance.myHero.defense.Value.ToString()));
+            HeroAttributeWidgets.Add(heroAttributeWidget);
+
+            heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam,null, Content,isInstance:true);
+            heroAttributeWidget.CustomInit(new HeroAttributeData("攻击速度", "", PlayerManager.Instance.myHero.attSpeed.Value.ToString()));
+            HeroAttributeWidgets.Add(heroAttributeWidget);
+            
+            
+            heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam,null, Content,isInstance:true);
+            heroAttributeWidget.CustomInit(new HeroAttributeData("金灵根", "", PlayerManager.Instance.myHero.Metal_Injury.ToString()));
+            HeroAttributeWidgets.Add(heroAttributeWidget);
+            
+            heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam,null, Content,isInstance:true);
+            heroAttributeWidget.CustomInit(new HeroAttributeData("木灵根", "", PlayerManager.Instance.myHero.Wood_Injury.ToString()));
+            HeroAttributeWidgets.Add(heroAttributeWidget);
+            
+            heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam,null, Content,isInstance:true);
+            heroAttributeWidget.CustomInit(new HeroAttributeData("水灵根", "", PlayerManager.Instance.myHero.Water_Injury.ToString()));
+            HeroAttributeWidgets.Add(heroAttributeWidget);
+            
+            heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam,null, Content,isInstance:true);
+            heroAttributeWidget.CustomInit(new HeroAttributeData("火灵根", "", PlayerManager.Instance.myHero.Fire_Injury.ToString()));
+            HeroAttributeWidgets.Add(heroAttributeWidget);
+            
+            heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam,null, Content,isInstance:true);
+            heroAttributeWidget.CustomInit(new HeroAttributeData("土灵根", "", PlayerManager.Instance.myHero.Earth_Injury.ToString()));
+            HeroAttributeWidgets.Add(heroAttributeWidget);
         }
 
         private async void OnClick(ItemWidgetBasic obj)
@@ -58,6 +104,7 @@ namespace Fort23.Mono
                 TipMessagePanel.OpenTipMessagePanel("当前位置未解锁");
                 return;
             }
+
             SelectFaBaoPanel selectFaBaoPanel = await SelectFaBaoPanel.OpenPanel(btnFaBaoWidget.index);
             await selectFaBaoPanel.UIClosed();
             foreach (var b in btnFaBaoWidgets)
@@ -73,8 +120,7 @@ namespace Fort23.Mono
             return mainHeroPanel;
         }
 
-   
-        
+
         public override void Close()
         {
             foreach (var btnFaBaoWidget in btnFaBaoWidgets)
@@ -83,6 +129,12 @@ namespace Fort23.Mono
             }
 
             btnFaBaoWidgets.Clear();
+            
+            foreach (var heroAttributeWidget in HeroAttributeWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(heroAttributeWidget);
+            }
+            HeroAttributeWidgets.Clear();
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanelData.cs

@@ -52,6 +52,28 @@ namespace Fort23.Mono
 	      return _FaBaoRoot;
 	     }
 	   }
+	  private RectTransform _Content;
+	  public RectTransform Content
+	   {
+	   get{
+	      if (_Content == null)
+	       {
+	         _Content  = GetUIUnit<RectTransform>("Content"); 
+	       }
+	      return _Content;
+	     }
+	   }
+	  private GameObject _HeroAttributeWidgetGam;
+	  public GameObject HeroAttributeWidgetGam
+	   {
+	   get{
+	      if (_HeroAttributeWidgetGam == null)
+	       {
+	         _HeroAttributeWidgetGam  = GetUIUnit<GameObject>("HeroAttributeWidgetGam"); 
+	       }
+	      return _HeroAttributeWidgetGam;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{