Merge branch 'dev_oneDis' into dev_one_discount
commit
3e7c0cc1aa
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 594dbf5c5466043479ec856cfc517533
|
||||||
|
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
|
||||||
|
- serializedVersion: 2
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 56
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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: 822cd487e9d481340a2a9c0798ae398c
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: MainAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -148,8 +148,8 @@ CHATINFO_SOULVAL_FIELD.index = 8
|
||||||
CHATINFO_SOULVAL_FIELD.label = 1
|
CHATINFO_SOULVAL_FIELD.label = 1
|
||||||
CHATINFO_SOULVAL_FIELD.has_default_value = false
|
CHATINFO_SOULVAL_FIELD.has_default_value = false
|
||||||
CHATINFO_SOULVAL_FIELD.default_value = 0
|
CHATINFO_SOULVAL_FIELD.default_value = 0
|
||||||
CHATINFO_SOULVAL_FIELD.type = 5
|
CHATINFO_SOULVAL_FIELD.type = 3
|
||||||
CHATINFO_SOULVAL_FIELD.cpp_type = 1
|
CHATINFO_SOULVAL_FIELD.cpp_type = 2
|
||||||
|
|
||||||
CHATINFO_MESSAGEID_FIELD.name = "messageId"
|
CHATINFO_MESSAGEID_FIELD.name = "messageId"
|
||||||
CHATINFO_MESSAGEID_FIELD.full_name = ".rpc.protocols.ChatInfo.messageId"
|
CHATINFO_MESSAGEID_FIELD.full_name = ".rpc.protocols.ChatInfo.messageId"
|
||||||
|
|
|
||||||
|
|
@ -1086,8 +1086,8 @@ PLAYER_MAXFORCE_FIELD.index = 11
|
||||||
PLAYER_MAXFORCE_FIELD.label = 1
|
PLAYER_MAXFORCE_FIELD.label = 1
|
||||||
PLAYER_MAXFORCE_FIELD.has_default_value = false
|
PLAYER_MAXFORCE_FIELD.has_default_value = false
|
||||||
PLAYER_MAXFORCE_FIELD.default_value = 0
|
PLAYER_MAXFORCE_FIELD.default_value = 0
|
||||||
PLAYER_MAXFORCE_FIELD.type = 5
|
PLAYER_MAXFORCE_FIELD.type = 3
|
||||||
PLAYER_MAXFORCE_FIELD.cpp_type = 1
|
PLAYER_MAXFORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
PLAYER_SAVEAMT_FIELD.name = "saveAmt"
|
PLAYER_SAVEAMT_FIELD.name = "saveAmt"
|
||||||
PLAYER_SAVEAMT_FIELD.full_name = ".rpc.protocols.Player.saveAmt"
|
PLAYER_SAVEAMT_FIELD.full_name = ".rpc.protocols.Player.saveAmt"
|
||||||
|
|
@ -3156,8 +3156,8 @@ ARENAPERSONINFO_SCORE_FIELD.index = 3
|
||||||
ARENAPERSONINFO_SCORE_FIELD.label = 1
|
ARENAPERSONINFO_SCORE_FIELD.label = 1
|
||||||
ARENAPERSONINFO_SCORE_FIELD.has_default_value = false
|
ARENAPERSONINFO_SCORE_FIELD.has_default_value = false
|
||||||
ARENAPERSONINFO_SCORE_FIELD.default_value = 0
|
ARENAPERSONINFO_SCORE_FIELD.default_value = 0
|
||||||
ARENAPERSONINFO_SCORE_FIELD.type = 5
|
ARENAPERSONINFO_SCORE_FIELD.type = 3
|
||||||
ARENAPERSONINFO_SCORE_FIELD.cpp_type = 1
|
ARENAPERSONINFO_SCORE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
ARENAPERSONINFO_HEAD_FIELD.name = "head"
|
ARENAPERSONINFO_HEAD_FIELD.name = "head"
|
||||||
ARENAPERSONINFO_HEAD_FIELD.full_name = ".rpc.protocols.ArenaPersonInfo.head"
|
ARENAPERSONINFO_HEAD_FIELD.full_name = ".rpc.protocols.ArenaPersonInfo.head"
|
||||||
|
|
@ -3186,8 +3186,8 @@ ARENAPERSONINFO_TOTALFORCE_FIELD.index = 6
|
||||||
ARENAPERSONINFO_TOTALFORCE_FIELD.label = 1
|
ARENAPERSONINFO_TOTALFORCE_FIELD.label = 1
|
||||||
ARENAPERSONINFO_TOTALFORCE_FIELD.has_default_value = false
|
ARENAPERSONINFO_TOTALFORCE_FIELD.has_default_value = false
|
||||||
ARENAPERSONINFO_TOTALFORCE_FIELD.default_value = 0
|
ARENAPERSONINFO_TOTALFORCE_FIELD.default_value = 0
|
||||||
ARENAPERSONINFO_TOTALFORCE_FIELD.type = 5
|
ARENAPERSONINFO_TOTALFORCE_FIELD.type = 3
|
||||||
ARENAPERSONINFO_TOTALFORCE_FIELD.cpp_type = 1
|
ARENAPERSONINFO_TOTALFORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
ARENAPERSONINFO_HEADFRAME_FIELD.name = "headFrame"
|
ARENAPERSONINFO_HEADFRAME_FIELD.name = "headFrame"
|
||||||
ARENAPERSONINFO_HEADFRAME_FIELD.full_name = ".rpc.protocols.ArenaPersonInfo.headFrame"
|
ARENAPERSONINFO_HEADFRAME_FIELD.full_name = ".rpc.protocols.ArenaPersonInfo.headFrame"
|
||||||
|
|
@ -3533,8 +3533,8 @@ ARENARECORDINFO_MYSCORECHANGE_FIELD.index = 3
|
||||||
ARENARECORDINFO_MYSCORECHANGE_FIELD.label = 1
|
ARENARECORDINFO_MYSCORECHANGE_FIELD.label = 1
|
||||||
ARENARECORDINFO_MYSCORECHANGE_FIELD.has_default_value = false
|
ARENARECORDINFO_MYSCORECHANGE_FIELD.has_default_value = false
|
||||||
ARENARECORDINFO_MYSCORECHANGE_FIELD.default_value = 0
|
ARENARECORDINFO_MYSCORECHANGE_FIELD.default_value = 0
|
||||||
ARENARECORDINFO_MYSCORECHANGE_FIELD.type = 5
|
ARENARECORDINFO_MYSCORECHANGE_FIELD.type = 3
|
||||||
ARENARECORDINFO_MYSCORECHANGE_FIELD.cpp_type = 1
|
ARENARECORDINFO_MYSCORECHANGE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
ARENARECORDINFO_FIGHTRESULT_FIELD.name = "fightResult"
|
ARENARECORDINFO_FIGHTRESULT_FIELD.name = "fightResult"
|
||||||
ARENARECORDINFO_FIGHTRESULT_FIELD.full_name = ".rpc.protocols.ArenaRecordInfo.fightResult"
|
ARENARECORDINFO_FIGHTRESULT_FIELD.full_name = ".rpc.protocols.ArenaRecordInfo.fightResult"
|
||||||
|
|
@ -4035,8 +4035,8 @@ FRIEND_SOULVAL_FIELD.index = 9
|
||||||
FRIEND_SOULVAL_FIELD.label = 1
|
FRIEND_SOULVAL_FIELD.label = 1
|
||||||
FRIEND_SOULVAL_FIELD.has_default_value = false
|
FRIEND_SOULVAL_FIELD.has_default_value = false
|
||||||
FRIEND_SOULVAL_FIELD.default_value = 0
|
FRIEND_SOULVAL_FIELD.default_value = 0
|
||||||
FRIEND_SOULVAL_FIELD.type = 5
|
FRIEND_SOULVAL_FIELD.type = 3
|
||||||
FRIEND_SOULVAL_FIELD.cpp_type = 1
|
FRIEND_SOULVAL_FIELD.cpp_type = 2
|
||||||
|
|
||||||
FRIEND_USERSKIN_FIELD.name = "userSkin"
|
FRIEND_USERSKIN_FIELD.name = "userSkin"
|
||||||
FRIEND_USERSKIN_FIELD.full_name = ".rpc.protocols.Friend.userSkin"
|
FRIEND_USERSKIN_FIELD.full_name = ".rpc.protocols.Friend.userSkin"
|
||||||
|
|
@ -4415,8 +4415,8 @@ USERRANK_FORCE_FIELD.index = 7
|
||||||
USERRANK_FORCE_FIELD.label = 1
|
USERRANK_FORCE_FIELD.label = 1
|
||||||
USERRANK_FORCE_FIELD.has_default_value = false
|
USERRANK_FORCE_FIELD.has_default_value = false
|
||||||
USERRANK_FORCE_FIELD.default_value = 0
|
USERRANK_FORCE_FIELD.default_value = 0
|
||||||
USERRANK_FORCE_FIELD.type = 5
|
USERRANK_FORCE_FIELD.type = 3
|
||||||
USERRANK_FORCE_FIELD.cpp_type = 1
|
USERRANK_FORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
USERRANK_GUILDSIGN_FIELD.name = "guildSign"
|
USERRANK_GUILDSIGN_FIELD.name = "guildSign"
|
||||||
USERRANK_GUILDSIGN_FIELD.full_name = ".rpc.protocols.UserRank.guildSign"
|
USERRANK_GUILDSIGN_FIELD.full_name = ".rpc.protocols.UserRank.guildSign"
|
||||||
|
|
@ -5958,8 +5958,8 @@ TEAMONETEAMINFO_TOTALFORCE_FIELD.index = 2
|
||||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.label = 1
|
TEAMONETEAMINFO_TOTALFORCE_FIELD.label = 1
|
||||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.has_default_value = false
|
TEAMONETEAMINFO_TOTALFORCE_FIELD.has_default_value = false
|
||||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.default_value = 0
|
TEAMONETEAMINFO_TOTALFORCE_FIELD.default_value = 0
|
||||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.type = 5
|
TEAMONETEAMINFO_TOTALFORCE_FIELD.type = 3
|
||||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.cpp_type = 1
|
TEAMONETEAMINFO_TOTALFORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
TEAMONETEAMINFO_REMAINHP_FIELD.name = "remainHp"
|
TEAMONETEAMINFO_REMAINHP_FIELD.name = "remainHp"
|
||||||
TEAMONETEAMINFO_REMAINHP_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.remainHp"
|
TEAMONETEAMINFO_REMAINHP_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.remainHp"
|
||||||
|
|
@ -7248,8 +7248,8 @@ EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.index = 2
|
||||||
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.label = 1
|
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.label = 1
|
||||||
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.has_default_value = false
|
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.has_default_value = false
|
||||||
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.default_value = 0
|
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.default_value = 0
|
||||||
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.type = 5
|
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.type = 3
|
||||||
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.cpp_type = 1
|
EXPEDITIONTEAMINFO_TOTALFORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
EXPEDITIONTEAMINFO_TEAMINFO_FIELD.name = "teamInfo"
|
EXPEDITIONTEAMINFO_TEAMINFO_FIELD.name = "teamInfo"
|
||||||
EXPEDITIONTEAMINFO_TEAMINFO_FIELD.full_name = ".rpc.protocols.ExpeditionTeamInfo.teamInfo"
|
EXPEDITIONTEAMINFO_TEAMINFO_FIELD.full_name = ".rpc.protocols.ExpeditionTeamInfo.teamInfo"
|
||||||
|
|
@ -8005,8 +8005,8 @@ HARDSTAGEPLAYERINFO_POWER_FIELD.index = 6
|
||||||
HARDSTAGEPLAYERINFO_POWER_FIELD.label = 1
|
HARDSTAGEPLAYERINFO_POWER_FIELD.label = 1
|
||||||
HARDSTAGEPLAYERINFO_POWER_FIELD.has_default_value = false
|
HARDSTAGEPLAYERINFO_POWER_FIELD.has_default_value = false
|
||||||
HARDSTAGEPLAYERINFO_POWER_FIELD.default_value = 0
|
HARDSTAGEPLAYERINFO_POWER_FIELD.default_value = 0
|
||||||
HARDSTAGEPLAYERINFO_POWER_FIELD.type = 5
|
HARDSTAGEPLAYERINFO_POWER_FIELD.type = 3
|
||||||
HARDSTAGEPLAYERINFO_POWER_FIELD.cpp_type = 1
|
HARDSTAGEPLAYERINFO_POWER_FIELD.cpp_type = 2
|
||||||
|
|
||||||
HARDSTAGEPLAYERINFO_TYPE_FIELD.name = "type"
|
HARDSTAGEPLAYERINFO_TYPE_FIELD.name = "type"
|
||||||
HARDSTAGEPLAYERINFO_TYPE_FIELD.full_name = ".rpc.protocols.HardStagePlayerInfo.type"
|
HARDSTAGEPLAYERINFO_TYPE_FIELD.full_name = ".rpc.protocols.HardStagePlayerInfo.type"
|
||||||
|
|
@ -8488,8 +8488,8 @@ CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.index = 9
|
||||||
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.label = 1
|
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.label = 1
|
||||||
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.has_default_value = false
|
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.has_default_value = false
|
||||||
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.default_value = 0
|
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.default_value = 0
|
||||||
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.type = 5
|
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.type = 3
|
||||||
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.cpp_type = 1
|
CROSSYXLDPLAYERRECORDINFO_POWER_FIELD.cpp_type = 2
|
||||||
|
|
||||||
CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD.name = "type"
|
CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD.name = "type"
|
||||||
CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.type"
|
CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.type"
|
||||||
|
|
@ -8578,8 +8578,8 @@ CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.index = 18
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.label = 3
|
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.label = 3
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.has_default_value = false
|
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.has_default_value = false
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.default_value = {}
|
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.default_value = {}
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.type = 5
|
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.type = 3
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.cpp_type = 1
|
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.name = "yxldDefForce"
|
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.name = "yxldDefForce"
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.yxldDefForce"
|
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.yxldDefForce"
|
||||||
|
|
@ -8588,8 +8588,8 @@ CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.index = 19
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.label = 3
|
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.label = 3
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.has_default_value = false
|
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.has_default_value = false
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.default_value = {}
|
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.default_value = {}
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.type = 5
|
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.type = 3
|
||||||
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.cpp_type = 1
|
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.name = "defScoreChange"
|
CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.name = "defScoreChange"
|
||||||
CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.defScoreChange"
|
CROSSYXLDPLAYERRECORDINFO_DEFSCORECHANGE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.defScoreChange"
|
||||||
|
|
@ -9435,8 +9435,8 @@ EXPLORERMAPINFO_HP_FIELD.index = 2
|
||||||
EXPLORERMAPINFO_HP_FIELD.label = 1
|
EXPLORERMAPINFO_HP_FIELD.label = 1
|
||||||
EXPLORERMAPINFO_HP_FIELD.has_default_value = false
|
EXPLORERMAPINFO_HP_FIELD.has_default_value = false
|
||||||
EXPLORERMAPINFO_HP_FIELD.default_value = 0
|
EXPLORERMAPINFO_HP_FIELD.default_value = 0
|
||||||
EXPLORERMAPINFO_HP_FIELD.type = 5
|
EXPLORERMAPINFO_HP_FIELD.type = 3
|
||||||
EXPLORERMAPINFO_HP_FIELD.cpp_type = 1
|
EXPLORERMAPINFO_HP_FIELD.cpp_type = 2
|
||||||
|
|
||||||
EXPLORERMAPINFO_EXPLORETIME_FIELD.name = "exploreTime"
|
EXPLORERMAPINFO_EXPLORETIME_FIELD.name = "exploreTime"
|
||||||
EXPLORERMAPINFO_EXPLORETIME_FIELD.full_name = ".rpc.protocols.ExplorerMapInfo.exploreTime"
|
EXPLORERMAPINFO_EXPLORETIME_FIELD.full_name = ".rpc.protocols.ExplorerMapInfo.exploreTime"
|
||||||
|
|
|
||||||
|
|
@ -451,8 +451,8 @@ FAMILYUSERINFO_SOULFORCE_FIELD.index = 7
|
||||||
FAMILYUSERINFO_SOULFORCE_FIELD.label = 1
|
FAMILYUSERINFO_SOULFORCE_FIELD.label = 1
|
||||||
FAMILYUSERINFO_SOULFORCE_FIELD.has_default_value = false
|
FAMILYUSERINFO_SOULFORCE_FIELD.has_default_value = false
|
||||||
FAMILYUSERINFO_SOULFORCE_FIELD.default_value = 0
|
FAMILYUSERINFO_SOULFORCE_FIELD.default_value = 0
|
||||||
FAMILYUSERINFO_SOULFORCE_FIELD.type = 5
|
FAMILYUSERINFO_SOULFORCE_FIELD.type = 3
|
||||||
FAMILYUSERINFO_SOULFORCE_FIELD.cpp_type = 1
|
FAMILYUSERINFO_SOULFORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
FAMILYUSERINFO_HEAD_FIELD.name = "head"
|
FAMILYUSERINFO_HEAD_FIELD.name = "head"
|
||||||
FAMILYUSERINFO_HEAD_FIELD.full_name = ".rpc.protocols.FamilyUserInfo.head"
|
FAMILYUSERINFO_HEAD_FIELD.full_name = ".rpc.protocols.FamilyUserInfo.head"
|
||||||
|
|
@ -840,8 +840,8 @@ FAMILYAPPLY_FORECES_FIELD.index = 6
|
||||||
FAMILYAPPLY_FORECES_FIELD.label = 1
|
FAMILYAPPLY_FORECES_FIELD.label = 1
|
||||||
FAMILYAPPLY_FORECES_FIELD.has_default_value = false
|
FAMILYAPPLY_FORECES_FIELD.has_default_value = false
|
||||||
FAMILYAPPLY_FORECES_FIELD.default_value = 0
|
FAMILYAPPLY_FORECES_FIELD.default_value = 0
|
||||||
FAMILYAPPLY_FORECES_FIELD.type = 5
|
FAMILYAPPLY_FORECES_FIELD.type = 3
|
||||||
FAMILYAPPLY_FORECES_FIELD.cpp_type = 1
|
FAMILYAPPLY_FORECES_FIELD.cpp_type = 2
|
||||||
|
|
||||||
FAMILYAPPLY_HEAD_FIELD.name = "head"
|
FAMILYAPPLY_HEAD_FIELD.name = "head"
|
||||||
FAMILYAPPLY_HEAD_FIELD.full_name = ".rpc.protocols.FamilyApply.head"
|
FAMILYAPPLY_HEAD_FIELD.full_name = ".rpc.protocols.FamilyApply.head"
|
||||||
|
|
@ -992,8 +992,8 @@ FAMILYDEFENDINFO_CURFORCE_FIELD.index = 3
|
||||||
FAMILYDEFENDINFO_CURFORCE_FIELD.label = 1
|
FAMILYDEFENDINFO_CURFORCE_FIELD.label = 1
|
||||||
FAMILYDEFENDINFO_CURFORCE_FIELD.has_default_value = false
|
FAMILYDEFENDINFO_CURFORCE_FIELD.has_default_value = false
|
||||||
FAMILYDEFENDINFO_CURFORCE_FIELD.default_value = 0
|
FAMILYDEFENDINFO_CURFORCE_FIELD.default_value = 0
|
||||||
FAMILYDEFENDINFO_CURFORCE_FIELD.type = 5
|
FAMILYDEFENDINFO_CURFORCE_FIELD.type = 3
|
||||||
FAMILYDEFENDINFO_CURFORCE_FIELD.cpp_type = 1
|
FAMILYDEFENDINFO_CURFORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
FAMILYDEFENDINFO.name = "FamilyDefendInfo"
|
FAMILYDEFENDINFO.name = "FamilyDefendInfo"
|
||||||
FAMILYDEFENDINFO.full_name = ".rpc.protocols.FamilyDefendInfo"
|
FAMILYDEFENDINFO.full_name = ".rpc.protocols.FamilyDefendInfo"
|
||||||
|
|
@ -2652,8 +2652,8 @@ CARCHALLENGEITEM_FORCE_FIELD.index = 2
|
||||||
CARCHALLENGEITEM_FORCE_FIELD.label = 1
|
CARCHALLENGEITEM_FORCE_FIELD.label = 1
|
||||||
CARCHALLENGEITEM_FORCE_FIELD.has_default_value = false
|
CARCHALLENGEITEM_FORCE_FIELD.has_default_value = false
|
||||||
CARCHALLENGEITEM_FORCE_FIELD.default_value = 0
|
CARCHALLENGEITEM_FORCE_FIELD.default_value = 0
|
||||||
CARCHALLENGEITEM_FORCE_FIELD.type = 5
|
CARCHALLENGEITEM_FORCE_FIELD.type = 3
|
||||||
CARCHALLENGEITEM_FORCE_FIELD.cpp_type = 1
|
CARCHALLENGEITEM_FORCE_FIELD.cpp_type = 2
|
||||||
|
|
||||||
CARCHALLENGEITEM_GUILDNAME_FIELD.name = "guildName"
|
CARCHALLENGEITEM_GUILDNAME_FIELD.name = "guildName"
|
||||||
CARCHALLENGEITEM_GUILDNAME_FIELD.full_name = ".rpc.protocols.CarChallengeItem.guildName"
|
CARCHALLENGEITEM_GUILDNAME_FIELD.full_name = ".rpc.protocols.CarChallengeItem.guildName"
|
||||||
|
|
|
||||||
|
|
@ -12642,5 +12642,83 @@ local passivityList = {
|
||||||
end
|
end
|
||||||
BattleLogic.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveBeDamaging,nil,nil,role)
|
BattleLogic.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveBeDamaging,nil,nil,role)
|
||||||
end,
|
end,
|
||||||
|
-- 己方神将被击杀,自身释放[a]技能,释放的技能类型为[b],技能追加的额外技能额外造成目标[c][d]%的伤害;并复活该神将回复[e]%血量,每回合只触发[f]次
|
||||||
|
-- a[int],b[int],c[int 属性id],d[float],e[float],f[int]
|
||||||
|
[479] = function(role, args,id,judge)
|
||||||
|
local f1 = args[1]
|
||||||
|
local f2 = args[2]
|
||||||
|
local f3 = args[3]
|
||||||
|
local dt = args[4]
|
||||||
|
local pro =args[5]
|
||||||
|
local time=args[6]
|
||||||
|
local addTime=0
|
||||||
|
local extTime=0
|
||||||
|
local deadTime=0
|
||||||
|
local insertSkill=nil
|
||||||
|
local onRoleHit = function(deadRole)
|
||||||
|
if role.isExile then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
if addTime>=time then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
if deadRole.camp==role.camp and not role:IsDead() then
|
||||||
|
addTime=addTime+1
|
||||||
|
BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function ()
|
||||||
|
insertSkill= role:InsertExtraSkill(f1,f2)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
BattleLogic.Event:AddEvent(BattleEventName.RoleRealDead, onRoleHit,nil,nil,role)
|
||||||
|
|
||||||
|
-- 直接伤害后
|
||||||
|
local onPassiveDamaging = function(func, defRole, damage,skill)
|
||||||
|
if skill and not skill.isTriggerJudge and judge==1 then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
-- if extTime>=time then
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
--观音,这个被动只有额外技能才能触发 by:王振兴 2021/1/21 17:48
|
||||||
|
if skill and skill.isAdd and skill==insertSkill then
|
||||||
|
--如果是boss 并且额外伤害是根据最大生命则返回
|
||||||
|
if (f3==12 or f3==13) and BattleUtil.CheckIsBoss(defRole) then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local val = floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f3])))
|
||||||
|
BattleUtil.FinalDamageCountShield(nil,role,defRole,val)
|
||||||
|
--extTime=extTime+1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role)
|
||||||
|
|
||||||
|
local onRoleRealDead = function(deadRole)
|
||||||
|
if deadRole==role then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if deadTime>=time then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
if deadRole.camp == role.camp and not role:IsDead() then
|
||||||
|
deadTime=deadTime+1
|
||||||
|
BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function () --延时一帧做处理,我方场上所有单位都结算死亡以后,再处理299被动回血
|
||||||
|
deadRole:SetRelive(pro,role)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
end
|
||||||
|
BattleLogic.Event:AddEvent(BattleEventName.RoleRealDead, onRoleRealDead,nil,nil,role)
|
||||||
|
|
||||||
|
local onBattleRoundChange = function(func, caster)
|
||||||
|
extTime=0
|
||||||
|
addTime=0
|
||||||
|
deadTime=0
|
||||||
|
end
|
||||||
|
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, onBattleRoundChange,nil,nil,role)
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
return passivityList
|
return passivityList
|
||||||
|
|
@ -627,7 +627,8 @@ function RoleLogic:InsertExtraSkill(id,type)
|
||||||
isTrigger=false
|
isTrigger=false
|
||||||
end
|
end
|
||||||
--和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴
|
--和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴
|
||||||
SkillManager.InsertSkill(self, effectData, skillType, nil, true, false,isTrigger)
|
local insertSkill=SkillManager.InsertSkill(self, effectData, skillType, nil, true, false,isTrigger)
|
||||||
|
return insertSkill
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@ function RoleProInfoPopup:InitComponent()
|
||||||
-- 公会数据节点
|
-- 公会数据节点
|
||||||
this.guildPre = newObjToParent(this.proPre2, this.thirdlyGrid)
|
this.guildPre = newObjToParent(this.proPre2, this.thirdlyGrid)
|
||||||
this.jumpBtn = Util.GetGameObject(this.guildPre, "jumpBtn")
|
this.jumpBtn = Util.GetGameObject(this.guildPre, "jumpBtn")
|
||||||
|
this.jumpBtn:SetActive(false)
|
||||||
this.guildProName = Util.GetGameObject(this.guildPre, "proName"):GetComponent("Text")
|
this.guildProName = Util.GetGameObject(this.guildPre, "proName"):GetComponent("Text")
|
||||||
this.guildProValue = Util.GetGameObject(this.guildPre, "proVale"):GetComponent("Text")
|
this.guildProValue = Util.GetGameObject(this.guildPre, "proVale"):GetComponent("Text")
|
||||||
|
|
||||||
|
|
@ -129,7 +130,7 @@ function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSk
|
||||||
this.guildProName.text = Language[11061]..GuildSkillType[_configData.Profession]
|
this.guildProName.text = Language[11061]..GuildSkillType[_configData.Profession]
|
||||||
this.guildProValue.text = allLv
|
this.guildProValue.text = allLv
|
||||||
-- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转
|
-- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转
|
||||||
this.jumpBtn:SetActive(_guildSkill == nil)
|
this.jumpBtn:SetActive(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not this.specialPro then
|
if not this.specialPro then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue