diff --git a/Assets/ManagedResources/Atlas/TailsmanSoulAtlas/f_fabaojuling_jindutiaohuang.png.meta b/Assets/ManagedResources/Atlas/TailsmanSoulAtlas/f_fabaojuling_jindutiaohuang.png.meta index 8f7c5e16d5..2048079c78 100644 --- a/Assets/ManagedResources/Atlas/TailsmanSoulAtlas/f_fabaojuling_jindutiaohuang.png.meta +++ b/Assets/ManagedResources/Atlas/TailsmanSoulAtlas/f_fabaojuling_jindutiaohuang.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 0, y: 2, z: 0, w: 2} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab index 56498edcbb..fa104cd123 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab @@ -47440,7 +47440,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.000007744202, y: 50} + m_AnchoredPosition: {x: -0.0000022442177, y: 50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 1, y: 0.5} --- !u!114 &455843809901100221 @@ -81391,8 +81391,8 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 0.00000011920929, y: 0.74999994} + m_SizeDelta: {x: -8, y: -6.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5820556875347599956 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab index a6b09f8654..4a752df415 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab @@ -724,9 +724,9 @@ RectTransform: 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: 114.75006} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 178.9, y: 114.75006} + m_SizeDelta: {x: 308.4, y: 0} + m_Pivot: {x: 1, y: 1} --- !u!114 &5086809663402702269 MonoBehaviour: m_ObjectHideFlags: 0 @@ -745,10 +745,10 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 11.8 - m_ChildForceExpandWidth: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 1 --- !u!114 &5086809663402702270 MonoBehaviour: @@ -762,8 +762,87 @@ MonoBehaviour: m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 + m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &940596303370961447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7935805716329333929} + - component: {fileID: 4063429400546293587} + - component: {fileID: 2744945179334946622} + m_Layer: 5 + m_Name: pro + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7935805716329333929 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940596303370961447} + 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: 1345622732181280237} + 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: 358.74997, y: -127} + m_SizeDelta: {x: 308.4, y: 35} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &4063429400546293587 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940596303370961447} + m_CullTransparentMesh: 0 +--- !u!114 &2744945179334946622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940596303370961447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8117647, b: 0.61960787, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: --- !u!1 &945728811091597308 GameObject: m_ObjectHideFlags: 0 @@ -5698,6 +5777,7 @@ GameObject: - component: {fileID: 6806311222125822462} - component: {fileID: 6712636463915347790} - component: {fileID: 8823004528143727134} + - component: {fileID: 2957038280454176012} m_Layer: 5 m_Name: skillLayout m_TagString: Untagged @@ -5717,7 +5797,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4691906652601479550} - - {fileID: 2514627608787250055} + - {fileID: 3176671448659083030} - {fileID: 8469090483397192595} m_Father: {fileID: 3847735914630897183} m_RootOrder: 9 @@ -5755,6 +5835,48 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &2957038280454176012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608170644583938805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8823004528143727134} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &2254615227032153688 GameObject: m_ObjectHideFlags: 0 @@ -5918,100 +6040,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!1 &2378711152285979126 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2717758793960761777} - - component: {fileID: 9008547840016297840} - - component: {fileID: 7221800882815018164} - - component: {fileID: 2233768062626440142} - m_Layer: 5 - m_Name: pro - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2717758793960761777 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2378711152285979126} - 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: 1345622732181280237} - 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: 50.1, y: -127} - m_SizeDelta: {x: 293, y: 35} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &9008547840016297840 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2378711152285979126} - m_CullTransparentMesh: 0 ---- !u!114 &7221800882815018164 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2378711152285979126} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8117647, b: 0.61960787, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u653B\u51FB\uFF1A1000\uFF08+500\uFF09" ---- !u!114 &2233768062626440142 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2378711152285979126} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 --- !u!1 &2385795265252942905 GameObject: m_ObjectHideFlags: 0 @@ -6243,100 +6271,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!1 &2495055151291717043 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2514627608787250055} - - component: {fileID: 1666281028079280985} - - component: {fileID: 5353000748583849036} - - component: {fileID: 3190225080716227508} - m_Layer: 5 - m_Name: pro - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2514627608787250055 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2495055151291717043} - 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: 6806311222125822462} - 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: -146.4, y: -142} - m_SizeDelta: {x: 911, y: 35} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &1666281028079280985 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2495055151291717043} - m_CullTransparentMesh: 0 ---- !u!114 &5353000748583849036 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2495055151291717043} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8117647, b: 0.61960787, a: 1} - m_RaycastTarget: 0 - 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 34 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u56DB\u79CD\u6CD5\u5B9D\u4E4B\u9B42\u5168\u90E8\u5230\u8FBE2\u661F" ---- !u!114 &3190225080716227508 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2495055151291717043} - 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 &2554574251685162266 GameObject: m_ObjectHideFlags: 0 @@ -6578,7 +6512,7 @@ RectTransform: m_Children: - {fileID: 2379808058044478554} - {fileID: 1718138152215959492} - - {fileID: 2717758793960761777} + - {fileID: 7935805716329333929} - {fileID: 470257861947977671} - {fileID: 4083169125156670223} - {fileID: 653018620393097303} @@ -22926,7 +22860,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.000022888, y: 275.1} - m_SizeDelta: {x: 321, y: 40} + m_SizeDelta: {x: 377, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1552852807439129411 CanvasRenderer: @@ -28990,9 +28924,9 @@ 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.000015258789, y: -0.0000129058335} + m_AnchoredPosition: {x: 0, y: 0.000009017457} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0, y: 1} --- !u!114 &6617612647759148344 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29006,13 +28940,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 40 m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 20.7 - m_ChildForceExpandWidth: 0 + m_Spacing: 28.6 + m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 m_ChildControlHeight: 1 @@ -29028,7 +28962,7 @@ MonoBehaviour: m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 + m_HorizontalFit: 0 m_VerticalFit: 2 --- !u!1 &8628893935515399361 GameObject: @@ -33755,6 +33689,85 @@ MonoBehaviour: m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &8984460172183604256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3176671448659083030} + - component: {fileID: 1472241134160624163} + - component: {fileID: 7180357180156463138} + m_Layer: 5 + m_Name: pro + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3176671448659083030 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8984460172183604256} + 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: 6806311222125822462} + 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: 0, y: -173.63} + m_SizeDelta: {x: 991.4, y: 259} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1472241134160624163 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8984460172183604256} + m_CullTransparentMesh: 0 +--- !u!114 &7180357180156463138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8984460172183604256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8117647, b: 0.61960787, a: 1} + m_RaycastTarget: 0 + 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: --- !u!1 &9030145728978423027 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua index 2cbb3375a0..eb78eb53bc 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua @@ -48,7 +48,7 @@ function this.GetTailsmanSoulDataById(id) if not skillList[trumpBook[id].SkillList[i][1]] then skillList[trumpBook[id].SkillList[i][1]] = "" end - skillList[trumpBook[id].SkillList[i][1]] = string.format("四种法宝之魂全部到达%s星:\n%s",trumpBook[id].SkillList[i][1],GetSkillConfigDesc(passiveSkillConfig[trumpBook[id].SkillList[i][2]])) + skillList[trumpBook[id].SkillList[i][1]] = string.format("四种法宝之灵全部到达%s星:\n%s",trumpBook[id].SkillList[i][1],GetSkillConfigDesc(passiveSkillConfig[trumpBook[id].SkillList[i][2]])) end return trumpList,maxLv,lv,skillList end