【称号坐骑时装】提交

dev_chengFeng
zhangqiang 2021-03-29 16:45:04 +08:00
parent 51bb90edce
commit cbdfb75576
14 changed files with 491 additions and 595 deletions

View File

@ -252,6 +252,7 @@ ADVENTURERANKITEMINFO_UID_FIELD = protobuf.FieldDescriptor();
ADVENTURERANKITEMINFO_USERSKIN_FIELD = protobuf.FieldDescriptor();
ADVENTURERANKITEMINFO_USERTITLE_FIELD = protobuf.FieldDescriptor();
ADVENTURERANKITEMINFO_USERMOUNT_FIELD = protobuf.FieldDescriptor();
ADVENTURERANKITEMINFO_SEX_FIELD = protobuf.FieldDescriptor();
ADVENTUREBOSSINFO = protobuf.Descriptor();
ADVENTUREBOSSINFO_ARENAID_FIELD = protobuf.FieldDescriptor();
ADVENTUREBOSSINFO_FINDUID_FIELD = protobuf.FieldDescriptor();
@ -288,6 +289,7 @@ FRIEND_SOULVAL_FIELD = protobuf.FieldDescriptor();
FRIEND_USERSKIN_FIELD = protobuf.FieldDescriptor();
FRIEND_USERTITLE_FIELD = protobuf.FieldDescriptor();
FRIEND_USERMOUNT_FIELD = protobuf.FieldDescriptor();
FRIEND_SEX_FIELD = protobuf.FieldDescriptor();
GIFTGOODSINFO = protobuf.Descriptor();
GIFTGOODSINFO_GOODSID_FIELD = protobuf.FieldDescriptor();
GIFTGOODSINFO_BUYTIMES_FIELD = protobuf.FieldDescriptor();
@ -430,6 +432,7 @@ EXPERTINFO_HEADFRAME_FIELD = protobuf.FieldDescriptor();
EXPERTINFO_USERSKIN_FIELD = protobuf.FieldDescriptor();
EXPERTINFO_USERTITLE_FIELD = protobuf.FieldDescriptor();
EXPERTINFO_USERMOUNT_FIELD = protobuf.FieldDescriptor();
EXPERTINFO_SEX_FIELD = protobuf.FieldDescriptor();
SIGNININFO = protobuf.Descriptor();
SIGNININFO_DAYS_FIELD = protobuf.FieldDescriptor();
SIGNININFO_STATE_FIELD = protobuf.FieldDescriptor();
@ -465,6 +468,7 @@ MONSTERRANKINFO_UID_FIELD = protobuf.FieldDescriptor();
MONSTERRANKINFO_USERSKIN_FIELD = protobuf.FieldDescriptor();
MONSTERRANKINFO_USERTITLE_FIELD = protobuf.FieldDescriptor();
MONSTERRANKINFO_USERMOUNT_FIELD = protobuf.FieldDescriptor();
MONSTERRANKINFO_SEX_FIELD = protobuf.FieldDescriptor();
HEROBLOODINFO = protobuf.Descriptor();
HEROBLOODINFO_HEROID_FIELD = protobuf.FieldDescriptor();
HEROBLOODINFO_LOSTBLOOD_FIELD = protobuf.FieldDescriptor();
@ -990,8 +994,8 @@ ITEM_ITEMNUM_FIELD.index = 1
ITEM_ITEMNUM_FIELD.label = 1
ITEM_ITEMNUM_FIELD.has_default_value = false
ITEM_ITEMNUM_FIELD.default_value = 0
ITEM_ITEMNUM_FIELD.type = 5
ITEM_ITEMNUM_FIELD.cpp_type = 1
ITEM_ITEMNUM_FIELD.type = 3
ITEM_ITEMNUM_FIELD.cpp_type = 2
ITEM_ENDINGTIME_FIELD.name = "endingTime"
ITEM_ENDINGTIME_FIELD.full_name = ".rpc.protocols.Item.endingTime"
@ -3013,11 +3017,21 @@ ADVENTURERANKITEMINFO_USERMOUNT_FIELD.default_value = 0
ADVENTURERANKITEMINFO_USERMOUNT_FIELD.type = 5
ADVENTURERANKITEMINFO_USERMOUNT_FIELD.cpp_type = 1
ADVENTURERANKITEMINFO_SEX_FIELD.name = "sex"
ADVENTURERANKITEMINFO_SEX_FIELD.full_name = ".rpc.protocols.AdventureRankItemInfo.sex"
ADVENTURERANKITEMINFO_SEX_FIELD.number = 11
ADVENTURERANKITEMINFO_SEX_FIELD.index = 10
ADVENTURERANKITEMINFO_SEX_FIELD.label = 1
ADVENTURERANKITEMINFO_SEX_FIELD.has_default_value = false
ADVENTURERANKITEMINFO_SEX_FIELD.default_value = 0
ADVENTURERANKITEMINFO_SEX_FIELD.type = 5
ADVENTURERANKITEMINFO_SEX_FIELD.cpp_type = 1
ADVENTURERANKITEMINFO.name = "AdventureRankItemInfo"
ADVENTURERANKITEMINFO.full_name = ".rpc.protocols.AdventureRankItemInfo"
ADVENTURERANKITEMINFO.nested_types = {}
ADVENTURERANKITEMINFO.enum_types = {}
ADVENTURERANKITEMINFO.fields = {ADVENTURERANKITEMINFO_LEVEL_FIELD, ADVENTURERANKITEMINFO_NAME_FIELD, ADVENTURERANKITEMINFO_HURT_FIELD, ADVENTURERANKITEMINFO_HEAD_FIELD, ADVENTURERANKITEMINFO_RANK_FIELD, ADVENTURERANKITEMINFO_HEADFRAME_FIELD, ADVENTURERANKITEMINFO_UID_FIELD, ADVENTURERANKITEMINFO_USERSKIN_FIELD, ADVENTURERANKITEMINFO_USERTITLE_FIELD, ADVENTURERANKITEMINFO_USERMOUNT_FIELD}
ADVENTURERANKITEMINFO.fields = {ADVENTURERANKITEMINFO_LEVEL_FIELD, ADVENTURERANKITEMINFO_NAME_FIELD, ADVENTURERANKITEMINFO_HURT_FIELD, ADVENTURERANKITEMINFO_HEAD_FIELD, ADVENTURERANKITEMINFO_RANK_FIELD, ADVENTURERANKITEMINFO_HEADFRAME_FIELD, ADVENTURERANKITEMINFO_UID_FIELD, ADVENTURERANKITEMINFO_USERSKIN_FIELD, ADVENTURERANKITEMINFO_USERTITLE_FIELD, ADVENTURERANKITEMINFO_USERMOUNT_FIELD, ADVENTURERANKITEMINFO_SEX_FIELD}
ADVENTURERANKITEMINFO.is_extendable = false
ADVENTURERANKITEMINFO.extensions = {}
ADVENTUREBOSSINFO_ARENAID_FIELD.name = "arenaId"
@ -3361,11 +3375,21 @@ FRIEND_USERMOUNT_FIELD.default_value = 0
FRIEND_USERMOUNT_FIELD.type = 5
FRIEND_USERMOUNT_FIELD.cpp_type = 1
FRIEND_SEX_FIELD.name = "sex"
FRIEND_SEX_FIELD.full_name = ".rpc.protocols.Friend.sex"
FRIEND_SEX_FIELD.number = 18
FRIEND_SEX_FIELD.index = 13
FRIEND_SEX_FIELD.label = 1
FRIEND_SEX_FIELD.has_default_value = false
FRIEND_SEX_FIELD.default_value = 0
FRIEND_SEX_FIELD.type = 5
FRIEND_SEX_FIELD.cpp_type = 1
FRIEND.name = "Friend"
FRIEND.full_name = ".rpc.protocols.Friend"
FRIEND.nested_types = {}
FRIEND.enum_types = {}
FRIEND.fields = {FRIEND_ID_FIELD, FRIEND_NAME_FIELD, FRIEND_LV_FIELD, FRIEND_OFFLINETIME_FIELD, FRIEND_HAVEREWARD_FIELD, FRIEND_ISGIVE_FIELD, FRIEND_ISAPPLYED_FIELD, FRIEND_HEAD_FIELD, FRIEND_FRAME_FIELD, FRIEND_SOULVAL_FIELD, FRIEND_USERSKIN_FIELD, FRIEND_USERTITLE_FIELD, FRIEND_USERMOUNT_FIELD}
FRIEND.fields = {FRIEND_ID_FIELD, FRIEND_NAME_FIELD, FRIEND_LV_FIELD, FRIEND_OFFLINETIME_FIELD, FRIEND_HAVEREWARD_FIELD, FRIEND_ISGIVE_FIELD, FRIEND_ISAPPLYED_FIELD, FRIEND_HEAD_FIELD, FRIEND_FRAME_FIELD, FRIEND_SOULVAL_FIELD, FRIEND_USERSKIN_FIELD, FRIEND_USERTITLE_FIELD, FRIEND_USERMOUNT_FIELD, FRIEND_SEX_FIELD}
FRIEND.is_extendable = false
FRIEND.extensions = {}
GIFTGOODSINFO_GOODSID_FIELD.name = "goodsId"
@ -3533,8 +3557,8 @@ ITEMINFO_OVERLAP_FIELD.index = 1
ITEMINFO_OVERLAP_FIELD.label = 1
ITEMINFO_OVERLAP_FIELD.has_default_value = false
ITEMINFO_OVERLAP_FIELD.default_value = 0
ITEMINFO_OVERLAP_FIELD.type = 5
ITEMINFO_OVERLAP_FIELD.cpp_type = 1
ITEMINFO_OVERLAP_FIELD.type = 3
ITEMINFO_OVERLAP_FIELD.cpp_type = 2
ITEMINFO_NEXTREFRESHTIME_FIELD.name = "nextRefreshTime"
ITEMINFO_NEXTREFRESHTIME_FIELD.full_name = ".rpc.protocols.ItemInfo.nextRefreshTime"
@ -4717,11 +4741,21 @@ EXPERTINFO_USERMOUNT_FIELD.default_value = 0
EXPERTINFO_USERMOUNT_FIELD.type = 5
EXPERTINFO_USERMOUNT_FIELD.cpp_type = 1
EXPERTINFO_SEX_FIELD.name = "sex"
EXPERTINFO_SEX_FIELD.full_name = ".rpc.protocols.ExpertInfo.sex"
EXPERTINFO_SEX_FIELD.number = 10
EXPERTINFO_SEX_FIELD.index = 9
EXPERTINFO_SEX_FIELD.label = 1
EXPERTINFO_SEX_FIELD.has_default_value = false
EXPERTINFO_SEX_FIELD.default_value = 0
EXPERTINFO_SEX_FIELD.type = 5
EXPERTINFO_SEX_FIELD.cpp_type = 1
EXPERTINFO.name = "ExpertInfo"
EXPERTINFO.full_name = ".rpc.protocols.ExpertInfo"
EXPERTINFO.nested_types = {}
EXPERTINFO.enum_types = {}
EXPERTINFO.fields = {EXPERTINFO_NAME_FIELD, EXPERTINFO_SCORE_FIELD, EXPERTINFO_RANK_FIELD, EXPERTINFO_LEVEL_FIELD, EXPERTINFO_HEAD_FIELD, EXPERTINFO_HEADFRAME_FIELD, EXPERTINFO_USERSKIN_FIELD, EXPERTINFO_USERTITLE_FIELD, EXPERTINFO_USERMOUNT_FIELD}
EXPERTINFO.fields = {EXPERTINFO_NAME_FIELD, EXPERTINFO_SCORE_FIELD, EXPERTINFO_RANK_FIELD, EXPERTINFO_LEVEL_FIELD, EXPERTINFO_HEAD_FIELD, EXPERTINFO_HEADFRAME_FIELD, EXPERTINFO_USERSKIN_FIELD, EXPERTINFO_USERTITLE_FIELD, EXPERTINFO_USERMOUNT_FIELD, EXPERTINFO_SEX_FIELD}
EXPERTINFO.is_extendable = false
EXPERTINFO.extensions = {}
SIGNININFO_DAYS_FIELD.name = "days"
@ -4857,8 +4891,8 @@ TEAMONETEAMINFO_REMAINHP_FIELD.index = 3
TEAMONETEAMINFO_REMAINHP_FIELD.label = 3
TEAMONETEAMINFO_REMAINHP_FIELD.has_default_value = false
TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {}
TEAMONETEAMINFO_REMAINHP_FIELD.type = 5
TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 1
TEAMONETEAMINFO_REMAINHP_FIELD.type = 3
TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2
TEAMONETEAMINFO.name = "TeamOneTeamInfo"
TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo"
@ -5055,11 +5089,21 @@ MONSTERRANKINFO_USERMOUNT_FIELD.default_value = 0
MONSTERRANKINFO_USERMOUNT_FIELD.type = 5
MONSTERRANKINFO_USERMOUNT_FIELD.cpp_type = 1
MONSTERRANKINFO_SEX_FIELD.name = "sex"
MONSTERRANKINFO_SEX_FIELD.full_name = ".rpc.protocols.MonsterRankInfo.sex"
MONSTERRANKINFO_SEX_FIELD.number = 11
MONSTERRANKINFO_SEX_FIELD.index = 10
MONSTERRANKINFO_SEX_FIELD.label = 1
MONSTERRANKINFO_SEX_FIELD.has_default_value = false
MONSTERRANKINFO_SEX_FIELD.default_value = 0
MONSTERRANKINFO_SEX_FIELD.type = 5
MONSTERRANKINFO_SEX_FIELD.cpp_type = 1
MONSTERRANKINFO.name = "MonsterRankInfo"
MONSTERRANKINFO.full_name = ".rpc.protocols.MonsterRankInfo"
MONSTERRANKINFO.nested_types = {}
MONSTERRANKINFO.enum_types = {}
MONSTERRANKINFO.fields = {MONSTERRANKINFO_NAME_FIELD, MONSTERRANKINFO_SCORE_FIELD, MONSTERRANKINFO_RANK_FIELD, MONSTERRANKINFO_LEVEL_FIELD, MONSTERRANKINFO_HEAD_FIELD, MONSTERRANKINFO_HEADFRAME_FIELD, MONSTERRANKINFO_UID_FIELD, MONSTERRANKINFO_USERSKIN_FIELD, MONSTERRANKINFO_USERTITLE_FIELD, MONSTERRANKINFO_USERMOUNT_FIELD}
MONSTERRANKINFO.fields = {MONSTERRANKINFO_NAME_FIELD, MONSTERRANKINFO_SCORE_FIELD, MONSTERRANKINFO_RANK_FIELD, MONSTERRANKINFO_LEVEL_FIELD, MONSTERRANKINFO_HEAD_FIELD, MONSTERRANKINFO_HEADFRAME_FIELD, MONSTERRANKINFO_UID_FIELD, MONSTERRANKINFO_USERSKIN_FIELD, MONSTERRANKINFO_USERTITLE_FIELD, MONSTERRANKINFO_USERMOUNT_FIELD, MONSTERRANKINFO_SEX_FIELD}
MONSTERRANKINFO.is_extendable = false
MONSTERRANKINFO.extensions = {}
HEROBLOODINFO_HEROID_FIELD.name = "heroId"

View File

@ -27,6 +27,7 @@ FAMILYUSERINFO_LASTHELPSENDTIME_FIELD = protobuf.FieldDescriptor();
FAMILYUSERINFO_USERSKIN_FIELD = protobuf.FieldDescriptor();
FAMILYUSERINFO_USERTITLE_FIELD = protobuf.FieldDescriptor();
FAMILYUSERINFO_USERMOUNT_FIELD = protobuf.FieldDescriptor();
FAMILYUSERINFO_SEX_FIELD = protobuf.FieldDescriptor();
CARDELAYPROGRESSINDICATION = protobuf.Descriptor();
CARDELAYPROGRESSINDICATION_PROGRESS_FIELD = protobuf.FieldDescriptor();
CARDELAYPROGRESSINDICATION_ENDTIME_FIELD = protobuf.FieldDescriptor();
@ -356,6 +357,7 @@ GUILDCHALLENGEINDICATION = protobuf.Descriptor();
GUILDCHALLENGEINDICATION_CURBOSS_FIELD = protobuf.FieldDescriptor();
GUILDCHALLENGEINDICATION_BLOOD_FIELD = protobuf.FieldDescriptor();
GUILDCHALLENGEINDICATION_ISKILL_FIELD = protobuf.FieldDescriptor();
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD = protobuf.FieldDescriptor();
GUILDCHALLENGEBUYBUFFINDICATION = protobuf.Descriptor();
GUILDCHALLENGEBUYBUFFINDICATION_BUFFCOUNT_FIELD = protobuf.FieldDescriptor();
GUILDCHALLENGEBUYBUFFINDICATION_BUFFTIME_FIELD = protobuf.FieldDescriptor();
@ -583,11 +585,21 @@ FAMILYUSERINFO_USERMOUNT_FIELD.default_value = 0
FAMILYUSERINFO_USERMOUNT_FIELD.type = 5
FAMILYUSERINFO_USERMOUNT_FIELD.cpp_type = 1
FAMILYUSERINFO_SEX_FIELD.name = "sex"
FAMILYUSERINFO_SEX_FIELD.full_name = ".rpc.protocols.FamilyUserInfo.sex"
FAMILYUSERINFO_SEX_FIELD.number = 23
FAMILYUSERINFO_SEX_FIELD.index = 22
FAMILYUSERINFO_SEX_FIELD.label = 1
FAMILYUSERINFO_SEX_FIELD.has_default_value = false
FAMILYUSERINFO_SEX_FIELD.default_value = 0
FAMILYUSERINFO_SEX_FIELD.type = 5
FAMILYUSERINFO_SEX_FIELD.cpp_type = 1
FAMILYUSERINFO.name = "FamilyUserInfo"
FAMILYUSERINFO.full_name = ".rpc.protocols.FamilyUserInfo"
FAMILYUSERINFO.nested_types = {}
FAMILYUSERINFO.enum_types = {}
FAMILYUSERINFO.fields = {FAMILYUSERINFO_ROLEUID_FIELD, FAMILYUSERINFO_USERNAME_FIELD, FAMILYUSERINFO_USERLEVEL_FIELD, FAMILYUSERINFO_POSITION_FIELD, FAMILYUSERINFO_CONTRIBUTE_FIELD, FAMILYUSERINFO_SECONDS_FIELD, FAMILYUSERINFO_CONTRIBUTETODAY_FIELD, FAMILYUSERINFO_SOULFORCE_FIELD, FAMILYUSERINFO_HEAD_FIELD, FAMILYUSERINFO_FRAME_FIELD, FAMILYUSERINFO_MAXBOSSHURT_FIELD, FAMILYUSERINFO_LASTHURT_FIELD, FAMILYUSERINFO_TAKEFETEREWARD_FIELD, FAMILYUSERINFO_LASTFETEGUILDID_FIELD, FAMILYUSERINFO_LASTFETETYPE_FIELD, FAMILYUSERINFO_GUILDHELPTIME_FIELD, FAMILYUSERINFO_ISTAKEGUILDHELPREWARD_FIELD, FAMILYUSERINFO_GUILDHELPINFO_FIELD, FAMILYUSERINFO_LASTHELPSENDTIME_FIELD, FAMILYUSERINFO_USERSKIN_FIELD, FAMILYUSERINFO_USERTITLE_FIELD, FAMILYUSERINFO_USERMOUNT_FIELD}
FAMILYUSERINFO.fields = {FAMILYUSERINFO_ROLEUID_FIELD, FAMILYUSERINFO_USERNAME_FIELD, FAMILYUSERINFO_USERLEVEL_FIELD, FAMILYUSERINFO_POSITION_FIELD, FAMILYUSERINFO_CONTRIBUTE_FIELD, FAMILYUSERINFO_SECONDS_FIELD, FAMILYUSERINFO_CONTRIBUTETODAY_FIELD, FAMILYUSERINFO_SOULFORCE_FIELD, FAMILYUSERINFO_HEAD_FIELD, FAMILYUSERINFO_FRAME_FIELD, FAMILYUSERINFO_MAXBOSSHURT_FIELD, FAMILYUSERINFO_LASTHURT_FIELD, FAMILYUSERINFO_TAKEFETEREWARD_FIELD, FAMILYUSERINFO_LASTFETEGUILDID_FIELD, FAMILYUSERINFO_LASTFETETYPE_FIELD, FAMILYUSERINFO_GUILDHELPTIME_FIELD, FAMILYUSERINFO_ISTAKEGUILDHELPREWARD_FIELD, FAMILYUSERINFO_GUILDHELPINFO_FIELD, FAMILYUSERINFO_LASTHELPSENDTIME_FIELD, FAMILYUSERINFO_USERSKIN_FIELD, FAMILYUSERINFO_USERTITLE_FIELD, FAMILYUSERINFO_USERMOUNT_FIELD, FAMILYUSERINFO_SEX_FIELD}
FAMILYUSERINFO.is_extendable = false
FAMILYUSERINFO.extensions = {}
CARDELAYPROGRESSINDICATION_PROGRESS_FIELD.name = "progress"
@ -3610,11 +3622,21 @@ GUILDCHALLENGEINDICATION_ISKILL_FIELD.default_value = 0
GUILDCHALLENGEINDICATION_ISKILL_FIELD.type = 5
GUILDCHALLENGEINDICATION_ISKILL_FIELD.cpp_type = 1
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.name = "isRefresh"
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.full_name = ".rpc.protocols.GuildChallengeIndication.isRefresh"
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.number = 4
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.index = 3
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.label = 1
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.has_default_value = false
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.default_value = 0
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.type = 5
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.cpp_type = 1
GUILDCHALLENGEINDICATION.name = "GuildChallengeIndication"
GUILDCHALLENGEINDICATION.full_name = ".rpc.protocols.GuildChallengeIndication"
GUILDCHALLENGEINDICATION.nested_types = {}
GUILDCHALLENGEINDICATION.enum_types = {}
GUILDCHALLENGEINDICATION.fields = {GUILDCHALLENGEINDICATION_CURBOSS_FIELD, GUILDCHALLENGEINDICATION_BLOOD_FIELD, GUILDCHALLENGEINDICATION_ISKILL_FIELD}
GUILDCHALLENGEINDICATION.fields = {GUILDCHALLENGEINDICATION_CURBOSS_FIELD, GUILDCHALLENGEINDICATION_BLOOD_FIELD, GUILDCHALLENGEINDICATION_ISKILL_FIELD, GUILDCHALLENGEINDICATION_ISREFRESH_FIELD}
GUILDCHALLENGEINDICATION.is_extendable = false
GUILDCHALLENGEINDICATION.extensions = {}
GUILDCHALLENGEBUYBUFFINDICATION_BUFFCOUNT_FIELD.name = "buffCount"

