摘星阁脚本预设提交

dev_chengFeng
yuanshuai 2022-09-01 17:30:15 +08:00
parent e3b1b3a967
commit 96f8605bb1
16 changed files with 8079 additions and 179 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c245d294a961fdb4d997aef2a0db8903
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -467,6 +467,7 @@ UIName = {
WeekCardPanel=475, --新周卡界面
RatioNumberGamePanel=476, --数字游戏界面
RatioNumberLevelPanel=477, --数字游戏界面
HomeLandEquipPopup=478, --摘星阁弹窗
}
SubUIConfig = {

View File

@ -60,7 +60,6 @@ EQUIP_ISLOCKED_FIELD = protobuf.FieldDescriptor();
EQUIP_EXP_FIELD = protobuf.FieldDescriptor();
EQUIP_TREELV_FIELD = protobuf.FieldDescriptor();
EQUIP_FOURSPIRIT_FIELD = protobuf.FieldDescriptor();
EQUIP_HOMEEQUIPLV_FIELD = protobuf.FieldDescriptor();
SOULPOS = protobuf.Descriptor();
SOULPOS_EQUIPID_FIELD = protobuf.FieldDescriptor();
SOULPOS_POSITION_FIELD = protobuf.FieldDescriptor();
@ -70,6 +69,9 @@ HEROGODSOULINFO_HEROS_FIELD = protobuf.FieldDescriptor();
HEROBEBINDGODSOULINFO = protobuf.Descriptor();
HEROBEBINDGODSOULINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
HEROBEBINDGODSOULINFO_HEROID_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYINFO = protobuf.Descriptor();
EQUIPINTENSIFYINFO_LOCATION_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYINFO_STRONGLV_FIELD = protobuf.FieldDescriptor();
HERO = protobuf.Descriptor();
HERO_ID_FIELD = protobuf.FieldDescriptor();
HERO_HEROID_FIELD = protobuf.FieldDescriptor();
@ -90,6 +92,8 @@ HERO_GODSOULLIST_FIELD = protobuf.FieldDescriptor();
HERO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
HERO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
HERO_GODSEALS_FIELD = protobuf.FieldDescriptor();
HERO_EQUIPSTRONG_FIELD = protobuf.FieldDescriptor();
HERO_EQUIPADVANCELV_FIELD = protobuf.FieldDescriptor();
POKEMONINFO = protobuf.Descriptor();
POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor();
@ -865,9 +869,6 @@ LANDINFO = protobuf.Descriptor();
LANDINFO_ID_FIELD = protobuf.FieldDescriptor();
LANDINFO_ENDTIME_FIELD = protobuf.FieldDescriptor();
LANDINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYINFO = protobuf.Descriptor();
EQUIPINTENSIFYINFO_LOCATION_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYINFO_LVID_FIELD = protobuf.FieldDescriptor();
COMMKEYVAL = protobuf.Descriptor();
COMMKEYVAL_KEY_FIELD = protobuf.FieldDescriptor();
COMMKEYVAL_VAL_FIELD = protobuf.FieldDescriptor();
@ -1443,21 +1444,11 @@ EQUIP_FOURSPIRIT_FIELD.default_value = 0
EQUIP_FOURSPIRIT_FIELD.type = 5
EQUIP_FOURSPIRIT_FIELD.cpp_type = 1
EQUIP_HOMEEQUIPLV_FIELD.name = "homeEquipLv"
EQUIP_HOMEEQUIPLV_FIELD.full_name = ".rpc.protocols.Equip.homeEquipLv"
EQUIP_HOMEEQUIPLV_FIELD.number = 12
EQUIP_HOMEEQUIPLV_FIELD.index = 11
EQUIP_HOMEEQUIPLV_FIELD.label = 3
EQUIP_HOMEEQUIPLV_FIELD.has_default_value = false
EQUIP_HOMEEQUIPLV_FIELD.default_value = {}
EQUIP_HOMEEQUIPLV_FIELD.type = 5
EQUIP_HOMEEQUIPLV_FIELD.cpp_type = 1
EQUIP.name = "Equip"
EQUIP.full_name = ".rpc.protocols.Equip"
EQUIP.nested_types = {}
EQUIP.enum_types = {}
EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_MAINATTRIBUTE_FIELD, EQUIP_SECONDATTRIBUTE_FIELD, EQUIP_REBUILDLEVEL_FIELD, EQUIP_CREATETIME_FIELD, EQUIP_SKILLID_FIELD, EQUIP_ISLOCKED_FIELD, EQUIP_EXP_FIELD, EQUIP_TREELV_FIELD, EQUIP_FOURSPIRIT_FIELD, EQUIP_HOMEEQUIPLV_FIELD}
EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_MAINATTRIBUTE_FIELD, EQUIP_SECONDATTRIBUTE_FIELD, EQUIP_REBUILDLEVEL_FIELD, EQUIP_CREATETIME_FIELD, EQUIP_SKILLID_FIELD, EQUIP_ISLOCKED_FIELD, EQUIP_EXP_FIELD, EQUIP_TREELV_FIELD, EQUIP_FOURSPIRIT_FIELD}
EQUIP.is_extendable = false
EQUIP.extensions = {}
SOULPOS_EQUIPID_FIELD.name = "equipId"
@ -1541,6 +1532,33 @@ HEROBEBINDGODSOULINFO.enum_types = {}
HEROBEBINDGODSOULINFO.fields = {HEROBEBINDGODSOULINFO_LEVEL_FIELD, HEROBEBINDGODSOULINFO_HEROID_FIELD}
HEROBEBINDGODSOULINFO.is_extendable = false
HEROBEBINDGODSOULINFO.extensions = {}
EQUIPINTENSIFYINFO_LOCATION_FIELD.name = "location"
EQUIPINTENSIFYINFO_LOCATION_FIELD.full_name = ".rpc.protocols.EquipIntensifyInfo.location"
EQUIPINTENSIFYINFO_LOCATION_FIELD.number = 1
EQUIPINTENSIFYINFO_LOCATION_FIELD.index = 0
EQUIPINTENSIFYINFO_LOCATION_FIELD.label = 1
EQUIPINTENSIFYINFO_LOCATION_FIELD.has_default_value = false
EQUIPINTENSIFYINFO_LOCATION_FIELD.default_value = 0
EQUIPINTENSIFYINFO_LOCATION_FIELD.type = 5
EQUIPINTENSIFYINFO_LOCATION_FIELD.cpp_type = 1
EQUIPINTENSIFYINFO_STRONGLV_FIELD.name = "strongLv"
EQUIPINTENSIFYINFO_STRONGLV_FIELD.full_name = ".rpc.protocols.EquipIntensifyInfo.strongLv"
EQUIPINTENSIFYINFO_STRONGLV_FIELD.number = 2
EQUIPINTENSIFYINFO_STRONGLV_FIELD.index = 1
EQUIPINTENSIFYINFO_STRONGLV_FIELD.label = 1
EQUIPINTENSIFYINFO_STRONGLV_FIELD.has_default_value = false
EQUIPINTENSIFYINFO_STRONGLV_FIELD.default_value = 0
EQUIPINTENSIFYINFO_STRONGLV_FIELD.type = 5
EQUIPINTENSIFYINFO_STRONGLV_FIELD.cpp_type = 1
EQUIPINTENSIFYINFO.name = "EquipIntensifyInfo"
EQUIPINTENSIFYINFO.full_name = ".rpc.protocols.EquipIntensifyInfo"
EQUIPINTENSIFYINFO.nested_types = {}
EQUIPINTENSIFYINFO.enum_types = {}
EQUIPINTENSIFYINFO.fields = {EQUIPINTENSIFYINFO_LOCATION_FIELD, EQUIPINTENSIFYINFO_STRONGLV_FIELD}
EQUIPINTENSIFYINFO.is_extendable = false
EQUIPINTENSIFYINFO.extensions = {}
HERO_ID_FIELD.name = "id"
HERO_ID_FIELD.full_name = ".rpc.protocols.Hero.id"
HERO_ID_FIELD.number = 1
@ -1734,11 +1752,32 @@ HERO_GODSEALS_FIELD.message_type = SOULPOS
HERO_GODSEALS_FIELD.type = 11
HERO_GODSEALS_FIELD.cpp_type = 10
HERO_EQUIPSTRONG_FIELD.name = "equipStrong"
HERO_EQUIPSTRONG_FIELD.full_name = ".rpc.protocols.Hero.equipStrong"
HERO_EQUIPSTRONG_FIELD.number = 21
HERO_EQUIPSTRONG_FIELD.index = 19
HERO_EQUIPSTRONG_FIELD.label = 3
HERO_EQUIPSTRONG_FIELD.has_default_value = false
HERO_EQUIPSTRONG_FIELD.default_value = {}
HERO_EQUIPSTRONG_FIELD.message_type = EQUIPINTENSIFYINFO
HERO_EQUIPSTRONG_FIELD.type = 11
HERO_EQUIPSTRONG_FIELD.cpp_type = 10
HERO_EQUIPADVANCELV_FIELD.name = "equipAdvanceLv"
HERO_EQUIPADVANCELV_FIELD.full_name = ".rpc.protocols.Hero.equipAdvanceLv"
HERO_EQUIPADVANCELV_FIELD.number = 22
HERO_EQUIPADVANCELV_FIELD.index = 20
HERO_EQUIPADVANCELV_FIELD.label = 1
HERO_EQUIPADVANCELV_FIELD.has_default_value = false
HERO_EQUIPADVANCELV_FIELD.default_value = 0
HERO_EQUIPADVANCELV_FIELD.type = 5
HERO_EQUIPADVANCELV_FIELD.cpp_type = 1
HERO.name = "Hero"
HERO.full_name = ".rpc.protocols.Hero"
HERO.nested_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_GODSOULLIST_FIELD, HERO_GODSOULLV_FIELD, HERO_PROPERTYID_FIELD, HERO_GODSEALS_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_GODSOULLIST_FIELD, HERO_GODSOULLV_FIELD, HERO_PROPERTYID_FIELD, HERO_GODSEALS_FIELD, HERO_EQUIPSTRONG_FIELD, HERO_EQUIPADVANCELV_FIELD}
HERO.is_extendable = false
HERO.extensions = {}
POKEMONINFO_TEMPID_FIELD.name = "tempId"
@ -9136,33 +9175,6 @@ LANDINFO.enum_types = {}
LANDINFO.fields = {LANDINFO_ID_FIELD, LANDINFO_ENDTIME_FIELD, LANDINFO_HEROTID_FIELD}
LANDINFO.is_extendable = false
LANDINFO.extensions = {}
EQUIPINTENSIFYINFO_LOCATION_FIELD.name = "location"
EQUIPINTENSIFYINFO_LOCATION_FIELD.full_name = ".rpc.protocols.EquipIntensifyInfo.location"
EQUIPINTENSIFYINFO_LOCATION_FIELD.number = 1
EQUIPINTENSIFYINFO_LOCATION_FIELD.index = 0
EQUIPINTENSIFYINFO_LOCATION_FIELD.label = 1
EQUIPINTENSIFYINFO_LOCATION_FIELD.has_default_value = false
EQUIPINTENSIFYINFO_LOCATION_FIELD.default_value = 0
EQUIPINTENSIFYINFO_LOCATION_FIELD.type = 5
EQUIPINTENSIFYINFO_LOCATION_FIELD.cpp_type = 1
EQUIPINTENSIFYINFO_LVID_FIELD.name = "lvId"
EQUIPINTENSIFYINFO_LVID_FIELD.full_name = ".rpc.protocols.EquipIntensifyInfo.lvId"
EQUIPINTENSIFYINFO_LVID_FIELD.number = 2
EQUIPINTENSIFYINFO_LVID_FIELD.index = 1
EQUIPINTENSIFYINFO_LVID_FIELD.label = 1
EQUIPINTENSIFYINFO_LVID_FIELD.has_default_value = false
EQUIPINTENSIFYINFO_LVID_FIELD.default_value = 0
EQUIPINTENSIFYINFO_LVID_FIELD.type = 5
EQUIPINTENSIFYINFO_LVID_FIELD.cpp_type = 1
EQUIPINTENSIFYINFO.name = "EquipIntensifyInfo"
EQUIPINTENSIFYINFO.full_name = ".rpc.protocols.EquipIntensifyInfo"
EQUIPINTENSIFYINFO.nested_types = {}
EQUIPINTENSIFYINFO.enum_types = {}
EQUIPINTENSIFYINFO.fields = {EQUIPINTENSIFYINFO_LOCATION_FIELD, EQUIPINTENSIFYINFO_LVID_FIELD}
EQUIPINTENSIFYINFO.is_extendable = false
EQUIPINTENSIFYINFO.extensions = {}
COMMKEYVAL_KEY_FIELD.name = "key"
COMMKEYVAL_KEY_FIELD.full_name = ".rpc.protocols.CommKeyVal.key"
COMMKEYVAL_KEY_FIELD.number = 1

