diff --git a/.gitignore b/.gitignore index 69ee986ebb..bd1a8711f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .svn/ Assets/StreamingAssets/Android/ +Library/ +Temp/ diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index f4df76673a..e38f9100cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -3183,8 +3183,8 @@ local passivityList = { local f1 = args[1] local dt = args[2] -- 直接伤害后 - local onRoleHit = function(target) - if target:IsDead() then + local onRoleHit = function(target, damage, bCrit, finalDmg, damageType, skill) + if skill and not skill.isAdd and target:IsDead() then local list = RoleManager.Query(function(v) return v.camp ~= role.camp end) BattleUtil.SortByHpFactor(list, 1) local index = 0 diff --git a/Assets/Plugins/iOS/libtolua.a b/Assets/Plugins/iOS/libtolua.a new file mode 100644 index 0000000000..0262055a38 Binary files /dev/null and b/Assets/Plugins/iOS/libtolua.a differ diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 0000000000..4dd2639e55 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,43 @@ + +=== Sat May 9 13:32:26 2020 + +Packages were changed. +Update Mode: resetToDefaultDependencies + +The following packages were added: + com.unity.analytics@3.2.2 + com.unity.purchasing@2.0.3 + com.unity.ads@2.0.8 + com.unity.textmeshpro@1.3.0 + com.unity.package-manager-ui@2.0.3 + com.unity.collab-proxy@1.2.15 + com.unity.modules.ai@1.0.0 + com.unity.modules.animation@1.0.0 + com.unity.modules.assetbundle@1.0.0 + com.unity.modules.audio@1.0.0 + com.unity.modules.cloth@1.0.0 + com.unity.modules.director@1.0.0 + com.unity.modules.imageconversion@1.0.0 + com.unity.modules.imgui@1.0.0 + com.unity.modules.jsonserialize@1.0.0 + com.unity.modules.particlesystem@1.0.0 + com.unity.modules.physics@1.0.0 + com.unity.modules.physics2d@1.0.0 + com.unity.modules.screencapture@1.0.0 + com.unity.modules.terrain@1.0.0 + com.unity.modules.terrainphysics@1.0.0 + com.unity.modules.tilemap@1.0.0 + com.unity.modules.ui@1.0.0 + com.unity.modules.uielements@1.0.0 + com.unity.modules.umbra@1.0.0 + com.unity.modules.unityanalytics@1.0.0 + com.unity.modules.unitywebrequest@1.0.0 + com.unity.modules.unitywebrequestassetbundle@1.0.0 + com.unity.modules.unitywebrequestaudio@1.0.0 + com.unity.modules.unitywebrequesttexture@1.0.0 + com.unity.modules.unitywebrequestwww@1.0.0 + com.unity.modules.vehicles@1.0.0 + com.unity.modules.video@1.0.0 + com.unity.modules.vr@1.0.0 + com.unity.modules.wind@1.0.0 + com.unity.modules.xr@1.0.0 diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000000..bd0c3485ac --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,40 @@ +{ + "dependencies": { + "com.unity.ads": "2.0.8", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.3", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.3.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/data_execl/base_data/GuildSacrificeConfig.xlsx b/data_execl/base_data/GuildSacrificeConfig.xlsx index 84dfdf9c7c..5d9c3f66f3 100644 Binary files a/data_execl/base_data/GuildSacrificeConfig.xlsx and b/data_execl/base_data/GuildSacrificeConfig.xlsx differ diff --git a/data_execl/base_data/GuildSacrificeRewardConfig.xlsx b/data_execl/base_data/GuildSacrificeRewardConfig.xlsx index 074aa0bc9a..d1c7f054de 100644 Binary files a/data_execl/base_data/GuildSacrificeRewardConfig.xlsx and b/data_execl/base_data/GuildSacrificeRewardConfig.xlsx differ diff --git a/data_execl/base_data/PassiveSkillLogicConfig.xlsx b/data_execl/base_data/PassiveSkillLogicConfig.xlsx index 66d0dd7919..05a59532b4 100644 Binary files a/data_execl/base_data/PassiveSkillLogicConfig.xlsx and b/data_execl/base_data/PassiveSkillLogicConfig.xlsx differ