View File

@ -320,8 +320,8 @@ FIGHTENDRESPONSE_REMAINHPLIST_FIELD.index = 3
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.label = 3
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.has_default_value = false
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.default_value = {}
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.type = 5
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.cpp_type = 1
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.type = 3
FIGHTENDRESPONSE_REMAINHPLIST_FIELD.cpp_type = 2
FIGHTENDRESPONSE_MISSION_FIELD.name = "mission"
FIGHTENDRESPONSE_MISSION_FIELD.full_name = ".rpc.protocols.FightEndResponse.mission"

View File

@ -245,8 +245,8 @@ HEROINFO_HEROHP_FIELD.index = 1
HEROINFO_HEROHP_FIELD.label = 1
HEROINFO_HEROHP_FIELD.has_default_value = false
HEROINFO_HEROHP_FIELD.default_value = 0
HEROINFO_HEROHP_FIELD.type = 5
HEROINFO_HEROHP_FIELD.cpp_type = 1
HEROINFO_HEROHP_FIELD.type = 3
HEROINFO_HEROHP_FIELD.cpp_type = 2
HEROINFO_HEROMAXHP_FIELD.name = "heroMaxHp"
HEROINFO_HEROMAXHP_FIELD.full_name = ".rpc.protocols.HeroInfo.heroMaxHp"
@ -255,8 +255,8 @@ HEROINFO_HEROMAXHP_FIELD.index = 2
HEROINFO_HEROMAXHP_FIELD.label = 1
HEROINFO_HEROMAXHP_FIELD.has_default_value = false
HEROINFO_HEROMAXHP_FIELD.default_value = 0
HEROINFO_HEROMAXHP_FIELD.type = 5
HEROINFO_HEROMAXHP_FIELD.cpp_type = 1
HEROINFO_HEROMAXHP_FIELD.type = 3
HEROINFO_HEROMAXHP_FIELD.cpp_type = 2
HEROINFO.name = "HeroInfo"
HEROINFO.full_name = ".rpc.protocols.HeroInfo"
@ -302,8 +302,8 @@ TRIALHEROINFO_HEROHP_FIELD.index = 3
TRIALHEROINFO_HEROHP_FIELD.label = 1
TRIALHEROINFO_HEROHP_FIELD.has_default_value = false
TRIALHEROINFO_HEROHP_FIELD.default_value = 0
TRIALHEROINFO_HEROHP_FIELD.type = 5
TRIALHEROINFO_HEROHP_FIELD.cpp_type = 1
TRIALHEROINFO_HEROHP_FIELD.type = 3
TRIALHEROINFO_HEROHP_FIELD.cpp_type = 2
TRIALHEROINFO_LEVEL_FIELD.name = "level"
TRIALHEROINFO_LEVEL_FIELD.full_name = ".rpc.protocols.TrialHeroInfo.level"

