diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index b7d3526d16..b26faf3528 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -13949,7 +13949,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: -2.7, y: 593.2} + m_AnchoredPosition: {x: 0, y: 610} m_SizeDelta: {x: 384.31, y: 64.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2740667404528603805 @@ -66870,7 +66870,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: -5.0000005, y: 595.0001} + m_AnchoredPosition: {x: 0, y: 610} m_SizeDelta: {x: 384.31, y: 64.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7441740070628515352 @@ -142930,7 +142930,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: -5, y: 595} + m_AnchoredPosition: {x: 0, y: 610} m_SizeDelta: {x: 384.31, y: 64.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3902386611346679078 @@ -151210,7 +151210,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 140, y: 140} - m_Spacing: {x: 94.1, y: 0} + m_Spacing: {x: 20, y: 0} m_Constraint: 2 m_ConstraintCount: 1 --- !u!1 &7610438453197308634 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 228b4b9d6f..08f8d9cdaf 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -4001,7 +4001,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, y: 115} + m_AnchoredPosition: {x: 0, y: 80} m_SizeDelta: {x: 250, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &331411697907940307 @@ -36156,8 +36156,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: 8.439335, y: -117.1} - m_SizeDelta: {x: 800, y: 201.8} + m_AnchoredPosition: {x: 8.439335, y: -134.8} + m_SizeDelta: {x: 800, y: 166.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8033159614109888874 CanvasRenderer: @@ -36199,7 +36199,7 @@ MonoBehaviour: m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 1.5 m_Text: LanguageIndex: 11279 --- !u!1 &7149380988800205505 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab index 7409cce582..b8f7b9f38b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab @@ -19705,7 +19705,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 0} + m_SizeDelta: {x: 700, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4495308895417329364 CanvasRenderer: @@ -75339,7 +75339,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 540, y: 0} - m_SizeDelta: {x: 1080, y: 0} + m_SizeDelta: {x: 980, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7331388033292539620 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index 6e4b54465c..6f5d5dbbff 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -254,6 +254,11 @@ function this.OnShowHeroAndTalisman() else --否则就正常显示 strTable[n]=string.format( Language[11535],GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),dowerData[n].Level,"\n") end + if dowerData[n].Level==25 then --特性显示 + strTable[n]=string.gsub(strTable[n],"·","") + local str=Language[11536]..strTable[n] + strTable[n]=string.gsub(str," "," ") --unity text中的单词过长 避免自动添加空格并换行 将那个空格替换 + end end local str=string.sub(table.concat(strTable),1,-2)--将表里字符串拼接 --去除最后\n