diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 1ae02a5f30..6fed1fa963 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -600,7 +600,7 @@ MonoBehaviour: m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 0.7 m_Text: lv 1 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index c15ae3188b..935dc55e7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -404,7 +404,8 @@ function TimeLimitedCall:OnShow(_sortingOrder,_parent) Util.GetGameObject(tempGo,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetJobSpriteStrByJobNum(configinfo.PropertyName)) if GetCurLanguage() ~= 0 and LengthString(GetLanguageStrById(GetLanguageStrById(configinfo.ReadingName))) > 6 then Util.GetGameObject(tempGo,"name"):GetComponent("Text").text = SubString(GetLanguageStrById(GetLanguageStrById(configinfo.ReadingName)),5).."..." - -- Util.GetGameObject(tempGo,"name"):GetComponent("Text").text=GetLanguageStrById(GetLanguageStrById(configinfo.ReadingName)) + else + Util.GetGameObject(tempGo,"name"):GetComponent("Text").text=GetLanguageStrById(GetLanguageStrById(configinfo.ReadingName)) end if activityType[activityId].bg == "Bg1" then SetTextVerTial(Util.GetGameObject(tempGo,"name"),actTypePos[n],"MiddleLeft",1) diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 93f1d508d6..0e17621557 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -234,7 +234,11 @@ function HandBookHeroInfoPanel:OnShowHeroData(_type,_starType,_star) local go = self.skillGrid.transform:GetChild(i-1).gameObject go:SetActive(true) Util.GetGameObject(go.transform,"s"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(skillList[i].skillConfig.Icon)) - Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text").text=GetLanguageStrById(skillList[i].skillConfig.Name)--Language[10453].. 1(skillList[i].skillConfig.Id % 10) + if GetCurLanguage() ~= 0 and LengthString(GetLanguageStrById(skillList[i].skillConfig.Name)) > 10 then + Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text").text = SubString(GetLanguageStrById(skillList[i].skillConfig.Name),10).."..." + else + Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text").text=GetLanguageStrById(skillList[i].skillConfig.Name)--Language[10453].. 1(skillList[i].skillConfig.Id % 10) + end Util.GetGameObject(go.transform,"SkillTypeImage"):GetComponent("Image").sprite=Util.LoadSprite(GetSkillType(skillList[i])) Util.AddOnceClick(Util.GetGameObject(go.transform,"s"), function() if Game.GlobalEvent:HasEvent(GameEvent.UI.OnClose, triggerCallBack) then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 82422113f1..bd997c74ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -298,7 +298,11 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills end end Util.GetGameObject(go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(curSkillData.skillConfig.Icon))--"i_act_ygmd2_2") - Util.GetGameObject(go.transform,"skillImage/skillName"):GetComponent("Text").text= GetLanguageStrById(curSkillData.skillConfig.Name)--(curSkillData.skillId % 10) + if GetCurLanguage() ~= 0 and LengthString(GetLanguageStrById(curSkillData.skillConfig.Name)) > 10 then + Util.GetGameObject(go.transform,"skillImage/skillName"):GetComponent("Text").text = SubString(GetLanguageStrById(curSkillData.skillConfig.Name),10).."..." + else + Util.GetGameObject(go.transform,"skillImage/skillName"):GetComponent("Text").text= GetLanguageStrById(curSkillData.skillConfig.Name)--(curSkillData.skillId % 10) + end else go:SetActive(false) end