From c46d18eb176040e660830f118f0e340550fc819f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 13 Dec 2021 15:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=B3=E5=8D=A1=E6=96=B0=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E3=80=91=E5=A5=BD=E6=84=9F=E5=BA=A6=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E9=80=8D=E9=81=A5=E6=B8=B8=E5=AE=8C=E6=88=90=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/MapInfoProto_pb.lua | 13 ++++++++++++- .../~Lua/Modules/Fight/FightPointPassManager.lua | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua index e75239968a..23c4e7f9f5 100644 --- a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua @@ -188,6 +188,7 @@ SITUATIONCHALLENGERESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); SITUATIONCHALLENGERESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor(); JOURNEYGETINFORESPONSE = protobuf.Descriptor(); JOURNEYGETINFORESPONSE_INFOS_FIELD = protobuf.FieldDescriptor(); +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD = protobuf.FieldDescriptor(); JOURNEYGETONEINFOREQUEST = protobuf.Descriptor(); JOURNEYGETONEINFOREQUEST_MAPID_FIELD = protobuf.FieldDescriptor(); JOURNEYGETONEINFORESPONSE = protobuf.Descriptor(); @@ -1959,11 +1960,21 @@ JOURNEYGETINFORESPONSE_INFOS_FIELD.message_type = CommonProto_pb.JOURNEYINFO JOURNEYGETINFORESPONSE_INFOS_FIELD.type = 11 JOURNEYGETINFORESPONSE_INFOS_FIELD.cpp_type = 10 +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD.name = "finishNum" +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD.full_name = ".rpc.protocols.JourneyGetInfoResponse.finishNum" +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD.number = 2 +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD.index = 1 +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD.label = 1 +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD.has_default_value = false +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD.default_value = 0 +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD.type = 5 +JOURNEYGETINFORESPONSE_FINISHNUM_FIELD.cpp_type = 1 + JOURNEYGETINFORESPONSE.name = "JourneyGetInfoResponse" JOURNEYGETINFORESPONSE.full_name = ".rpc.protocols.JourneyGetInfoResponse" JOURNEYGETINFORESPONSE.nested_types = {} JOURNEYGETINFORESPONSE.enum_types = {} -JOURNEYGETINFORESPONSE.fields = {JOURNEYGETINFORESPONSE_INFOS_FIELD} +JOURNEYGETINFORESPONSE.fields = {JOURNEYGETINFORESPONSE_INFOS_FIELD, JOURNEYGETINFORESPONSE_FINISHNUM_FIELD} JOURNEYGETINFORESPONSE.is_extendable = false JOURNEYGETINFORESPONSE.extensions = {} JOURNEYGETONEINFOREQUEST_MAPID_FIELD.name = "mapId" diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua index 08912e0ea5..f1c60c8ea2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua @@ -340,7 +340,7 @@ function this.CheckFightOpenRule(fightId) LogRed(tips[index]..", 当前:"..num) end elseif rule[1] == 5 then - local _, tlv, _ = LikabilityManager.GetTotalHeroLikeLv(1) + local _, tlv, _ = LikabilityManager.GetTotalHeroLikeLv(-1) if tlv < rule[2] then states[index] = false tips[index] = string.format("神将总好感度等级达%s", rule[2])