【装备界面】提交
parent
ff7e9e9e85
commit
12e46be512
File diff suppressed because it is too large
Load Diff
|
@ -455,9 +455,9 @@ function this.SingleItemDataShow(_go, _itemData)
|
||||||
Util.AddOnceClick(Util.GetGameObject(_go.gameObject, "GameObject/item/frame"), function()
|
Util.AddOnceClick(Util.GetGameObject(_go.gameObject, "GameObject/item/frame"), function()
|
||||||
if _itemData.itemConfig then
|
if _itemData.itemConfig then
|
||||||
if _itemData.itemConfig.ItemBaseType == ItemBaseType.Equip 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)
|
this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)
|
||||||
end,nil,true)
|
end)
|
||||||
elseif _itemData.itemConfig.ItemType == ItemType.SelfBox then--自选宝箱
|
elseif _itemData.itemConfig.ItemType == ItemType.SelfBox then--自选宝箱
|
||||||
UIManager.OpenPanel(UIName.RewardBoxPanel, _itemData, function()
|
UIManager.OpenPanel(UIName.RewardBoxPanel, _itemData, function()
|
||||||
this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)
|
this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)
|
||||||
|
|
|
@ -87,7 +87,7 @@ function BagResolveAnCompoundPanel:BindEvent()
|
||||||
PopupTipPanel.ShowTip(Language[10182])
|
PopupTipPanel.ShowTip(Language[10182])
|
||||||
end
|
end
|
||||||
elseif openLayoutType==2 then
|
elseif openLayoutType==2 then
|
||||||
UIManager.ClosePanel(UIName.RewardEquipSingleShowPopup)
|
UIManager.ClosePanel(UIName.RewardEquipSingleShowPopup2)
|
||||||
if equipData then
|
if equipData then
|
||||||
curResolveAllItemList={}
|
curResolveAllItemList={}
|
||||||
local equip = {}
|
local equip = {}
|
||||||
|
|
|
@ -119,7 +119,8 @@ function this.SetItemShow(drop)
|
||||||
elseif itemDataList[i].itemType==2 then
|
elseif itemDataList[i].itemType==2 then
|
||||||
Util.AddOnceClick(itemIcon, function()
|
Util.AddOnceClick(itemIcon, function()
|
||||||
Log("itemDataList[i].backData "..itemDataList[i].backData.equipId)
|
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)
|
end)
|
||||||
elseif itemDataList[i].itemType==3 then
|
elseif itemDataList[i].itemType==3 then
|
||||||
Util.AddOnceClick(itemIcon, function()
|
Util.AddOnceClick(itemIcon, function()
|
||||||
|
|
|
@ -240,7 +240,8 @@ function this.SetItemData(go, itemdata)
|
||||||
elseif itemdata.itemType==2 then
|
elseif itemdata.itemType==2 then
|
||||||
EquipManager.UpdateEquipData(itemdata.backData)
|
EquipManager.UpdateEquipData(itemdata.backData)
|
||||||
Util.AddOnceClick(itemIcon, function()
|
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)
|
end)
|
||||||
elseif itemdata.itemType==3 then
|
elseif itemdata.itemType==3 then
|
||||||
HeroManager.UpdateHeroDatas(itemdata.backData)
|
HeroManager.UpdateHeroDatas(itemdata.backData)
|
||||||
|
|
|
@ -422,7 +422,8 @@ function this.SystemItemAdapter(node, data, isShowTime)
|
||||||
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, data.itemId)
|
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, data.itemId)
|
||||||
local itemData = {}
|
local itemData = {}
|
||||||
itemData.id = data.itemId
|
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
|
elseif itemDataConFig.ItemType == ItemType.Talisman then
|
||||||
-- UIManager.OpenPanel(UIName.TalismanInfoPopup, data.itemId, 2, 1)
|
-- UIManager.OpenPanel(UIName.TalismanInfoPopup, data.itemId, 2, 1)
|
||||||
else
|
else
|
||||||
|
|
|
@ -218,7 +218,8 @@ function this.ShowTitleEquipData(_go,_itemData,curEquipStarsConfig)
|
||||||
-- LogPink("_itemData.Id:"..tostring(_itemData.Id))
|
-- LogPink("_itemData.Id:"..tostring(_itemData.Id))
|
||||||
local itemData = {}
|
local itemData = {}
|
||||||
itemData.id = _itemData.Id
|
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)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -274,7 +275,8 @@ function this.SingleItemDataShow(_go,_itemData,curEquipStarsConfig)
|
||||||
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, _itemData.Id)
|
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, _itemData.Id)
|
||||||
local itemData = {}
|
local itemData = {}
|
||||||
itemData.id = _itemData.Id
|
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, 0.5)
|
||||||
end
|
end
|
||||||
--加减方法
|
--加减方法
|
||||||
|
|
|
@ -689,7 +689,8 @@ function HandBookHeroAndEquipListPanel:OnShowSingleEquipData(_go,_equipData)
|
||||||
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel,equipData.Id)
|
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel,equipData.Id)
|
||||||
local _itemData = {}
|
local _itemData = {}
|
||||||
_itemData.id = equipData.Id
|
_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)
|
end)
|
||||||
if PlayerManager.equipHandBook[equipData.Id] == nil then
|
if PlayerManager.equipHandBook[equipData.Id] == nil then
|
||||||
Util.SetGray(_go, true)
|
Util.SetGray(_go, true)
|
||||||
|
|
|
@ -6,7 +6,11 @@ local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig
|
||||||
local _BaseProList = {}--基础属性对象
|
local _BaseProList = {}--基础属性对象
|
||||||
local _suitProList = {}--套装属性对象
|
local _suitProList = {}--套装属性对象
|
||||||
local _superProList = {}--白金属性对象
|
local _superProList = {}--白金属性对象
|
||||||
local isShowfenjie =true
|
local typeToUpdate = {
|
||||||
|
[2] = 2,--已穿戴->卸载单件
|
||||||
|
[3] = 1,--未穿戴->穿单件
|
||||||
|
[4] = 3,--未穿戴->替换单件
|
||||||
|
}
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function RewardEquipSingleShowPopup2:InitComponent()
|
function RewardEquipSingleShowPopup2:InitComponent()
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
|
@ -45,8 +49,13 @@ function RewardEquipSingleShowPopup2:InitComponent()
|
||||||
|
|
||||||
--分解按钮--btmBar
|
--分解按钮--btmBar
|
||||||
self.btmBar = Util.GetGameObject(self.transform, "Content/btmBar")
|
self.btmBar = Util.GetGameObject(self.transform, "Content/btmBar")
|
||||||
self.btnSure = Util.GetGameObject(self.btmBar, "btnGrid/btnSure")
|
self.howGet = Util.GetGameObject(self.btmBar, "howGet")
|
||||||
self.btnJump = Util.GetGameObject(self.btmBar, "btnGrid/btnJump")
|
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
|
--装备获取途径--btmBar
|
||||||
self.canGetPre = Util.GetGameObject(self.btmBar, "scroll/canGetPre")
|
self.canGetPre = Util.GetGameObject(self.btmBar, "scroll/canGetPre")
|
||||||
self.canGetGrid = Util.GetGameObject(self.btmBar, "scroll")
|
self.canGetGrid = Util.GetGameObject(self.btmBar, "scroll")
|
||||||
|
@ -64,7 +73,7 @@ function RewardEquipSingleShowPopup2:BindEvent()
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
--使用
|
--跳转
|
||||||
Util.AddClick(self.btnJump, function()
|
Util.AddClick(self.btnJump, function()
|
||||||
if self.equipData.itemConfig then
|
if self.equipData.itemConfig then
|
||||||
JumpManager.GoJump(self.equipData.itemConfig.UseJump)
|
JumpManager.GoJump(self.equipData.itemConfig.UseJump)
|
||||||
|
@ -95,6 +104,40 @@ function RewardEquipSingleShowPopup2:BindEvent()
|
||||||
PopupTipPanel.ShowTip(Language[11506])
|
PopupTipPanel.ShowTip(Language[11506])
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
|
@ -108,22 +151,37 @@ function RewardEquipSingleShowPopup2:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function RewardEquipSingleShowPopup2:OnOpen(_equipData,_openType,_isRewardItemPop,_curHeroData)
|
function RewardEquipSingleShowPopup2:OnOpen(_parent,_equipData,_openType,_isShowGet,_isShowGo,_curHeroData,_position,_targetEquipData,_func)
|
||||||
if not _equipData then
|
if not _equipData then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
self.equipData = _equipData
|
self.parent = _parent --父界面
|
||||||
self.openType = _openType
|
self.equipData = _equipData --当前装备数据
|
||||||
self.isRewardItemPop = _isRewardItemPop and _isRewardItemPop or false
|
self.openType = _openType --0不显示按钮、1背包、2已穿戴(显示卸下)、3未穿戴(显示穿戴)、4未穿戴(显示替换)
|
||||||
self.curHeroData = _curHeroData
|
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
|
end
|
||||||
|
|
||||||
function RewardEquipSingleShowPopup2:OnShow()
|
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 equipConfigData=ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(self.equipData.id))
|
||||||
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, 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.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..equipConfigData.Quality)
|
||||||
self.equipQuaText.text=GetStringByEquipQua(equipConfigData.Quality,GetQuaStringByEquipQua(equipConfigData.Quality))
|
self.equipQuaText.text=GetStringByEquipQua(equipConfigData.Quality,GetQuaStringByEquipQua(equipConfigData.Quality))
|
||||||
self.eqiopName.text=GetStringByEquipQua(equipConfigData.Quality,GetLanguageStrById(equipConfigData.Name))
|
self.eqiopName.text=GetStringByEquipQua(equipConfigData.Quality,GetLanguageStrById(equipConfigData.Name))
|
||||||
|
@ -134,7 +192,6 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
EquipManager.SetEquipStarShow(self.spLoader, self.star,equipConfigData.Id)
|
EquipManager.SetEquipStarShow(self.spLoader, self.star,equipConfigData.Id)
|
||||||
self.equipType.text=Language[11089]..GetEquipPosStrByEquipPosNum(equipConfigData.Position)
|
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)
|
self.effectbaijin:SetActive(equipConfigData.Quality==7)
|
||||||
Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1)
|
Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1)
|
||||||
|
|
||||||
|
@ -162,10 +219,10 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
end
|
end
|
||||||
|
|
||||||
--suitPro套装属性
|
--suitPro套装属性
|
||||||
|
local equipSuit = {}
|
||||||
if self.curHeroData then
|
if self.curHeroData then
|
||||||
-- body
|
equipSuit = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList)
|
||||||
end
|
end
|
||||||
local equipSuit = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList)
|
|
||||||
local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)
|
local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)
|
||||||
if suitConFig[equipConfigData.Star] then
|
if suitConFig[equipConfigData.Star] then
|
||||||
self.suitPro:SetActive(true)
|
self.suitPro:SetActive(true)
|
||||||
|
@ -181,8 +238,9 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
_suitProList[i].gameObject:SetActive(true)
|
_suitProList[i].gameObject:SetActive(true)
|
||||||
local name = Util.GetGameObject(_suitProList[i].transform, "proName"):GetComponent("Text")
|
local name = Util.GetGameObject(_suitProList[i].transform, "proName"):GetComponent("Text")
|
||||||
local value = Util.GetGameObject(_suitProList[i].transform, "proVale"):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>"
|
local color = #equipSuit >= i and "00ff66" or "FCEBCA"
|
||||||
value.text = "<color=#FCEBCA>(" .. curSuitConFig.SuiteValue[i][1] .. Language[11091]
|
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
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
@ -204,21 +262,17 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
for i = 1, #curSuitConFig.SuiteSkill do
|
for i = 1, #curSuitConFig.SuiteSkill do
|
||||||
local go = _superProList[i]
|
local go = _superProList[i]
|
||||||
go.gameObject:SetActive(true)
|
go.gameObject:SetActive(true)
|
||||||
local Star = curSuitConFig.Id
|
local name = Util.GetGameObject(go.transform, "Name"):GetComponent("Text")
|
||||||
local suitNum = curSuitConFig.SuiteSkill[i][1]
|
local value = Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text")
|
||||||
local passiveId = curSuitConFig.SuiteSkill[i][2]
|
local color = #equipSuit >= i and "00ff66" or "FCEBCA"
|
||||||
go:GetComponent("Text").text = "<color=#FCEBCA>" .. GetLanguageStrById(passiveSkillConfig[passiveId].Desc) .. "</color>"
|
name.text = string.format("不朽天赋%s:",i)
|
||||||
Util.GetGameObject(go.transform, "Name/vale"):GetComponent("Text").text = "<color=#FCEBCA>(" .. GetEquipSuitStr(Star,suitNum) .. ")</color>"
|
go:GetComponent("Text").text = string.format("<color=#%s>%s</color>",color,GetLanguageStrById(passiveSkillConfig[curSuitConFig.SuiteSkill[i][2]].Desc))
|
||||||
Util.GetGameObject(go.transform, "Name"):GetComponent("Text").text = "不朽天赋" .. i .. ":"
|
value.text = string.format("<color=#FCEBCA>(%s)</color>",GetEquipSuitStr(curSuitConFig.Id,curSuitConFig.SuiteSkill[i][1]))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
self.superPro:SetActive(false)
|
self.superPro:SetActive(false)
|
||||||
end
|
end
|
||||||
--(此处需要三遍才能完全打开)
|
|
||||||
ForceRebuildLayout(self.midBar.transform)
|
|
||||||
ForceRebuildLayout(self.midBar.transform)
|
|
||||||
ForceRebuildLayout(self.midBar.transform)
|
|
||||||
|
|
||||||
--获取途径
|
--获取途径
|
||||||
if self.jumpViewList and #self.jumpViewList > 0 then
|
if self.jumpViewList and #self.jumpViewList > 0 then
|
||||||
|
@ -231,15 +285,25 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
if curitemData.Jump and #curitemData.Jump>0 then
|
if curitemData.Jump and #curitemData.Jump>0 then
|
||||||
self.canGetScrollView:SetData(curitemData.Jump,function (index, item)
|
self.canGetScrollView:SetData(curitemData.Jump,function (index, item)
|
||||||
local tempView = nil
|
local tempView = nil
|
||||||
if self.isRewardItemPop then
|
if self.isShowGo then
|
||||||
tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],false)
|
|
||||||
else
|
|
||||||
tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],true)
|
tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],true)
|
||||||
|
else
|
||||||
|
tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],false)
|
||||||
end
|
end
|
||||||
table.insert(self.jumpViewList,tempView)
|
table.insert(self.jumpViewList,tempView)
|
||||||
end,true,true)
|
end,true,true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
--(此处需要三遍才能完全打开)
|
||||||
|
ForceRebuildLayout(self.midBar.transform)
|
||||||
|
ForceRebuildLayout(self.midBar.transform)
|
||||||
|
ForceRebuildLayout(self.midBar.transform)
|
||||||
|
|
||||||
|
if self.func then
|
||||||
|
self.func()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
|
|
|
@ -409,7 +409,8 @@ function this.EquipInfo()
|
||||||
local frameBtn = Util.GetGameObject(pos, "mask")
|
local frameBtn = Util.GetGameObject(pos, "mask")
|
||||||
Util.AddOnceClick(frameBtn, function()
|
Util.AddOnceClick(frameBtn, function()
|
||||||
if curEquipData then
|
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)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -664,7 +664,7 @@ function this:SingleDataShow(go,index)
|
||||||
function()
|
function()
|
||||||
if curHeroEquipDatas[index] then
|
if curHeroEquipDatas[index] then
|
||||||
curSelectEquipData = curHeroEquipDatas[index]
|
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
|
elseif curEquipTreasureDatas[index] then
|
||||||
if itemConfig[curEquipTreasureDatas[index].id].ItemType == ItemType.EquipTreasure then
|
if itemConfig[curEquipTreasureDatas[index].id].ItemType == ItemType.EquipTreasure then
|
||||||
local pos = 0
|
local pos = 0
|
||||||
|
@ -843,10 +843,10 @@ function this.SingleItemDataShow(_go, _itemData)
|
||||||
if curHeroData.harmonyGongMing then
|
if curHeroData.harmonyGongMing then
|
||||||
this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position)
|
this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position)
|
||||||
else
|
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
|
end
|
||||||
else
|
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
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
|
|
|
@ -210,7 +210,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
EquipManager.SetEquipStarShow(self.spLoader, self.starGrid, _itemData.configData.Id)
|
EquipManager.SetEquipStarShow(self.spLoader, self.starGrid, _itemData.configData.Id)
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
_itemData.id = _itemData.configData.Id
|
_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)
|
end)
|
||||||
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
||||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
|
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)
|
EquipManager.SetEquipStarShow(self.spLoader, self.starGrid, _itemData.configData.Id)
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
--Log("self.isRewardItemPop "..tostring(self.isRewardItemPop))
|
--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)
|
end)
|
||||||
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
||||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
|
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)
|
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemSId)
|
||||||
local _itemData = {}
|
local _itemData = {}
|
||||||
_itemData.id = itemSId
|
_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)
|
end)
|
||||||
elseif itemDataConFig.ItemType == ItemType.Pokemon then
|
elseif itemDataConFig.ItemType == ItemType.Pokemon then
|
||||||
--异妖配件
|
--异妖配件
|
||||||
|
@ -729,7 +732,8 @@ function ItemView:OnBtnCkickEvent(itemSId)
|
||||||
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemDataConFig.Id)
|
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemDataConFig.Id)
|
||||||
local _itemData = {}
|
local _itemData = {}
|
||||||
_itemData.id = itemDataConFig.Id
|
_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
|
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