wasteland / server

Commit 632c507c1f2eb0db3096da8880dece4899ed5503

Authored by zhouhaihai
2 parents 61543623 bc28fe9e

Merge branch 'develop' into qa

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/models/Role.lua
  Show/Hide comments   View file @632c507
@@ -358,6 +358,7 @@ function Role:data() @@ -358,6 +358,7 @@ function Role:data()
358 rmbC = self:getProperty("rmbC"), 358 rmbC = self:getProperty("rmbC"),
359 -- repayHero = self:getProperty("repayHero"), 359 -- repayHero = self:getProperty("repayHero"),
360 newerDraw = self:getProperty("newerDraw"), 360 newerDraw = self:getProperty("newerDraw"),
  361 + floorHero = self:getProperty("floorHero"),
361 362
362 sudoku = self:getProperty("sudoku"), 363 sudoku = self:getProperty("sudoku"),
363 sign = self:getProperty("sign"), 364 sign = self:getProperty("sign"),
src/models/RoleTask.lua
  Show/Hide comments   View file @632c507
@@ -147,7 +147,7 @@ local AchievListener = { @@ -147,7 +147,7 @@ local AchievListener = {
147 [TaskType.HangPass] = {{1, f("id")}}, 147 [TaskType.HangPass] = {{1, f("id")}},
148 [TaskType.UnionBattle] = {{2}}, 148 [TaskType.UnionBattle] = {{2}},
149 [TaskType.PvpWin] = {{3}, {4, f("score")}}, 149 [TaskType.PvpWin] = {{3}, {4, f("score")}},
150 - [TaskType.AdvAllPass] = {{5, f("id")}}, 150 + [TaskType.AdvAllPass] = {{5, 1, f("id")}},
151 [TaskType.AdvLevel] = {{6, f("level")}}, 151 [TaskType.AdvLevel] = {{6, f("level")}},
152 [TaskType.AdvScore] = {{7, f("score")}}, 152 [TaskType.AdvScore] = {{7, f("score")}},
153 [TaskType.AdvBattleWin] = {{8}}, 153 [TaskType.AdvBattleWin] = {{8}},