View File

@ -291,6 +291,8 @@ CHALLENGEDEATHPATHRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
CHALLENGEDEATHPATHRESPONSE_DAMAGE_FIELD = protobuf.FieldDescriptor();
CHALLENGEDEATHPATHRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
CHALLENGEDEATHPATHRESPONSE_HISTORYMAX_FIELD = protobuf.FieldDescriptor();
CARGRAPRECORDREQUEST = protobuf.Descriptor();
CARGRAPRECORDREQUEST_PAGE_FIELD = protobuf.FieldDescriptor();
CARGRAPRECORDRESPONSE = protobuf.Descriptor();
CARGRAPRECORDRESPONSE_CARCHALLENGEITEM_FIELD = protobuf.FieldDescriptor();
REWARDINFO = protobuf.Descriptor();
@ -3044,6 +3046,23 @@ CHALLENGEDEATHPATHRESPONSE.enum_types = {}
CHALLENGEDEATHPATHRESPONSE.fields = {CHALLENGEDEATHPATHRESPONSE_FIGHTDATA_FIELD, CHALLENGEDEATHPATHRESPONSE_DAMAGE_FIELD, CHALLENGEDEATHPATHRESPONSE_DROP_FIELD, CHALLENGEDEATHPATHRESPONSE_HISTORYMAX_FIELD}
CHALLENGEDEATHPATHRESPONSE.is_extendable = false
CHALLENGEDEATHPATHRESPONSE.extensions = {}
CARGRAPRECORDREQUEST_PAGE_FIELD.name = "page"
CARGRAPRECORDREQUEST_PAGE_FIELD.full_name = ".rpc.protocols.CarGrapRecordRequest.page"
CARGRAPRECORDREQUEST_PAGE_FIELD.number = 1
CARGRAPRECORDREQUEST_PAGE_FIELD.index = 0
CARGRAPRECORDREQUEST_PAGE_FIELD.label = 1
CARGRAPRECORDREQUEST_PAGE_FIELD.has_default_value = false
CARGRAPRECORDREQUEST_PAGE_FIELD.default_value = 0
CARGRAPRECORDREQUEST_PAGE_FIELD.type = 5
CARGRAPRECORDREQUEST_PAGE_FIELD.cpp_type = 1
CARGRAPRECORDREQUEST.name = "CarGrapRecordRequest"
CARGRAPRECORDREQUEST.full_name = ".rpc.protocols.CarGrapRecordRequest"
CARGRAPRECORDREQUEST.nested_types = {}
CARGRAPRECORDREQUEST.enum_types = {}
CARGRAPRECORDREQUEST.fields = {CARGRAPRECORDREQUEST_PAGE_FIELD}
CARGRAPRECORDREQUEST.is_extendable = false
CARGRAPRECORDREQUEST.extensions = {}
CARGRAPRECORDRESPONSE_CARCHALLENGEITEM_FIELD.name = "carChallengeItem"
CARGRAPRECORDRESPONSE_CARCHALLENGEITEM_FIELD.full_name = ".rpc.protocols.CarGrapRecordResponse.carChallengeItem"
CARGRAPRECORDRESPONSE_CARCHALLENGEITEM_FIELD.number = 1
@ -3771,6 +3790,7 @@ GUILDCHALLENGEMESSAGERESPONSE.extensions = {}
CarChallengeItem = protobuf.Message(CARCHALLENGEITEM)
CarDelayProgressIndication = protobuf.Message(CARDELAYPROGRESSINDICATION)
CarGrapRecordRequest = protobuf.Message(CARGRAPRECORDREQUEST)
CarGrapRecordResponse = protobuf.Message(CARGRAPRECORDRESPONSE)
ChallengeDeathPathRequest = protobuf.Message(CHALLENGEDEATHPATHREQUEST)
ChallengeDeathPathResponse = protobuf.Message(CHALLENGEDEATHPATHRESPONSE)

