Branch_oumei
zhangjiannan 2025-10-14 11:57:25 +08:00
parent f023ddefdb
commit 7591c71e5c
8 changed files with 287 additions and 132 deletions

View File

@ -425,6 +425,9 @@ end
--把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-16个预设 prefabAligment 1 左对齐 2 居中 默认居中
--> _scale 为spacing
function SetHeroStars(starGrid, star, scale)
if star == 0 then
return
end
scale = scale or 1
local starPre
if Util.GetGameObject(starGrid, "starGridMiddle") then
@ -2405,7 +2408,16 @@ function GetPictureFont(str)
return str .. "_zh"
end
end
function CheckListIsContainValue1(_list, _value)
if _list and _value then
for key, value in pairs(_list) do
if value == _value then
return true
end
end
end
return false
end
--设置机器人名字
function SetRobotName(uid, name)
if uid < 100000 then

View File

@ -102,7 +102,6 @@ HERO_CREATETYPE_FIELD = protobuf.FieldDescriptor();
HERO_CHANGEID_FIELD = protobuf.FieldDescriptor();
HERO_WARWAYSLOT1_FIELD = protobuf.FieldDescriptor();
HERO_WARWAYSLOT2_FIELD = protobuf.FieldDescriptor();
HERO_WARWAYSLOT3_FIELD = protobuf.FieldDescriptor();
HERO_REMAINHP_FIELD = protobuf.FieldDescriptor();
HERO_COMBATPLANS_FIELD = protobuf.FieldDescriptor();
HERO_MEDAL_FIELD = protobuf.FieldDescriptor();
@ -111,6 +110,8 @@ HERO_ADJUSTUNLOCK_FIELD = protobuf.FieldDescriptor();
HERO_POSITIONSKILLS_FIELD = protobuf.FieldDescriptor();
HERO_TOTEMID_FIELD = protobuf.FieldDescriptor();
HERO_PLAN_FIELD = protobuf.FieldDescriptor();
HERO_WARWAYSLOT3_FIELD = protobuf.FieldDescriptor();
HERO_GIFTEQUIPIDS_FIELD = protobuf.FieldDescriptor();
FIGHTUNITINFO = protobuf.Descriptor();
FIGHTUNITINFO_UNITID_FIELD = protobuf.FieldDescriptor();
FIGHTUNITINFO_UNITSKILLIDS_FIELD = protobuf.FieldDescriptor();
@ -1767,16 +1768,6 @@ HERO_WARWAYSLOT2_FIELD.default_value = 0
HERO_WARWAYSLOT2_FIELD.type = 5
HERO_WARWAYSLOT2_FIELD.cpp_type = 1
HERO_WARWAYSLOT3_FIELD.name = "warWaySlot3"
HERO_WARWAYSLOT3_FIELD.full_name = ".com.ljsd.jieling.protocols.Hero.warWaySlot3"
HERO_WARWAYSLOT3_FIELD.number = 27
HERO_WARWAYSLOT3_FIELD.index = 25
HERO_WARWAYSLOT3_FIELD.label = 1
HERO_WARWAYSLOT3_FIELD.has_default_value = false
HERO_WARWAYSLOT3_FIELD.default_value = 0
HERO_WARWAYSLOT3_FIELD.type = 5
HERO_WARWAYSLOT3_FIELD.cpp_type = 1
HERO_REMAINHP_FIELD.name = "remainHp"
HERO_REMAINHP_FIELD.full_name = ".com.ljsd.jieling.protocols.Hero.remainHp"
HERO_REMAINHP_FIELD.number = 19
@ -1859,15 +1850,35 @@ HERO_PLAN_FIELD.index = 24
HERO_PLAN_FIELD.label = 3
HERO_PLAN_FIELD.has_default_value = false
HERO_PLAN_FIELD.default_value = {}
HERO_PLAN_FIELD.message_type = COMBATPLAN
HERO_PLAN_FIELD.message_type = _COMBATPLAN
HERO_PLAN_FIELD.type = 11
HERO_PLAN_FIELD.cpp_type = 10
HERO_WARWAYSLOT3_FIELD.name = "warWaySlot3"
HERO_WARWAYSLOT3_FIELD.full_name = ".com.ljsd.jieling.protocols.Hero.warWaySlot3"
HERO_WARWAYSLOT3_FIELD.number = 27
HERO_WARWAYSLOT3_FIELD.index = 25
HERO_WARWAYSLOT3_FIELD.label = 1
HERO_WARWAYSLOT3_FIELD.has_default_value = false
HERO_WARWAYSLOT3_FIELD.default_value = 0
HERO_WARWAYSLOT3_FIELD.type = 5
HERO_WARWAYSLOT3_FIELD.cpp_type = 1
HERO_GIFTEQUIPIDS_FIELD.name = "giftEquipIds"
HERO_GIFTEQUIPIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.Hero.giftEquipIds"
HERO_GIFTEQUIPIDS_FIELD.number = 28
HERO_GIFTEQUIPIDS_FIELD.index = 26
HERO_GIFTEQUIPIDS_FIELD.label = 3
HERO_GIFTEQUIPIDS_FIELD.has_default_value = false
HERO_GIFTEQUIPIDS_FIELD.default_value = {}
HERO_GIFTEQUIPIDS_FIELD.type = 5
HERO_GIFTEQUIPIDS_FIELD.cpp_type = 1
HERO.name = "Hero"
HERO.full_name = ".com.ljsd.jieling.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_WARWAYSLOT1_FIELD, HERO_WARWAYSLOT2_FIELD, HERO_REMAINHP_FIELD, HERO_COMBATPLANS_FIELD, HERO_MEDAL_FIELD, HERO_SUIT_FIELD, HERO_ADJUSTUNLOCK_FIELD, HERO_POSITIONSKILLS_FIELD, HERO_TOTEMID_FIELD, HERO_PLAN_FIELD, HERO_WARWAYSLOT3_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_WARWAYSLOT1_FIELD, HERO_WARWAYSLOT2_FIELD, HERO_REMAINHP_FIELD, HERO_COMBATPLANS_FIELD, HERO_MEDAL_FIELD, HERO_SUIT_FIELD, HERO_ADJUSTUNLOCK_FIELD, HERO_POSITIONSKILLS_FIELD, HERO_TOTEMID_FIELD, HERO_PLAN_FIELD, HERO_WARWAYSLOT3_FIELD, HERO_GIFTEQUIPIDS_FIELD}
HERO.is_extendable = false
HERO.extensions = {}
FIGHTUNITINFO_UNITID_FIELD.name = "unitId"
@ -8454,7 +8465,7 @@ CAMPWARPLAYERINFO_BATTLERECORD_FIELD.index = 4
CAMPWARPLAYERINFO_BATTLERECORD_FIELD.label = 1
CAMPWARPLAYERINFO_BATTLERECORD_FIELD.has_default_value = false
CAMPWARPLAYERINFO_BATTLERECORD_FIELD.default_value = nil
CAMPWARPLAYERINFO_BATTLERECORD_FIELD.message_type = CAMPWARBATTLERECORD
CAMPWARPLAYERINFO_BATTLERECORD_FIELD.message_type = _CAMPWARBATTLERECORD
CAMPWARPLAYERINFO_BATTLERECORD_FIELD.type = 11
CAMPWARPLAYERINFO_BATTLERECORD_FIELD.cpp_type = 10

