【装备详情】界面调整
parent
8cd52f0f83
commit
da0d4f49d6
|
|
@ -358,7 +358,10 @@ function this.SystemItemAdapter(node, data, isShowTime)
|
||||||
UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,heroConfigData.Id,showStarNum)
|
UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,heroConfigData.Id,showStarNum)
|
||||||
end
|
end
|
||||||
elseif itemDataConFig.ItemType == ItemType.Equip then
|
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
|
elseif itemDataConFig.ItemType == ItemType.Talisman then
|
||||||
-- UIManager.OpenPanel(UIName.TalismanInfoPopup, data.itemId, 2, 1)
|
-- UIManager.OpenPanel(UIName.TalismanInfoPopup, data.itemId, 2, 1)
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -173,7 +173,11 @@ function this.ShowTitleEquipData(_go,_itemData,curEquipStarsConfig)
|
||||||
--Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=_itemData.Name
|
--Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=_itemData.Name
|
||||||
SetHeroStars(Util.GetGameObject(_go.transform, "star"), curEquipStarsConfig.Stars,1,nil,-15)
|
SetHeroStars(Util.GetGameObject(_go.transform, "star"), curEquipStarsConfig.Stars,1,nil,-15)
|
||||||
Util.AddClick(Util.GetGameObject(_go.transform,"icon"), function()
|
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)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -203,7 +207,10 @@ function this.SingleItemDataShow(_go,_itemData,curEquipStarsConfig)
|
||||||
this.ShowTitleData(curEquipStarsConfig)
|
this.ShowTitleData(curEquipStarsConfig)
|
||||||
end)
|
end)
|
||||||
Util.AddLongPressClick(Util.GetGameObject(_go.transform,"icon"), function()
|
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, 0.5)
|
||||||
end
|
end
|
||||||
--加减方法
|
--加减方法
|
||||||
|
|
|
||||||
|
|
@ -686,7 +686,10 @@ function HandBookHeroAndEquipListPanel:OnShowSingleEquipData(_go,_equipData)
|
||||||
end
|
end
|
||||||
Util.GetGameObject(_go.transform, "GameObject/name"):GetComponent("Text").text = equipData.Name
|
Util.GetGameObject(_go.transform, "GameObject/name"):GetComponent("Text").text = equipData.Name
|
||||||
Util.AddOnceClick(Util.GetGameObject(_go.transform, "GameObject/item/frame"), function()
|
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)
|
end)
|
||||||
if PlayerManager.equipHandBook[equipData.Id] == nil then
|
if PlayerManager.equipHandBook[equipData.Id] == nil then
|
||||||
Util.SetGray(_go, true)
|
Util.SetGray(_go, true)
|
||||||
|
|
|
||||||
|
|
@ -130,6 +130,8 @@ function RoleEquipChangePopup:OnOpen(...)
|
||||||
curEquipData=data[4]
|
curEquipData=data[4]
|
||||||
nextEquipData=data[5]
|
nextEquipData=data[5]
|
||||||
position=data[6]
|
position=data[6]
|
||||||
|
elseif type==4 then
|
||||||
|
curEquipData=data[4]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -162,6 +164,12 @@ function RoleEquipChangePopup:OnShow()
|
||||||
--"替 换"
|
--"替 换"
|
||||||
this.ShowCurEquipData(2)
|
this.ShowCurEquipData(2)
|
||||||
this.NextCurEquipData()
|
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
|
end
|
||||||
for i = 1,#this.equipPanel do
|
for i = 1,#this.equipPanel do
|
||||||
ForceRebuildLayout(this.equipPanel[i].bg.transform)
|
ForceRebuildLayout(this.equipPanel[i].bg.transform)
|
||||||
|
|
|
||||||
|
|
@ -182,8 +182,6 @@ function RoleEquipPanel:BindEvent()
|
||||||
Util.AddOnceClick(
|
Util.AddOnceClick(
|
||||||
this.allEquipDown,
|
this.allEquipDown,
|
||||||
function()
|
function()
|
||||||
--HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId) and
|
|
||||||
--print(tostring(HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId)),tostring(curHeroData.harmonyGongMing))
|
|
||||||
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
|
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
|
||||||
-- body
|
-- body
|
||||||
PopupTipPanel.ShowTip(Language[12222])
|
PopupTipPanel.ShowTip(Language[12222])
|
||||||
|
|
@ -396,11 +394,6 @@ function this:AllEquipUpBtnOnClick()
|
||||||
equiData = curEquip
|
equiData = curEquip
|
||||||
end
|
end
|
||||||
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 (index == 5 or index == 6) then
|
||||||
if ((curHeroEquipDatas[index] and equiData.idDyn ~= curHeroEquipDatas[index].idDyn)
|
if ((curHeroEquipDatas[index] and equiData.idDyn ~= curHeroEquipDatas[index].idDyn)
|
||||||
|
|
@ -460,9 +453,6 @@ function this:AllEquipUpBtnOnClick()
|
||||||
end
|
end
|
||||||
--穿戴宝物
|
--穿戴宝物
|
||||||
if isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0 then
|
if isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0 then
|
||||||
-- for i = 1, #allTreasureIds do
|
|
||||||
-- LogGreen("一键宝物"..allTreasureIds[i])
|
|
||||||
-- end
|
|
||||||
--穿装备协议
|
--穿装备协议
|
||||||
NetManager.EquipWearRequest(
|
NetManager.EquipWearRequest(
|
||||||
curHeroData.dynamicId,
|
curHeroData.dynamicId,
|
||||||
|
|
@ -526,7 +516,6 @@ function this:AllEquipDownBtnOnClick()
|
||||||
end
|
end
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_TakeOff)
|
PlaySoundWithoutClick(SoundConfig.Sound_TakeOff)
|
||||||
this.ShowHeroEquip()
|
this.ShowHeroEquip()
|
||||||
-- this:OnClickTabBtn(indexBtnNum)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.ShowHeroEquip()
|
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)
|
SetHeroBg(Util.GetGameObject(this.transform, "bg/heroInfo"),Util.GetGameObject(this.transform, "bg/heroInfo/bg"), curHeroData.star)
|
||||||
this.heroLv.text = curHeroData.lv
|
this.heroLv.text = curHeroData.lv
|
||||||
this.heroIcon.sprite = Util.LoadSprite(curHeroData.painting)
|
this.heroIcon.sprite = Util.LoadSprite(curHeroData.painting)
|
||||||
--this.heroPosIcon.sprite = Util.LoadSprite(curHeroData.professionIcon)
|
|
||||||
this.heroProIcon.sprite = Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName))
|
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)
|
SetHeroStars(this.heroStarGrid, curHeroData.star,1,nil,-10)
|
||||||
--装备的数据
|
--装备的数据
|
||||||
curHeroEquipDatas = {}
|
curHeroEquipDatas = {}
|
||||||
|
|
@ -578,7 +565,6 @@ function this.ShowHeroEquip()
|
||||||
end
|
end
|
||||||
--宝器的数据
|
--宝器的数据
|
||||||
curEquipTreasureDatas = {}
|
curEquipTreasureDatas = {}
|
||||||
--LogError("#curHeroData.jewels "..#curHeroData.jewels)
|
|
||||||
for i = 1, #curHeroData.jewels do
|
for i = 1, #curHeroData.jewels do
|
||||||
local treasureData = EquipTreasureManager.GetSingleEquipTreasreData(curHeroData.jewels[i])
|
local treasureData = EquipTreasureManager.GetSingleEquipTreasreData(curHeroData.jewels[i])
|
||||||
if treasureData ~= nil then
|
if treasureData ~= nil then
|
||||||
|
|
@ -587,7 +573,6 @@ function this.ShowHeroEquip()
|
||||||
curEquipTreasureDatas[pos] = treasureData
|
curEquipTreasureDatas[pos] = treasureData
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--this.equipTreasureBtn:SetActive(LengthOfTable(curEquipTreasureDatas) >= 2)
|
|
||||||
for i = 1, this.equipGrid.transform.childCount do
|
for i = 1, this.equipGrid.transform.childCount do
|
||||||
local go = this.equipGrid.transform:GetChild(i - 1).gameObject
|
local go = this.equipGrid.transform:GetChild(i - 1).gameObject
|
||||||
local effect = Util.GetGameObject(go.transform, "effect")
|
local effect = Util.GetGameObject(go.transform, "effect")
|
||||||
|
|
@ -600,29 +585,22 @@ function this.ShowHeroEquip()
|
||||||
if curHeroEquipDatas[i] then
|
if curHeroEquipDatas[i] then
|
||||||
this:UpdateEquipItem(go,curHeroEquipDatas[i],lvObj,refineObj)
|
this:UpdateEquipItem(go,curHeroEquipDatas[i],lvObj,refineObj)
|
||||||
elseif curEquipTreasureDatas[i] then
|
elseif curEquipTreasureDatas[i] then
|
||||||
-- print(curEquipTreasureDatas[i])
|
|
||||||
Util.GetGameObject(go.transform, "frame"):SetActive(true)
|
Util.GetGameObject(go.transform, "frame"):SetActive(true)
|
||||||
Util.GetGameObject(go.transform, "mask"):SetActive(false)
|
Util.GetGameObject(go.transform, "mask"):SetActive(false)
|
||||||
--Util.GetGameObject(go.transform,"proIcon"):SetActive(true)
|
|
||||||
Util.GetGameObject(go.transform, "frame/icon"):GetComponent("Image").sprite =
|
Util.GetGameObject(go.transform, "frame/icon"):GetComponent("Image").sprite =
|
||||||
Util.LoadSprite(curEquipTreasureDatas[i].icon)
|
Util.LoadSprite(curEquipTreasureDatas[i].icon)
|
||||||
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite =
|
Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite =
|
||||||
Util.LoadSprite(curEquipTreasureDatas[i].frame)
|
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, "frame/star"):SetActive(false)
|
||||||
Util.GetGameObject(go.transform, "num").gameObject:SetActive(false)
|
Util.GetGameObject(go.transform, "num").gameObject:SetActive(false)
|
||||||
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite =
|
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite =
|
||||||
Util.LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName))
|
Util.LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName))
|
||||||
--鸿蒙阵 共享数据判断
|
--鸿蒙阵 共享数据判断
|
||||||
if HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1 then
|
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)
|
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
|
||||||
elseif HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 then
|
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)
|
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
|
||||||
else
|
else
|
||||||
-- body
|
|
||||||
Util.GetGameObject(go.transform, "HongMenging"):SetActive(false)
|
Util.GetGameObject(go.transform, "HongMenging"):SetActive(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -639,11 +617,6 @@ function this.ShowHeroEquip()
|
||||||
else
|
else
|
||||||
refineObj:SetActive(false)
|
refineObj:SetActive(false)
|
||||||
end
|
end
|
||||||
-- if i==5 then
|
|
||||||
-- this.equipBTn5Add:SetActive(false)
|
|
||||||
-- elseif i==6 then
|
|
||||||
-- this.equipBtn6Add:SetActive(false)
|
|
||||||
-- end
|
|
||||||
else
|
else
|
||||||
Util.GetGameObject(go.transform, "frame"):SetActive(false)
|
Util.GetGameObject(go.transform, "frame"):SetActive(false)
|
||||||
Util.GetGameObject(go.transform, "mask"):SetActive(true)
|
Util.GetGameObject(go.transform, "mask"):SetActive(true)
|
||||||
|
|
@ -656,22 +629,14 @@ function this.ShowHeroEquip()
|
||||||
if refineObj then
|
if refineObj then
|
||||||
refineObj:SetActive(false)
|
refineObj:SetActive(false)
|
||||||
end
|
end
|
||||||
-- if i==5 then
|
|
||||||
-- this.equipBTn5Add:SetActive(true)
|
|
||||||
-- elseif i==6 then
|
|
||||||
-- this.equipBtn6Add:SetActive(true)
|
|
||||||
-- end
|
|
||||||
end
|
end
|
||||||
local iconBtn = Util.GetGameObject(go.transform, "icon")
|
local iconBtn = Util.GetGameObject(go.transform, "icon")
|
||||||
Util.AddOnceClick(
|
Util.AddOnceClick(
|
||||||
iconBtn,
|
iconBtn,
|
||||||
function()
|
function()
|
||||||
|
|
||||||
if curHeroEquipDatas[i] then
|
if curHeroEquipDatas[i] then
|
||||||
|
|
||||||
curSelectEquipData = curHeroEquipDatas[i]
|
curSelectEquipData = curHeroEquipDatas[i]
|
||||||
UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i])
|
UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, curHeroEquipDatas[i])
|
||||||
|
|
||||||
elseif curEquipTreasureDatas[i] then
|
elseif curEquipTreasureDatas[i] then
|
||||||
if itemConfig[curEquipTreasureDatas[i].id].ItemType == ItemType.EquipTreasure then
|
if itemConfig[curEquipTreasureDatas[i].id].ItemType == ItemType.EquipTreasure then
|
||||||
local pos = 0
|
local pos = 0
|
||||||
|
|
@ -683,15 +648,7 @@ function this.ShowHeroEquip()
|
||||||
elseif jewerConfig.Location == 2 then
|
elseif jewerConfig.Location == 2 then
|
||||||
pos = 6
|
pos = 6
|
||||||
end
|
end
|
||||||
UIManager.OpenPanel(
|
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,curEquipTreasureDatas[i],nil,pos)
|
||||||
UIName.RoleEquipTreasureChangePopup,
|
|
||||||
this,
|
|
||||||
2,
|
|
||||||
curHeroData,
|
|
||||||
curEquipTreasureDatas[i],
|
|
||||||
nil,
|
|
||||||
pos
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -723,21 +680,17 @@ end
|
||||||
function this:OpenTips(nextEquipData,pos)
|
function this:OpenTips(nextEquipData,pos)
|
||||||
local content = Language[12224]
|
local content = Language[12224]
|
||||||
MsgPanel.ShowTwo(content,function ()
|
MsgPanel.ShowTwo(content,function ()
|
||||||
|
|
||||||
end,function ()
|
end,function ()
|
||||||
|
|
||||||
local equipIdList={}
|
local equipIdList={}
|
||||||
local equipDataList={}
|
local equipDataList={}
|
||||||
table.insert(equipIdList,tostring(nextEquipData.id))
|
table.insert(equipIdList,tostring(nextEquipData.id))
|
||||||
table.insert(equipDataList,nextEquipData)
|
table.insert(equipDataList,nextEquipData)
|
||||||
NetManager.EquipWearRequest(curHeroData.dynamicId,equipIdList,1,function ()
|
NetManager.EquipWearRequest(curHeroData.dynamicId,equipIdList,1,function ()
|
||||||
|
|
||||||
this.UpdateEquipPosHeroData(1,3,equipDataList,nextEquipData,pos)
|
this.UpdateEquipPosHeroData(1,3,equipDataList,nextEquipData,pos)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
end,Language[10731],Language[11934])
|
end,Language[10731],Language[11934])
|
||||||
|
end
|
||||||
|
|
||||||
end
|
|
||||||
function this:UpdateEquipItem(go,data,lvObj,refineObj)
|
function this:UpdateEquipItem(go,data,lvObj,refineObj)
|
||||||
|
|
||||||
Util.GetGameObject(go.transform, "frame"):SetActive(true)
|
Util.GetGameObject(go.transform, "frame"):SetActive(true)
|
||||||
|
|
@ -760,11 +713,7 @@ function this:UpdateEquipItem(go,data,lvObj,refineObj)
|
||||||
if refineObj then
|
if refineObj then
|
||||||
refineObj:SetActive(false)
|
refineObj:SetActive(false)
|
||||||
end
|
end
|
||||||
EquipManager.SetEquipStarShow(
|
EquipManager.SetEquipStarShow(Util.GetGameObject(go.transform, "frame/star"),data.itemConfig.Id)
|
||||||
Util.GetGameObject(go.transform, "frame/star"),
|
|
||||||
data.itemConfig.Id
|
|
||||||
)
|
|
||||||
|
|
||||||
end
|
end
|
||||||
--点击全部按钮
|
--点击全部按钮
|
||||||
function this:OnClickAllBtn()
|
function this:OnClickAllBtn()
|
||||||
|
|
@ -831,22 +780,6 @@ function this:SetItemData(_itemDatas)
|
||||||
else
|
else
|
||||||
this.emptyObj.gameObject:SetActive(false)
|
this.emptyObj.gameObject:SetActive(false)
|
||||||
end
|
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(
|
this.ScrollView:SetData(
|
||||||
_itemDatas,
|
_itemDatas,
|
||||||
function(index, go)
|
function(index, go)
|
||||||
|
|
@ -870,11 +803,6 @@ function this.SingleItemDataShow(_go, _itemData)
|
||||||
if not itemConfig[_itemData.id] then
|
if not itemConfig[_itemData.id] then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- if isPlayAnim then
|
|
||||||
-- _go.gameObject:SetActive(false)
|
|
||||||
-- else
|
|
||||||
-- _go.gameObject:SetActive(true)
|
|
||||||
-- end
|
|
||||||
local frame = Util.GetGameObject(_go.transform, "frame"):GetComponent("Image")
|
local frame = Util.GetGameObject(_go.transform, "frame"):GetComponent("Image")
|
||||||
local icon = Util.GetGameObject(_go.transform, "icon"):GetComponent("Image")
|
local icon = Util.GetGameObject(_go.transform, "icon"):GetComponent("Image")
|
||||||
local name = Util.GetGameObject(_go.transform, "name"):GetComponent("Text")
|
local name = Util.GetGameObject(_go.transform, "name"):GetComponent("Text")
|
||||||
|
|
@ -921,24 +849,10 @@ function this.SingleItemDataShow(_go, _itemData)
|
||||||
-- 0.查看属性 1.穿戴 2.卸下 3.交换
|
-- 0.查看属性 1.穿戴 2.卸下 3.交换
|
||||||
--宝物界面
|
--宝物界面
|
||||||
Util.AddOnceClick(
|
Util.AddOnceClick(
|
||||||
Util.GetGameObject(_go.transform, "icon"),
|
Util.GetGameObject(_go.transform, "icon"),function()
|
||||||
function()
|
|
||||||
if curEquipTreasureDatas[pos] then
|
if curEquipTreasureDatas[pos] then
|
||||||
|
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,3,curHeroData,curEquipTreasureDatas[pos],_itemData,pos)
|
||||||
|
|
||||||
UIManager.OpenPanel(
|
|
||||||
UIName.RoleEquipTreasureChangePopup,
|
|
||||||
this,
|
|
||||||
3,
|
|
||||||
curHeroData,
|
|
||||||
curEquipTreasureDatas[pos],
|
|
||||||
_itemData,
|
|
||||||
pos
|
|
||||||
)
|
|
||||||
-- end
|
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup, this, 1, curHeroData, _itemData, nil, pos)
|
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup, this, 1, curHeroData, _itemData, nil, pos)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -977,30 +891,13 @@ function this.SingleItemDataShow(_go, _itemData)
|
||||||
local nextEquipData = EquipManager.GetSingleEquipData(_itemData.id)
|
local nextEquipData = EquipManager.GetSingleEquipData(_itemData.id)
|
||||||
print(Language[12226]..#curHeroData.equipIdList)
|
print(Language[12226]..#curHeroData.equipIdList)
|
||||||
if curHeroData.harmonyGongMing then
|
if curHeroData.harmonyGongMing then
|
||||||
-- body
|
|
||||||
this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position)
|
this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position)
|
||||||
|
|
||||||
else
|
else
|
||||||
UIManager.OpenPanel(
|
UIManager.OpenPanel(UIName.RoleEquipChangePopup,this,3,curHeroData,curHeroEquipDatas[equipConfig[_itemData.id].Position],nextEquipData,equipConfig[_itemData.id].Position)
|
||||||
UIName.RoleEquipChangePopup,
|
end
|
||||||
this,
|
|
||||||
3,
|
|
||||||
curHeroData,
|
|
||||||
curHeroEquipDatas[equipConfig[_itemData.id].Position],
|
|
||||||
nextEquipData,
|
|
||||||
equipConfig[_itemData.id].Position
|
|
||||||
)
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
print(Language[12227])
|
print(Language[12227])
|
||||||
UIManager.OpenPanel(
|
UIManager.OpenPanel(UIName.RoleEquipChangePopup,this,1,curHeroData,_itemData,equipConfig[_itemData.id].Position)
|
||||||
UIName.RoleEquipChangePopup,
|
|
||||||
this,
|
|
||||||
1,
|
|
||||||
curHeroData,
|
|
||||||
_itemData,
|
|
||||||
equipConfig[_itemData.id].Position
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
|
|
@ -1087,8 +984,6 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
|
||||||
curSelectEquipData = _selectEquipDataList[1]
|
curSelectEquipData = _selectEquipDataList[1]
|
||||||
HeroManager.SetHeroEquipIdList(curHeroData.dynamicId, {curSelectEquipData.id})
|
HeroManager.SetHeroEquipIdList(curHeroData.dynamicId, {curSelectEquipData.id})
|
||||||
EquipManager.SetEquipUpHeroDid(curSelectEquipData.id, curHeroData.dynamicId)
|
EquipManager.SetEquipUpHeroDid(curSelectEquipData.id, curHeroData.dynamicId)
|
||||||
-- curHeroData.equipIdList[1] = curSelectEquipData.id
|
|
||||||
-- HeroManager.SetHeroEquipIdList(curHeroData.dynamicId, curHeroData.equipIdList)
|
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
curEquipTreasureDatas = _selectEquipDataList[1]
|
curEquipTreasureDatas = _selectEquipDataList[1]
|
||||||
|
|
@ -1150,16 +1045,11 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogGreen("_selectEquipDataList[i]:".._selectEquipDataList[i])
|
|
||||||
-- LogGreen("isadd:"..tostring(isadd))
|
|
||||||
if isadd then
|
if isadd then
|
||||||
EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
|
EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
|
||||||
table.insert(curHeroData.jewels, _selectEquipDataList[i])
|
table.insert(curHeroData.jewels, _selectEquipDataList[i])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- for i = 1, #curHeroData.jewels do
|
|
||||||
-- LogYellow("curHeroData.jewels:"..i.. " id:"..curHeroData.jewels[i])
|
|
||||||
-- end
|
|
||||||
end
|
end
|
||||||
elseif _type == 5 then
|
elseif _type == 5 then
|
||||||
--一键脱 把身上装备英雄id置为“0” 再把英雄装备list清空
|
--一键脱 把身上装备英雄id置为“0” 再把英雄装备list清空
|
||||||
|
|
@ -1251,23 +1141,6 @@ function this:SortEquipDatas(_equipDatas)
|
||||||
)
|
)
|
||||||
end
|
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()
|
function RoleEquipPanel:OnDestroy()
|
||||||
|
|
|
||||||
|
|
@ -453,7 +453,10 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
||||||
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity == 7)
|
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity == 7)
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
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)
|
end)
|
||||||
elseif itemDataConFig.ItemType == ItemType.Pokemon then
|
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])
|
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id, itemConfig[itemDataConFig.Id].HeroStar[2])
|
||||||
elseif itemDataConFig.ItemType == ItemType.Equip then
|
elseif itemDataConFig.ItemType == ItemType.Equip then
|
||||||
--3装备
|
--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
|
elseif itemDataConFig.ItemType == ItemType.Blueprint then
|
||||||
local lanTuData = WorkShopManager.GetLanTuIsOpenLock(itemDataConFig.Id)
|
local lanTuData = WorkShopManager.GetLanTuIsOpenLock(itemDataConFig.Id)
|
||||||
if lanTuData then
|
if lanTuData then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue