lua 提交

dev_chengFeng
jiaoyangna 2021-02-22 16:35:25 +08:00
parent fce9811a5b
commit c4883087a5
5 changed files with 721 additions and 382 deletions

View File

@ -1491,7 +1491,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 255.51498, y: 330}
m_AnchoredPosition: {x: 290.18, y: 330}
m_SizeDelta: {x: 300, y: 14.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5978880476251738607
@ -1953,7 +1953,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -2.5, y: 326.43994}
m_AnchoredPosition: {x: 0, y: 326.43994}
m_SizeDelta: {x: 273.2, y: 62.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2660270962337554157
@ -7747,7 +7747,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -259, y: 329.53992}
m_AnchoredPosition: {x: -290.18, y: 329.53992}
m_SizeDelta: {x: 300, y: 12.72}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1201981010984464712

View File

@ -163,6 +163,33 @@ CHANGESKINREQUEST_HEROID_FIELD = protobuf.FieldDescriptor();
CHANGESKINREQUEST_SKINID_FIELD = protobuf.FieldDescriptor();
GETSKININDICATION = protobuf.Descriptor();
GETSKININDICATION_SKININFO_FIELD = protobuf.FieldDescriptor();
OPENRESONANCEREQUEST = protobuf.Descriptor();
OPENRESONANCEREQUEST_GRIDID_FIELD = protobuf.FieldDescriptor();
RESONANCEREQUEST = protobuf.Descriptor();
RESONANCEREQUEST_HEROID_FIELD = protobuf.FieldDescriptor();
RESONANCEREQUEST_GRIDID_FIELD = protobuf.FieldDescriptor();
RESONANCEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
RESONANCERESPONSE = protobuf.Descriptor();
RESONANCERESPONSE_LEFTTIME_FIELD = protobuf.FieldDescriptor();
CLEANRESONANCETIMEREQUEST = protobuf.Descriptor();
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD = protobuf.FieldDescriptor();
CLEANRESONANCETIMEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
HONGMENGHEROINFO = protobuf.Descriptor();
HONGMENGHEROINFO_GRIDID_FIELD = protobuf.FieldDescriptor();
HONGMENGHEROINFO_HEROID_FIELD = protobuf.FieldDescriptor();
HONGMENGHEROINFO_TIME_FIELD = protobuf.FieldDescriptor();
HONGMENGADDITION = protobuf.Descriptor();
HONGMENGADDITION_ADDITIONTYPE_FIELD = protobuf.FieldDescriptor();
HONGMENGADDITION_VALUE_FIELD = protobuf.FieldDescriptor();
HONGMENGADDITION_HEROTID_FIELD = protobuf.FieldDescriptor();
GETHONGMENGINFORESPONSE = protobuf.Descriptor();
HONGMENGINFOINDICATION = protobuf.Descriptor();
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD = protobuf.FieldDescriptor();
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD = protobuf.FieldDescriptor();
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD = protobuf.FieldDescriptor();
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD = protobuf.FieldDescriptor();
HONGMENGSTELENEWHANDINDICATION = protobuf.Descriptor();
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD = protobuf.FieldDescriptor();
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
@ -1604,10 +1631,257 @@ GETSKININDICATION.enum_types = {}
GETSKININDICATION.fields = {GETSKININDICATION_SKININFO_FIELD}
GETSKININDICATION.is_extendable = false
GETSKININDICATION.extensions = {}
OPENRESONANCEREQUEST_GRIDID_FIELD.name = "gridId"
OPENRESONANCEREQUEST_GRIDID_FIELD.full_name = ".rpc.protocols.OpenResonanceRequest.gridId"
OPENRESONANCEREQUEST_GRIDID_FIELD.number = 1
OPENRESONANCEREQUEST_GRIDID_FIELD.index = 0
OPENRESONANCEREQUEST_GRIDID_FIELD.label = 1
OPENRESONANCEREQUEST_GRIDID_FIELD.has_default_value = false
OPENRESONANCEREQUEST_GRIDID_FIELD.default_value = 0
OPENRESONANCEREQUEST_GRIDID_FIELD.type = 5
OPENRESONANCEREQUEST_GRIDID_FIELD.cpp_type = 1
OPENRESONANCEREQUEST.name = "OpenResonanceRequest"
OPENRESONANCEREQUEST.full_name = ".rpc.protocols.OpenResonanceRequest"
OPENRESONANCEREQUEST.nested_types = {}
OPENRESONANCEREQUEST.enum_types = {}
OPENRESONANCEREQUEST.fields = {OPENRESONANCEREQUEST_GRIDID_FIELD}
OPENRESONANCEREQUEST.is_extendable = false
OPENRESONANCEREQUEST.extensions = {}
RESONANCEREQUEST_HEROID_FIELD.name = "heroId"
RESONANCEREQUEST_HEROID_FIELD.full_name = ".rpc.protocols.ResonanceRequest.heroId"
RESONANCEREQUEST_HEROID_FIELD.number = 1
RESONANCEREQUEST_HEROID_FIELD.index = 0
RESONANCEREQUEST_HEROID_FIELD.label = 1
RESONANCEREQUEST_HEROID_FIELD.has_default_value = false
RESONANCEREQUEST_HEROID_FIELD.default_value = ""
RESONANCEREQUEST_HEROID_FIELD.type = 9
RESONANCEREQUEST_HEROID_FIELD.cpp_type = 9
RESONANCEREQUEST_GRIDID_FIELD.name = "gridId"
RESONANCEREQUEST_GRIDID_FIELD.full_name = ".rpc.protocols.ResonanceRequest.gridId"
RESONANCEREQUEST_GRIDID_FIELD.number = 2
RESONANCEREQUEST_GRIDID_FIELD.index = 1
RESONANCEREQUEST_GRIDID_FIELD.label = 1
RESONANCEREQUEST_GRIDID_FIELD.has_default_value = false
RESONANCEREQUEST_GRIDID_FIELD.default_value = 0
RESONANCEREQUEST_GRIDID_FIELD.type = 5
RESONANCEREQUEST_GRIDID_FIELD.cpp_type = 1
RESONANCEREQUEST_TYPE_FIELD.name = "type"
RESONANCEREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.ResonanceRequest.type"
RESONANCEREQUEST_TYPE_FIELD.number = 3
RESONANCEREQUEST_TYPE_FIELD.index = 2
RESONANCEREQUEST_TYPE_FIELD.label = 1
RESONANCEREQUEST_TYPE_FIELD.has_default_value = false
RESONANCEREQUEST_TYPE_FIELD.default_value = 0
RESONANCEREQUEST_TYPE_FIELD.type = 5
RESONANCEREQUEST_TYPE_FIELD.cpp_type = 1
RESONANCEREQUEST.name = "ResonanceRequest"
RESONANCEREQUEST.full_name = ".rpc.protocols.ResonanceRequest"
RESONANCEREQUEST.nested_types = {}
RESONANCEREQUEST.enum_types = {}
RESONANCEREQUEST.fields = {RESONANCEREQUEST_HEROID_FIELD, RESONANCEREQUEST_GRIDID_FIELD, RESONANCEREQUEST_TYPE_FIELD}
RESONANCEREQUEST.is_extendable = false
RESONANCEREQUEST.extensions = {}
RESONANCERESPONSE_LEFTTIME_FIELD.name = "leftTime"
RESONANCERESPONSE_LEFTTIME_FIELD.full_name = ".rpc.protocols.ResonanceResponse.leftTime"
RESONANCERESPONSE_LEFTTIME_FIELD.number = 1
RESONANCERESPONSE_LEFTTIME_FIELD.index = 0
RESONANCERESPONSE_LEFTTIME_FIELD.label = 1
RESONANCERESPONSE_LEFTTIME_FIELD.has_default_value = false
RESONANCERESPONSE_LEFTTIME_FIELD.default_value = 0
RESONANCERESPONSE_LEFTTIME_FIELD.type = 5
RESONANCERESPONSE_LEFTTIME_FIELD.cpp_type = 1
RESONANCERESPONSE.name = "ResonanceResponse"
RESONANCERESPONSE.full_name = ".rpc.protocols.ResonanceResponse"
RESONANCERESPONSE.nested_types = {}
RESONANCERESPONSE.enum_types = {}
RESONANCERESPONSE.fields = {RESONANCERESPONSE_LEFTTIME_FIELD}
RESONANCERESPONSE.is_extendable = false
RESONANCERESPONSE.extensions = {}
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.name = "gridId"
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.full_name = ".rpc.protocols.CleanResonanceTimeRequest.gridId"
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.number = 2
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.index = 0
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.label = 1
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.has_default_value = false
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.default_value = 0
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.type = 5
CLEANRESONANCETIMEREQUEST_GRIDID_FIELD.cpp_type = 1
CLEANRESONANCETIMEREQUEST_TYPE_FIELD.name = "type"
CLEANRESONANCETIMEREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.CleanResonanceTimeRequest.type"
CLEANRESONANCETIMEREQUEST_TYPE_FIELD.number = 1
CLEANRESONANCETIMEREQUEST_TYPE_FIELD.index = 1
CLEANRESONANCETIMEREQUEST_TYPE_FIELD.label = 1
CLEANRESONANCETIMEREQUEST_TYPE_FIELD.has_default_value = false
CLEANRESONANCETIMEREQUEST_TYPE_FIELD.default_value = 0
CLEANRESONANCETIMEREQUEST_TYPE_FIELD.type = 5
CLEANRESONANCETIMEREQUEST_TYPE_FIELD.cpp_type = 1
CLEANRESONANCETIMEREQUEST.name = "CleanResonanceTimeRequest"
CLEANRESONANCETIMEREQUEST.full_name = ".rpc.protocols.CleanResonanceTimeRequest"
CLEANRESONANCETIMEREQUEST.nested_types = {}
CLEANRESONANCETIMEREQUEST.enum_types = {}
CLEANRESONANCETIMEREQUEST.fields = {CLEANRESONANCETIMEREQUEST_GRIDID_FIELD, CLEANRESONANCETIMEREQUEST_TYPE_FIELD}
CLEANRESONANCETIMEREQUEST.is_extendable = false
CLEANRESONANCETIMEREQUEST.extensions = {}
HONGMENGHEROINFO_GRIDID_FIELD.name = "gridId"
HONGMENGHEROINFO_GRIDID_FIELD.full_name = ".rpc.protocols.HongmengHeroInfo.gridId"
HONGMENGHEROINFO_GRIDID_FIELD.number = 1
HONGMENGHEROINFO_GRIDID_FIELD.index = 0
HONGMENGHEROINFO_GRIDID_FIELD.label = 1
HONGMENGHEROINFO_GRIDID_FIELD.has_default_value = false
HONGMENGHEROINFO_GRIDID_FIELD.default_value = 0
HONGMENGHEROINFO_GRIDID_FIELD.type = 5
HONGMENGHEROINFO_GRIDID_FIELD.cpp_type = 1
HONGMENGHEROINFO_HEROID_FIELD.name = "heroId"
HONGMENGHEROINFO_HEROID_FIELD.full_name = ".rpc.protocols.HongmengHeroInfo.heroId"
HONGMENGHEROINFO_HEROID_FIELD.number = 2
HONGMENGHEROINFO_HEROID_FIELD.index = 1
HONGMENGHEROINFO_HEROID_FIELD.label = 1
HONGMENGHEROINFO_HEROID_FIELD.has_default_value = false
HONGMENGHEROINFO_HEROID_FIELD.default_value = ""
HONGMENGHEROINFO_HEROID_FIELD.type = 9
HONGMENGHEROINFO_HEROID_FIELD.cpp_type = 9
HONGMENGHEROINFO_TIME_FIELD.name = "time"
HONGMENGHEROINFO_TIME_FIELD.full_name = ".rpc.protocols.HongmengHeroInfo.time"
HONGMENGHEROINFO_TIME_FIELD.number = 3
HONGMENGHEROINFO_TIME_FIELD.index = 2
HONGMENGHEROINFO_TIME_FIELD.label = 1
HONGMENGHEROINFO_TIME_FIELD.has_default_value = false
HONGMENGHEROINFO_TIME_FIELD.default_value = 0
HONGMENGHEROINFO_TIME_FIELD.type = 3
HONGMENGHEROINFO_TIME_FIELD.cpp_type = 2
HONGMENGHEROINFO.name = "HongmengHeroInfo"
HONGMENGHEROINFO.full_name = ".rpc.protocols.HongmengHeroInfo"
HONGMENGHEROINFO.nested_types = {}
HONGMENGHEROINFO.enum_types = {}
HONGMENGHEROINFO.fields = {HONGMENGHEROINFO_GRIDID_FIELD, HONGMENGHEROINFO_HEROID_FIELD, HONGMENGHEROINFO_TIME_FIELD}
HONGMENGHEROINFO.is_extendable = false
HONGMENGHEROINFO.extensions = {}
HONGMENGADDITION_ADDITIONTYPE_FIELD.name = "additionType"
HONGMENGADDITION_ADDITIONTYPE_FIELD.full_name = ".rpc.protocols.HongmengAddition.additionType"
HONGMENGADDITION_ADDITIONTYPE_FIELD.number = 1
HONGMENGADDITION_ADDITIONTYPE_FIELD.index = 0
HONGMENGADDITION_ADDITIONTYPE_FIELD.label = 1
HONGMENGADDITION_ADDITIONTYPE_FIELD.has_default_value = false
HONGMENGADDITION_ADDITIONTYPE_FIELD.default_value = 0
HONGMENGADDITION_ADDITIONTYPE_FIELD.type = 5
HONGMENGADDITION_ADDITIONTYPE_FIELD.cpp_type = 1
HONGMENGADDITION_VALUE_FIELD.name = "value"
HONGMENGADDITION_VALUE_FIELD.full_name = ".rpc.protocols.HongmengAddition.value"
HONGMENGADDITION_VALUE_FIELD.number = 2
HONGMENGADDITION_VALUE_FIELD.index = 1
HONGMENGADDITION_VALUE_FIELD.label = 1
HONGMENGADDITION_VALUE_FIELD.has_default_value = false
HONGMENGADDITION_VALUE_FIELD.default_value = 0
HONGMENGADDITION_VALUE_FIELD.type = 5
HONGMENGADDITION_VALUE_FIELD.cpp_type = 1
HONGMENGADDITION_HEROTID_FIELD.name = "heroTid"
HONGMENGADDITION_HEROTID_FIELD.full_name = ".rpc.protocols.HongmengAddition.heroTid"
HONGMENGADDITION_HEROTID_FIELD.number = 3
HONGMENGADDITION_HEROTID_FIELD.index = 2
HONGMENGADDITION_HEROTID_FIELD.label = 1
HONGMENGADDITION_HEROTID_FIELD.has_default_value = false
HONGMENGADDITION_HEROTID_FIELD.default_value = 0
HONGMENGADDITION_HEROTID_FIELD.type = 5
HONGMENGADDITION_HEROTID_FIELD.cpp_type = 1
HONGMENGADDITION.name = "HongmengAddition"
HONGMENGADDITION.full_name = ".rpc.protocols.HongmengAddition"
HONGMENGADDITION.nested_types = {}
HONGMENGADDITION.enum_types = {}
HONGMENGADDITION.fields = {HONGMENGADDITION_ADDITIONTYPE_FIELD, HONGMENGADDITION_VALUE_FIELD, HONGMENGADDITION_HEROTID_FIELD}
HONGMENGADDITION.is_extendable = false
HONGMENGADDITION.extensions = {}
GETHONGMENGINFORESPONSE.name = "GetHongmengInfoResponse"
GETHONGMENGINFORESPONSE.full_name = ".rpc.protocols.GetHongmengInfoResponse"
GETHONGMENGINFORESPONSE.nested_types = {}
GETHONGMENGINFORESPONSE.enum_types = {}
GETHONGMENGINFORESPONSE.fields = {}
GETHONGMENGINFORESPONSE.is_extendable = false
GETHONGMENGINFORESPONSE.extensions = {}
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.name = "hongmengGuards"
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.full_name = ".rpc.protocols.HongmengInfoIndication.hongmengGuards"
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.number = 1
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.index = 0
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.label = 3
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.has_default_value = false
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.default_value = {}
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.message_type = HONGMENGHEROINFO
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.type = 11
HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD.cpp_type = 10
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.name = "hongmengAdditions"
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.full_name = ".rpc.protocols.HongmengInfoIndication.hongmengAdditions"
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.number = 2
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.index = 1
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.label = 3
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.has_default_value = false
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.default_value = {}
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.message_type = HONGMENGADDITION
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.type = 11
HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD.cpp_type = 10
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.name = "hongmengResonacnes"
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.full_name = ".rpc.protocols.HongmengInfoIndication.hongmengResonacnes"
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.number = 3
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.index = 2
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.label = 3
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.has_default_value = false
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.default_value = {}
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.message_type = HONGMENGHEROINFO
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.type = 11
HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD.cpp_type = 10
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD.name = "hongmengTabletMax"
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD.full_name = ".rpc.protocols.HongmengInfoIndication.hongmengTabletMax"
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD.number = 4
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD.index = 3
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD.label = 1
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD.has_default_value = false
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD.default_value = 0
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD.type = 5
HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD.cpp_type = 1
HONGMENGINFOINDICATION.name = "HongmengInfoIndication"
HONGMENGINFOINDICATION.full_name = ".rpc.protocols.HongmengInfoIndication"
HONGMENGINFOINDICATION.nested_types = {}
HONGMENGINFOINDICATION.enum_types = {}
HONGMENGINFOINDICATION.fields = {HONGMENGINFOINDICATION_HONGMENGGUARDS_FIELD, HONGMENGINFOINDICATION_HONGMENGADDITIONS_FIELD, HONGMENGINFOINDICATION_HONGMENGRESONACNES_FIELD, HONGMENGINFOINDICATION_HONGMENGTABLETMAX_FIELD}
HONGMENGINFOINDICATION.is_extendable = false
HONGMENGINFOINDICATION.extensions = {}
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD.name = "state"
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD.full_name = ".rpc.protocols.HongmengSteleNewHandIndication.state"
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD.number = 1
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD.index = 0
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD.label = 1
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD.has_default_value = false
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD.default_value = 0
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD.type = 5
HONGMENGSTELENEWHANDINDICATION_STATE_FIELD.cpp_type = 1
HONGMENGSTELENEWHANDINDICATION.name = "HongmengSteleNewHandIndication"
HONGMENGSTELENEWHANDINDICATION.full_name = ".rpc.protocols.HongmengSteleNewHandIndication"
HONGMENGSTELENEWHANDINDICATION.nested_types = {}
HONGMENGSTELENEWHANDINDICATION.enum_types = {}
HONGMENGSTELENEWHANDINDICATION.fields = {HONGMENGSTELENEWHANDINDICATION_STATE_FIELD}
HONGMENGSTELENEWHANDINDICATION.is_extendable = false
HONGMENGSTELENEWHANDINDICATION.extensions = {}
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
CancelHeroChangeResponse = protobuf.Message(CANCELHEROCHANGERESPONSE)
ChangeSkinRequest = protobuf.Message(CHANGESKINREQUEST)
CleanResonanceTimeRequest = protobuf.Message(CLEANRESONANCETIMEREQUEST)
ComplexEquipRequest = protobuf.Message(COMPLEXEQUIPREQUEST)
ComplexEquipResponse = protobuf.Message(COMPLEXEQUIPRESPONSE)
ComplexJewelEquipRequest = protobuf.Message(COMPLEXJEWELEQUIPREQUEST)
@ -1630,6 +1904,7 @@ GetAllSkinResponse = protobuf.Message(GETALLSKINRESPONSE)
GetAllTeamPosResponse = protobuf.Message(GETALLTEAMPOSRESPONSE)
GetHeroListInfoRequest = protobuf.Message(GETHEROLISTINFOREQUEST)
GetHeroListInfoResponse = protobuf.Message(GETHEROLISTINFORESPONSE)
GetHongmengInfoResponse = protobuf.Message(GETHONGMENGINFORESPONSE)
GetSkinIndication = protobuf.Message(GETSKININDICATION)
HeroComposeRequest = protobuf.Message(HEROCOMPOSEREQUEST)
HeroComposeResponse = protobuf.Message(HEROCOMPOSERESPONSE)
@ -1638,8 +1913,13 @@ HeroRandRequest = protobuf.Message(HERORANDREQUEST)
HeroRandResponse = protobuf.Message(HERORANDRESPONSE)
HeroReturnRequest = protobuf.Message(HERORETURNREQUEST)
HeroReturnResponse = protobuf.Message(HERORETURNRESPONSE)
HongmengAddition = protobuf.Message(HONGMENGADDITION)
HongmengHeroInfo = protobuf.Message(HONGMENGHEROINFO)
HongmengInfoIndication = protobuf.Message(HONGMENGINFOINDICATION)
HongmengSteleNewHandIndication = protobuf.Message(HONGMENGSTELENEWHANDINDICATION)
MergeSoulRequest = protobuf.Message(MERGESOULREQUEST)
MergeSoulResponse = protobuf.Message(MERGESOULRESPONSE)
OpenResonanceRequest = protobuf.Message(OPENRESONANCEREQUEST)
OptHeroSoul = protobuf.Message(OPTHEROSOUL)
PokemonAdvancedRequest = protobuf.Message(POKEMONADVANCEDREQUEST)
PokemonBackRequest = protobuf.Message(POKEMONBACKREQUEST)
@ -1650,6 +1930,8 @@ PokemonFreeResponse = protobuf.Message(POKEMONFREERESPONSE)
PokenmonUpLevelRequest = protobuf.Message(POKENMONUPLEVELREQUEST)
PokenmonUpLevelResponse = protobuf.Message(POKENMONUPLEVELRESPONSE)
ReplaceTeamPokemonInfoRequest = protobuf.Message(REPLACETEAMPOKEMONINFOREQUEST)
ResonanceRequest = protobuf.Message(RESONANCEREQUEST)
ResonanceResponse = protobuf.Message(RESONANCERESPONSE)
SaveHeroChangeRequest = protobuf.Message(SAVEHEROCHANGEREQUEST)
SaveHeroChangeResponse = protobuf.Message(SAVEHEROCHANGERESPONSE)
SoulEquipPos = protobuf.Message(SOULEQUIPPOS)

File diff suppressed because one or more lines are too long

View File

@ -1992,11 +1992,7 @@ end
end
itemId=haveGiftList.Reward[1][1]
local Gift = ConfigManager.GetConfigDataByKey(ConfigName.ItemConfig,"Id",itemId)
<<<<<<< HEAD
this.sgType.text=GetLanguageStrById(Gift.Name)
=======
this.sgType.text=Gift.Name
>>>>>>> local_to_xmadev
this.sgInfo.text=Language[11214]
this.sgEffect[1].gameObject:SetActive(false)
this.sgEffect[2].gameObject:SetActive(true)

View File

@ -4725,6 +4725,7 @@ end
--鸿蒙阵
-- 鸿蒙阵 游戏开始 拿到的数据
function this.HongMengInfoResponse(func)
LogGreen(tostring(MessageTypeProto_pb.HONGMENG_GET_INFO_REQUEST).." "..tostring(MessageTypeProto_pb.HONGMENG_GET_INFO_RESPONSE))
Network:SendMessageWithCallBack(MessageTypeProto_pb.HONGMENG_GET_INFO_REQUEST,MessageTypeProto_pb.HONGMENG_GET_INFO_RESPONSE,nil,function(buffer)
LogGreen("请求鸿蒙阵数据")
-- local data = buffer:DataByte()