File diff suppressed because one or more lines are too long

View File

@ -478,6 +478,8 @@ USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD = protobuf.FieldDescriptor();
USEHEADFRAMERESPONSE = protobuf.Descriptor();
USEHEADFRAMERESPONSE_VALIDTIME_FIELD = protobuf.FieldDescriptor();
LOGINCONFIRMREQUEST = protobuf.Descriptor();
RECHARGESUCCESSINDICATION = protobuf.Descriptor();
RECHARGESUCCESSINDICATION_ORDERID_FIELD = protobuf.FieldDescriptor();
ACTIVEUSERSKINREQUEST = protobuf.Descriptor();
ACTIVEUSERSKINREQUEST_SKINID_FIELD = protobuf.FieldDescriptor();
ACTIVEUSERSKINRESPONSE = protobuf.Descriptor();
@ -4860,6 +4862,23 @@ LOGINCONFIRMREQUEST.enum_types = {}
LOGINCONFIRMREQUEST.fields = {}
LOGINCONFIRMREQUEST.is_extendable = false
LOGINCONFIRMREQUEST.extensions = {}
RECHARGESUCCESSINDICATION_ORDERID_FIELD.name = "orderId"
RECHARGESUCCESSINDICATION_ORDERID_FIELD.full_name = ".rpc.protocols.RechargeSuccessIndication.orderId"
RECHARGESUCCESSINDICATION_ORDERID_FIELD.number = 1
RECHARGESUCCESSINDICATION_ORDERID_FIELD.index = 0
RECHARGESUCCESSINDICATION_ORDERID_FIELD.label = 1
RECHARGESUCCESSINDICATION_ORDERID_FIELD.has_default_value = false
RECHARGESUCCESSINDICATION_ORDERID_FIELD.default_value = ""
RECHARGESUCCESSINDICATION_ORDERID_FIELD.type = 9
RECHARGESUCCESSINDICATION_ORDERID_FIELD.cpp_type = 9
RECHARGESUCCESSINDICATION.name = "RechargeSuccessIndication"
RECHARGESUCCESSINDICATION.full_name = ".rpc.protocols.RechargeSuccessIndication"
RECHARGESUCCESSINDICATION.nested_types = {}
RECHARGESUCCESSINDICATION.enum_types = {}
RECHARGESUCCESSINDICATION.fields = {RECHARGESUCCESSINDICATION_ORDERID_FIELD}
RECHARGESUCCESSINDICATION.is_extendable = false
RECHARGESUCCESSINDICATION.extensions = {}
ACTIVEUSERSKINREQUEST_SKINID_FIELD.name = "skinId"
ACTIVEUSERSKINREQUEST_SKINID_FIELD.full_name = ".rpc.protocols.ActiveUserSkinRequest.skinId"
ACTIVEUSERSKINREQUEST_SKINID_FIELD.number = 1
@ -5058,6 +5077,7 @@ RankResponse = protobuf.Message(RANKRESPONSE)
ReNameRequest = protobuf.Message(RENAMEREQUEST)
RechargeInfoRequest = protobuf.Message(RECHARGEINFOREQUEST)
RechargeInfoResponse = protobuf.Message(RECHARGEINFORESPONSE)
RechargeSuccessIndication = protobuf.Message(RECHARGESUCCESSINDICATION)
RedPointInfo = protobuf.Message(REDPOINTINFO)
RefreshFriendStateResponse = protobuf.Message(REFRESHFRIENDSTATERESPONSE)
RefreshItemNumRequest = protobuf.Message(REFRESHITEMNUMREQUEST)

View File

@ -10,8 +10,8 @@ local state = 0
local isPlayAnim = true
local allRankData,myRankData
local mapNpc = "live2d_npc_map"
local mapNpc2 = "live2d_npc_map_nv"
-- local mapNpc = "live2d_npc_map"
-- local mapNpc2 = "live2d_npc_map_nv"
local npcList={}
local rankImage={
@ -134,13 +134,24 @@ function DemonSlayerPanel:SetRank(ActInfo)
item.text = allRankData[i].userName
--加载立绘
npc = allRankData[i].sex == ROLE_SEX.BOY and mapNpc or mapNpc2
local scale = allRankData[i].sex == ROLE_SEX.BOY and Vector3.one * 0.45 or Vector3.one * 0.25
npcList[i] = poolManager:LoadLive(npc, livePrefab.transform, scale, Vector3.New(0,-158.31,0))
local SkeletonGraphic = npcList[i]:GetComponent("SkeletonGraphic")
if SkeletonGraphic then
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
-- npc = allRankData[i].sex == ROLE_SEX.BOY and mapNpc or mapNpc2
-- local scale = allRankData[i].sex == ROLE_SEX.BOY and Vector3.one * 0.45 or Vector3.one * 0.25
-- npcList[i] = poolManager:LoadLive(npc, livePrefab.transform, scale, Vector3.New(0,-158.31,0))
-- local SkeletonGraphic = npcList[i]:GetComponent("SkeletonGraphic")
-- if SkeletonGraphic then
-- SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
-- end
if npcList[i] then
npcList[i]:OnClose()
end
local curPlayerLiveViewData = {
skin = allRankData[i].userSkin,
ride = allRankData[i].userMount,
sex = allRankData[i].sex,
designation = allRankData[i].userTitle
}
npcList[i] = PlayerLiveView:New(livePrefab.transform,2, curPlayerLiveViewData)
npcList[i]:OnOpen(25,nil,WALK_DIR.IDLE_LEFT)
else
image.enabled = true
item.text = Language[10423]
@ -298,8 +309,9 @@ function DemonSlayerPanel:OnClose()
self.timer = nil
end
for i = 1, #npcList do
poolManager:UnLoadLive(npcList[i].gameObject.name, npcList[i])
npcList[i]=nil
-- poolManager:UnLoadLive(npcList[i].gameObject.name, npcList[i])
-- npcList[i]=nil
npcList[i]:OnClose()
end
sortingOrder = 0
end

View File

@ -304,7 +304,7 @@ function this:BindEvent()
curNPCList = {}
PlayerManager.GetMainPlayerNPCData(function(NPCList)
for i = 1, #NPCList do
local view = MainPlayerView.New(false, this.btnClickMove, rect, Vector2.New(math.random(rect.xMin, rect.xMax), math.random(rect.yMin, rect.yMax)),NPCList[i].sex)
local view = MainPlayerView.New(false, this.btnClickMove, rect, Vector2.New(math.random(rect.xMin, rect.xMax), math.random(rect.yMin, rect.yMax)),NPCList[i])
view.NameText.text = NPCList[i].userName or NPCList[i].name
view:SetAutoMove()
view.leader.transform.name = "MainPlayerView"..i
@ -783,7 +783,6 @@ function this:OnShow()
this.playerHead:SetEffectScale(0.85)
--刷新主城npc
PlayerManager.SetisRefreshMainPanelNpc(true)
this:OnChangeTitleOrRideOrSkin()
Log(string.format("---------------------%s", BagManager.GetItemCountById(14)))
@ -1382,8 +1381,15 @@ function this:OnChangeTitleOrRideOrSkin()
table.remove(curNPCList,key)
end
end
LogBlue(":OnClose() :OnClose()")
if self.playerView.NpcGO then
self.playerView.NpcGO:OnClose()
end
if self.playerView then
poolManager:UnLoadAsset("UI_MainPlayer",self.playerView.leader, PoolManager.AssetType.GameObject)
self.playerView = nil
end
end
self.playerView = MainPlayerView.New(true, this.btnClickMove, rect, Vector2.New(-1210, 0))
table.insert(curNPCList,self.playerView)
--角色点击行走

View File

@ -3,7 +3,7 @@ MainPlayerView.__index = MainPlayerView
local mapNpcOp = "UI_MainPlayer"
require("View/PlayerLiveView")
function MainPlayerView.New(isSelf, root, rect, pos,_sex)
function MainPlayerView.New(isSelf, root, rect, pos,_NpvData)
local instance
instance = {}
setmetatable(instance, MainPlayerView)
@ -28,14 +28,14 @@ function MainPlayerView.New(isSelf, root, rect, pos,_sex)
instance.NameText = Util.GetGameObject(instance.leader, "name/text2"):GetComponent("Text")
Util.GetGameObject(instance.leader, "name/text"):SetActive(false)
Util.GetGameObject(instance.leader, "name/text2"):SetActive(true)
_sex = _sex or math.random(0,1)
_sex = _NpvData.sex
local zuoqi = 0
if _sex == 0 then zuoqi = 80008 end
local PlayerLiveViewData = {
skin = 80012,
skin = _NpvData.userSkin,
sex = _sex,
ride = zuoqi,
ride = _NpvData.userMount,
designation = _NpvData.userTitle
}
instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,2, PlayerLiveViewData)
end

View File

@ -35,7 +35,7 @@ this.headFrameList = {}
this.MainPanelRoleMonveState = false
--激活的称号 时装 坐骑
this.isRefreshMainPanelNpc = false
this.isRefreshMainPanelNpc = true
this.userSkinList = {}--[id] = {skinId , overTime}
this.userTitleList = {}--[id] = {titleId , overTime}
this.userMountList = {}--[id] = {mountId , overTime}
@ -333,24 +333,60 @@ end
function this.SetPlayerRide(value)
PlayerManager.ride = value
end
function this.GetPlayerDesignation(value)
function this.GetPlayerDesignation()
--加判断是否到时间 卸掉
local curTitleData = this.userTitleList[PlayerManager.designation]
if curTitleData then
if curTitleData.overTime > GetTimeStamp() or curTitleData.overTime == 0 then
return PlayerManager.designation
end
else
return PlayerManager.designation
end
NetManager.RequestChangeModifyDecoration(2,0)
this.SetPlayerDesignation(0)
PlayerManager.SetisRefreshMainPanelNpc(true)
return PlayerManager.designation
end
--设置玩家皮肤
function this.GetPlayerSkin(value)
function this.GetPlayerSkin()
--刷新所有时装 坐骑 称号 集合 检查是否有限时到时间的并删除
this.RefreshAllSkinRideTitle()
--加判断是否到时间 卸掉
local curSkinData = this.userSkinList[PlayerManager.skin]
if curSkinData then
if curSkinData.overTime > GetTimeStamp() or curSkinData.overTime == 0 then
return PlayerManager.skin
end
else
return PlayerManager.skin
end
NetManager.RequestChangeModifyDecoration(4,0)
this.SetPlayerSkin(0)
PlayerManager.SetisRefreshMainPanelNpc(true)
return PlayerManager.skin
end
--设置玩家坐骑
function this.GetPlayerRide(value)
function this.GetPlayerRide()
--加判断是否到时间 卸掉
local currideData = this.userMountList[PlayerManager.ride]
if currideData then
if currideData.overTime > GetTimeStamp() or currideData.overTime == 0 then
return PlayerManager.ride
end
else
return PlayerManager.ride
end
NetManager.RequestChangeModifyDecoration(3,0)
this.SetPlayerRide(0)
PlayerManager.SetisRefreshMainPanelNpc(true)
return PlayerManager.ride
end
function this.SetisRefreshMainPanelNpc(state)
LogBlue("isRefreshMainPanelNpc "..tostring(this.isRefreshMainPanelNpc))
this.isRefreshMainPanelNpc = state
end
function this.GetisRefreshMainPanelNpc(state)
function this.GetisRefreshMainPanelNpc()
return this.isRefreshMainPanelNpc
end
--初始化所以激活的称号 时装 坐骑
@ -383,11 +419,11 @@ function this.SetPlayerSkinTime(id,validTime)
if this.userSkinList then
if validTime then--不为空时是设置时间 没有会新加数据
if this.userSkinList[id] then
this.userSkinList[id].validTime = validTime
this.userSkinList[id].overTime = validTime
else
local singData = {}
singData.skinId = id
singData.validTime = validTime
singData.overTime = validTime
this.userSkinList[singData.skinId] = singData
end
else--为空时是删除数据 倒计时结束时
@ -402,11 +438,11 @@ function this.SetPlayerTitleTime(id,validTime)
if this.userTitleList then
if validTime then--不为空时是设置时间 没有会新加数据
if this.userTitleList[id] then
this.userTitleList[id].validTime = validTime
this.userTitleList[id].overTime = validTime
else
local singData = {}
singData.titleId = id
singData.validTime = validTime
singData.overTime = validTime
this.userTitleList[singData.titleId] = singData
end
else--为空时是删除数据 倒计时结束时
@ -421,11 +457,11 @@ function this.SetPlayerMountTime(id,validTime)
if this.userMountList then
if validTime then--不为空时是设置时间 没有会新加数据
if this.userMountList[id] then
this.userMountList[id].validTime = validTime
this.userMountList[id].overTime = validTime
else
local singData = {}
singData.mountId = id
singData.validTime = validTime
singData.overTime = validTime
this.userMountList[singData.mountId] = singData
end
else--为空时是删除数据 倒计时结束时
@ -435,6 +471,26 @@ function this.SetPlayerMountTime(id,validTime)
end
end
end
function this.RefreshAllSkinRideTitle()
for key, value in pairs(this.userMountList) do
if value and value.overTime > 0 and value.overTime < GetTimeStamp() then
--过期
table.remove(this.userMountList,key)
end
end
for key, value in pairs(this.userTitleList) do
if value and value.overTime > 0 and value.overTime < GetTimeStamp() then
--过期
table.remove(this.userTitleList,key)
end
end
for key, value in pairs(this.userSkinList) do
if value and value.overTime > 0 and value.overTime < GetTimeStamp() then
--过期
table.remove(this.userSkinList,key)
end
end
end
--设置当前玩家 视野范围 和 移动速度
function this.SetMoveSpeedAndMapView()
if PlayerManager.ride > 0 then
@ -498,18 +554,18 @@ function this.CalculatePlayerDcorateProAddVal()
table.insert(allActiveConfig,PlayerHeadIcon)
end
end
-- for i = 1, #allActiveConfig do
-- if allPlayerUpConfig[i].UnlockProperty then
-- for j = 1, #allPlayerUpConfig[i].UnlockProperty do
-- local curAddProInfo = allPlayerUpConfig[i].UnlockProperty[j]
-- if addAllProVal[curAddProInfo[1]] then
-- addAllProVal[curAddProInfo[1]] = addAllProVal[curAddProInfo[1]] + curAddProInfo[2]
-- else
-- addAllProVal[curAddProInfo[1]] = curAddProInfo[2]
-- end
-- end
-- end
-- end
for i = 1, #allActiveConfig do
if allActiveConfig[i].UnlockProperty then
for j = 1, #allActiveConfig[i].UnlockProperty do
local curAddProInfo = allActiveConfig[i].UnlockProperty[j]
if addAllProVal[curAddProInfo[1]] then
addAllProVal[curAddProInfo[1]] = addAllProVal[curAddProInfo[1]] + curAddProInfo[2]
else
addAllProVal[curAddProInfo[1]] = curAddProInfo[2]
end
end
end
end
return addAllProVal
end
-----------------------------------玩家坐骑 皮肤 称号结束
@ -588,8 +644,9 @@ function this.StopBattleUpLvTipTime()
end
------- 主城NPC 选择star ----------
local needNum = 3--7
local needAllNum = 6--14
---先去好友里 或 公会成员 去取needNum 个 再去排行榜里去取needAllNum - 去取needNum 个 最后不足自己造NPC 信息
local needNum = 5--7
local needAllNum = 10--14
local rankNPCList = {}
local friendNPCList = {}
function this.GetMainPlayerNPCData(fun)
@ -605,6 +662,7 @@ function this.GetMainPlayerNPCData(fun)
NetManager.RequestGetFriendInfo(1,function(msg)
for i = 1, #msg.Friends do
if msg.Friends[i].id ~= PlayerManager.uid then
LogBlue("msg.Friends[i] "..msg.Friends[i].userSkin.." "..msg.Friends[i].userTitle.." "..msg.Friends[i].userMount.." "..msg.Friends[i].sex)
table.insert(curfriendAllList,msg.Friends[i])
end
end
@ -626,6 +684,7 @@ function this.GetMainPlayerNPCData(fun)
local MyGuildMemList = MyGuildManager.GetMyGuildMemList()
for i = 1, #MyGuildMemList do
if MyGuildMemList[i].roleUid ~= PlayerManager.uid then
LogBlue("MyGuildMemList[i] "..MyGuildMemList[i].userSkin.." "..MyGuildMemList[i].userTitle.." "..MyGuildMemList[i].userMount.." "..MyGuildMemList[i].sex)
table.insert(curfriendAllList,MyGuildMemList[i])
end
end
@ -655,6 +714,7 @@ function this.GetMainPlayerNPCData2(fun)
local currankAllList = {}
for i = 1, 25 do
if rankAllList[i] and rankAllList[i].uid ~= PlayerManager.uid then
LogBlue("rankAllList[i] "..rankAllList[i].userSkin.." "..rankAllList[i].userTitle.." "..rankAllList[i].userMount.." "..rankAllList[i].sex)
table.insert(currankAllList,rankAllList[i])
end
end
@ -696,6 +756,9 @@ function this.GetMainPlayerNPCData3(fun)
singleUserData.userName = NameManager.GetLocalRandomName()
singleUserData.sex = math.random(0,1)
singleUserData.uid = 1000 + i
singleUserData.userSkin = PlayerManager.GetPlayerSkin()
singleUserData.userTitle = 0
singleUserData.userMount = 0
table.insert(upList,singleUserData)
end
end

View File

@ -218,10 +218,12 @@ function this.SetHeadsInfo(data,root,index,name,level)
npc:OnClose()
npc = nil
end
LogBlue("data.userSkin "..data.userSkin)
local curPlayerLiveViewData = {
skin = PlayerManager.GetPlayerSkin(),
sex = math.random(0,1),
ride = 80008,
skin = data.userSkin,
sex = data.sex,
ride = data.userMount,
designation = data.userTitle
}
npc = PlayerLiveView:New(this.livePrefab.transform,2, curPlayerLiveViewData)
npc:OnOpen(25,Vector3.New(0,-118.65,0),WALK_DIR.IDLE_LEFT)

View File

@ -11,6 +11,7 @@ function SettingPlayerRide:ctor(mainPanel, gameObject)
self:InitComponent(gameObject)
self:BindEvent()
end
local curUserRideId
--初始化组件(用于子类重写)
function SettingPlayerRide:InitComponent(gameObject)
this.live2dRootParent = Util.GetGameObject(gameObject, "live2dRootParent")
@ -74,19 +75,19 @@ function this.ShowPanelData()
local rideList = ConfigManager.GetAllConfigsDataByKey(ConfigName.PlayerHeadIcon,"Type",PlayerHeadIconType.Ride)
--设置滚动区信息
local curUserRideId = PlayerManager.GetPlayerRide()
local curUserRideConFig,isGet,isUser
curUserRideId = PlayerManager.GetPlayerRide()
local curUserRideConFig
this.scrollView:SetData(rideList,function(index,root)
if curUserRideId <= 0 and index == 1 then
curUserRideConFig,isGet,isUser = rideList[index],PlayerManager.userMountList[rideList[index].Id],curUserRideId == rideList[index].Id
curUserRideConFig = rideList[index]
end
this.ShowRideInfo(root,rideList[index])
end, not false, not false)
if curUserRideId > 0 then
local data = ConfigManager.GetConfigData(ConfigName.PlayerHeadIcon,curUserRideId)
this.SingleRideClickShowInfo(data,true,true)
this.SingleRideClickShowInfo(data)
else
this.SingleRideClickShowInfo(curUserRideConFig,isGet,isUser)
this.SingleRideClickShowInfo(curUserRideConFig)
end
end
@ -112,14 +113,15 @@ function this.ShowRideInfo(go,data)
noGetImage:SetActive(not isGet)
GetImage:SetActive(isUser)
Util.AddOnceClick(go, function()
setImage:SetActive(true)
this.SingleRideClickShowInfo(data,isGet,isUser)
this.SingleRideClickShowInfo(data)
end)
end
function this.SingleRideClickShowInfo(data,isGet,isUser)
function this.SingleRideClickShowInfo(data)
curPlayerHeadIconConfig = data
local isGet,isUser = PlayerManager.userMountList[curPlayerHeadIconConfig.Id],curUserRideId == curPlayerHeadIconConfig.Id
curItemConfig = ConfigManager.GetConfigData(ConfigName.ItemConfig,curPlayerHeadIconConfig.ItemId)
local rideData = PlayerManager.userMountList[curPlayerHeadIconConfig.Id]
this.name.text = curItemConfig.Name
this.getInfo.text = curItemConfig.ItemDescribe
this.scrollViewPro:SetData(curPlayerHeadIconConfig.UnlockProperty,function(index,root)
@ -135,7 +137,7 @@ function this.SingleRideClickShowInfo(data,isGet,isUser)
end
local setateImageStr = curPlayerHeadIconConfig.Time == 0 and "c_zuoqi_yongjiu_zh" or "c_zuoqi_xianshi_zh"
this.stateImg.sprite = Util.LoadSprite(setateImageStr)
this.lefeTime.text = curPlayerHeadIconConfig.Time == 0 and "" or "到期时间:"
this.lefeTime.text = curPlayerHeadIconConfig.Time == 0 and "" or "到期时间:"..TimeStampToDateStr(rideData.overTime)
if live2dRoot then
live2dRoot:OnClose()
end
@ -163,12 +165,14 @@ function this.SingleRideClickShowInfo(data,isGet,isUser)
PlayerManager.SetPlayerRide(curPlayerHeadIconConfig.Id)
this.ShowPanelData()
PlayerManager.SetisRefreshMainPanelNpc(true)
PopupTipPanel.ShowTip("已骑乘坐骑!")
end)
elseif isGet and isUser then
NetManager.RequestChangeModifyDecoration(3,0,function()
PlayerManager.SetPlayerRide(0)
this.ShowPanelData()
PlayerManager.SetisRefreshMainPanelNpc(true)
PopupTipPanel.ShowTip("已取消骑乘!")
end)
end
end)

View File

@ -1,21 +1,6 @@
--时装
local SettingPlayerSkin = quick_class("SettingPlayerSkin")
local this = SettingPlayerSkin
-- local playerSkinConFig --= ConfigManager.GetAllConfigsDataByKey(ConfigName.ItemConfig, "ItemType", ItemType.Skin)
-- local proList = {}
-- local skinList = {}
-- local curSkinId = 0
-- local curSkinItemConFig = {}--ItemConfig
-- local curSkinConFig = {}--PlayerAppearance
-- local parentGo = nil
-- local skinLive
-- local skinLiveStr
local playerLiveView--view
-- local posAddIndex = 0
-- local posJianIndex = 0
-- local curIndex = 0
-- local curDataIndex = 0
-- local isLicckBtn = false
function SettingPlayerSkin:ctor(mainPanel, gameObject)
self.mainPanel = mainPanel
self.gameObject = gameObject
@ -24,79 +9,11 @@ function SettingPlayerSkin:ctor(mainPanel, gameObject)
end
--初始化组件(用于子类重写)
function SettingPlayerSkin:InitComponent(gameObject)
-- parentGo = gameObject
this.live2dRootParent = Util.GetGameObject(gameObject, "live2dRootParent")
-- this.live2dRootParent2 = Util.GetGameObject(gameObject, "live2dRootParent2")
-- this.name = Util.GetGameObject(gameObject, "name/Text"):GetComponent("Text")
-- this.getInfo = Util.GetGameObject(gameObject, "skinProInfo/getInfo"):GetComponent("Text")
-- this.proListParent = Util.GetGameObject(gameObject, "skinProInfo/pro")
-- proList = {}
-- for i = 1, 3 do
-- proList[i] = Util.GetGameObject(gameObject, "skinProInfo/pro/pro ("..i..")")
-- end
-- this.setImage = Util.GetGameObject(gameObject, "setImage")
-- this.grid = Util.GetGameObject(gameObject, "rect/grid")
-- skinList = {}
-- --for i = 1, 5 do
-- -- skinList[i] = Util.GetGameObject(gameObject, "rect/grid/itemPre ("..i..")")
-- --end
-- this.goToBtn = Util.GetGameObject(gameObject, "goToBtn")
-- this.goToBtnText = Util.GetGameObject(gameObject, "goToBtn/Text"):GetComponent("Text")
-- this.Info = Util.GetGameObject(gameObject, "skinProInfo/Info"):GetComponent("Text")
-- this.rightBtn = Util.GetGameObject(gameObject, "rightBtn")
-- this.leftBtn = Util.GetGameObject(gameObject, "leftBtn")
-- this.itemPre = Util.GetGameObject(self.gameObject, "itemPre")
end
--绑定事件(用于子类重写)
function SettingPlayerSkin:BindEvent()
--Util.AddClick(this.cdKey, function()
-- UIManager.OpenPanel(UIName.CDKeyExchangePanel)
--end)
-- Util.AddOnceClick(this.rightBtn, function()
-- if not isLicckBtn then
-- isLicckBtn = true
-- curIndex = curIndex - 1
-- curDataIndex = curDataIndex + 1
-- this.grid.transform:DOLocalMove(Vector3.New(curIndex*440,0,0), 0.3, false):OnComplete(function ()
-- Log("移动完成")
-- if curDataIndex > #playerSkinConFig then
-- curDataIndex = 1
-- end
-- this.OnShowCurSkinProData(playerSkinConFig[curDataIndex].Id)
-- local curGo = this.grid.transform:GetChild(0).transform
-- curGo.transform:SetAsLastSibling()
-- posAddIndex = posAddIndex + 1
-- posJianIndex = posJianIndex + 1
-- curGo.transform.localPosition=Vector3.New(posAddIndex*440,0,0)
-- isLicckBtn = false
-- end):SetEase(Ease.Linear)
-- end
-- end)
-- Util.AddOnceClick(this.leftBtn, function()
-- if not isLicckBtn then
-- isLicckBtn = true
-- curIndex = curIndex + 1
-- curDataIndex = curDataIndex - 1
-- this.grid.transform:DOLocalMove(Vector3.New(curIndex*440,0,0), 0.3, false):OnComplete(function ()
-- Log("移动完成")
-- if curDataIndex < 1 then
-- curDataIndex = #playerSkinConFig
-- end
-- this.OnShowCurSkinProData(playerSkinConFig[curDataIndex].Id)
-- posAddIndex = posAddIndex - 1
-- posJianIndex = posJianIndex - 1
-- local curGo = this.grid.transform:GetChild(#playerSkinConFig - 1).transform
-- curGo.transform:SetAsFirstSibling()
-- curGo.transform.localPosition=Vector3.New(posJianIndex*440,0,0)
-- isLicckBtn = false
-- end):SetEase(Ease.Linear)
-- end
-- end)
end
--添加事件监听(用于子类重写)
@ -110,218 +27,22 @@ function SettingPlayerSkin:RemoveListener()
end
--界面打开时调用(用于子类重写)
function SettingPlayerSkin:OnOpen()
-- playerSkinConFig = ConfigManager.GetAllConfigsDataByKey(ConfigName.ItemConfig, "ItemType", ItemType.Skin)
end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function SettingPlayerSkin:OnShow()
-- Util.ClearChild(this.grid.transform)
-- skinList = {}
-- if #playerSkinConFig < 5 then
-- for i = 1, #playerSkinConFig do
-- table.insert(playerSkinConFig,playerSkinConFig[i])
-- end
-- end
-- this.OnShowCurSkinProData(PlayerManager.skin > 0 and PlayerManager.skin or playerSkinConFig[1].Id)
-- this.OnShowAllSkinGrid()
-- posAddIndex = #playerSkinConFig
-- posJianIndex = 1
if playerLiveView == nil then
playerLiveView = SubUIManager.Open(SubUIConfig.PlayerLiveView, this.live2dRootParent.transform)
end
playerLiveView:OnOpen()
end
--坐骑属性展示
function this.OnShowCurSkinProData(skinId)
curSkinId = skinId > 0 and skinId or playerSkinConFig[1].Id
curSkinItemConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig,curSkinId)
curSkinConFig = ConfigManager.GetConfigData(ConfigName.PlayerAppearance,curSkinId)
if curSkinConFig == nil then return end
--this.live2dRootParent = Util.GetGameObject(gameObject, "live2dRootParent")--:GetComponent("Text")
this.name.text = GetLanguageStrById(curSkinItemConFig.Name)
this.getInfo.text = GetLanguageStrById(curSkinConFig.Description)
this.Info.text = GetLanguageStrById(curSkinItemConFig.ItemDescribe)
local curproInfoList = this.GetCurSkinAllPro()
--属性展示
for i = 1, math.max(#proList, #curproInfoList) do
local go = proList[i]
if not go then
go=newObject(proList[1])
go.transform:SetParent(this.proListParent.transform)
go.transform.localScale = Vector3.one
go.transform.localPosition=Vector3.zero;
go.gameObject.name = "pro (".. i ..")"
proList[i] = go
end
go.gameObject:SetActive(false)
end
for i = 1, #curproInfoList do
proList[i]:SetActive(true)
Util.GetGameObject(proList[i], "proName"):GetComponent("Text").text = GetLanguageStrById(curproInfoList[i].name)..":"
Util.GetGameObject(proList[i], "proValue"):GetComponent("Text").text = "+"..curproInfoList[i].vale
end
if skinLive then
poolManager:UnLoadLive(skinLiveStr, skinLive, PoolManager.AssetType.GameObject)
skinLive = nil
end
skinLiveStr = GetResourcePath(ConfigManager.GetConfigData(ConfigName.PlayerAppearance,curSkinId).Live)
skinLive = poolManager:LoadLive(skinLiveStr, this.live2dRootParent2.transform, Vector3.one, Vector3.zero)
--满级显隐
this.GoToBtnFun()
end
--当前级属所有性获取
function this.GetCurSkinAllPro()
local proList = {}
local curPlayerMountLevelUp = curSkinConFig.Property
if curPlayerMountLevelUp then
for i = 1, #curPlayerMountLevelUp do
table.insert(proList,{name = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig,curPlayerMountLevelUp[i][1]).Info),
vale = curPlayerMountLevelUp[i][2]})
end
end
return proList
end
--所有坐骑展示
function this.OnShowAllSkinGrid()
for i = 1, math.max(#skinList, #playerSkinConFig) do
local go = skinList[i]
if not go then
go=newObject(this.itemPre)
go.transform:SetParent(this.grid.transform)
go.transform.localScale = Vector3.one
go.transform.localPosition=Vector3.zero;
go.gameObject.name = "itemPre (".. i ..")"
skinList[i] = go --440 = 362 + 80
skinList[i].transform.localPosition=Vector3.New(i*440,0,0)
end
go.gameObject:SetActive(false)
end
this.RefreshAllSkinData()
curIndex = -3
this.grid.transform.localPosition=Vector3.New(curIndex*440)
this.FirstSetGridPos(curIndex,curDataIndex)
end
function this.GoToBtnFun()
local btnState = 0
if BagManager.GetItemCountById(curSkinId) > 0 then--获得
this.goToBtnText.text = Language[10202]
btnState = 1
if curSkinId == PlayerManager.skin then--获得并使用
this.goToBtnText.text = Language[11868]
btnState = 2
end
else--未获得
this.goToBtnText.text = Language[11869]
end
Util.AddOnceClick(this.goToBtn, function()
if btnState == 0 then
JumpManager.GoJump(ConfigManager.GetConfigData(ConfigName.ItemConfig,curSkinId).Jump[1])
elseif btnState == 1 then
NetManager.RequestChangeModifyDecoration(4, curSkinId, function ()
PopupTipPanel.ShowTip(Language[11850])
PlayerManager.SetPlayerSkin(curSkinId)
this.RefreshAllSkinData()
FormationManager.UserPowerChanged()
this.GoToBtnFun()
if playerLiveView then
playerLiveView:OnOpen()
end
end)
elseif btnState == 2 then
NetManager.RequestChangeModifyDecoration(4, 0, function ()
PopupTipPanel.ShowTip(Language[11870])
PlayerManager.SetPlayerSkin(0)
this.RefreshAllSkinData()
FormationManager.UserPowerChanged()
this.GoToBtnFun()
if playerLiveView then
playerLiveView:OnOpen()
end
end)
end
end)
end
function this.RefreshAllSkinData()
for i = 1, #playerSkinConFig do
if curSkinId == playerSkinConFig[i].Id then
curDataIndex = i
end
skinList[i]:SetActive(true)
Util.GetGameObject(skinList[i], "iconMask/icon"):GetComponent("Image").sprite =
Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.PlayerAppearance,playerSkinConFig[i].Id).Painting))
--Util.SetGray(skinList[i], not (BagManager.GetItemCountById(playerSkinConFig[i].Id) > 0))
Util.GetGameObject(skinList[i], "noGetImage"):SetActive(BagManager.GetItemCountById(playerSkinConFig[i].Id) <= 0)
Util.GetGameObject(skinList[i], "GetImage"):SetActive(playerSkinConFig[i].Id == PlayerManager.skin)
end
end
function this.FirstSetGridPos(_curIndex,curSelectIndex)
Log("FirstSetGridPos ".._curIndex .." "..curSelectIndex)
local num = math.abs(curSelectIndex) - math.abs(_curIndex)
Log("FirstSetGridPos "..num)
if num < 0 then
num = math.abs(num)
for i = _curIndex+1, _curIndex+num do
curIndex = i
this.grid.transform:DOLocalMove(Vector3.New(curIndex*440,0,0), 0.01, false):OnComplete(function ()
Log("移动完成")
local dataIndex = math.abs(curIndex)
if dataIndex > #playerSkinConFig then
dataIndex = dataIndex % #playerSkinConFig
end
if dataIndex == 0 then
dataIndex = #playerSkinConFig
end
this.OnShowCurSkinProData(playerSkinConFig[dataIndex].Id)
posAddIndex = posAddIndex - 1
posJianIndex = posJianIndex - 1
local curGo = this.grid.transform:GetChild(#playerSkinConFig - 1).transform
curGo.transform:SetAsFirstSibling()
curGo.transform.localPosition=Vector3.New(posJianIndex*440,0,0)
end):SetEase(Ease.Linear)
end
elseif num > 0 then
num = math.abs(num)
for i = _curIndex-1, _curIndex-num,-1 do
curIndex = i
this.grid.transform:DOLocalMove(Vector3.New(curIndex*440,0,0), 0.01 , false):OnComplete(function ()
Log("移动完成")
local dataIndex = math.abs(curIndex)
if dataIndex > #playerSkinConFig then
dataIndex = dataIndex % #playerSkinConFig
end
if dataIndex == 0 then
dataIndex = #playerSkinConFig
end
this.OnShowCurSkinProData(playerSkinConFig[dataIndex].Id)
local curGo = this.grid.transform:GetChild(0).transform
curGo.transform:SetAsLastSibling()
posAddIndex = posAddIndex + 1
posJianIndex = posJianIndex + 1
curGo.transform.localPosition=Vector3.New(posAddIndex*440,0,0)
end):SetEase(Ease.Linear)
end
end
end
--界面关闭时调用(用于子类重写)
function SettingPlayerSkin:OnClose()
-- parentGo = nil
-- if skinLive then
-- poolManager:UnLoadLive(skinLiveStr, skinLive, PoolManager.AssetType.GameObject)
-- skinLive = nil
-- end
-- Util.ClearChild(this.grid.transform)
-- skinList = {}
end
--界面销毁时调用(用于子类重写)
function SettingPlayerSkin:OnDestroy()
-- if playerLiveView then
-- SubUIManager.Close(playerLiveView)
-- playerLiveView = nil
-- end
end
return SettingPlayerSkin

View File

@ -20,14 +20,11 @@ function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer)
if _Type == 2 then
instance.PlayerLiveViewData = PlayerLiveViewData
else
-- PlayerManager.ride = 80008
-- PlayerManager.skin = 80012
-- PlayerManager.designation = 80010
instance.PlayerLiveViewData = {
ride = PlayerManager.ride,
skin = PlayerManager.skin,
ride = PlayerManager.GetPlayerRide(),
skin = PlayerManager.GetPlayerSkin(),
sex = NameManager.roleSex,
designation = PlayerManager.designation
designation = PlayerManager.GetPlayerDesignation()
}
end
instance.orginLayer = orginLayer
@ -161,7 +158,7 @@ end
function PlayerLiveView:SetWalkDir(dir)
LogBlue("PlayerLiveView dir : "..dir)
-- LogBlue("PlayerLiveView dir : "..dir)
if dir == WALK_DIR.IDLE_FRONT then-- 站立_向前
if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then
self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_FRONT,RIDE_WALK_DIR.IDLE_FRONT)
@ -256,15 +253,15 @@ function PlayerLiveView:SetWalkDir(dir)
end
function PlayerLiveView:SetWalkDirInfo(playerDir,RideDir)
if playerDir and not RideDir then
LogBlue("PlayerLiveView playerDir : "..playerDir.animation .." ".. playerDir.y)
-- LogBlue("PlayerLiveView playerDir : "..playerDir.animation .." ".. playerDir.y)
self.playerLiveSkeletonGraphic.transform.localEulerAngles = Vector3.New(0, playerDir.y, 0)
self.playerLiveSkeletonGraphic.AnimationState:SetAnimation(0, playerDir.animation, true)
elseif not playerDir and RideDir then
LogBlue("PlayerLiveView playerDir : "..RideDir.animation .." ".. RideDir.y)
-- LogBlue("PlayerLiveView playerDir : "..RideDir.animation .." ".. RideDir.y)
self.rideLivSkeletonGraphic.transform.localEulerAngles = Vector3.New(0, RideDir.y, 0)
self.rideLivSkeletonGraphic.AnimationState:SetAnimation(0, RideDir.animation, true)
elseif playerDir and RideDir then
LogBlue("PlayerLiveView playerDir : "..playerDir.animation .." ".. playerDir.y.." RideDir : "..RideDir.animation .." ".. RideDir.y)
-- LogBlue("PlayerLiveView playerDir : "..playerDir.animation .." ".. playerDir.y.." RideDir : "..RideDir.animation .." ".. RideDir.y)
self.playerLiveSkeletonGraphic.transform.localEulerAngles = Vector3.New(0, playerDir.y, 0)
self.playerLiveSkeletonGraphic.AnimationState:SetAnimation(0, playerDir.animation, true)
self.rideLivSkeletonGraphic.transform.localEulerAngles = Vector3.New(0, RideDir.y, 0)