diff --git a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab index 98dc9d7c73..edf0a6d8da 100644 --- a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab @@ -487,7 +487,7 @@ 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: -1047, y: 82} + m_AnchoredPosition: {x: -1047.0001, y: 82} m_SizeDelta: {x: 0, y: 164} m_Pivot: {x: 0, y: 0.5} --- !u!114 &396553229042369324 @@ -3604,7 +3604,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9970\u54C1" + m_Text: "\u751F\u547D\u5361" LanguageIndex: 10142 --- !u!1 &731593931335967167 GameObject: @@ -9966,7 +9966,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5B9D\u7269" + m_Text: "\u9970\u54C1" LanguageIndex: 10147 --- !u!1 &2599414657393611234 GameObject: @@ -26291,7 +26291,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u795E\u77F3" + m_Text: "\u795E\u5370" LanguageIndex: 10142 --- !u!1 &4128145929314265536 GameObject: diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index b3ddf84d47..cbf989dcb7 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1776,11 +1776,11 @@ Language = { [11775] = GetLanguageStrById("强化饰品"), [11776] = GetLanguageStrById("强化等级:%d/%d"), [11777] = GetLanguageStrById("强 化"), - [11778] = GetLanguageStrById("更高品质的宝物可提升强化上限"), - [11779] = GetLanguageStrById("精炼宝物"), + [11778] = GetLanguageStrById("更高品质的饰品可提升强化上限"), + [11779] = GetLanguageStrById("精炼饰品"), [11780] = GetLanguageStrById("精炼等级:%d/%s"), [11781] = GetLanguageStrById("精 炼"), - [11782] = GetLanguageStrById("更高品质的宝物可提升精炼上限"), + [11782] = GetLanguageStrById("更高品质的饰品可提升精炼上限"), [11783] = GetLanguageStrById("英雄觉醒"), [11784] = GetLanguageStrById("觉醒要求"), [11785] = GetLanguageStrById("觉醒后英雄天赋会发生变化"), @@ -1797,10 +1797,10 @@ Language = { [11796] = GetLanguageStrById("职业限定:%s专用"), [11797] = GetLanguageStrById("共鸣需同时穿戴手环和挂件"), [11798] = GetLanguageStrById("没有装备可装备!"), - [11799] = GetLanguageStrById("没有宝物可装备!"), + [11799] = GetLanguageStrById("没有饰品可装备!"), [11800] = GetLanguageStrById("没有装备可卸下!"), - [11801] = GetLanguageStrById("玩家%s级解锁宝物功能"), - [11802] = GetLanguageStrById("%s星后才可装备宝物"), + [11801] = GetLanguageStrById("玩家%s级解锁饰品功能"), + [11802] = GetLanguageStrById("%s星后才可装备饰品"), [11803] = GetLanguageStrById("类型:%s"), [11804] = GetLanguageStrById("提升英雄等级上限"), [11805] = GetLanguageStrById("突 破"), @@ -2238,7 +2238,7 @@ Language = { [12237] = GetLanguageStrById("30级或充值任意金额后解锁"), [12238] = GetLanguageStrById("%s 级公会 %s 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 %s 级)【马上加入】"), [12239] = GetLanguageStrById("%s发送了%s,请迅速前往抢夺红包!"), - [12240] = GetLanguageStrById("无可合成宝物!"), + [12240] = GetLanguageStrById("无可合成饰品!"), [12241] = GetLanguageStrById("极速探索特权:每天增加免费2次,增加购买8次"), [12242] = GetLanguageStrById("极速探索特权:每天增加免费2次,增加购买8次"), [12243] = GetLanguageStrById("是否花费%s%s进行储值?"), diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index a201a53da0..fb7bc741c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -35,7 +35,7 @@ this.prefabs={} local curIndex=0 --Title资源名 local titleImageName={"gongsong_zh","h_xianji_fenjie_zh","lingshou_lingshoufangshengzi_zh","GodWeaponAtlas_fenjie_title_zh"}--,"guiyuan_zh","h_guiyuan_zi_zh" -local titleName={Language[11732],"宝物分解",Language[11735],"名刀分解"} +local titleName={Language[11732],"饰品分解",Language[11735],"名刀分解"} local titleColor={Color.New(243 / 255, 235 / 255, 202 / 255, 1),Color.New(243 / 255, 235 / 255, 202 / 255, 1),Color.New(243 / 255, 235 / 255, 202 / 255, 1)} local bgImageName={"UI_hz_ls_01","UI_hz_ls_07","UI_hz_ls_08"}--,"h_huisu_ditu","h_xianji_guiyuanditu" local heroEndBtns = {} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 700061ced2..16f5b20780 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -92,6 +92,7 @@ function RoleEquipPanel:InitComponent() this.effect = Util.GetGameObject(self.transform, "bg/effect") for i = 1, 6 do tabs[i] = Util.GetGameObject(self.transform, "Tabs/Btn" .. i) + Util.GetGameObject(self.transform, "Tabs/Btn" .. i.."/Text"):GetComponent("Text").text=typeTab[i] Util.GetGameObject(tabs[i], "Text"):GetComponent("Text").fontSize = 36 redTabs[i] = Util.GetGameObject(tabs[i], "red") effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect")