Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-05-24 14:58:09 +08:00
commit 0332366e9d
7 changed files with 915 additions and 736 deletions

View File

@ -77,7 +77,6 @@ HERO_LOCKSTATE_FIELD = protobuf.FieldDescriptor();
HERO_JEWELS_FIELD = protobuf.FieldDescriptor(); HERO_JEWELS_FIELD = protobuf.FieldDescriptor();
HERO_CREATETYPE_FIELD = protobuf.FieldDescriptor(); HERO_CREATETYPE_FIELD = protobuf.FieldDescriptor();
HERO_CHANGEID_FIELD = protobuf.FieldDescriptor(); HERO_CHANGEID_FIELD = protobuf.FieldDescriptor();
HERO_SEALIDLIST_FIELD = protobuf.FieldDescriptor();
POKEMONINFO = protobuf.Descriptor(); POKEMONINFO = protobuf.Descriptor();
POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor(); POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor(); POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor();
@ -442,6 +441,10 @@ EXPERTINFO_SEX_FIELD = protobuf.FieldDescriptor();
SIGNININFO = protobuf.Descriptor(); SIGNININFO = protobuf.Descriptor();
SIGNININFO_DAYS_FIELD = protobuf.FieldDescriptor(); SIGNININFO_DAYS_FIELD = protobuf.FieldDescriptor();
SIGNININFO_STATE_FIELD = protobuf.FieldDescriptor(); SIGNININFO_STATE_FIELD = protobuf.FieldDescriptor();
PURPLESEALSHOWINFO = protobuf.Descriptor();
PURPLESEALSHOWINFO_ID_FIELD = protobuf.FieldDescriptor();
PURPLESEALSHOWINFO_TYPE_FIELD = protobuf.FieldDescriptor();
PURPLESEALSHOWINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO = protobuf.Descriptor(); TEAMSIMPLEINFO = protobuf.Descriptor();
TEAMSIMPLEINFO_HEROID_FIELD = protobuf.FieldDescriptor(); TEAMSIMPLEINFO_HEROID_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_HEROTID_FIELD = protobuf.FieldDescriptor(); TEAMSIMPLEINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
@ -454,6 +457,7 @@ TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_TOTALFORCE_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_TOTALFORCE_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_REMAINHP_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_REMAINHP_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_SEALSHOW_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO = protobuf.Descriptor(); TEAMONEINFO = protobuf.Descriptor();
TEAMONEINFO_UID_FIELD = protobuf.FieldDescriptor(); TEAMONEINFO_UID_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); TEAMONEINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
@ -654,6 +658,9 @@ USERTITLEINFO_OVERTIME_FIELD = protobuf.FieldDescriptor();
USERMOUNTINFO = protobuf.Descriptor(); USERMOUNTINFO = protobuf.Descriptor();
USERMOUNTINFO_MOUNTID_FIELD = protobuf.FieldDescriptor(); USERMOUNTINFO_MOUNTID_FIELD = protobuf.FieldDescriptor();
USERMOUNTINFO_OVERTIME_FIELD = protobuf.FieldDescriptor(); USERMOUNTINFO_OVERTIME_FIELD = protobuf.FieldDescriptor();
WELFAREREDPACKET = protobuf.Descriptor();
WELFAREREDPACKET_ID_FIELD = protobuf.FieldDescriptor();
WELFAREREDPACKET_NUM_FIELD = protobuf.FieldDescriptor();
HARDSTAGEPLAYERINFO = protobuf.Descriptor(); HARDSTAGEPLAYERINFO = protobuf.Descriptor();
HARDSTAGEPLAYERINFO_UID_FIELD = protobuf.FieldDescriptor(); HARDSTAGEPLAYERINFO_UID_FIELD = protobuf.FieldDescriptor();
HARDSTAGEPLAYERINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); HARDSTAGEPLAYERINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
@ -762,8 +769,8 @@ PLAYER_EXP_FIELD.index = 3
PLAYER_EXP_FIELD.label = 1 PLAYER_EXP_FIELD.label = 1
PLAYER_EXP_FIELD.has_default_value = false PLAYER_EXP_FIELD.has_default_value = false
PLAYER_EXP_FIELD.default_value = 0 PLAYER_EXP_FIELD.default_value = 0
PLAYER_EXP_FIELD.type = 5 PLAYER_EXP_FIELD.type = 3
PLAYER_EXP_FIELD.cpp_type = 1 PLAYER_EXP_FIELD.cpp_type = 2
PLAYER_VIPLEVEL_FIELD.name = "vipLevel" PLAYER_VIPLEVEL_FIELD.name = "vipLevel"
PLAYER_VIPLEVEL_FIELD.full_name = ".rpc.protocols.Player.vipLevel" PLAYER_VIPLEVEL_FIELD.full_name = ".rpc.protocols.Player.vipLevel"
@ -1397,21 +1404,11 @@ HERO_CHANGEID_FIELD.default_value = 0
HERO_CHANGEID_FIELD.type = 5 HERO_CHANGEID_FIELD.type = 5
HERO_CHANGEID_FIELD.cpp_type = 1 HERO_CHANGEID_FIELD.cpp_type = 1
HERO_SEALIDLIST_FIELD.name = "sealIdList"
HERO_SEALIDLIST_FIELD.full_name = ".rpc.protocols.Hero.sealIdList"
HERO_SEALIDLIST_FIELD.number = 17
HERO_SEALIDLIST_FIELD.index = 15
HERO_SEALIDLIST_FIELD.label = 3
HERO_SEALIDLIST_FIELD.has_default_value = false
HERO_SEALIDLIST_FIELD.default_value = {}
HERO_SEALIDLIST_FIELD.type = 5
HERO_SEALIDLIST_FIELD.cpp_type = 1
HERO.name = "Hero" HERO.name = "Hero"
HERO.full_name = ".rpc.protocols.Hero" HERO.full_name = ".rpc.protocols.Hero"
HERO.nested_types = {} HERO.nested_types = {}
HERO.enum_types = {} HERO.enum_types = {}
HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD, HERO_SEALIDLIST_FIELD} HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD}
HERO.is_extendable = false HERO.is_extendable = false
HERO.extensions = {} HERO.extensions = {}
POKEMONINFO_TEMPID_FIELD.name = "tempId" POKEMONINFO_TEMPID_FIELD.name = "tempId"
@ -4887,6 +4884,43 @@ SIGNININFO.enum_types = {}
SIGNININFO.fields = {SIGNININFO_DAYS_FIELD, SIGNININFO_STATE_FIELD} SIGNININFO.fields = {SIGNININFO_DAYS_FIELD, SIGNININFO_STATE_FIELD}
SIGNININFO.is_extendable = false SIGNININFO.is_extendable = false
SIGNININFO.extensions = {} SIGNININFO.extensions = {}
PURPLESEALSHOWINFO_ID_FIELD.name = "id"
PURPLESEALSHOWINFO_ID_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.id"
PURPLESEALSHOWINFO_ID_FIELD.number = 1
PURPLESEALSHOWINFO_ID_FIELD.index = 0
PURPLESEALSHOWINFO_ID_FIELD.label = 1
PURPLESEALSHOWINFO_ID_FIELD.has_default_value = false
PURPLESEALSHOWINFO_ID_FIELD.default_value = 0
PURPLESEALSHOWINFO_ID_FIELD.type = 5
PURPLESEALSHOWINFO_ID_FIELD.cpp_type = 1
PURPLESEALSHOWINFO_TYPE_FIELD.name = "type"
PURPLESEALSHOWINFO_TYPE_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.type"
PURPLESEALSHOWINFO_TYPE_FIELD.number = 2
PURPLESEALSHOWINFO_TYPE_FIELD.index = 1
PURPLESEALSHOWINFO_TYPE_FIELD.label = 1
PURPLESEALSHOWINFO_TYPE_FIELD.has_default_value = false
PURPLESEALSHOWINFO_TYPE_FIELD.default_value = 0
PURPLESEALSHOWINFO_TYPE_FIELD.type = 5
PURPLESEALSHOWINFO_TYPE_FIELD.cpp_type = 1
PURPLESEALSHOWINFO_HEROTID_FIELD.name = "heroTId"
PURPLESEALSHOWINFO_HEROTID_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.heroTId"
PURPLESEALSHOWINFO_HEROTID_FIELD.number = 3
PURPLESEALSHOWINFO_HEROTID_FIELD.index = 2
PURPLESEALSHOWINFO_HEROTID_FIELD.label = 1
PURPLESEALSHOWINFO_HEROTID_FIELD.has_default_value = false
PURPLESEALSHOWINFO_HEROTID_FIELD.default_value = 0
PURPLESEALSHOWINFO_HEROTID_FIELD.type = 5
PURPLESEALSHOWINFO_HEROTID_FIELD.cpp_type = 1
PURPLESEALSHOWINFO.name = "PurpleSealShowInfo"
PURPLESEALSHOWINFO.full_name = ".rpc.protocols.PurpleSealShowInfo"
PURPLESEALSHOWINFO.nested_types = {}
PURPLESEALSHOWINFO.enum_types = {}
PURPLESEALSHOWINFO.fields = {PURPLESEALSHOWINFO_ID_FIELD, PURPLESEALSHOWINFO_TYPE_FIELD, PURPLESEALSHOWINFO_HEROTID_FIELD}
PURPLESEALSHOWINFO.is_extendable = false
PURPLESEALSHOWINFO.extensions = {}
TEAMSIMPLEINFO_HEROID_FIELD.name = "heroid" TEAMSIMPLEINFO_HEROID_FIELD.name = "heroid"
TEAMSIMPLEINFO_HEROID_FIELD.full_name = ".rpc.protocols.TeamSimpleInfo.heroid" TEAMSIMPLEINFO_HEROID_FIELD.full_name = ".rpc.protocols.TeamSimpleInfo.heroid"
TEAMSIMPLEINFO_HEROID_FIELD.number = 1 TEAMSIMPLEINFO_HEROID_FIELD.number = 1
@ -4996,11 +5030,22 @@ TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {}
TEAMONETEAMINFO_REMAINHP_FIELD.type = 3 TEAMONETEAMINFO_REMAINHP_FIELD.type = 3
TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2 TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2
TEAMONETEAMINFO_SEALSHOW_FIELD.name = "sealShow"
TEAMONETEAMINFO_SEALSHOW_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sealShow"
TEAMONETEAMINFO_SEALSHOW_FIELD.number = 5
TEAMONETEAMINFO_SEALSHOW_FIELD.index = 4
TEAMONETEAMINFO_SEALSHOW_FIELD.label = 3
TEAMONETEAMINFO_SEALSHOW_FIELD.has_default_value = false
TEAMONETEAMINFO_SEALSHOW_FIELD.default_value = {}
TEAMONETEAMINFO_SEALSHOW_FIELD.message_type = PURPLESEALSHOWINFO
TEAMONETEAMINFO_SEALSHOW_FIELD.type = 11
TEAMONETEAMINFO_SEALSHOW_FIELD.cpp_type = 10
TEAMONETEAMINFO.name = "TeamOneTeamInfo" TEAMONETEAMINFO.name = "TeamOneTeamInfo"
TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo" TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo"
TEAMONETEAMINFO.nested_types = {} TEAMONETEAMINFO.nested_types = {}
TEAMONETEAMINFO.enum_types = {} TEAMONETEAMINFO.enum_types = {}
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD} TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD}
TEAMONETEAMINFO.is_extendable = false TEAMONETEAMINFO.is_extendable = false
TEAMONETEAMINFO.extensions = {} TEAMONETEAMINFO.extensions = {}
TEAMONEINFO_UID_FIELD.name = "uid" TEAMONEINFO_UID_FIELD.name = "uid"
@ -6904,6 +6949,33 @@ USERMOUNTINFO.enum_types = {}
USERMOUNTINFO.fields = {USERMOUNTINFO_MOUNTID_FIELD, USERMOUNTINFO_OVERTIME_FIELD} USERMOUNTINFO.fields = {USERMOUNTINFO_MOUNTID_FIELD, USERMOUNTINFO_OVERTIME_FIELD}
USERMOUNTINFO.is_extendable = false USERMOUNTINFO.is_extendable = false
USERMOUNTINFO.extensions = {} USERMOUNTINFO.extensions = {}
WELFAREREDPACKET_ID_FIELD.name = "id"
WELFAREREDPACKET_ID_FIELD.full_name = ".rpc.protocols.WelfareRedPacket.id"
WELFAREREDPACKET_ID_FIELD.number = 1
WELFAREREDPACKET_ID_FIELD.index = 0
WELFAREREDPACKET_ID_FIELD.label = 1
WELFAREREDPACKET_ID_FIELD.has_default_value = false
WELFAREREDPACKET_ID_FIELD.default_value = 0
WELFAREREDPACKET_ID_FIELD.type = 5
WELFAREREDPACKET_ID_FIELD.cpp_type = 1
WELFAREREDPACKET_NUM_FIELD.name = "num"
WELFAREREDPACKET_NUM_FIELD.full_name = ".rpc.protocols.WelfareRedPacket.num"
WELFAREREDPACKET_NUM_FIELD.number = 2
WELFAREREDPACKET_NUM_FIELD.index = 1
WELFAREREDPACKET_NUM_FIELD.label = 1
WELFAREREDPACKET_NUM_FIELD.has_default_value = false
WELFAREREDPACKET_NUM_FIELD.default_value = 0
WELFAREREDPACKET_NUM_FIELD.type = 5
WELFAREREDPACKET_NUM_FIELD.cpp_type = 1
WELFAREREDPACKET.name = "WelfareRedPacket"
WELFAREREDPACKET.full_name = ".rpc.protocols.WelfareRedPacket"
WELFAREREDPACKET.nested_types = {}
WELFAREREDPACKET.enum_types = {}
WELFAREREDPACKET.fields = {WELFAREREDPACKET_ID_FIELD, WELFAREREDPACKET_NUM_FIELD}
WELFAREREDPACKET.is_extendable = false
WELFAREREDPACKET.extensions = {}
HARDSTAGEPLAYERINFO_UID_FIELD.name = "uid" HARDSTAGEPLAYERINFO_UID_FIELD.name = "uid"
HARDSTAGEPLAYERINFO_UID_FIELD.full_name = ".rpc.protocols.HardStagePlayerInfo.uid" HARDSTAGEPLAYERINFO_UID_FIELD.full_name = ".rpc.protocols.HardStagePlayerInfo.uid"
HARDSTAGEPLAYERINFO_UID_FIELD.number = 1 HARDSTAGEPLAYERINFO_UID_FIELD.number = 1
@ -7297,6 +7369,7 @@ Pokemoncomonpent = protobuf.Message(POKEMONCOMONPENT)
PosMineral = protobuf.Message(POSMINERAL) PosMineral = protobuf.Message(POSMINERAL)
Privilege = protobuf.Message(PRIVILEGE) Privilege = protobuf.Message(PRIVILEGE)
PurpleMansionSeal = protobuf.Message(PURPLEMANSIONSEAL) PurpleMansionSeal = protobuf.Message(PURPLEMANSIONSEAL)
PurpleSealShowInfo = protobuf.Message(PURPLESEALSHOWINFO)
QuestionOptions = protobuf.Message(QUESTIONOPTIONS) QuestionOptions = protobuf.Message(QUESTIONOPTIONS)
RankInfo = protobuf.Message(RANKINFO) RankInfo = protobuf.Message(RANKINFO)
RedOneDetail = protobuf.Message(REDONEDETAIL) RedOneDetail = protobuf.Message(REDONEDETAIL)
@ -7332,6 +7405,7 @@ UserSkinInfo = protobuf.Message(USERSKININFO)
UserTitleInfo = protobuf.Message(USERTITLEINFO) UserTitleInfo = protobuf.Message(USERTITLEINFO)
ViewHeroInfo = protobuf.Message(VIEWHEROINFO) ViewHeroInfo = protobuf.Message(VIEWHEROINFO)
VipBaseInfo = protobuf.Message(VIPBASEINFO) VipBaseInfo = protobuf.Message(VIPBASEINFO)
WelfareRedPacket = protobuf.Message(WELFAREREDPACKET)
WorkShopBaseInfo = protobuf.Message(WORKSHOPBASEINFO) WorkShopBaseInfo = protobuf.Message(WORKSHOPBASEINFO)
WorkShopUnLockInfo = protobuf.Message(WORKSHOPUNLOCKINFO) WorkShopUnLockInfo = protobuf.Message(WORKSHOPUNLOCKINFO)
blessReward = protobuf.Message(BLESSREWARD) blessReward = protobuf.Message(BLESSREWARD)

File diff suppressed because one or more lines are too long

View File

@ -66,6 +66,7 @@ GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_USERSKINLIST_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_USERSKINLIST_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_USERTITLELIST_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_USERTITLELIST_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
GETPLAYERINFORESPONSE_SEALLIST_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_SEALLIST_FIELD = protobuf.FieldDescriptor();
GETITEMINFOREQUEST = protobuf.Descriptor(); GETITEMINFOREQUEST = protobuf.Descriptor();
@ -506,6 +507,12 @@ EQUIPUPLEVELRESPONSE_RESULT_FIELD = protobuf.FieldDescriptor();
EQUIPUPLEVELRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); EQUIPUPLEVELRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
PUSHWELFARERESPONSE = protobuf.Descriptor(); PUSHWELFARERESPONSE = protobuf.Descriptor();
PUSHWELFARERESPONSE_ID_FIELD = protobuf.FieldDescriptor(); PUSHWELFARERESPONSE_ID_FIELD = protobuf.FieldDescriptor();
WELFAREREDPACKETPUSH = protobuf.Descriptor();
WELFAREREDPACKETPUSH_REDPACKET_FIELD = protobuf.FieldDescriptor();
WELFAREREDPACKETSENDREQUEST = protobuf.Descriptor();
WELFAREREDPACKETSENDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
WELFAREREDPACKETSENDRESPONSE = protobuf.Descriptor();
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD = protobuf.FieldDescriptor();
HARDSTAGEREQUEST = protobuf.Descriptor(); HARDSTAGEREQUEST = protobuf.Descriptor();
HARDSTAGERESPONSE = protobuf.Descriptor(); HARDSTAGERESPONSE = protobuf.Descriptor();
HARDSTAGERESPONSE_INFO_FIELD = protobuf.FieldDescriptor(); HARDSTAGERESPONSE_INFO_FIELD = protobuf.FieldDescriptor();
@ -1146,10 +1153,20 @@ GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD.message_type = CommonProto_pb.USERMOUN
GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD.type = 11 GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD.type = 11
GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD.cpp_type = 10 GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD.cpp_type = 10
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.name = "dailyredpack"
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.dailyredpack"
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.number = 40
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.index = 39
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.label = 1
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.has_default_value = false
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.default_value = 0
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.type = 5
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.cpp_type = 1
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.name = "practiceLevel" GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.name = "practiceLevel"
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.practiceLevel" GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.practiceLevel"
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.number = 40 GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.number = 41
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.index = 39 GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.index = 40
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.label = 1 GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.label = 1
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.has_default_value = false GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.has_default_value = false
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.default_value = 0 GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.default_value = 0
@ -1158,8 +1175,8 @@ GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.cpp_type = 1
GETPLAYERINFORESPONSE_SEALLIST_FIELD.name = "sealList" GETPLAYERINFORESPONSE_SEALLIST_FIELD.name = "sealList"
GETPLAYERINFORESPONSE_SEALLIST_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.sealList" GETPLAYERINFORESPONSE_SEALLIST_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.sealList"
GETPLAYERINFORESPONSE_SEALLIST_FIELD.number = 41 GETPLAYERINFORESPONSE_SEALLIST_FIELD.number = 42
GETPLAYERINFORESPONSE_SEALLIST_FIELD.index = 40 GETPLAYERINFORESPONSE_SEALLIST_FIELD.index = 41
GETPLAYERINFORESPONSE_SEALLIST_FIELD.label = 3 GETPLAYERINFORESPONSE_SEALLIST_FIELD.label = 3
GETPLAYERINFORESPONSE_SEALLIST_FIELD.has_default_value = false GETPLAYERINFORESPONSE_SEALLIST_FIELD.has_default_value = false
GETPLAYERINFORESPONSE_SEALLIST_FIELD.default_value = {} GETPLAYERINFORESPONSE_SEALLIST_FIELD.default_value = {}
@ -1171,7 +1188,7 @@ GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse" GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse"
GETPLAYERINFORESPONSE.nested_types = {} GETPLAYERINFORESPONSE.nested_types = {}
GETPLAYERINFORESPONSE.enum_types = {} GETPLAYERINFORESPONSE.enum_types = {}
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD} GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD}
GETPLAYERINFORESPONSE.is_extendable = false GETPLAYERINFORESPONSE.is_extendable = false
GETPLAYERINFORESPONSE.extensions = {} GETPLAYERINFORESPONSE.extensions = {}
GETITEMINFOREQUEST_INDEX_FIELD.name = "index" GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
@ -3530,8 +3547,8 @@ UPDATEUSEREXPINDICAITON_EXP_FIELD.index = 1
UPDATEUSEREXPINDICAITON_EXP_FIELD.label = 1 UPDATEUSEREXPINDICAITON_EXP_FIELD.label = 1
UPDATEUSEREXPINDICAITON_EXP_FIELD.has_default_value = false UPDATEUSEREXPINDICAITON_EXP_FIELD.has_default_value = false
UPDATEUSEREXPINDICAITON_EXP_FIELD.default_value = 0 UPDATEUSEREXPINDICAITON_EXP_FIELD.default_value = 0
UPDATEUSEREXPINDICAITON_EXP_FIELD.type = 5 UPDATEUSEREXPINDICAITON_EXP_FIELD.type = 3
UPDATEUSEREXPINDICAITON_EXP_FIELD.cpp_type = 1 UPDATEUSEREXPINDICAITON_EXP_FIELD.cpp_type = 2
UPDATEUSEREXPINDICAITON.name = "UpdateUserExpIndicaiton" UPDATEUSEREXPINDICAITON.name = "UpdateUserExpIndicaiton"
UPDATEUSEREXPINDICAITON.full_name = ".rpc.protocols.UpdateUserExpIndicaiton" UPDATEUSEREXPINDICAITON.full_name = ".rpc.protocols.UpdateUserExpIndicaiton"
@ -5152,6 +5169,59 @@ PUSHWELFARERESPONSE.enum_types = {}
PUSHWELFARERESPONSE.fields = {PUSHWELFARERESPONSE_ID_FIELD} PUSHWELFARERESPONSE.fields = {PUSHWELFARERESPONSE_ID_FIELD}
PUSHWELFARERESPONSE.is_extendable = false PUSHWELFARERESPONSE.is_extendable = false
PUSHWELFARERESPONSE.extensions = {} PUSHWELFARERESPONSE.extensions = {}
WELFAREREDPACKETPUSH_REDPACKET_FIELD.name = "redpacket"
WELFAREREDPACKETPUSH_REDPACKET_FIELD.full_name = ".rpc.protocols.WelfareRedPacketPush.redpacket"
WELFAREREDPACKETPUSH_REDPACKET_FIELD.number = 1
WELFAREREDPACKETPUSH_REDPACKET_FIELD.index = 0
WELFAREREDPACKETPUSH_REDPACKET_FIELD.label = 3
WELFAREREDPACKETPUSH_REDPACKET_FIELD.has_default_value = false
WELFAREREDPACKETPUSH_REDPACKET_FIELD.default_value = {}
WELFAREREDPACKETPUSH_REDPACKET_FIELD.message_type = CommonProto_pb.WELFAREREDPACKET
WELFAREREDPACKETPUSH_REDPACKET_FIELD.type = 11
WELFAREREDPACKETPUSH_REDPACKET_FIELD.cpp_type = 10
WELFAREREDPACKETPUSH.name = "WelfareRedPacketPush"
WELFAREREDPACKETPUSH.full_name = ".rpc.protocols.WelfareRedPacketPush"
WELFAREREDPACKETPUSH.nested_types = {}
WELFAREREDPACKETPUSH.enum_types = {}
WELFAREREDPACKETPUSH.fields = {WELFAREREDPACKETPUSH_REDPACKET_FIELD}
WELFAREREDPACKETPUSH.is_extendable = false
WELFAREREDPACKETPUSH.extensions = {}
WELFAREREDPACKETSENDREQUEST_ID_FIELD.name = "id"
WELFAREREDPACKETSENDREQUEST_ID_FIELD.full_name = ".rpc.protocols.WelfareRedPacketSendRequest.id"
WELFAREREDPACKETSENDREQUEST_ID_FIELD.number = 1
WELFAREREDPACKETSENDREQUEST_ID_FIELD.index = 0
WELFAREREDPACKETSENDREQUEST_ID_FIELD.label = 1
WELFAREREDPACKETSENDREQUEST_ID_FIELD.has_default_value = false
WELFAREREDPACKETSENDREQUEST_ID_FIELD.default_value = 0
WELFAREREDPACKETSENDREQUEST_ID_FIELD.type = 5
WELFAREREDPACKETSENDREQUEST_ID_FIELD.cpp_type = 1
WELFAREREDPACKETSENDREQUEST.name = "WelfareRedPacketSendRequest"
WELFAREREDPACKETSENDREQUEST.full_name = ".rpc.protocols.WelfareRedPacketSendRequest"
WELFAREREDPACKETSENDREQUEST.nested_types = {}
WELFAREREDPACKETSENDREQUEST.enum_types = {}
WELFAREREDPACKETSENDREQUEST.fields = {WELFAREREDPACKETSENDREQUEST_ID_FIELD}
WELFAREREDPACKETSENDREQUEST.is_extendable = false
WELFAREREDPACKETSENDREQUEST.extensions = {}
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.name = "redpacket"
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.full_name = ".rpc.protocols.WelfareRedPacketSendResponse.redpacket"
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.number = 1
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.index = 0
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.label = 3
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.has_default_value = false
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.default_value = {}
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.message_type = CommonProto_pb.WELFAREREDPACKET
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.type = 11
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.cpp_type = 10
WELFAREREDPACKETSENDRESPONSE.name = "WelfareRedPacketSendResponse"
WELFAREREDPACKETSENDRESPONSE.full_name = ".rpc.protocols.WelfareRedPacketSendResponse"
WELFAREREDPACKETSENDRESPONSE.nested_types = {}
WELFAREREDPACKETSENDRESPONSE.enum_types = {}
WELFAREREDPACKETSENDRESPONSE.fields = {WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD}
WELFAREREDPACKETSENDRESPONSE.is_extendable = false
WELFAREREDPACKETSENDRESPONSE.extensions = {}
HARDSTAGEREQUEST.name = "HardStageRequest" HARDSTAGEREQUEST.name = "HardStageRequest"
HARDSTAGEREQUEST.full_name = ".rpc.protocols.HardStageRequest" HARDSTAGEREQUEST.full_name = ".rpc.protocols.HardStageRequest"
HARDSTAGEREQUEST.nested_types = {} HARDSTAGEREQUEST.nested_types = {}
@ -5544,6 +5614,9 @@ 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)
WelfareRedPacketPush = protobuf.Message(WELFAREREDPACKETPUSH)
WelfareRedPacketSendRequest = protobuf.Message(WELFAREREDPACKETSENDREQUEST)
WelfareRedPacketSendResponse = protobuf.Message(WELFAREREDPACKETSENDRESPONSE)
WorkShopEquipCreateRequest = protobuf.Message(WORKSHOPEQUIPCREATEREQUEST) WorkShopEquipCreateRequest = protobuf.Message(WORKSHOPEQUIPCREATEREQUEST)
WorkShopEquipCreateResponse = protobuf.Message(WORKSHOPEQUIPCREATERESPONSE) WorkShopEquipCreateResponse = protobuf.Message(WORKSHOPEQUIPCREATERESPONSE)
WorkShopFoundationRequest = protobuf.Message(WORKSHOPFOUNDATIONREQUEST) WorkShopFoundationRequest = protobuf.Message(WORKSHOPFOUNDATIONREQUEST)

