Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
altair 2020-07-28 16:38:57 +08:00
commit 701faa8360
4 changed files with 2 additions and 40 deletions

View File

@ -20,7 +20,6 @@ function BagPanel:InitComponent()
tabs1[i] = Util.GetGameObject(self.transform, "box/Btn" .. i)
tabs1RedPoint[i] = Util.GetGameObject(self.transform, "box/Btn" .. i .. "/redPoint")
end
--this.tabs1Go = Util.GetGameObject(self.transform, "Tabs1")
this.selectBtn1 = Util.GetGameObject(self.gameObject, "selectBtn")
this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform)
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
@ -29,7 +28,6 @@ function BagPanel:InitComponent()
this.ItemView = Util.GetGameObject(self.gameObject, "ItemView")
this.ItemViewEffect = Util.GetGameObject(self.gameObject, "ItemView/GameObject/effects")
this.item = Util.GetGameObject(self.gameObject, "Item")
--this.itemEffect = Util.GetGameObject(self.gameObject, "Item/effects")
this.grid = Util.GetGameObject(self.gameObject, "scroll/grid")
this.Scrollbar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
this.isBagPanel = true
@ -61,7 +59,6 @@ function BagPanel:BindEvent()
Util.AddClick(this.BtnBack, function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
--UIManager.OpenPanel(UIName.MainPanel)
self:ClosePanel()
end)
for i = 0, 7 do
@ -108,7 +105,6 @@ end
function this:SetSelectBtn(_btn)
if _btn then
this.selectBtn1:SetActive(true)
--this.selectBtn1.transform.localPosition = _btn.transform.localPosition
this.selectBtn1.transform:SetParent(_btn.transform)
this.selectBtn1.transform.localPosition = Vector3.zero
Util.GetGameObject(this.selectBtn1.transform, "Text"):GetComponent("Text").text = Util.GetGameObject(_btn.transform, "Text"):GetComponent("Text").text
@ -130,13 +126,6 @@ function this:OnClickAllBtn()
for i = 1, #curAllEquipTreasure do
table.insert(itemData, curAllEquipTreasure[i])
end
--for i = 1, #allEquipData do
-- table.insert(itemData, allEquipData[i])
--end
--local allTalisman = TalismanManager.GetAllTalismanData(false, "0")
--for i = 1, #allTalisman do
-- table.insert(itemData, allTalisman[i])
--end
local soulPrintData = BagManager.GetAllSoulPrintData()
for i,v in ipairs(soulPrintData) do
table.insert(itemData, v)
@ -166,7 +155,6 @@ function this.OnClickTabBtn(_index, _clickBtn)
elseif _index == 0 then
this:OnClickAllBtn()
elseif (_index == ItemBaseType.SoulPrint) then
--itemData = BagManager.GetBagItemDataByItemType(ItemBaseType.SoulPrint)
itemData = BagManager.GetAllSoulPrintData()
itemNumText.text = Language[10189]..#itemData.."/"..specialConfig[9].Value
this:SetItemData(itemData, ItemBaseType.SoulPrint)
@ -273,7 +261,6 @@ function this.SingleItemDataShow(_go, _itemData)
if(UI_Effect_Kuang_JinSe) then
UI_Effect_Kuang_JinSe:SetActive(false)
end
--local UI_Effect_Kuang_HongSe = Util.GetGameObject(_go.transform, "GameObject/effects/UI_Effect_Kuang_HongSe")
upHeroInage:SetActive(false)
local frameMask = Util.GetGameObject(_go.transform, "GameObject/item/frameMask")
frameMask:SetActive(false)
@ -288,7 +275,6 @@ function this.SingleItemDataShow(_go, _itemData)
strongLv.gameObject:SetActive(false)
refine.gameObject:SetActive(false)
if _itemData.itemConfig then
--UI_Effect_Kuang_HongSe:SetActive(_itemData.itemConfig.Quantity == 6 )
Util.GetGameObject(_go.transform, "GameObject/item/innateImage"):SetActive(false)
Util.GetGameObject(_go.transform, "GameObject/item/fragmentIcon"):SetActive(false)
num:SetActive(true)
@ -361,20 +347,15 @@ function this.SingleItemDataShow(_go, _itemData)
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg/circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[_itemData.itemConfig.Id].Quantity].circle)
UI_Effect_Kuang_JinSe.gameObject:SetActive(true)
num:SetActive(false)
-- Util.GetGameObject(_go.transform, "GameObject/item/resetLv"):GetComponent("Text").text = "+" .. _itemData.level
end
end
local redPoint = Util.GetGameObject(_go.gameObject, "GameObject/redPoint")
Util.AddOnceClick(Util.GetGameObject(_go.gameObject, "GameObject/item/frame"), function()
if _itemData.itemConfig then
if _itemData.itemConfig.ItemBaseType == ItemBaseType.Equip then
-- if _itemData.itemConfig.Quantity >= 4 then
-- EquipManager.SetNotNewEquipAnyMore(_itemData.id)
-- redPoint:SetActive(false)
-- end
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData, function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo)
end)
end,nil,true)
elseif _itemData.itemConfig.ItemType == ItemType.SelfBox then--自选宝箱
UIManager.OpenPanel(UIName.RewardBoxPanel, _itemData, function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo)
@ -403,7 +384,6 @@ function this.SingleItemDataShow(_go, _itemData)
if _itemData.num >= _itemData.itemConfig.UsePerCount then
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo)
--UIManager.ClosePanel(UIName.RewardItemSingleShowPopup)
end)
else
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.id, function()
@ -415,7 +395,6 @@ function this.SingleItemDataShow(_go, _itemData)
--宝器
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.idDyn,_itemData.id, _itemData.lv,_itemData.refineLv, function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo)
--UIManager.ClosePanel(UIName.RewardTalismanSingleShowPopup)
end)
elseif _itemData.itemConfig.ItemBaseType == ItemBaseType.SoulPrint then
--魂印
@ -429,11 +408,6 @@ function this.SingleItemDataShow(_go, _itemData)
end
end)
--Util.AddOnceClick(pokemonFrame, function()
-- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.id, function()
-- this.OnClickTabBtn(sortIndex, sortIndexBtnGo)
-- end)
--end)
--显示红点
redPoint:SetActive(false)
if _itemData.itemConfig.ItemType == ItemType.Equip then
@ -503,9 +477,6 @@ function BagPanel:OnShow()
else
this:OnClickAllBtn()
end
--this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
--this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.BagPanel })
SoundManager.PlayMusic(SoundConfig.BGM_Main)
BagManager.isBagPanel = true
@ -543,22 +514,13 @@ function BagPanel:OnSortingOrderChange()
Util.AddParticleSortLayer(list[i], this.sortingOrder- orginLayer)
end
orginLayer = this.sortingOrder
--Util.AddParticleSortLayer(this.itemEffect, self.sortingOrder - this.EffectOrginLayer)
this.EffectOrginLayer = self.sortingOrder
--this.bg.overrideSorting = true
--this.scroll.overrideSorting = true
--this.scroll.sortingOrder = self.sortingOrder - 10
--this.bg.sortingOrder = self.sortingOrder - 20
this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder })
end
--界面关闭时调用(用于子类重写)
function BagPanel:OnClose()
this.noneImage:SetActive(false)
--BagManager.SetItemNewRewPooint()
-- EquipManager.SetEquipNewRewPooint()
BagManager.isBagPanel = false
if isFristOpenTime then
isFristOpenTime:Stop()

View File

@ -115,7 +115,7 @@ function RewardEquipSingleShowPopup:OnOpen(_equipData, _func,_isRewardItemPop,_i
equipData=_equipData
func=_func
isRewardItemPop = _isRewardItemPop and _isRewardItemPop or false
isShowfenjie = not (_isShowfenjie or false)
isShowfenjie = not not (_isShowfenjie or false)
end
function RewardEquipSingleShowPopup:OnShow()