Commit b6c4416d91eee615f1a084ec43a3b14efed044af

Authored by zhouhaihai
2 parents 5bf34f27 3f50410e

Merge branch 'develop' into qa

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
src/actions/CarAction.lua
@@ -114,8 +114,8 @@ function _M.runeUpRpc( agent, data ) @@ -114,8 +114,8 @@ function _M.runeUpRpc( agent, data )
114 local runeData = runeSet[id] 114 local runeData = runeSet[id]
115 if not runeData then return 5 end 115 if not runeData then return 5 end
116 116
117 - local maxLv = table.nums(csvdb["rune_buildCsv"])-1  
118 - if level > maxLv then return 6 end 117 + local maxLv = #csvdb["rune_buildCsv"]
  118 + if level >= maxLv then return 6 end
119 local lvData = csvdb["rune_buildCsv"][level] 119 local lvData = csvdb["rune_buildCsv"][level]
120 local cost = lvData.cost:toNumMap() 120 local cost = lvData.cost:toNumMap()
121 if not role:checkItemEnough(cost) then 121 if not role:checkItemEnough(cost) then
src/models/RoleTask.lua
@@ -343,6 +343,7 @@ function RoleTask.bind(Role) @@ -343,6 +343,7 @@ function RoleTask.bind(Role)
343 [22] = true, 343 [22] = true,
344 [23] = true, 344 [23] = true,
345 [25] = true, 345 [25] = true,
  346 + [37] = true,
346 } 347 }
347 348
348 for tId , achiveData in pairs(csvdb["achievement_typeCsv"]) do 349 for tId , achiveData in pairs(csvdb["achievement_typeCsv"]) do