svn逻辑同步
parent
5154fdbac0
commit
c4751eed0a
|
@ -9290,7 +9290,7 @@ ParticleSystem:
|
||||||
--- !u!199 &8784777500139318308
|
--- !u!199 &8784777500139318308
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -14582,7 +14582,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6409678742855279415
|
--- !u!199 &6409678742855279415
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -19709,7 +19709,7 @@ ParticleSystem:
|
||||||
--- !u!199 &5134806021683923440
|
--- !u!199 &5134806021683923440
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -24754,7 +24754,7 @@ ParticleSystem:
|
||||||
--- !u!199 &8594092854800795284
|
--- !u!199 &8594092854800795284
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -29536,7 +29536,7 @@ ParticleSystem:
|
||||||
--- !u!199 &5592400397920860441
|
--- !u!199 &5592400397920860441
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 2
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1095,7 +1095,7 @@
|
||||||
[11094] = "职业限定:%s",
|
[11094] = "职业限定:%s",
|
||||||
[11095] = "件激活)</color>",
|
[11095] = "件激活)</color>",
|
||||||
[11096] = "搜索进度:",
|
[11096] = "搜索进度:",
|
||||||
[11097] = "初始",
|
[11097] = "情报",
|
||||||
[11098] = "满星",
|
[11098] = "满星",
|
||||||
[11099] = "传记",
|
[11099] = "传记",
|
||||||
[11100] = "内容未开放",
|
[11100] = "内容未开放",
|
||||||
|
@ -2195,4 +2195,11 @@
|
||||||
[12194] = "瑶池魇妖化作一阵青烟消失~~",
|
[12194] = "瑶池魇妖化作一阵青烟消失~~",
|
||||||
[12195] = "大闹天宫进入重置阶段,请等待凌晨5点后进入!",
|
[12195] = "大闹天宫进入重置阶段,请等待凌晨5点后进入!",
|
||||||
[12196] = "无符合要求的神将!",
|
[12196] = "无符合要求的神将!",
|
||||||
|
[12197] = "已成功恢复神将!",
|
||||||
|
[12198] = "哦了",
|
||||||
|
[12199] = "求求你输个ID吧!",
|
||||||
|
[12200] = "后刷新",
|
||||||
|
[12201] = "保留",
|
||||||
|
[12202] = "贪婪节点无数据",
|
||||||
|
[12203] = "您已完成求援!",
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||||
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
||||||
local isFristOpenTime = Timer.New()
|
local isFristOpenTime = Timer.New()
|
||||||
local orginLayer=0--层级
|
local orginLayer=0--层级
|
||||||
|
local list={}
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function BagPanel:InitComponent()
|
function BagPanel:InitComponent()
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@ function this:OnClickAllBtn()
|
||||||
itemData = {}
|
itemData = {}
|
||||||
itemData = this.GetBagItemData()
|
itemData = this.GetBagItemData()
|
||||||
local allEquipData = {}
|
local allEquipData = {}
|
||||||
allEquipData = EquipManager.GetAllEquipData3()
|
allEquipData = EquipManager.GetAllEquipData2()
|
||||||
for i, v in pairs(allEquipData) do
|
for i, v in pairs(allEquipData) do
|
||||||
table.insert(itemData, v)
|
table.insert(itemData, v)
|
||||||
end
|
end
|
||||||
|
@ -191,10 +191,10 @@ function this.OnRefreshSoulPanelBagData()
|
||||||
this:SetItemData(itemData, ItemBaseType.SoulPrint)
|
this:SetItemData(itemData, ItemBaseType.SoulPrint)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local orginLayer2
|
||||||
|
|
||||||
--设置背包列表数据
|
--设置背包列表数据
|
||||||
function this:SetItemData(_itemDatas)
|
function this:SetItemData(_itemDatas)
|
||||||
|
list={}
|
||||||
this.ItemsSortData(_itemDatas)
|
this.ItemsSortData(_itemDatas)
|
||||||
if not this.ScrollView then
|
if not this.ScrollView then
|
||||||
local v2 = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
|
local v2 = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
|
||||||
|
@ -208,7 +208,16 @@ function this:SetItemData(_itemDatas)
|
||||||
go.gameObject:SetActive(false)
|
go.gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
this.SingleItemDataShow(go, _itemDatas[index])
|
this.SingleItemDataShow(go, _itemDatas[index])
|
||||||
|
if _itemDatas[index].itemConfig.ItemType == ItemType.HunYin then
|
||||||
|
table.insert(list,go)
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
|
--特效层级重设
|
||||||
|
for i=1,#list do
|
||||||
|
Util.AddParticleSortLayer(list[i], this.sortingOrder- orginLayer2)
|
||||||
|
end
|
||||||
|
orginLayer2 = this.sortingOrder
|
||||||
|
orginLayer = this.sortingOrder
|
||||||
|
|
||||||
if this.isFristOpen then
|
if this.isFristOpen then
|
||||||
this.ScrollView:ForeachItemGO(function(index, go)
|
this.ScrollView:ForeachItemGO(function(index, go)
|
||||||
|
@ -368,9 +377,7 @@ function this.SingleItemDataShow(_go, _itemData)
|
||||||
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[_itemData.itemConfig.Id].Quantity].circleBg2)
|
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[_itemData.itemConfig.Id].Quantity].circleBg2)
|
||||||
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg/Icon"):GetComponent("Image").sprite=Util.LoadSprite(_itemData.icon)
|
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg/Icon"):GetComponent("Image").sprite=Util.LoadSprite(_itemData.icon)
|
||||||
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg/circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[_itemData.itemConfig.Id].Quantity].circle)
|
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg/circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[_itemData.itemConfig.Id].Quantity].circle)
|
||||||
UI_Effect_Kuang_JinSe:SetActive(true)
|
UI_Effect_Kuang_JinSe.gameObject:SetActive(true)
|
||||||
Util.AddParticleSortLayer(_go, this.sortingOrder-orginLayer)
|
|
||||||
orginLayer=this.sortingOrder
|
|
||||||
-- Util.GetGameObject(_go.transform, "GameObject/item/resetLv"):GetComponent("Text").text = "+" .. _itemData.level
|
-- Util.GetGameObject(_go.transform, "GameObject/item/resetLv"):GetComponent("Text").text = "+" .. _itemData.level
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -543,11 +550,16 @@ function this.SetPlayerHead()
|
||||||
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
|
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
|
||||||
|
|
||||||
end
|
end
|
||||||
|
local orginLayer
|
||||||
function BagPanel:OnSortingOrderChange()
|
function BagPanel:OnSortingOrderChange()
|
||||||
Util.AddParticleSortLayer(this.ItemViewEffect, self.sortingOrder - this.EffectOrginLayer)
|
Util.AddParticleSortLayer(this.ItemViewEffect, self.sortingOrder - this.EffectOrginLayer)
|
||||||
Util.AddParticleSortLayer(this.vipPrivilegeBtn, self.sortingOrder - this.EffectOrginLayer)
|
Util.AddParticleSortLayer(this.vipPrivilegeBtn, self.sortingOrder - this.EffectOrginLayer)
|
||||||
|
|
||||||
|
--特效层级重设
|
||||||
|
for i=1,#list do
|
||||||
|
Util.AddParticleSortLayer(list[i], this.sortingOrder- orginLayer)
|
||||||
|
end
|
||||||
|
orginLayer = this.sortingOrder
|
||||||
--Util.AddParticleSortLayer(this.itemEffect, self.sortingOrder - this.EffectOrginLayer)
|
--Util.AddParticleSortLayer(this.itemEffect, self.sortingOrder - this.EffectOrginLayer)
|
||||||
this.EffectOrginLayer = self.sortingOrder
|
this.EffectOrginLayer = self.sortingOrder
|
||||||
|
|
||||||
|
@ -683,7 +695,7 @@ function this.GetBagItemData()
|
||||||
local _index = 1
|
local _index = 1
|
||||||
local _bagItemData = {}
|
local _bagItemData = {}
|
||||||
for i, v in pairs(BagManager.bagDatas) do
|
for i, v in pairs(BagManager.bagDatas) do
|
||||||
if v.isBag and v.num > 0 and v.itemConfig.ItemType ~= ItemType.Pokemon then
|
if v.isBag and v.num > 0 and v.itemConfig.ItemType ~= ItemType.Pokemon and v.itemConfig.ItemType ~= ItemType.HunYin then
|
||||||
--进背包 数量大于零的 不是异妖部件
|
--进背包 数量大于零的 不是异妖部件
|
||||||
_bagItemData[_index] = v
|
_bagItemData[_index] = v
|
||||||
_index = _index + 1
|
_index = _index + 1
|
||||||
|
@ -702,7 +714,9 @@ function BagPanel:OnDestroy()
|
||||||
ClearRedPointObject(RedPointType.Bag_BoxAndBlueprint, tabs1RedPoint[ItemBaseType.Special])
|
ClearRedPointObject(RedPointType.Bag_BoxAndBlueprint, tabs1RedPoint[ItemBaseType.Special])
|
||||||
ClearRedPointObject(RedPointType.Setting, this.headRedpot)
|
ClearRedPointObject(RedPointType.Setting, this.headRedpot)
|
||||||
ClearRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
|
ClearRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
|
||||||
|
list={}
|
||||||
|
orginLayer2=0
|
||||||
|
orginLayer=0
|
||||||
end
|
end
|
||||||
|
|
||||||
--跳转显示新手提示圈
|
--跳转显示新手提示圈
|
||||||
|
|
|
@ -117,25 +117,6 @@ function this.GetAllEquipData2()
|
||||||
return equips
|
return equips
|
||||||
end
|
end
|
||||||
|
|
||||||
--背包专用 去除已穿装备
|
|
||||||
--做装备叠加特殊组拼数据 去除魂印
|
|
||||||
function this.GetAllEquipData3()
|
|
||||||
local equips = {}
|
|
||||||
for i, v in pairs(this.equipDatas) do
|
|
||||||
if v.upHeroDid == "0" and v.position~=5 then
|
|
||||||
--table.insert(equips,v)
|
|
||||||
if equips[v.id] then
|
|
||||||
equips[v.id].num = equips[v.id].num + 1
|
|
||||||
else
|
|
||||||
equips[v.id] = v
|
|
||||||
equips[v.id].num = 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
--table.sort(equips, function(a,b) return a.id < b.id end)
|
|
||||||
return equips
|
|
||||||
end
|
|
||||||
|
|
||||||
--获取单个装备数据
|
--获取单个装备数据
|
||||||
function this.GetSingleEquipData(_equipDid)
|
function this.GetSingleEquipData(_equipDid)
|
||||||
if this.equipDatas[_equipDid] then
|
if this.equipDatas[_equipDid] then
|
||||||
|
|
|
@ -33,6 +33,16 @@ function this:BindEvent()
|
||||||
PopupTipPanel.ShowTip(Language[11007])
|
PopupTipPanel.ShowTip(Language[11007])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
local isFinish = 0
|
||||||
|
for i = 1, #allMyAidData do
|
||||||
|
if allMyAidData[i].num == allMyAidData[i].hadtakenum and allMyAidData[i].hadtakenum == guildHelpConfig[1].RecourseTime[2] then
|
||||||
|
isFinish = isFinish + 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if isFinish >= 2 then
|
||||||
|
PopupTipPanel.ShowTip(Language[12203])
|
||||||
|
return
|
||||||
|
end
|
||||||
local itemId1 = nil
|
local itemId1 = nil
|
||||||
local itemId2 = nil
|
local itemId2 = nil
|
||||||
if MyGuildManager.MyFeteInfo.guildHelpInfo and #MyGuildManager.MyFeteInfo.guildHelpInfo > 0 then
|
if MyGuildManager.MyFeteInfo.guildHelpInfo and #MyGuildManager.MyFeteInfo.guildHelpInfo > 0 then
|
||||||
|
|
|
@ -473,9 +473,12 @@ local funcList2={
|
||||||
[7]=function() --踩宝箱只发0
|
[7]=function() --踩宝箱只发0
|
||||||
NetManager.GetTrialBoxRewardRequest(0,function(msg)
|
NetManager.GetTrialBoxRewardRequest(0,function(msg)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove, MapManager.curTriggerPos)--删除宝箱点
|
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove, MapManager.curTriggerPos)--删除宝箱点
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function()
|
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function()
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
-- Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
||||||
end)
|
-- end)
|
||||||
|
local data = TrialMiniGameManager.IdToNameIconNum(msg.boxDrop.itemlist[1].itemId,msg.boxDrop.itemlist[1].itemNum)
|
||||||
|
PopupTipPanel.ShowColorTip(data[1],data[2],data[3])
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
[13] = function() -- 试炼副本答题游戏1
|
[13] = function() -- 试炼副本答题游戏1
|
||||||
|
|
|
@ -12,6 +12,9 @@ local heroRankupConfig=ConfigManager.GetConfig(ConfigName.HeroRankupConfig)
|
||||||
local jewelConfig=ConfigManager.GetConfig(ConfigName.JewelConfig)
|
local jewelConfig=ConfigManager.GetConfig(ConfigName.JewelConfig)
|
||||||
local choosedList
|
local choosedList
|
||||||
local pinjieImage={"r_hero_pinjiebiao_01","r_hero_pinjiebiao_02"} --该死的品阶图片 1是未激活 2是激活
|
local pinjieImage={"r_hero_pinjiebiao_01","r_hero_pinjiebiao_02"} --该死的品阶图片 1是未激活 2是激活
|
||||||
|
|
||||||
|
local orginLayer2 = 0
|
||||||
|
local orginLayer = 0
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function RoleInfoPopup:InitComponent()
|
function RoleInfoPopup:InitComponent()
|
||||||
|
|
||||||
|
@ -168,6 +171,9 @@ end
|
||||||
function RoleInfoPopup:OnDestroy()
|
function RoleInfoPopup:OnDestroy()
|
||||||
soulPrintPreList={}
|
soulPrintPreList={}
|
||||||
this.pinjieList={}
|
this.pinjieList={}
|
||||||
|
soulPrintPreList={}
|
||||||
|
orginLayer2=0
|
||||||
|
orginLayer=0
|
||||||
end
|
end
|
||||||
|
|
||||||
--设置技能选中外框
|
--设置技能选中外框
|
||||||
|
@ -374,6 +380,7 @@ function this.EquipInfo()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--魂印
|
--魂印
|
||||||
|
|
||||||
function this.SoulPrintInfo()
|
function this.SoulPrintInfo()
|
||||||
local curHeroSoulPrintDatas = {}
|
local curHeroSoulPrintDatas = {}
|
||||||
this.soulPrintInfo.gameObject:SetActive(#curHeroData.soulPrintList~=0)
|
this.soulPrintInfo.gameObject:SetActive(#curHeroData.soulPrintList~=0)
|
||||||
|
@ -385,6 +392,13 @@ function this.SoulPrintInfo()
|
||||||
end
|
end
|
||||||
soulPrintPreList[i].name="Pre"..i
|
soulPrintPreList[i].name="Pre"..i
|
||||||
|
|
||||||
|
--特效层级重设
|
||||||
|
for i=1,#soulPrintPreList do
|
||||||
|
Util.AddParticleSortLayer(soulPrintPreList[i], this.sortingOrder- orginLayer2)
|
||||||
|
end
|
||||||
|
orginLayer2 = this.sortingOrder
|
||||||
|
orginLayer=this.sortingOrder
|
||||||
|
|
||||||
local frame=Util.GetGameObject(soulPrintPreList[i],"Frame"):GetComponent("Image")
|
local frame=Util.GetGameObject(soulPrintPreList[i],"Frame"):GetComponent("Image")
|
||||||
local icon=Util.GetGameObject(soulPrintPreList[i],"circleFrameBg/Icon"):GetComponent("Image")
|
local icon=Util.GetGameObject(soulPrintPreList[i],"circleFrameBg/Icon"):GetComponent("Image")
|
||||||
frame.sprite=Util.LoadSprite(GetQuantityImageByquality(equipConfig[v.equipId].Quality))
|
frame.sprite=Util.LoadSprite(GetQuantityImageByquality(equipConfig[v.equipId].Quality))
|
||||||
|
@ -423,4 +437,12 @@ function this.TalismanInfo()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.OnSortingOrderChange()
|
||||||
|
--特效层级重设
|
||||||
|
for i=1,#soulPrintPreList do
|
||||||
|
Util.AddParticleSortLayer(soulPrintPreList[i], this.sortingOrder- orginLayer)
|
||||||
|
end
|
||||||
|
orginLayer = this.sortingOrder
|
||||||
|
end
|
||||||
|
|
||||||
return RoleInfoPopup
|
return RoleInfoPopup
|
|
@ -29,6 +29,10 @@ local _PanelType = {
|
||||||
[3] = PanelType.requiem,
|
[3] = PanelType.requiem,
|
||||||
[4] = PanelType.StarSoul,
|
[4] = PanelType.StarSoul,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local list={}
|
||||||
|
local orginLayer2=0
|
||||||
|
local orginLayer=0
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function HeroAndEquipResolvePanel:InitComponent()
|
function HeroAndEquipResolvePanel:InitComponent()
|
||||||
|
|
||||||
|
@ -310,7 +314,7 @@ function this.SortTypeClick(_sortType,_btn)
|
||||||
this.SingleEquipTreasureDataShow(go, equipTreasureData[index])
|
this.SingleEquipTreasureDataShow(go, equipTreasureData[index])
|
||||||
end)
|
end)
|
||||||
elseif tabType == 4 then
|
elseif tabType == 4 then
|
||||||
LogBlue(tostring(tabSortType))
|
list={}
|
||||||
soulPrintData= BagManager.GetAllSoulPrintData(tabSortType)
|
soulPrintData= BagManager.GetAllSoulPrintData(tabSortType)
|
||||||
this.soulPrintChooseType=tabSortType
|
this.soulPrintChooseType=tabSortType
|
||||||
if(not soulPrintData or #soulPrintData<1) then
|
if(not soulPrintData or #soulPrintData<1) then
|
||||||
|
@ -321,7 +325,15 @@ function this.SortTypeClick(_sortType,_btn)
|
||||||
this.selectText.text = Language[11775].."0/"..#soulPrintData
|
this.selectText.text = Language[11775].."0/"..#soulPrintData
|
||||||
this.ScrollView3:SetData(soulPrintData, function (index, go)
|
this.ScrollView3:SetData(soulPrintData, function (index, go)
|
||||||
this:SetSoulPrintData(go, soulPrintData[index],index)
|
this:SetSoulPrintData(go, soulPrintData[index],index)
|
||||||
|
table.insert(list,go)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
--特效层级重设
|
||||||
|
for i=1,#list do
|
||||||
|
Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer2)
|
||||||
|
end
|
||||||
|
orginLayer2 = this.sortingOrder
|
||||||
|
orginLayer = this.sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -1109,6 +1121,9 @@ function HeroAndEquipResolvePanel:OnDestroy()
|
||||||
this.ScrollView = nil
|
this.ScrollView = nil
|
||||||
this.ScrollView2 = nil
|
this.ScrollView2 = nil
|
||||||
this.ScrollView3=nil
|
this.ScrollView3=nil
|
||||||
|
list={}
|
||||||
|
orginLayer2=0
|
||||||
|
orginLayer=0
|
||||||
end
|
end
|
||||||
|
|
||||||
--根据品质获取
|
--根据品质获取
|
||||||
|
@ -1130,4 +1145,14 @@ function this.GetAllEquiptreasureByQuantity(Quantity)
|
||||||
end)
|
end)
|
||||||
return equipTreasure
|
return equipTreasure
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function this.OnSortingOrderChange()
|
||||||
|
--特效层级重设
|
||||||
|
for i=1,#list do
|
||||||
|
Util.AddParticleSortLayer(list[i], this.sortingOrder- orginLayer)
|
||||||
|
end
|
||||||
|
orginLayer = this.sortingOrder
|
||||||
|
end
|
||||||
|
|
||||||
return HeroAndEquipResolvePanel
|
return HeroAndEquipResolvePanel
|
|
@ -66,12 +66,14 @@ end
|
||||||
function this.OpenTreasure(star)
|
function this.OpenTreasure(star)
|
||||||
local config= ConfigManager.GetConfigData(40)
|
local config= ConfigManager.GetConfigData(40)
|
||||||
local configs= string.split(config.Value,'|')
|
local configs= string.split(config.Value,'|')
|
||||||
-- for i=1,#configs do
|
for i=1,#configs do
|
||||||
-- if configs[i]
|
if string.split(configs[i],'#')[1]==1 then --玩家等级
|
||||||
-- end
|
return PlayerManager.level >= string.split(configs[i],'#')[2]
|
||||||
-- if PlayerManager.level>= then
|
end
|
||||||
|
if string.split(configs[i],'#')[2] and string.split(configs[i],'#')[2] ==2 then --英雄星级
|
||||||
-- end
|
return star >= string.split(configs[i],'#')[2]
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--获取当前宝物升级数据
|
--获取当前宝物升级数据
|
||||||
|
|
|
@ -250,6 +250,7 @@ function this:AllEquipUpBtnOnClick()
|
||||||
curHeroEquipDatas[equipData.equipType+4]=equipData
|
curHeroEquipDatas[equipData.equipType+4]=equipData
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local equipEffectPos={}
|
local equipEffectPos={}
|
||||||
local treasureEffectPos={}
|
local treasureEffectPos={}
|
||||||
--如果身上的装备 带锁 则不替换
|
--如果身上的装备 带锁 则不替换
|
||||||
|
@ -331,9 +332,8 @@ function this:AllEquipUpBtnOnClick()
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(Language[11826])
|
PopupTipPanel.ShowTip(Language[11826])
|
||||||
end
|
end
|
||||||
--6星英雄才能穿宝物
|
|
||||||
if isCanUpEquipTreasure then
|
if isCanUpEquipTreasure then
|
||||||
if curHeroData.star >=6 then
|
--if EquipTreasureManager.OpenTreasure(curHeroData.star) then
|
||||||
--穿戴宝物
|
--穿戴宝物
|
||||||
if allTreasureIds and #allTreasureIds>0 then
|
if allTreasureIds and #allTreasureIds>0 then
|
||||||
--for i = 1, #allEquipIds do
|
--for i = 1, #allEquipIds do
|
||||||
|
@ -351,7 +351,7 @@ function this:AllEquipUpBtnOnClick()
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(Language[11827])
|
PopupTipPanel.ShowTip(Language[11827])
|
||||||
end
|
end
|
||||||
end
|
--end
|
||||||
end
|
end
|
||||||
|
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_Wear)
|
PlaySoundWithoutClick(SoundConfig.Sound_Wear)
|
||||||
|
@ -392,10 +392,9 @@ function this.ShowHeroEquip()
|
||||||
if config then
|
if config then
|
||||||
local limits = string.split(config.Value, "|")
|
local limits = string.split(config.Value, "|")
|
||||||
if limits then
|
if limits then
|
||||||
local heroConfig=ConfigManager.GetConfigData(ConfigName.HeroConfig,curHeroData.id)
|
|
||||||
local lvs=string.split(limits[1],"#")
|
local lvs=string.split(limits[1],"#")
|
||||||
local stars=string.split(limits[2],"#")
|
local stars=string.split(limits[2],"#")
|
||||||
if PlayerManager.level>=tonumber(lvs[2]) and heroConfig~=nil and heroConfig.MaxRank>=tonumber(stars[2]) then
|
if PlayerManager.level>=tonumber(lvs[2]) and curHeroData.star >=tonumber(stars[2]) then
|
||||||
isCanUpEquipTreasure = true
|
isCanUpEquipTreasure = true
|
||||||
this.equipTreasureBtn.gameObject:SetActive(true)
|
this.equipTreasureBtn.gameObject:SetActive(true)
|
||||||
this.treasure1.gameObject:SetActive(true)
|
this.treasure1.gameObject:SetActive(true)
|
||||||
|
|
|
@ -13,7 +13,7 @@ local tabs = {}
|
||||||
local itemData = {}
|
local itemData = {}
|
||||||
local currentDataList = {}
|
local currentDataList = {}
|
||||||
local chooseIdList = {}
|
local chooseIdList = {}
|
||||||
|
local list={}
|
||||||
|
|
||||||
function SoulPrintHandBook:InitComponent()
|
function SoulPrintHandBook:InitComponent()
|
||||||
this.backBtn = Util.GetGameObject(this.gameObject, "BackBtn")
|
this.backBtn = Util.GetGameObject(this.gameObject, "BackBtn")
|
||||||
|
@ -68,7 +68,11 @@ function SoulPrintHandBook:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
function SoulPrintHandBook:OnSortingOrderChange()
|
function SoulPrintHandBook:OnSortingOrderChange()
|
||||||
this.sortingOrder = self.sortingOrder
|
--特效层级重设
|
||||||
|
for i=1,#list do
|
||||||
|
Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer)
|
||||||
|
end
|
||||||
|
orginLayer = self.sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
function SoulPrintHandBook:OnOpen()
|
function SoulPrintHandBook:OnOpen()
|
||||||
|
@ -88,6 +92,7 @@ function SoulPrintHandBook:OnDestroy()
|
||||||
this.scrollView=nil
|
this.scrollView=nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local orginLayer2=0
|
||||||
--打开页面时,页面数据刷新
|
--打开页面时,页面数据刷新
|
||||||
function this.OnRefresh(index)
|
function this.OnRefresh(index)
|
||||||
local tempData={}
|
local tempData={}
|
||||||
|
@ -101,17 +106,18 @@ function this.OnRefresh(index)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--预设容器
|
--预设容器
|
||||||
local list={}
|
list={}
|
||||||
this.scrollView:SetData(tempData,function(index,root)
|
this.scrollView:SetData(tempData,function(index,root)
|
||||||
this.SetScrollPre(root,tempData[index])
|
this.SetScrollPre(root,tempData[index])
|
||||||
table.insert(list,root )
|
table.insert(list,root)
|
||||||
end)
|
end)
|
||||||
this.scrollView:SetIndex(1)
|
this.scrollView:SetIndex(1)
|
||||||
|
|
||||||
--特效层级重设
|
--特效层级重设
|
||||||
for i=1,#list do
|
for i=1,#list do
|
||||||
Util.AddParticleSortLayer(list[i], this.sortingOrder- orginLayer)
|
Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer2)
|
||||||
end
|
end
|
||||||
|
orginLayer2 = this.sortingOrder
|
||||||
orginLayer = this.sortingOrder
|
orginLayer = this.sortingOrder
|
||||||
end
|
end
|
||||||
--设置预设
|
--设置预设
|
||||||
|
|
|
@ -31,6 +31,9 @@ local index=0--当前索引
|
||||||
local isShow=true--默认显示装备中的魂印
|
local isShow=true--默认显示装备中的魂印
|
||||||
local _specialData={}
|
local _specialData={}
|
||||||
|
|
||||||
|
local list={}
|
||||||
|
|
||||||
|
local orginLayer2 = 0
|
||||||
function SoulPrintPanel:InitComponent()
|
function SoulPrintPanel:InitComponent()
|
||||||
this.upView = SubUIManager.Open(SubUIConfig.UpView, this.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
|
this.upView = SubUIManager.Open(SubUIConfig.UpView, this.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
|
||||||
this.helpBtn= Util.GetGameObject(this.gameObject, "HelpBtn")
|
this.helpBtn= Util.GetGameObject(this.gameObject, "HelpBtn")
|
||||||
|
@ -109,12 +112,13 @@ end
|
||||||
|
|
||||||
function SoulPrintPanel:RemoveListener()
|
function SoulPrintPanel:RemoveListener()
|
||||||
end
|
end
|
||||||
|
local orginLayer = 0
|
||||||
function SoulPrintPanel:OnSortingOrderChange()
|
function SoulPrintPanel:OnSortingOrderChange()
|
||||||
-- for i=1,6 do
|
--特效层级重设
|
||||||
-- Util.AddParticleSortLayer( this.effectList[i], this.sortingOrder - orginLayer)
|
for i=1,#list do
|
||||||
-- end
|
Util.AddParticleSortLayer(list[i], self.sortingOrder- orginLayer)
|
||||||
orginLayer = this.sortingOrder
|
end
|
||||||
|
orginLayer = self.sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
function SoulPrintPanel:OnOpen(_curHeroData,_heroDatas)
|
function SoulPrintPanel:OnOpen(_curHeroData,_heroDatas)
|
||||||
|
@ -163,6 +167,9 @@ function SoulPrintPanel:OnDestroy()
|
||||||
SubUIManager.Close(this.upView)
|
SubUIManager.Close(this.upView)
|
||||||
this.scrollView=nil
|
this.scrollView=nil
|
||||||
loopList={}
|
loopList={}
|
||||||
|
list={}
|
||||||
|
orginLayer2=0
|
||||||
|
orginLayer=0
|
||||||
end
|
end
|
||||||
|
|
||||||
--点击左
|
--点击左
|
||||||
|
@ -276,9 +283,9 @@ function this.SetLoopPre(root,type,index,data,curIndex)
|
||||||
Util.GetGameObject(bg,"bg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[0].circleBg1)
|
Util.GetGameObject(bg,"bg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[0].circleBg1)
|
||||||
Util.GetGameObject(lock,"Text"):GetComponent("Text").text=string.format( Language[11947],data)
|
Util.GetGameObject(lock,"Text"):GetComponent("Text").text=string.format( Language[11947],data)
|
||||||
elseif type==3 then
|
elseif type==3 then
|
||||||
Util.GetGameObject(bg,"Frame"):GetComponent("Image").enabled=true
|
--Util.GetGameObject(bg,"Frame"):GetComponent("Image").enabled=true
|
||||||
Util.GetGameObject(bg,"bg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[equipConfig[data.equipId].Quality].circleBg1)
|
Util.GetGameObject(bg,"bg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[equipConfig[data.equipId].Quality].circleBg1)
|
||||||
Util.GetGameObject(bg,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByqualityPoint(equipConfig[data.equipId].Quality))
|
--Util.GetGameObject(bg,"Frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByqualityPoint(equipConfig[data.equipId].Quality))
|
||||||
Util.GetGameObject(unlock,"circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[equipConfig[data.equipId].Quality].circleBg2)
|
Util.GetGameObject(unlock,"circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[equipConfig[data.equipId].Quality].circleBg2)
|
||||||
Util.GetGameObject(unlock,"Icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(itemConfig[data.equipId].ResourceID))
|
Util.GetGameObject(unlock,"Icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(itemConfig[data.equipId].ResourceID))
|
||||||
Util.GetGameObject(unlock,"circle"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[equipConfig[data.equipId].Quality].circle)
|
Util.GetGameObject(unlock,"circle"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[equipConfig[data.equipId].Quality].circle)
|
||||||
|
@ -317,13 +324,24 @@ function this.SetScrollData()
|
||||||
local data =SoulPrintManager.GetAllSoulPrint(isShow,curHeroData.id,curHeroData.dynamicId)
|
local data =SoulPrintManager.GetAllSoulPrint(isShow,curHeroData.id,curHeroData.dynamicId)
|
||||||
this.empty:SetActive(#data==0)
|
this.empty:SetActive(#data==0)
|
||||||
this.ShowRedPotDataAndSort(data)
|
this.ShowRedPotDataAndSort(data)
|
||||||
|
|
||||||
|
list={}
|
||||||
this.scrollView:SetData(data,function(index,root)
|
this.scrollView:SetData(data,function(index,root)
|
||||||
this.SetScrollPre(root,data[index])
|
this.SetScrollPre(root,data[index])
|
||||||
|
table.insert(list,root)
|
||||||
end)
|
end)
|
||||||
|
--特效层级重设
|
||||||
|
for i=1,#list do
|
||||||
|
Util.AddParticleSortLayer(list[i], this.sortingOrder- orginLayer2)
|
||||||
|
end
|
||||||
|
orginLayer2 = this.sortingOrder
|
||||||
|
orginLayer = this.sortingOrder
|
||||||
this.scrollView:SetIndex(1)
|
this.scrollView:SetIndex(1)
|
||||||
end
|
end
|
||||||
--设置魂印列表预设
|
--设置魂印列表预设
|
||||||
function this.SetScrollPre(root,data)
|
function this.SetScrollPre(root,data)
|
||||||
|
local effect = Util.GetGameObject(root,"UI_Effect_Kuang_JinSe")
|
||||||
|
|
||||||
local frame=Util.GetGameObject(root,"Frame"):GetComponent("Image")
|
local frame=Util.GetGameObject(root,"Frame"):GetComponent("Image")
|
||||||
local icon=Util.GetGameObject(root,"Icon"):GetComponent("Image")
|
local icon=Util.GetGameObject(root,"Icon"):GetComponent("Image")
|
||||||
local name=Util.GetGameObject(root,"Name"):GetComponent("Text")
|
local name=Util.GetGameObject(root,"Name"):GetComponent("Text")
|
||||||
|
@ -351,8 +369,11 @@ function this.SetScrollPre(root,data)
|
||||||
PopupTipPanel.ShowTip(Language[11950])
|
PopupTipPanel.ShowTip(Language[11950])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
if this.GetCurHeroSoulPrintState(data.id) then
|
||||||
|
PopupTipPanel.ShowTip(Language[11950])
|
||||||
|
return
|
||||||
|
end
|
||||||
local pos=this.GetPos()--位置
|
local pos=this.GetPos()--位置
|
||||||
|
|
||||||
UIManager.OpenPanel(UIName.SoulPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function()
|
UIManager.OpenPanel(UIName.SoulPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function()
|
||||||
PopupTipPanel.ShowTip(Language[11604])
|
PopupTipPanel.ShowTip(Language[11604])
|
||||||
this.RefreshShow()
|
this.RefreshShow()
|
||||||
|
@ -390,6 +411,7 @@ function this.ShowRedPotDataAndSort(allData)
|
||||||
end)
|
end)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local allUpSoulPrint = {}--所有已上魂印
|
local allUpSoulPrint = {}--所有已上魂印
|
||||||
if curHeroData.soulPrintList then
|
if curHeroData.soulPrintList then
|
||||||
for i = 1, #curHeroData.soulPrintList do
|
for i = 1, #curHeroData.soulPrintList do
|
||||||
|
@ -398,9 +420,17 @@ function this.ShowRedPotDataAndSort(allData)
|
||||||
end
|
end
|
||||||
--LogError("allUpSoulPrint "..LengthOfTable(allUpSoulPrint).." "..#allData)
|
--LogError("allUpSoulPrint "..LengthOfTable(allUpSoulPrint).." "..#allData)
|
||||||
local haveRedPointSid = {}--所有已标记红点魂印
|
local haveRedPointSid = {}--所有已标记红点魂印
|
||||||
|
|
||||||
|
local temp=SoulPrintManager.GetAllSoulPrint(true,curHeroData.id,curHeroData.dynamicId)
|
||||||
|
local limitSoulPrint = {}
|
||||||
|
for i = 1, #temp do
|
||||||
|
if not limitSoulPrint[temp[i].id] and equipConfig[temp[i].id].limit == 1 and temp[i].upHero ~= "" then
|
||||||
|
limitSoulPrint[temp[i].id] = temp[i].id
|
||||||
|
end
|
||||||
|
end
|
||||||
for i = 1, #allData do
|
for i = 1, #allData do
|
||||||
--这个英雄没有装备这个魂印,并且可以装备,别的英雄也没有装备,并且不在haveRedPointSid列表里
|
--这个英雄没有装备这个魂印,并且可以装备,并且不在haveRedPointSid列表里
|
||||||
if not allUpSoulPrint[allData[i].id] and equipConfig[allData[i].id].Range and equipConfig[allData[i].id].Range[1] == 0 and allData[i].upHero == "" and not haveRedPointSid[allData[i].id] then
|
if not allUpSoulPrint[allData[i].id] and equipConfig[allData[i].id].Range and equipConfig[allData[i].id].Range[1] == 0 and allData[i].upHero == "" and not haveRedPointSid[allData[i].id] then
|
||||||
allData[i].isShowRedPot = 1--有空位可以穿戴
|
allData[i].isShowRedPot = 1--有空位可以穿戴
|
||||||
haveRedPointSid[allData[i].id] = allData[i].id
|
haveRedPointSid[allData[i].id] = allData[i].id
|
||||||
else
|
else
|
||||||
|
@ -420,6 +450,10 @@ function this.ShowRedPotDataAndSort(allData)
|
||||||
allData[i].isShowRedPot = 1--有空位可以穿戴
|
allData[i].isShowRedPot = 1--有空位可以穿戴
|
||||||
haveRedPointSid[allData[i].id] = allData[i].id
|
haveRedPointSid[allData[i].id] = allData[i].id
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if limitSoulPrint[allData[i].id] then
|
||||||
|
allData[i].isShowRedPot = 0
|
||||||
|
end
|
||||||
end
|
end
|
||||||
table.sort(allData, function(a,b)
|
table.sort(allData, function(a,b)
|
||||||
if a.isShowRedPot > b.isShowRedPot then
|
if a.isShowRedPot > b.isShowRedPot then
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -2200,3 +2200,4 @@
|
||||||
12200,后刷新
|
12200,后刷新
|
||||||
12201,保留
|
12201,保留
|
||||||
12202,贪婪节点无数据
|
12202,贪婪节点无数据
|
||||||
|
12203,您已完成求援!
|
||||||
|
|
|
Loading…
Reference in New Issue