Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: bba95498987a2dc4bb032150121232db
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b9c28a22224cab240994f806ef885228
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 89 KiB |
|
@ -32,7 +32,7 @@ TextureImporter:
|
|||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
|
@ -59,6 +59,17 @@ TextureImporter:
|
|||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
|
@ -81,17 +92,6 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
|
@ -101,8 +101,8 @@ TextureImporter:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 385
|
||||
height: 251
|
||||
width: 382
|
||||
height: 249
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
|
@ -110,7 +110,7 @@ TextureImporter:
|
|||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: e34ac5e350e19bf4f830781159bdae70
|
||||
spriteID: f0a972455663f9d4989ff0143bad5e1b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
@ -118,7 +118,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 0c28347b97d04ba42a6881a3e1217bd9
|
||||
spriteID: d120d45f765834640b6bb37530bd098e
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
@ -127,5 +127,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_dhdj_00042_t9
|
||||
assetBundleVariant: unity3d
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 87 KiB |
|
@ -32,7 +32,7 @@ TextureImporter:
|
|||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
|
@ -59,6 +59,17 @@ TextureImporter:
|
|||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
|
@ -81,17 +92,6 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
|
@ -101,8 +101,8 @@ TextureImporter:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 391
|
||||
height: 247
|
||||
width: 386
|
||||
height: 249
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
|
@ -110,7 +110,7 @@ TextureImporter:
|
|||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 1fe93ebd2ff1aa14183fa07b10b791be
|
||||
spriteID: 53ab374c27b38cd4996c064fcfc73578
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
@ -118,7 +118,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 7698e83047f36914694a447cd03f25e4
|
||||
spriteID: 79f8f4d9747bc0b4aa2fc7e26d4a27a5
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
@ -127,5 +127,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_gyps_00020_t9
|
||||
assetBundleVariant: unity3d
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 86 KiB |
|
@ -32,7 +32,7 @@ TextureImporter:
|
|||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
|
@ -59,6 +59,17 @@ TextureImporter:
|
|||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
|
@ -81,17 +92,6 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
|
@ -101,8 +101,8 @@ TextureImporter:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 387
|
||||
height: 239
|
||||
width: 383
|
||||
height: 257
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
|
@ -110,7 +110,7 @@ TextureImporter:
|
|||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: dd018a6a7d0826645972a14a4bb766f2
|
||||
spriteID: 2444bbc99e6272a469a24b4685f60f94
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
@ -118,7 +118,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 61482c46e09579741849b0581df6f6bb
|
||||
spriteID: dc3c7f05c35115e41aa0b3695ec3c33f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
@ -127,5 +127,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_lslz_00046_t9
|
||||
assetBundleVariant: unity3d
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
@ -92,6 +92,17 @@ TextureImporter:
|
|||
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:
|
||||
|
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 78 KiB |
|
@ -32,7 +32,7 @@ TextureImporter:
|
|||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
|
@ -59,6 +59,17 @@ TextureImporter:
|
|||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
|
@ -81,17 +92,6 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
|
@ -101,8 +101,8 @@ TextureImporter:
|
|||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 393
|
||||
height: 252
|
||||
width: 388
|
||||
height: 261
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
|
@ -110,7 +110,7 @@ TextureImporter:
|
|||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 49994b1f9195ac64881e5eb2a9032a75
|
||||
spriteID: e060fcfb4b164ab4fa054910d8a6fccf
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
@ -118,7 +118,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: b6093f22213727a4194f783eb2318783
|
||||
spriteID: b74a40a44c1caf74593794131a1fe96b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
@ -127,5 +127,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/dynamicatlas/skill/c_wsps_00016_t9
|
||||
assetBundleVariant: unity3d
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 191 KiB After Width: | Height: | Size: 171 KiB |
|
@ -1,8 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4a5fe63095df83a4eb46e9b5258d796e
|
||||
guid: 30667e0d428635c4b9fb7cfded61c7e9
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: c_lslz_00046_t3
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
|
@ -41,9 +40,9 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 0
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
|
@ -70,66 +69,13 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 12
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- 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: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: c_lslz_00046_t3
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 178
|
||||
height: 426
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: aa4d876188300354a944c98c1ea2351f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 09075d27689e60a4f957bb102fa82b7c
|
||||
spriteID: 3772bd4b6c73cf049b131ceac1c9e150
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 175 KiB After Width: | Height: | Size: 118 KiB |
|
@ -1752,6 +1752,7 @@ RANK_TYPE = {
|
|||
FORCE_CURR_RANK=22,-- 实时战力排行
|
||||
ARENA_RANK=23,-- 竞技场积分排名 前端自己添加
|
||||
XUANYUANMIRROR_RANK=24,-- 竞技场积分排名 前端自己添加
|
||||
FAST_EXPLORE=25,--极速达人排行
|
||||
}
|
||||
|
||||
--东海寻仙弹窗类型
|
||||
|
@ -2024,6 +2025,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[1
|
|||
[4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,Id = 44,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
[5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,Id = 42,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = false},
|
||||
[6] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12240] ,Id = 8,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = false},
|
||||
[7] = { bgImage = "r_zjm_paihangbang_banner01", name = "极速排名" ,Id = 42,rankType = RANK_TYPE.FAST_EXPLORE,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false},
|
||||
}
|
||||
|
||||
SoulPrintSpriteByQuantity={
|
||||
|
|
|
@ -1980,6 +1980,7 @@ local effectList = {
|
|||
-- 检测技能伤害治疗加成
|
||||
f2 = BattleUtil.CheckSkillDamageHeal(f2, caster, arr[1])
|
||||
-- 治疗血量最低队友实际伤害的f2%
|
||||
--之前是finaldag 改成 damage
|
||||
BattleUtil.ApplyTreat(caster, arr[1], floor(damage*f2))
|
||||
end
|
||||
target.Event:AddEvent(BattleEventName.RoleBeHit, OnBeHit)
|
||||
|
|
|
@ -3030,12 +3030,35 @@ local passivityList = {
|
|||
-- a[float]
|
||||
[161] = function(role, args)
|
||||
local f1 = args[1]
|
||||
|
||||
--之前为根据异常效果的数量改为根据异常效果的类型 by:王振兴
|
||||
local function onPassiveDamaging(damagingFunc, target, damage)
|
||||
local list = BattleLogic.BuffMgr:GetBuff(target, function(buff)
|
||||
return buff.type == BuffName.DOT or buff.type == BuffName.Control
|
||||
end)
|
||||
if list and damagingFunc then
|
||||
local num = #list
|
||||
--local list = BattleLogic.BuffMgr:GetBuff(target, function(buff)
|
||||
--return buff.type == BuffName.DOT or buff.type == BuffName.Control
|
||||
--end)
|
||||
local dotList={}
|
||||
local controlList={}
|
||||
local list=BattleLogic.BuffMgr:GetBuff(target)
|
||||
for i = 1, #list do
|
||||
local buff=list[i]
|
||||
if buff.type== BuffName.DOT and buff.damageType and dotList and not BattleUtil.ChecklistIsContainValue(dotList,buff.damageType) then
|
||||
table.insert(dotList,buff.damageType)
|
||||
end
|
||||
|
||||
if buff.type== BuffName.Control and buff.ctrlType and controlList and not BattleUtil.ChecklistIsContainValue(controlList,buff.ctrlType) then
|
||||
table.insert(controlList,buff.ctrlType)
|
||||
end
|
||||
end
|
||||
local num = 0
|
||||
|
||||
if dotList then
|
||||
num = num + #dotList
|
||||
end
|
||||
if controlList then
|
||||
num=num+ #controlList
|
||||
end
|
||||
LogError("异常效果的数量为:".. num)
|
||||
if num>0 and damagingFunc then
|
||||
local dd = BattleUtil.CountValue(damage, f1 * num, CountTypeName.AddPencent) - damage
|
||||
damagingFunc(-floor(BattleUtil.ErrorCorrection(dd)))
|
||||
end
|
||||
|
|
|
@ -354,7 +354,19 @@ function BattleUtil.CheckIsNoDead(target)
|
|||
return false
|
||||
end
|
||||
|
||||
|
||||
--检测列表是否包含值
|
||||
function BattleUtil.ChecklistIsContainValue(_list,_value)
|
||||
if _list and _value then
|
||||
for key, value in pairs(_list) do
|
||||
if value==_value then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
function BattleUtil.FinalDamage(skill, atkRole, defRole, damage, bCrit, damageType, dotType)
|
||||
if damage < 0 then damage = 0 end
|
||||
|
|
|
@ -44,10 +44,7 @@ function Expert:BindEvent()
|
|||
local activityId = ActivityGiftManager.IsActivityTypeOpen(numExChange[activeIndext])
|
||||
UIManager.OpenPanel(UIName.ExpertRewardSortPanel,activityId,2)
|
||||
end)
|
||||
Util.AddClick(this.sortBtn, function()
|
||||
--UIManager.OpenPanel(UIName.ExpertRewardSortPanel,numExChange[activeIndext],1)
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[5])
|
||||
end)
|
||||
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
@ -88,6 +85,14 @@ function Expert:OnShowData(index)
|
|||
if globalActive and globalActive.OpenRanking == 1 then
|
||||
this.rewardBtn:SetActive(true)
|
||||
this.sortBtn:SetActive(true)
|
||||
Util.AddClick(this.sortBtn, function()
|
||||
if index == 5 then
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[5])
|
||||
elseif index == 10 then
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[7])
|
||||
end
|
||||
|
||||
end)
|
||||
end
|
||||
expertRewardTabs = ActivityGiftManager.GetActivityTypeInfo(numExChange[activeIndext])
|
||||
self.titleBg.sprite = Util.LoadSprite(titleImageSprites[activeIndext])
|
||||
|
|