Merge branch 'china/dev' into china/dev-c
# Conflicts: # Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.luadev_chengFeng
commit
fe837c22f4
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dd5c04a446b4673499e751f7c5db8292
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/atlas/dyact_activity7
|
||||
assetBundleVariant: unity3d
|
Binary file not shown.
After Width: | Height: | Size: 223 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4aae9cc118ac78648b896562bc7c8913
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 60d701b6684397846aa7d206b335b0f6
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DyAct_Activity8
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 208 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5c8ecb81c56ca0f4bbbb85e865cc93b7
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: d5dcabd5ed083a74ba55470a1c110e30
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DyAct_Activity8
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -210,7 +210,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: -723, y: -35.05005, z: 0}
|
||||
- initV3: {x: 6, y: -698, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 6, y: -698, z: 0}
|
||||
|
|
|
@ -23,6 +23,7 @@ CHATINFO_PRIORITYLEVEL_FIELD = protobuf.FieldDescriptor();
|
|||
CHATINFO_FREQUENCY_FIELD = protobuf.FieldDescriptor();
|
||||
CHATINFO_SPEED_FIELD = protobuf.FieldDescriptor();
|
||||
CHATINFO_MULTIPLE_FIELD = protobuf.FieldDescriptor();
|
||||
CHATINFO_USERTITLE_FIELD = protobuf.FieldDescriptor();
|
||||
GETCHATMESSAGEINFOREQUEST = protobuf.Descriptor();
|
||||
GETCHATMESSAGEINFOREQUEST_CHATTYPE_FIELD = protobuf.FieldDescriptor();
|
||||
GETCHATMESSAGEINFOREQUEST_MESSAGEID_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -228,11 +229,21 @@ CHATINFO_MULTIPLE_FIELD.default_value = 0
|
|||
CHATINFO_MULTIPLE_FIELD.type = 5
|
||||
CHATINFO_MULTIPLE_FIELD.cpp_type = 1
|
||||
|
||||
CHATINFO_USERTITLE_FIELD.name = "userTitle"
|
||||
CHATINFO_USERTITLE_FIELD.full_name = ".rpc.protocols.ChatInfo.userTitle"
|
||||
CHATINFO_USERTITLE_FIELD.number = 22
|
||||
CHATINFO_USERTITLE_FIELD.index = 19
|
||||
CHATINFO_USERTITLE_FIELD.label = 1
|
||||
CHATINFO_USERTITLE_FIELD.has_default_value = false
|
||||
CHATINFO_USERTITLE_FIELD.default_value = 0
|
||||
CHATINFO_USERTITLE_FIELD.type = 5
|
||||
CHATINFO_USERTITLE_FIELD.cpp_type = 1
|
||||
|
||||
CHATINFO.name = "ChatInfo"
|
||||
CHATINFO.full_name = ".rpc.protocols.ChatInfo"
|
||||
CHATINFO.nested_types = {}
|
||||
CHATINFO.enum_types = {}
|
||||
CHATINFO.fields = {CHATINFO_SENDERID_FIELD, CHATINFO_SENDERNAME_FIELD, CHATINFO_SENDERLEVEL_FIELD, CHATINFO_SENDERVIP_FIELD, CHATINFO_TIMES_FIELD, CHATINFO_MSG_FIELD, CHATINFO_HEAD_FIELD, CHATINFO_FRAME_FIELD, CHATINFO_SOULVAL_FIELD, CHATINFO_MESSAGEID_FIELD, CHATINFO_MESSAGETYPE_FIELD, CHATINFO_ITEMID_FIELD, CHATINFO_TYPE_FIELD, CHATINFO_STARTTIME_FIELD, CHATINFO_ENDTIME_FIELD, CHATINFO_PRIORITYLEVEL_FIELD, CHATINFO_FREQUENCY_FIELD, CHATINFO_SPEED_FIELD, CHATINFO_MULTIPLE_FIELD}
|
||||
CHATINFO.fields = {CHATINFO_SENDERID_FIELD, CHATINFO_SENDERNAME_FIELD, CHATINFO_SENDERLEVEL_FIELD, CHATINFO_SENDERVIP_FIELD, CHATINFO_TIMES_FIELD, CHATINFO_MSG_FIELD, CHATINFO_HEAD_FIELD, CHATINFO_FRAME_FIELD, CHATINFO_SOULVAL_FIELD, CHATINFO_MESSAGEID_FIELD, CHATINFO_MESSAGETYPE_FIELD, CHATINFO_ITEMID_FIELD, CHATINFO_TYPE_FIELD, CHATINFO_STARTTIME_FIELD, CHATINFO_ENDTIME_FIELD, CHATINFO_PRIORITYLEVEL_FIELD, CHATINFO_FREQUENCY_FIELD, CHATINFO_SPEED_FIELD, CHATINFO_MULTIPLE_FIELD, CHATINFO_USERTITLE_FIELD}
|
||||
CHATINFO.is_extendable = false
|
||||
CHATINFO.extensions = {}
|
||||
GETCHATMESSAGEINFOREQUEST_CHATTYPE_FIELD.name = "chatType"
|
||||
|
|
|
@ -457,6 +457,7 @@ TEAMONEINFO_HEADFRAME_FIELD = protobuf.FieldDescriptor();
|
|||
TEAMONEINFO_GUILDNAME_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONEINFO_TEAM_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONEINFO_ISAPPLYED_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONEINFO_USERTITLE_FIELD = protobuf.FieldDescriptor();
|
||||
MONSTERRANKINFO = protobuf.Descriptor();
|
||||
MONSTERRANKINFO_NAME_FIELD = protobuf.FieldDescriptor();
|
||||
MONSTERRANKINFO_SCORE_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -556,6 +557,7 @@ REDONEDETAIL_TIME_FIELD = protobuf.FieldDescriptor();
|
|||
REDONEDETAIL_COUNT_FIELD = protobuf.FieldDescriptor();
|
||||
REDONEDETAIL_ITEMID_FIELD = protobuf.FieldDescriptor();
|
||||
REDONEDETAIL_POSITION_FIELD = protobuf.FieldDescriptor();
|
||||
REDONEDETAIL_USERTITLE_FIELD = protobuf.FieldDescriptor();
|
||||
EXPEDITIONSIMPLEBOSSINFO = protobuf.Descriptor();
|
||||
EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
|
||||
EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -4982,11 +4984,21 @@ TEAMONEINFO_ISAPPLYED_FIELD.default_value = 0
|
|||
TEAMONEINFO_ISAPPLYED_FIELD.type = 5
|
||||
TEAMONEINFO_ISAPPLYED_FIELD.cpp_type = 1
|
||||
|
||||
TEAMONEINFO_USERTITLE_FIELD.name = "userTitle"
|
||||
TEAMONEINFO_USERTITLE_FIELD.full_name = ".rpc.protocols.TeamOneInfo.userTitle"
|
||||
TEAMONEINFO_USERTITLE_FIELD.number = 9
|
||||
TEAMONEINFO_USERTITLE_FIELD.index = 8
|
||||
TEAMONEINFO_USERTITLE_FIELD.label = 1
|
||||
TEAMONEINFO_USERTITLE_FIELD.has_default_value = false
|
||||
TEAMONEINFO_USERTITLE_FIELD.default_value = 0
|
||||
TEAMONEINFO_USERTITLE_FIELD.type = 5
|
||||
TEAMONEINFO_USERTITLE_FIELD.cpp_type = 1
|
||||
|
||||
TEAMONEINFO.name = "TeamOneInfo"
|
||||
TEAMONEINFO.full_name = ".rpc.protocols.TeamOneInfo"
|
||||
TEAMONEINFO.nested_types = {}
|
||||
TEAMONEINFO.enum_types = {}
|
||||
TEAMONEINFO.fields = {TEAMONEINFO_UID_FIELD, TEAMONEINFO_LEVEL_FIELD, TEAMONEINFO_NAME_FIELD, TEAMONEINFO_HEAD_FIELD, TEAMONEINFO_HEADFRAME_FIELD, TEAMONEINFO_GUILDNAME_FIELD, TEAMONEINFO_TEAM_FIELD, TEAMONEINFO_ISAPPLYED_FIELD}
|
||||
TEAMONEINFO.fields = {TEAMONEINFO_UID_FIELD, TEAMONEINFO_LEVEL_FIELD, TEAMONEINFO_NAME_FIELD, TEAMONEINFO_HEAD_FIELD, TEAMONEINFO_HEADFRAME_FIELD, TEAMONEINFO_GUILDNAME_FIELD, TEAMONEINFO_TEAM_FIELD, TEAMONEINFO_ISAPPLYED_FIELD, TEAMONEINFO_USERTITLE_FIELD}
|
||||
TEAMONEINFO.is_extendable = false
|
||||
TEAMONEINFO.extensions = {}
|
||||
MONSTERRANKINFO_NAME_FIELD.name = "name"
|
||||
|
@ -5930,11 +5942,21 @@ REDONEDETAIL_POSITION_FIELD.default_value = 0
|
|||
REDONEDETAIL_POSITION_FIELD.type = 5
|
||||
REDONEDETAIL_POSITION_FIELD.cpp_type = 1
|
||||
|
||||
REDONEDETAIL_USERTITLE_FIELD.name = "userTitle"
|
||||
REDONEDETAIL_USERTITLE_FIELD.full_name = ".rpc.protocols.RedOneDetail.userTitle"
|
||||
REDONEDETAIL_USERTITLE_FIELD.number = 9
|
||||
REDONEDETAIL_USERTITLE_FIELD.index = 8
|
||||
REDONEDETAIL_USERTITLE_FIELD.label = 1
|
||||
REDONEDETAIL_USERTITLE_FIELD.has_default_value = false
|
||||
REDONEDETAIL_USERTITLE_FIELD.default_value = 0
|
||||
REDONEDETAIL_USERTITLE_FIELD.type = 5
|
||||
REDONEDETAIL_USERTITLE_FIELD.cpp_type = 1
|
||||
|
||||
REDONEDETAIL.name = "RedOneDetail"
|
||||
REDONEDETAIL.full_name = ".rpc.protocols.RedOneDetail"
|
||||
REDONEDETAIL.nested_types = {}
|
||||
REDONEDETAIL.enum_types = {}
|
||||
REDONEDETAIL.fields = {REDONEDETAIL_UID_FIELD, REDONEDETAIL_HEAD_FIELD, REDONEDETAIL_HEADFRAME_FIELD, REDONEDETAIL_NAME_FIELD, REDONEDETAIL_TIME_FIELD, REDONEDETAIL_COUNT_FIELD, REDONEDETAIL_ITEMID_FIELD, REDONEDETAIL_POSITION_FIELD}
|
||||
REDONEDETAIL.fields = {REDONEDETAIL_UID_FIELD, REDONEDETAIL_HEAD_FIELD, REDONEDETAIL_HEADFRAME_FIELD, REDONEDETAIL_NAME_FIELD, REDONEDETAIL_TIME_FIELD, REDONEDETAIL_COUNT_FIELD, REDONEDETAIL_ITEMID_FIELD, REDONEDETAIL_POSITION_FIELD, REDONEDETAIL_USERTITLE_FIELD}
|
||||
REDONEDETAIL.is_extendable = false
|
||||
REDONEDETAIL.extensions = {}
|
||||
EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD.name = "heroTid"
|
||||
|
|
|
@ -15,6 +15,7 @@ TRIALHEROINFO_STAR_FIELD = protobuf.FieldDescriptor();
|
|||
TRIALHEROINFO_HEROHP_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFO_SKINID_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor();
|
||||
DIFFICULTMAPOPTION = protobuf.Descriptor();
|
||||
DIFFICULTMAPOPTION_ID_FIELD = protobuf.FieldDescriptor();
|
||||
DIFFICULTMAPOPTION_MAPDIFFICULTY_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -152,8 +153,11 @@ ENDLESSSETTEAMINDICATION_INFO_FIELD = protobuf.FieldDescriptor();
|
|||
ENDLESSMAPCHANGE = protobuf.Descriptor();
|
||||
ENDLESSMAPCHANGE_MAPID_FIELD = protobuf.FieldDescriptor();
|
||||
ENDLESSMAPCHANGE_WORLDLEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALSAVEHERO = protobuf.Descriptor();
|
||||
TRIALSAVEHERO_HEROID_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALSAVEHERO_POSITION_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFOSAVEREQUEST = protobuf.Descriptor();
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD = protobuf.FieldDescriptor();
|
||||
TRIALHEROINFOSAVERESPONSE = protobuf.Descriptor();
|
||||
TRIALHEROINFOSAVERESPONSE_HEROES_FIELD = protobuf.FieldDescriptor();
|
||||
GETTRIALBOXREWARDREQUEST = protobuf.Descriptor();
|
||||
|
@ -325,11 +329,21 @@ TRIALHEROINFO_SKINID_FIELD.default_value = 0
|
|||
TRIALHEROINFO_SKINID_FIELD.type = 5
|
||||
TRIALHEROINFO_SKINID_FIELD.cpp_type = 1
|
||||
|
||||
TRIALHEROINFO_POSITION_FIELD.name = "position"
|
||||
TRIALHEROINFO_POSITION_FIELD.full_name = ".rpc.protocols.TrialHeroInfo.position"
|
||||
TRIALHEROINFO_POSITION_FIELD.number = 7
|
||||
TRIALHEROINFO_POSITION_FIELD.index = 6
|
||||
TRIALHEROINFO_POSITION_FIELD.label = 1
|
||||
TRIALHEROINFO_POSITION_FIELD.has_default_value = false
|
||||
TRIALHEROINFO_POSITION_FIELD.default_value = 0
|
||||
TRIALHEROINFO_POSITION_FIELD.type = 5
|
||||
TRIALHEROINFO_POSITION_FIELD.cpp_type = 1
|
||||
|
||||
TRIALHEROINFO.name = "TrialHeroInfo"
|
||||
TRIALHEROINFO.full_name = ".rpc.protocols.TrialHeroInfo"
|
||||
TRIALHEROINFO.nested_types = {}
|
||||
TRIALHEROINFO.enum_types = {}
|
||||
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD}
|
||||
TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD}
|
||||
TRIALHEROINFO.is_extendable = false
|
||||
TRIALHEROINFO.extensions = {}
|
||||
DIFFICULTMAPOPTION_ID_FIELD.name = "Id"
|
||||
|
@ -1619,21 +1633,49 @@ ENDLESSMAPCHANGE.enum_types = {}
|
|||
ENDLESSMAPCHANGE.fields = {ENDLESSMAPCHANGE_MAPID_FIELD, ENDLESSMAPCHANGE_WORLDLEVEL_FIELD}
|
||||
ENDLESSMAPCHANGE.is_extendable = false
|
||||
ENDLESSMAPCHANGE.extensions = {}
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.name = "heroIds"
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.full_name = ".rpc.protocols.TrialHeroInfoSaveRequest.heroIds"
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.number = 1
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.index = 0
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.label = 3
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.has_default_value = false
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.default_value = {}
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.type = 9
|
||||
TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD.cpp_type = 9
|
||||
TRIALSAVEHERO_HEROID_FIELD.name = "heroId"
|
||||
TRIALSAVEHERO_HEROID_FIELD.full_name = ".rpc.protocols.TrialSaveHero.heroId"
|
||||
TRIALSAVEHERO_HEROID_FIELD.number = 1
|
||||
TRIALSAVEHERO_HEROID_FIELD.index = 0
|
||||
TRIALSAVEHERO_HEROID_FIELD.label = 1
|
||||
TRIALSAVEHERO_HEROID_FIELD.has_default_value = false
|
||||
TRIALSAVEHERO_HEROID_FIELD.default_value = ""
|
||||
TRIALSAVEHERO_HEROID_FIELD.type = 9
|
||||
TRIALSAVEHERO_HEROID_FIELD.cpp_type = 9
|
||||
|
||||
TRIALSAVEHERO_POSITION_FIELD.name = "position"
|
||||
TRIALSAVEHERO_POSITION_FIELD.full_name = ".rpc.protocols.TrialSaveHero.position"
|
||||
TRIALSAVEHERO_POSITION_FIELD.number = 2
|
||||
TRIALSAVEHERO_POSITION_FIELD.index = 1
|
||||
TRIALSAVEHERO_POSITION_FIELD.label = 1
|
||||
TRIALSAVEHERO_POSITION_FIELD.has_default_value = false
|
||||
TRIALSAVEHERO_POSITION_FIELD.default_value = 0
|
||||
TRIALSAVEHERO_POSITION_FIELD.type = 5
|
||||
TRIALSAVEHERO_POSITION_FIELD.cpp_type = 1
|
||||
|
||||
TRIALSAVEHERO.name = "TrialSaveHero"
|
||||
TRIALSAVEHERO.full_name = ".rpc.protocols.TrialSaveHero"
|
||||
TRIALSAVEHERO.nested_types = {}
|
||||
TRIALSAVEHERO.enum_types = {}
|
||||
TRIALSAVEHERO.fields = {TRIALSAVEHERO_HEROID_FIELD, TRIALSAVEHERO_POSITION_FIELD}
|
||||
TRIALSAVEHERO.is_extendable = false
|
||||
TRIALSAVEHERO.extensions = {}
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.name = "heroes"
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.full_name = ".rpc.protocols.TrialHeroInfoSaveRequest.heroes"
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.number = 1
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.index = 0
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.label = 3
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.has_default_value = false
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.default_value = {}
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.message_type = TRIALSAVEHERO
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.type = 11
|
||||
TRIALHEROINFOSAVEREQUEST_HEROES_FIELD.cpp_type = 10
|
||||
|
||||
TRIALHEROINFOSAVEREQUEST.name = "TrialHeroInfoSaveRequest"
|
||||
TRIALHEROINFOSAVEREQUEST.full_name = ".rpc.protocols.TrialHeroInfoSaveRequest"
|
||||
TRIALHEROINFOSAVEREQUEST.nested_types = {}
|
||||
TRIALHEROINFOSAVEREQUEST.enum_types = {}
|
||||
TRIALHEROINFOSAVEREQUEST.fields = {TRIALHEROINFOSAVEREQUEST_HEROIDS_FIELD}
|
||||
TRIALHEROINFOSAVEREQUEST.fields = {TRIALHEROINFOSAVEREQUEST_HEROES_FIELD}
|
||||
TRIALHEROINFOSAVEREQUEST.is_extendable = false
|
||||
TRIALHEROINFOSAVEREQUEST.extensions = {}
|
||||
TRIALHEROINFOSAVERESPONSE_HEROES_FIELD.name = "heroes"
|
||||
|
@ -2377,6 +2419,7 @@ TowerRewardResponse = protobuf.Message(TOWERREWARDRESPONSE)
|
|||
TrialHeroInfo = protobuf.Message(TRIALHEROINFO)
|
||||
TrialHeroInfoSaveRequest = protobuf.Message(TRIALHEROINFOSAVEREQUEST)
|
||||
TrialHeroInfoSaveResponse = protobuf.Message(TRIALHEROINFOSAVERESPONSE)
|
||||
TrialSaveHero = protobuf.Message(TRIALSAVEHERO)
|
||||
UseAddHpItemRequest = protobuf.Message(USEADDHPITEMREQUEST)
|
||||
UseTowerBuffRequest = protobuf.Message(USETOWERBUFFREQUEST)
|
||||
UseTowerBuffResponse = protobuf.Message(USETOWERBUFFRESPONSE)
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -494,6 +494,14 @@ ACTIVEUSERMOUNTREQUEST = protobuf.Descriptor();
|
|||
ACTIVEUSERMOUNTREQUEST_MOUNTID_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVEUSERMOUNTRESPONSE = protobuf.Descriptor();
|
||||
ACTIVEUSERMOUNTRESPONSE_VALIDTIME_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELREQUEST = protobuf.Descriptor();
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELRESPONSE = protobuf.Descriptor();
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD = protobuf.FieldDescriptor();
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
|
||||
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
|
||||
|
@ -5001,6 +5009,81 @@ ACTIVEUSERMOUNTRESPONSE.enum_types = {}
|
|||
ACTIVEUSERMOUNTRESPONSE.fields = {ACTIVEUSERMOUNTRESPONSE_VALIDTIME_FIELD}
|
||||
ACTIVEUSERMOUNTRESPONSE.is_extendable = false
|
||||
ACTIVEUSERMOUNTRESPONSE.extensions = {}
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.name = "activityId"
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.full_name = ".rpc.protocols.EquipUpLevelRequest.activityId"
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.number = 1
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.index = 0
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.label = 1
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.default_value = 0
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.type = 5
|
||||
EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.name = "equipId"
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.full_name = ".rpc.protocols.EquipUpLevelRequest.equipId"
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.number = 2
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.index = 1
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.label = 1
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.default_value = 0
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.type = 5
|
||||
EQUIPUPLEVELREQUEST_EQUIPID_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.name = "itemId"
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.EquipUpLevelRequest.itemId"
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.number = 3
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.index = 2
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.label = 1
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.default_value = 0
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.type = 5
|
||||
EQUIPUPLEVELREQUEST_ITEMID_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.name = "itemNum"
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.full_name = ".rpc.protocols.EquipUpLevelRequest.itemNum"
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.number = 4
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.index = 3
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.label = 1
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.default_value = 0
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.type = 5
|
||||
EQUIPUPLEVELREQUEST_ITEMNUM_FIELD.cpp_type = 1
|
||||
|
||||
EQUIPUPLEVELREQUEST.name = "EquipUpLevelRequest"
|
||||
EQUIPUPLEVELREQUEST.full_name = ".rpc.protocols.EquipUpLevelRequest"
|
||||
EQUIPUPLEVELREQUEST.nested_types = {}
|
||||
EQUIPUPLEVELREQUEST.enum_types = {}
|
||||
EQUIPUPLEVELREQUEST.fields = {EQUIPUPLEVELREQUEST_ACTIVITYID_FIELD, EQUIPUPLEVELREQUEST_EQUIPID_FIELD, EQUIPUPLEVELREQUEST_ITEMID_FIELD, EQUIPUPLEVELREQUEST_ITEMNUM_FIELD}
|
||||
EQUIPUPLEVELREQUEST.is_extendable = false
|
||||
EQUIPUPLEVELREQUEST.extensions = {}
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.name = "result"
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.full_name = ".rpc.protocols.EquipUpLevelResponse.result"
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.number = 1
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.index = 0
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.label = 1
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.default_value = false
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.type = 8
|
||||
EQUIPUPLEVELRESPONSE_RESULT_FIELD.cpp_type = 7
|
||||
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.name = "drop"
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.EquipUpLevelResponse.drop"
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.number = 2
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.index = 1
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.label = 1
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.has_default_value = false
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.default_value = nil
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.type = 11
|
||||
EQUIPUPLEVELRESPONSE_DROP_FIELD.cpp_type = 10
|
||||
|
||||
EQUIPUPLEVELRESPONSE.name = "EquipUpLevelResponse"
|
||||
EQUIPUPLEVELRESPONSE.full_name = ".rpc.protocols.EquipUpLevelResponse"
|
||||
EQUIPUPLEVELRESPONSE.nested_types = {}
|
||||
EQUIPUPLEVELRESPONSE.enum_types = {}
|
||||
EQUIPUPLEVELRESPONSE.fields = {EQUIPUPLEVELRESPONSE_RESULT_FIELD, EQUIPUPLEVELRESPONSE_DROP_FIELD}
|
||||
EQUIPUPLEVELRESPONSE.is_extendable = false
|
||||
EQUIPUPLEVELRESPONSE.extensions = {}
|
||||
|
||||
ActiveUserMountRequest = protobuf.Message(ACTIVEUSERMOUNTREQUEST)
|
||||
ActiveUserMountResponse = protobuf.Message(ACTIVEUSERMOUNTRESPONSE)
|
||||
|
@ -5022,6 +5105,8 @@ DailyChallengeRequest = protobuf.Message(DAILYCHALLENGEREQUEST)
|
|||
DailyChallengeResponse = protobuf.Message(DAILYCHALLENGERESPONSE)
|
||||
DelFriendRequest = protobuf.Message(DELFRIENDREQUEST)
|
||||
DirectBuyIndication = protobuf.Message(DIRECTBUYINDICATION)
|
||||
EquipUpLevelRequest = protobuf.Message(EQUIPUPLEVELREQUEST)
|
||||
EquipUpLevelResponse = protobuf.Message(EQUIPUPLEVELRESPONSE)
|
||||
ErrorMsgResponse = protobuf.Message(ERRORMSGRESPONSE)
|
||||
ExchangeCdkRequest = protobuf.Message(EXCHANGECDKREQUEST)
|
||||
FivePlayerUpdateIndication = protobuf.Message(FIVEPLAYERUPDATEINDICATION)
|
||||
|
|
|
@ -78,7 +78,7 @@ local activityType = {
|
|||
[4306] = {
|
||||
bg = "Bg2",
|
||||
hero = {
|
||||
[1]={name="Bg2/hero1",id=10001,hero="x_xianshizaohuan_fx"}, ----燃灯
|
||||
[1]={name="Bg2/hero1",id=10001,hero="t_tianxiangjiren_shenjiang_fx"}, ----燃灯
|
||||
[2]={name="Bg2/hero3",id=10011,hero="y_yunchouweiwo_shenjiang1"}, --伏虎罗汉
|
||||
[3]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, ----东华帝君
|
||||
},
|
||||
|
@ -89,7 +89,7 @@ local activityType = {
|
|||
[4307] = {
|
||||
bg = "Bg2",
|
||||
hero = {
|
||||
[1]={name="Bg2/hero1",id=10018,hero="c_ygsj_kuang001"}, ----雷震子
|
||||
[1]={name="Bg2/hero1",id=10018,hero="t_tianxiangjiren_shenjiang_jmm"}, ----雷震子
|
||||
[2]={name="Bg2/hero2",id=10023,hero="x_xuanjimiaosuan_shenjiang2"}, --通天教主
|
||||
[3]={name="Bg2/hero3",id=10015,hero="s_yongwangzhiqian_shenjiang3",}, ----达摩
|
||||
},
|
||||
|
|
|
@ -75,35 +75,28 @@ function FormationEditPopup:BindEvent()
|
|||
Util.AddClick(this.BtnSure, function()
|
||||
local go=function()
|
||||
local heros={}
|
||||
--后端提交后删除
|
||||
for i, v in ipairs(choosedList) do
|
||||
table.insert(heros,v.did)
|
||||
local hero = {}
|
||||
hero.heroId = v.did
|
||||
hero.position = #choosedList + 1
|
||||
table.insert(heros,hero)
|
||||
end
|
||||
table.sort(heros,function (a,b)
|
||||
return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower
|
||||
end)
|
||||
for i = 1, #heros do
|
||||
heros[i].position = i
|
||||
end
|
||||
--后端提交后放开
|
||||
-- for i, v in ipairs(choosedList) do
|
||||
-- local hero = {}
|
||||
-- hero.heroId = v.did
|
||||
-- hero.position = #choosedList + 1
|
||||
-- table.insert(heros,hero)
|
||||
-- end
|
||||
-- table.sort(heros,function (a,b)
|
||||
-- return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower
|
||||
-- end)
|
||||
-- for i = 1, #heros do
|
||||
-- heros[i].position = i
|
||||
-- end
|
||||
if #choosedList <= maxNum and #choosedList > 0 then
|
||||
NetManager.TrialHeroInfoSaveRequest(heros,function(msg)
|
||||
PopupTipPanel.ShowTip(Language[10670])
|
||||
--后端提交后放开
|
||||
-- local heros = msg.heroes
|
||||
-- if heros and #heros > 1 then
|
||||
-- table.sort(heros,function (a,b)
|
||||
-- return a.position < b.position
|
||||
-- end)
|
||||
-- end
|
||||
-- MapManager.trialHeroInfo = heros
|
||||
MapManager.trialHeroInfo = msg.heroes
|
||||
local heros = msg.heroes
|
||||
if heros and #heros > 1 then
|
||||
table.sort(heros,function (a,b)
|
||||
return a.position < b.position
|
||||
end)
|
||||
end
|
||||
MapManager.trialHeroInfo = heros
|
||||
if func~=nil then --保存完毕后 将英雄did合集传递过去 此时我拥有这些英雄 不用担心英雄已被删除
|
||||
func(heros)
|
||||
end
|
||||
|
|
|
@ -367,15 +367,13 @@ function this.MapInfoRequest(mapModeId,func)
|
|||
msg:ParseFromString(data)
|
||||
MapManager.curMapId = msg.mapId
|
||||
|
||||
----后端提交后放开
|
||||
-- local heros = msg.infos
|
||||
-- if heros then
|
||||
-- table.sort(heros,function (a,b)
|
||||
-- return a.position < b.position
|
||||
-- end)
|
||||
-- end
|
||||
-- MapManager.trialHeroInfo = heros
|
||||
MapManager.trialHeroInfo = msg.infos
|
||||
local heros = msg.infos
|
||||
if heros then
|
||||
table.sort(heros,function (a,b)
|
||||
return a.position < b.position
|
||||
end)
|
||||
end
|
||||
MapManager.trialHeroInfo = heros
|
||||
MapTrialManager.curTowerLevel = msg.curTower
|
||||
MapTrialManager.bombUsed = msg.bombUsed
|
||||
MapTrialManager.killCount=msg.killCount
|
||||
|
@ -4187,10 +4185,9 @@ end
|
|||
function NetManager.TrialHeroInfoSaveRequest(heros,func)
|
||||
local data = MapInfoProto_pb.TrialHeroInfoSaveRequest()
|
||||
for i = 1, #heros do
|
||||
-- local c = data.heroes:add()--后端提交后放开
|
||||
-- c.heroId = heros[i].heroId--后端提交后放开
|
||||
-- c.position = heros[i].position--后端提交后放开
|
||||
data.heroIds:append(heros[i])
|
||||
local c = data.heroes:add()--后端提交后放开
|
||||
c.heroId = heros[i].heroId--后端提交后放开
|
||||
c.position = heros[i].position--后端提交后放开
|
||||
end
|
||||
|
||||
local msg = data:SerializeToString()
|
||||
|
|
|
@ -89,7 +89,7 @@ function EveryDayGift:OnShow(_sortingOrder)
|
|||
self.sortingOrder = _sortingOrder or self.sortingOrder
|
||||
self.extra:SetActive(true)
|
||||
self.actId = self.actConfig.ActId
|
||||
self.actType = self.actConfig.ActiveType
|
||||
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
|
||||
if self.actConfig.IfBack == 1 then
|
||||
if self.actConfig.ActiveType > 0 then
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType)
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
require("Base/BasePanel")
|
||||
RoleStoryLayout = Inherit(BasePanel)
|
||||
local this = RoleStoryLayout
|
||||
RoleStoryLayout = {}
|
||||
local curHeroData--当前英雄信息
|
||||
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
|
@ -19,7 +17,7 @@ end
|
|||
|
||||
--初始化组件(用于子类重写)
|
||||
function RoleStoryLayout:InitComponent()
|
||||
this.infoTextStory = Util.GetGameObject(self.gameObject ,"infoBg/infoRect/infoText"):GetComponent("Text")
|
||||
self.infoTextStory = Util.GetGameObject(self.gameObject ,"infoBg/infoRect/infoText"):GetComponent("Text")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -48,9 +46,9 @@ end
|
|||
function RoleStoryLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_heroDatas)
|
||||
curHeroData = _curHerodata
|
||||
local story = curHeroData.heroConfig and curHeroData.heroConfig.HeroStory or curHeroData.HeroStory
|
||||
this.infoTextStory.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(-2, 0)
|
||||
self.infoTextStory.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(-2, 0)
|
||||
local stroyStr = string.gsub(GetLanguageStrById(story),"#","\n")
|
||||
this.infoTextStory.text = string.gsub(stroyStr,"|"," ")--传记
|
||||
self.infoTextStory.text = string.gsub(stroyStr,"|"," ")--传记
|
||||
end
|
||||
|
||||
function RoleStoryLayout:OnHide()
|
||||
|
|
Loading…
Reference in New Issue