View File

@ -4,6 +4,7 @@ local sortingOrder=0
local packageConfig=nil local packageConfig=nil
function this:InitComponent(gameObject) function this:InitComponent(gameObject)
this.spLoader = SpriteLoader.New()
this.itemPre=Util.GetGameObject(gameObject,"Item") this.itemPre=Util.GetGameObject(gameObject,"Item")
this.scrollRoot=Util.GetGameObject(gameObject,"scrollRect") this.scrollRoot=Util.GetGameObject(gameObject,"scrollRect")
this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scrollRoot.transform,this.itemPre, nil, this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scrollRoot.transform,this.itemPre, nil,
@ -52,7 +53,7 @@ function this:OnClose()
end end
function this:OnDestroy() function this:OnDestroy()
this.spLoader:Destroy()
end end
---初始化面板 ---初始化面板
@ -100,8 +101,8 @@ function this:ShowItemInfo(go,data)
local numTxt=Util.GetGameObject(go,"numTxt"):GetComponent("Text") local numTxt=Util.GetGameObject(go,"numTxt"):GetComponent("Text")
local btn_send=Util.GetGameObject(go,"btn_send") local btn_send=Util.GetGameObject(go,"btn_send")
local sendTxt=Util.GetGameObject(go,"btn_send/Text"):GetComponent("Text") local sendTxt=Util.GetGameObject(go,"btn_send/Text"):GetComponent("Text")
nameImage.sprite=Util.LoadSprite("g_ghhb_ming_04_zh") nameImage.sprite=this.spLoader:LoadSprite("g_ghhb_ming_04_zh")
icon.sprite=Util.LoadSprite(GetResourcePath(data.config.IconId)) icon.sprite=this.spLoader:LoadSprite(GetResourcePath(data.config.IconId))
desTxt.text= data.config.RuleDes desTxt.text= data.config.RuleDes
local num=data.num local num=data.num
numTxt.text="数量:"..data.num numTxt.text="数量:"..data.num
@ -145,7 +146,7 @@ function this:ShowItemInfo(go,data)
this.infoObj.gameObject:SetActive(true) this.infoObj.gameObject:SetActive(true)
this.numTxt.text=data.config.TotalMoney[1] this.numTxt.text=data.config.TotalMoney[1]
this.sumTxt.text=data.config.TotalMoney[2] this.sumTxt.text=data.config.TotalMoney[2]
this.rewardImg.sprite=Util.LoadSprite(GetResourcePath(data.config.IconId)) this.rewardImg.sprite=this.spLoader:LoadSprite(GetResourcePath(data.config.IconId))
end) end)

