【修行】提交

dev_chengFeng
ZhangBiao 2021-05-14 17:48:47 +08:00
parent b3e40bac95
commit 87f18cb049
7 changed files with 101 additions and 31 deletions

View File

@ -77,6 +77,7 @@ HERO_LOCKSTATE_FIELD = protobuf.FieldDescriptor();
HERO_JEWELS_FIELD = protobuf.FieldDescriptor(); HERO_JEWELS_FIELD = protobuf.FieldDescriptor();
HERO_CREATETYPE_FIELD = protobuf.FieldDescriptor(); HERO_CREATETYPE_FIELD = protobuf.FieldDescriptor();
HERO_CHANGEID_FIELD = protobuf.FieldDescriptor(); HERO_CHANGEID_FIELD = protobuf.FieldDescriptor();
HERO_SEALIDLIST_FIELD = protobuf.FieldDescriptor();
POKEMONINFO = protobuf.Descriptor(); POKEMONINFO = protobuf.Descriptor();
POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor(); POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor(); POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor();
@ -1362,11 +1363,21 @@ HERO_CHANGEID_FIELD.default_value = 0
HERO_CHANGEID_FIELD.type = 5 HERO_CHANGEID_FIELD.type = 5
HERO_CHANGEID_FIELD.cpp_type = 1 HERO_CHANGEID_FIELD.cpp_type = 1
HERO_SEALIDLIST_FIELD.name = "sealIdList"
HERO_SEALIDLIST_FIELD.full_name = ".rpc.protocols.Hero.sealIdList"
HERO_SEALIDLIST_FIELD.number = 17
HERO_SEALIDLIST_FIELD.index = 15
HERO_SEALIDLIST_FIELD.label = 3
HERO_SEALIDLIST_FIELD.has_default_value = false
HERO_SEALIDLIST_FIELD.default_value = {}
HERO_SEALIDLIST_FIELD.type = 5
HERO_SEALIDLIST_FIELD.cpp_type = 1
HERO.name = "Hero" HERO.name = "Hero"
HERO.full_name = ".rpc.protocols.Hero" HERO.full_name = ".rpc.protocols.Hero"
HERO.nested_types = {} HERO.nested_types = {}
HERO.enum_types = {} HERO.enum_types = {}
HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD} HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD, HERO_SEALIDLIST_FIELD}
HERO.is_extendable = false HERO.is_extendable = false
HERO.extensions = {} HERO.extensions = {}
POKEMONINFO_TEMPID_FIELD.name = "tempId" POKEMONINFO_TEMPID_FIELD.name = "tempId"

View File

@ -206,6 +206,8 @@ REPLACEPURPLEMANSIONSEALREQUEST_NEWSEALID_FIELD = protobuf.FieldDescriptor();
REPLACEPURPLEMANSIONSEALREQUEST_SUBID_FIELD = protobuf.FieldDescriptor(); REPLACEPURPLEMANSIONSEALREQUEST_SUBID_FIELD = protobuf.FieldDescriptor();
REPLACEPRUPLEMANSIONSEALRESPONSE = protobuf.Descriptor(); REPLACEPRUPLEMANSIONSEALRESPONSE = protobuf.Descriptor();
REPLACEPRUPLEMANSIONSEALRESPONSE_SEALLIST_FIELD = protobuf.FieldDescriptor(); REPLACEPRUPLEMANSIONSEALRESPONSE_SEALLIST_FIELD = protobuf.FieldDescriptor();
PURPLEMANSIONSEALINDICATION = protobuf.Descriptor();
PURPLEMANSIONSEALINDICATION_SEALLIST_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"
@ -2035,6 +2037,24 @@ REPLACEPRUPLEMANSIONSEALRESPONSE.enum_types = {}
REPLACEPRUPLEMANSIONSEALRESPONSE.fields = {REPLACEPRUPLEMANSIONSEALRESPONSE_SEALLIST_FIELD} REPLACEPRUPLEMANSIONSEALRESPONSE.fields = {REPLACEPRUPLEMANSIONSEALRESPONSE_SEALLIST_FIELD}
REPLACEPRUPLEMANSIONSEALRESPONSE.is_extendable = false REPLACEPRUPLEMANSIONSEALRESPONSE.is_extendable = false
REPLACEPRUPLEMANSIONSEALRESPONSE.extensions = {} REPLACEPRUPLEMANSIONSEALRESPONSE.extensions = {}
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.name = "sealList"
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.full_name = ".rpc.protocols.PurpleMansionSealIndication.sealList"
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.number = 1
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.index = 0
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.label = 3
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.has_default_value = false
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.default_value = {}
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.message_type = CommonProto_pb.PURPLEMANSIONSEAL
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.type = 11
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD.cpp_type = 10
PURPLEMANSIONSEALINDICATION.name = "PurpleMansionSealIndication"
PURPLEMANSIONSEALINDICATION.full_name = ".rpc.protocols.PurpleMansionSealIndication"
PURPLEMANSIONSEALINDICATION.nested_types = {}
PURPLEMANSIONSEALINDICATION.enum_types = {}
PURPLEMANSIONSEALINDICATION.fields = {PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD}
PURPLEMANSIONSEALINDICATION.is_extendable = false
PURPLEMANSIONSEALINDICATION.extensions = {}
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST) AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST) CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
@ -2090,6 +2110,7 @@ PokemonFreeRequest = protobuf.Message(POKEMONFREEREQUEST)
PokemonFreeResponse = protobuf.Message(POKEMONFREERESPONSE) PokemonFreeResponse = protobuf.Message(POKEMONFREERESPONSE)
PokenmonUpLevelRequest = protobuf.Message(POKENMONUPLEVELREQUEST) PokenmonUpLevelRequest = protobuf.Message(POKENMONUPLEVELREQUEST)
PokenmonUpLevelResponse = protobuf.Message(POKENMONUPLEVELRESPONSE) PokenmonUpLevelResponse = protobuf.Message(POKENMONUPLEVELRESPONSE)
PurpleMansionSealIndication = protobuf.Message(PURPLEMANSIONSEALINDICATION)
ReplacePrupleMansionSealResponse = protobuf.Message(REPLACEPRUPLEMANSIONSEALRESPONSE) ReplacePrupleMansionSealResponse = protobuf.Message(REPLACEPRUPLEMANSIONSEALRESPONSE)
ReplacePurpleMansionSealRequest = protobuf.Message(REPLACEPURPLEMANSIONSEALREQUEST) ReplacePurpleMansionSealRequest = protobuf.Message(REPLACEPURPLEMANSIONSEALREQUEST)
ReplaceTeamPokemonInfoRequest = protobuf.Message(REPLACETEAMPOKEMONINFOREQUEST) ReplaceTeamPokemonInfoRequest = protobuf.Message(REPLACETEAMPOKEMONINFOREQUEST)

File diff suppressed because one or more lines are too long

View File

