Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

2023-05-19 20:14:40 +08:00 · 2023-05-19 20:14:40 +08:00 · adca98cb90
commit adca98cb90
parent 55c6ba1263 1fcf0137e3
2 changed files with 2 additions and 2 deletions
--- a/lua/app/module/battle/controller/battle_controller.lua
+++ b/lua/app/module/battle/controller/battle_controller.lua
@ -1959,8 +1959,8 @@ function BattleController:getShuffleBoardInfo()
                else
                    if entity:getSkillId() then
                        haveSkill = true
-                        add = entity:canLink()
                    end
+                    add = entity:canLink()
                end
                if add then
                    table.insert(tempList, entity)
--- a/lua/app/userdata/hero/hero_entity.lua
+++ b/lua/app/userdata/hero/hero_entity.lua
@ -262,7 +262,7 @@ function HeroEntity:getActiveTogueSkills()
 		if id then
 			table.insert(list, id)
 		else
-			return
+			break
 		end
 	end