lzx 1 ngày trước cách đây
mục cha
commit
973bc4d8cb
35 tập tin đã thay đổi với 1957 bổ sung864 xóa
  1. 2 2
      Assets/Art/UIAssets/decorate/dec_xiulianDingDiban.png.meta
  2. 2 2
      Assets/Art/UIAssets/decorate/dec_xiulianDingDiban2.png.meta
  3. 2 2
      Assets/Art/UIAssets/decorate/dec_xiulianTiaoDi.png.meta
  4. 94 0
      Assets/Res/UI/HeroInformainPanel/BreakthroughItemWidget.prefab
  5. 366 0
      Assets/Res/UI/HeroInformainPanel/HeroAttributeWidgetType2.prefab
  6. 7 0
      Assets/Res/UI/HeroInformainPanel/HeroAttributeWidgetType2.prefab.meta
  7. 612 0
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab
  8. 7 0
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab.meta
  9. 10 5
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab
  10. 119 783
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughSuccessPanel.prefab
  11. 179 1
      Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab
  12. 133 32
      Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab
  13. 8 8
      Assets/Res/UI/HeroInformainPanel/SelectElixirPanel.prefab
  14. 2 2
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  15. 0 2
      Assets/Scripts/GameUI/UI/HeroInformationPanel/BreakthroughItemWidget.cs
  16. 11 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/BreakthroughItemWidgetData.cs
  17. 2 1
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType1.cs
  18. 29 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType2.cs
  19. 11 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType2.cs.meta
  20. 51 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType2Data.cs
  21. 11 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType2Data.cs.meta
  22. 47 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanel.cs
  23. 11 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanel.cs.meta
  24. 62 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanelData.cs
  25. 11 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanelData.cs.meta
  26. 37 10
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs
  27. 11 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanelData.cs
  28. 31 11
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanel.cs
  29. 22 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanelData.cs
  30. 57 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroHerlp.cs
  31. 1 1
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs
  32. 3 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectBreakthroughItemPanel.cs
  33. 5 2
      Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs
  34. 1 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/UseExpElixirPanel.cs
  35. 0 0
      Assets/StreamingAssets/assetConfig.txt

+ 2 - 2
Assets/Art/UIAssets/decorate/dec_xiulianDingDiban.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 0, y: 10, z: 0, w: 11}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 2 - 2
Assets/Art/UIAssets/decorate/dec_xiulianDingDiban2.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 33, y: 0, z: 33, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 2 - 2
Assets/Art/UIAssets/decorate/dec_xiulianTiaoDi.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 43, y: 12, z: 44, w: 13}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 94 - 0
Assets/Res/UI/HeroInformainPanel/BreakthroughItemWidget.prefab

@@ -1,5 +1,93 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &42978155513012107
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6433122712838406448}
+  - component: {fileID: 3055005395418551800}
+  - component: {fileID: 5733884552396975542}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Select
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6433122712838406448
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 42978155513012107}
+  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: 3856099267002940727}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000015258789, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3055005395418551800
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 42978155513012107}
+  m_CullTransparentMesh: 1
+--- !u!114 &5733884552396975542
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 42978155513012107}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.18039216, g: 0.19607845, b: 0.1764706, 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: 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
+  _icon_name: dec_juxing
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &607973598456700447
 GameObject:
   m_ObjectHideFlags: 0
@@ -199,6 +287,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 6433122712838406448}
   - {fileID: 7880301645922380373}
   - {fileID: 8581409025266951542}
   - {fileID: 1020282557348708133}
@@ -259,6 +348,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Select
+    gameObject: {fileID: 5733884552396975542}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1263351331824940359
 GameObject:

+ 366 - 0
Assets/Res/UI/HeroInformainPanel/HeroAttributeWidgetType2.prefab

