Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local

dev_chengFeng
jiaoyangna 2021-01-25 18:10:19 +08:00
commit 6a100b3199
4 changed files with 51 additions and 56 deletions

File diff suppressed because one or more lines are too long

View File

@ -84,6 +84,7 @@ TAKEMAILREQUEST = protobuf.Descriptor();
TAKEMAILREQUEST_MAILIDS_FIELD = protobuf.FieldDescriptor();
TAKEMAILRESPONSE = protobuf.Descriptor();
TAKEMAILRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
TAKEMAILRESPONSE_MSG_FIELD = protobuf.FieldDescriptor();
WORKSHOPFOUNDATIONREQUEST = protobuf.Descriptor();
WORKSHOPFOUNDATIONREQUEST_MATERIALID_FIELD = protobuf.FieldDescriptor();
WORKSHOPFOUNDATIONREQUEST_NUMS_FIELD = protobuf.FieldDescriptor();
@ -470,8 +471,6 @@ USEHEADFRAMEREQUEST = protobuf.Descriptor();
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD = protobuf.FieldDescriptor();
USEHEADFRAMERESPONSE = protobuf.Descriptor();
USEHEADFRAMERESPONSE_VALIDTIME_FIELD = protobuf.FieldDescriptor();
HEADFRAMEPASTDUEINDICATION = protobuf.Descriptor();
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD = protobuf.FieldDescriptor();
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
@ -1244,11 +1243,21 @@ TAKEMAILRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
TAKEMAILRESPONSE_DROP_FIELD.type = 11
TAKEMAILRESPONSE_DROP_FIELD.cpp_type = 10
TAKEMAILRESPONSE_MSG_FIELD.name = "msg"
TAKEMAILRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.TakeMailResponse.msg"
TAKEMAILRESPONSE_MSG_FIELD.number = 2
TAKEMAILRESPONSE_MSG_FIELD.index = 1
TAKEMAILRESPONSE_MSG_FIELD.label = 1
TAKEMAILRESPONSE_MSG_FIELD.has_default_value = false
TAKEMAILRESPONSE_MSG_FIELD.default_value = 0
TAKEMAILRESPONSE_MSG_FIELD.type = 5
TAKEMAILRESPONSE_MSG_FIELD.cpp_type = 1
TAKEMAILRESPONSE.name = "TakeMailResponse"
TAKEMAILRESPONSE.full_name = ".rpc.protocols.TakeMailResponse"
TAKEMAILRESPONSE.nested_types = {}
TAKEMAILRESPONSE.enum_types = {}
TAKEMAILRESPONSE.fields = {TAKEMAILRESPONSE_DROP_FIELD}
TAKEMAILRESPONSE.fields = {TAKEMAILRESPONSE_DROP_FIELD, TAKEMAILRESPONSE_MSG_FIELD}
TAKEMAILRESPONSE.is_extendable = false
TAKEMAILRESPONSE.extensions = {}
WORKSHOPFOUNDATIONREQUEST_MATERIALID_FIELD.name = "materialId"
@ -4762,23 +4771,6 @@ USEHEADFRAMERESPONSE.enum_types = {}
USEHEADFRAMERESPONSE.fields = {USEHEADFRAMERESPONSE_VALIDTIME_FIELD}
USEHEADFRAMERESPONSE.is_extendable = false
USEHEADFRAMERESPONSE.extensions = {}
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.name = "headFrameId"
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.full_name = ".rpc.protocols.HeadFramePastDueIndication.headFrameId"
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.number = 1
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.index = 0
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.label = 1
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.has_default_value = false
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.default_value = 0
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.type = 5
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.cpp_type = 1
HEADFRAMEPASTDUEINDICATION.name = "HeadFramePastDueIndication"
HEADFRAMEPASTDUEINDICATION.full_name = ".rpc.protocols.HeadFramePastDueIndication"
HEADFRAMEPASTDUEINDICATION.nested_types = {}
HEADFRAMEPASTDUEINDICATION.enum_types = {}
HEADFRAMEPASTDUEINDICATION.fields = {HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD}
HEADFRAMEPASTDUEINDICATION.is_extendable = false
HEADFRAMEPASTDUEINDICATION.extensions = {}
ActiviteWorkShopReqeust = protobuf.Message(ACTIVITEWORKSHOPREQEUST)
ActivityUpateIndication = protobuf.Message(ACTIVITYUPATEINDICATION)
@ -4834,7 +4826,6 @@ GetSomeActitityInfoRespone = protobuf.Message(GETSOMEACTITITYINFORESPONE)
GetSomeActivityInfoRequest = protobuf.Message(GETSOMEACTIVITYINFOREQUEST)
GetStoreInfosResponse = protobuf.Message(GETSTOREINFOSRESPONSE)
GetWorkShopInfoResponse = protobuf.Message(GETWORKSHOPINFORESPONSE)
HeadFramePastDueIndication = protobuf.Message(HEADFRAMEPASTDUEINDICATION)
InviteFriendRequest = protobuf.Message(INVITEFRIENDREQUEST)
JadeDynastyRefreshIndication = protobuf.Message(JADEDYNASTYREFRESHINDICATION)
JadeDynastyRefreshTimeResponse = protobuf.Message(JADEDYNASTYREFRESHTIMERESPONSE)

View File

@ -93,11 +93,15 @@ end
function this.GetMailData3()
NetManager.GetSingleMailRewardData(allGetMail,function (_drop)
for index = 1, #allGetMail do
MailManager.UpdataMialIsReadState(allGetMail[index],3)
end
UIManager.OpenPanel(UIName.RewardItemPopup,_drop,1)
this.UpdateMailData()
-- for index = 1, #allGetMail do
-- MailManager.UpdataMialIsReadState(allGetMail[index],3)
-- end
NetManager.GetAllMailData(function ()
this.OnShowMailListData(MailManager.mialDataList, true)
end)
UIManager.OpenPanel(UIName.RewardItemPopup,_drop,1,function ()
this.UpdateMailData()
end)
end)
end

View File

@ -1115,6 +1115,11 @@ function this.GetSingleMailRewardData(_mailIds, func)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.TakeMailResponse()
msg:ParseFromString(data)
if msg.msg == 0 then
PopupTipPanel.ShowTip("无可领取附件!")
elseif msg.msg == 2 then
PopupTipPanel.ShowTip("背包已满")
end
if func then
func(msg.drop)
end