Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
25af0a837a
|
@ -310,8 +310,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, y: -43.47496}
|
||||
m_SizeDelta: {x: 934.4, y: 1125.3}
|
||||
m_AnchoredPosition: {x: 0, y: -61.1}
|
||||
m_SizeDelta: {x: 934.4, y: 1090.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &817148689261127693
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -402,7 +402,10 @@ function TimeLimitedCall:OnShow(_sortingOrder,_parent)
|
|||
local configinfo= ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig, "Id", m.id)
|
||||
--LogGreen("configinfo.PropertyName:"..configinfo.PropertyName)
|
||||
Util.GetGameObject(tempGo,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetJobSpriteStrByJobNum(configinfo.PropertyName))
|
||||
Util.GetGameObject(tempGo,"name"):GetComponent("Text").text=GetLanguageStrById(GetLanguageStrById(configinfo.ReadingName))
|
||||
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))
|
||||
end
|
||||
if activityType[activityId].bg == "Bg1" then
|
||||
SetTextVerTial(Util.GetGameObject(tempGo,"name"),actTypePos[n],"MiddleLeft",1)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue