From d36dfd9e25072dd7fa21a1fe0333cd5de345c996 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 18 May 2021 16:51:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=B1=E6=B2=B3=E7=A4=BE=E7=A8=B7?= =?UTF-8?q?=E5=9B=BE=E3=80=91=E6=98=AF=E5=90=A6=E9=80=9A=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/CommonProto_pb.lua | 13 ++++++++++++- .../~Lua/Modules/FightLevel/FightLevelManager.lua | 1 + .../View/FightLevelInfoPopup_MainLevelReward.lua | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index 4fc2cf6422..f9d217d04e 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -671,6 +671,7 @@ HARDSTAGENODE_NODEID_FIELD = protobuf.FieldDescriptor(); HARDSTAGENODE_TYPE_FIELD = protobuf.FieldDescriptor(); HARDSTAGENODE_STATE_FIELD = protobuf.FieldDescriptor(); HARDSTAGENODE_ISFIRST_FIELD = protobuf.FieldDescriptor(); +HARDSTAGENODE_ISPASS_FIELD = protobuf.FieldDescriptor(); HARDSTAGECHAPTER = protobuf.Descriptor(); HARDSTAGECHAPTER_CHAPTERID_FIELD = protobuf.FieldDescriptor(); HARDSTAGECHAPTER_NODE_FIELD = protobuf.FieldDescriptor(); @@ -7055,11 +7056,21 @@ HARDSTAGENODE_ISFIRST_FIELD.default_value = false HARDSTAGENODE_ISFIRST_FIELD.type = 8 HARDSTAGENODE_ISFIRST_FIELD.cpp_type = 7 +HARDSTAGENODE_ISPASS_FIELD.name = "isPass" +HARDSTAGENODE_ISPASS_FIELD.full_name = ".rpc.protocols.HardStageNode.isPass" +HARDSTAGENODE_ISPASS_FIELD.number = 5 +HARDSTAGENODE_ISPASS_FIELD.index = 4 +HARDSTAGENODE_ISPASS_FIELD.label = 1 +HARDSTAGENODE_ISPASS_FIELD.has_default_value = false +HARDSTAGENODE_ISPASS_FIELD.default_value = false +HARDSTAGENODE_ISPASS_FIELD.type = 8 +HARDSTAGENODE_ISPASS_FIELD.cpp_type = 7 + HARDSTAGENODE.name = "HardStageNode" HARDSTAGENODE.full_name = ".rpc.protocols.HardStageNode" HARDSTAGENODE.nested_types = {} HARDSTAGENODE.enum_types = {} -HARDSTAGENODE.fields = {HARDSTAGENODE_NODEID_FIELD, HARDSTAGENODE_TYPE_FIELD, HARDSTAGENODE_STATE_FIELD, HARDSTAGENODE_ISFIRST_FIELD} +HARDSTAGENODE.fields = {HARDSTAGENODE_NODEID_FIELD, HARDSTAGENODE_TYPE_FIELD, HARDSTAGENODE_STATE_FIELD, HARDSTAGENODE_ISFIRST_FIELD, HARDSTAGENODE_ISPASS_FIELD} HARDSTAGENODE.is_extendable = false HARDSTAGENODE.extensions = {} HARDSTAGECHAPTER_CHAPTERID_FIELD.name = "chapterId" diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index 79d451b4ae..caee0f7691 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -67,6 +67,7 @@ function this.UpdataChapterData(msg,_isShowChapterOpenPopup) HardStageNode.type = msg.chapter[i].node[j].type--类型:0.大节点1.小节点 HardStageNode.state = msg.chapter[i].node[j].state--状态:0-7星级状态,8为荣耀三星,0为小节点未通过1为小节点通过 HardStageNode.isFirst= msg.chapter[i].node[j].isFirst--是否是第一次荣耀 + HardStageNode.isPass= msg.chapter[i].node[j].isPass--节点是否通过 HardStageNode.config = HardStage[msg.chapter[i].node[j].nodeId]--表 this.SetCurChapterLevelId(HardStageNode.nodeId) singleHardStageChapter.node[HardStageNode.nodeId] = HardStageNode diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua index 8b13b1e031..15ccc77cf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelReward.lua @@ -95,8 +95,8 @@ function this.SingleDataShow(_go,_rewardData,_index) noButton:SetActive(not FightLevelManager.GetCurLevelStarState(fightLevelData.state,index)) okButton:SetActive(FightLevelManager.GetCurLevelStarState(fightLevelData.state,index)) if index == 0 then--首通 - noButton:SetActive(not (fightLevelData.state > 0))--state > 0 说明有星 肯定通关了就 - okButton:SetActive(fightLevelData.state > 0) + noButton:SetActive(not fightLevelData.isPass)--state > 0 说明有星 肯定通关了就 + okButton:SetActive(fightLevelData.isPass) else noButton:SetActive(not FightLevelManager.GetCurLevelStarState(fightLevelData.state,index)) okButton:SetActive(FightLevelManager.GetCurLevelStarState(fightLevelData.state,index))