View File

@ -26,9 +26,6 @@ TEAMPOSSAVEREQUEST = protobuf.Descriptor();
TEAMPOSSAVEREQUEST_TEAMPOSINFO_FIELD = protobuf.FieldDescriptor();
GETALLTEAMPOSRESPONSE = protobuf.Descriptor();
GETALLTEAMPOSRESPONSE_TEAMPOSINFO_FIELD = protobuf.FieldDescriptor();
HEROCOMPOSEALLREQUEST = protobuf.Descriptor();
HEROCOMPOSEALLRESPONSE = protobuf.Descriptor();
HEROCOMPOSEALLRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
UPHEROLEVELREQUEST = protobuf.Descriptor();
UPHEROLEVELREQUEST_HEROID_FIELD = protobuf.FieldDescriptor();
UPHEROLEVELREQUEST_TARGETLEVEL_FIELD = protobuf.FieldDescriptor();
@ -88,6 +85,9 @@ HEROCOMPOSEREQUEST = protobuf.Descriptor();
HEROCOMPOSEREQUEST_ITEM_FIELD = protobuf.FieldDescriptor();
HEROCOMPOSERESPONSE = protobuf.Descriptor();
HEROCOMPOSERESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
HEROCOMPOSEALLREQUEST = protobuf.Descriptor();
HEROCOMPOSEALLRESPONSE = protobuf.Descriptor();
HEROCOMPOSEALLRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
GETALLEQUIPREQUEST = protobuf.Descriptor();
GETALLEQUIPREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
GETALLEQUIPREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
@ -301,23 +301,31 @@ HEROCOLLECTREWARDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
HEROCOLLECTREWARDREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
HEROCOLLECTREWARDRESPONSE = protobuf.Descriptor();
HEROCOLLECTREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
SELFSELECTHEROLISTREQUEST = protobuf.Descriptor();
SELFSELECTHEROLISTRESPONSE = protobuf.Descriptor();
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD = protobuf.FieldDescriptor();
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD = protobuf.FieldDescriptor();
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD = protobuf.FieldDescriptor();
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD = protobuf.FieldDescriptor();
HEROGETINDICATION = protobuf.Descriptor();
HEROGETINDICATION_HEROLIST_FIELD = protobuf.FieldDescriptor();
SELFSELECTHERORECRUITREQUEST = protobuf.Descriptor();
SELFSELECTHERORECRUITREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
SELFSELECTHERORECRUITREQUEST_ACTID_FIELD = protobuf.FieldDescriptor();
SELFSELECTCHANGEHEROREQUEST = protobuf.Descriptor();
SELFSELECTCHANGEHEROREQUEST_HEROIDS_FIELD = protobuf.FieldDescriptor();
SELFSELECTCHANGEHEROREQUEST_ACTID_FIELD = protobuf.FieldDescriptor();
SELFSELECTHEROLISTREQUEST = protobuf.Descriptor();
SELFSELECTHEROLISTRESPONSE = protobuf.Descriptor();
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD = protobuf.FieldDescriptor();
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD = protobuf.FieldDescriptor();
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD = protobuf.FieldDescriptor();
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD = protobuf.FieldDescriptor();
HIGHLOTTERYTAKEREWARDRESPONSE = protobuf.Descriptor();
HIGHLOTTERYTAKEREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
HIGHLOTTERYTAKEREWARDRESPONSE_OBTAINAGAIN_FIELD = protobuf.FieldDescriptor();
HEROGETINDICATION = protobuf.Descriptor();
HEROGETINDICATION_HEROLIST_FIELD = protobuf.FieldDescriptor();
GIFTEQUIPWEARREQUEST = protobuf.Descriptor();
GIFTEQUIPWEARREQUEST_OPERATE_FIELD = protobuf.FieldDescriptor();
GIFTEQUIPWEARREQUEST_ROLE_FIELD = protobuf.FieldDescriptor();
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD = protobuf.FieldDescriptor();
GIFTEQUIPUPSTARREQUEST = protobuf.Descriptor();
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD = protobuf.FieldDescriptor();
GIFTEQUIPUPSTARRESPONSE = protobuf.Descriptor();
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".com.ljsd.jieling.protocols.GetHeroListInfoRequest.index"
@ -521,31 +529,6 @@ GETALLTEAMPOSRESPONSE.enum_types = {}
GETALLTEAMPOSRESPONSE.fields = {GETALLTEAMPOSRESPONSE_TEAMPOSINFO_FIELD}
GETALLTEAMPOSRESPONSE.is_extendable = false
GETALLTEAMPOSRESPONSE.extensions = {}
HEROCOMPOSEALLREQUEST.name = "HeroComposeAllRequest"
HEROCOMPOSEALLREQUEST.full_name = ".com.ljsd.jieling.protocols.HeroComposeAllRequest"
HEROCOMPOSEALLREQUEST.nested_types = {}
HEROCOMPOSEALLREQUEST.enum_types = {}
HEROCOMPOSEALLREQUEST.fields = {}
HEROCOMPOSEALLREQUEST.is_extendable = false
HEROCOMPOSEALLREQUEST.extensions = {}
HEROCOMPOSEALLRESPONSE_DROP_FIELD.name = "drop"
HEROCOMPOSEALLRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroComposeAllResponse.drop"
HEROCOMPOSEALLRESPONSE_DROP_FIELD.number = 1
HEROCOMPOSEALLRESPONSE_DROP_FIELD.index = 0
HEROCOMPOSEALLRESPONSE_DROP_FIELD.label = 1
HEROCOMPOSEALLRESPONSE_DROP_FIELD.has_default_value = false
HEROCOMPOSEALLRESPONSE_DROP_FIELD.default_value = nil
HEROCOMPOSEALLRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
HEROCOMPOSEALLRESPONSE_DROP_FIELD.type = 11
HEROCOMPOSEALLRESPONSE_DROP_FIELD.cpp_type = 10
HEROCOMPOSEALLRESPONSE.name = "HeroComposeAllResponse"
HEROCOMPOSEALLRESPONSE.full_name = ".com.ljsd.jieling.protocols.HeroComposeAllResponse"
HEROCOMPOSEALLRESPONSE.nested_types = {}
HEROCOMPOSEALLRESPONSE.enum_types = {}
HEROCOMPOSEALLRESPONSE.fields = {HEROCOMPOSEALLRESPONSE_DROP_FIELD}
HEROCOMPOSEALLRESPONSE.is_extendable = false
HEROCOMPOSEALLRESPONSE.extensions = {}
UPHEROLEVELREQUEST_HEROID_FIELD.name = "heroId"
UPHEROLEVELREQUEST_HEROID_FIELD.full_name = ".com.ljsd.jieling.protocols.UpHeroLevelRequest.heroId"
UPHEROLEVELREQUEST_HEROID_FIELD.number = 1
@ -1088,6 +1071,31 @@ HEROCOMPOSERESPONSE.enum_types = {}
HEROCOMPOSERESPONSE.fields = {HEROCOMPOSERESPONSE_DROP_FIELD}
HEROCOMPOSERESPONSE.is_extendable = false
HEROCOMPOSERESPONSE.extensions = {}
HEROCOMPOSEALLREQUEST.name = "HeroComposeAllRequest"
HEROCOMPOSEALLREQUEST.full_name = ".com.ljsd.jieling.protocols.HeroComposeAllRequest"
HEROCOMPOSEALLREQUEST.nested_types = {}
HEROCOMPOSEALLREQUEST.enum_types = {}
HEROCOMPOSEALLREQUEST.fields = {}
HEROCOMPOSEALLREQUEST.is_extendable = false
HEROCOMPOSEALLREQUEST.extensions = {}
HEROCOMPOSEALLRESPONSE_DROP_FIELD.name = "drop"
HEROCOMPOSEALLRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroComposeAllResponse.drop"
HEROCOMPOSEALLRESPONSE_DROP_FIELD.number = 1
HEROCOMPOSEALLRESPONSE_DROP_FIELD.index = 0
HEROCOMPOSEALLRESPONSE_DROP_FIELD.label = 1
HEROCOMPOSEALLRESPONSE_DROP_FIELD.has_default_value = false
HEROCOMPOSEALLRESPONSE_DROP_FIELD.default_value = nil
HEROCOMPOSEALLRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
HEROCOMPOSEALLRESPONSE_DROP_FIELD.type = 11
HEROCOMPOSEALLRESPONSE_DROP_FIELD.cpp_type = 10
HEROCOMPOSEALLRESPONSE.name = "HeroComposeAllResponse"
HEROCOMPOSEALLRESPONSE.full_name = ".com.ljsd.jieling.protocols.HeroComposeAllResponse"
HEROCOMPOSEALLRESPONSE.nested_types = {}
HEROCOMPOSEALLRESPONSE.enum_types = {}
HEROCOMPOSEALLRESPONSE.fields = {HEROCOMPOSEALLRESPONSE_DROP_FIELD}
HEROCOMPOSEALLRESPONSE.is_extendable = false
HEROCOMPOSEALLRESPONSE.extensions = {}
GETALLEQUIPREQUEST_INDEX_FIELD.name = "index"
GETALLEQUIPREQUEST_INDEX_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAllEquipRequest.index"
GETALLEQUIPREQUEST_INDEX_FIELD.number = 1
@ -2995,60 +3003,24 @@ HEROCOLLECTREWARDRESPONSE.enum_types = {}
HEROCOLLECTREWARDRESPONSE.fields = {HEROCOLLECTREWARDRESPONSE_DROP_FIELD}
HEROCOLLECTREWARDRESPONSE.is_extendable = false
HEROCOLLECTREWARDRESPONSE.extensions = {}
SELFSELECTHEROLISTREQUEST.name = "SelfSelectHeroListRequest"
SELFSELECTHEROLISTREQUEST.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListRequest"
SELFSELECTHEROLISTREQUEST.nested_types = {}
SELFSELECTHEROLISTREQUEST.enum_types = {}
SELFSELECTHEROLISTREQUEST.fields = {}
SELFSELECTHEROLISTREQUEST.is_extendable = false
SELFSELECTHEROLISTREQUEST.extensions = {}
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.name = "heroIds"
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse.heroIds"
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.number = 1
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.index = 0
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.label = 3
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.has_default_value = false
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.default_value = {}
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.type = 5
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.cpp_type = 1
HEROGETINDICATION_HEROLIST_FIELD.name = "heroList"
HEROGETINDICATION_HEROLIST_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroGetIndication.heroList"
HEROGETINDICATION_HEROLIST_FIELD.number = 1
HEROGETINDICATION_HEROLIST_FIELD.index = 0
HEROGETINDICATION_HEROLIST_FIELD.label = 3
HEROGETINDICATION_HEROLIST_FIELD.has_default_value = false
HEROGETINDICATION_HEROLIST_FIELD.default_value = {}
HEROGETINDICATION_HEROLIST_FIELD.message_type = CommonProto_pb.HERO
HEROGETINDICATION_HEROLIST_FIELD.type = 11
HEROGETINDICATION_HEROLIST_FIELD.cpp_type = 10
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.name = "dailyGemRandomTimes"
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse.dailyGemRandomTimes"
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.number = 2
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.index = 1
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.label = 1
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.has_default_value = false
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.default_value = 0
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.type = 5
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.cpp_type = 1
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.name = "everOpenedActIds"
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse.everOpenedActIds"
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.number = 3
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.index = 2
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.label = 3
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.has_default_value = false
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.default_value = {}
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.type = 5
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.cpp_type = 1
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.name = "guaranteeTimes"
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse.guaranteeTimes"
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.number = 4
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.index = 3
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.label = 1
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.has_default_value = false
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.default_value = 0
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.type = 5
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.cpp_type = 1
SELFSELECTHEROLISTRESPONSE.name = "SelfSelectHeroListResponse"
SELFSELECTHEROLISTRESPONSE.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse"
SELFSELECTHEROLISTRESPONSE.nested_types = {}
SELFSELECTHEROLISTRESPONSE.enum_types = {}
SELFSELECTHEROLISTRESPONSE.fields = {SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD, SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD, SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD, SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD}
SELFSELECTHEROLISTRESPONSE.is_extendable = false
SELFSELECTHEROLISTRESPONSE.extensions = {}
HEROGETINDICATION.name = "HeroGetIndication"
HEROGETINDICATION.full_name = ".com.ljsd.jieling.protocols.HeroGetIndication"
HEROGETINDICATION.nested_types = {}
HEROGETINDICATION.enum_types = {}
HEROGETINDICATION.fields = {HEROGETINDICATION_HEROLIST_FIELD}
HEROGETINDICATION.is_extendable = false
HEROGETINDICATION.extensions = {}
SELFSELECTHERORECRUITREQUEST_TYPE_FIELD.name = "type"
SELFSELECTHERORECRUITREQUEST_TYPE_FIELD.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroRecruitRequest.type"
SELFSELECTHERORECRUITREQUEST_TYPE_FIELD.number = 1
@ -3103,6 +3075,60 @@ SELFSELECTCHANGEHEROREQUEST.enum_types = {}
SELFSELECTCHANGEHEROREQUEST.fields = {SELFSELECTCHANGEHEROREQUEST_HEROIDS_FIELD, SELFSELECTCHANGEHEROREQUEST_ACTID_FIELD}
SELFSELECTCHANGEHEROREQUEST.is_extendable = false
SELFSELECTCHANGEHEROREQUEST.extensions = {}
SELFSELECTHEROLISTREQUEST.name = "SelfSelectHeroListRequest"
SELFSELECTHEROLISTREQUEST.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListRequest"
SELFSELECTHEROLISTREQUEST.nested_types = {}
SELFSELECTHEROLISTREQUEST.enum_types = {}
SELFSELECTHEROLISTREQUEST.fields = {}
SELFSELECTHEROLISTREQUEST.is_extendable = false
SELFSELECTHEROLISTREQUEST.extensions = {}
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.name = "heroIds"
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse.heroIds"
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.number = 1
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.index = 0
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.label = 3
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.has_default_value = false
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.default_value = {}
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.type = 5
SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD.cpp_type = 1
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.name = "dailyGemRandomTimes"
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse.dailyGemRandomTimes"
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.number = 2
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.index = 1
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.label = 1
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.has_default_value = false
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.default_value = 0
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.type = 5
SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD.cpp_type = 1
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.name = "everOpenedActIds"
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse.everOpenedActIds"
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.number = 3
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.index = 2
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.label = 3
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.has_default_value = false
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.default_value = {}
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.type = 5
SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD.cpp_type = 1
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.name = "guaranteeTimes"
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse.guaranteeTimes"
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.number = 4
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.index = 3
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.label = 1
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.has_default_value = false
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.default_value = 0
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.type = 5
SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD.cpp_type = 1
SELFSELECTHEROLISTRESPONSE.name = "SelfSelectHeroListResponse"
SELFSELECTHEROLISTRESPONSE.full_name = ".com.ljsd.jieling.protocols.SelfSelectHeroListResponse"
SELFSELECTHEROLISTRESPONSE.nested_types = {}
SELFSELECTHEROLISTRESPONSE.enum_types = {}
SELFSELECTHEROLISTRESPONSE.fields = {SELFSELECTHEROLISTRESPONSE_HEROIDS_FIELD, SELFSELECTHEROLISTRESPONSE_DAILYGEMRANDOMTIMES_FIELD, SELFSELECTHEROLISTRESPONSE_EVEROPENEDACTIDS_FIELD, SELFSELECTHEROLISTRESPONSE_GUARANTEETIMES_FIELD}
SELFSELECTHEROLISTRESPONSE.is_extendable = false
SELFSELECTHEROLISTRESPONSE.extensions = {}
HIGHLOTTERYTAKEREWARDRESPONSE_DROP_FIELD.name = "drop"
HIGHLOTTERYTAKEREWARDRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.HighLotteryTakeRewardResponse.drop"
HIGHLOTTERYTAKEREWARDRESPONSE_DROP_FIELD.number = 1
@ -3131,24 +3157,78 @@ HIGHLOTTERYTAKEREWARDRESPONSE.enum_types = {}
HIGHLOTTERYTAKEREWARDRESPONSE.fields = {HIGHLOTTERYTAKEREWARDRESPONSE_DROP_FIELD, HIGHLOTTERYTAKEREWARDRESPONSE_OBTAINAGAIN_FIELD}
HIGHLOTTERYTAKEREWARDRESPONSE.is_extendable = false
HIGHLOTTERYTAKEREWARDRESPONSE.extensions = {}
HEROGETINDICATION_HEROLIST_FIELD.name = "heroList"
HEROGETINDICATION_HEROLIST_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroGetIndication.heroList"
HEROGETINDICATION_HEROLIST_FIELD.number = 1
HEROGETINDICATION_HEROLIST_FIELD.index = 0
HEROGETINDICATION_HEROLIST_FIELD.label = 3
HEROGETINDICATION_HEROLIST_FIELD.has_default_value = false
HEROGETINDICATION_HEROLIST_FIELD.default_value = {}
HEROGETINDICATION_HEROLIST_FIELD.message_type = CommonProto_pb.HERO
HEROGETINDICATION_HEROLIST_FIELD.type = 11
HEROGETINDICATION_HEROLIST_FIELD.cpp_type = 10
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.name = "operate"
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.full_name = ".com.ljsd.jieling.protocols.GiftEquipWearRequest.operate"
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.number = 1
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.index = 0
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.label = 1
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.has_default_value = false
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.default_value = 0
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.type = 5
GIFTEQUIPWEARREQUEST_OPERATE_FIELD.cpp_type = 1
HEROGETINDICATION.name = "HeroGetIndication"
HEROGETINDICATION.full_name = ".com.ljsd.jieling.protocols.HeroGetIndication"
HEROGETINDICATION.nested_types = {}
HEROGETINDICATION.enum_types = {}
HEROGETINDICATION.fields = {HEROGETINDICATION_HEROLIST_FIELD}
HEROGETINDICATION.is_extendable = false
HEROGETINDICATION.extensions = {}
GIFTEQUIPWEARREQUEST_ROLE_FIELD.name = "role"
GIFTEQUIPWEARREQUEST_ROLE_FIELD.full_name = ".com.ljsd.jieling.protocols.GiftEquipWearRequest.role"
GIFTEQUIPWEARREQUEST_ROLE_FIELD.number = 2
GIFTEQUIPWEARREQUEST_ROLE_FIELD.index = 1
GIFTEQUIPWEARREQUEST_ROLE_FIELD.label = 1
GIFTEQUIPWEARREQUEST_ROLE_FIELD.has_default_value = false
GIFTEQUIPWEARREQUEST_ROLE_FIELD.default_value = ""
GIFTEQUIPWEARREQUEST_ROLE_FIELD.type = 9
GIFTEQUIPWEARREQUEST_ROLE_FIELD.cpp_type = 9
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.name = "giftIds"
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.GiftEquipWearRequest.giftIds"
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.number = 3
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.index = 2
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.label = 3
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.has_default_value = false
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.default_value = {}
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.type = 5
GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD.cpp_type = 1
GIFTEQUIPWEARREQUEST.name = "GiftEquipWearRequest"
GIFTEQUIPWEARREQUEST.full_name = ".com.ljsd.jieling.protocols.GiftEquipWearRequest"
GIFTEQUIPWEARREQUEST.nested_types = {}
GIFTEQUIPWEARREQUEST.enum_types = {}
GIFTEQUIPWEARREQUEST.fields = {GIFTEQUIPWEARREQUEST_OPERATE_FIELD, GIFTEQUIPWEARREQUEST_ROLE_FIELD, GIFTEQUIPWEARREQUEST_GIFTIDS_FIELD}
GIFTEQUIPWEARREQUEST.is_extendable = false
GIFTEQUIPWEARREQUEST.extensions = {}
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD.name = "giftId"
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD.full_name = ".com.ljsd.jieling.protocols.GiftEquipUpStarRequest.giftId"
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD.number = 1
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD.index = 0
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD.label = 1
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD.has_default_value = false
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD.default_value = 0
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD.type = 5
GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD.cpp_type = 1
GIFTEQUIPUPSTARREQUEST.name = "GiftEquipUpStarRequest"
GIFTEQUIPUPSTARREQUEST.full_name = ".com.ljsd.jieling.protocols.GiftEquipUpStarRequest"
GIFTEQUIPUPSTARREQUEST.nested_types = {}
GIFTEQUIPUPSTARREQUEST.enum_types = {}
GIFTEQUIPUPSTARREQUEST.fields = {GIFTEQUIPUPSTARREQUEST_GIFTID_FIELD}
GIFTEQUIPUPSTARREQUEST.is_extendable = false
GIFTEQUIPUPSTARREQUEST.extensions = {}
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.name = "drop"
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.GiftEquipUpStarResponse.drop"
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.number = 1
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.index = 0
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.label = 1
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.has_default_value = false
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.default_value = nil
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.type = 11
GIFTEQUIPUPSTARRESPONSE_DROP_FIELD.cpp_type = 10
GIFTEQUIPUPSTARRESPONSE.name = "GiftEquipUpStarResponse"
GIFTEQUIPUPSTARRESPONSE.full_name = ".com.ljsd.jieling.protocols.GiftEquipUpStarResponse"
GIFTEQUIPUPSTARRESPONSE.nested_types = {}
GIFTEQUIPUPSTARRESPONSE.enum_types = {}
GIFTEQUIPUPSTARRESPONSE.fields = {GIFTEQUIPUPSTARRESPONSE_DROP_FIELD}
GIFTEQUIPUPSTARRESPONSE.is_extendable = false
GIFTEQUIPUPSTARRESPONSE.extensions = {}
AdjustLevelUpRequest = protobuf.Message(ADJUSTLEVELUPREQUEST)
AdjustResetRequest = protobuf.Message(ADJUSTRESETREQUEST)
@ -3187,6 +3267,9 @@ GetHeroListInfoRequest = protobuf.Message(GETHEROLISTINFOREQUEST)
GetHeroListInfoResponse = protobuf.Message(GETHEROLISTINFORESPONSE)
GetHongmengInfoResponse = protobuf.Message(GETHONGMENGINFORESPONSE)
GetTeamPosMirrorInfoRequest = protobuf.Message(GETTEAMPOSMIRRORINFOREQUEST)
GiftEquipUpStarRequest = protobuf.Message(GIFTEQUIPUPSTARREQUEST)
GiftEquipUpStarResponse = protobuf.Message(GIFTEQUIPUPSTARRESPONSE)
GiftEquipWearRequest = protobuf.Message(GIFTEQUIPWEARREQUEST)
HeroCollectRewardInfo = protobuf.Message(HEROCOLLECTREWARDINFO)
HeroCollectRewardInfoRequest = protobuf.Message(HEROCOLLECTREWARDINFOREQUEST)
HeroCollectRewardInfoResponse = protobuf.Message(HEROCOLLECTREWARDINFORESPONSE)

File diff suppressed because one or more lines are too long

View File

@ -303,6 +303,7 @@ function this.GetBagItemDataByItemType(_itemType)
if v.type == _itemType and v.num > 0 and v.itemConfig.BackpackOrNot then
items[index] = v
index = index + 1
LogError(tostring(_itemType).."背包物品类型:"..tostring(v.type).."/"..tostring(v.itemConfig.ItemType).." id:"..tostring(v.itemConfig.Id))
end
end
return items

View File

@ -151,7 +151,8 @@ function this.UpdateHeroDatas(_msgHeroData, _isFindHandBook, _isExtern)
heroData.suitActive = _msgHeroData.suit -- 勋章套装激活
heroData.totemId = _msgHeroData.totemId -- 图腾
heroData.CombatPlanList =_msgHeroData.plan --戒指
GiftManager.InitHeroGift(_msgHeroData.id, _msgHeroData.giftEquipIds)
heroData.giftIds = _msgHeroData.giftEquipIds
if #_msgHeroData.soulPos >= 1 then
local soulPrintList = {}
for i, v in ipairs(_msgHeroData.soulPos) do
@ -1415,7 +1416,20 @@ local function CalculateHeroUpEquipsProAddVal(_heroId)
end
end
end
for i = 1, #curHeroData.giftIds do
local curEquip = EquipManager.GetSingleHeroSingleEquipData(curHeroData.giftIds[i], _heroId)
if curEquip then
for index, prop in ipairs(curEquip.mainAttribute) do
local id = prop.propertyId
local value = prop.propertyValue
if addAllProVal[id] then
addAllProVal[id] = addAllProVal[id] + value
else
addAllProVal[id] = value
end
end
end
end
if equipSuit and LengthOfTable(equipSuit) > 0 then
for i, v in pairs(equipSuit) do
local curSuitConfig = equipsuite[i]
@ -4334,7 +4348,15 @@ function this.GetCurHeroIsHaveBySid(heroSId)
end
return false
end
--改变英雄礼物
function this.ChangeHeroGift(_dyn, list)
if heroDatas[_dyn] then
heroDatas[_dyn].giftIds = list
--for k, v in pairs(heroDatas[_dyn].potential) do
--v.giftLv = GiftManager.GetHeroPotencyLvById(_dyn)
--end
end
end
-- 角色定位相关
-- 判断该角色是否开启定位 sid 英雄静态ID
function this.IsHeroPosOpen(did)

View File

@ -8006,9 +8006,9 @@ end
function NetManager.CampSimpleInfoGetReq(func)
-- local data = CampWar_pb.CampSimpleInfoGetReq()
-- local msg = data:SerializeToString()
LogError("============================select1============================")
--LogError("============================select1============================")
if ActTimeCtrlManager.FunctionIsOpen(111) then
LogError("============================select2============================")
--LogError("============================select2============================")
Network:SendMessageWithCallBack(MessageTypeProto_pb.CS_CampSimpleInfoGet,
MessageTypeProto_pb.SC_CampSimpleInfoGet, nil, function(buffer)
local data = buffer:DataByte()
@ -8743,7 +8743,8 @@ function NetManager.GiftEquipWearRequest(_type,_roleId,_ids,_func)
if _func then
_func()
end
if _roleId=="0" then
--[[
if _roleId=="0" then
local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
for i = 1, 6 do
if formationList.teamHeroInfos[i] then
@ -8754,6 +8755,8 @@ function NetManager.GiftEquipWearRequest(_type,_roleId,_ids,_func)
HeroPropManager.SetDirtyByType(_roleId, Hero_Prop_Type.Gift)
end
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Gift)
]]
--FormationManager.UserPowerChanged()
--获取新战力
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)

View File

@ -135,7 +135,7 @@ function RoleGiftPanel:BindEvent()
if canNum>0 then
local list={}
table.sort(allEquip,function(a,b)
return equipConfig[a.id].ExhibitionScore>equipConfig[b.id].ExhibitionScore
return equipConfig[a.id].Quality>equipConfig[b.id].Quality
end)
for i=1,#allEquip do
if i<=canNum then
@ -240,7 +240,7 @@ function this.RefreshWindowData()
maxNum=12
--end
this.lvTxt.text="收集度"..lv..""
LogError("lv========="..lv.." curnum=="..curNum.." maxNum=="..maxNum)
--LogError("lv========="..lv.." curnum=="..curNum.." maxNum=="..maxNum)
--maxNum=0
local giftDatas={}
allUpIds={}
@ -274,7 +274,7 @@ function this.RefreshWindowData()
end
end)
--LogError("当前礼物数量:"..#list)
this.UpScrollView:SetData(giftDatas,
function(index, go)
this.SingleUpItemShow(go, giftDatas[index],index)
@ -362,7 +362,7 @@ function this.SingleUpItemShow(_go,data,_index)
starGrid:SetActive(true)
lockText.gameObject:SetActive(false)
add:SetActive(false)
name.text=itemConfig[data.id].Name
name.text= GetLanguageStrById(itemConfig[data.id].Name)
icon.sprite=Util.LoadSprite(GetResourcePath(itemConfig[data.id].ResourceID))
SetHeroStars(starGrid,equipConfig[data.id].Star,1,nil,-15)
Util.AddOnceClick(icon.gameObject,function()
@ -410,8 +410,10 @@ function this:OnClickTabBtn(_index)
count = count + 1
if CheckListIsContainValue1(allUpIds,allEquip[i].id) or CheckListIsContainValue1(upSuitId,equipConfig[allEquip[i].id].SuiteID) then
allEquip[i].isUp=1
--LogError("rrrrrrrrrrrrrrrr:"..tostring(allEquip[i].id).."/"..tostring(equipConfig[allEquip[i].id].SuiteID))
else
allEquip[i].isUp=2
--LogError("bbbbbbbbbbbbbbbb:"..tostring(allEquip[i].id).."/"..tostring(equipConfig[allEquip[i].id].SuiteID))
end
end
table.sort(allEquip,function(a,b)
@ -428,6 +430,7 @@ function this:OnClickTabBtn(_index)
end)
--"装备数量:"
this.itemNumText.text = "礼物种类:" .. count
--LogError("xxxxxxxxxxxxxxxxxxxx"..#allEquip)
this:SetItemData(allEquip)
--this.CheckRedTab()