Merge branch 'master_xma_local' into master_xma_test

dev_chengFeng hotfix/xma/test/0.1.52
JieLing 2020-12-14 11:53:15 +08:00
commit 3c67f34b18
36 changed files with 873 additions and 235 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b4868f57511cb694988ac2572b37feca
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 954 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: f400894547b76264a9440a7e3999b460
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5b40ed704016b4e4197eef6a9b463f13
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: b8e244d0a0b698449ac48429c7c5190c
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: fdc169c841314934aa6c86df657fee79
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 00597d2500812ec49a846d4227b65441
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 074139507cf2d6249b40859f9b6325d3
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 2b97735c8e027974b99f16226a442bb6
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 4599aec96c2460d4caf6060d53adc8fb
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 66446388ac13f194a90fa030c44f7983
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 1ac85a87d89c735458d85a9ac8210869
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 0bb259a6c71c9f94bae95e87d421ee6d
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 2eb11dcb336623e4086d0b84da97de83
vertices: []
indices:
edges: []
weights: []
spritePackingTag: MainAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1654,4 +1654,9 @@ function SetHeroIcon(heroData,icon,heroConfig)
local heroSkinconfig = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",heroData.skinId)
icon.sprite = Util.LoadSprite(GetResourcePath(heroSkinconfig.Icon))
end
end
function GetEquipSuitStr(Star,num)
return string.format("%s件%s%s星激活",num,QualityNameDef[ ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig,"Star",Star).Quality],ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,Star).Stars)
end

View File

@ -20,6 +20,14 @@ SELETSUBREWARDPOOLRESPONSE = protobuf.Descriptor();
SPECICALMONSTERCHOOSEREQUEST = protobuf.Descriptor();
SPECICALMONSTERCHOOSEREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
SPECICALMONSTERCHOOSEREQUEST_SELECTID_FIELD = protobuf.FieldDescriptor();
NEWGENERALATTACKREQUEST = protobuf.Descriptor();
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD = protobuf.FieldDescriptor();
NEWGENERALATTACKRESPONSE = protobuf.Descriptor();
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
NEWGENERALATTACKRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
UPGRADEGODTREEREQUEST = protobuf.Descriptor();
UPGRADEGODTREERESPONSE = protobuf.Descriptor();
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".com.ljsd.jieling.protocols.CommitShejiActivityItemRequest.itemId"
@ -162,12 +170,86 @@ SPECICALMONSTERCHOOSEREQUEST.enum_types = {}
SPECICALMONSTERCHOOSEREQUEST.fields = {SPECICALMONSTERCHOOSEREQUEST_ACTIVITYID_FIELD, SPECICALMONSTERCHOOSEREQUEST_SELECTID_FIELD}
SPECICALMONSTERCHOOSEREQUEST.is_extendable = false
SPECICALMONSTERCHOOSEREQUEST.extensions = {}
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.name = "activityId"
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackRequest.activityId"
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.number = 1
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.index = 0
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.label = 1
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.has_default_value = false
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.default_value = 0
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.type = 5
NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD.cpp_type = 1
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.name = "privilageTypeId"
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackRequest.privilageTypeId"
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.number = 2
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.index = 1
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.label = 1
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.has_default_value = false
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.default_value = 0
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.type = 5
NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD.cpp_type = 1
NEWGENERALATTACKREQUEST.name = "NewGeneralAttackRequest"
NEWGENERALATTACKREQUEST.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackRequest"
NEWGENERALATTACKREQUEST.nested_types = {}
NEWGENERALATTACKREQUEST.enum_types = {}
NEWGENERALATTACKREQUEST.fields = {NEWGENERALATTACKREQUEST_ACTIVITYID_FIELD, NEWGENERALATTACKREQUEST_PRIVILAGETYPEID_FIELD}
NEWGENERALATTACKREQUEST.is_extendable = false
NEWGENERALATTACKREQUEST.extensions = {}
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.name = "fightData"
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackResponse.fightData"
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.number = 1
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.index = 0
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.label = 1
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.has_default_value = false
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.default_value = nil
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.message_type = CommonProto_pb.FIGHTDATA
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.type = 11
NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD.cpp_type = 10
NEWGENERALATTACKRESPONSE_DROP_FIELD.name = "drop"
NEWGENERALATTACKRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackResponse.drop"
NEWGENERALATTACKRESPONSE_DROP_FIELD.number = 2
NEWGENERALATTACKRESPONSE_DROP_FIELD.index = 1
NEWGENERALATTACKRESPONSE_DROP_FIELD.label = 1
NEWGENERALATTACKRESPONSE_DROP_FIELD.has_default_value = false
NEWGENERALATTACKRESPONSE_DROP_FIELD.default_value = nil
NEWGENERALATTACKRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
NEWGENERALATTACKRESPONSE_DROP_FIELD.type = 11
NEWGENERALATTACKRESPONSE_DROP_FIELD.cpp_type = 10
NEWGENERALATTACKRESPONSE.name = "NewGeneralAttackResponse"
NEWGENERALATTACKRESPONSE.full_name = ".com.ljsd.jieling.protocols.NewGeneralAttackResponse"
NEWGENERALATTACKRESPONSE.nested_types = {}
NEWGENERALATTACKRESPONSE.enum_types = {}
NEWGENERALATTACKRESPONSE.fields = {NEWGENERALATTACKRESPONSE_FIGHTDATA_FIELD, NEWGENERALATTACKRESPONSE_DROP_FIELD}
NEWGENERALATTACKRESPONSE.is_extendable = false
NEWGENERALATTACKRESPONSE.extensions = {}
UPGRADEGODTREEREQUEST.name = "UpgradeGodTreeRequest"
UPGRADEGODTREEREQUEST.full_name = ".com.ljsd.jieling.protocols.UpgradeGodTreeRequest"
UPGRADEGODTREEREQUEST.nested_types = {}
UPGRADEGODTREEREQUEST.enum_types = {}
UPGRADEGODTREEREQUEST.fields = {}
UPGRADEGODTREEREQUEST.is_extendable = false
UPGRADEGODTREEREQUEST.extensions = {}
UPGRADEGODTREERESPONSE.name = "UpgradeGodTreeResponse"
UPGRADEGODTREERESPONSE.full_name = ".com.ljsd.jieling.protocols.UpgradeGodTreeResponse"
UPGRADEGODTREERESPONSE.nested_types = {}
UPGRADEGODTREERESPONSE.enum_types = {}
UPGRADEGODTREERESPONSE.fields = {}
UPGRADEGODTREERESPONSE.is_extendable = false
UPGRADEGODTREERESPONSE.extensions = {}
CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST)
CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
GetShejiAwardRequest = protobuf.Message(GETSHEJIAWARDREQUEST)
GetShejiAwardResponse = protobuf.Message(GETSHEJIAWARDRESPONSE)
NewGeneralAttackRequest = protobuf.Message(NEWGENERALATTACKREQUEST)
NewGeneralAttackResponse = protobuf.Message(NEWGENERALATTACKRESPONSE)
SeletSubRewardPoolRequest = protobuf.Message(SELETSUBREWARDPOOLREQUEST)
SeletSubRewardPoolResponse = protobuf.Message(SELETSUBREWARDPOOLRESPONSE)
SpecicalMonsterChooseRequest = protobuf.Message(SPECICALMONSTERCHOOSEREQUEST)
UpgradeGodTreeRequest = protobuf.Message(UPGRADEGODTREEREQUEST)
UpgradeGodTreeResponse = protobuf.Message(UPGRADEGODTREERESPONSE)

