【周卡】红点添加,协议修改,推送逻辑添加
parent
0fcf94a9c8
commit
d23318b53d
|
@ -73,7 +73,7 @@ TextureImporter:
|
||||||
buildTarget: iPhone
|
buildTarget: iPhone
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
textureFormat: 33
|
textureFormat: 56
|
||||||
textureCompression: 1
|
textureCompression: 1
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
crunchedCompression: 0
|
crunchedCompression: 0
|
||||||
|
|
|
@ -73,7 +73,7 @@ TextureImporter:
|
||||||
buildTarget: iPhone
|
buildTarget: iPhone
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
textureFormat: 33
|
textureFormat: 56
|
||||||
textureCompression: 1
|
textureCompression: 1
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
crunchedCompression: 0
|
crunchedCompression: 0
|
||||||
|
|
|
@ -73,7 +73,7 @@ TextureImporter:
|
||||||
buildTarget: iPhone
|
buildTarget: iPhone
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
textureFormat: 33
|
textureFormat: 56
|
||||||
textureCompression: 1
|
textureCompression: 1
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
crunchedCompression: 0
|
crunchedCompression: 0
|
||||||
|
|
|
@ -73,7 +73,7 @@ TextureImporter:
|
||||||
buildTarget: iPhone
|
buildTarget: iPhone
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
textureFormat: 33
|
textureFormat: 56
|
||||||
textureCompression: 1
|
textureCompression: 1
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
crunchedCompression: 0
|
crunchedCompression: 0
|
||||||
|
|
|
@ -73,7 +73,7 @@ TextureImporter:
|
||||||
buildTarget: iPhone
|
buildTarget: iPhone
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
textureFormat: 33
|
textureFormat: 56
|
||||||
textureCompression: 1
|
textureCompression: 1
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
crunchedCompression: 0
|
crunchedCompression: 0
|
||||||
|
|
|
@ -73,7 +73,7 @@ TextureImporter:
|
||||||
buildTarget: iPhone
|
buildTarget: iPhone
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
textureFormat: 33
|
textureFormat: 56
|
||||||
textureCompression: 1
|
textureCompression: 1
|
||||||
compressionQuality: 50
|
compressionQuality: 50
|
||||||
crunchedCompression: 0
|
crunchedCompression: 0
|
||||||
|
|
|
@ -709,6 +709,9 @@ RedPointType = {
|
||||||
FifteenDayGift = 2028,--十五日登录
|
FifteenDayGift = 2028,--十五日登录
|
||||||
FifteenDayGift_1 = 20281,--十五日登录领取按钮
|
FifteenDayGift_1 = 20281,--十五日登录领取按钮
|
||||||
XunBaoMiZong = 2029,--寻宝迷踪
|
XunBaoMiZong = 2029,--寻宝迷踪
|
||||||
|
WeekCard = 2030,
|
||||||
|
WeekCardOpen = 20301,
|
||||||
|
WeekCardReward = 20302,
|
||||||
---聊天相关-----
|
---聊天相关-----
|
||||||
Chat = 207,
|
Chat = 207,
|
||||||
Chat_Friend = 2070,
|
Chat_Friend = 2070,
|
||||||
|
@ -1565,6 +1568,7 @@ FUNCTION_OPEN_TYPE = {
|
||||||
QIJIESHILIAN = 112,--七界试炼
|
QIJIESHILIAN = 112,--七界试炼
|
||||||
FOURQUADRANT=113,--四象心法
|
FOURQUADRANT=113,--四象心法
|
||||||
PLAYER_SKILL = 115, --主角技能
|
PLAYER_SKILL = 115, --主角技能
|
||||||
|
WEEK_CARD = 117, -- 周卡
|
||||||
}
|
}
|
||||||
|
|
||||||
TaskGetBtnIconDef = {
|
TaskGetBtnIconDef = {
|
||||||
|
|
|
@ -83,6 +83,15 @@ RIDINGSWARDINFORESPONSE_RECORDLSIT_FIELD = protobuf.FieldDescriptor();
|
||||||
RIDINGSWARDINFORESPONSE_BETLIST_FIELD = protobuf.FieldDescriptor();
|
RIDINGSWARDINFORESPONSE_BETLIST_FIELD = protobuf.FieldDescriptor();
|
||||||
RIDINGSWARDINFORESPONSE_LASTRANK_FIELD = protobuf.FieldDescriptor();
|
RIDINGSWARDINFORESPONSE_LASTRANK_FIELD = protobuf.FieldDescriptor();
|
||||||
RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD = protobuf.FieldDescriptor();
|
RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD = protobuf.FieldDescriptor();
|
||||||
|
WEEKCARDINFOREQUEST = protobuf.Descriptor();
|
||||||
|
WEEKCARDINFORESPONSE = protobuf.Descriptor();
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD = protobuf.FieldDescriptor();
|
||||||
|
WEEKCARDREWARDREQUEST = protobuf.Descriptor();
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
|
||||||
|
WEEKCARDREWARDRESPONSE = protobuf.Descriptor();
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE = protobuf.Descriptor();
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD = protobuf.FieldDescriptor();
|
||||||
|
|
||||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
|
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
|
||||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.CommitShejiActivityItemRequest.itemId"
|
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.CommitShejiActivityItemRequest.itemId"
|
||||||
|
@ -795,6 +804,84 @@ RIDINGSWARDINFORESPONSE.enum_types = {}
|
||||||
RIDINGSWARDINFORESPONSE.fields = {RIDINGSWARDINFORESPONSE_RECORDLSIT_FIELD, RIDINGSWARDINFORESPONSE_BETLIST_FIELD, RIDINGSWARDINFORESPONSE_LASTRANK_FIELD, RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD}
|
RIDINGSWARDINFORESPONSE.fields = {RIDINGSWARDINFORESPONSE_RECORDLSIT_FIELD, RIDINGSWARDINFORESPONSE_BETLIST_FIELD, RIDINGSWARDINFORESPONSE_LASTRANK_FIELD, RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD}
|
||||||
RIDINGSWARDINFORESPONSE.is_extendable = false
|
RIDINGSWARDINFORESPONSE.is_extendable = false
|
||||||
RIDINGSWARDINFORESPONSE.extensions = {}
|
RIDINGSWARDINFORESPONSE.extensions = {}
|
||||||
|
WEEKCARDINFOREQUEST.name = "WeekCardInfoRequest"
|
||||||
|
WEEKCARDINFOREQUEST.full_name = ".rpc.protocols.WeekCardInfoRequest"
|
||||||
|
WEEKCARDINFOREQUEST.nested_types = {}
|
||||||
|
WEEKCARDINFOREQUEST.enum_types = {}
|
||||||
|
WEEKCARDINFOREQUEST.fields = {}
|
||||||
|
WEEKCARDINFOREQUEST.is_extendable = false
|
||||||
|
WEEKCARDINFOREQUEST.extensions = {}
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.name = "allWeekCardInfo"
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.full_name = ".rpc.protocols.WeekCardInfoResponse.allWeekCardInfo"
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.number = 1
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.index = 0
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.label = 3
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.has_default_value = false
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.default_value = {}
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.message_type = CommonProto_pb.WEEKCARD
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.type = 11
|
||||||
|
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.cpp_type = 10
|
||||||
|
|
||||||
|
WEEKCARDINFORESPONSE.name = "WeekCardInfoResponse"
|
||||||
|
WEEKCARDINFORESPONSE.full_name = ".rpc.protocols.WeekCardInfoResponse"
|
||||||
|
WEEKCARDINFORESPONSE.nested_types = {}
|
||||||
|
WEEKCARDINFORESPONSE.enum_types = {}
|
||||||
|
WEEKCARDINFORESPONSE.fields = {WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD}
|
||||||
|
WEEKCARDINFORESPONSE.is_extendable = false
|
||||||
|
WEEKCARDINFORESPONSE.extensions = {}
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD.name = "id"
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD.full_name = ".rpc.protocols.WeekCardRewardRequest.id"
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD.number = 1
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD.index = 0
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD.label = 1
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD.has_default_value = false
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD.default_value = 0
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD.type = 5
|
||||||
|
WEEKCARDREWARDREQUEST_ID_FIELD.cpp_type = 1
|
||||||
|
|
||||||
|
WEEKCARDREWARDREQUEST.name = "WeekCardRewardRequest"
|
||||||
|
WEEKCARDREWARDREQUEST.full_name = ".rpc.protocols.WeekCardRewardRequest"
|
||||||
|
WEEKCARDREWARDREQUEST.nested_types = {}
|
||||||
|
WEEKCARDREWARDREQUEST.enum_types = {}
|
||||||
|
WEEKCARDREWARDREQUEST.fields = {WEEKCARDREWARDREQUEST_ID_FIELD}
|
||||||
|
WEEKCARDREWARDREQUEST.is_extendable = false
|
||||||
|
WEEKCARDREWARDREQUEST.extensions = {}
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.name = "drop"
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.WeekCardRewardResponse.drop"
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.number = 1
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.index = 0
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.label = 1
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.has_default_value = false
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.default_value = nil
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.type = 11
|
||||||
|
WEEKCARDREWARDRESPONSE_DROP_FIELD.cpp_type = 10
|
||||||
|
|
||||||
|
WEEKCARDREWARDRESPONSE.name = "WeekCardRewardResponse"
|
||||||
|
WEEKCARDREWARDRESPONSE.full_name = ".rpc.protocols.WeekCardRewardResponse"
|
||||||
|
WEEKCARDREWARDRESPONSE.nested_types = {}
|
||||||
|
WEEKCARDREWARDRESPONSE.enum_types = {}
|
||||||
|
WEEKCARDREWARDRESPONSE.fields = {WEEKCARDREWARDRESPONSE_DROP_FIELD}
|
||||||
|
WEEKCARDREWARDRESPONSE.is_extendable = false
|
||||||
|
WEEKCARDREWARDRESPONSE.extensions = {}
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.name = "allWeekCardInfo"
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.full_name = ".rpc.protocols.WeekCardIndicationInfoResponse.allWeekCardInfo"
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.number = 1
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.index = 0
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.label = 3
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.has_default_value = false
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.default_value = {}
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.message_type = CommonProto_pb.WEEKCARD
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.type = 11
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.cpp_type = 10
|
||||||
|
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE.name = "WeekCardIndicationInfoResponse"
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE.full_name = ".rpc.protocols.WeekCardIndicationInfoResponse"
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE.nested_types = {}
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE.enum_types = {}
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE.fields = {WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD}
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE.is_extendable = false
|
||||||
|
WEEKCARDINDICATIONINFORESPONSE.extensions = {}
|
||||||
|
|
||||||
CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST)
|
CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST)
|
||||||
CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
|
CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
|
||||||
|
@ -819,6 +906,11 @@ TasuilingxiaoRequest = protobuf.Message(TASUILINGXIAOREQUEST)
|
||||||
TasuilingxiaoResponse = protobuf.Message(TASUILINGXIAORESPONSE)
|
TasuilingxiaoResponse = protobuf.Message(TASUILINGXIAORESPONSE)
|
||||||
UpgradeGodTreeRequest = protobuf.Message(UPGRADEGODTREEREQUEST)
|
UpgradeGodTreeRequest = protobuf.Message(UPGRADEGODTREEREQUEST)
|
||||||
UpgradeGodTreeResponse = protobuf.Message(UPGRADEGODTREERESPONSE)
|
UpgradeGodTreeResponse = protobuf.Message(UPGRADEGODTREERESPONSE)
|
||||||
|
WeekCardIndicationInfoResponse = protobuf.Message(WEEKCARDINDICATIONINFORESPONSE)
|
||||||
|
WeekCardInfoRequest = protobuf.Message(WEEKCARDINFOREQUEST)
|
||||||
|
WeekCardInfoResponse = protobuf.Message(WEEKCARDINFORESPONSE)
|
||||||
|
WeekCardRewardRequest = protobuf.Message(WEEKCARDREWARDREQUEST)
|
||||||
|
WeekCardRewardResponse = protobuf.Message(WEEKCARDREWARDRESPONSE)
|
||||||
choiceDrawCardRequest = protobuf.Message(CHOICEDRAWCARDREQUEST)
|
choiceDrawCardRequest = protobuf.Message(CHOICEDRAWCARDREQUEST)
|
||||||
choiceDrawCardResponse = protobuf.Message(CHOICEDRAWCARDRESPONSE)
|
choiceDrawCardResponse = protobuf.Message(CHOICEDRAWCARDRESPONSE)
|
||||||
choiceHeroRewardRequest = protobuf.Message(CHOICEHEROREWARDREQUEST)
|
choiceHeroRewardRequest = protobuf.Message(CHOICEHEROREWARDREQUEST)
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -627,13 +627,6 @@ SEVENWORLDCHALLENGERESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||||
SEVENWORLDCHALLENGERESPONSE_TEAMBUFFIDS_FIELD = protobuf.FieldDescriptor();
|
SEVENWORLDCHALLENGERESPONSE_TEAMBUFFIDS_FIELD = protobuf.FieldDescriptor();
|
||||||
SEVENWORLDCHALLENGERESPONSE_RELICIDS_FIELD = protobuf.FieldDescriptor();
|
SEVENWORLDCHALLENGERESPONSE_RELICIDS_FIELD = protobuf.FieldDescriptor();
|
||||||
SEVENWORLDCHALLENGERESPONSE_ROUND_FIELD = protobuf.FieldDescriptor();
|
SEVENWORLDCHALLENGERESPONSE_ROUND_FIELD = protobuf.FieldDescriptor();
|
||||||
WEEKCARDINFOREQUEST = protobuf.Descriptor();
|
|
||||||
WEEKCARDINFORESPONSE = protobuf.Descriptor();
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD = protobuf.FieldDescriptor();
|
|
||||||
WEEKCARDREWARDREQUEST = protobuf.Descriptor();
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
|
|
||||||
WEEKCARDREWARDRESPONSE = protobuf.Descriptor();
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
|
||||||
|
|
||||||
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
|
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
|
||||||
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
|
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
|
||||||
|
@ -6354,66 +6347,6 @@ SEVENWORLDCHALLENGERESPONSE.enum_types = {}
|
||||||
SEVENWORLDCHALLENGERESPONSE.fields = {SEVENWORLDCHALLENGERESPONSE_RESULT_FIELD, SEVENWORLDCHALLENGERESPONSE_FIGHTDATA_FIELD, SEVENWORLDCHALLENGERESPONSE_DROP_FIELD, SEVENWORLDCHALLENGERESPONSE_TEAMBUFFIDS_FIELD, SEVENWORLDCHALLENGERESPONSE_RELICIDS_FIELD, SEVENWORLDCHALLENGERESPONSE_ROUND_FIELD}
|
SEVENWORLDCHALLENGERESPONSE.fields = {SEVENWORLDCHALLENGERESPONSE_RESULT_FIELD, SEVENWORLDCHALLENGERESPONSE_FIGHTDATA_FIELD, SEVENWORLDCHALLENGERESPONSE_DROP_FIELD, SEVENWORLDCHALLENGERESPONSE_TEAMBUFFIDS_FIELD, SEVENWORLDCHALLENGERESPONSE_RELICIDS_FIELD, SEVENWORLDCHALLENGERESPONSE_ROUND_FIELD}
|
||||||
SEVENWORLDCHALLENGERESPONSE.is_extendable = false
|
SEVENWORLDCHALLENGERESPONSE.is_extendable = false
|
||||||
SEVENWORLDCHALLENGERESPONSE.extensions = {}
|
SEVENWORLDCHALLENGERESPONSE.extensions = {}
|
||||||
WEEKCARDINFOREQUEST.name = "WeekCardInfoRequest"
|
|
||||||
WEEKCARDINFOREQUEST.full_name = ".rpc.protocols.WeekCardInfoRequest"
|
|
||||||
WEEKCARDINFOREQUEST.nested_types = {}
|
|
||||||
WEEKCARDINFOREQUEST.enum_types = {}
|
|
||||||
WEEKCARDINFOREQUEST.fields = {}
|
|
||||||
WEEKCARDINFOREQUEST.is_extendable = false
|
|
||||||
WEEKCARDINFOREQUEST.extensions = {}
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.name = "allWeekCardInfo"
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.full_name = ".rpc.protocols.WeekCardInfoResponse.allWeekCardInfo"
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.number = 1
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.index = 0
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.label = 3
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.has_default_value = false
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.default_value = {}
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.message_type = CommonProto_pb.WEEKCARD
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.type = 11
|
|
||||||
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.cpp_type = 10
|
|
||||||
|
|
||||||
WEEKCARDINFORESPONSE.name = "WeekCardInfoResponse"
|
|
||||||
WEEKCARDINFORESPONSE.full_name = ".rpc.protocols.WeekCardInfoResponse"
|
|
||||||
WEEKCARDINFORESPONSE.nested_types = {}
|
|
||||||
WEEKCARDINFORESPONSE.enum_types = {}
|
|
||||||
WEEKCARDINFORESPONSE.fields = {WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD}
|
|
||||||
WEEKCARDINFORESPONSE.is_extendable = false
|
|
||||||
WEEKCARDINFORESPONSE.extensions = {}
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD.name = "id"
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD.full_name = ".rpc.protocols.WeekCardRewardRequest.id"
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD.number = 1
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD.index = 0
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD.label = 1
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD.has_default_value = false
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD.default_value = 0
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD.type = 5
|
|
||||||
WEEKCARDREWARDREQUEST_ID_FIELD.cpp_type = 1
|
|
||||||
|
|
||||||
WEEKCARDREWARDREQUEST.name = "WeekCardRewardRequest"
|
|
||||||
WEEKCARDREWARDREQUEST.full_name = ".rpc.protocols.WeekCardRewardRequest"
|
|
||||||
WEEKCARDREWARDREQUEST.nested_types = {}
|
|
||||||
WEEKCARDREWARDREQUEST.enum_types = {}
|
|
||||||
WEEKCARDREWARDREQUEST.fields = {WEEKCARDREWARDREQUEST_ID_FIELD}
|
|
||||||
WEEKCARDREWARDREQUEST.is_extendable = false
|
|
||||||
WEEKCARDREWARDREQUEST.extensions = {}
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.name = "drop"
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.WeekCardRewardResponse.drop"
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.number = 1
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.index = 0
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.label = 1
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.has_default_value = false
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.default_value = nil
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.type = 11
|
|
||||||
WEEKCARDREWARDRESPONSE_DROP_FIELD.cpp_type = 10
|
|
||||||
|
|
||||||
WEEKCARDREWARDRESPONSE.name = "WeekCardRewardResponse"
|
|
||||||
WEEKCARDREWARDRESPONSE.full_name = ".rpc.protocols.WeekCardRewardResponse"
|
|
||||||
WEEKCARDREWARDRESPONSE.nested_types = {}
|
|
||||||
WEEKCARDREWARDRESPONSE.enum_types = {}
|
|
||||||
WEEKCARDREWARDRESPONSE.fields = {WEEKCARDREWARDRESPONSE_DROP_FIELD}
|
|
||||||
WEEKCARDREWARDRESPONSE.is_extendable = false
|
|
||||||
WEEKCARDREWARDRESPONSE.extensions = {}
|
|
||||||
|
|
||||||
ActiveUserMountRequest = protobuf.Message(ACTIVEUSERMOUNTREQUEST)
|
ActiveUserMountRequest = protobuf.Message(ACTIVEUSERMOUNTREQUEST)
|
||||||
ActiveUserMountResponse = protobuf.Message(ACTIVEUSERMOUNTRESPONSE)
|
ActiveUserMountResponse = protobuf.Message(ACTIVEUSERMOUNTRESPONSE)
|
||||||
|
@ -6602,10 +6535,6 @@ VipTakeBoxRequest = protobuf.Message(VIPTAKEBOXREQUEST)
|
||||||
VipTakeBoxResponse = protobuf.Message(VIPTAKEBOXRESPONSE)
|
VipTakeBoxResponse = protobuf.Message(VIPTAKEBOXRESPONSE)
|
||||||
VipTakeDilyRequest = protobuf.Message(VIPTAKEDILYREQUEST)
|
VipTakeDilyRequest = protobuf.Message(VIPTAKEDILYREQUEST)
|
||||||
VipTakeDilyResponse = protobuf.Message(VIPTAKEDILYRESPONSE)
|
VipTakeDilyResponse = protobuf.Message(VIPTAKEDILYRESPONSE)
|
||||||
WeekCardInfoRequest = protobuf.Message(WEEKCARDINFOREQUEST)
|
|
||||||
WeekCardInfoResponse = protobuf.Message(WEEKCARDINFORESPONSE)
|
|
||||||
WeekCardRewardRequest = protobuf.Message(WEEKCARDREWARDREQUEST)
|
|
||||||
WeekCardRewardResponse = protobuf.Message(WEEKCARDREWARDRESPONSE)
|
|
||||||
WelfareRedPacketPush = protobuf.Message(WELFAREREDPACKETPUSH)
|
WelfareRedPacketPush = protobuf.Message(WELFAREREDPACKETPUSH)
|
||||||
WelfareRedPacketRequest = protobuf.Message(WELFAREREDPACKETREQUEST)
|
WelfareRedPacketRequest = protobuf.Message(WELFAREREDPACKETREQUEST)
|
||||||
WelfareRedPacketSendRequest = protobuf.Message(WELFAREREDPACKETSENDREQUEST)
|
WelfareRedPacketSendRequest = protobuf.Message(WELFAREREDPACKETSENDREQUEST)
|
||||||
|
|
|
@ -135,7 +135,7 @@ function this.RegisterMessage(network)
|
||||||
-- 神印信息推送
|
-- 神印信息推送
|
||||||
socket:RegistNetMessage(MessageTypeProto_pb.PurpleMansionSealIndication, this.PracticeImprintData)
|
socket:RegistNetMessage(MessageTypeProto_pb.PurpleMansionSealIndication, this.PracticeImprintData)
|
||||||
-- Vip等级奖励信息推送
|
-- Vip等级奖励信息推送
|
||||||
socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
|
-- socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
|
||||||
-- --心愿抽卡信息推送
|
-- --心愿抽卡信息推送
|
||||||
socket:RegistNetMessage(MessageTypeProto_pb.wishDrawCardIndication, this.WishDrawCardInfoIndication)
|
socket:RegistNetMessage(MessageTypeProto_pb.wishDrawCardIndication, this.WishDrawCardInfoIndication)
|
||||||
-- --心愿抽卡信息推送
|
-- --心愿抽卡信息推送
|
||||||
|
@ -147,6 +147,9 @@ function this.RegisterMessage(network)
|
||||||
--七界试炼推送
|
--七界试炼推送
|
||||||
socket:RegistNetMessage(MessageTypeProto_pb.SevenWorldInfoIndication, this.SevenWorldInfoIndication)
|
socket:RegistNetMessage(MessageTypeProto_pb.SevenWorldInfoIndication, this.SevenWorldInfoIndication)
|
||||||
socket:RegistNetMessage(MessageTypeProto_pb.EQUIP_BOOK_INDICATION, this.EquipBookInfoIndication)
|
socket:RegistNetMessage(MessageTypeProto_pb.EQUIP_BOOK_INDICATION, this.EquipBookInfoIndication)
|
||||||
|
-- 周卡推送
|
||||||
|
socket:RegistNetMessage(MessageTypeProto_pb.WeekCardIndicationInfoResponse, this.WeekCardIndication)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.EquipBookInfoIndication(buff)
|
function this.EquipBookInfoIndication(buff)
|
||||||
|
@ -1043,4 +1046,11 @@ function this.SevenWorldInfoIndication(buffer)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.WeekCardIndication(buffer)
|
||||||
|
local data = buffer:DataByte()
|
||||||
|
local msg = ActivityProto_pb.WeekCardIndicationInfoResponse()
|
||||||
|
msg:ParseFromString(data)
|
||||||
|
WeekCardManager.UpdateAllWeekCard(msg)
|
||||||
|
end
|
||||||
|
|
||||||
return this
|
return this
|
|
@ -6022,11 +6022,11 @@ end
|
||||||
|
|
||||||
-- 周卡初始化数据
|
-- 周卡初始化数据
|
||||||
function NetManager.GetWeekCardData(func)
|
function NetManager.GetWeekCardData(func)
|
||||||
local data = PlayerInfoProto_pb.WeekCardInfoRequest()
|
local data = ActivityProto_pb.WeekCardInfoRequest()
|
||||||
local msg = data:SerializeToString()
|
local msg = data:SerializeToString()
|
||||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.WeekCardInfoRequest, MessageTypeProto_pb.WeekCardInfoResponse, msg, function(buffer)
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.WeekCardInfoRequest, MessageTypeProto_pb.WeekCardInfoResponse, msg, function(buffer)
|
||||||
local data = buffer:DataByte()
|
local data = buffer:DataByte()
|
||||||
local msg = PlayerInfoProto_pb.WeekCardInfoResponse()
|
local msg = ActivityProto_pb.WeekCardInfoResponse()
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
if func then
|
if func then
|
||||||
func(msg)
|
func(msg)
|
||||||
|
@ -6035,12 +6035,12 @@ function NetManager.GetWeekCardData(func)
|
||||||
end
|
end
|
||||||
-- 请求领取周卡奖励
|
-- 请求领取周卡奖励
|
||||||
function NetManager.GetWeekCardReward(id, func)
|
function NetManager.GetWeekCardReward(id, func)
|
||||||
local data = PlayerInfoProto_pb.WeekCardRewardRequest()
|
local data = ActivityProto_pb.WeekCardRewardRequest()
|
||||||
data.id = id
|
data.id = id
|
||||||
local msg = data:SerializeToString()
|
local msg = data:SerializeToString()
|
||||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.WeekCardRewardRequest, MessageTypeProto_pb.WeekCardRewardResponse, msg, function(buffer)
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.WeekCardRewardRequest, MessageTypeProto_pb.WeekCardRewardResponse, msg, function(buffer)
|
||||||
local data = buffer:DataByte()
|
local data = buffer:DataByte()
|
||||||
local msg = PlayerInfoProto_pb.WeekCardRewardResponse()
|
local msg = ActivityProto_pb.WeekCardRewardResponse()
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
if func then
|
if func then
|
||||||
func(msg)
|
func(msg)
|
||||||
|
|
|
@ -4,22 +4,28 @@ local this = WeekCardManager
|
||||||
--初始化月卡数据
|
--初始化月卡数据
|
||||||
local _WeekCardData = {}
|
local _WeekCardData = {}
|
||||||
function this.InitWeekCardData()
|
function this.InitWeekCardData()
|
||||||
_WeekCardData = {}
|
|
||||||
NetManager.GetWeekCardData(function(msg)
|
NetManager.GetWeekCardData(function(msg)
|
||||||
--LogError("周卡信息初始化 "..#msg.allWeekCardInfo)
|
this.UpdateAllWeekCard(msg)
|
||||||
for i, data in ipairs(msg.allWeekCardInfo) do
|
|
||||||
this.UpdateWeekCardData(data)
|
|
||||||
end
|
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
-- 更新所有周卡数据
|
||||||
|
function this.UpdateAllWeekCard(msg)
|
||||||
|
_WeekCardData = {}
|
||||||
|
LogRed("周卡信息初始化 "..#msg.allWeekCardInfo)
|
||||||
|
for i, data in ipairs(msg.allWeekCardInfo) do
|
||||||
|
this.UpdateWeekCardData(data)
|
||||||
|
end
|
||||||
|
end
|
||||||
-- 更新月卡数据
|
-- 更新月卡数据
|
||||||
function this.UpdateWeekCardData(data)
|
function this.UpdateWeekCardData(data)
|
||||||
-- LogError("月卡信息更新 "..data.id.." "..data.isBuy.." "..data.leaveGetRewardDays)
|
LogRed("月卡信息更新 "..data.id.." "..tostring(data.isBuy).." "..data.leaveGetRewardDays)
|
||||||
local week = {}
|
local week = {}
|
||||||
week.id = data.id
|
week.id = data.id
|
||||||
week.isBuy = data.isBuy
|
week.isBuy = data.isBuy
|
||||||
week.leaveGetRewardDays = data.leaveGetRewardDays
|
week.leaveGetRewardDays = data.leaveGetRewardDays
|
||||||
_WeekCardData[data.id] = week
|
_WeekCardData[data.id] = week
|
||||||
|
-- 检测红点显示
|
||||||
|
CheckRedPointStatus(RedPointType.WeekCardReward)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 请求获取周卡数据
|
-- 请求获取周卡数据
|
||||||
|
@ -29,7 +35,16 @@ end
|
||||||
|
|
||||||
-- 获取周卡数据,以数组的形式
|
-- 获取周卡数据,以数组的形式
|
||||||
function this.GetWeekCardDataArray()
|
function this.GetWeekCardDataArray()
|
||||||
|
local list = {}
|
||||||
|
if _WeekCardData then
|
||||||
|
for id, data in pairs(_WeekCardData) do
|
||||||
|
table.insert(list, data)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
table.sort(list, function(a, b)
|
||||||
|
return a.id < b.id
|
||||||
|
end)
|
||||||
|
return list
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 请求领取周卡奖励
|
-- 请求领取周卡奖励
|
||||||
|
@ -45,7 +60,7 @@ function this.RequestGetWeekCardReward(id, func)
|
||||||
end
|
end
|
||||||
-- 请求领取
|
-- 请求领取
|
||||||
NetManager.GetWeekCardReward(id, function(msg)
|
NetManager.GetWeekCardReward(id, function(msg)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1)
|
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drops, 1)
|
||||||
-- 累计时间归0
|
-- 累计时间归0
|
||||||
data.leaveGetRewardDays = 0
|
data.leaveGetRewardDays = 0
|
||||||
this.UpdateWeekCardData(data)
|
this.UpdateWeekCardData(data)
|
||||||
|
@ -54,4 +69,24 @@ function this.RequestGetWeekCardReward(id, func)
|
||||||
func()
|
func()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 检测是否进入过周卡界面
|
||||||
|
function this.CheckRedOpen()
|
||||||
|
local isCheck = PlayerPrefs.GetInt("IsCheckWeekCard_"..PlayerManager.uid, 0)
|
||||||
|
if isCheck == 1 then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
-- 是否有可以领取的红点
|
||||||
|
function this.CheckRedReward()
|
||||||
|
if _WeekCardData then
|
||||||
|
for id, data in pairs(_WeekCardData) do
|
||||||
|
if data.isBuy and data.leaveGetRewardDays > 0 then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return false
|
||||||
end
|
end
|
|
@ -65,6 +65,11 @@ function WeekCardPage:OnShow(_sortingOrder)
|
||||||
self.gameObject:SetActive(true)
|
self.gameObject:SetActive(true)
|
||||||
sortingOrder = _sortingOrder
|
sortingOrder = _sortingOrder
|
||||||
self:RefreshShow()
|
self:RefreshShow()
|
||||||
|
|
||||||
|
-- 查看周卡界面刷新红点
|
||||||
|
PlayerPrefs.SetInt("IsCheckWeekCard_"..PlayerManager.uid, 1)
|
||||||
|
CheckRedPointStatus(RedPointType.WeekCardOpen)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 妖晶数量显示
|
-- 妖晶数量显示
|
||||||
|
@ -88,9 +93,10 @@ function WeekCardPage:SetCardShow(index, data)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- 背景
|
-- 背景
|
||||||
pre.bg.sprite = self.spLoader.LoadSprite(config.BgImage)
|
pre.bg.sprite = self.spLoader:LoadSprite(config.BgImage)
|
||||||
-- 物品名称
|
-- 物品名称
|
||||||
pre.name.sprite = self.spLoader.LoadSprite(config.TypeImage)
|
pre.name.sprite = self.spLoader:LoadSprite(config.TypeImage)
|
||||||
|
pre.name:SetNativeSize()
|
||||||
-- 每日奖励数量
|
-- 每日奖励数量
|
||||||
local itemId = 0
|
local itemId = 0
|
||||||
local dayNum = 0
|
local dayNum = 0
|
||||||
|
@ -120,7 +126,7 @@ function WeekCardPage:SetCardShow(index, data)
|
||||||
|
|
||||||
-- 按钮状态
|
-- 按钮状态
|
||||||
if data.isBuy then
|
if data.isBuy then
|
||||||
if continueDay > 0 then
|
if data.leaveGetRewardDays > 0 then
|
||||||
-- 领取奖励
|
-- 领取奖励
|
||||||
pre.btnText.text = "领取"
|
pre.btnText.text = "领取"
|
||||||
pre.red:SetActive(true)
|
pre.red:SetActive(true)
|
||||||
|
|
|
@ -319,6 +319,12 @@ function this.InitRedPointAllRelate()
|
||||||
RPData:SetParent(RedPointType.playerSkill2,RedPointType.Practice)
|
RPData:SetParent(RedPointType.playerSkill2,RedPointType.Practice)
|
||||||
RPData:SetParent(RedPointType.playerSkill3,RedPointType.Practice)
|
RPData:SetParent(RedPointType.playerSkill3,RedPointType.Practice)
|
||||||
RPData:SetParent(RedPointType.playerSkill4,RedPointType.Practice)
|
RPData:SetParent(RedPointType.playerSkill4,RedPointType.Practice)
|
||||||
|
|
||||||
|
-- 周卡
|
||||||
|
RPData:SetParent(RedPointType.WeekCardOpen,RedPointType.WeekCard)
|
||||||
|
RPData:SetParent(RedPointType.WeekCardReward,RedPointType.WeekCard)
|
||||||
|
|
||||||
|
|
||||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
|
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
|
||||||
if v.RpType > 0 and v.RpTypeParent > 0 then
|
if v.RpType > 0 and v.RpTypeParent > 0 then
|
||||||
RPData:SetParent(v.RpType,v.RpTypeParent)
|
RPData:SetParent(v.RpType,v.RpTypeParent)
|
||||||
|
@ -602,6 +608,10 @@ function this.RegisterRedCheckFunc()
|
||||||
RPData:AddCheckFunc(RedPointType.playerSkill4, PracticeManager.CheckPlayerSkillRed)
|
RPData:AddCheckFunc(RedPointType.playerSkill4, PracticeManager.CheckPlayerSkillRed)
|
||||||
--三界降魔
|
--三界降魔
|
||||||
RPData:AddCheckFunc(RedPointType.DemonSlayerNew, CommonActPageManager.DemonSlayerNewRedCheck)
|
RPData:AddCheckFunc(RedPointType.DemonSlayerNew, CommonActPageManager.DemonSlayerNewRedCheck)
|
||||||
|
|
||||||
|
-- 周卡
|
||||||
|
RPData:AddCheckFunc(RedPointType.WeekCardOpen, WeekCardManager.CheckRedOpen, FUNCTION_OPEN_TYPE.WEEK_CARD)
|
||||||
|
RPData:AddCheckFunc(RedPointType.WeekCardReward, WeekCardManager.CheckRedReward, FUNCTION_OPEN_TYPE.WEEK_CARD)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 向红点绑定物体
|
-- 向红点绑定物体
|
||||||
|
|
Loading…
Reference in New Issue