diff --git a/Assets/ManagedResources/EffectResSkill/Effect_skill_nvErGuoWang/Textures/Fx_tex_os4_ani_017_ne.png b/Assets/ManagedResources/EffectResSkill/Effect_skill_nvErGuoWang/Textures/Fx_tex_os4_ani_017_ne.png new file mode 100644 index 0000000000..09cc5a6e49 Binary files /dev/null and b/Assets/ManagedResources/EffectResSkill/Effect_skill_nvErGuoWang/Textures/Fx_tex_os4_ani_017_ne.png differ diff --git a/Assets/ManagedResources/EffectResSkill/Effect_skill_nvErGuoWang/Textures/Fx_tex_os4_ani_017_ne.png.meta b/Assets/ManagedResources/EffectResSkill/Effect_skill_nvErGuoWang/Textures/Fx_tex_os4_ani_017_ne.png.meta new file mode 100644 index 0000000000..4954b8bab6 --- /dev/null +++ b/Assets/ManagedResources/EffectResSkill/Effect_skill_nvErGuoWang/Textures/Fx_tex_os4_ani_017_ne.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6eb59e87ce266ff42a8414b3227768a7 +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: -1 + 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: 0 + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + 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: 63b9f24836ee6bb4c9c41e8d75edc369 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 3a25a9c519..cae27c0d13 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1717,6 +1717,9 @@ local passivityList = { if skill.type == BattleSkillType.Special then role.Event:RemoveEvent(BattleEventName.RoleHit, OnHit) local arr = RoleManager.NoOrder(function (r) return r.camp == role.camp and r.deadFilter end) + if arr==nil or #arr==0 then + return + end BattleUtil.SortByHpFactor(arr, 1) -- 检测技能伤害���疗加成 local f = BattleUtil.CheckSkillDamageHeal(f1, role, arr[1]) @@ -3969,6 +3972,9 @@ local passivityList = { local list = RoleManager.Query(function(v) return v.camp == role.camp and v.position ~= role.position end) + if list==nil or #list==0 then + return + end local ff = 1 -- 分摊比 -- 检测被动对分摊比的影响 local cl = {} @@ -4572,6 +4578,9 @@ local passivityList = { if curRound == round then local list = RoleManager.Query(function(r) return r.camp == role.camp end) list = BattleUtil.SortByProp(list, RoleDataName.Hp, 1) + if list[1]==nil then + return + end local base = list[1]:GetRoleData(BattlePropList[pro]) local value = floor(BattleUtil.ErrorCorrection(base* f1)) BattleUtil.ApplyTreat(list[1], list[1], value) @@ -9143,6 +9152,9 @@ local passivityList = { return end list = BattleUtil.SortByProp(list, BattlePropList[pro],sort) + if list==nil or #list==0 then + return + end BattleUtil.CalRage(role,list[1],addNum,ct) end role.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCast,nil,nil,role)