diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index f9ebc7b967..8dada16e1d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -480,4 +480,18 @@ function this.GetMinEquipStar(equiplist) end return _minStar end + +function this.updateHomeLandEquipLv() + for key, value in pairs(this.equipDatas) do + value.HomeEquipLv = function() + local data = HomeLandManager.EquipData[value.position] + if data and data.configData and data.configPro then + return {data.configData.Level,data.configPro.Level} + end + return {0,0} + end + value.homeEquipLv = value.HomeEquipLv() + end +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandUpgrade.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandUpgrade.lua index 3cee3dcfde..1e32a52fea 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandUpgrade.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandUpgrade.lua @@ -59,8 +59,8 @@ function this:BindEvent() MsgPanel.ShowTwo(string.format("是否花费%s妖晶立即升级?",num),function() end,function() NetManager.ArchitectureOperateRequest({data.dataMain.Id},2,0,function () Game.GlobalEvent:DispatchEvent(GameEvent.UI.OnUpdateData) - parent:ClosePanel() PopupTipPanel.ShowTip(string.format("%s已升级至%s级",data.dataMain.Name,data.dataSingle.level)) + parent:ClosePanel() end) end,"取消","确定") diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 69f96ff61f..ca928f686b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -6420,6 +6420,7 @@ function NetManager.EquipIntensifyRequset(_type,func) local msg = PlayerInfoProto_pb.EquipIntensifyResponse() msg:ParseFromString(data) HomeLandManager.GetServerEquipData(msg,function () + EquipManager.updateHomeLandEquipLv() --设置脏数据 HeroPropManager.SetFuncPropDirty(Hero_Prop_Type.Equip) --获取新战力 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index dc7cd69ff7..3f3eacfe79 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -412,7 +412,7 @@ function this.EquipInfo() end this.treasureDatas[pos].gameObject:SetActive(true) this.treasureDatas[pos].transform:SetAsFirstSibling() - LogRed(tostring(curEquipData.homeEquipLv[1]).." "..tostring(curEquipData.homeEquipLv[2])) + -- LogRed(tostring(curEquipData.homeEquipLv[1]).." "..tostring(curEquipData.homeEquipLv[2])) this.treasureDatas[pos]:OnOpen(false, {curEquipData.id,0}, 0.8, false, false, false, 0,nil,curEquipData) end