道友修改

Assets/Res/UI/HeroInformainPanel/DaoYouInvitePanel.prefab

@@ -89,6 +89,102 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &506399724983741923
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4576285318986263254}
+  - component: {fileID: 7098982894530736914}
+  - component: {fileID: 3558480924074859307}
+  - component: {fileID: 4361170091588961590}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Tex_Tips1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4576285318986263254
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 506399724983741923}
+  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: 8559904281704070969}
+  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: -2.3695984, y: 60.761353}
+  m_SizeDelta: {x: 586.441, y: 112.6639}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7098982894530736914
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 506399724983741923}
+  m_CullTransparentMesh: 1
+--- !u!114 &3558480924074859307
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 506399724983741923}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 64
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 6
+    m_MaxSize: 69
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6CA1\u6709\u53EF\u9080\u8BF7\u7684\u9053\u53CB"
+--- !u!114 &4361170091588961590
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 506399724983741923}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &1332422308143544244
 GameObject:
   m_ObjectHideFlags: 0
@@ -124,6 +220,7 @@ RectTransform:
   - {fileID: 7491882126916522431}
   - {fileID: 4653635054886181200}
   - {fileID: 7822339305649708051}
+  - {fileID: 4576285318986263254}
   - {fileID: 4692689013923525961}
   - {fileID: 5438165848166744141}
   m_Father: {fileID: 3841459159292626461}
@@ -615,7 +712,7 @@ RectTransform:
   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_AnchoredPosition: {x: 0, y: 0.00045575196}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &724288541559200254
@@ -730,6 +827,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Tex_Tips1
+    gameObject: {fileID: 3558480924074859307}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &5116507181306801372
 GameObject:
@@ -1193,9 +1295,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 21
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 40
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -1235,16 +1337,16 @@ RectTransform:
   m_GameObject: {fileID: 7366817748854094879}
   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_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 7556008299970749112}
   m_Father: {fileID: 8559904281704070969}
   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: 4.8, y: 87.23346}
-  m_SizeDelta: {x: 488.6721, y: 357.5932}
+  m_AnchoredPosition: {x: -2.979, y: 83.048706}
+  m_SizeDelta: {x: 692.27, y: 514.8203}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1404023537134062787
 CanvasRenderer:
@@ -1261,7 +1363,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7366817748854094879}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -1297,7 +1399,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 2205515264212013486}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3386,7 +3386,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/ImmortalBondPanel.prefab

@@ -242,17 +242,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1359402998321021210}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 7162416977698810643}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 327243503884649638}
   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: -3.0569, y: -354.95325}
+  m_AnchoredPosition: {x: 1.6276093, y: 5.046753}
   m_SizeDelta: {x: 677.89, y: 460.7005}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4641237089428913100
@@ -336,7 +336,7 @@ GameObject:
   - component: {fileID: 9129800528592546002}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Title
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -356,11 +356,11 @@ RectTransform:
   m_Children:
   - {fileID: 9173573771523279921}
   - {fileID: 9175010539118973105}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 7457214521840115427}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -5.4742, y: -140}
+  m_AnchoredPosition: {x: -0.7896905, y: 65.58008}
   m_SizeDelta: {x: 673.0516, y: 67.3992}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3934428611676916963
@@ -427,7 +427,7 @@ GameObject:
   - component: {fileID: 4891220396990480751}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Scroll View (3)
+  m_Name: bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -777,18 +777,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4602857039045673254}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
+  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 3249805744168002171}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 7457214521840115427}
   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: 354.09546}
-  m_SizeDelta: {x: 826.96, y: 586.6553}
+  m_AnchoredPosition: {x: -0.78948975, y: 2.6933594}
+  m_SizeDelta: {x: 961.5, y: 661.6342}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8796266728886944745
 CanvasRenderer:
@@ -858,6 +858,102 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5865721309907835821
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4727328004991424369}
+  - component: {fileID: 4762904975579296906}
+  - component: {fileID: 3993553364013520035}
+  - component: {fileID: 4495693326472607328}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Tex_Tips2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4727328004991424369
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5865721309907835821}
+  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: 327243503884649638}
+  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: 10.73201, y: 6}
+  m_SizeDelta: {x: 586.441, y: 112.6639}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4762904975579296906
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5865721309907835821}
+  m_CullTransparentMesh: 1
+--- !u!114 &3993553364013520035
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5865721309907835821}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 64
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 6
+    m_MaxSize: 69
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6682\u672A\u83B7\u5F97\u8BCD\u7F00"
+--- !u!114 &4495693326472607328
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5865721309907835821}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &6015582386914595975
 GameObject:
   m_ObjectHideFlags: 0
@@ -960,7 +1056,7 @@ GameObject:
   - component: {fileID: 6291263383671788961}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Scroll View (3)
+  m_Name: bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1220,7 +1316,7 @@ GameObject:
   - component: {fileID: 8995798452343590750}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Scroll View (2)
+  m_Name: bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1239,6 +1335,9 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 303119171736115231}
+  - {fileID: 7687848880532792628}
+  - {fileID: 4612498028179779562}
+  - {fileID: 8391934036047443866}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1316,7 +1415,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &205635573972117461
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1431,6 +1530,102 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7738798198105362083
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8391934036047443866}
+  - component: {fileID: 6621027986772833750}
+  - component: {fileID: 769198364920310270}
+  - component: {fileID: 6963118523230157506}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Tex_Tips1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8391934036047443866
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7738798198105362083}
+  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: 7457214521840115427}
+  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: 10.73201, y: 27.578003}
+  m_SizeDelta: {x: 586.441, y: 112.6639}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6621027986772833750
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7738798198105362083}
+  m_CullTransparentMesh: 1
+--- !u!114 &769198364920310270
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7738798198105362083}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 64
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 6
+    m_MaxSize: 69
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6682\u672A\u9080\u8BF7\u9053\u53CB"
+--- !u!114 &6963118523230157506
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7738798198105362083}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &8572305521124621975
 GameObject:
   m_ObjectHideFlags: 0
@@ -1444,7 +1639,7 @@ GameObject:
   - component: {fileID: 7727375635204751251}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (1)
+  m_Name: Title
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1463,11 +1658,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6637792765956460269}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 327243503884649638}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -5.4742, y: -848}
+  m_AnchoredPosition: {x: -0.7896905, y: 67.670044}
   m_SizeDelta: {x: 673.0516, y: 67.3992}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8233679402347973395
@@ -1534,7 +1729,7 @@ GameObject:
   - component: {fileID: 4069755116707177322}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Scroll View (3)
+  m_Name: bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1553,6 +1748,9 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2996272652403237873}
+  - {fileID: 7983989259447555728}
+  - {fileID: 4215927490646221192}
+  - {fileID: 4727328004991424369}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1715,16 +1913,12 @@ RectTransform:
   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_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 8212670971040085124}
-  - {fileID: 7687848880532792628}
-  - {fileID: 7457214521840115427}
-  - {fileID: 4612498028179779562}
   - {fileID: 205635573972117461}
-  - {fileID: 7983989259447555728}
+  - {fileID: 7457214521840115427}
   - {fileID: 327243503884649638}
-  - {fileID: 4215927490646221192}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1765,4 +1959,24 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Tex_Tips1
+    gameObject: {fileID: 769198364920310270}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Tex_Tips2
+    gameObject: {fileID: 3993553364013520035}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Tex_Tips1
+    gameObject: {fileID: 769198364920310270}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Tex_Tips2
+    gameObject: {fileID: 3993553364013520035}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInvitePanel.cs

@@ -1,92 +1,132 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
+using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
 using Utility;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "DaoYouInvitePanel"  )]
-	public partial class DaoYouInvitePanel : UIPanel
-	{
-		private DaoYouWidget addDaoYouWidget;
-		
-		List<DaoYouWidget> _daoYouWidgets = new List<DaoYouWidget>();
-		
-		private void Init()
-		{
-			isAddStack = true;
-			
-		}
-		protected override void AddEvent()
-		{
-
-		}
-		protected override void DelEvent()
-		{
-
-		}
-		public override void AddButtonEvent()
-		{
-			Btn_Close.onClick.AddListener(() =>
-			{
-				UIManager.Instance.HideUIUIPanel(this);
-			});
-			Btn_Ok.onClick.AddListener(() =>
-			{
-				if (addDaoYouWidget == null)
-				{
-					
-					return;
-				}
-
-				if (!PlayerManager.Instance.myHero.heroData.ImmortalBond.Contains(addDaoYouWidget._daoYouData.id))
-				{
-					PlayerManager.Instance.myHero.heroData.ImmortalBond.Add(addDaoYouWidget._daoYouData.id);
-					PlayerManager.Instance.myHero.ComputeHeroInfo();
-					AccountFileInfo.Instance.SavePlayerData();
-					addDaoYouWidget = null;
-					UIManager.Instance.HideUIUIPanel(this);
-				}
-			});
-		}
-
-
-		public async override CTask<bool> AsyncInit(object[] uiData)
-		{
-			
-			//可以被邀请的道侣
-			foreach (var playerDataDaoYouData in AccountFileInfo.Instance.playerData.daoYouDatas)
-			{
-				if (!PlayerManager.Instance.myHero.heroData.ImmortalBond.Contains(playerDataDaoYouData.id))
-				{
-					DaoYouWidget daoYouWidget = await UIManager.Instance.CreateGComponent<DaoYouWidget>(null, Content);
-					daoYouWidget.CustomInit(playerDataDaoYouData.id);
-					daoYouWidget.OnClick = OnClick2;
-					_daoYouWidgets.Add(daoYouWidget);
-				}
-			}
-			return await base.AsyncInit(uiData);
-		}
-
-		private void OnClick2(ItemWidgetBasic obj)
-		{
-			DaoYouWidget daoYouWidget = obj as DaoYouWidget;
-			addDaoYouWidget = daoYouWidget;
-		}
-
-		public async static CTask OpenPanel()
-		{
-			await UIManager.Instance.LoadAndOpenPanel<DaoYouInvitePanel>(null,UILayer.Top);
-		}
-
-		public override void Close()
-		{
-			foreach (var daoYouWidget in _daoYouWidgets)
-			{
-				UIManager.Instance.DormancyGComponent(daoYouWidget);
-			}
-			_daoYouWidgets.Clear();
-			base.Close();
-		}
-	}
-}
+    [UIBinding(prefab = "DaoYouInvitePanel")]
+    public partial class DaoYouInvitePanel : UIPanel
+    {
+        private DaoYouWidget addDaoYouWidget;
+
+        List<DaoYouWidget> _daoYouWidgets = new List<DaoYouWidget>();
+
+        List<DaoYouaaFfixWidget> _daoYouaaFfixWidgets = new List<DaoYouaaFfixWidget>();
+
+        private void Init()
+        {
+            isAddStack = true;
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            Btn_Ok.onClick.AddListener(() =>
+            {
+                if (addDaoYouWidget == null)
+                {
+                    return;
+                }
+
+                if (!PlayerManager.Instance.myHero.heroData.ImmortalBond.Contains(addDaoYouWidget._daoYouData.id))
+                {
+                    PlayerManager.Instance.myHero.heroData.ImmortalBond.Add(addDaoYouWidget._daoYouData.id);
+                    PlayerManager.Instance.myHero.ComputeHeroInfo();
+                    AccountFileInfo.Instance.SavePlayerData();
+                    addDaoYouWidget = null;
+                    UIManager.Instance.HideUIUIPanel(this);
+                }
+            });
+        }
+
+
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            int count = 0;
+            //可以被邀请的道侣
+            foreach (var playerDataDaoYouData in AccountFileInfo.Instance.playerData.daoYouDatas)
+            {
+                if (!PlayerManager.Instance.myHero.heroData.ImmortalBond.Contains(playerDataDaoYouData.id))
+                {
+                    count++;
+                    DaoYouWidget daoYouWidget = await UIManager.Instance.CreateGComponent<DaoYouWidget>(null, Content);
+                    daoYouWidget.CustomInit(playerDataDaoYouData.id);
+                    daoYouWidget.OnClick = OnClick2;
+                    _daoYouWidgets.Add(daoYouWidget);
+                }
+            }
+
+            Tex_Tips1.gameObject.SetActive(count <= 0);
+            Btn_Ok.transform.Gray();
+
+
+            return await base.AsyncInit(uiData);
+        }
+
+        private async void OnClick2(ItemWidgetBasic obj)
+        {
+            DaoYouWidget daoYouWidget = obj as DaoYouWidget;
+
+
+            if (addDaoYouWidget == daoYouWidget)
+                return;
+            addDaoYouWidget = daoYouWidget;
+            Btn_Ok.transform.RecoverColor();
+            foreach (var daoYouaaFfixWidget in _daoYouaaFfixWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(daoYouaaFfixWidget);
+            }
+
+            _daoYouaaFfixWidgets.Clear();
+
+            var _daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(addDaoYouWidget._daoYouData.id);
+            if (_daoyouModelConfig.daolvSkillID != null)
+            {
+                foreach (var i in _daoyouModelConfig.daolvSkillID)
+                {
+                    DaoYouaaFfixWidget daoYouaaFfixWidge = await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, JiachengContent);
+                    daoYouaaFfixWidge.CustomInit(i);
+                    _daoYouaaFfixWidgets.Add(daoYouaaFfixWidge);
+                }
+            }
+        }
+
+        public async static CTask OpenPanel()
+        {
+            await UIManager.Instance.LoadAndOpenPanel<DaoYouInvitePanel>(null, UILayer.Top);
+        }
+
+        public override void Close()
+        {
+            foreach (var daoYouWidget in _daoYouWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(daoYouWidget);
+            }
+
+            _daoYouWidgets.Clear();
+
+            foreach (var daoYouaaFfixWidget in _daoYouaaFfixWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(daoYouaaFfixWidget);
+            }
+
+            _daoYouaaFfixWidgets.Clear();
+
+            addDaoYouWidget = null;
+            base.Close();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInvitePanelData.cs

@@ -41,6 +41,28 @@ namespace Fort23.Mono
 	      return _Btn_Ok;
 	     }
 	   }
+	  private RectTransform _JiachengContent;
+	  public RectTransform JiachengContent
+	   {
+	   get{
+	      if (_JiachengContent == null)
+	       {
+	         _JiachengContent  = GetUIUnit<RectTransform>("JiachengContent"); 
+	       }
+	      return _JiachengContent;
+	     }
+	   }
+	  private Text _Tex_Tips1;
+	  public Text Tex_Tips1
+	   {
+	   get{
+	      if (_Tex_Tips1 == null)
+	       {
+	         _Tex_Tips1  = GetUIUnit<Text>("Tex_Tips1"); 
+	       }
+	      return _Tex_Tips1;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -44,12 +44,15 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            UpdateUi();
-
-
             return await base.AsyncInit(uiData);
         }
 
+        public override CTask Show()
+        {
+            UpdateUi();
+            return base.Show();
+        }
+
         private async CTask UpdateUi()
         {
             foreach (var daoLvSkillWidget in _daoLvSkillWidgets)
@@ -61,6 +64,9 @@ namespace Fort23.Mono
 
             UIManager.Instance.DormancyAllGComponent<DaoYouWidget>();
 
+            Tex_Tips1.gameObject.SetActive(PlayerManager.Instance.myHero.heroData.ImmortalBond.Count <= 0);
+            Tex_Tips2.gameObject.SetActive(PlayerManager.Instance.myHero.daolvBl.Count <= 0);
+
             //已经邀请的道侣
             foreach (var i in PlayerManager.Instance.myHero.heroData.ImmortalBond)
             {

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

@@ -52,6 +52,28 @@ namespace Fort23.Mono
 	      return _Btn_YaoQing;
 	     }
 	   }
+	  private Text _Tex_Tips1;
+	  public Text Tex_Tips1
+	   {
+	   get{
+	      if (_Tex_Tips1 == null)
+	       {
+	         _Tex_Tips1  = GetUIUnit<Text>("Tex_Tips1"); 
+	       }
+	      return _Tex_Tips1;
+	     }
+	   }
+	  private Text _Tex_Tips2;
+	  public Text Tex_Tips2
+	   {
+	   get{
+	      if (_Tex_Tips2 == null)
+	       {
+	         _Tex_Tips2  = GetUIUnit<Text>("Tex_Tips2"); 
+	       }
+	      return _Tex_Tips2;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{