diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab index a703a16e8d..f4b1bff305 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleTalismanPanelV2.prefab @@ -4849,7 +4849,7 @@ ParticleSystem: --- !u!199 &5475183851846367264 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10058,7 +10058,7 @@ ParticleSystem: --- !u!199 &7175515632173838630 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14819,7 +14819,7 @@ ParticleSystem: --- !u!199 &2424411900952576964 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19575,7 +19575,7 @@ ParticleSystem: --- !u!199 &7003235447524177872 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19736,7 +19736,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -24689,7 +24689,7 @@ ParticleSystem: --- !u!199 &6775624527687177699 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29434,7 +29434,7 @@ ParticleSystem: --- !u!199 &876445508905491866 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34079,7 +34079,7 @@ ParticleSystem: --- !u!199 &4107366793135521658 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39171,7 +39171,7 @@ ParticleSystem: --- !u!199 &8761706858282258751 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44003,7 +44003,7 @@ ParticleSystem: --- !u!199 &4396747555986394406 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48844,7 +48844,7 @@ ParticleSystem: --- !u!199 &4152745225773462240 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54304,7 +54304,7 @@ ParticleSystem: --- !u!199 &635127155071403073 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54430,7 +54430,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -59468,7 +59468,7 @@ ParticleSystem: --- !u!199 &8461887328555741404 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64303,7 +64303,7 @@ ParticleSystem: --- !u!199 &4035478127761353795 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69272,7 +69272,7 @@ ParticleSystem: --- !u!199 &3287078869885518980 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69471,19 +69471,19 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1.1 - m_Text: "\u5347\u7EA7\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5427\u5566\u5427\u5566\u5427\u5566\u5427\u5566\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427\u5427\u5566\u5427" + m_Text: LanguageIndex: 0 --- !u!1 &7300991108107053034 GameObject: @@ -74513,7 +74513,7 @@ ParticleSystem: --- !u!199 &5949988206710758398 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index 6f5d5dbbff..6e4b54465c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -254,11 +254,6 @@ 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