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

Assets/Res/UI/HeroInformainPanel/Animator.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Bykf53ykACgPt2WHdAqy57fo4oN7gJO6l+HdbnRSrjkvHJbZMLASnSo26qWD
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3387,7 +3387,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -5747,6 +5747,21 @@ MonoBehaviour:
     - gameObject: {fileID: 7376704574898062582}
     - gameObject: {fileID: 5361362261105901452}
     - gameObject: {fileID: 3729610520836463702}
+  - key: fx_ui_tupo2
+    gameObject: {fileID: 1351546473485693172}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
   isAssetBundle: 1
 --- !u!1001 &508761963476317887
 PrefabInstance:
@@ -6527,15 +6542,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
       propertyPath: m_LocalPosition.x
@@ -6614,6 +6629,11 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
+--- !u!1 &1351546473485693172 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 429141462419320987, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
+  m_PrefabInstance: {fileID: 1672301908283277423}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1793514868338276612 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}

Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab

@@ -289,8 +289,7 @@ RectTransform:
   - {fileID: 543116040436373444}
   - {fileID: 2583264031236995806}
   - {fileID: 4092484107647895613}
-  - {fileID: 472811775746804830}
-  - {fileID: 1085220640693048462}
+  - {fileID: 8266832900577066409}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -361,6 +360,93 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!1 &5170332322964461372
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7129149656182869682}
+  - component: {fileID: 7335451067053430739}
+  - component: {fileID: 8257280305357096206}
+  - component: {fileID: 5828648931728266450}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: AttributeRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7129149656182869682
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5170332322964461372}
+  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: 8266832900577066409}
+  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: -5.1293, y: 327.2}
+  m_SizeDelta: {x: 578.0841, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &7335451067053430739
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5170332322964461372}
+  m_CullTransparentMesh: 1
+--- !u!114 &8257280305357096206
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5170332322964461372}
+  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: 5.34
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &5828648931728266450
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5170332322964461372}
+  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 &5294230650080845847
 GameObject:
   m_ObjectHideFlags: 0
@@ -672,116 +758,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &6328008475876290341
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 472811775746804830}
-  - component: {fileID: 5249337868127242115}
-  - component: {fileID: 8021534401990309569}
-  - component: {fileID: 7766564801190356076}
-  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: 0
---- !u!224 &472811775746804830
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6328008475876290341}
-  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: 3479442316472032070}
-  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: 2}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &5249337868127242115
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6328008475876290341}
-  m_CullTransparentMesh: 1
---- !u!114 &8021534401990309569
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6328008475876290341}
-  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.4666667, g: 0.36078432, b: 0.24705884, 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_TupoFenGeXian
-  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
-  imageH: 2
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!114 &7766564801190356076
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6328008475876290341}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &7371325538380333896
 GameObject:
   m_ObjectHideFlags: 0
@@ -883,7 +859,7 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
---- !u!1 &8761311858942247224
+--- !u!1 &8252014874114865912
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -891,59 +867,59 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1085220640693048462}
-  - component: {fileID: 956848905564691411}
-  - component: {fileID: 8921433333291855242}
-  - component: {fileID: 4479323012423221125}
+  - component: {fileID: 8266832900577066409}
+  - component: {fileID: 7127467652639367246}
+  - component: {fileID: 1165132109175964643}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: AttributeBg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &1085220640693048462
+  m_IsActive: 1
+--- !u!224 &8266832900577066409
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8761311858942247224}
+  m_GameObject: {fileID: 8252014874114865912}
   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_Children:
+  - {fileID: 7129149656182869682}
   m_Father: {fileID: 3479442316472032070}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 2}
-  m_Pivot: {x: 0.5, y: 0}
---- !u!222 &956848905564691411
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 6.029785, y: -210.1}
+  m_SizeDelta: {x: 592.3805, y: 346.9185}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7127467652639367246
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8761311858942247224}
+  m_GameObject: {fileID: 8252014874114865912}
   m_CullTransparentMesh: 1