@@ -0,0 +1,366 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &502454093952904744
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6997671251480869774}
+  - component: {fileID: 8330249997138580010}
+  - component: {fileID: 1708581195574070171}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6997671251480869774
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 502454093952904744}
+  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: 5332338466812100478}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 4.700012, y: 2.1661}
+  m_SizeDelta: {x: 81.3883, y: 41.6678}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8330249997138580010
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 502454093952904744}
+  m_CullTransparentMesh: 1
+--- !u!114 &1708581195574070171
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 502454093952904744}
+  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.73333335, g: 0.8431373, b: 0.75294125, 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u751F\u547D"
+--- !u!1 &1084872618741251314
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5332338466812100478}
+  - component: {fileID: 2607102815132907146}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5332338466812100478
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1084872618741251314}
+  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: 6997671251480869774}
+  - {fileID: 5790646450901348242}
+  - {fileID: 4134232522543321143}
+  m_Father: {fileID: 439661866309752828}
+  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 &2607102815132907146
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1084872618741251314}
+  m_CullTransparentMesh: 1
+--- !u!1 &2796280068222542287
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5790646450901348242}
+  - component: {fileID: 3639138606694352301}
+  - component: {fileID: 2475424460546988587}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Value
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5790646450901348242
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2796280068222542287}
+  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: 5332338466812100478}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 184.3, y: 4.1302}
+  m_SizeDelta: {x: 77.3688, y: 45.596}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3639138606694352301
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2796280068222542287}
+  m_CullTransparentMesh: 1
+--- !u!114 &2475424460546988587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2796280068222542287}
+  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.62352943, g: 0.7176471, b: 0.6392157, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: +794
+--- !u!1 &4252063621790870621
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4134232522543321143}
+  - component: {fileID: 1780294559565883098}
+  - component: {fileID: 8820730255413389777}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_NextValue
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4134232522543321143
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4252063621790870621}
+  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: 5332338466812100478}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 377.5, y: 4.1302}
+  m_SizeDelta: {x: 77.3688, y: 45.596}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &1780294559565883098
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4252063621790870621}
+  m_CullTransparentMesh: 1
+--- !u!114 &8820730255413389777
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4252063621790870621}
+  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.3529412, g: 0.9176471, b: 0.44705886, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: +794
+--- !u!1 &9028940008435226479
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 439661866309752828}
+  - component: {fileID: 8381508890814916228}
+  - component: {fileID: 1703294406591298355}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: HeroAttributeWidgetType2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &439661866309752828
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9028940008435226479}
+  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: 5332338466812100478}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 395.9011, y: -751.8607}
+  m_SizeDelta: {x: 600.7477, y: 45.7216}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8381508890814916228
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9028940008435226479}
+  m_CullTransparentMesh: 1
+--- !u!114 &1703294406591298355
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9028940008435226479}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 1708581195574070171}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Value
+    gameObject: {fileID: 2475424460546988587}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_NextValue
+    gameObject: {fileID: 8820730255413389777}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1

+ 7 - 0
Assets/Res/UI/HeroInformainPanel/HeroAttributeWidgetType2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: C3hMvHj8UH/gajG8fjh6hAnepPK7i+JJ6+t/ZyAZtb/kQdq77TrbB+qUp6Ny
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 612 - 0
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab

@@ -0,0 +1,612 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &908498901687786849
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4363201749955246993}
+  - component: {fileID: 300703156522098652}
+  - component: {fileID: 3362068676485299346}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Tu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4363201749955246993
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908498901687786849}
+  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: 21, y: 346}
+  m_SizeDelta: {x: 600, y: 149}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &300703156522098652
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908498901687786849}
+  m_CullTransparentMesh: 1
+--- !u!114 &3362068676485299346
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908498901687786849}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 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
+  _icon_name: dec_tuposhibai
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &1729087048142024704
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9126064206330965304}
+  - component: {fileID: 5710891575198841785}
+  - component: {fileID: 490223779882293346}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Xw
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9126064206330965304
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1729087048142024704}
+  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: 334.3309, y: 62.687}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5710891575198841785
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1729087048142024704}
+  m_CullTransparentMesh: 1
+--- !u!114 &490223779882293346
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1729087048142024704}
+  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.86274517, g: 0.98823535, b: 0.8862746, 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4FEE\u4E3A-5\u4E07"
+--- !u!1 &1944986462689415960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1871334959253546311}
+  - component: {fileID: 8884516353508125679}
+  - component: {fileID: 9199402534891039922}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1871334959253546311
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944986462689415960}
+  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 &8884516353508125679
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944986462689415960}
+  m_CullTransparentMesh: 1
+--- !u!114 &9199402534891039922
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944986462689415960}
+  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: 21300000, guid: b10fe3c1a9c5440458371368504f7b13, type: 3}
+  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!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: 1
+--- !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 &6059519925302326691
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8489357731499039436}
+  - component: {fileID: 4369372019103071337}
+  - component: {fileID: 7278925911318931419}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Dj
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8489357731499039436
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6059519925302326691}
+  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: 21, y: 346}
+  m_SizeDelta: {x: 558, y: 161}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4369372019103071337
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6059519925302326691}
+  m_CullTransparentMesh: 1
+--- !u!114 &7278925911318931419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6059519925302326691}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 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
+  _icon_name: dec_dujieshibai
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &7049107214540533472
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3413493527203036687}
+  - component: {fileID: 8506310247902265301}
+  - component: {fileID: 8476237323180442642}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3413493527203036687
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7049107214540533472}
+  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}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 62}
+  m_SizeDelta: {x: 334.3309, y: 62.68701}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &8506310247902265301
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7049107214540533472}
+  m_CullTransparentMesh: 1
+--- !u!114 &8476237323180442642
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7049107214540533472}
+  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.5647059, g: 0.64705884, b: 0.5764706, 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !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: HeroBreakthroughFailPanel
+  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: 1871334959253546311}
+  - {fileID: 4363201749955246993}
+  - {fileID: 8489357731499039436}
+  - {fileID: 9126064206330965304}
+  - {fileID: 3413493527203036687}
+  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: Icon_Tu
+    gameObject: {fileID: 3362068676485299346}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Dj
+    gameObject: {fileID: 7278925911318931419}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Xw
+    gameObject: {fileID: 490223779882293346}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0

+ 7 - 0
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WSkX5yn5AXtdhwRqO+WKImEhVFve9P/pgNLJVLIF10kUSg8d7e90Kjvlc2VG
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 10 - 5
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -205,7 +205,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 980429640142043099}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 
@@ -231,7 +231,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 980429640142043099}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
@@ -2031,7 +2031,7 @@ GameObject:
   - component: {fileID: 1984449624224166326}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy)
+  m_Name: Text_Combat
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2865,7 +2865,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.78431374}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.9882353}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2873,7 +2873,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3871,4 +3871,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Combat
+    gameObject: {fileID: 1984449624224166326}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 119 - 783
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughSuccessPanel.prefab


+ 179 - 1
Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -134,6 +134,94 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &761335188077721832
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3106622106931745522}
+  - component: {fileID: 3703191467005982840}
+  - component: {fileID: 1942332183402266682}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3106622106931745522
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 761335188077721832}
+  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: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -180.79999}
+  m_SizeDelta: {x: 516.9802, y: 37}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &3703191467005982840
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 761335188077721832}
+  m_CullTransparentMesh: 1
+--- !u!114 &1942332183402266682
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 761335188077721832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 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
+  _icon_name: dec_xiulianDingDiban2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1535638494222853882
 GameObject:
   m_ObjectHideFlags: 0
@@ -1291,7 +1379,7 @@ MonoBehaviour:
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 0
-  m_FillAmount: 0.972
+  m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
@@ -2028,6 +2116,94 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8696231582153991412
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4814999327870452515}
+  - component: {fileID: 3646972974379602426}
+  - component: {fileID: 6005990600651927154}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4814999327870452515
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8696231582153991412}
+  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: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -100.4}
+  m_SizeDelta: {x: 693, y: 69.468994}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &3646972974379602426
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8696231582153991412}
+  m_CullTransparentMesh: 1
+--- !u!114 &6005990600651927154
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8696231582153991412}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 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
+  _icon_name: dec_xiulianDingDiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8742744849944818760
 GameObject:
   m_ObjectHideFlags: 0
@@ -2147,6 +2323,8 @@ RectTransform:
   m_Children:
   - {fileID: 8212670971040085124}
   - {fileID: 307469801909214118}
+  - {fileID: 4814999327870452515}
+  - {fileID: 3106622106931745522}
   - {fileID: 5624694180497915839}
   - {fileID: 1772753141541214691}
   - {fileID: 7447784581765122494}

