白金装备修改提交
parent
ad9ee953dc
commit
ac0221b89f
|
@ -252,6 +252,8 @@ HEROUPLIKABLEREQUEST = protobuf.Descriptor();
|
||||||
HEROUPLIKABLEREQUEST_HEROSTATICID_FIELD = protobuf.FieldDescriptor();
|
HEROUPLIKABLEREQUEST_HEROSTATICID_FIELD = protobuf.FieldDescriptor();
|
||||||
HEROUPLIKABLEREQUEST_ITEMID_FIELD = protobuf.FieldDescriptor();
|
HEROUPLIKABLEREQUEST_ITEMID_FIELD = protobuf.FieldDescriptor();
|
||||||
HEROUPLIKABLEREQUEST_ITEMNUM_FIELD = protobuf.FieldDescriptor();
|
HEROUPLIKABLEREQUEST_ITEMNUM_FIELD = protobuf.FieldDescriptor();
|
||||||
|
EQUIPBOOKINDICATION = protobuf.Descriptor();
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD = protobuf.FieldDescriptor();
|
||||||
|
|
||||||
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
|
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
|
||||||
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
|
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
|
||||||
|
@ -2509,6 +2511,24 @@ HEROUPLIKABLEREQUEST.enum_types = {}
|
||||||
HEROUPLIKABLEREQUEST.fields = {HEROUPLIKABLEREQUEST_HEROSTATICID_FIELD, HEROUPLIKABLEREQUEST_ITEMID_FIELD, HEROUPLIKABLEREQUEST_ITEMNUM_FIELD}
|
HEROUPLIKABLEREQUEST.fields = {HEROUPLIKABLEREQUEST_HEROSTATICID_FIELD, HEROUPLIKABLEREQUEST_ITEMID_FIELD, HEROUPLIKABLEREQUEST_ITEMNUM_FIELD}
|
||||||
HEROUPLIKABLEREQUEST.is_extendable = false
|
HEROUPLIKABLEREQUEST.is_extendable = false
|
||||||
HEROUPLIKABLEREQUEST.extensions = {}
|
HEROUPLIKABLEREQUEST.extensions = {}
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.name = "changeEquipList"
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.full_name = ".rpc.protocols.EquipBookIndication.changeEquipList"
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.number = 1
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.index = 0
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.label = 3
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.has_default_value = false
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.default_value = {}
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.message_type = CommonProto_pb.EQUIPBOOKINFO
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.type = 11
|
||||||
|
EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD.cpp_type = 10
|
||||||
|
|
||||||
|
EQUIPBOOKINDICATION.name = "EquipBookIndication"
|
||||||
|
EQUIPBOOKINDICATION.full_name = ".rpc.protocols.EquipBookIndication"
|
||||||
|
EQUIPBOOKINDICATION.nested_types = {}
|
||||||
|
EQUIPBOOKINDICATION.enum_types = {}
|
||||||
|
EQUIPBOOKINDICATION.fields = {EQUIPBOOKINDICATION_CHANGEEQUIPLIST_FIELD}
|
||||||
|
EQUIPBOOKINDICATION.is_extendable = false
|
||||||
|
EQUIPBOOKINDICATION.extensions = {}
|
||||||
|
|
||||||
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
|
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
|
||||||
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
|
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
|
||||||
|
@ -2525,6 +2545,7 @@ DoHeroChangeRequest = protobuf.Message(DOHEROCHANGEREQUEST)
|
||||||
DoHeroChangeResponse = protobuf.Message(DOHEROCHANGERESPONSE)
|
DoHeroChangeResponse = protobuf.Message(DOHEROCHANGERESPONSE)
|
||||||
DrawHeroRequest = protobuf.Message(DRAWHEROREQUEST)
|
DrawHeroRequest = protobuf.Message(DRAWHEROREQUEST)
|
||||||
DrawHeroResponse = protobuf.Message(DRAWHERORESPONSE)
|
DrawHeroResponse = protobuf.Message(DRAWHERORESPONSE)
|
||||||
|
EquipBookIndication = protobuf.Message(EQUIPBOOKINDICATION)
|
||||||
EquipUnLoadOptRequest = protobuf.Message(EQUIPUNLOADOPTREQUEST)
|
EquipUnLoadOptRequest = protobuf.Message(EQUIPUNLOADOPTREQUEST)
|
||||||
EquipWearRequest = protobuf.Message(EQUIPWEARREQUEST)
|
EquipWearRequest = protobuf.Message(EQUIPWEARREQUEST)
|
||||||
EspecialEquipBackRequest = protobuf.Message(ESPECIALEQUIPBACKREQUEST)
|
EspecialEquipBackRequest = protobuf.Message(ESPECIALEQUIPBACKREQUEST)
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -81,7 +81,6 @@ function this.UpdateBagData(_itemData, isNoSendNewItemEvent)
|
||||||
diamond_amount = BagManager.GetItemCountById(16),
|
diamond_amount = BagManager.GetItemCountById(16),
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
--
|
|
||||||
end
|
end
|
||||||
|
|
||||||
---英雄副本独用刷新
|
---英雄副本独用刷新
|
||||||
|
@ -594,12 +593,6 @@ function this.GoIntoBackData(drop)
|
||||||
if (#drop.itemlist > 0) then
|
if (#drop.itemlist > 0) then
|
||||||
--BagManager.UpDataBagItemIdNumber(drop.itemlist)
|
--BagManager.UpDataBagItemIdNumber(drop.itemlist)
|
||||||
--Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
|
--Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
|
||||||
for i = 1, #drop.itemlist do
|
|
||||||
if itemConfig[drop.itemlist[i].itemId].ItemType == ItemType.Equip then
|
|
||||||
EquipManager.InitHaveEquipDatas(drop.itemlist[i].itemId,drop.itemlist[i].itemNum)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
TianShuMiJuanManger.CheckFetterStatus(4)
|
|
||||||
CheckRedPointStatus(RedPointType.Recruit_Normal)
|
CheckRedPointStatus(RedPointType.Recruit_Normal)
|
||||||
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
|
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
|
||||||
CheckRedPointStatus(RedPointType.Recruit_Friend)
|
CheckRedPointStatus(RedPointType.Recruit_Friend)
|
||||||
|
@ -639,14 +632,6 @@ function this.GoIntoBackData(drop)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.GMCallBackData(drop)
|
function this.GMCallBackData(drop)
|
||||||
if drop.itemlist and #drop.itemlist > 0 then
|
|
||||||
for i = 1, #drop.itemlist do
|
|
||||||
if itemConfig[drop.itemlist[i].itemId].ItemType == ItemType.Equip then
|
|
||||||
EquipManager.InitHaveEquipDatas(drop.itemlist[i].itemId,drop.itemlist[i].itemNum)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
TianShuMiJuanManger.CheckFetterStatus(4)
|
|
||||||
end
|
|
||||||
--for i = 1, #drop.itemlist do
|
--for i = 1, #drop.itemlist do
|
||||||
-- BagManager.UpdateBagData(drop.itemlist[i])
|
-- BagManager.UpdateBagData(drop.itemlist[i])
|
||||||
--end
|
--end
|
||||||
|
@ -697,12 +682,7 @@ function this.GetTableByBackDropData(drop)
|
||||||
itemdata.icon = GetResourcePath(itemdata.configData.ResourceID)
|
itemdata.icon = GetResourcePath(itemdata.configData.ResourceID)
|
||||||
itemdata.num = drop.itemlist[i].itemNum
|
itemdata.num = drop.itemlist[i].itemNum
|
||||||
table.insert(itemDataList, itemdata)
|
table.insert(itemDataList, itemdata)
|
||||||
--BagManager.UpdateBagData(itemdata.backData)
|
|
||||||
if itemConfig[drop.itemlist[i].itemId].ItemType == ItemType.Equip then
|
|
||||||
EquipManager.InitHaveEquipDatas(drop.itemlist[i].itemId,drop.itemlist[i].itemNum)
|
|
||||||
end
|
end
|
||||||
end
|
|
||||||
TianShuMiJuanManger.CheckFetterStatus(4)
|
|
||||||
CheckRedPointStatus(RedPointType.Recruit_Normal)
|
CheckRedPointStatus(RedPointType.Recruit_Normal)
|
||||||
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
|
CheckRedPointStatus(RedPointType.Recruit_ShenJiang)
|
||||||
CheckRedPointStatus(RedPointType.Recruit_Friend)
|
CheckRedPointStatus(RedPointType.Recruit_Friend)
|
||||||
|
@ -828,12 +808,8 @@ function this.GetItemListFromTempBag(drop, isSave)
|
||||||
elseif this.dropIsSHowEquipPrint then--献祭 升星吞卡 掉落身上装备和魂印 但是不显示 前端做处理
|
elseif this.dropIsSHowEquipPrint then--献祭 升星吞卡 掉落身上装备和魂印 但是不显示 前端做处理
|
||||||
table.insert(itemDataList, itemdata)
|
table.insert(itemDataList, itemdata)
|
||||||
end
|
end
|
||||||
if itemConfig[drop.itemlist[i].itemId].ItemType == ItemType.Equip then
|
|
||||||
EquipManager.InitHaveEquipDatas(drop.itemlist[i].itemId,drop.itemlist[i].itemNum)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
TianShuMiJuanManger.CheckFetterStatus(4)
|
|
||||||
end
|
|
||||||
if drop.equipId ~= nil and #drop.equipId > 0 then
|
if drop.equipId ~= nil and #drop.equipId > 0 then
|
||||||
--LogError("获取宝物的数量:".. LengthOfTable(drop.equipId))
|
--LogError("获取宝物的数量:".. LengthOfTable(drop.equipId))
|
||||||
for i = 1, #drop.equipId do
|
for i = 1, #drop.equipId do
|
||||||
|
@ -1116,12 +1092,8 @@ function this.BagIndicationRefresh(msg)
|
||||||
if itemConfig[v.itemId].ItemType == ItemType.LingShouChip then--灵兽碎片获得刷新红点
|
if itemConfig[v.itemId].ItemType == ItemType.LingShouChip then--灵兽碎片获得刷新红点
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonChipRefresh)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonChipRefresh)
|
||||||
end
|
end
|
||||||
if itemConfig[v.itemId].ItemType == ItemType.Equip then
|
|
||||||
EquipManager.InitHaveEquipDatas(v.itemId,v.itemNum)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
TianShuMiJuanManger.CheckFetterStatus(4)
|
|
||||||
end
|
|
||||||
elseif msg.type == 1 then
|
elseif msg.type == 1 then
|
||||||
--临时背包
|
--临时背包
|
||||||
for i, v in pairs(msg.item) do
|
for i, v in pairs(msg.item) do
|
||||||
|
|
|
@ -11,11 +11,11 @@ function this.Initialize()
|
||||||
this.HaveEquipDatas = {}
|
this.HaveEquipDatas = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.InitHaveEquipDatas(id,num)
|
function this.InitHaveEquipDatas(equipList)
|
||||||
if not this.HaveEquipDatas[id] then
|
for k,v in ipairs(equipList) do
|
||||||
this.HaveEquipDatas[id] = 0
|
this.HaveEquipDatas[v.equipId] = v.num
|
||||||
end
|
end
|
||||||
this.HaveEquipDatas[id] = this.HaveEquipDatas[id] + num
|
TianShuMiJuanManger.CheckFetterStatus(4)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.GetHaveEquipDatas()
|
function this.GetHaveEquipDatas()
|
||||||
|
|
|
@ -146,6 +146,14 @@ function this.RegisterMessage(network)
|
||||||
socket:RegistNetMessage(MessageTypeProto_pb.IsCrossIndication, this.IsCrossIndication)
|
socket:RegistNetMessage(MessageTypeProto_pb.IsCrossIndication, this.IsCrossIndication)
|
||||||
--七界试炼推送
|
--七界试炼推送
|
||||||
socket:RegistNetMessage(MessageTypeProto_pb.SevenWorldInfoIndication, this.SevenWorldInfoIndication)
|
socket:RegistNetMessage(MessageTypeProto_pb.SevenWorldInfoIndication, this.SevenWorldInfoIndication)
|
||||||
|
socket:RegistNetMessage(MessageTypeProto_pb.EQUIP_BOOK_INDICATION, this.EquipBookInfoIndication)
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.EquipBookInfoIndication(buff)
|
||||||
|
local data = buff:DataByte()
|
||||||
|
local msg = HeroInfoProto_pb.EquipBookIndication()
|
||||||
|
msg:ParseFromString(data)
|
||||||
|
EquipManager.InitHaveEquipDatas(msg.changeEquipList)
|
||||||
end
|
end
|
||||||
|
|
||||||
--后端推送激活的称号
|
--后端推送激活的称号
|
||||||
|
|
|
@ -262,9 +262,7 @@ function this.AllBookEnableResponse(func)
|
||||||
SoulPrintManager.UpdateAllHavedSoulPrint(msg.equipGot)
|
SoulPrintManager.UpdateAllHavedSoulPrint(msg.equipGot)
|
||||||
end
|
end
|
||||||
if msg.equipList then
|
if msg.equipList then
|
||||||
for k,v in ipairs(msg.equipList) do
|
EquipManager.InitHaveEquipDatas(msg.equipList)
|
||||||
EquipManager.InitHaveEquipDatas(v.equipId,v.num)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
TianShuMiJuanManger.OnLevelChange()
|
TianShuMiJuanManger.OnLevelChange()
|
||||||
if func then
|
if func then
|
||||||
|
|
Loading…
Reference in New Issue