diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 75fbbc2250..c945bb10ad 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -1178,7 +1178,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -1530,7 +1530,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index a0b9d54710..74b476fdad 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -3410,7 +3410,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5568628, g: 0.42352945, b: 0.07058824, a: 1} + m_Color: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8286,8 +8286,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: -145.51004, y: -18.55} - m_SizeDelta: {x: 462.62, y: 52.5} + m_AnchoredPosition: {x: -145.51004, y: -26.01} + m_SizeDelta: {x: 462.62, y: 67.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &705801403844062499 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 391f8e429d..c7ac48e701 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -49028,7 +49028,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 160} - m_SizeDelta: {x: 700, y: 141.7} + m_SizeDelta: {x: 750, y: 141.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1871382871495151358 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab index 3c22708b6b..d06fb07b2f 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab @@ -10317,7 +10317,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6039216, g: 0.52156866, b: 0.39215687, a: 1} + m_Color: {r: 0, g: 1, b: 0.4, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -59042,7 +59042,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 90, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8127154594001898220 @@ -59100,7 +59100,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u83E9\u63D0\u591C" + m_Text: LanguageIndex: 0 --- !u!1 &8348793177209857894 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 3a0ed7525d..7a28e85675 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3771,6 +3771,7 @@ function this.UpdateSingleHeroWarPower(dynamicId) end end +--查找英雄身上的装备List function this.GetEquipedEquipList() local EquipedEquipList = {} for _, heroData in ipairs(this.heroDataLists) do @@ -3782,6 +3783,17 @@ function this.GetEquipedEquipList() return EquipedEquipList end +--通过装备id找英雄id +function this.GetHeroIdByEquipId(_id) + for _, heroData in ipairs(this.heroDataLists) do + for i = 1, #heroData.equipIdList do + if _id == tonumber(heroData.equipIdList[i]) then + return heroData.name + end + end + end +end + function this.CheckIsUpTreasure(Did,index) if not Did then return false diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index eff1f53142..7b70b1af5b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua @@ -54,7 +54,7 @@ function this:OnShow(_parent,...) _Con_Recharge = tonumber(con[1]) _Con_Star = tonumber(con[2]) this.titleText.text=Language[11587] - this.text1.text=string.format("消耗%s点仙缘积分开启一次仙缘汇聚箱,必定获得5星神将!",_CostItem) + this.text1.text=string.format("消耗%s点仙缘积分\n开启一次仙缘汇聚箱必得5星神将!",_CostItem) this.text2.text=""--Language[11589] --后续改成读表 this.text3.text= string.format("充值%s或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star) --Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),_Con_Recharge)..Language[11591] diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua index 4658ad556e..46dcb84714 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua @@ -141,7 +141,9 @@ function this:ShowSingleData(item,sdata,index) end end) Util.AddOnceClick(equiped,function () - PopupTipPanel.ShowTip(Language[12313]) + MsgPanel.ShowTwo(string.format("%s穿戴该装备,是否前往卸下?",HeroManager.GetHeroIdByEquipId(sdata.Id)),function() end,function() + JumpManager.GoJump(22001) + end,"取消","确定") end) end