代金券购买礼包提交
parent
f97eb65108
commit
3d5ed9271e
|
@ -106,6 +106,9 @@ UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD = protobuf.FieldDescriptor();
|
|||
EXPLOREACTIVITYINDICATION = protobuf.Descriptor();
|
||||
EXPLOREACTIVITYINDICATION_GUILDID_FIELD = protobuf.FieldDescriptor();
|
||||
EXPLOREACTIVITYINDICATION_EXPLOREKILLMONSTERNUM_FIELD = protobuf.FieldDescriptor();
|
||||
GETGMSINGLEACTIVITYREQUEST = protobuf.Descriptor();
|
||||
GETGMSINGLEACTIVITYRESPONSE = protobuf.Descriptor();
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
|
||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.CommitShejiActivityItemRequest.itemId"
|
||||
|
@ -1022,6 +1025,31 @@ EXPLOREACTIVITYINDICATION.enum_types = {}
|
|||
EXPLOREACTIVITYINDICATION.fields = {EXPLOREACTIVITYINDICATION_GUILDID_FIELD, EXPLOREACTIVITYINDICATION_EXPLOREKILLMONSTERNUM_FIELD}
|
||||
EXPLOREACTIVITYINDICATION.is_extendable = false
|
||||
EXPLOREACTIVITYINDICATION.extensions = {}
|
||||
GETGMSINGLEACTIVITYREQUEST.name = "GetGmSingleActivityRequest"
|
||||
GETGMSINGLEACTIVITYREQUEST.full_name = ".rpc.protocols.GetGmSingleActivityRequest"
|
||||
GETGMSINGLEACTIVITYREQUEST.nested_types = {}
|
||||
GETGMSINGLEACTIVITYREQUEST.enum_types = {}
|
||||
GETGMSINGLEACTIVITYREQUEST.fields = {}
|
||||
GETGMSINGLEACTIVITYREQUEST.is_extendable = false
|
||||
GETGMSINGLEACTIVITYREQUEST.extensions = {}
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.name = "gmSingle"
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.full_name = ".rpc.protocols.GetGmSingleActivityResponse.gmSingle"
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.number = 1
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.index = 0
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.label = 3
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.has_default_value = false
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.default_value = {}
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.message_type = CommonProto_pb.GMSINGLEACTIVITY
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.type = 11
|
||||
GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD.cpp_type = 10
|
||||
|
||||
GETGMSINGLEACTIVITYRESPONSE.name = "GetGmSingleActivityResponse"
|
||||
GETGMSINGLEACTIVITYRESPONSE.full_name = ".rpc.protocols.GetGmSingleActivityResponse"
|
||||
GETGMSINGLEACTIVITYRESPONSE.nested_types = {}
|
||||
GETGMSINGLEACTIVITYRESPONSE.enum_types = {}
|
||||
GETGMSINGLEACTIVITYRESPONSE.fields = {GETGMSINGLEACTIVITYRESPONSE_GMSINGLE_FIELD}
|
||||
GETGMSINGLEACTIVITYRESPONSE.is_extendable = false
|
||||
GETGMSINGLEACTIVITYRESPONSE.extensions = {}
|
||||
|
||||
BuyGoodsToItemRequest = protobuf.Message(BUYGOODSTOITEMREQUEST)
|
||||
BuyGoodsToItemResponse = protobuf.Message(BUYGOODSTOITEMRESPONSE)
|
||||
|
@ -1029,6 +1057,8 @@ CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST
|
|||
CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
|
||||
ExploreActivityIndication = protobuf.Message(EXPLOREACTIVITYINDICATION)
|
||||
FuXingStoreBuyRequest = protobuf.Message(FUXINGSTOREBUYREQUEST)
|
||||
GetGmSingleActivityRequest = protobuf.Message(GETGMSINGLEACTIVITYREQUEST)
|
||||
GetGmSingleActivityResponse = protobuf.Message(GETGMSINGLEACTIVITYRESPONSE)
|
||||
GetShejiAwardRequest = protobuf.Message(GETSHEJIAWARDREQUEST)
|
||||
GetShejiAwardResponse = protobuf.Message(GETSHEJIAWARDRESPONSE)
|
||||
GetTrumpSelectItemRequest = protobuf.Message(GETTRUMPSELECTITEMREQUEST)
|
||||
|
|
|
@ -912,6 +912,16 @@ DUODUIINFO_TYPE_FIELD = protobuf.FieldDescriptor();
|
|||
DUODUIINFO_TIER_FIELD = protobuf.FieldDescriptor();
|
||||
DUODUIINFO_RANK_FIELD = protobuf.FieldDescriptor();
|
||||
DUODUIINFO_TIME_FIELD = protobuf.FieldDescriptor();
|
||||
GMSINGLEGIFT = protobuf.Descriptor();
|
||||
GMSINGLEGIFT_GIFTID_FIELD = protobuf.FieldDescriptor();
|
||||
GMSINGLEGIFT_SORT_FIELD = protobuf.FieldDescriptor();
|
||||
GMSINGLEGIFT_NAME_FIELD = protobuf.FieldDescriptor();
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD = protobuf.FieldDescriptor();
|
||||
GMSINGLEACTIVITY = protobuf.Descriptor();
|
||||
GMSINGLEACTIVITY_ID_FIELD = protobuf.FieldDescriptor();
|
||||
GMSINGLEACTIVITY_NAME_FIELD = protobuf.FieldDescriptor();
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD = protobuf.FieldDescriptor();
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
|
||||
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode"
|
||||
|
@ -9591,6 +9601,101 @@ DUODUIINFO.enum_types = {}
|
|||
DUODUIINFO.fields = {DUODUIINFO_TYPE_FIELD, DUODUIINFO_TIER_FIELD, DUODUIINFO_RANK_FIELD, DUODUIINFO_TIME_FIELD}
|
||||
DUODUIINFO.is_extendable = false
|
||||
DUODUIINFO.extensions = {}
|
||||
GMSINGLEGIFT_GIFTID_FIELD.name = "giftId"
|
||||
GMSINGLEGIFT_GIFTID_FIELD.full_name = ".rpc.protocols.GmSingleGift.giftId"
|
||||
GMSINGLEGIFT_GIFTID_FIELD.number = 1
|
||||
GMSINGLEGIFT_GIFTID_FIELD.index = 0
|
||||
GMSINGLEGIFT_GIFTID_FIELD.label = 1
|
||||
GMSINGLEGIFT_GIFTID_FIELD.has_default_value = false
|
||||
GMSINGLEGIFT_GIFTID_FIELD.default_value = 0
|
||||
GMSINGLEGIFT_GIFTID_FIELD.type = 5
|
||||
GMSINGLEGIFT_GIFTID_FIELD.cpp_type = 1
|
||||
|
||||
GMSINGLEGIFT_SORT_FIELD.name = "sort"
|
||||
GMSINGLEGIFT_SORT_FIELD.full_name = ".rpc.protocols.GmSingleGift.sort"
|
||||
GMSINGLEGIFT_SORT_FIELD.number = 2
|
||||
GMSINGLEGIFT_SORT_FIELD.index = 1
|
||||
GMSINGLEGIFT_SORT_FIELD.label = 1
|
||||
GMSINGLEGIFT_SORT_FIELD.has_default_value = false
|
||||
GMSINGLEGIFT_SORT_FIELD.default_value = 0
|
||||
GMSINGLEGIFT_SORT_FIELD.type = 5
|
||||
GMSINGLEGIFT_SORT_FIELD.cpp_type = 1
|
||||
|
||||
GMSINGLEGIFT_NAME_FIELD.name = "name"
|
||||
GMSINGLEGIFT_NAME_FIELD.full_name = ".rpc.protocols.GmSingleGift.name"
|
||||
GMSINGLEGIFT_NAME_FIELD.number = 3
|
||||
GMSINGLEGIFT_NAME_FIELD.index = 2
|
||||
GMSINGLEGIFT_NAME_FIELD.label = 1
|
||||
GMSINGLEGIFT_NAME_FIELD.has_default_value = false
|
||||
GMSINGLEGIFT_NAME_FIELD.default_value = ""
|
||||
GMSINGLEGIFT_NAME_FIELD.type = 9
|
||||
GMSINGLEGIFT_NAME_FIELD.cpp_type = 9
|
||||
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD.name = "discount"
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD.full_name = ".rpc.protocols.GmSingleGift.discount"
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD.number = 4
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD.index = 3
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD.label = 1
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD.has_default_value = false
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD.default_value = ""
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD.type = 9
|
||||
GMSINGLEGIFT_DISCOUNT_FIELD.cpp_type = 9
|
||||
|
||||
GMSINGLEGIFT.name = "GmSingleGift"
|
||||
GMSINGLEGIFT.full_name = ".rpc.protocols.GmSingleGift"
|
||||
GMSINGLEGIFT.nested_types = {}
|
||||
GMSINGLEGIFT.enum_types = {}
|
||||
GMSINGLEGIFT.fields = {GMSINGLEGIFT_GIFTID_FIELD, GMSINGLEGIFT_SORT_FIELD, GMSINGLEGIFT_NAME_FIELD, GMSINGLEGIFT_DISCOUNT_FIELD}
|
||||
GMSINGLEGIFT.is_extendable = false
|
||||
GMSINGLEGIFT.extensions = {}
|
||||
GMSINGLEACTIVITY_ID_FIELD.name = "id"
|
||||
GMSINGLEACTIVITY_ID_FIELD.full_name = ".rpc.protocols.GmSingleActivity.id"
|
||||
GMSINGLEACTIVITY_ID_FIELD.number = 1
|
||||
GMSINGLEACTIVITY_ID_FIELD.index = 0
|
||||
GMSINGLEACTIVITY_ID_FIELD.label = 1
|
||||
GMSINGLEACTIVITY_ID_FIELD.has_default_value = false
|
||||
GMSINGLEACTIVITY_ID_FIELD.default_value = 0
|
||||
GMSINGLEACTIVITY_ID_FIELD.type = 5
|
||||
GMSINGLEACTIVITY_ID_FIELD.cpp_type = 1
|
||||
|
||||
GMSINGLEACTIVITY_NAME_FIELD.name = "name"
|
||||
GMSINGLEACTIVITY_NAME_FIELD.full_name = ".rpc.protocols.GmSingleActivity.name"
|
||||
GMSINGLEACTIVITY_NAME_FIELD.number = 2
|
||||
GMSINGLEACTIVITY_NAME_FIELD.index = 1
|
||||
GMSINGLEACTIVITY_NAME_FIELD.label = 1
|
||||
GMSINGLEACTIVITY_NAME_FIELD.has_default_value = false
|
||||
GMSINGLEACTIVITY_NAME_FIELD.default_value = ""
|
||||
GMSINGLEACTIVITY_NAME_FIELD.type = 9
|
||||
GMSINGLEACTIVITY_NAME_FIELD.cpp_type = 9
|
||||
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD.name = "endTime"
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD.full_name = ".rpc.protocols.GmSingleActivity.endTime"
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD.number = 3
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD.index = 2
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD.label = 1
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD.has_default_value = false
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD.default_value = 0
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD.type = 3
|
||||
GMSINGLEACTIVITY_ENDTIME_FIELD.cpp_type = 2
|
||||
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.name = "missions"
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.full_name = ".rpc.protocols.GmSingleActivity.missions"
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.number = 4
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.index = 3
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.label = 3
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.has_default_value = false
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.default_value = {}
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.message_type = GMSINGLEGIFT
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.type = 11
|
||||
GMSINGLEACTIVITY_MISSIONS_FIELD.cpp_type = 10
|
||||
|
||||
GMSINGLEACTIVITY.name = "GmSingleActivity"
|
||||
GMSINGLEACTIVITY.full_name = ".rpc.protocols.GmSingleActivity"
|
||||
GMSINGLEACTIVITY.nested_types = {}
|
||||
GMSINGLEACTIVITY.enum_types = {}
|
||||
GMSINGLEACTIVITY.fields = {GMSINGLEACTIVITY_ID_FIELD, GMSINGLEACTIVITY_NAME_FIELD, GMSINGLEACTIVITY_ENDTIME_FIELD, GMSINGLEACTIVITY_MISSIONS_FIELD}
|
||||
GMSINGLEACTIVITY.is_extendable = false
|
||||
GMSINGLEACTIVITY.extensions = {}
|
||||
|
||||
ActivityInfo = protobuf.Message(ACTIVITYINFO)
|
||||
ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO)
|
||||
|
@ -9648,6 +9753,8 @@ FunctionOfTime = protobuf.Message(FUNCTIONOFTIME)
|
|||
GMCommand = protobuf.Message(GMCOMMAND)
|
||||
GiftGoodsInfo = protobuf.Message(GIFTGOODSINFO)
|
||||
GmResponse = protobuf.Message(GMRESPONSE)
|
||||
GmSingleActivity = protobuf.Message(GMSINGLEACTIVITY)
|
||||
GmSingleGift = protobuf.Message(GMSINGLEGIFT)
|
||||
GoodsTypeDuration = protobuf.Message(GOODSTYPEDURATION)
|
||||
GuildHelpInfo = protobuf.Message(GUILDHELPINFO)
|
||||
GuildHelpLog = protobuf.Message(GUILDHELPLOG)
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -7082,6 +7082,24 @@ function NetManager.SendGmBuyGoodRequest(_id,func)
|
|||
end
|
||||
end)
|
||||
end
|
||||
--优惠券购买物品
|
||||
function NetManager.SendYHQBuyGoodRequest(_id,func)
|
||||
local data = PlayerInfoProto_pb.GmBuyGoodRequest()
|
||||
data.goodsId=_id
|
||||
LogError("id========================".._id)
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.VouchersBuyGiftRequest,MessageTypeProto_pb.TEST_BUY_GIGT_GOODS_RESPONSE,msg,function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.BuyGoodsDropIndication()
|
||||
LogError("response------------------")
|
||||
msg:ParseFromString(data)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
|
||||
---神将置换卡使用置换
|
||||
function NetManager.SendHeroChangeRequest(_heroDId1,_heroDId2,_itemId,func)
|
||||
|
|
|
@ -63,6 +63,30 @@ function this.Pay(id, func)
|
|||
CheckRedPointStatus(RedPointType.GrowthPackage)--成长礼包的红点检测
|
||||
--直购商品
|
||||
local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, id)
|
||||
|
||||
local yhqNum=BagManager.GetItemCountById(108)
|
||||
if yhqNum>=rechargeConfig.Price then
|
||||
local sureFunc=function()
|
||||
NetManager.SendYHQBuyGoodRequest(id)
|
||||
end
|
||||
local cancelFunc=function()
|
||||
if AppConst.isSDKLogin and rechargeConfig.Price > 0 then
|
||||
PayManager.SdkPay({ Id = id, orderId = orderId })
|
||||
else
|
||||
NetManager.RequestBuyGiftGoods(id, function(msg)
|
||||
this.onSdkPayResult(id)
|
||||
end)
|
||||
end
|
||||
end
|
||||
local args={}
|
||||
args[1]="该礼包可通过消耗代金券获得,是否继续充值"
|
||||
args[2]="代金券购买"
|
||||
args[3]="直接充值"
|
||||
args[4]=sureFunc
|
||||
args[5]=cancelFunc
|
||||
UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args)
|
||||
return
|
||||
end
|
||||
if rechargeConfig.BuyType==1 then --人民币
|
||||
if AppConst.isSDKLogin and rechargeConfig.Price > 0 then
|
||||
PayManager.SdkPay({ Id = id, orderId = orderId })
|
||||
|
|
Loading…
Reference in New Issue