From f2c3cfa8bf1958cff6ad48b8f09bda9d3f3ff8e7 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Sat, 20 Jan 2024 14:21:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E9=89=B4=E9=A2=84=E8=AE=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/HandBook/HandBookHeroInfoPanel.prefab | 18 +++++++++--------- .../View/GeneralBigPopup_SelectGem.lua | 2 +- .../~Lua/Modules/Map/View/EndLessMapView.lua | 4 ++-- .../Popup/RewardEquipSingleShowPopup2.lua | 6 +++--- .../~Lua/Modules/RoleInfo/PlayerGiftPanel.lua | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 677d74bce1..bfc656a246 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -3896,7 +3896,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -3944,7 +3944,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -90, y: -200} + m_AnchoredPosition: {x: -140, y: -197} m_SizeDelta: {x: 121, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6161143365764854322 @@ -4395,9 +4395,9 @@ RectTransform: m_Father: {fileID: 164915241442772717} m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 968, y: -733.4} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -112, y: -737} m_SizeDelta: {x: 160, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9049422214420379269 @@ -5200,7 +5200,7 @@ RectTransform: m_GameObject: {fileID: 7562258272849120841} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_Children: - {fileID: 7438115198098257837} m_Father: {fileID: 458271444932364388} @@ -5495,7 +5495,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 44 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -5819,7 +5819,7 @@ RectTransform: m_GameObject: {fileID: 8984313322781969218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_Children: - {fileID: 7012391571410172215} - {fileID: 8654895496356684777} @@ -5830,7 +5830,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 138, y: -737} + m_AnchoredPosition: {x: 105, y: -737} m_SizeDelta: {x: 151.25, y: 186} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &274082961861789344 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua index cf706bc3ab..bcf1e04d1b 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua @@ -87,7 +87,7 @@ function SelectGem:SingleDataShow(go,data,index) elseif PropertyConfig[property[i][1]].Style==2 then str=string.format( "全体英雄%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%" end - textDesc = str--textDesc..string.format( "全体神将%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%" + textDesc = str--textDesc..string.format( "全体英雄%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%" if property[i+1] then textDesc = textDesc.."\n" end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index 448be3fd68..c7eaf0f85e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -179,14 +179,14 @@ function EndLessMapView:BindEvent() local pros = u(id,false,pros) local str = s(pros) if str and str ~= "" then - table.insert(pro,string.format("本级加成:全体神将%s",str)) + table.insert(pro,string.format("本级加成:全体英雄%s",str)) end id = id + 1 if endlessMorale[id] then local pros = u(id,true,pros) local str = s(pros) if str and str ~= "" then - table.insert(pro,string.format("下级加成:全体神将%s",str)) + table.insert(pro,string.format("下级加成:全体英雄%s",str)) end end else --特殊加成 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index 319da0eb70..2d45723ccc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -430,9 +430,9 @@ function RewardEquipSingleShowPopup2:OnShow() _BaseProList[num]:SetActive(true) Util.GetGameObject(_BaseProList[num], "curProVale").gameObject:SetActive(false) if equipConfigData.Position==7 then - _BaseProList[num]:GetComponent("Text").text ="全体神将潜能等级+"..equipConfigData.PotentialNew[2] + _BaseProList[num]:GetComponent("Text").text ="全体英雄潜能等级+"..equipConfigData.PotentialNew[2] elseif equipConfigData.Position==8 then - _BaseProList[num]:GetComponent("Text").text = "神将潜能等级+"..equipConfigData.PotentialNew[2] + _BaseProList[num]:GetComponent("Text").text = "英雄潜能等级+"..equipConfigData.PotentialNew[2] end end if equipConfigData.HeroGitUp>0 then @@ -443,7 +443,7 @@ function RewardEquipSingleShowPopup2:OnShow() _BaseProList[num]:SetActive(true) Util.GetGameObject(_BaseProList[num], "curProVale").gameObject:SetActive(false) if equipConfigData.Position==7 then - _BaseProList[num]:GetComponent("Text").text =string.format("全体神将礼物属性+%s%%",equipConfigData.HeroGitUp/100) + _BaseProList[num]:GetComponent("Text").text =string.format("全体英雄礼物属性+%s%%",equipConfigData.HeroGitUp/100) end end end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua index 0c21567cda..f092794c9e 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua @@ -240,8 +240,8 @@ function this.RefreshWindowData() this:OnClickTabBtn(1) local proList=IncarnationManager.GetproDesLst(GiftManager.GetPlayerGiftAddPro(),"00FF00") - table.insert(proList,string.format("全体神将潜能等级+%s",GiftManager.GetPlayerGiftAddPotencyLv())) - table.insert(proList,string.format("全体神将礼物属性+%s%%",GiftManager.GetPlayerGiftAdd())) + table.insert(proList,string.format("全体英雄潜能等级+%s",GiftManager.GetPlayerGiftAddPotencyLv())) + table.insert(proList,string.format("全体英雄礼物属性+%s%%",GiftManager.GetPlayerGiftAdd())) if proList and #proList>0 then this.proGrid:SetActive(true) this.proEmptyObj:SetActive(false) @@ -265,7 +265,7 @@ function this.RefreshWindowData() this.proGrid:SetActive(false) this.proEmptyObj:SetActive(true) end - --this.tipInfo.text=string.format("全体神将潜能等级+%s",GiftManager.GetPlayerGiftAddPotencyLv()) + --this.tipInfo.text=string.format("全体英雄潜能等级+%s",GiftManager.GetPlayerGiftAddPotencyLv()) end