Branch_oumei
parent
7572ff5dfb
commit
913701f5db
|
|
@ -14,6 +14,7 @@ PLAYER_NICKNAME_FIELD = protobuf.FieldDescriptor();
|
|||
PLAYER_LEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_EXP_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_VIPLEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_TOTALVIPEXP_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_FAMILYID_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_HEAD_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_CURMAPID_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -33,7 +34,6 @@ PLAYER_DECROTION_FIELD = protobuf.FieldDescriptor();
|
|||
PLAYER_RIDE_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_RIDELEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_SEX_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_TOTALVIPEXP_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYER_WELFARECURRENCYRECHARGETIME_FIELD = protobuf.FieldDescriptor();
|
||||
PRIVILEGE = protobuf.Descriptor();
|
||||
PRIVILEGE_ID_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -186,6 +186,11 @@ DROP_PLAN_FIELD = protobuf.FieldDescriptor();
|
|||
DROP_MEDAL_FIELD = protobuf.FieldDescriptor();
|
||||
DROP_MOTHERSHIPPLAN_FIELD = protobuf.FieldDescriptor();
|
||||
DROP_TITLE_FIELD = protobuf.FieldDescriptor();
|
||||
DROP_ITEMTRANSFORM_FIELD = protobuf.FieldDescriptor();
|
||||
ITEMTRANSFORM = protobuf.Descriptor();
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD = protobuf.FieldDescriptor();
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD = protobuf.FieldDescriptor();
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD = protobuf.FieldDescriptor();
|
||||
GMCOMMAND = protobuf.Descriptor();
|
||||
GMCOMMAND_COMMAND_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMHEROINFO = protobuf.Descriptor();
|
||||
|
|
@ -821,6 +826,10 @@ CAMPWARRANKINGLISTINFO_TOP100_FIELD = protobuf.FieldDescriptor();
|
|||
CAMPWARRANKINGLISTINFO_SELFSCORE_FIELD = protobuf.FieldDescriptor();
|
||||
CAMPWARRANKINGLISTINFO_SELFRANK_FIELD = protobuf.FieldDescriptor();
|
||||
CAMPWARRANKINGLISTINFO_SELFFIGHT_FIELD = protobuf.FieldDescriptor();
|
||||
MONTHCARDRECHARGEINFO = protobuf.Descriptor();
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD = protobuf.FieldDescriptor();
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD = protobuf.FieldDescriptor();
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD = protobuf.FieldDescriptor();
|
||||
PRIVILEGECARDINFO = protobuf.Descriptor();
|
||||
PRIVILEGECARDINFO_CARDID_FIELD = protobuf.FieldDescriptor();
|
||||
PRIVILEGECARDINFO_TAKEDAILYREWARD_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -919,10 +928,20 @@ PLAYER_VIPLEVEL_FIELD.default_value = 0
|
|||
PLAYER_VIPLEVEL_FIELD.type = 5
|
||||
PLAYER_VIPLEVEL_FIELD.cpp_type = 1
|
||||
|
||||
PLAYER_TOTALVIPEXP_FIELD.name = "totalVipExp"
|
||||
PLAYER_TOTALVIPEXP_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.totalVipExp"
|
||||
PLAYER_TOTALVIPEXP_FIELD.number = 25
|
||||
PLAYER_TOTALVIPEXP_FIELD.index = 5
|
||||
PLAYER_TOTALVIPEXP_FIELD.label = 1
|
||||
PLAYER_TOTALVIPEXP_FIELD.has_default_value = false
|
||||
PLAYER_TOTALVIPEXP_FIELD.default_value = 0
|
||||
PLAYER_TOTALVIPEXP_FIELD.type = 5
|
||||
PLAYER_TOTALVIPEXP_FIELD.cpp_type = 1
|
||||
|
||||
PLAYER_FAMILYID_FIELD.name = "familyId"
|
||||
PLAYER_FAMILYID_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.familyId"
|
||||
PLAYER_FAMILYID_FIELD.number = 6
|
||||
PLAYER_FAMILYID_FIELD.index = 5
|
||||
PLAYER_FAMILYID_FIELD.index = 6
|
||||
PLAYER_FAMILYID_FIELD.label = 1
|
||||
PLAYER_FAMILYID_FIELD.has_default_value = false
|
||||
PLAYER_FAMILYID_FIELD.default_value = 0
|
||||
|
|
@ -932,7 +951,7 @@ PLAYER_FAMILYID_FIELD.cpp_type = 1
|
|||
PLAYER_HEAD_FIELD.name = "head"
|
||||
PLAYER_HEAD_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.head"
|
||||
PLAYER_HEAD_FIELD.number = 7
|
||||
PLAYER_HEAD_FIELD.index = 6
|
||||
PLAYER_HEAD_FIELD.index = 7
|
||||
PLAYER_HEAD_FIELD.label = 1
|
||||
PLAYER_HEAD_FIELD.has_default_value = false
|
||||
PLAYER_HEAD_FIELD.default_value = 0
|
||||
|
|
@ -942,7 +961,7 @@ PLAYER_HEAD_FIELD.cpp_type = 1
|
|||
PLAYER_CURMAPID_FIELD.name = "curMapId"
|
||||
PLAYER_CURMAPID_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.curMapId"
|
||||
PLAYER_CURMAPID_FIELD.number = 8
|
||||
PLAYER_CURMAPID_FIELD.index = 7
|
||||
PLAYER_CURMAPID_FIELD.index = 8
|
||||
PLAYER_CURMAPID_FIELD.label = 1
|
||||
PLAYER_CURMAPID_FIELD.has_default_value = false
|
||||
PLAYER_CURMAPID_FIELD.default_value = 0
|
||||
|
|
@ -952,7 +971,7 @@ PLAYER_CURMAPID_FIELD.cpp_type = 1
|
|||
PLAYER_ENERGY_FIELD.name = "energy"
|
||||
PLAYER_ENERGY_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.energy"
|
||||
PLAYER_ENERGY_FIELD.number = 9
|
||||
PLAYER_ENERGY_FIELD.index = 8
|
||||
PLAYER_ENERGY_FIELD.index = 9
|
||||
PLAYER_ENERGY_FIELD.label = 1
|
||||
PLAYER_ENERGY_FIELD.has_default_value = false
|
||||
PLAYER_ENERGY_FIELD.default_value = 0
|
||||
|
|
@ -962,7 +981,7 @@ PLAYER_ENERGY_FIELD.cpp_type = 1
|
|||
PLAYER_LASTUPDATEENERGYTIME_FIELD.name = "lastUpdateEnergyTime"
|
||||
PLAYER_LASTUPDATEENERGYTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.lastUpdateEnergyTime"
|
||||
PLAYER_LASTUPDATEENERGYTIME_FIELD.number = 10
|
||||
PLAYER_LASTUPDATEENERGYTIME_FIELD.index = 9
|
||||
PLAYER_LASTUPDATEENERGYTIME_FIELD.index = 10
|
||||
PLAYER_LASTUPDATEENERGYTIME_FIELD.label = 1
|
||||
PLAYER_LASTUPDATEENERGYTIME_FIELD.has_default_value = false
|
||||
PLAYER_LASTUPDATEENERGYTIME_FIELD.default_value = 0
|
||||
|
|
@ -972,7 +991,7 @@ PLAYER_LASTUPDATEENERGYTIME_FIELD.cpp_type = 1
|
|||
PLAYER_SERVERTIME_FIELD.name = "serverTime"
|
||||
PLAYER_SERVERTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.serverTime"
|
||||
PLAYER_SERVERTIME_FIELD.number = 11
|
||||
PLAYER_SERVERTIME_FIELD.index = 10
|
||||
PLAYER_SERVERTIME_FIELD.index = 11
|
||||
PLAYER_SERVERTIME_FIELD.label = 1
|
||||
PLAYER_SERVERTIME_FIELD.has_default_value = false
|
||||
PLAYER_SERVERTIME_FIELD.default_value = 0
|
||||
|
|
@ -982,7 +1001,7 @@ PLAYER_SERVERTIME_FIELD.cpp_type = 1
|
|||
PLAYER_MAXFORCE_FIELD.name = "maxForce"
|
||||
PLAYER_MAXFORCE_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.maxForce"
|
||||
PLAYER_MAXFORCE_FIELD.number = 12
|
||||
PLAYER_MAXFORCE_FIELD.index = 11
|
||||
PLAYER_MAXFORCE_FIELD.index = 12
|
||||
PLAYER_MAXFORCE_FIELD.label = 1
|
||||
PLAYER_MAXFORCE_FIELD.has_default_value = false
|
||||
PLAYER_MAXFORCE_FIELD.default_value = 0
|
||||
|
|
@ -992,7 +1011,7 @@ PLAYER_MAXFORCE_FIELD.cpp_type = 1
|
|||
PLAYER_SAVEAMT_FIELD.name = "saveAmt"
|
||||
PLAYER_SAVEAMT_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.saveAmt"
|
||||
PLAYER_SAVEAMT_FIELD.number = 13
|
||||
PLAYER_SAVEAMT_FIELD.index = 12
|
||||
PLAYER_SAVEAMT_FIELD.index = 13
|
||||
PLAYER_SAVEAMT_FIELD.label = 1
|
||||
PLAYER_SAVEAMT_FIELD.has_default_value = false
|
||||
PLAYER_SAVEAMT_FIELD.default_value = 0.0
|
||||
|
|
@ -1002,7 +1021,7 @@ PLAYER_SAVEAMT_FIELD.cpp_type = 5
|
|||
PLAYER_RECHARGETIME_FIELD.name = "rechargeTime"
|
||||
PLAYER_RECHARGETIME_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.rechargeTime"
|
||||
PLAYER_RECHARGETIME_FIELD.number = 14
|
||||
PLAYER_RECHARGETIME_FIELD.index = 13
|
||||
PLAYER_RECHARGETIME_FIELD.index = 14
|
||||
PLAYER_RECHARGETIME_FIELD.label = 1
|
||||
PLAYER_RECHARGETIME_FIELD.has_default_value = false
|
||||
PLAYER_RECHARGETIME_FIELD.default_value = 0
|
||||
|
|
@ -1012,7 +1031,7 @@ PLAYER_RECHARGETIME_FIELD.cpp_type = 1
|
|||
PLAYER_ISFIRSTRECHARGE_FIELD.name = "isFirstRecharge"
|
||||
PLAYER_ISFIRSTRECHARGE_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.isFirstRecharge"
|
||||
PLAYER_ISFIRSTRECHARGE_FIELD.number = 15
|
||||
PLAYER_ISFIRSTRECHARGE_FIELD.index = 14
|
||||
PLAYER_ISFIRSTRECHARGE_FIELD.index = 15
|
||||
PLAYER_ISFIRSTRECHARGE_FIELD.label = 1
|
||||
PLAYER_ISFIRSTRECHARGE_FIELD.has_default_value = false
|
||||
PLAYER_ISFIRSTRECHARGE_FIELD.default_value = 0
|
||||
|
|
@ -1022,7 +1041,7 @@ PLAYER_ISFIRSTRECHARGE_FIELD.cpp_type = 1
|
|||
PLAYER_ISMATCHROOM_FIELD.name = "isMatchRoom"
|
||||
PLAYER_ISMATCHROOM_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.isMatchRoom"
|
||||
PLAYER_ISMATCHROOM_FIELD.number = 16
|
||||
PLAYER_ISMATCHROOM_FIELD.index = 15
|
||||
PLAYER_ISMATCHROOM_FIELD.index = 16
|
||||
PLAYER_ISMATCHROOM_FIELD.label = 1
|
||||
PLAYER_ISMATCHROOM_FIELD.has_default_value = false
|
||||
PLAYER_ISMATCHROOM_FIELD.default_value = 0
|
||||
|
|
@ -1032,7 +1051,7 @@ PLAYER_ISMATCHROOM_FIELD.cpp_type = 1
|
|||
PLAYER_CURROOMTYPE_FIELD.name = "curRoomType"
|
||||
PLAYER_CURROOMTYPE_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.curRoomType"
|
||||
PLAYER_CURROOMTYPE_FIELD.number = 17
|
||||
PLAYER_CURROOMTYPE_FIELD.index = 16
|
||||
PLAYER_CURROOMTYPE_FIELD.index = 17
|
||||
PLAYER_CURROOMTYPE_FIELD.label = 1
|
||||
PLAYER_CURROOMTYPE_FIELD.has_default_value = false
|
||||
PLAYER_CURROOMTYPE_FIELD.default_value = 0
|
||||
|
|
@ -1042,7 +1061,7 @@ PLAYER_CURROOMTYPE_FIELD.cpp_type = 1
|
|||
PLAYER_HEADFRAME_FIELD.name = "headFrame"
|
||||
PLAYER_HEADFRAME_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.headFrame"
|
||||
PLAYER_HEADFRAME_FIELD.number = 18
|
||||
PLAYER_HEADFRAME_FIELD.index = 17
|
||||
PLAYER_HEADFRAME_FIELD.index = 18
|
||||
PLAYER_HEADFRAME_FIELD.label = 1
|
||||
PLAYER_HEADFRAME_FIELD.has_default_value = false
|
||||
PLAYER_HEADFRAME_FIELD.default_value = 0
|
||||
|
|
@ -1052,7 +1071,7 @@ PLAYER_HEADFRAME_FIELD.cpp_type = 1
|
|||
PLAYER_ROOMADDREESS_FIELD.name = "roomAddreess"
|
||||
PLAYER_ROOMADDREESS_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.roomAddreess"
|
||||
PLAYER_ROOMADDREESS_FIELD.number = 19
|
||||
PLAYER_ROOMADDREESS_FIELD.index = 18
|
||||
PLAYER_ROOMADDREESS_FIELD.index = 19
|
||||
PLAYER_ROOMADDREESS_FIELD.label = 1
|
||||
PLAYER_ROOMADDREESS_FIELD.has_default_value = false
|
||||
PLAYER_ROOMADDREESS_FIELD.default_value = ""
|
||||
|
|
@ -1062,7 +1081,7 @@ PLAYER_ROOMADDREESS_FIELD.cpp_type = 9
|
|||
PLAYER_DESIGNATION_FIELD.name = "designation"
|
||||
PLAYER_DESIGNATION_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.designation"
|
||||
PLAYER_DESIGNATION_FIELD.number = 20
|
||||
PLAYER_DESIGNATION_FIELD.index = 19
|
||||
PLAYER_DESIGNATION_FIELD.index = 20
|
||||
PLAYER_DESIGNATION_FIELD.label = 1
|
||||
PLAYER_DESIGNATION_FIELD.has_default_value = false
|
||||
PLAYER_DESIGNATION_FIELD.default_value = 0
|
||||
|
|
@ -1072,7 +1091,7 @@ PLAYER_DESIGNATION_FIELD.cpp_type = 1
|
|||
PLAYER_DECROTION_FIELD.name = "decrotion"
|
||||
PLAYER_DECROTION_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.decrotion"
|
||||
PLAYER_DECROTION_FIELD.number = 21
|
||||
PLAYER_DECROTION_FIELD.index = 20
|
||||
PLAYER_DECROTION_FIELD.index = 21
|
||||
PLAYER_DECROTION_FIELD.label = 1
|
||||
PLAYER_DECROTION_FIELD.has_default_value = false
|
||||
PLAYER_DECROTION_FIELD.default_value = 0
|
||||
|
|
@ -1082,7 +1101,7 @@ PLAYER_DECROTION_FIELD.cpp_type = 1
|
|||
PLAYER_RIDE_FIELD.name = "ride"
|
||||
PLAYER_RIDE_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.ride"
|
||||
PLAYER_RIDE_FIELD.number = 22
|
||||
PLAYER_RIDE_FIELD.index = 21
|
||||
PLAYER_RIDE_FIELD.index = 22
|
||||
PLAYER_RIDE_FIELD.label = 1
|
||||
PLAYER_RIDE_FIELD.has_default_value = false
|
||||
PLAYER_RIDE_FIELD.default_value = 0
|
||||
|
|
@ -1092,7 +1111,7 @@ PLAYER_RIDE_FIELD.cpp_type = 1
|
|||
PLAYER_RIDELEVEL_FIELD.name = "rideLevel"
|
||||
PLAYER_RIDELEVEL_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.rideLevel"
|
||||
PLAYER_RIDELEVEL_FIELD.number = 23
|
||||
PLAYER_RIDELEVEL_FIELD.index = 22
|
||||
PLAYER_RIDELEVEL_FIELD.index = 23
|
||||
PLAYER_RIDELEVEL_FIELD.label = 1
|
||||
PLAYER_RIDELEVEL_FIELD.has_default_value = false
|
||||
PLAYER_RIDELEVEL_FIELD.default_value = 0
|
||||
|
|
@ -1102,23 +1121,13 @@ PLAYER_RIDELEVEL_FIELD.cpp_type = 1
|
|||
PLAYER_SEX_FIELD.name = "sex"
|
||||
PLAYER_SEX_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.sex"
|
||||
PLAYER_SEX_FIELD.number = 24
|
||||
PLAYER_SEX_FIELD.index = 23
|
||||
PLAYER_SEX_FIELD.index = 24
|
||||
PLAYER_SEX_FIELD.label = 1
|
||||
PLAYER_SEX_FIELD.has_default_value = false
|
||||
PLAYER_SEX_FIELD.default_value = 0
|
||||
PLAYER_SEX_FIELD.type = 5
|
||||
PLAYER_SEX_FIELD.cpp_type = 1
|
||||
|
||||
PLAYER_TOTALVIPEXP_FIELD.name = "totalVipExp"
|
||||
PLAYER_TOTALVIPEXP_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.totalVipExp"
|
||||
PLAYER_TOTALVIPEXP_FIELD.number = 25
|
||||
PLAYER_TOTALVIPEXP_FIELD.index = 24
|
||||
PLAYER_TOTALVIPEXP_FIELD.label = 1
|
||||
PLAYER_TOTALVIPEXP_FIELD.has_default_value = false
|
||||
PLAYER_TOTALVIPEXP_FIELD.default_value = 0
|
||||
PLAYER_TOTALVIPEXP_FIELD.type = 5
|
||||
PLAYER_TOTALVIPEXP_FIELD.cpp_type = 1
|
||||
|
||||
PLAYER_WELFARECURRENCYRECHARGETIME_FIELD.name = "welfareCurrencyRechargeTime"
|
||||
PLAYER_WELFARECURRENCYRECHARGETIME_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.welfareCurrencyRechargeTime"
|
||||
PLAYER_WELFARECURRENCYRECHARGETIME_FIELD.number = 26
|
||||
|
|
@ -1133,7 +1142,7 @@ PLAYER.name = "Player"
|
|||
PLAYER.full_name = ".com.ljsd.jieling.protocols.Player"
|
||||
PLAYER.nested_types = {}
|
||||
PLAYER.enum_types = {}
|
||||
PLAYER.fields = {PLAYER_UID_FIELD, PLAYER_NICKNAME_FIELD, PLAYER_LEVEL_FIELD, PLAYER_EXP_FIELD, PLAYER_VIPLEVEL_FIELD, PLAYER_FAMILYID_FIELD, PLAYER_HEAD_FIELD, PLAYER_CURMAPID_FIELD, PLAYER_ENERGY_FIELD, PLAYER_LASTUPDATEENERGYTIME_FIELD, PLAYER_SERVERTIME_FIELD, PLAYER_MAXFORCE_FIELD, PLAYER_SAVEAMT_FIELD, PLAYER_RECHARGETIME_FIELD, PLAYER_ISFIRSTRECHARGE_FIELD, PLAYER_ISMATCHROOM_FIELD, PLAYER_CURROOMTYPE_FIELD, PLAYER_HEADFRAME_FIELD, PLAYER_ROOMADDREESS_FIELD, PLAYER_DESIGNATION_FIELD, PLAYER_DECROTION_FIELD, PLAYER_RIDE_FIELD, PLAYER_RIDELEVEL_FIELD, PLAYER_SEX_FIELD, PLAYER_TOTALVIPEXP_FIELD, PLAYER_WELFARECURRENCYRECHARGETIME_FIELD}
|
||||
PLAYER.fields = {PLAYER_UID_FIELD, PLAYER_NICKNAME_FIELD, PLAYER_LEVEL_FIELD, PLAYER_EXP_FIELD, PLAYER_VIPLEVEL_FIELD, PLAYER_TOTALVIPEXP_FIELD, PLAYER_FAMILYID_FIELD, PLAYER_HEAD_FIELD, PLAYER_CURMAPID_FIELD, PLAYER_ENERGY_FIELD, PLAYER_LASTUPDATEENERGYTIME_FIELD, PLAYER_SERVERTIME_FIELD, PLAYER_MAXFORCE_FIELD, PLAYER_SAVEAMT_FIELD, PLAYER_RECHARGETIME_FIELD, PLAYER_ISFIRSTRECHARGE_FIELD, PLAYER_ISMATCHROOM_FIELD, PLAYER_CURROOMTYPE_FIELD, PLAYER_HEADFRAME_FIELD, PLAYER_ROOMADDREESS_FIELD, PLAYER_DESIGNATION_FIELD, PLAYER_DECROTION_FIELD, PLAYER_RIDE_FIELD, PLAYER_RIDELEVEL_FIELD, PLAYER_SEX_FIELD, PLAYER_WELFARECURRENCYRECHARGETIME_FIELD}
|
||||
PLAYER.is_extendable = false
|
||||
PLAYER.extensions = {}
|
||||
PRIVILEGE_ID_FIELD.name = "id"
|
||||
|
|
@ -2594,13 +2603,61 @@ DROP_TITLE_FIELD.default_value = {}
|
|||
DROP_TITLE_FIELD.type = 5
|
||||
DROP_TITLE_FIELD.cpp_type = 1
|
||||
|
||||
DROP_ITEMTRANSFORM_FIELD.name = "itemTransform"
|
||||
DROP_ITEMTRANSFORM_FIELD.full_name = ".com.ljsd.jieling.protocols.Drop.itemTransform"
|
||||
DROP_ITEMTRANSFORM_FIELD.number = 9
|
||||
DROP_ITEMTRANSFORM_FIELD.index = 8
|
||||
DROP_ITEMTRANSFORM_FIELD.label = 3
|
||||
DROP_ITEMTRANSFORM_FIELD.has_default_value = false
|
||||
DROP_ITEMTRANSFORM_FIELD.default_value = {}
|
||||
DROP_ITEMTRANSFORM_FIELD.message_type = _ITEMTRANSFORM
|
||||
DROP_ITEMTRANSFORM_FIELD.type = 11
|
||||
DROP_ITEMTRANSFORM_FIELD.cpp_type = 10
|
||||
|
||||
DROP.name = "Drop"
|
||||
DROP.full_name = ".com.ljsd.jieling.protocols.Drop"
|
||||
DROP.nested_types = {}
|
||||
DROP.enum_types = {}
|
||||
DROP.fields = {DROP_ITEMLIST_FIELD, DROP_EQUIPID_FIELD, DROP_HERO_FIELD, DROP_SOULEQUIP_FIELD, DROP_PLAN_FIELD, DROP_MEDAL_FIELD, DROP_MOTHERSHIPPLAN_FIELD, DROP_TITLE_FIELD}
|
||||
DROP.fields = {DROP_ITEMLIST_FIELD, DROP_EQUIPID_FIELD, DROP_HERO_FIELD, DROP_SOULEQUIP_FIELD, DROP_PLAN_FIELD, DROP_MEDAL_FIELD, DROP_MOTHERSHIPPLAN_FIELD, DROP_TITLE_FIELD, DROP_ITEMTRANSFORM_FIELD}
|
||||
DROP.is_extendable = false
|
||||
DROP.extensions = {}
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD.name = "itemIdBefore"
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD.full_name = ".com.ljsd.jieling.protocols.ItemTransform.itemIdBefore"
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD.number = 1
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD.index = 0
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD.label = 1
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD.has_default_value = false
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD.default_value = 0
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD.type = 5
|
||||
ITEMTRANSFORM_ITEMIDBEFORE_FIELD.cpp_type = 1
|
||||
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD.name = "itemIdAfter"
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD.full_name = ".com.ljsd.jieling.protocols.ItemTransform.itemIdAfter"
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD.number = 2
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD.index = 1
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD.label = 1
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD.has_default_value = false
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD.default_value = 0
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD.type = 5
|
||||
ITEMTRANSFORM_ITEMIDAFTER_FIELD.cpp_type = 1
|
||||
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD.name = "itemNum"
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD.full_name = ".com.ljsd.jieling.protocols.ItemTransform.itemNum"
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD.number = 3
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD.index = 2
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD.label = 1
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD.has_default_value = false
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD.default_value = 0
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD.type = 3
|
||||
ITEMTRANSFORM_ITEMNUM_FIELD.cpp_type = 2
|
||||
|
||||
ITEMTRANSFORM.name = "ItemTransform"
|
||||
ITEMTRANSFORM.full_name = ".com.ljsd.jieling.protocols.ItemTransform"
|
||||
ITEMTRANSFORM.nested_types = {}
|
||||
ITEMTRANSFORM.enum_types = {}
|
||||
ITEMTRANSFORM.fields = {ITEMTRANSFORM_ITEMIDBEFORE_FIELD, ITEMTRANSFORM_ITEMIDAFTER_FIELD, ITEMTRANSFORM_ITEMNUM_FIELD}
|
||||
ITEMTRANSFORM.is_extendable = false
|
||||
ITEMTRANSFORM.extensions = {}
|
||||
GMCOMMAND_COMMAND_FIELD.name = "command"
|
||||
GMCOMMAND_COMMAND_FIELD.full_name = ".com.ljsd.jieling.protocols.GMCommand.command"
|
||||
GMCOMMAND_COMMAND_FIELD.number = 1
|
||||
|
|
@ -8650,6 +8707,43 @@ CAMPWARRANKINGLISTINFO.enum_types = {}
|
|||
CAMPWARRANKINGLISTINFO.fields = {CAMPWARRANKINGLISTINFO_TOP100_FIELD, CAMPWARRANKINGLISTINFO_SELFSCORE_FIELD, CAMPWARRANKINGLISTINFO_SELFRANK_FIELD, CAMPWARRANKINGLISTINFO_SELFFIGHT_FIELD}
|
||||
CAMPWARRANKINGLISTINFO.is_extendable = false
|
||||
CAMPWARRANKINGLISTINFO.extensions = {}
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD.name = "monthCardId"
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD.full_name = ".com.ljsd.jieling.protocols.MonthCardRechargeInfo.monthCardId"
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD.number = 1
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD.index = 0
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD.label = 1
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD.has_default_value = false
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD.default_value = 0
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD.type = 5
|
||||
MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD.cpp_type = 1
|
||||
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD.name = "realRechargeAmount"
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD.full_name = ".com.ljsd.jieling.protocols.MonthCardRechargeInfo.realRechargeAmount"
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD.number = 2
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD.index = 1
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD.label = 1
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD.has_default_value = false
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD.default_value = 0.0
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD.type = 1
|
||||
MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD.cpp_type = 5
|
||||
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD.name = "welfareCurrencyRechargeAmount"
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD.full_name = ".com.ljsd.jieling.protocols.MonthCardRechargeInfo.welfareCurrencyRechargeAmount"
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD.number = 3
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD.index = 2
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD.label = 1
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD.has_default_value = false
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD.default_value = 0.0
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD.type = 1
|
||||
MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD.cpp_type = 5
|
||||
|
||||
MONTHCARDRECHARGEINFO.name = "MonthCardRechargeInfo"
|
||||
MONTHCARDRECHARGEINFO.full_name = ".com.ljsd.jieling.protocols.MonthCardRechargeInfo"
|
||||
MONTHCARDRECHARGEINFO.nested_types = {}
|
||||
MONTHCARDRECHARGEINFO.enum_types = {}
|
||||
MONTHCARDRECHARGEINFO.fields = {MONTHCARDRECHARGEINFO_MONTHCARDID_FIELD, MONTHCARDRECHARGEINFO_REALRECHARGEAMOUNT_FIELD, MONTHCARDRECHARGEINFO_WELFARECURRENCYRECHARGEAMOUNT_FIELD}
|
||||
MONTHCARDRECHARGEINFO.is_extendable = false
|
||||
MONTHCARDRECHARGEINFO.extensions = {}
|
||||
PRIVILEGECARDINFO_CARDID_FIELD.name = "cardId"
|
||||
PRIVILEGECARDINFO_CARDID_FIELD.full_name = ".com.ljsd.jieling.protocols.PrivilegeCardInfo.cardId"
|
||||
PRIVILEGECARDINFO_CARDID_FIELD.number = 1
|
||||
|
|
@ -8747,6 +8841,7 @@ HeroBloodInfo = protobuf.Message(HEROBLOODINFO)
|
|||
HeroLuxury = protobuf.Message(HEROLUXURY)
|
||||
Item = protobuf.Message(ITEM)
|
||||
ItemInfo = protobuf.Message(ITEMINFO)
|
||||
ItemTransform = protobuf.Message(ITEMTRANSFORM)
|
||||
JourneyCell = protobuf.Message(JOURNEYCELL)
|
||||
JourneyGoodsInfo = protobuf.Message(JOURNEYGOODSINFO)
|
||||
JourneyInfo = protobuf.Message(JOURNEYINFO)
|
||||
|
|
@ -8762,6 +8857,7 @@ Mission = protobuf.Message(MISSION)
|
|||
ModuleProperty = protobuf.Message(MODULEPROPERTY)
|
||||
MonsterRankInfo = protobuf.Message(MONSTERRANKINFO)
|
||||
MonthCardInfo = protobuf.Message(MONTHCARDINFO)
|
||||
MonthCardRechargeInfo = protobuf.Message(MONTHCARDRECHARGEINFO)
|
||||
MotherShipInfo = protobuf.Message(MOTHERSHIPINFO)
|
||||
MotherShipPlan = protobuf.Message(MOTHERSHIPPLAN)
|
||||
NewPlayerGuidePoint = protobuf.Message(NEWPLAYERGUIDEPOINT)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
|||
local equipData
|
||||
local func
|
||||
local isRewardItemPop
|
||||
local curSuitProGo = {}--当前套装属性对象
|
||||
local curSuitProGo = {} --当前套装属性对象
|
||||
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
||||
local _MainProList = {}
|
||||
local isShowfenjie = true
|
||||
|
|
@ -23,9 +23,9 @@ function RewardEquipSingleShowPopup2:InitComponent()
|
|||
this.powerNum = Util.GetGameObject(self.transform, "bg/Content/armorInfo/powerNumText/powerNum"):GetComponent("Text")
|
||||
this.star = Util.GetGameObject(self.transform, "bg/Content/armorInfo/Item/star")
|
||||
--装备属性
|
||||
this.equipOtherProPre=Util.GetGameObject(self.transform, "bg/Content/proPre")
|
||||
this.equipProGrid=Util.GetGameObject(self.transform, "bg/Content/proRect/proGrid")
|
||||
this.mainPro=Util.GetGameObject(self.transform, "bg/Content/mainPro")
|
||||
this.equipOtherProPre = Util.GetGameObject(self.transform, "bg/Content/proPre")
|
||||
this.equipProGrid = Util.GetGameObject(self.transform, "bg/Content/proRect/proGrid")
|
||||
this.mainPro = Util.GetGameObject(self.transform, "bg/Content/mainPro")
|
||||
this.mainProGrid = Util.GetGameObject(self.transform, "bg/Content/mainPro/bg")
|
||||
this.mainProItem = Util.GetGameObject(self.transform, "mainPro/bg/proPre")
|
||||
this.mainProItem:SetActive(false)
|
||||
|
|
@ -35,10 +35,10 @@ function RewardEquipSingleShowPopup2:InitComponent()
|
|||
--装备获取途径
|
||||
--this.getTuPre=Util.GetGameObject(self.transform, "Content/bg/getTuPre")
|
||||
-- this.getTuGrid=Util.GetGameObject(self.transform, "Content/bg/scroll/grid")
|
||||
this.getTuGrid=Util.GetGameObject(self.transform, "bg/Content/scroll")
|
||||
this.getTuGrid = Util.GetGameObject(self.transform, "bg/Content/scroll")
|
||||
--装备被动技能
|
||||
this.skillObject=Util.GetGameObject(self.transform, "bg/Content/skillObject")
|
||||
this.skillInfo=Util.GetGameObject(self.transform, "bg/Content/skillObject/skillInfo"):GetComponent("Text")
|
||||
this.skillObject = Util.GetGameObject(self.transform, "bg/Content/skillObject")
|
||||
this.skillInfo = Util.GetGameObject(self.transform, "bg/Content/skillObject/skillInfo"):GetComponent("Text")
|
||||
this.skillObject:SetActive(false)
|
||||
--分解按钮
|
||||
-- this.btnSure = Util.GetGameObject(self.transform, "Content/bg/btnGrid/btnSure")
|
||||
|
|
@ -57,7 +57,7 @@ end
|
|||
function RewardEquipSingleShowPopup2:BindEvent()
|
||||
Util.AddClick(this.BackMask, function()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
self:ClosePanel()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.BtnBack, function()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
|
|
@ -71,63 +71,62 @@ function RewardEquipSingleShowPopup2:BindEvent()
|
|||
Util.AddClick(this.btnSure, function()
|
||||
--装备逻辑
|
||||
--LogError("fffffffffffff"..equipData.Position)
|
||||
local idList={}
|
||||
table.insert(idList,self.equipData.id)
|
||||
local heroId=""
|
||||
if self.curHeroData then
|
||||
heroId=self.curHeroData.dynamicId
|
||||
local list=GiftManager.GetHeroGifts(heroId)
|
||||
if #list >= 12 then
|
||||
PopupTipPanel.ShowTip("礼物数量已达上限！")
|
||||
return
|
||||
end
|
||||
|
||||
else
|
||||
heroId="0"
|
||||
local list=GiftManager.GetPlayerGifts()
|
||||
if #list >= 12 then
|
||||
PopupTipPanel.ShowTip("礼物数量已达上限！")
|
||||
return
|
||||
end
|
||||
local idList = {}
|
||||
table.insert(idList, self.equipData.id)
|
||||
local heroId = ""
|
||||
if self.curHeroData then
|
||||
heroId = self.curHeroData.dynamicId
|
||||
local list = GiftManager.GetHeroGifts(heroId)
|
||||
if #list >= 12 then
|
||||
PopupTipPanel.ShowTip("礼物数量已达上限！")
|
||||
return
|
||||
end
|
||||
NetManager.GiftEquipWearRequest(1,heroId,idList,function()
|
||||
self:ClosePanel()
|
||||
if heroId=="0" then
|
||||
GiftManager.SetPlayerGift(idList)
|
||||
--HeroManager.ChangeAllHeroGiftLV()
|
||||
else
|
||||
GiftManager.SetHeroGift(self.curHeroData.dynamicId,idList,1)
|
||||
end
|
||||
self.parent.RefreshWindowData()
|
||||
end)
|
||||
else
|
||||
heroId = "0"
|
||||
local list = GiftManager.GetPlayerGifts()
|
||||
if #list >= 12 then
|
||||
PopupTipPanel.ShowTip("礼物数量已达上限！")
|
||||
return
|
||||
end
|
||||
end
|
||||
NetManager.GiftEquipWearRequest(1, heroId, idList, function()
|
||||
self:ClosePanel()
|
||||
if heroId == "0" then
|
||||
GiftManager.SetPlayerGift(idList)
|
||||
--HeroManager.ChangeAllHeroGiftLV()
|
||||
else
|
||||
GiftManager.SetHeroGift(self.curHeroData.dynamicId, idList, 1)
|
||||
end
|
||||
self.parent.RefreshWindowData()
|
||||
end)
|
||||
end)
|
||||
Util.AddClick(this.btnDown, function()
|
||||
--卸下逻辑
|
||||
local idList={}
|
||||
local heroId=""
|
||||
if self.curHeroData then
|
||||
heroId=self.curHeroData.dynamicId
|
||||
else
|
||||
heroId="0"
|
||||
end
|
||||
--LogError("2222222222222222222222"..heroId)
|
||||
--LogError("self.equipData.id==="..self.equipData.id)
|
||||
local idList = {}
|
||||
local heroId = ""
|
||||
if self.curHeroData then
|
||||
heroId = self.curHeroData.dynamicId
|
||||
else
|
||||
heroId = "0"
|
||||
end
|
||||
--LogError("2222222222222222222222"..heroId)
|
||||
--LogError("self.equipData.id==="..self.equipData.id)
|
||||
|
||||
table.insert(idList,self.equipData.id)
|
||||
--table.insert(idList,5200020)
|
||||
NetManager.GiftEquipWearRequest(2,heroId,idList,function()
|
||||
self:ClosePanel()
|
||||
if heroId=="0" then
|
||||
GiftManager.RemovePlayerGift(idList)
|
||||
HeroManager.ChangeAllHeroGiftLV()
|
||||
else
|
||||
GiftManager.SetHeroGift(self.curHeroData.dynamicId,idList,2)
|
||||
end
|
||||
self.parent.RefreshWindowData()
|
||||
end)
|
||||
end)
|
||||
table.insert(idList, self.equipData.id)
|
||||
--table.insert(idList,5200020)
|
||||
NetManager.GiftEquipWearRequest(2, heroId, idList, function()
|
||||
self:ClosePanel()
|
||||
if heroId == "0" then
|
||||
GiftManager.RemovePlayerGift(idList)
|
||||
HeroManager.ChangeAllHeroGiftLV()
|
||||
else
|
||||
GiftManager.SetHeroGift(self.curHeroData.dynamicId, idList, 2)
|
||||
end
|
||||
self.parent.RefreshWindowData()
|
||||
end)
|
||||
end)
|
||||
Util.AddClick(this.btnLock, function()
|
||||
self:OnLockClickEvent()
|
||||
self:OnLockClickEvent()
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
@ -140,7 +139,8 @@ function RewardEquipSingleShowPopup2:RemoveListener()
|
|||
end
|
||||
|
||||
--界面打开时调用（用于子类重写）
|
||||
function RewardEquipSingleShowPopup2:OnOpen(parent,_equipData,curHeroData, _func,_isRewardItemPop,_isShowfenjie,_isDown)
|
||||
function RewardEquipSingleShowPopup2:OnOpen(parent, _equipData, curHeroData, _func, _isRewardItemPop, _isShowfenjie,
|
||||
_isDown)
|
||||
if not _equipData then
|
||||
return
|
||||
end
|
||||
|
|
@ -152,6 +152,7 @@ function RewardEquipSingleShowPopup2:OnOpen(parent,_equipData,curHeroData, _func
|
|||
isDown = _isDown and _isDown or false
|
||||
self.parent = parent
|
||||
end
|
||||
|
||||
function RewardEquipSingleShowPopup2:OnShow()
|
||||
--装备基础信息
|
||||
local equipConfigData = ConfigManager.GetConfigData(ConfigName.EquipConfig, tonumber(self.equipData.id))
|
||||
|
|
@ -170,8 +171,8 @@ function RewardEquipSingleShowPopup2:OnShow()
|
|||
-- --this.downLockImage:SetActive(curEquipData.isLocked == 0)
|
||||
-- end
|
||||
-- this.equipQuaText.text = GetStringByEquipQua(equipConfigData.Quality,GetQuaStringByEquipQua(equipConfigData.Quality)) --n1
|
||||
--LogError("xxxxxxxxxxxxxxx"..tostring(self.equipData.id))
|
||||
this.eqiopName.text = GetStringByEquipQua(equipConfigData.Quality,GetLanguageStrById(equipConfigData.Name))
|
||||
--LogError("xxxxxxxxxxxxxxx"..tostring(self.equipData.id))
|
||||
this.eqiopName.text = GetStringByEquipQua(equipConfigData.Quality, GetLanguageStrById(equipConfigData.Name))
|
||||
|
||||
--if equipConfigData.IfClear == 0 then
|
||||
-- this.equipRebuildLv:GetComponent("Text").text = "不可重铸"
|
||||
|
|
@ -181,9 +182,9 @@ function RewardEquipSingleShowPopup2:OnShow()
|
|||
this.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(equipConfigData.Quality))
|
||||
this.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfigData.ResourceID))
|
||||
this.equipInfoText.text = GetLanguageStrById(itemConfigData.ItemDescribe)
|
||||
|
||||
|
||||
this.powerNum.text = EquipManager.CalculateWarForce(self.equipData.id)
|
||||
EquipManager.SetEquipStarShow(this.star,equipConfigData.Id)
|
||||
EquipManager.SetEquipStarShow(this.star, equipConfigData.Id)
|
||||
|
||||
this.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and BagManager.isBagPanel)
|
||||
|
||||
|
|
@ -192,12 +193,12 @@ function RewardEquipSingleShowPopup2:OnShow()
|
|||
passiveCfg = ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig, self.equipData.skillId)
|
||||
end
|
||||
if passiveCfg and self.equipData.skillId and self.equipData.skillId > 0 then
|
||||
this.skillObject:SetActive(true)
|
||||
this.skillInfo.text = GetLanguageStrById(passiveCfg.Desc)
|
||||
this.skillObject:SetActive(true)
|
||||
this.skillInfo.text = GetLanguageStrById(passiveCfg.Desc)
|
||||
else
|
||||
this.skillObject:SetActive(false)
|
||||
this.skillObject:SetActive(false)
|
||||
end
|
||||
this.equipType.text = GetLanguageStrById(11093)..GetEquipPosStrByEquipPosNum(equipConfigData.Position)
|
||||
this.equipType.text = GetLanguageStrById(11093) .. GetEquipPosStrByEquipPosNum(equipConfigData.Position)
|
||||
-- this.equipPos.text=string.format("职业限定：%s",GetJobStrByJobNum(equipConfigData.ProfessionLimit)) --装备关闭职业限定
|
||||
--装备属性
|
||||
for _, item in ipairs(_MainProList) do
|
||||
|
|
@ -212,25 +213,27 @@ function RewardEquipSingleShowPopup2:OnShow()
|
|||
_MainProList[index] = newObjToParent(this.mainProItem, this.mainProGrid)
|
||||
end
|
||||
_MainProList[index]:SetActive(true)
|
||||
Util.GetGameObject(_MainProList[index], "curProName"):GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
|
||||
Util.GetGameObject(_MainProList[index], "curProName"):GetComponent("Text").text = GetLanguageStrById(
|
||||
proConfigData.Info)
|
||||
local vText = Util.GetGameObject(_MainProList[index], "curProVale"):GetComponent("Text")
|
||||
Util.GetGameObject(_MainProList[index], "curProIcon"):GetComponent("Image").sprite = Util.LoadSprite(proConfigData.Icon)
|
||||
Util.GetGameObject(_MainProList[index], "curProIcon"):GetComponent("Image").sprite = Util.LoadSprite(
|
||||
proConfigData.Icon)
|
||||
-- if prop[2] > 0 then
|
||||
-- vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
|
||||
-- else
|
||||
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
|
||||
-- else
|
||||
vText.text = "+" .. GetPropertyFormatStr(proConfigData.Style, prop[2])
|
||||
-- end
|
||||
end
|
||||
end
|
||||
else
|
||||
this.mainPro:SetActive(false)
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
--套装属性
|
||||
Util.GetGameObject(self.transform, "Content/proRect"):SetActive(false)
|
||||
|
||||
|
||||
|
||||
|
||||
--装备获得途径
|
||||
Util.ClearChild(this.getTuGrid.transform)
|
||||
local curitemData = itemConfig[tonumber(self.equipData.id)]
|
||||
|
|
@ -238,9 +241,9 @@ function RewardEquipSingleShowPopup2:OnShow()
|
|||
if curitemData.Jump and #curitemData.Jump > 0 then
|
||||
for i = 1, #curitemData.Jump do
|
||||
if isRewardItemPop then
|
||||
SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],false)
|
||||
SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i], false)
|
||||
else
|
||||
SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i],true)
|
||||
SubUIManager.Open(SubUIConfig.JumpView, this.getTuGrid.transform, curitemData.Jump[i], true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -249,17 +252,17 @@ end
|
|||
|
||||
--道具 和 装备分解 发送请求后 回调
|
||||
function this.SendBackResolveReCallBack(drop)
|
||||
local isShowReward=false
|
||||
if drop.itemlist~=nil and #drop.itemlist > 0 then
|
||||
local isShowReward = false
|
||||
if drop.itemlist ~= nil and #drop.itemlist > 0 then
|
||||
for i = 1, #drop.itemlist do
|
||||
if drop.itemlist[i].itemNum > 0 then
|
||||
isShowReward=true
|
||||
isShowReward = true
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
if isShowReward then
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function ()
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1, function()
|
||||
BagManager.OnShowTipDropNumZero(drop)
|
||||
end)
|
||||
else
|
||||
|
|
@ -272,13 +275,13 @@ function this.SendBackResolveReCallBack(drop)
|
|||
end
|
||||
|
||||
function RewardEquipSingleShowPopup2:OnLockClickEvent()
|
||||
if equipData and equipData.isLocked == 0 then--未上锁
|
||||
NetManager.EquipLockRequest({equipData.id}, 1,function ()
|
||||
this.upLockImage:SetActive(true)
|
||||
this.downLockImage:SetActive(false)
|
||||
if equipData and equipData.isLocked == 0 then --未上锁
|
||||
NetManager.EquipLockRequest({ equipData.id }, 1, function()
|
||||
this.upLockImage:SetActive(true)
|
||||
this.downLockImage:SetActive(false)
|
||||
end)
|
||||
elseif equipData and equipData.isLocked == 1 then--已上锁
|
||||
NetManager.EquipLockRequest({equipData.id}, 2,function ()
|
||||
elseif equipData and equipData.isLocked == 1 then --已上锁
|
||||
NetManager.EquipLockRequest({ equipData.id }, 2, function()
|
||||
this.upLockImage:SetActive(false)
|
||||
this.downLockImage:SetActive(true)
|
||||
end)
|
||||
|
|
@ -298,4 +301,4 @@ function RewardEquipSingleShowPopup2:OnDestroy()
|
|||
_MainProList = {}
|
||||
end
|
||||
|
||||
return RewardEquipSingleShowPopup2
|
||||
return RewardEquipSingleShowPopup2
|
||||
|
|
|
|||
|
|
@ -52,7 +52,8 @@ function RoleGiftPanel:InitComponent()
|
|||
this.btnPrant = Util.GetGameObject(self.gameObject, "Tabs")
|
||||
this.equipPreList2 = {}
|
||||
this.equipPreList = {}
|
||||
this.equipPre = Util.GetGameObject(self.gameObject, "equipPre")
|
||||
--this.equipPre = Util.GetGameObject(self.gameObject, "equipPre")
|
||||
|
||||
this.upItemPre = Util.GetGameObject(self.gameObject, "upItemPre")
|
||||
this.grid = Util.GetGameObject(self.gameObject, "scroll/grid")
|
||||
this.selsectSkillImage = Util.GetGameObject(self.gameObject, "selsectSkillImage")
|
||||
|
|
@ -63,15 +64,20 @@ function RoleGiftPanel:InitComponent()
|
|||
this.allEquipDown = Util.GetGameObject(self.transform, "allEquipDown")
|
||||
this.allEquipUpRedPoint = Util.GetGameObject(self.transform, "allEquipUp/redPoint")
|
||||
this.allEquipUpRedPoint:SetActive(false)
|
||||
this.ScrollBar = Util.GetGameObject(self.gameObject, "listObj/bg/Scrollbar"):GetComponent("Scrollbar")
|
||||
--[[
|
||||
this.ScrollBar = Util.GetGameObject(self.gameObject, "listObj/bg/Scrollbar"):GetComponent("Scrollbar")
|
||||
local v2 = Util.GetGameObject(self.gameObject, "listObj/bg/scroll"):GetComponent("RectTransform").rect
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,
|
||||
Util.GetGameObject(self.transform, "listObj/bg/scroll").transform,
|
||||
this.equipPre, this.ScrollBar, Vector2.New(v2.width, v2.height), 1, 4, Vector2.New(40, 25))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 1
|
||||
]]
|
||||
|
||||
|
||||
this.scorllRoot = Util.GetGameObject(self.gameObject, "listObj/bg/scroll")
|
||||
this.equipPre = Util.GetGameObject(self.gameObject, "listObj/bg/equipPre")
|
||||
this.equipPre:SetActive(false)
|
||||
v1 = Util.GetGameObject(self.gameObject, "upScroll"):GetComponent("RectTransform").rect
|
||||
this.UpScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,
|
||||
Util.GetGameObject(self.transform, "upScroll").transform, this.upItemPre, nil, Vector2.New(v1.width, v1.height),
|
||||
|
|
@ -202,6 +208,15 @@ function RoleGiftPanel:OnOpen(...)
|
|||
heroListData = HeroManager.GetAllHeroDatas()
|
||||
end
|
||||
this.listObj:SetActive(false)
|
||||
|
||||
local scrollWidth = this.scorllRoot.transform.rect.width
|
||||
local scrollHight = this.scorllRoot.transform.rect.height
|
||||
|
||||
Util.ClearChild(this.scorllRoot.transform)
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scorllRoot.transform,
|
||||
this.equipPre, nil, Vector2.New(scrollWidth, scrollHight), 1, 1, Vector2.New(50, 15))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 1
|
||||
end
|
||||
|
||||
function RoleGiftPanel:OnShow()
|
||||
|
|
@ -511,7 +526,8 @@ function this:SetItemData(_itemDatas)
|
|||
end
|
||||
|
||||
function this.SingleItemDataShow(_go, _itemData)
|
||||
if not itemConfig[_itemData.id] then
|
||||
--[[
|
||||
if not itemConfig[_itemData.id] then
|
||||
return
|
||||
end
|
||||
if not this.equipPreList[_go] then
|
||||
|
|
@ -541,7 +557,108 @@ function this.SingleItemDataShow(_go, _itemData)
|
|||
end
|
||||
end
|
||||
)
|
||||
]]
|
||||
|
||||
--end
|
||||
|
||||
if not itemConfig[_itemData.id] then
|
||||
return
|
||||
end
|
||||
local frame = Util.GetGameObject(_go.transform, "frame"):GetComponent("Image")
|
||||
local icon = Util.GetGameObject(_go.transform, "icon"):GetComponent("Image")
|
||||
local name = Util.GetGameObject(_go.transform, "name"):GetComponent("Text")
|
||||
local power = Util.GetGameObject(_go.transform, "score"):GetComponent("Text")
|
||||
local star = Util.GetGameObject(_go.transform, "star")
|
||||
local pro = Util.GetGameObject(_go.transform, "pro")
|
||||
local proBG = Util.GetGameObject(_go.transform, "pro/proBG")
|
||||
local proIcon = Util.GetGameObject(_go.transform, "pro/proIcon")
|
||||
Util.GetGameObject(_go.transform, "num").gameObject:SetActive(true)
|
||||
Util.GetGameObject(_go.transform, "num"):GetComponent("Text").text = _itemData.num
|
||||
power.text = GetLanguageStrById(22327) .. EquipManager.CalculateWarForce(_itemData.id)
|
||||
local lvObj = Util.GetGameObject(_go.transform, "lv"):GetComponent("Text")
|
||||
local refineObj = Util.GetGameObject(_go.transform, "refine"):GetComponent("Text")
|
||||
frame.sprite = Util.LoadSprite(_itemData.frame)
|
||||
icon.sprite = Util.LoadSprite(_itemData.icon)
|
||||
lvObj.gameObject:SetActive(false)
|
||||
refineObj.gameObject:SetActive(false)
|
||||
pro:SetActive(false)
|
||||
name.text = GetLanguageStrById(_itemData.itemConfig.Name)
|
||||
star:SetActive(true)
|
||||
EquipManager.SetEquipStarShow(star, _itemData.itemConfig.Id)
|
||||
-- local redPoint = Util.GetGameObject(_go.transform, "redPoint")
|
||||
-- if curHeroCanUpEquipTabs and #curHeroCanUpEquipTabs > 0 then
|
||||
-- local isShow = false
|
||||
-- for i = 1, #curHeroCanUpEquipTabs do
|
||||
-- if curHeroCanUpEquipTabs[i] == _itemData.id then
|
||||
-- isShow = true
|
||||
-- end
|
||||
-- end
|
||||
-- if isShow then
|
||||
-- redPoint:SetActive(true)
|
||||
-- else
|
||||
-- redPoint:SetActive(false)
|
||||
-- end
|
||||
-- else
|
||||
-- redPoint:SetActive(false)
|
||||
-- end
|
||||
Util.GetGameObject(_go.transform, "num"):GetComponent("Text").text = _itemData.num
|
||||
Util.AddOnceClick(icon.gameObject, function()
|
||||
-- if curHeroEquipDatas[equipConfig[_itemData.id].Position] then
|
||||
-- local nextEquipData = EquipManager.GetSingleEquipData(_itemData.id)
|
||||
-- UIManager.OpenPanel(
|
||||
-- UIName.RoleEquipChangePopup,
|
||||
-- this,
|
||||
-- 3,
|
||||
-- curHeroData,
|
||||
-- curHeroEquipDatas[equipConfig[_itemData.id].Position],
|
||||
-- nextEquipData,
|
||||
-- equipConfig[_itemData.id].Position
|
||||
-- )
|
||||
-- else
|
||||
--UIManager.OpenPanel(UIName.RoleEquipChangePopup, this, 2, curHeroData, _itemData,
|
||||
--equipConfig[_itemData.id].Position)
|
||||
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this, _itemData, curHeroData, nil, false, false, false)
|
||||
-- end
|
||||
end)
|
||||
|
||||
-- 穿戴
|
||||
if _itemData.isUp == 1 then
|
||||
Util.GetGameObject(_go.transform, "btn_sure"):GetComponent("Image").sprite = Util.LoadSprite(GetPictureFont(
|
||||
"X1_genghuan_zhuangbei"))
|
||||
else
|
||||
Util.GetGameObject(_go.transform, "btn_sure"):GetComponent("Image").sprite = Util.LoadSprite(GetPictureFont(
|
||||
"X1_xinpian_xinpianyizhuangbei"))
|
||||
end
|
||||
Util.AddOnceClick(Util.GetGameObject(_go.transform, "btn_sure"), function()
|
||||
local idList = {}
|
||||
table.insert(idList, _itemData.id)
|
||||
local heroId = ""
|
||||
if curHeroData then
|
||||
heroId = curHeroData.dynamicId
|
||||
local list = GiftManager.GetHeroGifts(heroId)
|
||||
if #list >= 12 then
|
||||
PopupTipPanel.ShowTip("礼物数量已达上限！")
|
||||
return
|
||||
end
|
||||
else
|
||||
heroId = "0"
|
||||
local list = GiftManager.GetPlayerGifts()
|
||||
if #list >= 12 then
|
||||
PopupTipPanel.ShowTip("礼物数量已达上限！")
|
||||
return
|
||||
end
|
||||
end
|
||||
NetManager.GiftEquipWearRequest(1, heroId, idList, function()
|
||||
self:ClosePanel()
|
||||
if heroId == "0" then
|
||||
GiftManager.SetPlayerGift(idList)
|
||||
--HeroManager.ChangeAllHeroGiftLV()
|
||||
else
|
||||
GiftManager.SetHeroGift(self.curHeroData.dynamicId, idList, 1)
|
||||
end
|
||||
self.RefreshWindowData()
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
function this:SetSelectBtn()
|
||||
|
|
|
|||
Loading…
Reference in New Issue