+ 133 - 32
Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab

@@ -700,8 +700,8 @@ GameObject:
   m_Component:
   - component: {fileID: 3577922257924512980}
   - component: {fileID: 2747026803546040257}
-  - component: {fileID: 5066644999548193194}
   - component: {fileID: 4180526276572653514}
+  - component: {fileID: 869392520891257521}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Close
@@ -737,36 +737,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3587899887059951543}
   m_CullTransparentMesh: 1
---- !u!114 &5066644999548193194
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3587899887059951543}
-  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.6901961}
-  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 &4180526276572653514
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -807,10 +777,52 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 5066644999548193194}
+  m_TargetGraphic: {fileID: 869392520891257521}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &869392520891257521
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3587899887059951543}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.78431374}
+  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
+  _icon_name: dec_juxing
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4334978824698879176
 GameObject:
   m_ObjectHideFlags: 0
@@ -1312,6 +1324,7 @@ RectTransform:
   - {fileID: 4702162582110572812}
   - {fileID: 1304532800865056302}
   - {fileID: 7534567713969676397}
+  - {fileID: 6223992893219584324}
   - {fileID: 7693569213957008509}
   - {fileID: 1446556576223137171}
   - {fileID: 7269271526319791146}
@@ -1676,6 +1689,94 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7279\u522B\u9053\u5177"
+--- !u!1 &6953401030225933709
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6223992893219584324}
+  - component: {fileID: 8612881284138927429}
+  - component: {fileID: 5693828198875216041}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6223992893219584324
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6953401030225933709}
+  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: 1528319131332351769}
+  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: -185.02562, y: 25.8}
+  m_SizeDelta: {x: 183.7099, y: 301.7909}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8612881284138927429
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6953401030225933709}
+  m_CullTransparentMesh: 1
+--- !u!114 &5693828198875216041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6953401030225933709}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.70980394, g: 0.8352942, b: 0.7843138, 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: 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
+  _icon_name: dec_xiulianTiaoDi
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7194394831620754205
 GameObject:
   m_ObjectHideFlags: 0

+ 8 - 8
Assets/Res/UI/HeroInformainPanel/SelectElixirPanel.prefab

@@ -1680,7 +1680,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.78431374}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1688,7 +1688,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1697,14 +1697,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_juxing
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

+ 2 - 2
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -403,12 +403,12 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         //测试道具
         playerData.ItemListData.Add(new ItemData(1201, 10));
         playerData.ItemListData.Add(new ItemData(1202, 10));
-
+        
         playerData.ItemListData.Add(new ItemData(1301, 10));
         playerData.ItemListData.Add(new ItemData(1302, 10));
         playerData.ItemListData.Add(new ItemData(1303, 10));
         playerData.ItemListData.Add(new ItemData(1304, 10));
-
+        //
         playerData.ItemListData.Add(new ItemData(1401, 10));
         playerData.ItemListData.Add(new ItemData(1402, 10));
         playerData.ItemListData.Add(new ItemData(1403, 10));

+ 0 - 2
Assets/Scripts/GameUI/UI/HeroInformationPanel/BreakthroughItemWidget.cs

@@ -40,8 +40,6 @@ namespace Fort23.Mono
                 {
                     SelectElixirPanel.OpenPanel(this, async (e) =>
                     {
-                     
-                        
                         //取消选择丹药
                         if (e == null)
                         {

+ 11 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/BreakthroughItemWidgetData.cs

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

+ 2 - 1
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType1.cs

@@ -23,7 +23,8 @@ namespace Fort23.Mono
 		public void CustomInit(HeroAttributeData data)
 		{
 			Text_Name.text = data.name;
-			Text_Value.text = data.currentValue;
+			// Text_Value.text = data.currentValue;
+			Text_Value.text = "+" + data.nextValue;
 			// Text_NextValue.text = data.nextValue;
 		}
 

+ 29 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType2.cs

@@ -0,0 +1,29 @@
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "HeroAttributeWidgetType2"  )]
+	public partial class HeroAttributeWidgetType2 : UIComponent
+	{
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+		public void CustomInit(HeroAttributeData data)
+		{
+			Text_Name.text = data.name;
+			Text_Value.text = data.currentValue;
+			Text_NextValue.text = data.nextValue;
+		}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType2.cs.meta

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

+ 51 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType2Data.cs

@@ -0,0 +1,51 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class HeroAttributeWidgetType2 
+	{
+	  #region 自定义数据 
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private Text _Text_Value;
+	  public Text Text_Value
+	   {
+	   get{
+	      if (_Text_Value == null)
+	       {
+	         _Text_Value  = GetUIUnit<Text>("Text_Value"); 
+	       }
+	      return _Text_Value;
+	     }
+	   }
+	  private Text _Text_NextValue;
+	  public Text Text_NextValue
+	   {
+	   get{
+	      if (_Text_NextValue == null)
+	       {
+	         _Text_NextValue  = GetUIUnit<Text>("Text_NextValue"); 
+	       }
+	      return _Text_NextValue;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType2Data.cs.meta

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

+ 47 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanel.cs

@@ -0,0 +1,47 @@
+using Fort23.Core;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "HeroBreakthroughFailPanel")]
+    public partial class HeroBreakthroughFailPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void CustomInit(int type, int xw)
+        {
+            if (type == 2)
+            {
+                Icon_Tu.gameObject.SetActive(true);
+                Icon_Dj.gameObject.SetActive(false);
+            }
+            else if (type == 3)
+            {
+                Icon_Tu.gameObject.SetActive(false);
+                Icon_Dj.gameObject.SetActive(true);
+            }
+
+            Text_Xw.text = "修为-" + xw;
+        }
+
+        public static async CTask<HeroBreakthroughFailPanel> OpenPanel(int type, int xw)
+        {
+            HeroBreakthroughFailPanel heroBreakthroughFailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughFailPanel>(null, UILayer.Top);
+            heroBreakthroughFailPanel.CustomInit(type,xw);
+            return heroBreakthroughFailPanel;
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanel.cs.meta

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

+ 62 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanelData.cs

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

+ 11 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Cn9Ksi6vVXwFrhe0xLlVYRxnQmRlQ0Z+8x7T6l/BDRdOos0QWdykeSy5lBeg
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 37 - 10
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -27,6 +27,7 @@ namespace Fort23.Mono
         private void Init()
         {
             isPopUi = true;
+            isAddStack = false;
         }
 
         protected override void AddEvent()
@@ -108,7 +109,7 @@ namespace Fort23.Mono
 
 
                 int ramdomValue = Random.Range(1, 101);
-
+                int type1 = 2;
                 //突破成功
                 if (ramdomValue < list[0])
                 {
@@ -117,29 +118,33 @@ namespace Fort23.Mono
                     {
                         if (PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages != null && PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages.Length > 1)
                         {
+                            type1 = 3;
                             ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0], PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
                             //渡劫失败
                             if (ramdomValue >= PlayerManager.Instance.myHero.hp.Value)
                             {
                                 isTuPoSuccess = false;
                                 RemoveHeroItem(list[1]);
-                                TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("雷劫失败");
-                                await tipMessage.UIClosed();
+                                HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(3, list[1]);
+                                await heroBreakthroughFailPanel.UIClosed();
+                                // TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("雷劫失败");
+                                // await tipMessage.UIClosed();
                             }
                         }
                     }
 
                     if (isTuPoSuccess)
                     {
-                        await UpHero();
+                        await UpHero(type1);
                     }
                 }
                 //失败
                 else
                 {
                     RemoveHeroItem(list[1]);
-                    TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("突破失败");
-                    await tipMessage.UIClosed();
+
+                    HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
+                    await heroBreakthroughFailPanel.UIClosed();
                 }
 
                 UIManager.Instance.HideUIUIPanel(this);
@@ -166,6 +171,7 @@ namespace Fort23.Mono
                             AccountFileInfo.Instance.SavePlayerData();
                             Btn_StartCombat.gameObject.SetActive(false);
                             CombatTrue.gameObject.SetActive(true);
+                            Text_Combat.text = "已破除";
                             RefenceSuccessProbability(PlayerManager.Instance.myHero);
                             // UIManager.Instance.ShowLastHindAllShowPanel();
                         }
@@ -186,11 +192,28 @@ namespace Fort23.Mono
             AccountFileInfo.Instance.SavePlayerData();
         }
 
-        private async CTask UpHero()
+        private async CTask UpHero(int type)
         {
-            var heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+            List<HeroAttributeData> heroAttributData = null;
+            //小突破
+            if (type == 1)
+            {
+               heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
+              
+            }
+            //大突破
+            else if (type == 2)
+            {
+                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+            }
+            //渡劫
+            else if (type == 3)
+            {
+                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+            }
+           
             PlayerManager.Instance.myHero.Upgrade();
-            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await HeroBreakthroughSuccessPanel.OpenPanel(heroAttributData);
+            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await HeroBreakthroughSuccessPanel.OpenPanel(type,heroAttributData);
             await heroBreakthroughSuccessPanel.UIClosed();
         }
 
@@ -251,11 +274,13 @@ namespace Fort23.Mono
                 {
                     Btn_StartCombat.gameObject.SetActive(false);
                     CombatTrue.gameObject.SetActive(true);
+                    Text_Combat.text = "已破除";
                 }
                 else
                 {
                     Btn_StartCombat.gameObject.SetActive(true);
                     CombatTrue.gameObject.SetActive(false);
+                    Text_Combat.text = "破除";
                 }
             }
             else
@@ -489,11 +514,13 @@ namespace Fort23.Mono
                 {
                     Btn_StartCombat.gameObject.SetActive(false);
                     CombatTrue.gameObject.SetActive(true);
+                    Text_Combat.text = "已破除";
                 }
                 else
                 {
                     Btn_StartCombat.gameObject.SetActive(true);
                     CombatTrue.gameObject.SetActive(false);
+                    Text_Combat.text = "破除";
                 }
             }
             else
@@ -535,7 +562,7 @@ namespace Fort23.Mono
                     breakthroughItemWidgets[i].transform.anchoredPosition = new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 48) * i, 0);
                 }
 
-                Content.sizeDelta = new Vector2((breakthroughItemWidgets[0].transform.sizeDelta.x + 48) * breakthroughItemWidgets.Count, 200);
+                Content.sizeDelta = new Vector2((breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count, 200);
             }
         }
 

+ 11 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanelData.cs

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

+ 31 - 11
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanel.cs

@@ -10,12 +10,10 @@ namespace Fort23.Mono
     [UIBinding(prefab = "HeroBreakthroughSuccessPanel")]
     public partial class HeroBreakthroughSuccessPanel : UIPanel
     {
-        List<HeroAttributeWidgetType1> heroAttributeWidgets = new List<HeroAttributeWidgetType1>();
+        List<UIComponent> heroAttributeWidgets = new List<UIComponent>();
 
         private void Init()
         {
-          
-          
         }
 
         protected override void AddEvent()
@@ -31,14 +29,16 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public async static CTask<HeroBreakthroughSuccessPanel> OpenPanel(List<HeroAttributeData> heroAttributes)
+        int type;
+
+        public async static CTask<HeroBreakthroughSuccessPanel> OpenPanel(int type, List<HeroAttributeData> heroAttributes)
         {
-            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null,UILayer.Top,isFocus:false);
-            heroBreakthroughSuccessPanel.CustomInit(heroAttributes);
+            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null, UILayer.Top, isFocus: false);
+            heroBreakthroughSuccessPanel.CustomInit(type, heroAttributes);
             return heroBreakthroughSuccessPanel;
         }
 
-        public async void CustomInit(List<HeroAttributeData> heroAttributes)
+        public async void CustomInit(int type, List<HeroAttributeData> heroAttributes)
         {
             HeroInfo heroInfo = new HeroInfo();
             heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, PlayerManager.Instance.myHero.heroData.heroPowerId + 1);
@@ -49,13 +49,33 @@ namespace Fort23.Mono
             Text_NextJIngjie.text = LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[0]) +
                                     LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[1]) +
                                     LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[2]);
+            if (type == 1 || type == 2)
+            {
+                Icon_Tu.gameObject.SetActive(true);
+                Icon_Dj.gameObject.SetActive(false);
+            }
+            else
+            {
+                Icon_Tu.gameObject.SetActive(false);
+                Icon_Dj.gameObject.SetActive(true);
+            }
+
             foreach (var heroAttributeData in heroAttributes)
             {
-                HeroAttributeWidgetType1 heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidgetType1>(null, AttributeRoot);
-                heroAttributeWidget.CustomInit(heroAttributeData);
-                heroAttributeWidgets.Add(heroAttributeWidget);
+                if (type == 1)
+                {
+                    HeroAttributeWidgetType1 heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidgetType1>(null, AttributeRoot);
+                    heroAttributeWidget.CustomInit(heroAttributeData);
+                    heroAttributeWidgets.Add(heroAttributeWidget);
+                }
+                else
+                {
+                    HeroAttributeWidgetType2 heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidgetType2>(null, AttributeRoot);
+                    heroAttributeWidget.CustomInit(heroAttributeData);
+                    heroAttributeWidgets.Add(heroAttributeWidget);
+                }
             }
-            
+
             LayoutRebuilder.ForceRebuildLayoutImmediate(AttributeRoot);
             LayoutRebuilder.ForceRebuildLayoutImmediate(AttributeRoot.parent.GetComponent<RectTransform>());
         }

+ 22 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanelData.cs

@@ -52,6 +52,28 @@ namespace Fort23.Mono
 	      return _Text_NextJIngjie ;
 	     }
 	   }
+	  private MyImage _Icon_Tu;
+	  public MyImage Icon_Tu
+	   {
+	   get{
+	      if (_Icon_Tu == null)
+	       {
+	         _Icon_Tu  = GetUIUnit<MyImage>("Icon_Tu"); 
+	       }
+	      return _Icon_Tu;
+	     }
+	   }
+	  private MyImage _Icon_Dj;
+	  public MyImage Icon_Dj
+	   {
+	   get{
+	      if (_Icon_Dj == null)
+	       {
+	         _Icon_Dj  = GetUIUnit<MyImage>("Icon_Dj"); 
+	       }
+	      return _Icon_Dj;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 57 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroHerlp.cs

@@ -62,6 +62,63 @@ namespace Fort23.Mono
             return heroAttributeDataList;
         }
 
+
+        public static List<HeroAttributeData> GetHeroChageHeroAttributeData1(HeroInfo currentHero, HeroInfo newHero)
+        {
+            List<HeroAttributeData> heroAttributeDataList = new List<HeroAttributeData>();
+            if (currentHero.powerUpConfig.ShenshiMax != newHero.powerUpConfig.ShenshiMax)
+            {
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), newHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax + "");
+                heroAttributeDataList.Add(heroAttributeData);
+            }
+
+
+            if (currentHero.hp != newHero.hp)
+            {
+                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToString(), newHero.hp.Value - currentHero.hp.Value + "");
+                heroAttributeDataList.Add(heroAttributeData);
+            }
+
+            if (currentHero.attack != newHero.attack)
+            {
+                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToString(), newHero.attack.Value - currentHero.attack.Value + "");
+                heroAttributeDataList.Add(heroAttributeData);
+            }
+
+            if (currentHero.defense != newHero.defense)
+            {
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御", currentHero.defense.Value.ToString(), newHero.defense.Value - currentHero.defense.Value + "");
+                heroAttributeDataList.Add(heroAttributeData);
+            }
+
+
+            if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
+            {
+                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率", currentHero.powerUpConfig.MPFactor.ToString(), currentHero.powerUpConfig.MPFactor - currentHero.powerUpConfig.MPFactor + "");
+                heroAttributeDataList.Add(heroAttributeData);
+            }
+
+            if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
+            {
+                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率", currentHero.powerUpConfig.HudunFactor.ToString(), currentHero.powerUpConfig.HudunFactor - currentHero.powerUpConfig.HudunFactor + "");
+                heroAttributeDataList.Add(heroAttributeData);
+            }
+
+            if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
+            {
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K", currentHero.powerUpConfig.defK.ToString(), currentHero.powerUpConfig.defK - currentHero.powerUpConfig.defK + "");
+                heroAttributeDataList.Add(heroAttributeData);
+            }
+
+            if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
+            {
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), currentHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax + "");
+                heroAttributeDataList.Add(heroAttributeData);
+            }
+
+            return heroAttributeDataList;
+        }
+
         public static int GetHeroExp()
         {
             int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);

+ 1 - 1
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -101,7 +101,7 @@ namespace Fort23.Mono
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
                     {
                         var heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, heroInfo);
-                        HeroBreakthroughSuccessPanel.OpenPanel(heroAttributData);
+                        HeroBreakthroughSuccessPanel.OpenPanel(1,heroAttributData);
                         PlayerManager.Instance.myHero.Upgrade();
                         CustomInit();
                     }

+ 3 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectBreakthroughItemPanel.cs

@@ -21,6 +21,7 @@ namespace Fort23.Mono
         private void Init()
         {
             isPopUi = true;
+            isAddStack = false;
         }
 
         protected override void AddEvent()
@@ -52,6 +53,7 @@ namespace Fort23.Mono
             breakthrough = breakthroughItemWidget;
             weidgetFater = breakthrough.transform.parent;
             breakthrough.transform.SetParent(this.transform);
+            breakthrough.Icon_Select.gameObject.SetActive(true);
             itemConfig = ConfigComponent.Instance.Get<ItemConfig>(breakthroughItemWidget.itemId);
 
             Text_ItemName.text = LanguageManager.Instance.Text(itemConfig.itemName);
@@ -96,6 +98,7 @@ namespace Fort23.Mono
 
         public override void Close()
         {
+            breakthrough.Icon_Select.gameObject.SetActive(false);
             breakthrough.transform.SetParent(weidgetFater);
             weidgetFater = null;
             breakthrough = null;

+ 5 - 2
Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs

@@ -25,6 +25,7 @@ namespace Fort23.Mono
         private void Init()
         {
             isPopUi = true;
+            isAddStack = false;
         }
 
         protected override void AddEvent()
@@ -71,6 +72,7 @@ namespace Fort23.Mono
 
             weidgetFater = breakthroughItemWidget.transform.parent;
             breakthroughItemWidget.transform.SetParent(this.transform);
+            breakthroughItemWidget.Icon_Select.gameObject.SetActive(true);
 
             List<ItemConfig> itemConfigs = ConfigComponent.Instance.GetAll<ItemConfig>().ToList();
             var showItemConfigs = itemConfigs.Where(i => i.itemTag == 3 && PlayerManager.Instance.myHero.heroData.heroPowerId >= i.associateVlaue[0] && PlayerManager.Instance.myHero.heroData.heroPowerId <= i.associateVlaue[1]).ToList();
@@ -124,7 +126,7 @@ namespace Fort23.Mono
             else
             {
                 Icon_Select.transform.SetParent(elixirItemWidget.SelectRoot);
-                Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(-0.48f,6.1f);
+                Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(-0.48f, 6.1f);
                 Icon_Select.SetActive(true);
             }
         }
@@ -151,6 +153,7 @@ namespace Fort23.Mono
             elixirItemWidget = null;
 
             breakthrough.transform.SetParent(weidgetFater);
+            breakthrough.Icon_Select.gameObject.SetActive(false);
             breakthrough = null;
             weidgetFater = null;
             SelectWidget(null);
@@ -159,7 +162,7 @@ namespace Fort23.Mono
 
         public async static CTask<SelectElixirPanel> OpenPanel(BreakthroughItemWidget itemInfo, Action<ElixirItemWidget> callback = null)
         {
-            SelectElixirPanel selectElixirPanel = await UIManager.Instance.LoadAndOpenPanel<SelectElixirPanel>(null,UILayer.Top,isFocus:false);
+            SelectElixirPanel selectElixirPanel = await UIManager.Instance.LoadAndOpenPanel<SelectElixirPanel>(null, UILayer.Top, isFocus: false);
             selectElixirPanel.CustomInit(itemInfo, callback);
             return selectElixirPanel;
         }

+ 1 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/UseExpElixirPanel.cs

@@ -15,6 +15,7 @@ namespace Fort23.Mono
         private void Init()
         {
             isPopUi = true;
+            isAddStack = false;
         }
 
         protected override void AddEvent()

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác