diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
index 202ff27441..fd165cf820 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
@@ -2868,80 +2868,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
---- !u!1 &984883796
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 984883797}
- - component: {fileID: 984883799}
- - component: {fileID: 984883798}
- m_Layer: 5
- m_Name: Image (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &984883797
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 984883796}
- 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_Children: []
- m_Father: {fileID: 2423465471356683207}
- m_RootOrder: 29
- 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: 85}
- m_SizeDelta: {x: 1082, y: 1920}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &984883799
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 984883796}
- m_CullTransparentMesh: 0
---- !u!114 &984883798
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 984883796}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.5803922}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 4fc374a6dce71e443abe943c261eab55, 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
--- !u!1 &1002555690
GameObject:
m_ObjectHideFlags: 0
@@ -9953,6 +9879,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &323802826509203418
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2790714697526120800}
+ - component: {fileID: 3463022531422860952}
+ - component: {fileID: 579617120603253827}
+ - component: {fileID: 759329938732244913}
+ m_Layer: 0
+ m_Name: name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2790714697526120800
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 323802826509203418}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 7222930730222701088}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 800, y: 38}
+ m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3463022531422860952
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 323802826509203418}
+ m_CullTransparentMesh: 0
+--- !u!114 &579617120603253827
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 323802826509203418}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.009433985, g: 0.009211485, b: 0.009211485, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
+ m_FontSize: 35
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text:
+ LanguageIndex: 0
+--- !u!114 &759329938732244913
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 323802826509203418}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
--- !u!1 &326833675838045230
GameObject:
m_ObjectHideFlags: 0
@@ -10796,6 +10817,101 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &510929527871806642
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 34421898330128293}
+ - component: {fileID: 9848764314094300}
+ - component: {fileID: 8076970719945406627}
+ - component: {fileID: 7551890038951934421}
+ m_Layer: 0
+ m_Name: name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &34421898330128293
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 510929527871806642}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -200}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3319923457760513102}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 450, y: -25}
+ m_SizeDelta: {x: 400, y: 40}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9848764314094300
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 510929527871806642}
+ m_CullTransparentMesh: 0
+--- !u!114 &8076970719945406627
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 510929527871806642}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
+ m_FontSize: 32
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: 111111111111111111111111111111
+ LanguageIndex: 0
+--- !u!114 &7551890038951934421
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 510929527871806642}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
--- !u!1 &519556077802838666
GameObject:
m_ObjectHideFlags: 0
@@ -14806,6 +14922,86 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1203122398529045696
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 865582988718049366}
+ - component: {fileID: 7265067235129485750}
+ - component: {fileID: 2195410254709287390}
+ m_Layer: 5
+ m_Name: text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &865582988718049366
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1203122398529045696}
+ 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_Children: []
+ m_Father: {fileID: 7592583781240096572}
+ m_RootOrder: 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: -4.700012, y: 0}
+ m_SizeDelta: {x: 197.07, y: 47.75}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7265067235129485750
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1203122398529045696}
+ m_CullTransparentMesh: 0
+--- !u!114 &2195410254709287390
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1203122398529045696}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.85490197, g: 0.5882353, b: 0.28235295, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 70
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u795E\u5E94\u5C5E\u6027"
+ LanguageIndex: 11580
--- !u!1 &1220464110280881561
GameObject:
m_ObjectHideFlags: 0
@@ -27950,6 +28146,90 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &3502467361483905382
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7034621390176500919}
+ - component: {fileID: 5240057174635246244}
+ - component: {fileID: 6820821153068041173}
+ - component: {fileID: 6540665126934646377}
+ m_Layer: 5
+ m_Name: title
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &7034621390176500919
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3502467361483905382}
+ 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_Children:
+ - {fileID: 7592583781240096572}
+ m_Father: {fileID: 2456842363814967438}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 540, y: -434.96985}
+ m_SizeDelta: {x: 800, y: 64.08}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5240057174635246244
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3502467361483905382}
+ m_CullTransparentMesh: 0
+--- !u!114 &6820821153068041173
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3502467361483905382}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+--- !u!114 &6540665126934646377
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3502467361483905382}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
--- !u!1 &3516495220728142311
GameObject:
m_ObjectHideFlags: 0
@@ -29116,6 +29396,55 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &3744316963401036139
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2456842363814967438}
+ - component: {fileID: 7802359398045994946}
+ m_Layer: 5
+ m_Name: GeneralBigPopup_IncarnationDes2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2456842363814967438
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3744316963401036139}
+ 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_Children:
+ - {fileID: 7222930730222701088}
+ - {fileID: 7034621390176500919}
+ - {fileID: 3319923457760513102}
+ - {fileID: 4352524436166072161}
+ - {fileID: 563433611652599592}
+ m_Father: {fileID: 2423465471356683207}
+ m_RootOrder: 29
+ 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 &7802359398045994946
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3744316963401036139}
+ m_CullTransparentMesh: 0
--- !u!1 &3760893303146919856
GameObject:
m_ObjectHideFlags: 0
@@ -33788,6 +34117,91 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text:
LanguageIndex: 0
+--- !u!1 &4697527109777214669
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3319923457760513102}
+ - component: {fileID: 5475098668402452269}
+ - component: {fileID: 3717921641432392457}
+ - component: {fileID: 4905060002077212533}
+ m_Layer: 5
+ m_Name: pro
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3319923457760513102
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4697527109777214669}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 200}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 34421898330128293}
+ m_Father: {fileID: 2456842363814967438}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 540, y: 291}
+ m_SizeDelta: {x: 800, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5475098668402452269
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4697527109777214669}
+ m_CullTransparentMesh: 0
+--- !u!114 &3717921641432392457
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4697527109777214669}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
+--- !u!114 &4905060002077212533
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4697527109777214669}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 1
+ m_StartCorner: 0
+ m_StartAxis: 1
+ m_CellSize: {x: 420, y: 50}
+ m_Spacing: {x: 0, y: 0}
+ m_Constraint: 0
+ m_ConstraintCount: 2
--- !u!1 &4760152867400636903
GameObject:
m_ObjectHideFlags: 0
@@ -37587,6 +38001,90 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &5415436737273850087
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7222930730222701088}
+ - component: {fileID: 901526931831821648}
+ - component: {fileID: 4859499800277174102}
+ - component: {fileID: 5723307080002350047}
+ m_Layer: 5
+ m_Name: tip
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &7222930730222701088
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5415436737273850087}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 200}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 2790714697526120800}
+ m_Father: {fileID: 2456842363814967438}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 540, y: -525.96985}
+ m_SizeDelta: {x: 800, y: 38}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &901526931831821648
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5415436737273850087}
+ m_CullTransparentMesh: 0
+--- !u!114 &4859499800277174102
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5415436737273850087}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
+--- !u!114 &5723307080002350047
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5415436737273850087}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, 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: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 1
--- !u!1 &5429785474783642778
GameObject:
m_ObjectHideFlags: 0
@@ -38512,7 +39010,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1823191076860614843
RectTransform:
m_ObjectHideFlags: 0
@@ -45418,6 +45916,89 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u9644\u8EAB\u4E2D"
LanguageIndex: 0
+--- !u!1 &6558540842224608070
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4352524436166072161}
+ - component: {fileID: 173541755880759830}
+ - component: {fileID: 4518853072004620677}
+ - component: {fileID: 1436756655644822058}
+ m_Layer: 5
+ m_Name: proGroup
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &4352524436166072161
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6558540842224608070}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 200}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 2456842363814967438}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 140, y: -616.96985}
+ m_SizeDelta: {x: 800, y: 0}
+ m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &173541755880759830
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6558540842224608070}
+ m_CullTransparentMesh: 0
+--- !u!114 &4518853072004620677
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6558540842224608070}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
+--- !u!114 &1436756655644822058
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6558540842224608070}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_Spacing: 10
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 1
--- !u!1 &6575109109089505024
GameObject:
m_ObjectHideFlags: 0
@@ -47886,7 +48467,7 @@ RectTransform:
- {fileID: 2140040536}
- {fileID: 1006421095}
- {fileID: 6207233311855498205}
- - {fileID: 984883797}
+ - {fileID: 2456842363814967438}
m_Father: {fileID: 1047325092235970838}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -50878,6 +51459,119 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &7448178162357609332
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 563433611652599592}
+ - component: {fileID: 8914469466657701054}
+ - component: {fileID: 5428647197648868176}
+ - component: {fileID: 9064445059898336394}
+ - component: {fileID: 5839001561519970521}
+ m_Layer: 5
+ m_Name: bg
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &563433611652599592
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7448178162357609332}
+ 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_Children: []
+ m_Father: {fileID: 2456842363814967438}
+ m_RootOrder: 4
+ 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: 123.99011}
+ m_SizeDelta: {x: 800, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8914469466657701054
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7448178162357609332}
+ m_CullTransparentMesh: 0
+--- !u!114 &5428647197648868176
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7448178162357609332}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: a9d99aaadd0a9e143b499c7f81be48b2, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &9064445059898336394
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7448178162357609332}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 30
+ m_Bottom: 30
+ m_ChildAlignment: 0
+ m_Spacing: 20
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 1
+--- !u!114 &5839001561519970521
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7448178162357609332}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
--- !u!1 &7463970635137092722
GameObject:
m_ObjectHideFlags: 0
@@ -53787,6 +54481,81 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5996"
LanguageIndex: 10139
+--- !u!1 &8136239368567998138
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7592583781240096572}
+ - component: {fileID: 8481705063453734731}
+ - component: {fileID: 3403134640558760592}
+ m_Layer: 5
+ m_Name: name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7592583781240096572
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8136239368567998138}
+ 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_Children:
+ - {fileID: 865582988718049366}
+ m_Father: {fileID: 7034621390176500919}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 400, y: -32.04}
+ m_SizeDelta: {x: 280.5, y: 64.08}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8481705063453734731
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8136239368567998138}
+ m_CullTransparentMesh: 0
+--- !u!114 &3403134640558760592
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8136239368567998138}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &8152049152556875637
GameObject:
m_ObjectHideFlags: 0
@@ -57118,7 +57887,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 123.99011}
- m_SizeDelta: {x: 800, y: 0}
+ m_SizeDelta: {x: 800, y: 386}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &856329827745869401
CanvasRenderer:
@@ -57232,7 +58001,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -2.7, y: 0}
- m_SizeDelta: {x: 884.8, y: 0}
+ m_SizeDelta: {x: 884.8, y: 252}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1478443720213518412
CanvasRenderer:
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
index f8cf7820aa..52596c40b9 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
@@ -38,6 +38,7 @@ local contentScripts = {
--灵脉秘境纪录
[GENERAL_POPUP_TYPE.LingMaiRecord] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord"), panelName = "GeneralBigPopup_LingMaiRecord"},
[GENERAL_POPUP_TYPE.IncarnationDes] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes"), panelName = "GeneralBigPopup_IncarnationDes"},
+ [GENERAL_POPUP_TYPE.IncarnationDes2] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes2"), panelName = "GeneralBigPopup_IncarnationDes2"},
[GENERAL_POPUP_TYPE.chooseTailsManSoul] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip"), panelName = "GeneralBigPopup_WishTailsmanSoulChip"},
--寻仙招募选择up英雄
[GENERAL_POPUP_TYPE.ChooseUpHero] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpHero"), panelName = "GeneralBigPopup_ChooseUpHero"},
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes2.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes2.lua
new file mode 100644
index 0000000000..234fcb0e27
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes2.lua
@@ -0,0 +1,99 @@
+----- 神应属性弹窗 -----
+local this = {}
+local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
+--传入父脚本模块
+local parent
+local sortingOrder=0
+local attriList = {}
+
+function this:InitComponent(gameObject)
+ self.bg =Util.GetGameObject(gameObject, "bg")
+ self.proGroup =Util.GetGameObject(gameObject, "proGroup")
+ self.proTitle =Util.GetGameObject(gameObject, "title")
+ self.proTip =Util.GetGameObject(gameObject, "tip")
+ self.proValue =Util.GetGameObject(gameObject, "pro")
+ self.proNum =Util.GetGameObject(self.proValue, "name")
+end
+
+function this:BindEvent()
+
+end
+
+function this:AddListener()
+end
+
+function this:RemoveListener()
+end
+
+function this:OnShow(_parent,_Data)
+ parent=_parent
+ sortingOrder = _parent.sortingOrder
+ parent.BG:SetActive(false)
+ local args = _Data
+ local data = args[1]
+ for i = 1, #data do
+ if not attriList[i] then
+ attriList[i] = {}
+ attriList[i].proGroup = newObjToParent(self.proGroup,self.bg)
+ end
+ attriList[i].proGroup.gameObject:SetActive(false)
+ if not attriList[i].title then
+ attriList[i].title = newObjToParent(self.proTitle,attriList[i].proGroup)
+ attriList[i].titleCom = Util.GetGameObject(attriList[i].title,"name/text"):GetComponent("Text")
+ end
+ attriList[i].title.gameObject:SetActive(false)
+ for j = 1, #data[i].pro do
+ if not attriList[i].pro then
+ attriList[i].pro = {}
+ end
+ if not attriList[i].TextCom then
+ attriList[i].TextCom = {}
+ end
+ if not attriList[i].proParent then
+ attriList[i].proParent = newObjToParent(self.proValue,attriList[i].proGroup)
+ end
+ if not attriList[i].pro[j] then
+ attriList[i].pro[j] = newObjToParent(self.proNum,attriList[i].proParent)
+ attriList[i].TextCom[j] = attriList[i].pro[j]:GetComponent("Text")
+ end
+ attriList[i].pro[j].gameObject:SetActive(false)
+ end
+ if not attriList[i].tip then
+ attriList[i].tip = newObjToParent(self.proTip,attriList[i].proGroup)
+ attriList[i].tipComp = Util.GetGameObject(attriList[i].tip,"name"):GetComponent("Text")
+ end
+ attriList[i].proGroup.gameObject:SetActive(false)
+ end
+
+ for i = 1, #data do
+ attriList[i].proGroup.gameObject:SetActive(true)
+ if data[i].title and data[i].title ~= "" then
+ attriList[i].title.gameObject:SetActive(true)
+ attriList[i].titleCom.text = data[i].title
+ else
+ attriList[i].title.gameObject:SetActive(false)
+ end
+ for j = 1, #data[i].pro do
+ attriList[i].pro[j].gameObject:SetActive(true)
+ attriList[i].TextCom[j].text = data[i].pro[j]
+ end
+ if data[i].tip and data[i].tip ~= "" then
+ attriList[i].tip.gameObject:SetActive(true)
+ attriList[i].tipComp.text = data[i].tip
+ else
+ attriList[i].tip.gameObject:SetActive(false)
+ end
+ end
+end
+
+function this:OnClose()
+ Util.ClearChild(self.bg.transform)
+ attriList = {}
+end
+
+function this:OnDestroy()
+ Util.ClearChild(self.bg.transform)
+ attriList = {}
+end
+
+return this
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes2.lua.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes2.lua.meta
new file mode 100644
index 0000000000..2466342dd1
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes2.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f11aea8f71233a643ac7a7dc5e17dc63
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
index e064e907a1..5387b95192 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
@@ -292,6 +292,17 @@ function this.AddPotentialDataByType(dyn,type,lv)
end
end
+--改变所有英雄的礼物等级
+function this.ChangeAllHeroGiftLV()
+ for i, v in pairs(heroDatas) do
+ if v.potential then
+ for key, value in pairs(v.potential) do
+ value.giftLv=GiftManager.GetHeroPotencyLvById(i)
+ end
+ end
+ end
+end
+
--设置法灵
function this.SetHeroBaublesId(dyn,_id)
if heroDatas[dyn] then
@@ -1219,7 +1230,7 @@ function this.UpdateHeroLvEnd()
if heroEndStar == nil then
heroEndStar = v.Star
end
- LogError("heroEndStar================="..heroEndStar)
+ -- LogError("heroEndStar================="..heroEndStar)
for i, v2 in ConfigPairs(heroRankUpConfig) do
if v2.Star == v.Star then
if v2.OpenStar == heroEndStar then
@@ -2967,72 +2978,73 @@ end
local rewardGroup = ConfigManager.GetConfig(ConfigName.RewardGroup)
function this.GetHeroReturnItems(selectHeroData, type)
local allRewardData = {}
- -- if type == GENERAL_POPUP_TYPE.ResolveRecall then
- -- local specificValue = tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 34).Value) / 10000
- -- local ShowItemlist = {}
- -- --HeroReturn 的 ReturnHero + RankupReturn * specificValue + HeroLevelConfig 的 Consume * specificValue
- -- --先把回溯英雄放进去
- -- for i, v in pairs(selectHeroData) do
- -- local curHeroData = heroDatas[i]
- -- if not curHeroData then
- -- return
- -- end
- -- local pId
- -- if curHeroData.breakId == 0 then
- -- pId=0
- -- else
- -- pId= heroRankUpConfig[curHeroData.breakId].Phase[2]
- -- end
- -- local heroReturnConfig =
- -- ConfigManager.TryGetConfigDataByDoubleKey(
- -- ConfigName.HeroReturn,
- -- "HeroId",
- -- curHeroData.id,
- -- "Star",
- -- pId
- -- )
- -- local rewardShowStr1 = {}
- -- if not heroReturnConfig then
- -- LogRed("pId:"..pId.." curHeroData.breakId:"..curHeroData.breakId.." curHeroData.id:"..curHeroData.id)
- -- else
- -- ShowItemlist[heroReturnConfig.HeroId] = {heroReturnConfig.HeroId,1,curHeroData.star}
- -- rewardShowStr1 = heroReturnConfig.RankupReturn
- -- if rewardShowStr1 then
- -- for k,v in ipairs(rewardShowStr1) do
- -- if v[1] and v[2] then
- -- if not ShowItemlist[v[1]] then
- -- ShowItemlist[v[1]] = {v[1], v[2] * specificValue}
- -- else
- -- ShowItemlist[v[1]] = {v[1],ShowItemlist[v[1]][2] + v[2] * specificValue}
- -- end
- -- end
- -- end
- -- end
- -- end
- -- rewardShowStr1 = ConfigManager.GetConfigData(ConfigName.HeroLevelConfig, v.lv).SumConsume
- -- if rewardShowStr1 then
- -- for k,v in ipairs(rewardShowStr1) do
- -- if not ShowItemlist[v[1]] then
- -- ShowItemlist[v[1]] = {v[1], v[2] * specificValue}
- -- else
- -- ShowItemlist[v[1]] = {v[1],ShowItemlist[v[1]][2] + v[2] * specificValue}
- -- end
- -- end
- -- end
- -- --this.GetHeroReturnItems2(ShowItemlist,allRewardData)
- -- end
- -- local dropList = {}
- -- for n,m in pairs(ShowItemlist) do
- -- local curReward = {}
- -- curReward.id = m[1]
- -- curReward.num = math.floor(m[2])
- -- curReward.itemConfig = itemConfig[curReward.id]
- -- curReward.star = m[3] or nil
- -- table.insert(dropList, curReward)
- -- end
- -- return dropList
- -- else
- if type == GENERAL_POPUP_TYPE.ResolveDismantle or type== GENERAL_POPUP_TYPE.ResolveRecall then --献祭
+ if type == GENERAL_POPUP_TYPE.ResolveRecall then
+ local specificValue = tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 34).Value) / 10000
+ local ShowItemlist = {}
+ --HeroReturn 的 ReturnHero + RankupReturn * specificValue + HeroLevelConfig 的 Consume * specificValue
+ --先把回溯英雄放进去
+ for i, v in pairs(selectHeroData) do
+ local curHeroData = heroDatas[i]
+ if not curHeroData then
+ return
+ end
+ local pId
+ if curHeroData.breakId == 0 then
+ pId=0
+ else
+ pId= heroRankUpConfig[curHeroData.breakId].Phase[2]
+ end
+ local heroReturnConfig =
+ ConfigManager.TryGetConfigDataByDoubleKey(
+ ConfigName.HeroReturn,
+ "HeroId",
+ curHeroData.id,
+ "Star",
+ pId
+ )
+ local rewardShowStr1 = {}
+ if not heroReturnConfig then
+ LogRed("pId:"..pId.." curHeroData.breakId:"..curHeroData.breakId.." curHeroData.id:"..curHeroData.id)
+ else
+ ShowItemlist[heroReturnConfig.HeroId] = {heroReturnConfig.HeroId,1,curHeroData.star}
+ rewardShowStr1 = heroReturnConfig.RankupReturn
+ if rewardShowStr1 then
+ for k,v in ipairs(rewardShowStr1) do
+ if v[1] and v[2] then
+ if not ShowItemlist[v[1]] then
+ ShowItemlist[v[1]] = {v[1], v[2] * specificValue}
+ else
+ ShowItemlist[v[1]] = {v[1],ShowItemlist[v[1]][2] + v[2] * specificValue}
+ end
+ end
+ end
+ end
+ end
+ rewardShowStr1 = ConfigManager.GetConfigData(ConfigName.HeroLevelConfig, v.lv).SumConsume
+ if rewardShowStr1 then
+ for k,v in ipairs(rewardShowStr1) do
+ if not ShowItemlist[v[1]] then
+ ShowItemlist[v[1]] = {v[1], v[2] * specificValue}
+ else
+ ShowItemlist[v[1]] = {v[1],ShowItemlist[v[1]][2] + v[2] * specificValue}
+ end
+ end
+ end
+ --this.GetHeroReturnItems2(ShowItemlist,allRewardData)
+ end
+ local dropList = {}
+ for n,m in pairs(ShowItemlist) do
+ local curReward = {}
+ curReward.id = m[1]
+ curReward.num = math.floor(m[2])
+ curReward.itemConfig = itemConfig[curReward.id]
+ curReward.star = m[3] or nil
+ table.insert(dropList, curReward)
+ end
+ return dropList
+ elseif type == GENERAL_POPUP_TYPE.ResolveDismantle then
+
+ --if type == GENERAL_POPUP_TYPE.ResolveDismantle or type== GENERAL_POPUP_TYPE.ResolveRecall then --献祭
local specificValue = tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 35).Value) / 10000
for i, v in pairs(selectHeroData) do
--当英雄一次都未突破和进阶时
@@ -3196,7 +3208,7 @@ function this.GetReturnItemsByType(selectHeroData)
for i, v in pairs(selectHeroData) do
local curHeroData = heroDatas[i]
local temp = {}
- if curHeroData.talismanList > 1 then
+ if curHeroData.talismanList and curHeroData.talismanList > 1 then
local temp1 =tonumber(ConfigManager.GetConfigData(ConfigName.HeroConfig, curHeroData.id).EquipTalismana[2])
for i = 1, curHeroData.talismanList - 1 do
temp = ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",temp1,"Level",i).RankupBasicMaterial
@@ -4244,6 +4256,19 @@ function this.GetHeroPotencyAddByType(_dyn,_type)
end
+function this.GetHeroPotencyAddByTypeAndPotencyData(_data,_type)
+ if _data and _type and _data[_type] then
+ local aaa=_data[_type]
+ local allLv=aaa.lv+aaa.giftLv
+ local config=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew,"Type",_type,"Level",allLv)
+ if config then
+ local pro=config.Attribute/10000
+ return pro
+ end
+ end
+ return 0
+end
+
function this.ResetHero(dynamicloadId)
if heroDatas[dynamicloadId] then
diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua
index a9d62c92ef..4fac1cd75b 100644
--- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua
@@ -5,6 +5,7 @@ local Trump = ConfigManager.GetConfig(ConfigName.Trump)
local TrumpLevelupPool = ConfigManager.GetConfig(ConfigName.TrumpLevelupPool)
local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig)
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
+local propertyConfig=ConfigManager.GetConfig(ConfigName.PropertyConfig)
this.TailsmanList = {}
function this.Initialize()
end
@@ -123,7 +124,10 @@ end
function this.GetTailsmanTotalPro()
local proList = {}
+ local special=ConfigManager.GetConfigData(ConfigName.SpecialConfig,177)
+ local num=tonumber(special.Value)/10000
for k,v in pairs(this.TailsmanList) do
+ --LogError("Trump[k].LvupPool==========="..Trump[k].LvupPool.." level==="..v)
local tempPro = ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrumpLevelupPool,"PoolId",Trump[k].LvupPool,"Level",v).LvupProps
if tempPro then
for i = 1,#tempPro do
@@ -134,18 +138,77 @@ function this.GetTailsmanTotalPro()
end
end
end
- local tempPro = this.GetTotalStarPro()
- if tempPro then
- for i = 1,#tempPro do
- if not proList[tempPro[i][1]] then
- proList[tempPro[i][1]] = 0
+ --获取所有技能加成属性
+ local addLv=0
+ for i=1,5 do
+ local curData = TailsManSoulManager.GetTailsmanSoulDatasByPro(i)
+ for j=1,#curData do
+ --LogError("curData.lv=========="..curData[j].lv)
+ if curData[j].lv>0 then
+ addLv=addLv+curData[j].lv
end
- proList[tempPro[i][1]] = proList[tempPro[i][1]] + tempPro[i][2]
+
end
end
+ --屏蔽星数加成属性
+ -- local tempPro = this.GetTotalStarPro()
+ -- if tempPro then
+ -- for i = 1,#tempPro do
+ -- if not proList[tempPro[i][1]] then
+ -- proList[tempPro[i][1]] = 0
+ -- end
+ -- proList[tempPro[i][1]] = proList[tempPro[i][1]] + tempPro[i][2]
+ -- end
+ -- end
+
+ -- for k, v in pairs(proList) do
+ -- LogError("属性 v========================================="..v)
+ -- end
+ -- LogError("addlv============================"..addLv)
+ if addLv>0 then
+ for k, v in pairs(proList) do
+ if propertyConfig[k].Style==1 then
+ proList[k]=math.floor(v*(1+addLv*num)+0.5)
+ end
+ end
+ end
return proList
end
+function this.GetTailsmanTotalProNoAdd()
+ local proList = {}
+ local special=ConfigManager.GetConfigData(ConfigName.SpecialConfig,177)
+ local num=tonumber(special.Value)/10000
+ for k,v in pairs(this.TailsmanList) do
+ --LogError("Trump[k].LvupPool==========="..Trump[k].LvupPool.." level==="..v)
+ local tempPro = ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrumpLevelupPool,"PoolId",Trump[k].LvupPool,"Level",v).LvupProps
+ if tempPro then
+ for i = 1,#tempPro do
+ if not proList[tempPro[i][1]] then
+ proList[tempPro[i][1]] = 0
+ end
+ proList[tempPro[i][1]] = proList[tempPro[i][1]] + tempPro[i][2]
+ end
+ end
+ end
+
+ --屏蔽星数加成属性
+ -- local tempPro = this.GetTotalStarPro()
+ -- if tempPro then
+ -- for i = 1,#tempPro do
+ -- if not proList[tempPro[i][1]] then
+ -- proList[tempPro[i][1]] = 0
+ -- end
+ -- proList[tempPro[i][1]] = proList[tempPro[i][1]] + tempPro[i][2]
+ -- end
+ -- end
+ -- for k, v in pairs(proList) do
+ -- LogError("属性 v========================================="..v)
+ -- end
+ -- LogError("addlv============================"..addLv)
+
+ return proList
+end
function this.GetTailsmanCost(id,lv)
local num = ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrumpLevelupPool,"PoolId",Trump[id].LvupPool,"Level",lv).LvupCostItemNum
local costId = Trump[id].LvupCostItem
diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
index 3cdc42caee..82be53ffe7 100644
--- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
@@ -2,7 +2,10 @@
TailsmanSoulMainPanel = Inherit(BasePanel)
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
+local specialConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,177)
local sortOrder = 0
+local pro=tonumber(specialConfig.Value)/10000
+local addLv=0
local curData = {}
function TailsmanSoulMainPanel:InitComponent()
self.spLoader = SpriteLoader.New()
@@ -14,8 +17,9 @@ function TailsmanSoulMainPanel:InitComponent()
self.tailsmainSoulDi = Util.GetGameObject(self.tailsmainSoul, "di"):GetComponent("Image")
self.icon = Util.GetGameObject(self.tailsmainSoul, "icon"):GetComponent("Image")
- self.starGray = Util.GetGameObject(self.transform,"proMainLayout/starGrid/starGray")
- self.starLight = Util.GetGameObject(self.transform,"proMainLayout/starGrid/starLight")
+ --self.starGray = Util.GetGameObject(self.transform,"proMainLayout/starGrid/starGray")
+ --self.starLight = Util.GetGameObject(self.transform,"proMainLayout/starGrid/starLight")
+ self.starGrid = Util.GetGameObject(self.transform,"proMainLayout/starGrid")
self.upLvBtn = Util.GetGameObject(self.transform, "proMainLayout/upLvBtn")
self.upLvBtnText = Util.GetGameObject(self.upLvBtn, "Text"):GetComponent("Text")
self.upLvBtnRed = Util.GetGameObject(self.upLvBtn, "red")
@@ -107,7 +111,7 @@ function TailsmanSoulMainPanel:RemoveListener()
end
function TailsmanSoulMainPanel:OnSortingOrderChange()
- --Util.SetParticleSortLayer(self.effect,self.sortingOrder + 1)
+ -- Util.SetParticleSortLayer(self.effect,self.sortingOrder + 1)
end
function TailsmanSoulMainPanel:OnOpen(curCompId)
@@ -138,14 +142,15 @@ end
function TailsmanSoulMainPanel:GetSkillDataList()
local datas = {}
+
for k,v in pairs(self.skillDataList) do
local str = v
if self.complv == k then
- str = string.format("%s",str)
+ str = string.format("%s %s",str,"羁绊基础属性提升"..pro*100*k.."%")
elseif self.complv < k then
- str = string.format("%s",str)
+ str = string.format("%s %s",str,"羁绊聚灵基础属性提升"..pro*100*k.."%")
else
- str = string.format("%s",str)
+ str = string.format("%s %s",str,"羁绊聚灵基础属性提升"..pro*100*k.."%")
end
datas[k] = str
end
@@ -156,13 +161,26 @@ function TailsmanSoulMainPanel:ChangeTailsMan()
self.data = self.trumpList[self.index]
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(self.data.config.Icon))
--self.tailsmainSoulDi.sprite = self.spLoader:LoadSprite(GetTailsmanDiImage[self.data.config.Quality])
+ --获取技能加成等级
+ addLv=0
+ for i=1,5 do
+ local curData = TailsManSoulManager.GetTailsmanSoulDatasByPro(i)
+ for j=1,#curData do
+ --LogError("curData.lv=========="..curData[j].lv)
+ if curData[j].lv>0 then
+ addLv=addLv+curData[j].lv
+ end
+
+ end
+ end
local data1 = self:GetProData()
+
self:SetProList(data1,self.proList,self.proGrid,self.pro)
self:SetSelect()
self:SetCostItem()
- self:SetStar(self.starGray,self.data.config.LvMax)
- self:SetStar(self.starLight,self.data.lv)
-
+ --self:SetStar(self.starGray,self.data.config.LvMax)
+ --self:SetStar(self.starLight,self.data.lv)
+ SetHeroStars(self.spLoader,self.starGrid,self.data.lv)
end
function TailsmanSoulMainPanel:GetProData()
@@ -178,9 +196,11 @@ function TailsmanSoulMainPanel:GetProData()
end
local str = ""
for i = 1,#curData do
- str = string.format("%s:%s",propertyConfig[curData[i][1]].Info,GetPropertyFormatStrOne(propertyConfig[curData[i][1]].Style,curData[i][2]) )
+ --LogError("addlv======================"..addLv.." pro========="..pro)
+ local value=math.floor(curData[i][2]*(1+addLv*pro)+0.5)
+ str = string.format("%s:%s",propertyConfig[curData[i][1]].Info,GetPropertyFormatStrOne(propertyConfig[curData[i][1]].Style,value) )
if nextProData[curData[i][1]] then
- str = str..string.format("(+%s)",GetPropertyFormatStrOne(propertyConfig[curData[i][1]].Style,nextProData[curData[i][1]] - curData[i][2]))
+ str = str..string.format("(+%s)",GetPropertyFormatStrOne(propertyConfig[curData[i][1]].Style,nextProData[curData[i][1]] - value))
end
table.insert(proData,str)
end
@@ -195,6 +215,9 @@ function TailsmanSoulMainPanel:SetProData(proData)
end
proList[proData[i][1]] = proList[proData[i][1]] + proData[i][2]
end
+ for k, v in pairs(proList) do
+ proList[k]=math.floor(v*(1+addLv*pro)+0.5)
+ end
return proList
end
@@ -263,8 +286,9 @@ function TailsmanSoulMainPanel:SetTailsManList(data,grid,pre)
self.tailsList[i].card = Util.GetGameObject(self.tailsList[i].go,"ItemView")
self.tailsList[i].bg = Util.GetGameObject(self.tailsList[i].card.transform,"item/frame"):GetComponent("Image")
self.tailsList[i].icon = Util.GetGameObject(self.tailsList[i].card.transform,"item/icon"):GetComponent("Image")
- self.tailsList[i].starGray = Util.GetGameObject(self.tailsList[i].card.transform,"item/starGrid/starGray")
- self.tailsList[i].starLight = Util.GetGameObject(self.tailsList[i].card.transform,"starGrid/starLight")
+ --self.tailsList[i].starGray = Util.GetGameObject(self.tailsList[i].card.transform,"item/starGrid/starGray")
+ --self.tailsList[i].starLight = Util.GetGameObject(self.tailsList[i].card.transform,"starGrid/starLight")
+ self.tailsList[i].starGrid = Util.GetGameObject(self.tailsList[i].card.transform,"starGrid")
self.tailsList[i].name = Util.GetGameObject(self.tailsList[i].card.transform,"name"):GetComponent("Text")
self.tailsList[i].red = Util.GetGameObject(self.tailsList[i].card.transform,"redPoint")
end
@@ -272,8 +296,9 @@ function TailsmanSoulMainPanel:SetTailsManList(data,grid,pre)
self.tailsList[i].bg.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(data[i].config.Quality))
self.tailsList[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(data[i].config.Icon))
self.tailsList[i].name.text = data[i].config.Name
- self:SetStar(self.tailsList[i].starGray,data[i].config.LvMax)
- self:SetStar(self.tailsList[i].starLight,data[i].lv)
+ --self:SetStar(self.tailsList[i].starGray,data[i].config.LvMax)
+ --self:SetStar(self.tailsList[i].starLight,data[i].lv)
+ SetHeroStars(self.spLoader,self.tailsList[i].starGrid,data[i].lv)
local costId,num = TailsManSoulManager.GetTailsmanCost(data[i].id,data[i].lv)
local curNum = BagManager.GetItemCountById(costId)
if num and num > 0 and curNum >= num then