View File

@ -32,6 +32,7 @@ PLAYER_DECROTION_FIELD = protobuf.FieldDescriptor();
PLAYER_RIDE_FIELD = protobuf.FieldDescriptor();
PLAYER_RIDELEVEL_FIELD = protobuf.FieldDescriptor();
PLAYER_SEX_FIELD = protobuf.FieldDescriptor();
PLAYER_TREELEVEL_FIELD = protobuf.FieldDescriptor();
PRIVILEGE = protobuf.Descriptor();
PRIVILEGE_ID_FIELD = protobuf.FieldDescriptor();
PRIVILEGE_USEDTIMES_FIELD = protobuf.FieldDescriptor();
@ -872,11 +873,21 @@ PLAYER_SEX_FIELD.default_value = 0
PLAYER_SEX_FIELD.type = 5
PLAYER_SEX_FIELD.cpp_type = 1
PLAYER_TREELEVEL_FIELD.name = "treeLevel"
PLAYER_TREELEVEL_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.treeLevel"
PLAYER_TREELEVEL_FIELD.number = 25
PLAYER_TREELEVEL_FIELD.index = 24
PLAYER_TREELEVEL_FIELD.label = 1
PLAYER_TREELEVEL_FIELD.has_default_value = false
PLAYER_TREELEVEL_FIELD.default_value = 0
PLAYER_TREELEVEL_FIELD.type = 5
PLAYER_TREELEVEL_FIELD.cpp_type = 1
PLAYER.name = "Player"
PLAYER.full_name = ".com.ljsd.jieling.protocols.Player"
PLAYER.nested_types = {}
PLAYER.enum_types = {}
PLAYER.fields = {PLAYER_UID_FIELD, PLAYER_NICKNAME_FIELD, PLAYER_LEVEL_FIELD, PLAYER_EXP_FIELD, PLAYER_VIPLEVEL_FIELD, PLAYER_FAMILYID_FIELD, PLAYER_HEAD_FIELD, PLAYER_CURMAPID_FIELD, PLAYER_ENERGY_FIELD, PLAYER_LASTUPDATEENERGYTIME_FIELD, PLAYER_SERVERTIME_FIELD, PLAYER_MAXFORCE_FIELD, PLAYER_SAVEAMT_FIELD, PLAYER_RECHARGETIME_FIELD, PLAYER_ISFIRSTRECHARGE_FIELD, PLAYER_ISMATCHROOM_FIELD, PLAYER_CURROOMTYPE_FIELD, PLAYER_HEADFRAME_FIELD, PLAYER_ROOMADDREESS_FIELD, PLAYER_DESIGNATION_FIELD, PLAYER_DECROTION_FIELD, PLAYER_RIDE_FIELD, PLAYER_RIDELEVEL_FIELD, PLAYER_SEX_FIELD}
PLAYER.fields = {PLAYER_UID_FIELD, PLAYER_NICKNAME_FIELD, PLAYER_LEVEL_FIELD, PLAYER_EXP_FIELD, PLAYER_VIPLEVEL_FIELD, PLAYER_FAMILYID_FIELD, PLAYER_HEAD_FIELD, PLAYER_CURMAPID_FIELD, PLAYER_ENERGY_FIELD, PLAYER_LASTUPDATEENERGYTIME_FIELD, PLAYER_SERVERTIME_FIELD, PLAYER_MAXFORCE_FIELD, PLAYER_SAVEAMT_FIELD, PLAYER_RECHARGETIME_FIELD, PLAYER_ISFIRSTRECHARGE_FIELD, PLAYER_ISMATCHROOM_FIELD, PLAYER_CURROOMTYPE_FIELD, PLAYER_HEADFRAME_FIELD, PLAYER_ROOMADDREESS_FIELD, PLAYER_DESIGNATION_FIELD, PLAYER_DECROTION_FIELD, PLAYER_RIDE_FIELD, PLAYER_RIDELEVEL_FIELD, PLAYER_SEX_FIELD, PLAYER_TREELEVEL_FIELD}
PLAYER.is_extendable = false
PLAYER.extensions = {}
PRIVILEGE_ID_FIELD.name = "id"

View File

