【装备界面】提交

dev_chengFeng
ZhangBiao 2021-11-09 10:22:16 +08:00
parent ff7e9e9e85
commit 12e46be512
12 changed files with 991 additions and 79 deletions

View File

@ -455,9 +455,9 @@ function this.SingleItemDataShow(_go, _itemData)
Util.AddOnceClick(Util.GetGameObject(_go.gameObject, "GameObject/item/frame"), function()
if _itemData.itemConfig then
if _itemData.itemConfig.ItemBaseType == ItemBaseType.Equip then
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData, function()
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this, _itemData,1,true,true,nil,function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)
end,nil,true)
end)
elseif _itemData.itemConfig.ItemType == ItemType.SelfBox then--自选宝箱
UIManager.OpenPanel(UIName.RewardBoxPanel, _itemData, function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)

View File

@ -87,7 +87,7 @@ function BagResolveAnCompoundPanel:BindEvent()
PopupTipPanel.ShowTip(Language[10182])
end
elseif openLayoutType==2 then
UIManager.ClosePanel(UIName.RewardEquipSingleShowPopup)
UIManager.ClosePanel(UIName.RewardEquipSingleShowPopup2)
if equipData then
curResolveAllItemList={}
local equip = {}

View File

@ -119,7 +119,8 @@ function this.SetItemShow(drop)
elseif itemDataList[i].itemType==2 then
Util.AddOnceClick(itemIcon, function()
Log("itemDataList[i].backData "..itemDataList[i].backData.equipId)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup,itemDataList[i].backData)
-- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup,itemDataList[i].backData)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this, itemDataList[i],0,true,false)
end)
elseif itemDataList[i].itemType==3 then
Util.AddOnceClick(itemIcon, function()

View File

@ -240,7 +240,8 @@ function this.SetItemData(go, itemdata)
elseif itemdata.itemType==2 then
EquipManager.UpdateEquipData(itemdata.backData)
Util.AddOnceClick(itemIcon, function()
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup,itemdata.backData)
-- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup,itemdata.backData)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this, itemdata,0,true,false)
end)
elseif itemdata.itemType==3 then
HeroManager.UpdateHeroDatas(itemdata.backData)

View File

@ -422,7 +422,8 @@ function this.SystemItemAdapter(node, data, isShowTime)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, data.itemId)
local itemData = {}
itemData.id = data.itemId
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
-- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, itemData,0)
elseif itemDataConFig.ItemType == ItemType.Talisman then
-- UIManager.OpenPanel(UIName.TalismanInfoPopup, data.itemId, 2, 1)
else

View File

@ -218,7 +218,8 @@ function this.ShowTitleEquipData(_go,_itemData,curEquipStarsConfig)
-- LogPink("_itemData.Id:"..tostring(_itemData.Id))
local itemData = {}
itemData.id = _itemData.Id
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
-- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, itemData,0)
end)
end
@ -274,7 +275,8 @@ function this.SingleItemDataShow(_go,_itemData,curEquipStarsConfig)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, _itemData.Id)
local itemData = {}
itemData.id = _itemData.Id
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
-- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, itemData,0)
end, 0.5)
end
--加减方法

View File

@ -689,7 +689,8 @@ function HandBookHeroAndEquipListPanel:OnShowSingleEquipData(_go,_equipData)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel,equipData.Id)
local _itemData = {}
_itemData.id = equipData.Id
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
-- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0)
end)
if PlayerManager.equipHandBook[equipData.Id] == nil then
Util.SetGray(_go, true)

View File

@ -6,7 +6,11 @@ local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig
local _BaseProList = {}--基础属性对象
local _suitProList = {}--套装属性对象
local _superProList = {}--白金属性对象
local isShowfenjie =true
local typeToUpdate = {
[2] = 2,--已穿戴->卸载单件
[3] = 1,--未穿戴->穿单件
[4] = 3,--未穿戴->替换单件
}
--初始化组件(用于子类重写)
function RewardEquipSingleShowPopup2:InitComponent()
self.spLoader = SpriteLoader.New()
@ -45,8 +49,13 @@ function RewardEquipSingleShowPopup2:InitComponent()
--分解按钮--btmBar
self.btmBar = Util.GetGameObject(self.transform, "Content/btmBar")
self.btnSure = Util.GetGameObject(self.btmBar, "btnGrid/btnSure")
self.btnJump = Util.GetGameObject(self.btmBar, "btnGrid/btnJump")
self.howGet = Util.GetGameObject(self.btmBar, "howGet")
self.btnGrid = Util.GetGameObject(self.btmBar, "btnGrid")
self.btnSure = Util.GetGameObject(self.btnGrid, "btnSure")
self.btnJump = Util.GetGameObject(self.btnGrid, "btnJump")
self.btnWear = Util.GetGameObject(self.btnGrid, "btnWear")
self.btnDown = Util.GetGameObject(self.btnGrid, "btnDown")
self.btnSwitch = Util.GetGameObject(self.btnGrid, "btnSwitch")
--装备获取途径--btmBar
self.canGetPre = Util.GetGameObject(self.btmBar, "scroll/canGetPre")
self.canGetGrid = Util.GetGameObject(self.btmBar, "scroll")
@ -64,7 +73,7 @@ function RewardEquipSingleShowPopup2:BindEvent()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
self:ClosePanel()
end)
--使用
--跳转
Util.AddClick(self.btnJump, function()
if self.equipData.itemConfig then
JumpManager.GoJump(self.equipData.itemConfig.UseJump)
@ -95,6 +104,40 @@ function RewardEquipSingleShowPopup2:BindEvent()
PopupTipPanel.ShowTip(Language[11506])
end
end)
--穿戴
Util.AddClick(self.btnWear, function()
local equipIdList={}
local equipDataList={}
table.insert(equipIdList,tostring(self.equipData.id))
table.insert(equipDataList,self.equipData)
NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList,1,function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,0,self.position)
end)
end)
--卸下
Util.AddClick(self.btnDown, function()
local equipIdList={}
local equipDataList={}
table.insert(equipIdList,tostring(self.equipData.id))
table.insert(equipDataList,self.equipData)
NetManager.EquipUnLoadOptRequest(self.curHeroData.dynamicId,equipIdList ,1, function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList)
end)
end)
--替换
Util.AddClick(self.btnSwitch, function()
local equipIdList={}
local equipDataList={}
table.insert(equipIdList,tostring(self.equipData.id))
table.insert(equipDataList,self.nextEquip)
NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList ,1, function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,self.equipData,self.position)
end)
end)
end
--添加事件监听(用于子类重写)
@ -108,22 +151,37 @@ function RewardEquipSingleShowPopup2:RemoveListener()
end
--界面打开时调用(用于子类重写)
function RewardEquipSingleShowPopup2:OnOpen(_equipData,_openType,_isRewardItemPop,_curHeroData)
function RewardEquipSingleShowPopup2:OnOpen(_parent,_equipData,_openType,_isShowGet,_isShowGo,_curHeroData,_position,_targetEquipData,_func)
if not _equipData then
return
end
self.equipData = _equipData
self.openType = _openType
self.isRewardItemPop = _isRewardItemPop and _isRewardItemPop or false
self.curHeroData = _curHeroData
self.parent = _parent --父界面
self.equipData = _equipData --当前装备数据
self.openType = _openType --0不显示按钮、1背包、2已穿戴显示卸下、3未穿戴显示穿戴、4未穿戴显示替换
self.howGet:SetActive(_isShowGet and true or false)--是否显示获取途径
self.btnGrid:SetActive(self.openType ~= 0)
self.curHeroData = _curHeroData --装备了该装备的英雄数据
self.position = _position --装备的位置
self.nextEquip = _targetEquipData--要替换的目标装备
self.isShowGo = _isShowGo and _isShowGo or false--是否显示跳转按钮
self.func = _func
end
function RewardEquipSingleShowPopup2:SetBtns()
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id))
self.btnSure:SetActive(itemConfigData.IfResolve==1)
self.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and BagManager.isBagPanel)
self.btnWear:SetActive(self.openType == 3)
self.btnDown:SetActive(self.openType == 2)
self.btnSwitch:SetActive(self.openType == 4)
end
function RewardEquipSingleShowPopup2:OnShow()
--上部装备基础信息
LogBlue(self.equipData.id)
Log("装备id:"..tostring(self.equipData.id).." openType:"..tostring(self.openType))
self:SetBtns()
local equipConfigData=ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(self.equipData.id))
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id))
self.btnSure:SetActive(itemConfigData.IfResolve==1)
self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..equipConfigData.Quality)
self.equipQuaText.text=GetStringByEquipQua(equipConfigData.Quality,GetQuaStringByEquipQua(equipConfigData.Quality))
self.eqiopName.text=GetStringByEquipQua(equipConfigData.Quality,GetLanguageStrById(equipConfigData.Name))
@ -134,7 +192,6 @@ function RewardEquipSingleShowPopup2:OnShow()
EquipManager.SetEquipStarShow(self.spLoader, self.star,equipConfigData.Id)
self.equipType.text=Language[11089]..GetEquipPosStrByEquipPosNum(equipConfigData.Position)
--下部按钮信息
self.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and BagManager.isBagPanel)
self.effectbaijin:SetActive(equipConfigData.Quality==7)
Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1)
@ -162,10 +219,10 @@ function RewardEquipSingleShowPopup2:OnShow()
end
--suitPro套装属性
local equipSuit = {}
if self.curHeroData then
-- body
equipSuit = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList)
end
local equipSuit = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList)
local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)
if suitConFig[equipConfigData.Star] then
self.suitPro:SetActive(true)
@ -181,8 +238,9 @@ function RewardEquipSingleShowPopup2:OnShow()
_suitProList[i].gameObject:SetActive(true)
local name = Util.GetGameObject(_suitProList[i].transform, "proName"):GetComponent("Text")
local value = Util.GetGameObject(_suitProList[i].transform, "proVale"):GetComponent("Text")
name.text = "<color=#FCEBCA>" .. GetLanguageStrById(propertyConfig[curSuitConFig.SuiteValue[i][2]].Info) .."+ "..GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]) .. "</color>"
value.text = "<color=#FCEBCA>(" .. curSuitConFig.SuiteValue[i][1] .. Language[11091]
local color = #equipSuit >= i and "00ff66" or "FCEBCA"
name.text = string.format("<color=#%s>%s+ %s</color>",color,GetLanguageStrById(propertyConfig[curSuitConFig.SuiteValue[i][2]].Info),GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]))
value.text = string.format("<color=#%s>(%s件激活)</color>",color,curSuitConFig.SuiteValue[i][1])
end
end
else
@ -204,21 +262,17 @@ function RewardEquipSingleShowPopup2:OnShow()
for i = 1, #curSuitConFig.SuiteSkill do
local go = _superProList[i]
go.gameObject:SetActive(true)
local Star = curSuitConFig.Id
local suitNum = curSuitConFig.SuiteSkill[i][1]
local passiveId = curSuitConFig.SuiteSkill[i][2]
go:GetComponent("Text").text = "<color=#FCEBCA>" .. GetLanguageStrById(passiveSkillConfig[passiveId].Desc) .. "</color>"
Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text").text = "<color=#FCEBCA>(" .. GetEquipSuitStr(Star,suitNum) .. ")</color>"
Util.GetGameObject(go.transform, "Name"):GetComponent("Text").text = "不朽天赋" .. i .. ""
local name = Util.GetGameObject(go.transform, "Name"):GetComponent("Text")
local value = Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text")
local color = #equipSuit >= i and "00ff66" or "FCEBCA"
name.text = string.format("不朽天赋%s",i)
go:GetComponent("Text").text = string.format("<color=#%s>%s</color>",color,GetLanguageStrById(passiveSkillConfig[curSuitConFig.SuiteSkill[i][2]].Desc))
value.text = string.format("<color=#FCEBCA>(%s)</color>",GetEquipSuitStr(curSuitConFig.Id,curSuitConFig.SuiteSkill[i][1]))
end
end
else
self.superPro:SetActive(false)
end
--(此处需要三遍才能完全打开)
ForceRebuildLayout(self.midBar.transform)
ForceRebuildLayout(self.midBar.transform)
ForceRebuildLayout(self.midBar.transform)
--获取途径
if self.jumpViewList and #self.jumpViewList > 0 then
@ -231,15 +285,25 @@ function RewardEquipSingleShowPopup2:OnShow()
if curitemData.Jump and #curitemData.Jump>0 then
self.canGetScrollView:SetData(curitemData.Jump,function (index, item)
local tempView = nil
if self.isRewardItemPop then
tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],false)
else
if self.isShowGo then
tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],true)
else
tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],false)
end
table.insert(self.jumpViewList,tempView)
end,true,true)
end
end
--(此处需要三遍才能完全打开)
ForceRebuildLayout(self.midBar.transform)
ForceRebuildLayout(self.midBar.transform)
ForceRebuildLayout(self.midBar.transform)
if self.func then
self.func()
end
end
--界面关闭时调用(用于子类重写)

