From 254dbc5e92d313d4ea0131bd18c8d52cfd033012 Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Tue, 29 Oct 2024 20:58:02 +0800 Subject: [PATCH] 1 --- .../Prefabs/UI/Popup/PlayerInfoPopup.prefab | 4 ++-- .../Modules/Carbon/XuanYuanMirrorPanel.lua | 2 +- .../~Lua/Modules/GeneralPanel/AttriTips.lua | 22 +++++++++---------- .../Incarnation/IncarnationManager.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab index bf3f5d6e69..f3998cf452 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab @@ -20913,8 +20913,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -20} - m_SizeDelta: {x: 100, y: 40} + m_AnchoredPosition: {x: 0, y: -34.52} + m_SizeDelta: {x: 100, y: 69.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4120350516855940403 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index 278f1e4654..99b9286957 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua @@ -130,7 +130,7 @@ this.refreshShow = function() local textParnet = Util.GetGameObject(go, "titileBg") local textName = Util.GetGameObject(textParnet, "Text"):GetComponent("Text") textName.text =v.name - SetTextVerTial(Util.GetGameObject(textParnet, "Text"),Vector3.New(295.93,-10.17,0),"MiddleRight") + --SetTextVerTial(Util.GetGameObject(textParnet, "Text"),Vector3.New(295.93,-10.17,0),"MiddleRight") if GetCurLanguage() == 2 then textName.fontSize = 36 end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/AttriTips.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/AttriTips.lua index 99a011f438..0671ab11b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/AttriTips.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/AttriTips.lua @@ -5,8 +5,8 @@ local Thread = nil local proList = {} --初始化组件(用于子类重写) function AttriTips:InitComponent() - AttriTips.proPre = Util.GetGameObject(AttriTips.gameObject,"proPre") - AttriTips.attriParent = Util.GetGameObject(AttriTips.gameObject,"AttriParent") + AttriTips.proPre = Util.GetGameObject(AttriTips.gameObject, "proPre") + AttriTips.attriParent = Util.GetGameObject(AttriTips.gameObject, "AttriParent") end --添加事件监听(用于子类重写) @@ -21,9 +21,11 @@ function AttriTips:OnDestroy() Thread = nil proList = {} end + function AttriTips:OnOpen() - + end + --关闭弹出信息 function AttriTips.CloseAttriTip() AttriTips:ClosePanel() @@ -31,7 +33,7 @@ end --显示弹出信息 --type=null List[num]=属性ID#属性值; type=1 List[属性ID]=属性值; -function AttriTips.ShowAttriTip(_attriList,_type) +function AttriTips.ShowAttriTip(_attriList, _type) UIManager.OpenPanel(UIName.AttriTips) local attriList = {} if _type then @@ -46,19 +48,19 @@ function AttriTips.ShowAttriTip(_attriList,_type) local data = attriList[i] if not proList[i] then proList[i] = newObject(AttriTips.proPre) - proList[i].transform.name = "proPre"..i + proList[i].transform.name = "proPre" .. i proList[i].transform:SetParent(AttriTips.attriParent.transform) proList[i].transform.localScale = Vector3.one proList[i].transform.localPosition = Vector3.zero end proList[i]:SetActive(false) local proData = propertyConfig[data[1]] - Util.GetGameObject(proList[i],"name"):GetComponent("Text").text = proData.Info + Util.GetGameObject(proList[i], "name"):GetComponent("Text").text = GetLanguageStrById(proData.Info) local str = data[2] if proData.Style == 2 then - str = tostring(data[2]/100).."%" + str = tostring(data[2] / 100) .. "%" end - Util.GetGameObject(proList[i],"value"):GetComponent("Text").text = str + Util.GetGameObject(proList[i], "value"):GetComponent("Text").text = str end if Thread then coroutine.stop(Thread) @@ -78,6 +80,4 @@ function AttriTips.ShowAttriTip(_attriList,_type) end) end - - -return AttriTips \ No newline at end of file +return AttriTips diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua index a6adee107a..bf91f61547 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua @@ -70,7 +70,7 @@ end --获取化身卡指定星级的技能描述 function this.GetSkillDesStr(id, Star) local skillId = ChangingCard[id].Skill[Star + 1] - local skillDes = PassiveSkillConfig[skillId].Desc + local skillDes = GetLanguageStrById(PassiveSkillConfig[skillId].Desc) return skillDes end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua index d66283581a..8d90cab5f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua @@ -179,7 +179,7 @@ function RoleFlyUpLayout:UpdateHeroUpStarData() if aaa then --this.skillInfoGrid.text="激活飞升天赋:".." "..aaa.Desc --break - str = str .. aaa.Desc + str = str .. GetLanguageStrById(aaa.Desc) end end end