wasteland / server

Commit 6a18cfa7fa49f9d943a7aaeda3cb0186c9a18386

Authored by liuzujun
2 parents 34d9f192 56d52cf4

Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/models/RoleTask.lua
  Show/Hide comments   View file @6a18cfa
@@ -148,7 +148,7 @@ local CommonListener = { @@ -148,7 +148,7 @@ local CommonListener = {
148 [TaskType.AdvStartSelf] = {{24}}, 148 [TaskType.AdvStartSelf] = {{24}},
149 [TaskType.ShopAll] = {{25, f("count")}}, 149 [TaskType.ShopAll] = {{25, f("count")}},
150 [TaskType.RuneUp] = {{26}}, 150 [TaskType.RuneUp] = {{26}},
151 - [TaskType.OpenBox] = {{27, 1, f("id")}}, 151 + [TaskType.OpenBox] = {{27, f("count"), f("id")}},
152 [TaskType.AdvDraw] = {{28, f("count"), f("ptype")}}, 152 [TaskType.AdvDraw] = {{28, f("count"), f("ptype")}},
153 [TaskType.PotionMake] = {{29, f("count"), f("id")}}, 153 [TaskType.PotionMake] = {{29, f("count"), f("id")}},
154 } 154 }
@@ -174,7 +174,7 @@ local AchievListener = { @@ -174,7 +174,7 @@ local AchievListener = {
174 [TaskType.FoodSellGold] = {{15, f("count")}}, 174 [TaskType.FoodSellGold] = {{15, f("count")}},
175 [TaskType.DinerPopular] = {{16, f("count")}}, 175 [TaskType.DinerPopular] = {{16, f("count")}},
176 [TaskType.TowerPass] = {{17, f("level")}}, 176 [TaskType.TowerPass] = {{17, f("level")}},
177 - [TaskType.OpenBox] = {{18}}, 177 + [TaskType.OpenBox] = {{18, f("count")}},
178 [TaskType.DinerLevelUp] = {{19, f("level"), f("type")}}, 178 [TaskType.DinerLevelUp] = {{19, f("level"), f("type")}},
179 [TaskType.DinerTalentUp] = {{20, 1, f("type")}}, 179 [TaskType.DinerTalentUp] = {{20, 1, f("type")}},
180 [TaskType.HangGetGold] = {{21, f("count")}}, 180 [TaskType.HangGetGold] = {{21, f("count")}},
@@ -211,7 +211,7 @@ local SudokuListener = { @@ -211,7 +211,7 @@ local SudokuListener = {
211 [TaskType.AdvDraw] = {{10, f("count")}}, 211 [TaskType.AdvDraw] = {{10, f("count")}},
212 [TaskType.DinerLevelUp] = {{11, f("level"), f("type")}}, 212 [TaskType.DinerLevelUp] = {{11, f("level"), f("type")}},
213 [TaskType.FoodSell] = {{12, f("count")}}, 213 [TaskType.FoodSell] = {{12, f("count")}},
214 - [TaskType.OpenBox] = {{13, 1}}, 214 + [TaskType.OpenBox] = {{13, f("count")}},
215 [TaskType.TowerPass] = {{14, f("level")}}, 215 [TaskType.TowerPass] = {{14, f("level")}},
216 [TaskType.PvpWin] = {{15, 1}}, 216 [TaskType.PvpWin] = {{15, 1}},
217 [TaskType.DinerTalentUp] = {{16, f("level"), f("type")}}, 217 [TaskType.DinerTalentUp] = {{16, f("level"), f("type")}},