From 971622a4c5383dee0d5b85e08f11ae6e931f4160 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 29 Jul 2020 18:36:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E5=85=91=E6=8D=A2=20?= =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/MapInfoProto_pb.lua | 14 +++++++++++++- .../~Lua/Modules/Expert/ExChange.lua | 3 ++- .../~Lua/Modules/Expert/PatFaceManager.lua | 15 ++++++++++++--- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua index 079d950948..b6018b3bbc 100644 --- a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua @@ -125,6 +125,7 @@ MAPTOWERCALLCHIEFRESPONSE_MONSTERINFO_FIELD = protobuf.FieldDescriptor(); MAPTOWERUSEBOMBRESPONSE = protobuf.Descriptor(); MAPTOWERUSEBOMBRESPONSE_ESSENCEVALUE_FIELD = protobuf.FieldDescriptor(); MAPTOWERUSEBOMBRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD = protobuf.FieldDescriptor(); DIFFICULTMAPREQUEST = protobuf.Descriptor(); DIFFICULTMAPREQUEST_MAPINFO_FIELD = protobuf.FieldDescriptor(); TOWERREWARDREQUEST = protobuf.Descriptor(); @@ -1324,11 +1325,22 @@ MAPTOWERUSEBOMBRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP MAPTOWERUSEBOMBRESPONSE_DROP_FIELD.type = 11 MAPTOWERUSEBOMBRESPONSE_DROP_FIELD.cpp_type = 10 +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.name = "cell" +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.full_name = ".com.ljsd.jieling.protocols.MapTowerUseBombResponse.cell" +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.number = 3 +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.index = 2 +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.label = 1 +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.has_default_value = false +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.default_value = nil +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.message_type = CommonProto_pb.CELL +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.type = 11 +MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.cpp_type = 10 + MAPTOWERUSEBOMBRESPONSE.name = "MapTowerUseBombResponse" MAPTOWERUSEBOMBRESPONSE.full_name = ".com.ljsd.jieling.protocols.MapTowerUseBombResponse" MAPTOWERUSEBOMBRESPONSE.nested_types = {} MAPTOWERUSEBOMBRESPONSE.enum_types = {} -MAPTOWERUSEBOMBRESPONSE.fields = {MAPTOWERUSEBOMBRESPONSE_ESSENCEVALUE_FIELD, MAPTOWERUSEBOMBRESPONSE_DROP_FIELD} +MAPTOWERUSEBOMBRESPONSE.fields = {MAPTOWERUSEBOMBRESPONSE_ESSENCEVALUE_FIELD, MAPTOWERUSEBOMBRESPONSE_DROP_FIELD, MAPTOWERUSEBOMBRESPONSE_CELL_FIELD} MAPTOWERUSEBOMBRESPONSE.is_extendable = false MAPTOWERUSEBOMBRESPONSE.extensions = {} DIFFICULTMAPREQUEST_MAPINFO_FIELD.name = "mapInfo" diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua index b2ab589fe3..28b54c4a3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExChange.lua @@ -78,8 +78,9 @@ this.liveName=nil function ExChange:ExChangeShow() local LimitExchange = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LimitExchange) if LimitExchange then + local str = Language[11496] Log("LimitExchange "..LimitExchange.endTime) - PatFaceManager.RemainTimeDown(this.timeTextExChangeGo,this.timeTextExChange,LimitExchange.endTime - GetTimeStamp()) + PatFaceManager.RemainTimeDown(this.timeTextExChangeGo,this.timeTextExChange,LimitExchange.endTime - GetTimeStamp(),str) else this.timeTextExChangeGo:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index 1a6a625966..35060f1d3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -186,13 +186,18 @@ function this.GetTimeStrBySeconds(_seconds) end this.timer = Timer.New() --刷新倒计时显示 -function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown) +function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown,str) if timeDown > 0 then if _timeTextExpertgo then _timeTextExpertgo:SetActive(true) end if _timeTextExpert then - _timeTextExpert.text = Language[10028]..this.TimeStampToDateString(timeDown) + if str then + _timeTextExpert.text = str..this.TimeStampToDateString(timeDown) + else + _timeTextExpert.text = Language[10028]..this.TimeStampToDateString(timeDown) + end + end if this.timer then this.timer:Stop() @@ -200,7 +205,11 @@ function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown) end this.timer = Timer.New(function() if _timeTextExpert then - _timeTextExpert.text = Language[10028]..this.TimeStampToDateString(timeDown) + if str then + _timeTextExpert.text = str..this.TimeStampToDateString(timeDown) + else + _timeTextExpert.text = Language[10028]..this.TimeStampToDateString(timeDown) + end end if timeDown < 0 then if _timeTextExpertgo then