View File

@ -321,6 +321,12 @@ USERLIKEHERORANKINFOREQUEST = protobuf.Descriptor();
USERLIKEHERORANKINFOREQUEST_RANKSUBID_FIELD = protobuf.FieldDescriptor();
USERLIKEHERORANKINFORESPONSE = protobuf.Descriptor();
USERLIKEHERORANKINFORESPONSE_HEROTID_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYREQUSET = protobuf.Descriptor();
EQUIPINTENSIFYREQUSET_HEROID_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYREQUSET_TYPE_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYRESPONSE = protobuf.Descriptor();
EQUIPINTENSIFYRESPONSE_INFOS_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD = protobuf.FieldDescriptor();
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
@ -3208,6 +3214,61 @@ USERLIKEHERORANKINFORESPONSE.enum_types = {}
USERLIKEHERORANKINFORESPONSE.fields = {USERLIKEHERORANKINFORESPONSE_HEROTID_FIELD}
USERLIKEHERORANKINFORESPONSE.is_extendable = false
USERLIKEHERORANKINFORESPONSE.extensions = {}
EQUIPINTENSIFYREQUSET_HEROID_FIELD.name = "heroId"
EQUIPINTENSIFYREQUSET_HEROID_FIELD.full_name = ".rpc.protocols.EquipIntensifyRequset.heroId"
EQUIPINTENSIFYREQUSET_HEROID_FIELD.number = 1
EQUIPINTENSIFYREQUSET_HEROID_FIELD.index = 0
EQUIPINTENSIFYREQUSET_HEROID_FIELD.label = 1
EQUIPINTENSIFYREQUSET_HEROID_FIELD.has_default_value = false
EQUIPINTENSIFYREQUSET_HEROID_FIELD.default_value = ""
EQUIPINTENSIFYREQUSET_HEROID_FIELD.type = 9
EQUIPINTENSIFYREQUSET_HEROID_FIELD.cpp_type = 9
EQUIPINTENSIFYREQUSET_TYPE_FIELD.name = "type"
EQUIPINTENSIFYREQUSET_TYPE_FIELD.full_name = ".rpc.protocols.EquipIntensifyRequset.type"
EQUIPINTENSIFYREQUSET_TYPE_FIELD.number = 2
EQUIPINTENSIFYREQUSET_TYPE_FIELD.index = 1
EQUIPINTENSIFYREQUSET_TYPE_FIELD.label = 1
EQUIPINTENSIFYREQUSET_TYPE_FIELD.has_default_value = false
EQUIPINTENSIFYREQUSET_TYPE_FIELD.default_value = 0
EQUIPINTENSIFYREQUSET_TYPE_FIELD.type = 5
EQUIPINTENSIFYREQUSET_TYPE_FIELD.cpp_type = 1
EQUIPINTENSIFYREQUSET.name = "EquipIntensifyRequset"
EQUIPINTENSIFYREQUSET.full_name = ".rpc.protocols.EquipIntensifyRequset"
EQUIPINTENSIFYREQUSET.nested_types = {}
EQUIPINTENSIFYREQUSET.enum_types = {}
EQUIPINTENSIFYREQUSET.fields = {EQUIPINTENSIFYREQUSET_HEROID_FIELD, EQUIPINTENSIFYREQUSET_TYPE_FIELD}
EQUIPINTENSIFYREQUSET.is_extendable = false
EQUIPINTENSIFYREQUSET.extensions = {}
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.name = "infos"
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.full_name = ".rpc.protocols.EquipIntensifyResponse.infos"
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.number = 1
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.index = 0
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.label = 3
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.has_default_value = false
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.default_value = {}
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.message_type = CommonProto_pb.EQUIPINTENSIFYINFO
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.type = 11
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.cpp_type = 10
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.name = "equipRankUp"
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.full_name = ".rpc.protocols.EquipIntensifyResponse.equipRankUp"
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.number = 2
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.index = 1
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.label = 1
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.has_default_value = false
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.default_value = 0
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.type = 5
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.cpp_type = 1
EQUIPINTENSIFYRESPONSE.name = "EquipIntensifyResponse"
EQUIPINTENSIFYRESPONSE.full_name = ".rpc.protocols.EquipIntensifyResponse"
EQUIPINTENSIFYRESPONSE.nested_types = {}
EQUIPINTENSIFYRESPONSE.enum_types = {}
EQUIPINTENSIFYRESPONSE.fields = {EQUIPINTENSIFYRESPONSE_INFOS_FIELD, EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD}
EQUIPINTENSIFYRESPONSE.is_extendable = false
EQUIPINTENSIFYRESPONSE.extensions = {}
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
@ -3225,6 +3286,8 @@ DoHeroChangeResponse = protobuf.Message(DOHEROCHANGERESPONSE)
DrawHeroRequest = protobuf.Message(DRAWHEROREQUEST)
DrawHeroResponse = protobuf.Message(DRAWHERORESPONSE)
EquipBookIndication = protobuf.Message(EQUIPBOOKINDICATION)
EquipIntensifyRequset = protobuf.Message(EQUIPINTENSIFYREQUSET)
EquipIntensifyResponse = protobuf.Message(EQUIPINTENSIFYRESPONSE)
EquipUnLoadOptRequest = protobuf.Message(EQUIPUNLOADOPTREQUEST)
EquipWearRequest = protobuf.Message(EQUIPWEARREQUEST)
EspecialEquipBackRequest = protobuf.Message(ESPECIALEQUIPBACKREQUEST)

View File

@ -704,11 +704,6 @@ WANDERDISPATCHRESPONSE = protobuf.Descriptor();
WANDERDISPATCHRESPONSE_LAND_FIELD = protobuf.FieldDescriptor();
WANDERDISPATCHRESPONSE_HEROTIDS_FIELD = protobuf.FieldDescriptor();
WANDERDISPATCHRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYREQUSET = protobuf.Descriptor();
EQUIPINTENSIFYREQUSET_TYPE_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYRESPONSE = protobuf.Descriptor();
EQUIPINTENSIFYRESPONSE_INFOS_FIELD = protobuf.FieldDescriptor();
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD = protobuf.FieldDescriptor();
ARCHITECTUREUNLOCKINDICATION = protobuf.Descriptor();
ARCHITECTUREUNLOCKINDICATION_INFOS_FIELD = protobuf.FieldDescriptor();
QUERYWEEKCARDINFOREQUEST = protobuf.Descriptor();
@ -7172,51 +7167,6 @@ WANDERDISPATCHRESPONSE.enum_types = {}
WANDERDISPATCHRESPONSE.fields = {WANDERDISPATCHRESPONSE_LAND_FIELD, WANDERDISPATCHRESPONSE_HEROTIDS_FIELD, WANDERDISPATCHRESPONSE_DROP_FIELD}
WANDERDISPATCHRESPONSE.is_extendable = false
WANDERDISPATCHRESPONSE.extensions = {}
EQUIPINTENSIFYREQUSET_TYPE_FIELD.name = "type"
EQUIPINTENSIFYREQUSET_TYPE_FIELD.full_name = ".rpc.protocols.EquipIntensifyRequset.type"
EQUIPINTENSIFYREQUSET_TYPE_FIELD.number = 1
EQUIPINTENSIFYREQUSET_TYPE_FIELD.index = 0
EQUIPINTENSIFYREQUSET_TYPE_FIELD.label = 1
EQUIPINTENSIFYREQUSET_TYPE_FIELD.has_default_value = false
EQUIPINTENSIFYREQUSET_TYPE_FIELD.default_value = 0
EQUIPINTENSIFYREQUSET_TYPE_FIELD.type = 5
EQUIPINTENSIFYREQUSET_TYPE_FIELD.cpp_type = 1
EQUIPINTENSIFYREQUSET.name = "EquipIntensifyRequset"
EQUIPINTENSIFYREQUSET.full_name = ".rpc.protocols.EquipIntensifyRequset"
EQUIPINTENSIFYREQUSET.nested_types = {}
EQUIPINTENSIFYREQUSET.enum_types = {}
EQUIPINTENSIFYREQUSET.fields = {EQUIPINTENSIFYREQUSET_TYPE_FIELD}
EQUIPINTENSIFYREQUSET.is_extendable = false
EQUIPINTENSIFYREQUSET.extensions = {}
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.name = "infos"
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.full_name = ".rpc.protocols.EquipIntensifyResponse.infos"
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.number = 1
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.index = 0
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.label = 3
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.has_default_value = false
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.default_value = {}
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.message_type = CommonProto_pb.EQUIPINTENSIFYINFO
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.type = 11
EQUIPINTENSIFYRESPONSE_INFOS_FIELD.cpp_type = 10
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.name = "equipRankUp"
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.full_name = ".rpc.protocols.EquipIntensifyResponse.equipRankUp"
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.number = 2
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.index = 1
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.label = 1
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.has_default_value = false
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.default_value = 0
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.type = 5
EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD.cpp_type = 1
EQUIPINTENSIFYRESPONSE.name = "EquipIntensifyResponse"
EQUIPINTENSIFYRESPONSE.full_name = ".rpc.protocols.EquipIntensifyResponse"
EQUIPINTENSIFYRESPONSE.nested_types = {}
EQUIPINTENSIFYRESPONSE.enum_types = {}
EQUIPINTENSIFYRESPONSE.fields = {EQUIPINTENSIFYRESPONSE_INFOS_FIELD, EQUIPINTENSIFYRESPONSE_EQUIPRANKUP_FIELD}
EQUIPINTENSIFYRESPONSE.is_extendable = false
EQUIPINTENSIFYRESPONSE.extensions = {}
ARCHITECTUREUNLOCKINDICATION_INFOS_FIELD.name = "infos"
ARCHITECTUREUNLOCKINDICATION_INFOS_FIELD.full_name = ".rpc.protocols.ArchitectureUnlockIndication.infos"
ARCHITECTUREUNLOCKINDICATION_INFOS_FIELD.number = 1
@ -7586,8 +7536,6 @@ DailyChallengeRequest = protobuf.Message(DAILYCHALLENGEREQUEST)
DailyChallengeResponse = protobuf.Message(DAILYCHALLENGERESPONSE)
DelFriendRequest = protobuf.Message(DELFRIENDREQUEST)
DirectBuyIndication = protobuf.Message(DIRECTBUYINDICATION)
EquipIntensifyRequset = protobuf.Message(EQUIPINTENSIFYREQUSET)
EquipIntensifyResponse = protobuf.Message(EQUIPINTENSIFYRESPONSE)
EquipUpLevelRequest = protobuf.Message(EQUIPUPLEVELREQUEST)
EquipUpLevelResponse = protobuf.Message(EQUIPUPLEVELRESPONSE)
ErrorMsgResponse = protobuf.Message(ERRORMSGRESPONSE)

View File

@ -459,6 +459,16 @@ function this.GetHeroDatas(_msgHeroData, force, specialEffects,guildSkill)
heroData.equipIdList = _msgHeroData.equipIdList
heroData.talismanList = _msgHeroData.especialEquipLevel
heroData.jewels = _msgHeroData.jewels
---↓↓↓↓↓↓↓↓↓↓↓摘星阁
heroData.equipStrong={}
for i = 1, #_msgHeroData.equipStrong do
local _key=_msgHeroData.equipStrong[i].location
local _val=_msgHeroData.equipStrong[i].strongLv
heroData.equipStrong[_key]=_val
end
heroData.equipAdvanceLv=_msgHeroData.equipAdvanceLv --摘星阁装备突破数据
heroData.changeProId=_msgHeroData.propertyId
if (#_msgHeroData.soulPos >= 1) then
local soulPrintList = {}
@ -579,7 +589,7 @@ function this.InitUpdateEquipData(_equipData, heroData)
equipdata.id = equipdata.equipConfig.Id
equipdata.homeEquipLv = _equipData.homeEquipLv--摘星阁等级1试强化2是突破
-- LogWarn("--好友 摘星阁加持:"..tostring(_equipData.homeEquipLv[1]).." "..tostring(_equipData.homeEquipLv[2]))
equipdata.homeEquipLv = HomeLandManager.IdToLevel(_equipData.homeEquipLv[1],_equipData.homeEquipLv[2])
equipdata.homeEquipLv = {heroData.equipStrong[i], heroData.equipAdvanceLv}
if itemConfig[equipdata.id] then
equipdata.icon = GetResourcePath(itemConfig[equipdata.id].ResourceID)
else

View File

@ -181,6 +181,15 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
heroData.name = GetLanguageStrById(_configData.ReadingName)
heroData.property = heroData.changeProId
heroData.sortId = #heroDatas + 1
---↓↓↓↓↓↓↓↓↓↓↓摘星阁
heroData.equipStrong={}
for i = 1, #_msgHeroData.equipStrong do
local _key=_msgHeroData.equipStrong[i].location
local _val=_msgHeroData.equipStrong[i].strongLv
heroData.equipStrong[_key]=_val
end
heroData.equipAdvanceLv=_msgHeroData.equipAdvanceLv --摘星阁装备突破数据
heroData.harmonyGongMing = _msgHeroData.createtype
heroData.GetStar = function(index)

View File

@ -187,9 +187,9 @@ Hero_Prop_Func = {
else
addAllProVal[id] = value
end
if propertyConfig[id].Style == 1 and curEquip.homeEquipLv then--摘星阁加持
if propertyConfig[id].Style == 1 then--摘星阁加持
--LogError("addlevel=="..HomeLandManager.LevelToValue(curEquip.homeEquipLv,curEquip.position))
addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.LevelToValue(curEquip.homeEquipLv,curEquip.position)/10000)
addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000)
end
end
end

View File