View File

@ -53,7 +53,7 @@ end
--界面销毁时调用(用于子类重写) --界面销毁时调用(用于子类重写)
function NoticePopup:OnDestroy() function NoticePopup:OnDestroy()
this.spLoader:Destroy() this.spLoader:Destroy()
prelist = {}
end end
function this.GetNotice(str) function this.GetNotice(str)
@ -71,6 +71,7 @@ function this.GetNotice(str)
-- value.content="一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。" -- value.content="一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。"
-- LogError("title:"..value.title.." content:"..value.content.." type:"..value.type) -- LogError("title:"..value.title.." content:"..value.content.." type:"..value.type)
-- end -- end
this.TitleText.text=Language[11147]
if data.list and #data.list>0 then if data.list and #data.list>0 then
this.ContentText.gameObject:SetActive(false) this.ContentText.gameObject:SetActive(false)
table.sort(data.list, function(a, b) table.sort(data.list, function(a, b)
@ -99,9 +100,15 @@ function this.GetNotice(str)
elseif value.type==4 then elseif value.type==4 then
img.gameObject:SetActive(false) img.gameObject:SetActive(false)
end end
Util.GetGameObject(prelist[key],"Image/title"):GetComponent("Text").text=value.title -- 表体
local title = Util.GetGameObject(prelist[key],"Image/title"):GetComponent("Text")
local titleStr = string.split(value.title,"|")
title.text = titleStr[GetCurLanguage()+1] or titleStr[1]
-- 内容
local content=Util.GetGameObject(prelist[key],"content"):GetComponent("Text") local content=Util.GetGameObject(prelist[key],"content"):GetComponent("Text")
content.text=value.content local contentStr = string.split(string.gsub(value.content, "\\n", "\n"),"|")
content.text = contentStr[GetCurLanguage()+1] or contentStr[1]
local down=Util.GetGameObject(prelist[key],"Image/down") local down=Util.GetGameObject(prelist[key],"Image/down")
local left=Util.GetGameObject(prelist[key],"Image/left") local left=Util.GetGameObject(prelist[key],"Image/left")
local isOpen=true local isOpen=true
@ -109,12 +116,12 @@ function this.GetNotice(str)
left:SetActive(not isOpen) left:SetActive(not isOpen)
content.gameObject:SetActive(isOpen) content.gameObject:SetActive(isOpen)
local btn=Util.GetGameObject(prelist[key],"Image") local btn=Util.GetGameObject(prelist[key],"Image")
Util.AddClick(btn,function() Util.AddClick(btn,function()
isOpen=not isOpen isOpen=not isOpen
down:SetActive(isOpen) down:SetActive(isOpen)
left:SetActive(not isOpen) left:SetActive(not isOpen)
content.gameObject:SetActive(isOpen) content.gameObject:SetActive(isOpen)
end) end)
end end
-- local titleStr = string.split(data.parms.title,"|") -- local titleStr = string.split(data.parms.title,"|")
-- this.TitleText.text =titleStr[GetCurLanguage()+1] or titleStr[1] -- this.TitleText.text =titleStr[GetCurLanguage()+1] or titleStr[1]
@ -122,7 +129,6 @@ function this.GetNotice(str)
-- this.ContentText.text = contentStr[GetCurLanguage()+1] or contentStr[1] -- this.ContentText.text = contentStr[GetCurLanguage()+1] or contentStr[1]
else else
this.ContentText.gameObject:SetActive(true) this.ContentText.gameObject:SetActive(true)
this.TitleText.text=Language[11147]
this.ContentText.text=Language[11148] this.ContentText.text=Language[11148]
end end
end end

View File

@ -921,12 +921,22 @@ function this.CheckScreenRightRedPoint()
if not this.btnPokemon then if not this.btnPokemon then
return return
end end
if not this.btnColorfulWorld then
return
end
if not this.btnPokemon.gameObject then
return
end
if not this.btnColorfulWorld.gameObject then
return
end
if not this.btnPokemon.gameObject.transform then if not this.btnPokemon.gameObject.transform then
return return
end end
if not this.btnColorfulWorld.gameObject.transform then if not this.btnColorfulWorld.gameObject.transform then
return return
end end
pos1=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnPokemon.transform.position) pos1=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnPokemon.transform.position)
pos2=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnColorfulWorld.transform.position) pos2=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnColorfulWorld.transform.position)
if (pos1.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.PokemonMainCity)==RedPointStatus.Show) or (pos2.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.Vientiane)==RedPointStatus.Show) then if (pos1.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.PokemonMainCity)==RedPointStatus.Show) or (pos2.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.Vientiane)==RedPointStatus.Show) then

View File

@ -17,7 +17,7 @@ function this.RegisterMessage(network)
--监听红点推送 --监听红点推送
socket:RegistNetMessage(MessageTypeProto_pb.SEND_RED_POINT_INDICATION, this.ReceiveRedPoint) socket:RegistNetMessage(MessageTypeProto_pb.SEND_RED_POINT_INDICATION, this.ReceiveRedPoint)
--福利红包推送 --福利红包推送
-- socket:RegistNetMessage(MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, this.WelfareRedPacketPush) socket:RegistNetMessage(MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, this.WelfareRedPacketPush)
socket:RegistNetMessage(MessageTypeProto_pb.UPDATE_BAG_INDICATION, this.BackUpDataBagItemIdNumber) socket:RegistNetMessage(MessageTypeProto_pb.UPDATE_BAG_INDICATION, this.BackUpDataBagItemIdNumber)
socket:RegistNetMessage(MessageTypeProto_pb.SEND_CHAT_INFO_INDICATION, this.ReceiveFriendChat) socket:RegistNetMessage(MessageTypeProto_pb.SEND_CHAT_INFO_INDICATION, this.ReceiveFriendChat)