diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab index fbf379fa16..26eb0e0ac5 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab @@ -261,7 +261,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Sprite: {fileID: 21300000, guid: 2bee63a8cad6b4046a314a7b3a598cd2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -304,7 +304,7 @@ 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.88, y: 614.44} + m_AnchoredPosition: {x: 0, y: 625} m_SizeDelta: {x: 326.5, y: 64.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222385873251802084 @@ -328,7 +328,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9803922, g: 0.69803923, b: 0.2901961, a: 1} + m_Color: {r: 1, g: 0.72019726, b: 0.3160377, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -415,7 +415,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9658c5a8f1777e74d9a8915414aaa5ac, type: 3} + m_Sprite: {fileID: 21300000, guid: a91544c62f0ce22438507ef0dd8672bd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -841,7 +841,7 @@ 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: -4.5175, y: -523.8} + m_AnchoredPosition: {x: -4.5175, y: -517} m_SizeDelta: {x: 925.8, y: 118.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3287052441690214797 @@ -1347,8 +1347,8 @@ 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: 102.67, y: -23.842} - m_SizeDelta: {x: 205.34, y: 110.9} + m_AnchoredPosition: {x: 102.67, y: -21} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &903598582962903888 CanvasRenderer: @@ -1466,8 +1466,8 @@ 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: -103.89, y: -23.843} - m_SizeDelta: {x: 207.78, y: 110.9} + m_AnchoredPosition: {x: -103.89, y: -21.7} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4663026695833607491 CanvasRenderer: @@ -1582,8 +1582,8 @@ 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.47, y: 182} - m_SizeDelta: {x: 927.41, y: 76.8} + m_AnchoredPosition: {x: 0, y: 351.70993} + m_SizeDelta: {x: 895.6, y: 417.86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4992443721524327437 CanvasRenderer: @@ -1613,8 +1613,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 90aaa61758e59d647b395e62acccc454, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 98c0661898384464aa0372b59e5e07ab, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2002,8 +2002,8 @@ 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.29003906, y: 206} - m_SizeDelta: {x: 898.92, y: 4.44} + m_AnchoredPosition: {x: 0, y: 206} + m_SizeDelta: {x: 900, y: 4.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4897021660228937839 CanvasRenderer: @@ -2026,14 +2026,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.16981131, g: 0.16580632, b: 0.16580632, 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: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2100,7 +2100,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3372549, g: 0.78039217, b: 0.5372549, a: 1} + m_Color: {r: 0.24964403, g: 0.9622642, b: 0.57126915, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2513,7 +2513,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5058824, g: 0.42745098, b: 0.30588236, a: 1} + m_Color: {r: 0.09433961, g: 0.08634447, b: 0.0725347, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2675,8 +2675,8 @@ 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.28999758, y: 145} - m_SizeDelta: {x: 898.92, y: 4.44} + m_AnchoredPosition: {x: 0, y: 145} + m_SizeDelta: {x: 900, y: 4.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1957170809448953427 CanvasRenderer: @@ -2699,14 +2699,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, 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: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2848,7 +2848,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8867924, g: 0.70619214, b: 0.2300641, a: 1} + m_Color: {r: 1, g: 0.80900466, b: 0.3066038, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3000,8 +3000,8 @@ RectTransform: 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_AnchoredPosition: {x: -0.019989014, y: 0} + m_SizeDelta: {x: -13.33, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8163805731759817949 CanvasRenderer: @@ -3031,7 +3031,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d1ae2fdf5abfca745baf5d316f53b922, type: 3} + m_Sprite: {fileID: 21300000, guid: e0bff012d1290b044b09c7410f2b4ac1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3247,7 +3247,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, a: 1} + m_Color: {r: 0.1981132, g: 0.13001178, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3480,8 +3480,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 466, y: -501} - m_SizeDelta: {x: 912.8, y: 60} + m_AnchoredPosition: {x: 467.71, y: -501} + m_SizeDelta: {x: 909.39, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7669026485797189264 GameObject: @@ -3625,7 +3625,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 456.4, y: 0} + m_AnchoredPosition: {x: 456.4, y: -0.000045776367} m_SizeDelta: {x: 912.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3795659575372293691 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangStrongPopup.lua index fc307d34a3..cbd9adbacc 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangStrongPopup.lua @@ -345,7 +345,7 @@ function FaXiangStrongPopup:SetWindShow(_index) des= des..ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,skillId[i]).Desc end this.hintTxt.text="已提升至最大等级" - this.skillInfo.text= "".."法相技能: "..""..des + this.skillInfo.text= "".."法相技能: "..""..des elseif _index == 2 then this.titleTxt.text="法相升星" this.btnRefine:SetActive(true)