Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
luyao 2022-06-15 15:02:29 +08:00
commit a8920a1c88
3 changed files with 11 additions and 6 deletions

View File

@ -389,7 +389,12 @@ function this.Compound()
PopupTipPanel.ShowTip(itemConfig[otherId].Name.."不足")
return
end
NetManager.ComplexEquipRequest(curIndex,curSelectEquip.Star,compoundNum,function(msg)
local aaa=curIndex
if curIndex==5 then
aaa=curSelectEquip.Position
end
--LogError("curSelectEquip.Name=="..curSelectEquip.Name.." id=="..curSelectEquip.Id.." aaa=="..aaa)
NetManager.ComplexEquipRequest(aaa,curSelectEquip.Star,compoundNum,function(msg)
SoundManager.PlaySound(SoundConfig.UI_Duanzao)
-- SoundManager.PlaySound(SoundConfig.UI_Baoqi)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()

View File

@ -441,7 +441,7 @@ function this.EquipInfo()
this.treasureDatas[pos].gameObject:SetActive(true)
this.treasureDatas[pos].transform:SetAsFirstSibling()
-- 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)
this.treasureDatas[pos]:OnOpen(false, {curEquipData.id,0}, 0.8, false, false, false,orginLayer,nil,curEquipData)
end
local frameBtn = Util.GetGameObject(pos, "mask")

View File

@ -547,7 +547,7 @@ function this:SingleDataShow(go,index)
-- else
-- LogError("无homeEquipLv")
-- end
this.equipPreList2[go]:OnOpen(false,{curHeroEquipDatas[index].id,0}, 1, false, false, false, 0,nil,curHeroEquipDatas[index])
this.equipPreList2[go]:OnOpen(false,{curHeroEquipDatas[index].id,0}, 1, false, false, false, orginLayer,nil,curHeroEquipDatas[index])
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
-- body
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
@ -557,7 +557,7 @@ function this:SingleDataShow(go,index)
elseif curEquipTreasureDatas[index] then
this.equipPreList2[go].gameObject:SetActive(true)
mask.gameObject:SetActive(false)
this.equipPreList2[go]:OnOpen(false,{curEquipTreasureDatas[index].id,0}, 1, false, false, false, 0,curEquipTreasureDatas[index].idDyn)
this.equipPreList2[go]:OnOpen(false,{curEquipTreasureDatas[index].id,0}, 1, false, false, false, orginLayer,curEquipTreasureDatas[index].idDyn)
--鸿蒙阵 共享数据判断
if HarmonyManager.IsInfo(curEquipTreasureDatas[index].upHeroDid) and curEquipTreasureDatas[index].equipType == 1 then
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
@ -684,7 +684,7 @@ function this.SingleItemDataShow(_go, _itemData)
this.equipPreList[_go].gameObject:SetActive(true)
this.equipPreList[_go].transform:SetAsFirstSibling()
if itemConfig[_itemData.id].ItemType == ItemType.EquipTreasure then
this.equipPreList[_go]:OnOpen(false,{_itemData.id,0}, 1.1, true, false, false, 0,_itemData.idDyn)
this.equipPreList[_go]:OnOpen(false,{_itemData.id,0}, 1.1, true, false, false, orginLayer,_itemData.idDyn)
if curHeroCanUpEquipTreasuresTabs and #curHeroCanUpEquipTreasuresTabs > 0 then
local isShow = false
for i = 1, #curHeroCanUpEquipTreasuresTabs do
@ -713,7 +713,7 @@ function this.SingleItemDataShow(_go, _itemData)
end
)
else
this.equipPreList[_go]:OnOpen(false,{_itemData.id,_itemData.num}, 1, true, false, false, 0)
this.equipPreList[_go]:OnOpen(false,{_itemData.id,_itemData.num}, 1, true, false, false, orginLayer)
if curHeroCanUpEquipTabs and #curHeroCanUpEquipTabs > 0 then
local isShow = false
for i = 1, #curHeroCanUpEquipTabs do