@ -35,11 +35,9 @@ end
--获取家园和装备强化信息
function this.GetData(func)
NetManager.HomeInfoRequest(function ()
NetManager.EquipIntensifyRequset(-1,function ()
if func then
func()
end
end)
if func then
func()
end
end)
end
@ -67,6 +65,21 @@ function this.GetServerData(msg,func)
end
end
---获取英雄武器摘星阁属性加成
function this.GetHeroEquipPropAdd(_heroId,_equipPos)
local heroDId= string.gsub(_heroId, "TEMP_", "")--不知道为什么有狗屁临时id
local heroData=HeroManager.GetSingleHeroData(heroDId)
if heroData.equipStrong==nil then
return 0
end
local lv=heroData.equipStrong[_equipPos]
local equipRankUpLv=heroData.equipAdvanceLv
local equipStrengthenConfig=ConfigManager.GetConfigDataByKey(ConfigName.EquipStrengthen,"Level",lv)
local equipRankUpConfig=ConfigManager.GetConfigDataByKey(ConfigName.EquipRankUp,"Level",equipRankUpLv)
local addProp=equipStrengthenConfig.Rate+equipRankUpConfig.Rate[_equipPos]
return addProp
end
--获取服务器装备信息
function this.GetServerEquipData(msg,func)
this.levelProId = msg.equipRankUp > 0 and msg.equipRankUp or 1
@ -154,10 +167,12 @@ function this.GetCurIndexBtnsShow()
end
--检测是否全部可以突破
function this.GetAllCanUpgrade()
function this.GetAllCanUpgrade(_heroData)
local num = 0
for i = 1, 4 do
if this.EquipData[i].configData.Limit2 > EquipRankUp[this.levelProId].Level then
local curLv=_heroData.equipStrong[i]
local equipStrengthenConfig=ConfigManager.GetConfigDataByKey(ConfigName.EquipStrengthen,"Level",curLv)
if equipStrengthenConfig.Limit2 > _heroData.equipAdvanceLv then
num = num + 1
end
end
@ -168,16 +183,17 @@ function this.GetAllCanUpgrade()
end
--检测是否全部可以突破并提示
function this.GetAllCanUpgradeWithPopup()
function this.GetAllCanUpgradeWithPopup(_heroData)
local TEXT = {
[1] = {"武器","r_Equip_GuardianWeapon_0004"},
[2] = {"战甲","r_Equip_Coat_0005"},
[3] = {"头饰","r_Equip_HeadAccessory_0005"},
[4] = {"战靴","r_equip_Shoes_0005"},
}
local num = 0
for i = 1, 4 do
if this.EquipData[i].configData.Limit2 == EquipRankUp[this.levelProId].Level then
local curLv=_heroData.equipStrong[i]
local equipStrengthenConfig=ConfigManager.GetConfigDataByKey(ConfigName.EquipStrengthen,"Level",curLv)
if equipStrengthenConfig.Limit2 == _heroData.equipAdvanceLv then
PopupTipPanel.ShowTip(string.format("%s未达到最大等级不可突破",TEXT[i][1]))
this.curEquip = i
return true
@ -285,27 +301,27 @@ end
--摘星阁
function this.CheckEquipUpgrade()
if this.BuildData[5].level >= HomeLand[6].UnlockLevel[2] then
if this.GetAllCanUpgrade() then
local configData = EquipRankUp[this.levelProId]
local isEnough=true
for i = 1, #configData.Cost do
if BagManager.GetTotalItemNum(configData.Cost[i][1]) < configData.Cost[i][2] then
isEnough=false
end
end
if configData.Cost and isEnough then
return true
else
return false
end
end
for i = 1, 4 do
if this.CheckSingleEquipUpgrade(i) then
return true
end
end
end
-- if this.BuildData[5].level >= HomeLand[6].UnlockLevel[2] then
-- if this.GetAllCanUpgrade() then
-- local configData = EquipRankUp[this.levelProId]
-- local isEnough=true
-- for i = 1, #configData.Cost do
-- if BagManager.GetTotalItemNum(configData.Cost[i][1]) < configData.Cost[i][2] then
-- isEnough=false
-- end
-- end
-- if configData.Cost and isEnough then
-- return true
-- else
-- return false
-- end
-- end
-- for i = 1, 4 do
-- if this.CheckSingleEquipUpgrade(i) then
-- return true
-- end
-- end
-- end
return false
end

View File

@ -207,7 +207,8 @@ function HomeLand:BindEvent()
PopupTipPanel.ShowTip(string.format("浮生殿到达%s级开启",HomeLandConfig[6].UnlockLevel[2]))
return
end
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HomeLandEquip)
-- UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HomeLandEquip)
UIManager.OpenPanel(UIName.HomeLandEquipPopup)
end)
--产出详情框

View File

@ -6689,31 +6689,46 @@ function NetManager.HomeAllGainRequset(_id,func)
end
--摘星阁装备强化信息请求
function NetManager.EquipIntensifyRequset(_type,func)
function NetManager.EquipIntensifyRequset(_heroId,_type,func)
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
local data = PlayerInfoProto_pb.EquipIntensifyRequset()
local data = HeroInfoProto_pb.EquipIntensifyRequset()
data.heroId = _heroId
data.type = _type
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.EquipIntensifyRequset, MessageTypeProto_pb.EquipIntensifyResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.EquipIntensifyResponse()
local msg = HeroInfoProto_pb.EquipIntensifyResponse()
msg:ParseFromString(data)
HomeLandManager.GetServerEquipData(msg,function ()
EquipManager.updateHomeLandEquipLv()
HarmonyManager.updateHomeLandEquipLv()
--设置脏数据
HeroPropManager.SetAllHeroDirtyByType(Hero_Prop_Type.Equip)
--获取新战力
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
if oldWarPower ~= tempPower and _type ~= -1 then
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
local heroData= HeroManager.GetSingleHeroData(_heroId)
if _type>0 then
for i = 1, #msg.infos do
local _key=msg.infos[i].location
local _val=msg.infos[i].strongLv
heroData.equipStrong[_key]=_val
end
CheckRedPointStatus(RedPointType.HomeLand)
if func then
func(msg)
end
end)
else
heroData.equipAdvanceLv=msg.equipRankUp
end
--设置脏数据
HeroPropManager.SetAllHeroDirtyByType(Hero_Prop_Type.Equip)
--获取新战力
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
if oldWarPower ~= tempPower and _type ~= -1 then
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
end
if func then
func(msg)
end
-- CheckRedPointStatus(RedPointType.HomeLand)
-- HomeLandManager.GetServerEquipData(msg,function ()
-- EquipManager.updateHomeLandEquipLv()
-- HarmonyManager.updateHomeLandEquipLv()
-- --设置脏数据
-- HeroPropManager.SetAllHeroDirtyByType(Hero_Prop_Type.Equip)
-- end)
end)
end

View File

@ -93,7 +93,7 @@ local contentScripts = {
--英雄回退
[GENERAL_POPUP_TYPE.ResolveReStar] = {view = require("Modules/Popup/View/GeneralPopup_ResolveReStar"), panelName = "GeneralPopup_ResolveReStar"},
--家园装备升级
[GENERAL_POPUP_TYPE.HomeLandEquip] = {view = require("Modules/Popup/View/GeneralPopup_HomeLandEquip"), panelName = "GeneralPopup_HomeLandEquip"},
--[GENERAL_POPUP_TYPE.HomeLandEquip] = {view = require("Modules/Popup/View/GeneralPopup_HomeLandEquip"), panelName = "GeneralPopup_HomeLandEquip"},
--改变英雄阵营
[GENERAL_POPUP_TYPE.ChangeHeroPro] = {view = require("Modules/Popup/View/GeneralPopup_ChangeHeroPro"), panelName = "GeneralPopup_ChangeHeroPro"},
--改变英雄阵营确认界面

View File

@ -1,5 +1,7 @@
require("Base/BasePanel")
HomeLandEquipPopup = Inherit(BasePanel)
----- --家园装备升级 -----
local this = {}
local this = HomeLandEquipPopup
local HomeLand = ConfigManager.GetConfig(ConfigName.HomeLand)
local HomeLandLevel = ConfigManager.GetConfig(ConfigName.HomeLandLevel)
local HomeLandTask = ConfigManager.GetConfig(ConfigName.HomeLandTask)
@ -17,7 +19,10 @@ local TEXT = {
[3] = {"头饰","r_Equip_HeadAccessory_0005","魔抗"},
[4] = {"战靴","r_equip_Shoes_0005","生命"},
}
function this:InitComponent(gameObject)
local curSelectHero=nil
function this:InitComponent()
this.closeBtn=Util.GetGameObject(self.gameObject,"BG/BackBtn")
local gameObject=Util.GetGameObject(self.transform,"GeneralPopup_HomeLandEquip")
this.spLoader = SpriteLoader.New()
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
this.titleText.text="摘星阁"
@ -44,11 +49,27 @@ function this:InitComponent(gameObject)
end
this.Desc = Util.GetGameObject(gameObject,"Content/Desc"):GetComponent("Text")
this.heroPre = Util.GetGameObject(this.gameObject, "Scroll/HeroPre")
this.scroll = Util.GetGameObject(gameObject, "Scroll")
this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll.transform,
this.heroPre, this.scrollBar, Vector2.New(1010, 490), 1, 5, Vector2.New(20, 20))
this.scrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, 0)
this.scrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5)
this.scrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)
this.scrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
this.scrollView.moveTween.MomentumAmount = 1
this.scrollView.moveTween.Strength = 2
this.heroSelect=Util.GetGameObject(this.scroll,"Select")
end
function this:BindEvent()
Util.AddClick(this.closeBtn,function()
self:ClosePanel()
end)
Util.AddClick(this.Btn1,function()
local data = HomeLandManager.EquipData[HomeLandManager.curEquip].configData
local curLv=curSelectHero.equipStrong[HomeLandManager.curEquip]
local data =ConfigManager.GetConfigDataByKey(ConfigName.EquipStrengthen,"Level",curLv)
if HomeLandManager.BuildData[data.Limit[1]].level < data.Limit[2] then
PopupTipPanel.ShowTip(string.format("%s到达%s级可升级",HomeLandManager.BuildData[data.Limit[1]].dataMain.Name,data.Limit[2]))
return
@ -61,16 +82,16 @@ function this:BindEvent()
return
end
end
NetManager.EquipIntensifyRequset(HomeLandManager.curEquip,function ()
NetManager.EquipIntensifyRequset(curSelectHero.dynamicId,HomeLandManager.curEquip,function ()
this:Refresh()
end)
end)
Util.AddClick(this.Btn2,function()
if HomeLandManager.GetAllCanUpgradeWithPopup() then
if HomeLandManager.GetAllCanUpgradeWithPopup(curSelectHero) then
this:Refresh()
return
end
NetManager.EquipIntensifyRequset(0,function ()
NetManager.EquipIntensifyRequset(curSelectHero.dynamicId,0,function ()
this:Refresh()
end)
end)
@ -84,11 +105,10 @@ function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, this.SetData)
end
function this:OnShow(_parent,_args)
data = _args
parent=_parent
sortingOrder =_parent.sortingOrder
HomeLandManager.GetCurIndex()
function this:OnOpen()
local _roleDatas = HeroManager.GetAllHeroDatas()
curSelectHero=_roleDatas[1]
this.SetHeroList(_roleDatas)
this:Refresh()
end
@ -97,10 +117,8 @@ function this:Refresh()
local go = this.objList[i]
go.select:SetActive(i == HomeLandManager.curEquip)
go.name.text = TEXT[i][1].."加持"
go.level.text = HomeLandManager.EquipData[i].configData.Level
go.level.text = curSelectHero.equipStrong[i]~=nil and curSelectHero.equipStrong[i] or 0
go.image.sprite = this.spLoader:LoadSprite(TEXT[i][2])
Util.AddOnceClick(go.mask,function ()
HomeLandManager.curEquip = i
this:Refresh()
@ -114,25 +132,29 @@ end
function this:SetData()
-- LogPink(HomeLandManager.EquipData[HomeLandManager.curEquip].Id)
local curIndex = HomeLandManager.curEquip
local curLv=0
if curSelectHero.equipStrong[curIndex] then
curLv=curSelectHero.equipStrong[curIndex]
end
local equipStrengthenConfig=ConfigManager.GetConfigDataByKey(ConfigName.EquipStrengthen,"Level",curLv)
local equipRankUpConfig=ConfigManager.GetConfigDataByKey(ConfigName.EquipRankUp,"Level",curSelectHero.equipAdvanceLv)
--设置消耗
local limit = EquipStrengthen[HomeLandManager.EquipData[curIndex].Id].Limit
local cost = EquipStrengthen[HomeLandManager.EquipData[curIndex].Id].Cost
local data = EquipStrengthen[HomeLandManager.EquipData[curIndex].Id].Rate--当前装备加成
local proData = EquipRankUp[HomeLandManager.levelProId].Rate--当前装备突破加成
local limit = equipStrengthenConfig.Limit
local cost = equipStrengthenConfig.Cost
local data = equipStrengthenConfig.Rate--当前装备加成
local proData = equipRankUpConfig.Rate--当前装备突破加成
if cost then--如果有下一级
local nextData = EquipStrengthen[HomeLandManager.EquipData[curIndex].Id + 1].Rate--下一装备加成
local nextProData = EquipRankUp[HomeLandManager.levelProId + 1].Rate--下一装备突破加成
local nextEquipStrengthenConfig=ConfigManager.GetConfigDataByKey(ConfigName.EquipStrengthen,"Level",curLv+1)
local nextData = nextEquipStrengthenConfig.Rate--下一装备加成
local nextProData = EquipRankUp[equipRankUpConfig.id + 1].Rate--下一装备突破加成
local num1 = data + proData[curIndex]
-- LogYellow(tostring(data).." @ "..tostring(proData[curIndex]))
local num2 = 0
if not HomeLandManager.GetCurIndexBtnsShow() then--如果都到达了等级上限
if not equipStrengthenConfig.Limit2==equipRankUpConfig.Level then--如果都到达了等级上限
num2 = data + nextProData[curIndex]
-- LogYellow(tostring(data).." $ "..tostring(nextProData[curIndex]))
else
num2 = nextData + proData[curIndex]
-- LogYellow(tostring(nextData).." # "..tostring(proData[curIndex]))
end
this.Desc.text = string.format("神将佩戴的%s%s属性增加%s",TEXT[curIndex][1],TEXT[curIndex][3],num1/100).."%"..string.format("<color=#00FF00>%s",num2/100).."%</color>"
@ -167,8 +189,7 @@ function this:SetData()
this.costCondition.text = string.format("<color=red>%s需要到达%s级</color>",HomeLand[limit[1]].Name,limit[2])
end
--按钮和tips显示
local bool = HomeLandManager.GetCurIndexBtnsShow()
local bool2 =
local bool = equipStrengthenConfig.Limit2==equipRankUpConfig.Level
-- LogBlue("bool:"..tostring(bool))
this.Btn1:SetActive(bool)
this.Btn2:SetActive(not bool)
@ -176,15 +197,15 @@ function this:SetData()
this.Cost:SetActive(bool)
this.Tips:SetActive(not bool)
this.costCondition.gameObject:SetActive(true)
this.Tips:GetComponent("Text").text = string.format("全部加持到达%s级后方可进行突破",EquipStrengthen[HomeLandManager.EquipData[curIndex].Id].Level)
if not bool and HomeLandManager.GetAllCanUpgrade() then
this.Tips:GetComponent("Text").text = string.format("全部加持到达%s级后方可进行突破",equipStrengthenConfig.Level)
if not bool and HomeLandManager.GetAllCanUpgrade(curSelectHero) then
this.Cost:SetActive(true)
this.Tips:SetActive(false)
this.costIcon.gameObject:SetActive(true)
this.costNum.gameObject:SetActive(true)
this.costCondition.gameObject:SetActive(false)
--突破的消耗和升级不同
local cost = EquipRankUp[HomeLandManager.levelProId].Cost
local cost = equipRankUpConfig.Cost
local color2 = BagManager.GetTotalItemNum(cost[1][1]) >= cost[1][2] and "#FFEED6" or "red"
this.costIcon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(cost[1][1]))
this.costNum.text = string.format("<color=%s>%s</color>",color2,cost[1][2])
@ -211,6 +232,93 @@ function this:SetData()
this.Tips:SetActive(false)
end
end
---设置显示英雄列表
function this.SetHeroList(_roleDatas)
this.scrollView:SetData(_roleDatas, function(index, go)
if index==1 then
this.SetHeroSelect(go)
end
-- 基础显示
this.SingleHeroDataShow(go, _roleDatas[index])
end, true,false)
end
--设置每条英雄数据
function this.SingleHeroDataShow(_go, _heroData)
local go=_go
local heroData=_heroData
local frame=Util.GetGameObject(go,"frame"):GetComponent("Image")
local icon=Util.GetGameObject(go, "icon"):GetComponent("Image")
local lv= Util.GetGameObject(go, "lv/Text"):GetComponent("Text")
local pro= Util.GetGameObject(go, "proIcon"):GetComponent("Image")
local pos= Util.GetGameObject(go, "posIcon"):GetComponent("Image")
local teamList={}
for i = 1, 3 do
table.insert(teamList,Util.GetGameObject(go, "yxteamName/Image"..i))
end
local yxInfo=Util.GetGameObject(go, "yxteamName")
--local yxTeamName=Util.GetGameObject(go, "yxteamName/Text"):GetComponent("Text")
yxInfo:SetActive(false)
Util.GetGameObject(go, "posIcon"):SetActive(this.curFormationIndex == FormationTypeDef.FIGHT_LEVEL or this.curFormationIndex == FormationTypeDef.FIGHT_ASSISTANTLEVEL or
this.curFormationIndex == FormationTypeDef.FORMATION_QIJIESHILIAN)
local starGrid = Util.GetGameObject(go, "star")
local yuanImage = Util.GetGameObject(go, "yuanImage")
yuanImage.gameObject:SetActive(false)
local choosedObj = Util.GetGameObject(go, "choosed")
choosedObj.gameObject:SetActive(false)
local hpExp = Util.GetGameObject(go, "hpExp")
hpExp.gameObject:SetActive(false)
local redPot = Util.GetGameObject(go, "redpoint")
local changeProBtn=Util.GetGameObject(go,"proMaskObj")
if heroData.isNew and heroData.isNew == 1 then
redPot.gameObject:SetActive(true)
else
redPot.gameObject:SetActive(false)
end
if _heroData.property then
changeProBtn:SetActive(_heroData.property>=5)
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.property))
else
changeProBtn:SetActive(false)
LogError("+++++++")
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
end
frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
icon.sprite=this.spLoader:LoadSprite(heroData.icon)
if HarmonyManager.IsChangeColor(heroData.dynamicId) then
-- body
lv.text="<color=#0f0>"..heroData.lv.."</color>"
elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager:HongMengTowerUpLimit() >= HarmonyManager.TowerStartLimit then
-- bod
lv.text="<color=#ffbe22>"..heroData.lv.."</color>"
else
lv.text=heroData.lv
end
pos.sprite = this.spLoader:LoadSprite(heroData.professionIcon)
local star,starType = heroData.GetStar(1)
local starSize = Vector2.New(30,30)
local starScale = -8
if starType == 3 then
starSize = Vector2.New(1,-15.65)
starScale = -13
elseif starType == 2 then
starSize = Vector2.New(60,57)
end
SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale)
Util.AddOnceClick(go, function()
curSelectHero=_heroData
this:SetData()
this.SetHeroSelect(go)
end)
end
function this.SetHeroSelect(_heroObj)
this.heroSelect.transform:SetParent(_heroObj.transform)
this.heroSelect.transform.localPosition=Vector3.zero
end
function this:OnClose()
HomeLandManager.curEquip = 1
@ -220,6 +328,7 @@ end
function this:OnDestroy()
this.SelectList = {}
this.spLoader:Destroy()
this.scrollView = nil
end
return this

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e1dbee4100b7a7b48a48f68fc680720b
guid: 3a7cda63f1f6aa5498515740a7170dea
DefaultImporter:
externalObjects: {}
userData: