From b09b45c92e89fd59cc6cc1653d63a5c58cdf9924 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 20 Nov 2023 16:14:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E8=AE=AD=E6=95=B0=E6=8D=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=B1=BB=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/HeroInfoProto_pb.lua | 47 ++++++++++++++++++- .../Modules/HomeLand/TrainBuildManager.lua | 44 +++++++++++++---- .../~Lua/Modules/Net/NetManager.lua | 5 +- 3 files changed, 83 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua index 402e90b046..faeb520f19 100644 --- a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua @@ -375,6 +375,10 @@ TRAININGRESPONSE_INFO_FIELD = protobuf.FieldDescriptor(); TRAININGUNLOCKSKILLREQUEST = protobuf.Descriptor(); TRAININGUNLOCKSKILLREQUEST_HEROID_FIELD = protobuf.FieldDescriptor(); TRAININGUNLOCKSKILLREQUEST_UNLOCKID_FIELD = protobuf.FieldDescriptor(); +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD = protobuf.FieldDescriptor(); +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD = protobuf.FieldDescriptor(); +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD = protobuf.FieldDescriptor(); +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD = protobuf.FieldDescriptor(); TRAININGUPLVREQUEST = protobuf.Descriptor(); TRAININGUPLVREQUEST_HEROID_FIELD = protobuf.FieldDescriptor(); TRAININGUPLVRESPONSE = protobuf.Descriptor(); @@ -3754,11 +3758,52 @@ TRAININGUNLOCKSKILLREQUEST_UNLOCKID_FIELD.default_value = 0 TRAININGUNLOCKSKILLREQUEST_UNLOCKID_FIELD.type = 5 TRAININGUNLOCKSKILLREQUEST_UNLOCKID_FIELD.cpp_type = 1 +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD.name = "pokemonIds" +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD.full_name = ".rpc.protocols.TrainingUnlockSkillRequest.pokemonIds" +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD.number = 3 +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD.index = 2 +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD.label = 3 +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD.has_default_value = false +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD.default_value = {} +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD.type = 9 +TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD.cpp_type = 9 + +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD.name = "magicSoldierIds" +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD.full_name = ".rpc.protocols.TrainingUnlockSkillRequest.magicSoldierIds" +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD.number = 4 +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD.index = 3 +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD.label = 3 +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD.has_default_value = false +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD.default_value = {} +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD.type = 9 +TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD.cpp_type = 9 + +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD.name = "consumeHeroIds" +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD.full_name = ".rpc.protocols.TrainingUnlockSkillRequest.consumeHeroIds" +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD.number = 5 +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD.index = 4 +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD.label = 3 +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD.has_default_value = false +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD.default_value = {} +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD.type = 9 +TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD.cpp_type = 9 + +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.name = "items" +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.full_name = ".rpc.protocols.TrainingUnlockSkillRequest.items" +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.number = 6 +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.index = 5 +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.label = 3 +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.has_default_value = false +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.default_value = {} +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.message_type = CommonProto_pb.ITEM +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.type = 11 +TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD.cpp_type = 10 + TRAININGUNLOCKSKILLREQUEST.name = "TrainingUnlockSkillRequest" TRAININGUNLOCKSKILLREQUEST.full_name = ".rpc.protocols.TrainingUnlockSkillRequest" TRAININGUNLOCKSKILLREQUEST.nested_types = {} TRAININGUNLOCKSKILLREQUEST.enum_types = {} -TRAININGUNLOCKSKILLREQUEST.fields = {TRAININGUNLOCKSKILLREQUEST_HEROID_FIELD, TRAININGUNLOCKSKILLREQUEST_UNLOCKID_FIELD} +TRAININGUNLOCKSKILLREQUEST.fields = {TRAININGUNLOCKSKILLREQUEST_HEROID_FIELD, TRAININGUNLOCKSKILLREQUEST_UNLOCKID_FIELD, TRAININGUNLOCKSKILLREQUEST_POKEMONIDS_FIELD, TRAININGUNLOCKSKILLREQUEST_MAGICSOLDIERIDS_FIELD, TRAININGUNLOCKSKILLREQUEST_CONSUMEHEROIDS_FIELD, TRAININGUNLOCKSKILLREQUEST_ITEMS_FIELD} TRAININGUNLOCKSKILLREQUEST.is_extendable = false TRAININGUNLOCKSKILLREQUEST.extensions = {} TRAININGUPLVREQUEST_HEROID_FIELD.name = "heroId" diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildManager.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildManager.lua index b68d76b5a6..6881ba9afe 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildManager.lua @@ -10,8 +10,9 @@ function this.Initialize() this.BuildData[configData.Id] = {} this.BuildData[configData.Id].dataMain = configData--HomeLand中数据 if configData.LvupCostPool > 0 then + this.BuildData[configData.Id].id=configData.Id this.BuildData[configData.Id].level = 1 --等级 - local singledata = ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrainBuildLevel,"PoolID",configData.Id,"level",this.BuildData[configData.Id].level) + local singledata = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainBuildLevel,"PoolID",configData.Id,"level",this.BuildData[configData.Id].level) this.BuildData[configData.Id].dataSingle = singledata--HomeLandLevel中数据 this.BuildData[configData.Id].startTime = 0 --资源开始积攒的时间 this.BuildData[configData.Id].endTime = 0 --建筑升级的结束时间 @@ -42,15 +43,21 @@ end function this.GetServerData(msg,func) if msg.infos and #msg.infos > 0 then for index, value in ipairs(msg.infos) do - -- LogGreen("Id:"..tostring(value.id).." startTime:"..tostring(TimeStampToDateStr4(value.productionStartTime)).." endTime:"..tostring(TimeStampToDateStr4(value.upLvEndTime))) + LogGreen("Id:"..tostring(value.id).." startTime:"..tostring(TimeStampToDateStr4(value.startTime)).." value.lv:"..value.lv) if value.id and value.id > 0 then - local data = HomeLandLevel[value.id] - if data then - this.BuildData[data.PoolID].level = data.level - this.BuildData[data.PoolID].startTime = value.productionStartTime - this.BuildData[data.PoolID].endTime = value.upLvEndTime - this.BuildData[data.PoolID].dataSingle = HomeLandLevel[value.id] - end + --local data = HomeLandLevel[value.id] + --if data then + this.BuildData[value.id].level = value.lv + this.BuildData[value.id].startTime = value.startTime + this.BuildData[value.id].endTime=0 + this.BuildData[value.id].heroId = value.heroId + this.BuildData[value.id].heroStarTime = value.heroStartTime + local singledata = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainBuildLevel,"PoolID",value.id,"level",value.lv) + if value.startTime>0 then + this.BuildData[value.id].endTime=value.startTime+singledata.Time + end + this.BuildData[value.id].dataSingle = singledata + --end end end end @@ -62,6 +69,23 @@ function this.GetServerData(msg,func) end end +--设置特训点信息 +function this.SetBuildInfo(_info) + if _info and this.BuildData[_info.id] then + this.BuildData[_info.id].level = _info.lv + this.BuildData[_info.id].startTime = _info.startTime + this.BuildData[_info.id].heroId = _info.heroId + this.BuildData[_info.id].heroStarTime = _info.heroStartTime + LogError("_info.startTime==================".._info.startTime.." _info.lv===".._info.lv) + local singledata = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.TrainBuildLevel,"PoolID",_info.id,"level",_info.lv) + this.BuildData[_info.id].endTime = _info.startTime+singledata.Time + this.BuildData[_info.id].dataSingle = singledata + end +end + + + + --升级材料和前置浮生殿等级检测 function this.ResumeCost(_data,_str,func) @@ -79,7 +103,7 @@ function this.ResumeCost(_data,_str,func) end if _str then--立即完成 -- LogGreen(tostring(_data.Time).." "..tostring(tonumber(_str[1])).." "..tonumber(_str[3])) - data[16] = math.ceil(_data.Time/tonumber(_str[1]))*tonumber(_str[3]) + data[16] = math.ceil(_data.Time/60)*tonumber(_str[2]) end for key, value in pairs(data) do -- LogGreen(string.format("需要%s: %s,现有:%s",key,value,BagManager.GetTotalItemNum(key))) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 0213a1e7ef..67b07672f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -7588,7 +7588,7 @@ function NetManager.TrainingArchitectureInfoRequest(_func) local data = buffer:DataByte() local msg = HeroInfoProto_pb.TrainingArchitectureInfoResponse() msg:ParseFromString(data) - + TrainBuildManager.GetServerData(msg) if _func then _func() end @@ -7607,7 +7607,8 @@ function NetManager.TrainingArchitectureUpRequest(_id,_type,_func) local data = buffer:DataByte() local msg = HeroInfoProto_pb.TrainingArchitectureUpResponse() msg:ParseFromString(data) - + LogError("升级请求") + TrainBuildManager.SetBuildInfo(msg.info) if _func then _func() end