@ -46,6 +46,9 @@ MAPENTERRESPONSE_ADDHPCOUNT_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_MAPID_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_CURTOWER_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_BOMBUSED_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_KILLCOUNT_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_ESSENCEVALUE_FIELD = protobuf.FieldDescriptor();
EVENTUPDATEREQUEST = protobuf.Descriptor();
EVENTUPDATEREQUEST_EVENTID_FIELD = protobuf.FieldDescriptor();
EVENTUPDATEREQUEST_OPTIONID_FIELD = protobuf.FieldDescriptor();
@ -79,21 +82,10 @@ USETOWERBUFFREQUEST_TOWERLEVEL_FIELD = protobuf.FieldDescriptor();
USETOWERBUFFREQUEST_OPTIONID_FIELD = protobuf.FieldDescriptor();
USETOWERBUFFRESPONSE = protobuf.Descriptor();
USETOWERBUFFRESPONSE_EVENTBEHAVIORCOMMON_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO = protobuf.Descriptor();
TOWERCOPYINFO_TOWER_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_FIGHTCOUNT_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_HIGHESTTOWER_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_ESSENCEVALUE_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_MAPINTORESET_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_TOWERUSETIME_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_TRIALREWARDINFO_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_KILLCOUNT_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_BOMBUSED_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE = protobuf.Descriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD = protobuf.FieldDescriptor();
MAPGETRANKINFOREQUEST = protobuf.Descriptor();
@ -637,11 +629,41 @@ MAPENTERRESPONSE_BOMBUSED_FIELD.default_value = 0
MAPENTERRESPONSE_BOMBUSED_FIELD.type = 5
MAPENTERRESPONSE_BOMBUSED_FIELD.cpp_type = 1
MAPENTERRESPONSE_KILLCOUNT_FIELD.name = "killCount"
MAPENTERRESPONSE_KILLCOUNT_FIELD.full_name = ".com.ljsd.jieling.protocols.MapEnterResponse.killCount"
MAPENTERRESPONSE_KILLCOUNT_FIELD.number = 22
MAPENTERRESPONSE_KILLCOUNT_FIELD.index = 21
MAPENTERRESPONSE_KILLCOUNT_FIELD.label = 1
MAPENTERRESPONSE_KILLCOUNT_FIELD.has_default_value = false
MAPENTERRESPONSE_KILLCOUNT_FIELD.default_value = 0
MAPENTERRESPONSE_KILLCOUNT_FIELD.type = 5
MAPENTERRESPONSE_KILLCOUNT_FIELD.cpp_type = 1
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD.name = "trialRewardInfo"
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.MapEnterResponse.trialRewardInfo"
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD.number = 23
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD.index = 22
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD.label = 3
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD.has_default_value = false
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD.default_value = {}
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD.type = 5
MAPENTERRESPONSE_TRIALREWARDINFO_FIELD.cpp_type = 1
MAPENTERRESPONSE_ESSENCEVALUE_FIELD.name = "essenceValue"
MAPENTERRESPONSE_ESSENCEVALUE_FIELD.full_name = ".com.ljsd.jieling.protocols.MapEnterResponse.essenceValue"
MAPENTERRESPONSE_ESSENCEVALUE_FIELD.number = 24
MAPENTERRESPONSE_ESSENCEVALUE_FIELD.index = 23
MAPENTERRESPONSE_ESSENCEVALUE_FIELD.label = 1
MAPENTERRESPONSE_ESSENCEVALUE_FIELD.has_default_value = false
MAPENTERRESPONSE_ESSENCEVALUE_FIELD.default_value = 0
MAPENTERRESPONSE_ESSENCEVALUE_FIELD.type = 5
MAPENTERRESPONSE_ESSENCEVALUE_FIELD.cpp_type = 1
MAPENTERRESPONSE.name = "MapEnterResponse"
MAPENTERRESPONSE.full_name = ".com.ljsd.jieling.protocols.MapEnterResponse"
MAPENTERRESPONSE.nested_types = {}
MAPENTERRESPONSE.enum_types = {}
MAPENTERRESPONSE.fields = {MAPENTERRESPONSE_MAPLIST_FIELD, MAPENTERRESPONSE_CURXY_FIELD, MAPENTERRESPONSE_HEROINFOS_FIELD, MAPENTERRESPONSE_LEFTTIME_FIELD, MAPENTERRESPONSE_TEMPORARYITEMS_FIELD, MAPENTERRESPONSE_FOODBUFFERS_FIELD, MAPENTERRESPONSE_WAKECELLS_FIELD, MAPENTERRESPONSE_MISSIONS_FIELD, MAPENTERRESPONSE_REVIVETIME_FIELD, MAPENTERRESPONSE_DIECOUNT_FIELD, MAPENTERRESPONSE_EXPLOREDETAIL_FIELD, MAPENTERRESPONSE_BUF_FIELD, MAPENTERRESPONSE_SIGNS_FIELD, MAPENTERRESPONSE_REFRESHINFO_FIELD, MAPENTERRESPONSE_SKIPFIGHT_FIELD, MAPENTERRESPONSE_INFOS_FIELD, MAPENTERRESPONSE_CURHERO_FIELD, MAPENTERRESPONSE_ADDHPCOUNT_FIELD, MAPENTERRESPONSE_MAPID_FIELD, MAPENTERRESPONSE_CURTOWER_FIELD, MAPENTERRESPONSE_BOMBUSED_FIELD}
MAPENTERRESPONSE.fields = {MAPENTERRESPONSE_MAPLIST_FIELD, MAPENTERRESPONSE_CURXY_FIELD, MAPENTERRESPONSE_HEROINFOS_FIELD, MAPENTERRESPONSE_LEFTTIME_FIELD, MAPENTERRESPONSE_TEMPORARYITEMS_FIELD, MAPENTERRESPONSE_FOODBUFFERS_FIELD, MAPENTERRESPONSE_WAKECELLS_FIELD, MAPENTERRESPONSE_MISSIONS_FIELD, MAPENTERRESPONSE_REVIVETIME_FIELD, MAPENTERRESPONSE_DIECOUNT_FIELD, MAPENTERRESPONSE_EXPLOREDETAIL_FIELD, MAPENTERRESPONSE_BUF_FIELD, MAPENTERRESPONSE_SIGNS_FIELD, MAPENTERRESPONSE_REFRESHINFO_FIELD, MAPENTERRESPONSE_SKIPFIGHT_FIELD, MAPENTERRESPONSE_INFOS_FIELD, MAPENTERRESPONSE_CURHERO_FIELD, MAPENTERRESPONSE_ADDHPCOUNT_FIELD, MAPENTERRESPONSE_MAPID_FIELD, MAPENTERRESPONSE_CURTOWER_FIELD, MAPENTERRESPONSE_BOMBUSED_FIELD, MAPENTERRESPONSE_KILLCOUNT_FIELD, MAPENTERRESPONSE_TRIALREWARDINFO_FIELD, MAPENTERRESPONSE_ESSENCEVALUE_FIELD}
MAPENTERRESPONSE.is_extendable = false
MAPENTERRESPONSE.extensions = {}
EVENTUPDATEREQUEST_EVENTID_FIELD.name = "eventId"
@ -953,103 +975,6 @@ USETOWERBUFFRESPONSE.enum_types = {}
USETOWERBUFFRESPONSE.fields = {USETOWERBUFFRESPONSE_EVENTBEHAVIORCOMMON_FIELD}
USETOWERBUFFRESPONSE.is_extendable = false
USETOWERBUFFRESPONSE.extensions = {}
TOWERCOPYINFO_TOWER_FIELD.name = "tower"
TOWERCOPYINFO_TOWER_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.tower"
TOWERCOPYINFO_TOWER_FIELD.number = 1
TOWERCOPYINFO_TOWER_FIELD.index = 0
TOWERCOPYINFO_TOWER_FIELD.label = 1
TOWERCOPYINFO_TOWER_FIELD.has_default_value = false
TOWERCOPYINFO_TOWER_FIELD.default_value = 0
TOWERCOPYINFO_TOWER_FIELD.type = 5
TOWERCOPYINFO_TOWER_FIELD.cpp_type = 1
TOWERCOPYINFO_FIGHTCOUNT_FIELD.name = "fightCount"
TOWERCOPYINFO_FIGHTCOUNT_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.fightCount"
TOWERCOPYINFO_FIGHTCOUNT_FIELD.number = 2
TOWERCOPYINFO_FIGHTCOUNT_FIELD.index = 1
TOWERCOPYINFO_FIGHTCOUNT_FIELD.label = 1
TOWERCOPYINFO_FIGHTCOUNT_FIELD.has_default_value = false
TOWERCOPYINFO_FIGHTCOUNT_FIELD.default_value = 0
TOWERCOPYINFO_FIGHTCOUNT_FIELD.type = 5
TOWERCOPYINFO_FIGHTCOUNT_FIELD.cpp_type = 1
TOWERCOPYINFO_HIGHESTTOWER_FIELD.name = "highestTower"
TOWERCOPYINFO_HIGHESTTOWER_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.highestTower"
TOWERCOPYINFO_HIGHESTTOWER_FIELD.number = 3
TOWERCOPYINFO_HIGHESTTOWER_FIELD.index = 2
TOWERCOPYINFO_HIGHESTTOWER_FIELD.label = 1
TOWERCOPYINFO_HIGHESTTOWER_FIELD.has_default_value = false
TOWERCOPYINFO_HIGHESTTOWER_FIELD.default_value = 0
TOWERCOPYINFO_HIGHESTTOWER_FIELD.type = 5
TOWERCOPYINFO_HIGHESTTOWER_FIELD.cpp_type = 1
TOWERCOPYINFO_ESSENCEVALUE_FIELD.name = "essenceValue"
TOWERCOPYINFO_ESSENCEVALUE_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.essenceValue"
TOWERCOPYINFO_ESSENCEVALUE_FIELD.number = 4
TOWERCOPYINFO_ESSENCEVALUE_FIELD.index = 3
TOWERCOPYINFO_ESSENCEVALUE_FIELD.label = 1
TOWERCOPYINFO_ESSENCEVALUE_FIELD.has_default_value = false
TOWERCOPYINFO_ESSENCEVALUE_FIELD.default_value = 0
TOWERCOPYINFO_ESSENCEVALUE_FIELD.type = 5
TOWERCOPYINFO_ESSENCEVALUE_FIELD.cpp_type = 1
TOWERCOPYINFO_MAPINTORESET_FIELD.name = "mapIntoReset"
TOWERCOPYINFO_MAPINTORESET_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.mapIntoReset"
TOWERCOPYINFO_MAPINTORESET_FIELD.number = 5
TOWERCOPYINFO_MAPINTORESET_FIELD.index = 4
TOWERCOPYINFO_MAPINTORESET_FIELD.label = 1
TOWERCOPYINFO_MAPINTORESET_FIELD.has_default_value = false
TOWERCOPYINFO_MAPINTORESET_FIELD.default_value = 0
TOWERCOPYINFO_MAPINTORESET_FIELD.type = 5
TOWERCOPYINFO_MAPINTORESET_FIELD.cpp_type = 1
TOWERCOPYINFO_TOWERUSETIME_FIELD.name = "towerUseTime"
TOWERCOPYINFO_TOWERUSETIME_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.towerUseTime"
TOWERCOPYINFO_TOWERUSETIME_FIELD.number = 6
TOWERCOPYINFO_TOWERUSETIME_FIELD.index = 5
TOWERCOPYINFO_TOWERUSETIME_FIELD.label = 1
TOWERCOPYINFO_TOWERUSETIME_FIELD.has_default_value = false
TOWERCOPYINFO_TOWERUSETIME_FIELD.default_value = 0
TOWERCOPYINFO_TOWERUSETIME_FIELD.type = 5
TOWERCOPYINFO_TOWERUSETIME_FIELD.cpp_type = 1
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.name = "trialRewardInfo"
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.trialRewardInfo"
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.number = 7
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.index = 6
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.label = 3
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.has_default_value = false
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.default_value = {}
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.type = 5
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.cpp_type = 1
TOWERCOPYINFO_KILLCOUNT_FIELD.name = "killCount"
TOWERCOPYINFO_KILLCOUNT_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.killCount"
TOWERCOPYINFO_KILLCOUNT_FIELD.number = 8
TOWERCOPYINFO_KILLCOUNT_FIELD.index = 7
TOWERCOPYINFO_KILLCOUNT_FIELD.label = 1
TOWERCOPYINFO_KILLCOUNT_FIELD.has_default_value = false
TOWERCOPYINFO_KILLCOUNT_FIELD.default_value = 0
TOWERCOPYINFO_KILLCOUNT_FIELD.type = 5
TOWERCOPYINFO_KILLCOUNT_FIELD.cpp_type = 1
TOWERCOPYINFO_BOMBUSED_FIELD.name = "bombUsed"
TOWERCOPYINFO_BOMBUSED_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.bombUsed"
TOWERCOPYINFO_BOMBUSED_FIELD.number = 9
TOWERCOPYINFO_BOMBUSED_FIELD.index = 8
TOWERCOPYINFO_BOMBUSED_FIELD.label = 1
TOWERCOPYINFO_BOMBUSED_FIELD.has_default_value = false
TOWERCOPYINFO_BOMBUSED_FIELD.default_value = 0
TOWERCOPYINFO_BOMBUSED_FIELD.type = 5
TOWERCOPYINFO_BOMBUSED_FIELD.cpp_type = 1
TOWERCOPYINFO.name = "TowerCopyInfo"
TOWERCOPYINFO.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo"
TOWERCOPYINFO.nested_types = {}
TOWERCOPYINFO.enum_types = {}
TOWERCOPYINFO.fields = {TOWERCOPYINFO_TOWER_FIELD, TOWERCOPYINFO_FIGHTCOUNT_FIELD, TOWERCOPYINFO_HIGHESTTOWER_FIELD, TOWERCOPYINFO_ESSENCEVALUE_FIELD, TOWERCOPYINFO_MAPINTORESET_FIELD, TOWERCOPYINFO_TOWERUSETIME_FIELD, TOWERCOPYINFO_TRIALREWARDINFO_FIELD, TOWERCOPYINFO_KILLCOUNT_FIELD, TOWERCOPYINFO_BOMBUSED_FIELD}
TOWERCOPYINFO.is_extendable = false
TOWERCOPYINFO.extensions = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.name = "levelDifficultyInfos"
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.full_name = ".com.ljsd.jieling.protocols.getAllLevelDifficultyInfosResponse.levelDifficultyInfos"
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.number = 1
@ -1082,21 +1007,10 @@ GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.default_value = 0
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.type = 5
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.cpp_type = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.name = "towerCopyInfo"
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.getAllLevelDifficultyInfosResponse.towerCopyInfo"
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.number = 4
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.index = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.label = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.default_value = nil
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.message_type = TOWERCOPYINFO
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.type = 11
GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD.cpp_type = 10
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.name = "playedGenMapId"
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.full_name = ".com.ljsd.jieling.protocols.getAllLevelDifficultyInfosResponse.playedGenMapId"
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.number = 5
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.index = 4
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.number = 4
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.index = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.label = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.default_value = {}
@ -1105,8 +1019,8 @@ GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.cpp_type = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.name = "difficultMapOptions"
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.full_name = ".com.ljsd.jieling.protocols.getAllLevelDifficultyInfosResponse.difficultMapOptions"
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.number = 6
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.index = 5
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.number = 5
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.index = 4
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.label = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.default_value = {}
@ -1118,7 +1032,7 @@ GETALLLEVELDIFFICULTYINFOSRESPONSE.name = "getAllLevelDifficultyInfosResponse"
GETALLLEVELDIFFICULTYINFOSRESPONSE.full_name = ".com.ljsd.jieling.protocols.getAllLevelDifficultyInfosResponse"
GETALLLEVELDIFFICULTYINFOSRESPONSE.nested_types = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE.enum_types = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE.fields = {GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_TOWERCOPYINFO_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD}
GETALLLEVELDIFFICULTYINFOSRESPONSE.fields = {GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD}
GETALLLEVELDIFFICULTYINFOSRESPONSE.is_extendable = false
GETALLLEVELDIFFICULTYINFOSRESPONSE.extensions = {}
MAPGETRANKINFOREQUEST_MAPID_FIELD.name = "mapId"
@ -2422,7 +2336,6 @@ SignEndlessCellResponse = protobuf.Message(SIGNENDLESSCELLRESPONSE)
SituationChallengeRequest = protobuf.Message(SITUATIONCHALLENGEREQUEST)
SituationChallengeResponse = protobuf.Message(SITUATIONCHALLENGERESPONSE)
TowerBuff = protobuf.Message(TOWERBUFF)
TowerCopyInfo = protobuf.Message(TOWERCOPYINFO)
TowerRewardRequest = protobuf.Message(TOWERREWARDREQUEST)
TowerRewardResponse = protobuf.Message(TOWERREWARDRESPONSE)
TrialHeroInfo = protobuf.Message(TRIALHEROINFO)

File diff suppressed because one or more lines are too long

View File

@ -179,7 +179,7 @@ function this.RequestArenaChallenge(index, isSkip, func)
this.RequestReplayRecord(msg.fightResult, fightData, nil,function()
BattleRecordManager.SetBattleBothNameStr(PlayerManager.nickName.."|"..enemy.personInfo.name)
UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
end)
end,BATTLE_TYPE.ARENA)
else
-- 设置战斗数据用于统计战斗
local _fightData = BattleManager.GetBattleServerData({fightData = fightData}, 1)
@ -249,9 +249,9 @@ end
--- fightData 战斗数据
--- nameStr 交战双方名称
--- doneFunc 战斗播放完成要回调的事件
function this.RequestReplayRecord(isWin, fightData, nameStr, doneFunc)
function this.RequestReplayRecord(isWin, fightData, nameStr, doneFunc,battle_type)
local fightData = BattleManager.GetBattleServerData({fightData = fightData}, 1)
local battlePanel = UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.BACK, doneFunc)
local battlePanel = UIManager.OpenPanel(UIName.BattlePanel, fightData, battle_type and battle_type or BATTLE_TYPE.BACK, doneFunc)
battlePanel:ShowNameShow(isWin, nameStr)
end

View File

@ -2305,7 +2305,7 @@ local passivityList = {
local i1 = args[1]
local f1 = args[2]
local ct = args[3]
role.isHaveNoDead = true
-- 角色死亡时
local onRoleDead = function()
-- -- 暂时不能死
@ -4505,7 +4505,7 @@ local passivityList = {
role.Event:AddEvent(BattleEventName.RoleHit, _OnRoleHit)
end,
--
-- 大闹天宫胜利次数
[225] = function(role, args)
--王振兴添加
local f1 = args[1]
@ -4513,7 +4513,7 @@ local passivityList = {
local ct1 = args[3]
local maxNum = args[4]
-- 紫+橙
local num = OutDataManager.GetOutData(role.camp, OutDataName.MisteryLiquidUsedTimes)
local num = OutDataManager.GetOutData(role.camp, OutDataName.WinTimes)
num = min(maxNum, num)
BattleUtil.AddProp(role, pro1, f1 * num, ct1)
@ -4762,7 +4762,7 @@ local passivityList = {
local maxNum = args[7]
-- 紫+橙
local num = OutDataManager.GetOutData(role.camp, OutDataName.PerpleGloryItemNum) + OutDataManager.GetOutData(role.camp, OutDataName.OrangeGloryItemNum)
local num = OutDataManager.GetOutData(role.camp, OutDataName.OrangeGloryItemNum) + OutDataManager.GetOutData(role.camp, OutDataName.RedGloryItemNum)
num = min(maxNum, num)
BattleUtil.AddProp(role, pro1, f1 * num, ct1)
BattleUtil.AddProp(role, pro2, f2 * num, ct2)

View File

@ -411,7 +411,7 @@ end
--检测是否有是金翅大鹏有不灭效果
function BattleUtil.CheckIsNoDead(target)
if target then
return target:IsAssignHeroAndHeroStar(10086,10) or BattleLogic.BuffMgr:HasBuff(target,BuffName.NoDead)
return target.isHaveNoDead or BattleLogic.BuffMgr:HasBuff(target,BuffName.NoDead)
end
return false
end

View File

@ -39,7 +39,7 @@ function RoleLogic:Init(uid, data, position)
self.exCalDmgList:Clear() --额外计算伤害列表
self.buffFilter:Clear() --buff屏蔽列表
self.proTranList:Clear() --属性转换列表
self.isHaveNoDead = false -- 是否有不灭
self.Event:ClearEvent()
self.skill = data.skill

View File

@ -379,25 +379,19 @@ function this.BtnClick(id)
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id))
end
elseif id == FUNCTION_OPEN_TYPE.TRIAL then
elseif id == FUNCTION_OPEN_TYPE.TRIAL then--森罗在此!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
LogGreen("点击进入森罗时候的层数"..MapTrialManager.curTowerLevel)
if ActTimeCtrlManager.SingleFuncState(id) then
CarbonManager.difficulty = 2
local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
-- if MapTrialManager.curTowerLevel > 10000 then
-- MapManager.curMapId = MapTrialManager.GetSurprisedLevelMapId()
-- else
-- MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId
-- end
MapManager.curCarbonType =CarBonTypeId.TRIAL
NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
MapManager.isReloadEnter = false
MapTrialManager.firstEnter = true
MapManager.SetViewSize(20)--设置视野范围(明雷形式)
MapManager.curAreaId =FormationTypeDef.FORMATION_DREAMLAND
MapManager.trialHeroInfo=msg.infos
MapTrialManager.isHaveBoss = false
SwitchPanel.OpenPanel(UIName.MapPanel)
end)
LogBlue(Language[11163])
@ -515,10 +509,18 @@ end
function CarbonTypePanelV2:OnDestroy()
hasFresh = false
if this.BtView then
SubUIManager.Close(this.BtView)
SubUIManager.Close(this.BtView)
end
carbons = {}
this.playerHead=nil
if this.playerHead then
SubUIManager.Close(this.playerHead)
end
SubUIManager.Close(this.UpView)
this.playerHead = nil
this.UpView = nil
this.BtView = nil
ClearRedPointObject(RedPointType.Setting, this.headRedpot)
for k,v in ipairs(carbons) do
local data

View File

@ -55,8 +55,8 @@ local tabs = {
default = "b_bianhuanmoce_icon2", lock = "b_bianhuanmoce_icon2", select = "b_bianhuanmoce_icon1",
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
},
[13] = { --第十四周 降龙伏虎
default = "x_xianglongfuhu_icon2", lock = "x_xianglongfuhu_icon2", select = "x_xianglongfuhu_icon1",
[13] = { --第十四周 博闻强识
default = "b_bowenduoshi_icon2", lock = "b_bowenduoshi_icon2", select = "b_bowenduoshi_icon1",
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
},
[14] = { --第十五周 降龙伏虎

View File

@ -18,6 +18,7 @@ local bannerType = {
[10] = {compent = "bg1",titilebg1 = "x_xianglongfuhu_banner"},
[11] = {compent = "bg1",titilebg1 = "q_qikaidesheng_banner"},
[12] = {compent = "bg1",titilebg1 = "b_bianhuanmoce_banner"},
[13] = {compent = "bg1",titilebg1 = "b_bowenduoshi_banner"},
}
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
function DynamicTaskPage:ctor(mainPanel, gameObject)

View File

@ -151,6 +151,17 @@ local activityType = {
title = "b_bianhuanmoce_zi",
helptype = HELP_TYPE.TimeLimitedCall
},
--博文多识 限时召唤
[4313] = {
bg = "Bg2",
hero = {
[1]={name="Bg2/hero1",id=10008,hero="b_bowenduoshi_shenjiang1"}, ----精卫
[2]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, ---哪吒
[3]={name="Bg2/hero3",id=10013,hero="y_yishandaohai_shenjiang2"}, --吕洞宾
},
title = "b_bowenduoshi_zi",
helptype = HELP_TYPE.TimeLimitedCall
},
}
--type与lotterySetting表中的id对应
local btns={ [bType.Btn1]={name="btngroup/once",isInfo=Language[10644]}, [bType.Btn10]={name="btngroup/ten",isInfo=Language[12182]}}

View File

@ -207,7 +207,11 @@ function YiJingBaoKu:AddBackToFrontClick()
trigger = true
if tempData[1] == BlessingConfig[ActData.selectId].Reward[1] then
finalReward.gameObject:SetActive(false)
itemViewList[18].gameObject:SetActive(false)
if itemViewList[18] then
itemViewList[18].gameObject:SetActive(false)
else
Util.GetGameObject(_itemsList[18],"front"):GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 0, 0))
end
YiJingBaoKu:Refresh()
end
end)

View File

@ -234,7 +234,10 @@ function EightDayGiftPanel:SetSingleReward(item,i)
--点击奖励时更改背景
Util.AddOnceClick(event,function()
poolManager:UnLoadLive(bgName, Live)
if Live then
poolManager:UnLoadLive(bgName, Live)
Live = nil
end
this:SetBg(i)
if ItemConfig[EightDayRewardConfig[i].Reward[1][1]].ItemType == 13 then
UIManager.OpenPanel(UIName.SoulPrintPopUp,3,nil,EightDayRewardConfig[i].Reward[1][1],nil,nil)
@ -245,7 +248,10 @@ function EightDayGiftPanel:SetSingleReward(item,i)
end)
Util.AddOnceClick(reward,function()
poolManager:UnLoadLive(bgName, Live)
if Live then
poolManager:UnLoadLive(bgName, Live)
Live = nil
end
this:SetBg(i)
end)
@ -261,7 +267,10 @@ function EightDayGiftPanel:SetRemainTime(day,i)
local t = CalculateSecondsNowTo_N_OClock(5)
if t-1 < 0 then
Timer.New(function()
poolManager:UnLoadLive(bgName, Live)
if Live then
poolManager:UnLoadLive(bgName, Live)
Live = nil
end
this:Refresh()
end, 1, 1, true):Start()
end
@ -289,7 +298,10 @@ end
--界面关闭时调用(用于子类重写)
function EightDayGiftPanel:OnClose()
poolManager:UnLoadLive(bgName, Live)
if Live then
poolManager:UnLoadLive(bgName, Live)
Live = nil
end
end
--界面销毁时调用(用于子类重写)

View File

@ -887,7 +887,7 @@ local function CalculateHeroUpEquipsProAddVal(_heroId)
local curHeroData = HeroManager.GetSingleHeroData(_heroId)
if curHeroData then
--Log("#curHeroData.equipIdList "..#curHeroData.equipIdList)
local equipSuit = {}
local equipSuit = this.GetCurHeroEquipSuitPros(curHeroData.equipIdList)
--[id] = 件数
for i = 1, #curHeroData.equipIdList do
local curEquip = EquipManager.GetSingleHeroSingleEquipData(curHeroData.equipIdList[i], _heroId)
@ -901,33 +901,19 @@ local function CalculateHeroUpEquipsProAddVal(_heroId)
addAllProVal[id] = value
end
end
--套装加成
if equipSuit[curEquip.equipConfig.SuiteID] then
equipSuit[curEquip.equipConfig.SuiteID] = equipSuit[curEquip.equipConfig.SuiteID] + 1
else
equipSuit[curEquip.equipConfig.SuiteID] = 1
end
end
end
if equipSuit and LengthOfTable(equipSuit) > 0 then
for i, v in pairs(equipSuit) do
if equipSuit and #equipSuit > 0 then
for i, v in ipairs(equipSuit) do
local curSuitConfig = equipsuite[i]
if v > 1 then
if curSuitConfig and curSuitConfig.SuiteValue then
for j = 1, #curSuitConfig.SuiteValue do
if v >= curSuitConfig.SuiteValue[j][1] then
local curProId = curSuitConfig.SuiteValue[j][2]
local curProVal = curSuitConfig.SuiteValue[j][3]
--LogError("套装激活 "..i .." "..v.." curProId "..curProId .." "..curProVal)
if addAllProVal[curProId] then
addAllProVal[curProId] = addAllProVal[curProId] + curProVal
else
addAllProVal[curProId] = curProVal
end
end
end
end
local curProId = equipSuit[i][2][2]
local curProVal = equipSuit[i][2][3]
-- LogError("套装激活 curProId "..curProId .." "..curProVal)
if addAllProVal[curProId] then
addAllProVal[curProId] = addAllProVal[curProId] + curProVal
else
addAllProVal[curProId] = curProVal
end
end
end
@ -3374,4 +3360,43 @@ function this.ChangeDownSkinId(heroSId,skinId)
end
Game.GlobalEvent:DispatchEvent(GameEvent.Role.UpdateSkin)
end
--套装新属性计算
--{{Star,{4#61#100}}{}{}
local equipSuiteConfig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)
function this.GetCurHeroEquipSuitPros(equipIdList)
local equipSuit = {}
local curEquipLists = {}
for i = 1, #equipIdList do
--套装加成
local curEquip = EquipManager.GetSingleEquipData(equipIdList[i])
if equipSuiteConfig[curEquip.equipConfig.Star] then--有套装
table.insert(curEquipLists,curEquip)
if #curEquipLists > 1 then
end
end
end
table.sort(curEquipLists, function(a, b)
return a.equipConfig.Star < b.equipConfig.Star
end)
local num = #curEquipLists
-- LogPink("num "..num)
for i = 1, #curEquipLists do
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)) do
if configInfo.Id == curEquipLists[i].equipConfig.Star then
if num > 1 then
-- LogPink("curEquipLists[i].equipConfig.Star "..curEquipLists[i].equipConfig.Star.." "..num)
local curequipSuit = {curEquipLists[i].equipConfig.Star,configInfo.SuiteValue[num - 1]}
table.insert(equipSuit,curequipSuit)
end
num = num - 1
end
end
end
-- for i = 1, #equipSuit do
-- LogPink(equipSuit[i][1].. " " ..equipSuit[i][2][1])
-- end
return equipSuit
end
return this

View File

@ -62,6 +62,7 @@ local mainDynamicActivityIcon = {
[10] = "r_zjm_huodongicon-xianglongfuhu", ----降龙伏虎
[11] = "r_zjm_huodongicon-qikaidesheng", ----旗开得胜
[12] = "r_zjm_huodongicon-bianhuanmoce", ----变幻莫测
[13] = "r_zjm_huodongicon-bowenduoshi", ----博文多识
}
function this:AddFuncItem(btnGO, pos)
return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}

View File

@ -33,29 +33,29 @@ function this.Initialize()
this.bombUsed=0 --炸弹已使用次数
end
function this.RefreshTrialInfo(towerCopyInfo)
--试炼副本数据初始化
this.curTowerLevel=towerCopyInfo.tower
this.highestLevel=towerCopyInfo.highestTower
this.resetCount=PrivilegeManager.GetPrivilegeRemainValue(17)
this.fightCount=towerCopyInfo.towerCopyInfo
this.powerValue = towerCopyInfo.essenceValue
this.isCanReset=towerCopyInfo.mapIntoReset
this.doneTime = towerCopyInfo.towerUseTime
-- this.trialRewardInfo=towerCopyInfo.trialRewardInfo
this.InitTrialRewardData(towerCopyInfo.trialRewardInfo)
this.killCount=towerCopyInfo.killCount
this.bombUsed=towerCopyInfo.bombUsed
-- function this.RefreshTrialInfo(towerCopyInfo)
-- --试炼副本数据初始化
-- this.curTowerLevel=towerCopyInfo.tower
-- this.highestLevel=towerCopyInfo.highestTower
-- this.resetCount=PrivilegeManager.GetPrivilegeRemainValue(17)
-- this.fightCount=towerCopyInfo.towerCopyInfo
-- this.powerValue = towerCopyInfo.essenceValue
-- this.isCanReset=towerCopyInfo.mapIntoReset
-- this.doneTime = towerCopyInfo.towerUseTime
-- -- this.trialRewardInfo=towerCopyInfo.trialRewardInfo
-- this.InitTrialRewardData(towerCopyInfo.trialRewardInfo)
-- this.killCount=towerCopyInfo.killCount
-- this.bombUsed=towerCopyInfo.bombUsed
-- 最后一层需要赋值
this.bossDeadTime = towerCopyInfo.towerUseTime
-- -- 最后一层需要赋值
-- this.bossDeadTime = towerCopyInfo.towerUseTime
Log("towerUseTime ============" .. towerCopyInfo.towerUseTime)
Log(Language[11243] .. this.resetCount)
this.SetBossState(this.powerValue)
Log(Language[11244] .. this.powerValue)
end
-- Log("towerUseTime ============" .. towerCopyInfo.towerUseTime)
-- Log(Language[11243] .. this.resetCount)
-- this.SetBossState(this.powerValue)
-- Log(Language[11244] .. this.powerValue)
-- end
-- 取得最初的服务器精气值
function this.UpdatePowerValue(value)

View File

@ -350,21 +350,25 @@ function this.MapInfoRequest(mapModeId,func)
local msg = MapInfoProto_pb.MapEnterResponse()
msg:ParseFromString(data)
MapManager.curMapId = msg.mapId
MapManager.trialHeroInfo=msg.infos
MapTrialManager.curTowerLevel = msg.curTower
MapTrialManager.bombUsed = msg.bombUsed
Log("服务器返回的MapID:"..msg.mapId.." 当前层数"..msg.curTower.." msg.bombUsed"..msg.bombUsed)
MapTrialManager.killCount=msg.killCount
MapTrialManager.powerValue = msg.essenceValue
MapTrialManager.InitTrialRewardData(msg.trialRewardInfo)
MapManager.mapPointList = {}
EndLessMapManager.PointNoteDataList = {}
MapManager.InitData(msg)
--SubmitExtraData({ type = SDKSubMitType.TYPE_ENTER_COPY })
if msg.exploreDetail then
MapManager.InitAllMapProgressData(msg.exploreDetail)--更新当前地图探索度
end
if func then
func(msg)
end
-- 请求进图后
MapManager.Mapping = true
Log("服务器返回的MapID:"..msg.mapId.." 当前层数"..msg.curTower.." msg.bombUsed"..msg.bombUsed)
-- if msg.exploreDetail then
-- MapManager.InitAllMapProgressData(msg.exploreDetail)--更新当前地图探索度
-- end
end)
end
@ -1219,7 +1223,7 @@ function this.GetAllFightDataRequest(func)
local msg = MapInfoProto_pb.getAllLevelDifficultyInfosResponse()
msg:ParseFromString(data)
--FightManager.InitAllMapPgData(msg.levelDifficultyInfos)
MapTrialManager.RefreshTrialInfo(msg.towerCopyInfo)
-- MapTrialManager.RefreshTrialInfo(msg.towerCopyInfo)
CarbonManager.InitCarbonState(msg.mapInfos)
CarbonManager.InitNormalState(msg.playedGenMapId)
CarbonManager.InitCountDownProcess()

View File

@ -94,7 +94,7 @@ function PokemonSingleResultPanel:TenOpenPanel()
else
self:ClosePanel()
end
end, 0.1):Start()
end, 0.0001):Start()
end
function PokemonSingleResultPanel:UpdataPanelData(_heroData)

View File

@ -194,9 +194,10 @@ function RewardEquipSingleShowPopup:OnShow()
end
--套装属性
if equipConfigData.SuiteID and equipConfigData.SuiteID > 0 then
local suitConFig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)
if suitConFig[equipConfigData.Star] then
Util.GetGameObject(self.transform, "Content/proRect"):SetActive(true)
local curSuitConFig = ConfigManager.GetConfigData(ConfigName.EquipSuiteConfig,equipConfigData.SuiteID)
local curSuitConFig = suitConFig[equipConfigData.Star]
if curSuitConFig then
for i = 1, math.max(#curSuitConFig.SuiteValue, #curSuitProGo) do
local go = curSuitProGo[i]
@ -213,7 +214,7 @@ function RewardEquipSingleShowPopup:OnShow()
local go = curSuitProGo[i]
go.gameObject:SetActive(true)
Util.GetGameObject(go.transform, "proName"):GetComponent("Text").text = "<color=#B9AC97>" .. propertyConfig[curSuitConFig.SuiteValue[i][2]].Info .."+ "..GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]) .. "</color>"
Util.GetGameObject(go.transform, "proVale"):GetComponent("Text").text = "<color=#B9AC97>(" .. curSuitConFig.SuiteValue[i][1] .. Language[11095]
Util.GetGameObject(go.transform, "proVale"):GetComponent("Text").text = "<color=#B9AC97>(" .. GetEquipSuitStr(equipConfigData.Star,curSuitConFig.SuiteValue[i][1]) .. ")</color>"
end
end
else

View File

@ -208,6 +208,10 @@ end
function RewardBoxPanel:OnBtnSureClick()
if curId then
local data = {itemData.id,curId,curNum}
if curNum <= 0 then
PopupTipPanel.ShowTip("宝箱开启数量不能为0")
return
end
NetManager.UseAndPriceItemRequest(6,data,function (drop)
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
-- self:RefreshData()--执行这个Unity会崩溃
@ -231,5 +235,6 @@ end
--界面销毁时调用(用于子类重写)
function RewardBoxPanel:OnDestroy()
itemIconList={}
goList = {}
end
return RewardBoxPanel

View File

@ -147,16 +147,7 @@ end
function RoleEquipChangePopup:OnShow()
if curHeroData then
equipSuit = {}
for i = 1, #curHeroData.equipIdList do
--套装加成
local curEquip = EquipManager.GetSingleEquipData(curHeroData.equipIdList[i])
if equipSuit[curEquip.equipConfig.SuiteID] then
equipSuit[curEquip.equipConfig.SuiteID] = equipSuit[curEquip.equipConfig.SuiteID] + 1
else
equipSuit[curEquip.equipConfig.SuiteID] = 1
end
end
equipSuit = HeroManager.GetCurHeroEquipSuitPros(curHeroData.equipIdList)
end
if type==1 then
this.curEquipText:SetActive(false)
@ -275,11 +266,24 @@ function this.ShowCurEquipData(index)
end
end
--套装属性
if equipConfigData.SuiteID and equipConfigData.SuiteID > 0 then
local endProList = {}
if type == 1 or #equipSuit <= 0 then
if equipSuiteConfig[equipConfigData.Star] then
for i = 1, #equipSuiteConfig[equipConfigData.Star].SuiteValue do
table.insert(endProList,{equipConfigData.Star,equipSuiteConfig[equipConfigData.Star].SuiteValue[i]})
end
end
else
endProList = equipSuit
-- if equipSuit and #equipSuit > 0 then
-- for i = 1, #equipSuit do
-- table.insert(endProList,equipSuit[i])
-- end
-- end
end
if endProList and #endProList > 0 then
this.curotherProscroll:SetActive(true)
local curSuitConFig = equipSuiteConfig[equipConfigData.SuiteID]
if curSuitConFig then
for i = 1, math.max(#curSuitConFig.SuiteValue, #curSuitProGo) do
for i = 1, math.max(#endProList, #curSuitProGo) do
local go = curSuitProGo[i]
if not go then
go = newObject(this.otherProPre)
@ -290,20 +294,21 @@ function this.ShowCurEquipData(index)
end
go.gameObject:SetActive(false)
end
for i = 1, #curSuitConFig.SuiteValue do
for i = 1, #endProList do
local go = curSuitProGo[i]
go.gameObject:SetActive(true)
--type=data[2]--1 穿戴 2 卸下 3 替换
Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#B9AC97>" .. propertyConfig[curSuitConFig.SuiteValue[i][2]].Info .."+ "..GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]) .. "</color>"
Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#B9AC97>(" .. curSuitConFig.SuiteValue[i][1] .. Language[11095]
if type == 2 then
if equipSuit[curSuitConFig.Id] >= curSuitConFig.SuiteValue[i][1] then--激活的要变颜色
Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#66FF00>" .. propertyConfig[curSuitConFig.SuiteValue[i][2]].Info.."+ "..GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]) .. "</color>"
Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#66FF00>(" .. curSuitConFig.SuiteValue[i][1] .. Language[11095]
end
local proId = endProList[i][2][2]
local proVa = endProList[i][2][3]
local suitNum = endProList[i][2][1]
local Star = endProList[i][1]
Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#B9AC97>" .. propertyConfig[proId].Info .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "</color>"
Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#B9AC97>(" .. GetEquipSuitStr(Star,suitNum) .. ")</color>"
if type == 2 and #equipSuit > 0 then--激活的要变颜色
Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#66FF00>" .. propertyConfig[proId].Info .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "</color>"
Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#66FF00>(" .. GetEquipSuitStr(Star,suitNum) .. ")</color>"
end
end
end
else
this.curotherProscroll:SetActive(false)
end
@ -416,9 +421,9 @@ function this.NextCurEquipData()
end
end
--套装属性
if equipConfigData.SuiteID and equipConfigData.SuiteID > 0 then
if equipSuiteConfig[equipConfigData.Star] then
this.nexttherProscroll:SetActive(true)
local curSuitConFig = equipSuiteConfig[equipConfigData.SuiteID]
local curSuitConFig = equipSuiteConfig[equipConfigData.Star]
if curSuitConFig then
for i = 1, math.max(#curSuitConFig.SuiteValue, #nextSuitProGo) do
local go = nextSuitProGo[i]
@ -435,8 +440,8 @@ function this.NextCurEquipData()
local go = nextSuitProGo[i]
go.gameObject:SetActive(true)
--type=data[2]--1 穿戴 2 卸下 3 替换
Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#B9AC97>" .. propertyConfig[curSuitConFig.SuiteValue[i][2]].Info .."+ "..curSuitConFig.SuiteValue[i][3].. "</color>"
Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#B9AC97>(+" .. curSuitConFig.SuiteValue[i][1] .. Language[11095]
Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#B9AC97>" .. propertyConfig[curSuitConFig.SuiteValue[i][2]].Info .."+ "..GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]).. "</color>"
Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#B9AC97>(+" .. GetEquipSuitStr(equipConfigData.Star,curSuitConFig.SuiteValue[i][1]) .. ")</color>"
end
end
else