View File

@ -409,7 +409,8 @@ function this.EquipInfo()
local frameBtn = Util.GetGameObject(pos, "mask")
Util.AddOnceClick(frameBtn, function()
if curEquipData then
UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i],0,nil,0)
-- UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i],0,nil,0)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, curHeroEquipDatas[i],0,false,false,curHeroData)
end
end)
end

View File

@ -664,7 +664,7 @@ function this:SingleDataShow(go,index)
function()
if curHeroEquipDatas[index] then
curSelectEquipData = curHeroEquipDatas[index]
UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[index])
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this,curHeroEquipDatas[index],2,false,nil,curHeroData)
elseif curEquipTreasureDatas[index] then
if itemConfig[curEquipTreasureDatas[index].id].ItemType == ItemType.EquipTreasure then
local pos = 0
@ -843,10 +843,10 @@ function this.SingleItemDataShow(_go, _itemData)
if curHeroData.harmonyGongMing then
this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position)
else
UIManager.OpenPanel(UIName.RoleEquipChangePopup,this,3,curHeroData,curHeroEquipDatas[equipConfig[_itemData.id].Position],nextEquipData,equipConfig[_itemData.id].Position)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this,_itemData,4,false,nil, curHeroData,equipConfig[_itemData.id].Position,nextEquipData)
end
else
UIManager.OpenPanel(UIName.RoleEquipChangePopup,this,1,curHeroData,_itemData,equipConfig[_itemData.id].Position)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this,_itemData,3,false,nil, curHeroData,equipConfig[_itemData.id].Position)
end
end
)

View File

@ -210,7 +210,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
EquipManager.SetEquipStarShow(self.spLoader, self.starGrid, _itemData.configData.Id)
Util.AddOnceClick(self.frameBtn, function()
_itemData.id = _itemData.configData.Id
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData,nil,self.isRewardItemPop)
-- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData,nil,self.isRewardItemPop)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0,true,true,nil)
end)
if effectLayer > 0 and _itemData.configData.Quantity1 then
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
@ -274,7 +275,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
EquipManager.SetEquipStarShow(self.spLoader, self.starGrid, _itemData.configData.Id)
Util.AddOnceClick(self.frameBtn, function()
--Log("self.isRewardItemPop "..tostring(self.isRewardItemPop))
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop)
-- UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0,true,true,nil)
end)
if effectLayer > 0 and _itemData.configData.Quantity1 then
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
@ -507,7 +509,8 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemSId)
local _itemData = {}
_itemData.id = itemSId
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
-- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0,true,true,nil)
end)
elseif itemDataConFig.ItemType == ItemType.Pokemon then
--异妖配件
@ -729,7 +732,8 @@ function ItemView:OnBtnCkickEvent(itemSId)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemDataConFig.Id)
local _itemData = {}
_itemData.id = itemDataConFig.Id
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
-- UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,self, _itemData,0,true,true,nil)
elseif itemDataConFig.ItemType == ItemType.Blueprint then
local lanTuData = WorkShopManager.GetLanTuIsOpenLock(itemDataConFig.Id)
if lanTuData then