【巅峰赛限时头像修改】
parent
ca5a82f655
commit
040971534e
|
@ -966,6 +966,7 @@ JumpType = {
|
|||
YiJingBaoKu = 10018,--易经宝库
|
||||
LingShouBaoGe = 10019,--灵兽宝阁
|
||||
XiangYaoDuoBao = 10020,--降妖夺宝
|
||||
HeadChange = 10021, --巅峰赛
|
||||
|
||||
}
|
||||
YaoHunFrame = {
|
||||
|
|
|
@ -178,7 +178,8 @@ ConfigName = {
|
|||
BlessingConfigNew = "BlessingConfigNew",
|
||||
BlessingRewardPoolNew = "BlessingRewardPoolNew",
|
||||
SpiritAnimalSummon = "SpiritAnimalSummon",
|
||||
NewHeroConfig = "NewHeroConfig"
|
||||
NewHeroConfig = "NewHeroConfig",
|
||||
PlayerHeadIcon = "PlayerHeadIcon",
|
||||
}
|
||||
|
||||
require "Framework/GameDataBase"
|
||||
|
|
|
@ -45,6 +45,9 @@ ITEM_NEXTFLUSHTIME_FIELD = protobuf.FieldDescriptor();
|
|||
SPECIALEFFECTS = protobuf.Descriptor();
|
||||
SPECIALEFFECTS_PROPERTYID_FIELD = protobuf.FieldDescriptor();
|
||||
SPECIALEFFECTS_PROPERTYVALUE_FIELD = protobuf.FieldDescriptor();
|
||||
HEADFRAMELIST = protobuf.Descriptor();
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD = protobuf.FieldDescriptor();
|
||||
HEADFRAMELIST_VALIDTIME_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIP = protobuf.Descriptor();
|
||||
EQUIP_ID_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIP_EQUIPID_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -1008,6 +1011,33 @@ SPECIALEFFECTS.enum_types = {}
|
|||
SPECIALEFFECTS.fields = {SPECIALEFFECTS_PROPERTYID_FIELD, SPECIALEFFECTS_PROPERTYVALUE_FIELD}
|
||||
SPECIALEFFECTS.is_extendable = false
|
||||
SPECIALEFFECTS.extensions = {}
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD.name = "headFrameId"
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD.full_name = ".rpc.protocols.HeadFrameList.headFrameId"
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD.number = 1
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD.index = 0
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD.label = 1
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD.has_default_value = false
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD.default_value = 0
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD.type = 5
|
||||
HEADFRAMELIST_HEADFRAMEID_FIELD.cpp_type = 1
|
||||
|
||||
HEADFRAMELIST_VALIDTIME_FIELD.name = "validTime"
|
||||
HEADFRAMELIST_VALIDTIME_FIELD.full_name = ".rpc.protocols.HeadFrameList.validTime"
|
||||
HEADFRAMELIST_VALIDTIME_FIELD.number = 2
|
||||
HEADFRAMELIST_VALIDTIME_FIELD.index = 1
|
||||
HEADFRAMELIST_VALIDTIME_FIELD.label = 1
|
||||
HEADFRAMELIST_VALIDTIME_FIELD.has_default_value = false
|
||||
HEADFRAMELIST_VALIDTIME_FIELD.default_value = 0
|
||||
HEADFRAMELIST_VALIDTIME_FIELD.type = 5
|
||||
HEADFRAMELIST_VALIDTIME_FIELD.cpp_type = 1
|
||||
|
||||
HEADFRAMELIST.name = "HeadFrameList"
|
||||
HEADFRAMELIST.full_name = ".rpc.protocols.HeadFrameList"
|
||||
HEADFRAMELIST.nested_types = {}
|
||||
HEADFRAMELIST.enum_types = {}
|
||||
HEADFRAMELIST.fields = {HEADFRAMELIST_HEADFRAMEID_FIELD, HEADFRAMELIST_VALIDTIME_FIELD}
|
||||
HEADFRAMELIST.is_extendable = false
|
||||
HEADFRAMELIST.extensions = {}
|
||||
EQUIP_ID_FIELD.name = "id"
|
||||
EQUIP_ID_FIELD.full_name = ".rpc.protocols.Equip.id"
|
||||
EQUIP_ID_FIELD.number = 1
|
||||
|
@ -6359,6 +6389,7 @@ GmResponse = protobuf.Message(GMRESPONSE)
|
|||
GoodsTypeDuration = protobuf.Message(GOODSTYPEDURATION)
|
||||
GuildHelpInfo = protobuf.Message(GUILDHELPINFO)
|
||||
GuildHelpLog = protobuf.Message(GUILDHELPLOG)
|
||||
HeadFrameList = protobuf.Message(HEADFRAMELIST)
|
||||
Hero = protobuf.Message(HERO)
|
||||
HeroBloodInfo = protobuf.Message(HEROBLOODINFO)
|
||||
Item = protobuf.Message(ITEM)
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -62,6 +62,7 @@ GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD = protobuf.FieldDescriptor();
|
|||
GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_WORLDLEVE_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD = protobuf.FieldDescriptor();
|
||||
GETITEMINFOREQUEST = protobuf.Descriptor();
|
||||
GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
|
||||
GETITEMINFORESPONSE = protobuf.Descriptor();
|
||||
|
@ -465,6 +466,12 @@ JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD = protobuf.FieldDescriptor();
|
|||
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD = protobuf.FieldDescriptor();
|
||||
WORLDLEVELINDICATION = protobuf.Descriptor();
|
||||
WORLDLEVELINDICATION_WORLDLEVE_FIELD = protobuf.FieldDescriptor();
|
||||
USEHEADFRAMEREQUEST = protobuf.Descriptor();
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD = protobuf.FieldDescriptor();
|
||||
USEHEADFRAMERESPONSE = protobuf.Descriptor();
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD = protobuf.FieldDescriptor();
|
||||
HEADFRAMEPASTDUEINDICATION = protobuf.Descriptor();
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
|
||||
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
|
||||
|
@ -1035,11 +1042,22 @@ GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD.default_value = {}
|
|||
GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD.type = 5
|
||||
GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD.cpp_type = 1
|
||||
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.name = "headFrameBag"
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.headFrameBag"
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.number = 36
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.index = 35
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.label = 3
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.has_default_value = false
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.default_value = {}
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.message_type = CommonProto_pb.HEADFRAMELIST
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.type = 11
|
||||
GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD.cpp_type = 10
|
||||
|
||||
GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
|
||||
GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse"
|
||||
GETPLAYERINFORESPONSE.nested_types = {}
|
||||
GETPLAYERINFORESPONSE.enum_types = {}
|
||||
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD}
|
||||
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD}
|
||||
GETPLAYERINFORESPONSE.is_extendable = false
|
||||
GETPLAYERINFORESPONSE.extensions = {}
|
||||
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
|
||||
|
@ -4710,6 +4728,57 @@ WORLDLEVELINDICATION.enum_types = {}
|
|||
WORLDLEVELINDICATION.fields = {WORLDLEVELINDICATION_WORLDLEVE_FIELD}
|
||||
WORLDLEVELINDICATION.is_extendable = false
|
||||
WORLDLEVELINDICATION.extensions = {}
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD.name = "headFrameId"
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD.full_name = ".rpc.protocols.UseHeadFrameRequest.headFrameId"
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD.number = 1
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD.index = 0
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD.label = 1
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD.has_default_value = false
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD.default_value = 0
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD.type = 5
|
||||
USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD.cpp_type = 1
|
||||
|
||||
USEHEADFRAMEREQUEST.name = "UseHeadFrameRequest"
|
||||
USEHEADFRAMEREQUEST.full_name = ".rpc.protocols.UseHeadFrameRequest"
|
||||
USEHEADFRAMEREQUEST.nested_types = {}
|
||||
USEHEADFRAMEREQUEST.enum_types = {}
|
||||
USEHEADFRAMEREQUEST.fields = {USEHEADFRAMEREQUEST_HEADFRAMEID_FIELD}
|
||||
USEHEADFRAMEREQUEST.is_extendable = false
|
||||
USEHEADFRAMEREQUEST.extensions = {}
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD.name = "validTime"
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD.full_name = ".rpc.protocols.UseHeadFrameResponse.validTime"
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD.number = 1
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD.index = 0
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD.label = 1
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD.has_default_value = false
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD.default_value = 0
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD.type = 5
|
||||
USEHEADFRAMERESPONSE_VALIDTIME_FIELD.cpp_type = 1
|
||||
|
||||
USEHEADFRAMERESPONSE.name = "UseHeadFrameResponse"
|
||||
USEHEADFRAMERESPONSE.full_name = ".rpc.protocols.UseHeadFrameResponse"
|
||||
USEHEADFRAMERESPONSE.nested_types = {}
|
||||
USEHEADFRAMERESPONSE.enum_types = {}
|
||||
USEHEADFRAMERESPONSE.fields = {USEHEADFRAMERESPONSE_VALIDTIME_FIELD}
|
||||
USEHEADFRAMERESPONSE.is_extendable = false
|
||||
USEHEADFRAMERESPONSE.extensions = {}
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.name = "headFrameId"
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.full_name = ".rpc.protocols.HeadFramePastDueIndication.headFrameId"
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.number = 1
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.index = 0
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.label = 1
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.has_default_value = false
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.default_value = 0
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.type = 5
|
||||
HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD.cpp_type = 1
|
||||
|
||||
HEADFRAMEPASTDUEINDICATION.name = "HeadFramePastDueIndication"
|
||||
HEADFRAMEPASTDUEINDICATION.full_name = ".rpc.protocols.HeadFramePastDueIndication"
|
||||
HEADFRAMEPASTDUEINDICATION.nested_types = {}
|
||||
HEADFRAMEPASTDUEINDICATION.enum_types = {}
|
||||
HEADFRAMEPASTDUEINDICATION.fields = {HEADFRAMEPASTDUEINDICATION_HEADFRAMEID_FIELD}
|
||||
HEADFRAMEPASTDUEINDICATION.is_extendable = false
|
||||
HEADFRAMEPASTDUEINDICATION.extensions = {}
|
||||
|
||||
ActiviteWorkShopReqeust = protobuf.Message(ACTIVITEWORKSHOPREQEUST)
|
||||
ActivityUpateIndication = protobuf.Message(ACTIVITYUPATEINDICATION)
|
||||
|
@ -4765,6 +4834,7 @@ GetSomeActitityInfoRespone = protobuf.Message(GETSOMEACTITITYINFORESPONE)
|
|||
GetSomeActivityInfoRequest = protobuf.Message(GETSOMEACTIVITYINFOREQUEST)
|
||||
GetStoreInfosResponse = protobuf.Message(GETSTOREINFOSRESPONSE)
|
||||
GetWorkShopInfoResponse = protobuf.Message(GETWORKSHOPINFORESPONSE)
|
||||
HeadFramePastDueIndication = protobuf.Message(HEADFRAMEPASTDUEINDICATION)
|
||||
InviteFriendRequest = protobuf.Message(INVITEFRIENDREQUEST)
|
||||
JadeDynastyRefreshIndication = protobuf.Message(JADEDYNASTYREFRESHINDICATION)
|
||||
JadeDynastyRefreshTimeResponse = protobuf.Message(JADEDYNASTYREFRESHTIMERESPONSE)
|
||||
|
@ -4837,6 +4907,8 @@ UpdateStateRequest = protobuf.Message(UPDATESTATEREQUEST)
|
|||
UpdateUserExpIndicaiton = protobuf.Message(UPDATEUSEREXPINDICAITON)
|
||||
UseAndPriceItemRequest = protobuf.Message(USEANDPRICEITEMREQUEST)
|
||||
UseAndPriceItemResponse = protobuf.Message(USEANDPRICEITEMRESPONSE)
|
||||
UseHeadFrameRequest = protobuf.Message(USEHEADFRAMEREQUEST)
|
||||
UseHeadFrameResponse = protobuf.Message(USEHEADFRAMERESPONSE)
|
||||
UserForceChangeRequest = protobuf.Message(USERFORCECHANGEREQUEST)
|
||||
ViewHeroInfoRequest = protobuf.Message(VIEWHEROINFOREQUEST)
|
||||
ViewHeroInfoResponse = protobuf.Message(VIEWHEROINFORESPONSE)
|
||||
|
|
|
@ -299,13 +299,13 @@ function this.GetBagItemDataByItemType(_itemType)
|
|||
end
|
||||
|
||||
--通过物品类型获得物品list
|
||||
function this.GetBagItemDataByItemTypeV2(_itemType,_itemType1)
|
||||
function this.GetBagItemDataByItemTypeV2(_itemType,_itemType1,_itemType2)
|
||||
local items = {}
|
||||
local index = 1
|
||||
--LogError("_itemType ".._itemType)
|
||||
for i, v in pairs(this.bagDatas) do
|
||||
--LogError(v.itemConfig.Name.." ".._itemType.." "..v.type.." "..v.num)
|
||||
if (v.type == _itemType or v.type == _itemType1) and v.num > 0 and v.itemConfig.BackpackOrNot then
|
||||
if (v.type == _itemType or v.type == _itemType1 or v.itemType == _itemType2) and v.num > 0 and v.itemConfig.BackpackOrNot then
|
||||
items[index] = v
|
||||
index = index + 1
|
||||
end
|
||||
|
|
|
@ -156,6 +156,7 @@ function this.OnClickTabBtn(_index, _clickBtn)
|
|||
itemData = {}
|
||||
local itemNumText = this.itemNumText:GetComponent("Text")
|
||||
this:SetSelectBtn(_clickBtn)
|
||||
print("_index ".._index)
|
||||
if _index == ItemBaseType.Equip then
|
||||
local allEquipData = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip)
|
||||
local allEquipNum = 0
|
||||
|
@ -176,9 +177,10 @@ function this.OnClickTabBtn(_index, _clickBtn)
|
|||
itemNumText.text = Language[10190]..LengthOfTable(itemData).."/"..specialConfig[10].Value
|
||||
this:SetItemData(itemData)
|
||||
elseif (_index == ItemBaseType.Special) then
|
||||
itemData = BagManager.GetBagItemDataByItemTypeV2(ItemBaseType.Special,ItemBaseType.Materials)
|
||||
itemData = BagManager.GetBagItemDataByItemTypeV2(ItemBaseType.Special,ItemBaseType.Materials,ItemType.HeadFrame)
|
||||
this:SetItemData(itemData)
|
||||
else
|
||||
|
||||
itemData = BagManager.GetBagItemDataByItemType(_index)
|
||||
this:SetItemData(itemData)
|
||||
end
|
||||
|
@ -437,6 +439,12 @@ function this.SingleItemDataShow(_go, _itemData)
|
|||
this.OnClickTabBtn(sortIndex, sortIndexBtnGo)
|
||||
UIManager.ClosePanel(UIName.RewardItemSingleShowPopup)
|
||||
end)
|
||||
-- elseif _itemData.itemConfig.ItemType == ItemType.HeadFrame then
|
||||
-- --
|
||||
-- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.id,function()
|
||||
-- this.OnClickTabBtn(sortIndex, sortIndexBtnGo)
|
||||
-- UIManager.ClosePanel(UIName.RewardItemSingleShowPopup)
|
||||
-- end)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.id, function()
|
||||
this.OnClickTabBtn(sortIndex, sortIndexBtnGo)
|
||||
|
@ -556,7 +564,7 @@ function this.SetPlayerHead()
|
|||
this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
|
||||
end
|
||||
this.playerHead:SetHead(PlayerManager.head)
|
||||
this.playerHead:SetFrame(PlayerManager.frame)
|
||||
this.playerHead:SetFrame(HeadManager.GetCurFrameId())
|
||||
this.playerHead:SetScale(Vector3.one * 0.9)
|
||||
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
|
||||
this.playerHead:SetLayer(this.sortingOrder)
|
||||
|
|
|
@ -441,7 +441,7 @@ function this.SetPlayerHead()
|
|||
this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
|
||||
end
|
||||
this.playerHead:SetHead(PlayerManager.head)
|
||||
this.playerHead:SetFrame(PlayerManager.frame)
|
||||
this.playerHead:SetFrame(HeadManager.GetCurFrameId())
|
||||
this.playerHead:SetScale(Vector3.one * 0.9)
|
||||
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
|
||||
this.playerHead:SetLayer(this.sortingOrder)
|
||||
|
|
|
@ -96,7 +96,7 @@ function this.SetPlayerHead()
|
|||
this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
|
||||
end
|
||||
this.playerHead:SetHead(PlayerManager.head)
|
||||
this.playerHead:SetFrame(PlayerManager.frame)
|
||||
this.playerHead:SetFrame(HeadManager.GetCurFrameId())
|
||||
this.playerHead:SetScale(Vector3.one * 0.9)
|
||||
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
|
||||
this.playerHead:SetLayer(this.sortingOrder)
|
||||
|
|
|
@ -506,7 +506,7 @@ function this.InitShow()
|
|||
this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
|
||||
end
|
||||
this.playerHead:SetHead(PlayerManager.head)
|
||||
this.playerHead:SetFrame(PlayerManager.frame)
|
||||
this.playerHead:SetFrame(HeadManager.GetCurFrameId())
|
||||
this.playerHead:SetScale(Vector3.one * 0.9)
|
||||
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
|
||||
this.playerHead:SetLayer(this.sortingOrder)
|
||||
|
|
|
@ -331,7 +331,7 @@ function this.SetPlayerHead()
|
|||
this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
|
||||
end
|
||||
this.playerHead:SetHead(PlayerManager.head)
|
||||
this.playerHead:SetFrame(PlayerManager.frame)
|
||||
this.playerHead:SetFrame(HeadManager.GetCurFrameId())
|
||||
this.playerHead:SetScale(Vector3.one * 0.9)
|
||||
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
|
||||
this.playerHead:SetLayer(this.sortingOrder)
|
||||
|
|
|
@ -1089,7 +1089,7 @@ function this:OnShow()
|
|||
this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
|
||||
end
|
||||
this.playerHead:SetHead(PlayerManager.head)
|
||||
this.playerHead:SetFrame(PlayerManager.frame)
|
||||
this.playerHead:SetFrame(HeadManager.GetCurFrameId())
|
||||
this.playerHead:SetScale(Vector3.one * 0.9)
|
||||
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
|
||||
this.playerHead:SetLayer(this.sortingOrder)
|
||||
|
|
|
@ -113,6 +113,7 @@ function this.PlayerInfoRequest(func)
|
|||
PlayerManager.skin = msg.player.decrotion--皮肤
|
||||
PlayerManager.ride = msg.player.ride--坐骑
|
||||
PlayerManager.rideLevel = msg.player.rideLevel
|
||||
HeadManager.SetHeadFrameAllData(msg.headFrameBag)
|
||||
if msg.player.sex then
|
||||
NameManager.SetRoleSex(msg.player.sex)
|
||||
else
|
||||
|
@ -4752,4 +4753,22 @@ function this.DemonsTrialRewardRequest(layerId,func)
|
|||
end
|
||||
end)
|
||||
end
|
||||
|
||||
--使用头像框
|
||||
|
||||
function this.UseHeadFrameRequestFun(headFrameId,func)
|
||||
local data = PlayerInfoProto_pb.UseHeadFrameRequest()
|
||||
data.headFrameId = headFrameId
|
||||
LogBlue("headFrameId "..headFrameId)
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.UseHeadFrameRequest, MessageTypeProto_pb.UseHeadFrameResponse, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.UseHeadFrameResponse()
|
||||
msg:ParseFromString(data)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
return this
|
|
@ -168,5 +168,52 @@ function HeadManager.CheckHeadRedPot(rpType)
|
|||
return false
|
||||
end
|
||||
|
||||
local playerHeadIcon = ConfigManager.GetConfig(ConfigName.PlayerHeadIcon)
|
||||
this.headFrameData = {}
|
||||
--获取后端传来的数据 加以修改
|
||||
function HeadManager.SetHeadFrameAllData(data)
|
||||
this.headFrameData = {}
|
||||
if #data > 0 then
|
||||
for i = 1, #data do
|
||||
LogGreen(" data[i].headFrameId ".. data[i].headFrameId.." data[i].validTime "..data[i].validTime )
|
||||
local single_data = {}
|
||||
single_data.headFrameId = data[i].headFrameId
|
||||
single_data.validTime = data[i].validTime
|
||||
single_data.PlayerHeadIcon = ConfigManager.GetConfigDataByKey(ConfigName.PlayerHeadIcon,"ItemId",single_data.headFrameId)
|
||||
this.headFrameData[single_data.headFrameId] = single_data
|
||||
end
|
||||
-- body
|
||||
end
|
||||
end
|
||||
|
||||
function HeadManager.SetSineleHeadFrameAllData(headFrameId,time)
|
||||
local single_data = {}
|
||||
single_data.headFrameId = headFrameId
|
||||
single_data.validTime = time
|
||||
LogGreen(" headFrameId ".. headFrameId.." time "..time )
|
||||
single_data.PlayerHeadIcon = ConfigManager.GetConfigDataByKey(ConfigName.PlayerHeadIcon,"ItemId",single_data.headFrameId)
|
||||
this.headFrameData[single_data.headFrameId] = single_data
|
||||
end
|
||||
|
||||
function HeadManager.GetSingleFrame(Did)
|
||||
if this.headFrameData[Did] then
|
||||
-- body
|
||||
return this.headFrameData[Did]
|
||||
else
|
||||
return nil
|
||||
end
|
||||
end
|
||||
|
||||
function HeadManager.GetCurFrameId()
|
||||
local freameData = this.headFrameData[PlayerManager.frame]
|
||||
if freameData then
|
||||
if (freameData.validTime > 0 and freameData.validTime > GetTimeStamp()) or freameData.validTime <= 0 then
|
||||
return PlayerManager.frame
|
||||
else
|
||||
this.headFrameData[PlayerManager.frame] = nil
|
||||
end
|
||||
end
|
||||
PlayerManager.frame = 80000
|
||||
return 80000
|
||||
end
|
||||
return HeadManager
|
|
@ -29,6 +29,10 @@ this.IsGetFiveStarHero = false
|
|||
this.headBookListTag = 1
|
||||
|
||||
this.now_index = 0
|
||||
|
||||
--头像框数据
|
||||
this.headFrameList = {}
|
||||
|
||||
local update = function()
|
||||
local dt = Time.unscaledDeltaTime
|
||||
this.serverTime = this.serverTime + dt
|
||||
|
@ -454,4 +458,6 @@ function this.StopBattleUpLvTipTime()
|
|||
battleUpLvTipTime = nil
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
return this
|
|
@ -128,6 +128,12 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
end
|
||||
end)
|
||||
end
|
||||
elseif itemConfigData.ItemType == ItemType.HeadFrame then
|
||||
LogBlue("itemSid "..itemSid)
|
||||
NetManager.UseHeadFrameRequestFun(itemSid,function (msg)
|
||||
HeadManager.SetSineleHeadFrameAllData(itemSid,msg.validTime)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
elseif itemConfigData then
|
||||
JumpManager.GoJump(itemConfigData.UseJump,function ()
|
||||
this:ClosePanel()
|
||||
|
|
|
@ -205,7 +205,7 @@ function this.SetPlayerHead()
|
|||
this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
|
||||
end
|
||||
this.playerHead:SetHead(PlayerManager.head)
|
||||
this.playerHead:SetFrame(PlayerManager.frame)
|
||||
this.playerHead:SetFrame(HeadManager.GetCurFrameId())
|
||||
this.playerHead:SetScale(Vector3.one * 0.9)
|
||||
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
|
||||
this.playerHead:SetLayer(this.sortingOrder)
|
||||
|
|
|
@ -91,8 +91,8 @@ function HeadChangePopup:BindEvent()
|
|||
-- 请求更换头像框
|
||||
if this.CurSelectType == SELECT_TYPE.FRAME then
|
||||
local frameId = _HeadFrameList[this.CurSelectIndex].Id
|
||||
local num = BagManager.GetItemCountById(frameId)
|
||||
if num <= 0 then
|
||||
local num = HeadManager.headFrameData[frameId]
|
||||
if not num then
|
||||
PopupTipPanel.ShowTip(Language[11890])
|
||||
return
|
||||
end
|
||||
|
@ -180,11 +180,13 @@ function this.OnTabChange(index, lastIndex)
|
|||
local curId = nil
|
||||
if index == SELECT_TYPE.FRAME then
|
||||
datalist = _HeadFrameList
|
||||
--print(#datalist.." 77777")
|
||||
curId = PlayerManager.frame
|
||||
this.title.text = Language[11893]
|
||||
elseif index == SELECT_TYPE.HEAD then
|
||||
datalist = _HeadList
|
||||
curId = PlayerManager.head
|
||||
--print(#datalist.." 88888")
|
||||
this.title.text = Language[11894]
|
||||
end
|
||||
-- 排序
|
||||
|
@ -246,10 +248,11 @@ function this.HeadFrameItemAdapter(item, data, index)
|
|||
this:RecycleUsing(_PlayerHeadList[item].gameObject)
|
||||
end
|
||||
|
||||
local num = BagManager.GetItemCountById(frameId)
|
||||
_PlayerHeadList[item]:SetGray(num <= 0)
|
||||
local num = HeadManager.headFrameData[frameId]
|
||||
|
||||
_PlayerHeadList[item]:SetGray( not num)
|
||||
|
||||
redpot:SetActive(num > 0 and HeadManager.IsNewHead(frameId))
|
||||
redpot:SetActive(num and HeadManager.IsNewHead(frameId))
|
||||
|
||||
Util.AddOnceClick(item, function()
|
||||
this.SelectItem(index, item)
|
||||
|
@ -268,6 +271,7 @@ function this.HeadFrameItemAdapter(item, data, index)
|
|||
end
|
||||
|
||||
local num = BagManager.GetItemCountById(headId)
|
||||
--print(num.." !!!!!!")
|
||||
_PlayerHeadList[item]:SetGray(num <= 0)
|
||||
|
||||
redpot:SetActive(num > 0 and HeadManager.IsNewHead(headId))
|
||||
|
@ -299,14 +303,23 @@ function this.SelectItem(index, item)
|
|||
|
||||
-- 设置content显示
|
||||
local data = nil
|
||||
local HeadData = nil
|
||||
if this.CurSelectType == SELECT_TYPE.FRAME then
|
||||
data = _HeadFrameList[index]
|
||||
--print(data.Id)
|
||||
HeadData = HeadManager.GetSingleFrame(data.Id)
|
||||
elseif this.CurSelectType == SELECT_TYPE.HEAD then
|
||||
data = _HeadList[index]
|
||||
end
|
||||
|
||||
if not data then return end
|
||||
|
||||
this.content.text = data.ItemDescribe
|
||||
if data.Id >=80000 and HeadData and HeadData.validTime - GetTimeStamp() > 0 then
|
||||
-- body
|
||||
this.content.text = data.ItemDescribe .."到期时间:"..TimeStampToDateStr(HeadData.validTime)
|
||||
else
|
||||
this.content.text = data.ItemDescribe
|
||||
end
|
||||
--..",到期时间:"..HeadData.validTime
|
||||
|
||||
-- 红点
|
||||
if HeadManager.IsNewHead(data.Id) then
|
||||
|
|
|
@ -121,7 +121,7 @@ function this.RefreshPlayerInfoShow()
|
|||
end
|
||||
this.playerHead:Reset()
|
||||
this.playerHead:SetHead(PlayerManager.head)
|
||||
this.playerHead:SetFrame(PlayerManager.frame)
|
||||
this.playerHead:SetFrame(HeadManager.GetCurFrameId())
|
||||
this.playerHead:SetLevel(PlayerManager.level)
|
||||
this.playerHead:SetLayer(this.rootPanel.sortingOrder)
|
||||
this.playerHead:SetEffectScale(1.1)
|
||||
|
|
|
@ -105,7 +105,7 @@ function this.SetPlayerHead()
|
|||
this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
|
||||
end
|
||||
this.playerHead:SetHead(PlayerManager.head)
|
||||
this.playerHead:SetFrame(PlayerManager.frame)
|
||||
this.playerHead:SetFrame(HeadManager.GetCurFrameId())
|
||||
this.playerHead:SetScale(Vector3.one * 0.9)
|
||||
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
|
||||
this.playerHead:SetLayer(this.sortingOrder)
|
||||
|
|
Loading…
Reference in New Issue