【装备详情】界面调整

dev_chengFeng
ZhangBiao 2021-04-09 20:31:45 +08:00
parent 8cd52f0f83
commit da0d4f49d6
6 changed files with 45 additions and 145 deletions

View File

@ -358,7 +358,10 @@ function this.SystemItemAdapter(node, data, isShowTime)
UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,heroConfigData.Id,showStarNum)
end
elseif itemDataConFig.ItemType == ItemType.Equip then
UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, data.itemId)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, data.itemId)
local itemData = {}
itemData.id = data.itemId
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
elseif itemDataConFig.ItemType == ItemType.Talisman then
-- UIManager.OpenPanel(UIName.TalismanInfoPopup, data.itemId, 2, 1)
else

View File

@ -173,7 +173,11 @@ function this.ShowTitleEquipData(_go,_itemData,curEquipStarsConfig)
--Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=_itemData.Name
SetHeroStars(Util.GetGameObject(_go.transform, "star"), curEquipStarsConfig.Stars,1,nil,-15)
Util.AddClick(Util.GetGameObject(_go.transform,"icon"), function()
UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, _itemData.Id)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, _itemData.Id)
-- LogPink("_itemData.Id:"..tostring(_itemData.Id))
local itemData = {}
itemData.id = _itemData.Id
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
end)
end
@ -203,7 +207,10 @@ function this.SingleItemDataShow(_go,_itemData,curEquipStarsConfig)
this.ShowTitleData(curEquipStarsConfig)
end)
Util.AddLongPressClick(Util.GetGameObject(_go.transform,"icon"), function()
UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, _itemData.Id)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, _itemData.Id)
local itemData = {}
itemData.id = _itemData.Id
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, itemData, nil, nil)
end, 0.5)
end
--加减方法

View File

@ -686,7 +686,10 @@ function HandBookHeroAndEquipListPanel:OnShowSingleEquipData(_go,_equipData)
end
Util.GetGameObject(_go.transform, "GameObject/name"):GetComponent("Text").text = equipData.Name
Util.AddOnceClick(Util.GetGameObject(_go.transform, "GameObject/item/frame"), function()
UIManager.OpenPanel(UIName.HandBookEquipInfoPanel,equipData.Id)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel,equipData.Id)
local _itemData = {}
_itemData.id = equipData.Id
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
end)
if PlayerManager.equipHandBook[equipData.Id] == nil then
Util.SetGray(_go, true)

View File

@ -130,6 +130,8 @@ function RoleEquipChangePopup:OnOpen(...)
curEquipData=data[4]
nextEquipData=data[5]
position=data[6]
elseif type==4 then
curEquipData=data[4]
end
end
@ -162,6 +164,12 @@ function RoleEquipChangePopup:OnShow()
--"替 换"
this.ShowCurEquipData(2)
this.NextCurEquipData()
elseif type==4 then
this.equipPanel[2].bg:SetActive(false)
this.equipPanel[1].bg:SetActive(true)
this.equipPanel[1].curEquipText:SetActive(false)
this.equipPanel[1].curEquipBtnDown:SetActive(false)
this.ShowCurEquipData(4)
end
for i = 1,#this.equipPanel do
ForceRebuildLayout(this.equipPanel[i].bg.transform)

View File

@ -182,8 +182,6 @@ function RoleEquipPanel:BindEvent()
Util.AddOnceClick(
this.allEquipDown,
function()
--HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId) and
--print(tostring(HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId)),tostring(curHeroData.harmonyGongMing))
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
-- body
PopupTipPanel.ShowTip(Language[12222])
@ -396,11 +394,6 @@ function this:AllEquipUpBtnOnClick()
equiData = curEquip
end
end
-- if index == 5 or index == 6 then
-- LogYellow("宝物id"..equiData.idDyn.." id:"..equiData.id)
-- else
-- LogYellow("装备id"..equiData.id)
-- end
if (index == 5 or index == 6) then
if ((curHeroEquipDatas[index] and equiData.idDyn ~= curHeroEquipDatas[index].idDyn)
@ -460,9 +453,6 @@ function this:AllEquipUpBtnOnClick()
end
--穿戴宝物
if isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0 then
-- for i = 1, #allTreasureIds do
-- LogGreen("一键宝物"..allTreasureIds[i])
-- end
--穿装备协议
NetManager.EquipWearRequest(
curHeroData.dynamicId,
@ -526,7 +516,6 @@ function this:AllEquipDownBtnOnClick()
end
PlaySoundWithoutClick(SoundConfig.Sound_TakeOff)
this.ShowHeroEquip()
-- this:OnClickTabBtn(indexBtnNum)
end
function this.ShowHeroEquip()
@ -564,9 +553,7 @@ function this.ShowHeroEquip()
SetHeroBg(Util.GetGameObject(this.transform, "bg/heroInfo"),Util.GetGameObject(this.transform, "bg/heroInfo/bg"), curHeroData.star)
this.heroLv.text = curHeroData.lv
this.heroIcon.sprite = Util.LoadSprite(curHeroData.painting)
--this.heroPosIcon.sprite = Util.LoadSprite(curHeroData.professionIcon)
this.heroProIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
--this.heroStage.sprite = Util.LoadSprite(HeroStageSprite[curHeroData.heroConfig.HeroStage])
SetHeroStars(this.heroStarGrid, curHeroData.star,1,nil,-10)
--装备的数据
curHeroEquipDatas = {}
@ -578,7 +565,6 @@ function this.ShowHeroEquip()
end
--宝器的数据
curEquipTreasureDatas = {}
--LogError("#curHeroData.jewels "..#curHeroData.jewels)
for i = 1, #curHeroData.jewels do
local treasureData = EquipTreasureManager.GetSingleEquipTreasreData(curHeroData.jewels[i])
if treasureData ~= nil then
@ -587,7 +573,6 @@ function this.ShowHeroEquip()
curEquipTreasureDatas[pos] = treasureData
end
end
--this.equipTreasureBtn:SetActive(LengthOfTable(curEquipTreasureDatas) >= 2)
for i = 1, this.equipGrid.transform.childCount do
local go = this.equipGrid.transform:GetChild(i - 1).gameObject
local effect = Util.GetGameObject(go.transform, "effect")
@ -600,29 +585,22 @@ function this.ShowHeroEquip()
if curHeroEquipDatas[i] then
this:UpdateEquipItem(go,curHeroEquipDatas[i],lvObj,refineObj)
elseif curEquipTreasureDatas[i] then
-- print(curEquipTreasureDatas[i])
Util.GetGameObject(go.transform, "frame"):SetActive(true)
Util.GetGameObject(go.transform, "mask"):SetActive(false)
--Util.GetGameObject(go.transform,"proIcon"):SetActive(true)
Util.GetGameObject(go.transform, "frame/icon"):GetComponent("Image").sprite =
Util.LoadSprite(curEquipTreasureDatas[i].icon)
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite =
Util.LoadSprite(curEquipTreasureDatas[i].frame)
--Util.GetGameObject(go.transform,"proIcon"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName))
Util.GetGameObject(go.transform, "frame/star"):SetActive(false)
Util.GetGameObject(go.transform, "num").gameObject:SetActive(false)
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite =
Util.LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName))
--鸿蒙阵 共享数据判断
if HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1 then
-- body
--curEquipTreasureDatas[i].lv = curEquipTreasureDatas[i].lv > HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) and curEquipTreasureDatas[i].lv or HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint)
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
elseif HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 then
--curEquipTreasureDatas[i].lv = curEquipTreasureDatas[i].lv > HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) and curEquipTreasureDatas[i].lv or HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint)
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
else
-- body
Util.GetGameObject(go.transform, "HongMenging"):SetActive(false)
end
@ -639,11 +617,6 @@ function this.ShowHeroEquip()
else
refineObj:SetActive(false)
end
-- if i==5 then
-- this.equipBTn5Add:SetActive(false)
-- elseif i==6 then
-- this.equipBtn6Add:SetActive(false)
-- end
else
Util.GetGameObject(go.transform, "frame"):SetActive(false)
Util.GetGameObject(go.transform, "mask"):SetActive(true)
@ -656,22 +629,14 @@ function this.ShowHeroEquip()
if refineObj then
refineObj:SetActive(false)
end
-- if i==5 then
-- this.equipBTn5Add:SetActive(true)
-- elseif i==6 then
-- this.equipBtn6Add:SetActive(true)
-- end
end
local iconBtn = Util.GetGameObject(go.transform, "icon")
Util.AddOnceClick(
iconBtn,
function()
if curHeroEquipDatas[i] then
curSelectEquipData = curHeroEquipDatas[i]
UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i])
elseif curEquipTreasureDatas[i] then
if itemConfig[curEquipTreasureDatas[i].id].ItemType == ItemType.EquipTreasure then
local pos = 0
@ -683,15 +648,7 @@ function this.ShowHeroEquip()
elseif jewerConfig.Location == 2 then
pos = 6
end
UIManager.OpenPanel(
UIName.RoleEquipTreasureChangePopup,
this,
2,
curHeroData,
curEquipTreasureDatas[i],
nil,
pos
)
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,curEquipTreasureDatas[i],nil,pos)
end
end
end
@ -723,21 +680,17 @@ end
function this:OpenTips(nextEquipData,pos)
local content = Language[12224]
MsgPanel.ShowTwo(content,function ()
end,function ()
local equipIdList={}
local equipDataList={}
table.insert(equipIdList,tostring(nextEquipData.id))
table.insert(equipDataList,nextEquipData)
NetManager.EquipWearRequest(curHeroData.dynamicId,equipIdList,1,function ()
this.UpdateEquipPosHeroData(1,3,equipDataList,nextEquipData,pos)
end)
end,Language[10731],Language[11934])
end
function this:UpdateEquipItem(go,data,lvObj,refineObj)
Util.GetGameObject(go.transform, "frame"):SetActive(true)
@ -760,11 +713,7 @@ function this:UpdateEquipItem(go,data,lvObj,refineObj)
if refineObj then
refineObj:SetActive(false)
end
EquipManager.SetEquipStarShow(
Util.GetGameObject(go.transform, "frame/star"),
data.itemConfig.Id
)
EquipManager.SetEquipStarShow(Util.GetGameObject(go.transform, "frame/star"),data.itemConfig.Id)
end
--点击全部按钮
function this:OnClickAllBtn()
@ -831,22 +780,6 @@ function this:SetItemData(_itemDatas)
else
this.emptyObj.gameObject:SetActive(false)
end
--this:SortEquipDatas(_itemDatas)
--做装备叠加特殊组拼数据
-- local equips = {}
-- for i = 1, #_itemDatas do
-- --table.insert(equips,v)
-- if equips[_itemDatas[i].id] then
-- equips[_itemDatas[i].id].num = equips[_itemDatas[i].id].num + 1
-- else
-- equips[_itemDatas[i].id] = _itemDatas[i]
-- equips[_itemDatas[i].id].num = 1
-- end
-- end
-- local showList = {}
-- for i, v in pairs(equips) do
-- table.insert(showList, v)
-- end
this.ScrollView:SetData(
_itemDatas,
function(index, go)
@ -870,11 +803,6 @@ function this.SingleItemDataShow(_go, _itemData)
if not itemConfig[_itemData.id] then
return
end
-- if isPlayAnim then
-- _go.gameObject:SetActive(false)
-- else
-- _go.gameObject:SetActive(true)
-- end
local frame = Util.GetGameObject(_go.transform, "frame"):GetComponent("Image")
local icon = Util.GetGameObject(_go.transform, "icon"):GetComponent("Image")
local name = Util.GetGameObject(_go.transform, "name"):GetComponent("Text")
@ -921,24 +849,10 @@ function this.SingleItemDataShow(_go, _itemData)
-- 0.查看属性 1.穿戴 2.卸下 3.交换
--宝物界面
Util.AddOnceClick(
Util.GetGameObject(_go.transform, "icon"),
function()
Util.GetGameObject(_go.transform, "icon"),function()
if curEquipTreasureDatas[pos] then
UIManager.OpenPanel(
UIName.RoleEquipTreasureChangePopup,
this,
3,
curHeroData,
curEquipTreasureDatas[pos],
_itemData,
pos
)
-- end
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,3,curHeroData,curEquipTreasureDatas[pos],_itemData,pos)
else
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup, this, 1, curHeroData, _itemData, nil, pos)
end
end
@ -977,30 +891,13 @@ function this.SingleItemDataShow(_go, _itemData)
local nextEquipData = EquipManager.GetSingleEquipData(_itemData.id)
print(Language[12226]..#curHeroData.equipIdList)
if curHeroData.harmonyGongMing then
-- body
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.RoleEquipChangePopup,this,3,curHeroData,curHeroEquipDatas[equipConfig[_itemData.id].Position],nextEquipData,equipConfig[_itemData.id].Position)
end
else
print(Language[12227])
UIManager.OpenPanel(
UIName.RoleEquipChangePopup,
this,
1,
curHeroData,
_itemData,
equipConfig[_itemData.id].Position
)
UIManager.OpenPanel(UIName.RoleEquipChangePopup,this,1,curHeroData,_itemData,equipConfig[_itemData.id].Position)
end
end
)
@ -1087,8 +984,6 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
curSelectEquipData = _selectEquipDataList[1]
HeroManager.SetHeroEquipIdList(curHeroData.dynamicId, {curSelectEquipData.id})
EquipManager.SetEquipUpHeroDid(curSelectEquipData.id, curHeroData.dynamicId)
-- curHeroData.equipIdList[1] = curSelectEquipData.id
-- HeroManager.SetHeroEquipIdList(curHeroData.dynamicId, curHeroData.equipIdList)
end
else
curEquipTreasureDatas = _selectEquipDataList[1]
@ -1150,16 +1045,11 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
break
end
end
-- LogGreen("_selectEquipDataList[i]:".._selectEquipDataList[i])
-- LogGreen("isadd:"..tostring(isadd))
if isadd then
EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
table.insert(curHeroData.jewels, _selectEquipDataList[i])
end
end
-- for i = 1, #curHeroData.jewels do
-- LogYellow("curHeroData.jewels:"..i.. " id:"..curHeroData.jewels[i])
-- end
end
elseif _type == 5 then
--一键脱 把身上装备英雄id置为“0” 再把英雄装备list清空
@ -1251,23 +1141,6 @@ function this:SortEquipDatas(_equipDatas)
)
end
-- --做装备叠加特殊组拼数据
-- function this:EquipDJDatas(_itemDatas)
-- local equips = {}
-- for i = 1, #_itemDatas do
-- if equips[_itemDatas[i].id] then
-- equips[_itemDatas[i].id].num = equips[_itemDatas[i].id].num + 1
-- else
-- equips[_itemDatas[i].id] = _itemDatas[i]
-- equips[_itemDatas[i].id].num = 1
-- end
-- end
-- local showList = {}
-- for i, v in pairs(equips) do
-- table.insert(showList, v)
-- end
-- return showList
-- end
--界面销毁时调用(用于子类重写)
function RoleEquipPanel:OnDestroy()

View File

@ -453,7 +453,10 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity == 7)
end
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemSId)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemSId)
local _itemData = {}
_itemData.id = itemSId
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
end)
elseif itemDataConFig.ItemType == ItemType.Pokemon then
--异妖配件
@ -607,7 +610,10 @@ function ItemView:OnBtnCkickEvent(itemSId)
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id, itemConfig[itemDataConFig.Id].HeroStar[2])
elseif itemDataConFig.ItemType == ItemType.Equip then
--3装备
UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemDataConFig.Id)
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemDataConFig.Id)
local _itemData = {}
_itemData.id = itemDataConFig.Id
UIManager.OpenPanel(UIName.RoleEquipChangePopup, nil, 4, nil, _itemData, nil, nil)
elseif itemDataConFig.ItemType == ItemType.Blueprint then
local lanTuData = WorkShopManager.GetLanTuIsOpenLock(itemDataConFig.Id)
if lanTuData then