From 444f8259ee15b6a94dd82326a29378078c3ae2db Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 14 Oct 2021 21:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93=E4=B8=BB?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=AF=B7=E6=B1=82=E6=B7=BB=E5=8A=A0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/ArenaInfoProto_pb.lua | 13 +++++++- .../~Lua/Message/CommonProto_pb.lua | 31 +++++++++++++++++++ .../~Lua/Message/HeroInfoProto_pb.lua | 14 ++++++++- .../~Lua/Message/PlayerInfoProto_pb.lua | 13 +++++++- .../~Lua/Modules/Login/LoginPanel.lua | 2 +- .../~Lua/Modules/Net/NetManager.lua | 7 ++++- .../~Lua/Modules/Player/JumpManager.lua | 2 +- 7 files changed, 76 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua index cce840caa4..48bd82a5d3 100644 --- a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua @@ -92,6 +92,7 @@ TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor(); TAKEARENABATTLEREWARDRESPONSE = protobuf.Descriptor(); TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); CROSSYUXULUNDAOGETINFOREQUEST = protobuf.Descriptor(); +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); CROSSYUXULUNDAOGETINFORESPONSE = protobuf.Descriptor(); CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD = protobuf.FieldDescriptor(); CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD = protobuf.FieldDescriptor(); @@ -957,11 +958,21 @@ TAKEARENABATTLEREWARDRESPONSE.enum_types = {} TAKEARENABATTLEREWARDRESPONSE.fields = {TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD} TAKEARENABATTLEREWARDRESPONSE.is_extendable = false TAKEARENABATTLEREWARDRESPONSE.extensions = {} +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.name = "type" +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoRequest.type" +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.number = 1 +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.index = 0 +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.label = 1 +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.has_default_value = false +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.default_value = 0 +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.type = 5 +CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.cpp_type = 1 + CROSSYUXULUNDAOGETINFOREQUEST.name = "CrossYuXuLunDaoGetInfoRequest" CROSSYUXULUNDAOGETINFOREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoRequest" CROSSYUXULUNDAOGETINFOREQUEST.nested_types = {} CROSSYUXULUNDAOGETINFOREQUEST.enum_types = {} -CROSSYUXULUNDAOGETINFOREQUEST.fields = {} +CROSSYUXULUNDAOGETINFOREQUEST.fields = {CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD} CROSSYUXULUNDAOGETINFOREQUEST.is_extendable = false CROSSYUXULUNDAOGETINFOREQUEST.extensions = {} CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.name = "isFirst" diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index b705781e6c..59f900b57e 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -768,6 +768,9 @@ RELIC_STATUS_FIELD = protobuf.FieldDescriptor(); LIKABLEINFO = protobuf.Descriptor(); LIKABLEINFO_HEROSTATICID_FIELD = protobuf.FieldDescriptor(); LIKABLEINFO_LIKABLENUM_FIELD = protobuf.FieldDescriptor(); +EQUIPBOOKINFO = protobuf.Descriptor(); +EQUIPBOOKINFO_EQUIPID_FIELD = protobuf.FieldDescriptor(); +EQUIPBOOKINFO_NUM_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode" @@ -8080,6 +8083,33 @@ LIKABLEINFO.enum_types = {} LIKABLEINFO.fields = {LIKABLEINFO_HEROSTATICID_FIELD, LIKABLEINFO_LIKABLENUM_FIELD} LIKABLEINFO.is_extendable = false LIKABLEINFO.extensions = {} +EQUIPBOOKINFO_EQUIPID_FIELD.name = "equipId" +EQUIPBOOKINFO_EQUIPID_FIELD.full_name = ".rpc.protocols.EquipBookInfo.equipId" +EQUIPBOOKINFO_EQUIPID_FIELD.number = 1 +EQUIPBOOKINFO_EQUIPID_FIELD.index = 0 +EQUIPBOOKINFO_EQUIPID_FIELD.label = 1 +EQUIPBOOKINFO_EQUIPID_FIELD.has_default_value = false +EQUIPBOOKINFO_EQUIPID_FIELD.default_value = 0 +EQUIPBOOKINFO_EQUIPID_FIELD.type = 5 +EQUIPBOOKINFO_EQUIPID_FIELD.cpp_type = 1 + +EQUIPBOOKINFO_NUM_FIELD.name = "num" +EQUIPBOOKINFO_NUM_FIELD.full_name = ".rpc.protocols.EquipBookInfo.num" +EQUIPBOOKINFO_NUM_FIELD.number = 2 +EQUIPBOOKINFO_NUM_FIELD.index = 1 +EQUIPBOOKINFO_NUM_FIELD.label = 1 +EQUIPBOOKINFO_NUM_FIELD.has_default_value = false +EQUIPBOOKINFO_NUM_FIELD.default_value = 0 +EQUIPBOOKINFO_NUM_FIELD.type = 5 +EQUIPBOOKINFO_NUM_FIELD.cpp_type = 1 + +EQUIPBOOKINFO.name = "EquipBookInfo" +EQUIPBOOKINFO.full_name = ".rpc.protocols.EquipBookInfo" +EQUIPBOOKINFO.nested_types = {} +EQUIPBOOKINFO.enum_types = {} +EQUIPBOOKINFO.fields = {EQUIPBOOKINFO_EQUIPID_FIELD, EQUIPBOOKINFO_NUM_FIELD} +EQUIPBOOKINFO.is_extendable = false +EQUIPBOOKINFO.extensions = {} ActivityInfo = protobuf.Message(ACTIVITYINFO) ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO) @@ -8102,6 +8132,7 @@ Drop = protobuf.Message(DROP) EndlessPoint = protobuf.Message(ENDLESSPOINT) EndlessRefreshInfo = protobuf.Message(ENDLESSREFRESHINFO) Equip = protobuf.Message(EQUIP) +EquipBookInfo = protobuf.Message(EQUIPBOOKINFO) ErrorResponse = protobuf.Message(ERRORRESPONSE) EventBehaviorCommon = protobuf.Message(EVENTBEHAVIORCOMMON) EventBehaviorValues = protobuf.Message(EVENTBEHAVIORVALUES) diff --git a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua index dd65cc8dfe..caac7450fc 100644 --- a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua @@ -99,6 +99,7 @@ GETALLPOKEMONRESPONSE_POKEMONGOT_FIELD = protobuf.FieldDescriptor(); GETALLPROPERTYINFORESPONSE = protobuf.Descriptor(); GETALLPROPERTYINFORESPONSE_ALLBOOKENABLED_FIELD = protobuf.FieldDescriptor(); GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD = protobuf.FieldDescriptor(); +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD = protobuf.FieldDescriptor(); REPLACETEAMPOKEMONINFOREQUEST = protobuf.Descriptor(); REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD = protobuf.FieldDescriptor(); POKENMONUPLEVELREQUEST = protobuf.Descriptor(); @@ -1119,11 +1120,22 @@ GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD.default_value = {} GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD.type = 5 GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD.cpp_type = 1 +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.name = "equipList" +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.full_name = ".rpc.protocols.GetAllPropertyInfoResponse.equipList" +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.number = 3 +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.index = 2 +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.label = 3 +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.has_default_value = false +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.default_value = {} +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.message_type = CommonProto_pb.EQUIPBOOKINFO +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.type = 11 +GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD.cpp_type = 10 + GETALLPROPERTYINFORESPONSE.name = "GetAllPropertyInfoResponse" GETALLPROPERTYINFORESPONSE.full_name = ".rpc.protocols.GetAllPropertyInfoResponse" GETALLPROPERTYINFORESPONSE.nested_types = {} GETALLPROPERTYINFORESPONSE.enum_types = {} -GETALLPROPERTYINFORESPONSE.fields = {GETALLPROPERTYINFORESPONSE_ALLBOOKENABLED_FIELD, GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD} +GETALLPROPERTYINFORESPONSE.fields = {GETALLPROPERTYINFORESPONSE_ALLBOOKENABLED_FIELD, GETALLPROPERTYINFORESPONSE_EQUIPGOT_FIELD, GETALLPROPERTYINFORESPONSE_EQUIPLIST_FIELD} GETALLPROPERTYINFORESPONSE.is_extendable = false GETALLPROPERTYINFORESPONSE.extensions = {} REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.name = "teamPokemonInfos" diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua index 15d20b0d6c..64b0628c4b 100644 --- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua @@ -412,6 +412,7 @@ VIEWHEROINFORESPONSE_EQUIP_FIELD = protobuf.FieldDescriptor(); VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD = protobuf.FieldDescriptor(); VIEWHEROINFORESPONSE_FORCE_FIELD = protobuf.FieldDescriptor(); VIEWHEROINFORESPONSE_GUILDSKILL_FIELD = protobuf.FieldDescriptor(); +VIEWHEROINFORESPONSE_TREELEVEL_FIELD = protobuf.FieldDescriptor(); RANKREQUEST = protobuf.Descriptor(); RANKREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); RANKREQUEST_ACTIVITEID_FIELD = protobuf.FieldDescriptor(); @@ -4410,11 +4411,21 @@ VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.default_value = 0 VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.type = 5 VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.cpp_type = 1 +VIEWHEROINFORESPONSE_TREELEVEL_FIELD.name = "treeLevel" +VIEWHEROINFORESPONSE_TREELEVEL_FIELD.full_name = ".rpc.protocols.ViewHeroInfoResponse.treeLevel" +VIEWHEROINFORESPONSE_TREELEVEL_FIELD.number = 6 +VIEWHEROINFORESPONSE_TREELEVEL_FIELD.index = 5 +VIEWHEROINFORESPONSE_TREELEVEL_FIELD.label = 1 +VIEWHEROINFORESPONSE_TREELEVEL_FIELD.has_default_value = false +VIEWHEROINFORESPONSE_TREELEVEL_FIELD.default_value = 0 +VIEWHEROINFORESPONSE_TREELEVEL_FIELD.type = 5 +VIEWHEROINFORESPONSE_TREELEVEL_FIELD.cpp_type = 1 + VIEWHEROINFORESPONSE.name = "ViewHeroInfoResponse" VIEWHEROINFORESPONSE.full_name = ".rpc.protocols.ViewHeroInfoResponse" VIEWHEROINFORESPONSE.nested_types = {} VIEWHEROINFORESPONSE.enum_types = {} -VIEWHEROINFORESPONSE.fields = {VIEWHEROINFORESPONSE_HERO_FIELD, VIEWHEROINFORESPONSE_EQUIP_FIELD, VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD, VIEWHEROINFORESPONSE_FORCE_FIELD, VIEWHEROINFORESPONSE_GUILDSKILL_FIELD} +VIEWHEROINFORESPONSE.fields = {VIEWHEROINFORESPONSE_HERO_FIELD, VIEWHEROINFORESPONSE_EQUIP_FIELD, VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD, VIEWHEROINFORESPONSE_FORCE_FIELD, VIEWHEROINFORESPONSE_GUILDSKILL_FIELD, VIEWHEROINFORESPONSE_TREELEVEL_FIELD} VIEWHEROINFORESPONSE.is_extendable = false VIEWHEROINFORESPONSE.extensions = {} RANKREQUEST_TYPE_FIELD.name = "type" diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 687b833eff..25938a5373 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -677,7 +677,7 @@ function this.ExecuteLoading() --[[[47] =]]function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜 --[[[48] =]]function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, --跨服 --[[[49] =]]function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --太初密卷 - --[[[50] =]]function() NetManager.CrossYuXuLunDaoGetInfoRequest(LoadingPanel.OnStep) end, --玉虚论道红点 + --[[[50] =]]function() NetManager.CrossYuXuLunDaoGetInfoRequest(2,LoadingPanel.OnStep) end, --玉虚论道红点 --[[[51] =]]function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度 function() -- 登录请求最终接口,所有请求放在此接口之前 -- 登录成功确认 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 8ba2ac4f59..e4f3054b3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5628,8 +5628,13 @@ function NetManager.TaiChuSecretvolumeRequest(func) end --请求玉虚论道主界面信息 -function NetManager.CrossYuXuLunDaoGetInfoRequest(func) +function NetManager.CrossYuXuLunDaoGetInfoRequest(_type,func) local data=ArenaInfoProto_pb.CrossYuXuLunDaoGetInfoRequest() + if _type==0 then + data.type=0 + else + data.type= tonumber(_type) + end local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoGetInfoRequest, MessageTypeProto_pb.CrossYuXuLunDaoGetInfoResponse, msg, function(buffer) local data = buffer:DataByte() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 3846b92f7a..e96773cb97 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -801,7 +801,7 @@ local jumpDic = { end, [JumpType.YuXuLunDao] = function(data) QiJieShiLianManager.CheckQiJieJump(FUNCTION_OPEN_TYPE.JumpServer_YuXu,2,function () - NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg) + NetManager.CrossYuXuLunDaoGetInfoRequest(1,function(msg) UIManager.OpenPanel(UIName.WorldArenaMainPanel,msg) end) end)