@ -123,6 +123,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
heroData.equipIdList = _msgHeroData.equipIdList heroData.equipIdList = _msgHeroData.equipIdList
heroData.jewels = _msgHeroData.jewels heroData.jewels = _msgHeroData.jewels
heroData.talismanList = _msgHeroData.especialEquipLevel --法宝等级 heroData.talismanList = _msgHeroData.especialEquipLevel --法宝等级
heroData.sealIdList = _msgHeroData.sealIdList --紫府神印list
if (#_msgHeroData.soulPos >= 1) then if (#_msgHeroData.soulPos >= 1) then
local soulPrintList = {} local soulPrintList = {}
for i, v in ipairs(_msgHeroData.soulPos) do for i, v in ipairs(_msgHeroData.soulPos) do
@ -1665,6 +1666,9 @@ function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
--光环加成 --光环加成
local aureoleProAdd = FormationManager.GetCurFormationElementAdd(teamHeroInfos) local aureoleProAdd = FormationManager.GetCurFormationElementAdd(teamHeroInfos)
this.DoubleTableCompound(teamProVal, aureoleProAdd) this.DoubleTableCompound(teamProVal, aureoleProAdd)
--修行加成
local practiceAddPro = PracticeManager.GetCurAllGetAdd()
this.DoubleTableCompound(teamProVal, practiceAddPro)
return teamProVal return teamProVal
end end
@ -1861,6 +1865,15 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
-- end -- end
-- end -- end
-- end -- end
--修行加成
local practiceAddPro = PracticeManager.GetCurAllGetAdd()
-- if practiceAddPro and LengthOfTable(practiceAddPro) > 0 then
-- for i, v in pairs(practiceAddPro) do
-- if v > 0 then
-- LogError("修行加成 "..i.." "..v)
-- end
-- end
-- end
--单体所有属性合并 --单体所有属性合并
this.DoubleTableCompound(allAddProVal, allPokemonPeiJianAddPro) this.DoubleTableCompound(allAddProVal, allPokemonPeiJianAddPro)
@ -1885,6 +1898,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
this.DoubleTableCompound(allHeroProVal, heroFetterAddPro) this.DoubleTableCompound(allHeroProVal, heroFetterAddPro)
this.DoubleTableCompound(allHeroProVal, hunyinFetterAddPro) this.DoubleTableCompound(allHeroProVal, hunyinFetterAddPro)
this.DoubleTableCompound(allHeroProVal, pokemonFormationAllHeroProVal) this.DoubleTableCompound(allHeroProVal, pokemonFormationAllHeroProVal)
this.DoubleTableCompound(allHeroProVal, practiceAddPro)
end end
--4公式特殊减乘所有属性加成 --4公式特殊减乘所有属性加成
this.DoubleTableCompound(specialProVal, falismanSpecialProVal) this.DoubleTableCompound(specialProVal, falismanSpecialProVal)

View File

@ -902,6 +902,6 @@ function this.PracticeImprintData(buffer)
local data = buffer:DataByte() local data = buffer:DataByte()
local msg = HeroInfoProto_pb.PurpleMansionSealIndication() local msg = HeroInfoProto_pb.PurpleMansionSealIndication()
msg:ParseFromString(data) msg:ParseFromString(data)
Log("神印信息推送") PracticeManager.UpdataImprintDataFromServer(msg.sealList)
end end
return this return this

View File

@ -51,6 +51,27 @@ end
--获取当前获得的所有属性相加 --获取当前获得的所有属性相加
function this.GetCurAllGetAdd() function this.GetCurAllGetAdd()
local PropertyList = this.BuildAddTemplate()
for i = 1, this.PracticeLevel do
-- LogPink("i:"..tostring(i))
if XiuXianConfig[i].TotalPros then
local Pros = XiuXianConfig[i].TotalPros
-- LogGreen("#Pros:"..tostring(#Pros))
for i = 1, #Pros do
-- LogBlue("ProsId:"..tostring(Pros[i][1]).." ProsNum:"..tostring(Pros[i][2]))
if PropertyConfig[Pros[i][1]].Style == 1 then
PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2]
elseif PropertyConfig[Pros[i][1]].Style == 2 then
PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2]
end
end
end
end
return PropertyList
end
--获取当前获得的所有属性相加(用于界面展示)
function this.GetCurAllGetAddForShow()
local PropertyList = this.BuildAddTemplate() local PropertyList = this.BuildAddTemplate()
for i = 1, this.PracticeLevel do for i = 1, this.PracticeLevel do
-- LogPink("i:"..tostring(i)) -- LogPink("i:"..tostring(i))
@ -81,7 +102,7 @@ function this.GetAddsListWithTemplate()
if PropertyConfig[Pros[i][1]].Style == 1 then if PropertyConfig[Pros[i][1]].Style == 1 then
PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2] PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2]
elseif PropertyConfig[Pros[i][1]].Style == 2 then elseif PropertyConfig[Pros[i][1]].Style == 2 then
PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2]/100 PropertyList[Pros[i][1]] = PropertyList[Pros[i][1]] + Pros[i][2]
end end
end end
end end
@ -175,8 +196,6 @@ function this.BigLevelWithImprint()
for i, v in ConfigPairs(XiuXianSkillConfig) do for i, v in ConfigPairs(XiuXianSkillConfig) do
if v.UnlockId > 0 then if v.UnlockId > 0 then
this.BigLevelImprintList[v.UnlockId] = 0 this.BigLevelImprintList[v.UnlockId] = 0
-- this.BigLevelImprintList[v.UnlockId].id = 0
-- this.BigLevelImprintList[v.UnlockId].subId = ""
end end
end end
end end

View File

@ -49,7 +49,7 @@ function Practice:BindEvent()
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.PracticeStatePreview) UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.PracticeStatePreview)
end) end)
Util.AddClick(self.additionBtn, function() Util.AddClick(self.additionBtn, function()
UIManager.OpenPanel(UIName.RoleProInfoPopup,PracticeManager.GetCurAllGetAdd(),nil,false,nil) UIManager.OpenPanel(UIName.RoleProInfoPopup,PracticeManager.GetCurAllGetAddForShow(),nil,false,nil)
end) end)
Util.AddClick(self.imprintBtn, function() Util.AddClick(self.imprintBtn, function()
UIManager.OpenPanel(UIName.PracticeImprintPanel) UIManager.OpenPanel(UIName.PracticeImprintPanel)