---- !u!114 &8921433333291855242
+--- !u!114 &1165132109175964643
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8761311858942247224}
+  m_GameObject: {fileID: 8252014874114865912}
   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.4666667, g: 0.36078432, b: 0.24705884, a: 1}
+  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
@@ -951,7 +927,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
@@ -960,7 +936,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_TupoFenGeXian
+  _icon_name: dec_dikuang_db
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
   packInfo:
@@ -968,31 +944,11 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
-  imageH: 2
+  imageH: 346
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!114 &4479323012423221125
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8761311858942247224}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -1024,8 +980,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8212670971040085124}
   - {fileID: 1871334959253546311}
+  - {fileID: 8212670971040085124}
   - {fileID: 3479442316472032070}
   - {fileID: 4363201749955246993}
   - {fileID: 8489357731499039436}
@@ -1075,6 +1031,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: AttributeRoot
+    gameObject: {fileID: 7129149656182869682}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!95 &4895211963443726447
 Animator:
@@ -1109,14 +1070,26 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 756648002295189263, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1646731325258546683, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1646731325258546683, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1819034189074160187, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1819034189074160187, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3605989120534549272, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -1221,6 +1194,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3975577161060829257, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5928305546705379711, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Particles.Array.size
       value: 8
@@ -1245,6 +1222,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6416273557571709796, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7238359920612202419, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: randomSeed
       value: 3639
@@ -1261,14 +1242,26 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8646301895823271843, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8676008609181533993, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8676008609181533993, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8765597809117012698, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8765597809117012698, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Res/UI/HeroInformainPanel/修炼-渡劫成功.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: CX0asiylBynkya1VbEAFmvcpf4+FUP0bjeEWGBwsmh/+LsAXHSsL00SgL1Or
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -141,8 +141,8 @@ namespace Fort23.Mono
 
                         if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
                         {
-                            heroInformationPanel.root.SetActive(false);
-                            heroInformationPanel.AttributeBg.SetActive(false);
+                            // heroInformationPanel.root.SetActive(false);
+                            // heroInformationPanel.AttributeBg.SetActive(false);
                             type1 = 4;
                         }
 
@@ -197,9 +197,9 @@ namespace Fort23.Mono
                         else
                         {
                             AudioManager.Instance.PlayAudio("ui_tupo.wav");
-                            heroInformationPanel.RecoverDujie();
-                            heroInformationPanel.root.SetActive(false);
-                            heroInformationPanel.AttributeBg.SetActive(true);
+                            // heroInformationPanel.RecoverDujie();
+                            // heroInformationPanel.root.SetActive(false);
+                            // heroInformationPanel.AttributeBg.SetActive(true);
                             UIManager.Instance.HideUIUIPanel(this);
                             TitlePanel.ClosePanel();
                             heroInformationPanel.UpHero(3, nextHeroInfo);

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

@@ -31,21 +31,35 @@ namespace Fort23.Mono
 
         int type;
 
-        public async static CTask<HeroBreakthroughSuccessPanel> OpenPanel(int type, List<HeroAttributeData> heroAttributes)
+        public async static CTask<HeroBreakthroughSuccessPanel> OpenPanel(int type,
+            List<HeroAttributeData> heroAttributes)
         {
-            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
-            heroBreakthroughSuccessPanel.CustomInit(type, heroAttributes);
+            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null, UILayer.Top,
+                    uiData: new object[] { type, heroAttributes }, isShowBG: true);
+            // heroBreakthroughSuccessPanel.CustomInit(type, heroAttributes);
             return heroBreakthroughSuccessPanel;
         }
 
-        public async void CustomInit(int type, List<HeroAttributeData> heroAttributes)
+
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            int type = int.Parse(uiData[0].ToString());
+            List<HeroAttributeData> heroAttributes = uiData[1] as List<HeroAttributeData>;
+            await CustomInit(type, heroAttributes);
+            return await base.AsyncInit(uiData);
+        }
+
+        public async CTask CustomInit(int type, List<HeroAttributeData> heroAttributes)
         {
             // HeroInfo heroInfo = new HeroInfo();
             HeroInfo heroInfo = PlayerManager.Instance.myHero.CopyHero();
-            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, PlayerManager.Instance.myHero.heroData.heroPowerId - 1);
-            Text_NextJIngjie.text = LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                                                       LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                                                       LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                PlayerManager.Instance.myHero.heroData.heroPowerId - 1);
+            Text_NextJIngjie.text =
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
 
             Text_CurretnJIngjie.text = LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[0]) +
                                        LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[1]) +
@@ -65,13 +79,15 @@ namespace Fort23.Mono
             {
                 if (type == 1)
                 {
-                    HeroAttributeWidgetType1 heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidgetType1>(null, AttributeRoot);
+                    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);
+                    HeroAttributeWidgetType2 heroAttributeWidget =
+                        await UIManager.Instance.CreateGComponent<HeroAttributeWidgetType2>(null, AttributeRoot);
                     heroAttributeWidget.CustomInit(heroAttributeData);
                     heroAttributeWidgets.Add(heroAttributeWidget);
                 }

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

@@ -608,6 +608,7 @@ namespace Fort23.Mono
             DujiePanelAnim.Play("guodu_idle");
             root.SetActive(true);
             AttributeBg.SetActive(true);
+            fx_ui_tupo2.gameObject.SetActive(false);
         }
 
 
@@ -635,30 +636,36 @@ namespace Fort23.Mono
                     await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
                 await heroBreakthroughSuccessPanel.UIClosed();
                 CustomInit();
+
                 TitlePanel.OpenPanel();
             }
             //渡劫
             else if (type == 3)
             {
-                // heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
                 PlayerManager.Instance.myHero.heroData.isYuanMan = false;
                 PlayerManager.Instance.myHero.Upgrade();
-                HeroTuPoSuccessPanel heroTuPoSuccessPanel = await HeroTuPoSuccessPanel.OpenPanel();
+                HeroTuPoSuccessPanel heroTuPoSuccessPanel = await HeroTuPoSuccessPanel.OpenPanel(heroAttributData);
                 await heroTuPoSuccessPanel.UIClosed();
-                heroInformationPanel.root.SetActive(true);
-                heroInformationPanel.AttributeBg.SetActive(true);
+                // heroInformationPanel.root.SetActive(true);
+                // heroInformationPanel.AttributeBg.SetActive(true);
                 CustomInit();
+                heroInformationPanel.RecoverDujie();
                 TitlePanel.OpenPanel();
             }
             //圆满
             else if (type == 4)
             {
                 PlayerManager.Instance.myHero.heroData.isYuanMan = true;
+                fx_ui_tupo2.gameObject.SetActive(true);
+                await TimerComponent.Instance.WaitAsync(500);
                 HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
                 await herYuanManSuccessPanel.UIClosed();
-                heroInformationPanel.root.SetActive(true);
-                heroInformationPanel.AttributeBg.SetActive(true);
                 CustomInit();
+                heroInformationPanel.RecoverDujie();
+                // heroInformationPanel.root.SetActive(true);
+                // heroInformationPanel.AttributeBg.SetActive(true);
+
                 TitlePanel.OpenPanel();
             }
         }

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

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

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

@@ -10,6 +10,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "HeroTuPoSuccessPanel")]
     public partial class HeroTuPoSuccessPanel : UIPanel
     {
+        List<UIComponent> heroAttributeWidgets = new List<UIComponent>();
+
         private void Init()
         {
         }
@@ -27,14 +29,37 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public async static CTask<HeroTuPoSuccessPanel> OpenPanel()
+        public async static CTask<HeroTuPoSuccessPanel> OpenPanel(List<HeroAttributeData> heroAttributeDatas)
         {
             HeroTuPoSuccessPanel heroBreakthroughSuccessPanel =
-                await UIManager.Instance.LoadAndOpenPanel<HeroTuPoSuccessPanel>(null, UILayer.Top);
-            heroBreakthroughSuccessPanel.CustomInit();
+                await UIManager.Instance.LoadAndOpenPanel<HeroTuPoSuccessPanel>(null, UILayer.Top,
+                    uiData: new object[] { heroAttributeDatas });
             return heroBreakthroughSuccessPanel;
         }
 
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            foreach (var heroAttributeWidget in heroAttributeWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(heroAttributeWidget);
+            }
+
+            heroAttributeWidgets.Clear();
+
+            List<HeroAttributeData> heroAttributeDatas = uiData[0] as List<HeroAttributeData>;
+
+            foreach (var heroAttributeData in heroAttributeDatas)
+            {
+                HeroAttributeWidget heroAttributeWidget =
+                    await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+                heroAttributeWidget.CustomInit(heroAttributeData);
+                heroAttributeWidgets.Add(heroAttributeWidget);
+            }
+
+            CustomInit();
+            return await base.AsyncInit(uiData);
+        }
+
         public async void CustomInit()
         {
             // HeroInfo heroInfo = new HeroInfo();
@@ -48,5 +73,17 @@ namespace Fort23.Mono
             Text_CurretnJIngjie.text = LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[0]) +
                                        LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[1]);
         }
+
+        public override CTask Close()
+        {
+            foreach (var heroAttributeWidget in heroAttributeWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(heroAttributeWidget);
+            }
+
+            heroAttributeWidgets.Clear();
+
+            return base.Close();
+        }
     }
 }

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

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

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

@@ -31,7 +31,7 @@ namespace Fort23.Mono
 
         private void ItemUpdateEvent(IEventData e)
         {
-            CustomInit(breakthrough, callBack);
+            CustomInit();
         }
 
         protected override void DelEvent()
@@ -53,14 +53,20 @@ namespace Fort23.Mono
             Btn_Source.onClick.AddListener(() => { ItemSourcePanel.OpenPanel(itemConfig.ID); });
         }
 
-        public void CustomInit(BreakthroughItemWidget breakthroughItemWidget, Action callBack)
+        public override CTask<bool> AsyncInit(object[] uiData)
         {
-            this.callBack = callBack;
-            breakthrough = breakthroughItemWidget;
+            breakthrough = uiData[0] as BreakthroughItemWidget;
+            this.callBack = uiData[1] as Action;
             weidgetFater = breakthrough.transform.parent;
             breakthrough.transform.SetParent(this.transform);
             breakthrough.Icon_Select.gameObject.SetActive(true);
-            itemConfig = ConfigComponent.Instance.Get<ItemConfig>(breakthroughItemWidget.itemId);
+            CustomInit();
+            return base.AsyncInit(uiData);
+        }
+
+        public void CustomInit()
+        {
+            itemConfig = ConfigComponent.Instance.Get<ItemConfig>(breakthrough.itemId);
 
             Text_ItemName.text = LanguageManager.Instance.Text(itemConfig.itemName);
             Text_ItemDesc.text = LanguageManager.Instance.Text(itemConfig.itemDesc);
@@ -68,7 +74,6 @@ namespace Fort23.Mono
             if (itemConfig.itemTag == 3)
             {
                 Text_SucceedDesc.text = $"+{itemConfig.associateVlaue[2]}%";
-                // Text_FailDesc.text = $"-{itemConfig.associateVlaue[3]}%";
             }
             else
             {
@@ -77,7 +82,7 @@ namespace Fort23.Mono
 
             if (breakthrough.itemInfo == null)
             {
-                if (PlayerManager.Instance.BagController.IsEnough(breakthroughItemWidget.itemId, 1))
+                if (PlayerManager.Instance.BagController.IsEnough(breakthrough.itemId, 1))
                 {
                     Text_Affirm.text = "使用";
                     Btn_Affirm.gameObject.SetActive(true);
@@ -115,9 +120,8 @@ namespace Fort23.Mono
         {
             SelectBreakthroughItemPanel selectBreakthroughItemPanel =
                 await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null, UILayer.Middle,
+                    uiData: new object[] { breakthroughItemWidget, callBack },
                     isFocus: false);
-
-            selectBreakthroughItemPanel.CustomInit(breakthroughItemWidget, callBack);
             return selectBreakthroughItemPanel;
         }
     }