Merge branch 'develop' into qa

zhouhaihai
2 parents 61543623 bc28fe9e
Showing 2 changed files with 2 additions and 1 deletions Show diff stats
src/models/Role.lua
src/models/RoleTask.lua
@@ -358,6 +358,7 @@ function Role:data()
 		rmbC = self:getProperty("rmbC"),
 		-- repayHero = self:getProperty("repayHero"),
 		newerDraw = self:getProperty("newerDraw"),
+		floorHero = self:getProperty("floorHero"),
  
 		sudoku = self:getProperty("sudoku"),
 		sign = self:getProperty("sign"),
@@ -147,7 +147,7 @@ local AchievListener = {
 		[TaskType.HangPass] = {{1, f("id")}},
 		[TaskType.UnionBattle] = {{2}},
 		[TaskType.PvpWin] = {{3}, {4, f("score")}},
-		[TaskType.AdvAllPass] = {{5, f("id")}},
+		[TaskType.AdvAllPass] = {{5, 1, f("id")}},
 		[TaskType.AdvLevel] = {{6, f("level")}},
 		[TaskType.AdvScore] = {{7, f("score")}},
 		[TaskType.AdvBattleWin] = {{8}},