wasteland / server

Commit 75b439b1ff7bdd3b1abb4b1fd546e2de8973c782

Authored by zhouhaihai
2 parents cd789e7c b3593354

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

* 'develop' of 120.26.43.151:wasteland/server:
  日历任务 拾荒开始任务
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
Inline Side-by-side
1 -Subproject commit 8bea1965307b5fc426e20a42736f06dfcdfd08ae 1 +Subproject commit 4a72b95ffb82eab671c6414aefa23b2e4718646c
src/models/RoleTask.lua
  Show/Hide comments   View file @75b439b
@@ -245,7 +245,7 @@ local CalendaTaskListener = { @@ -245,7 +245,7 @@ local CalendaTaskListener = {
245 listen = { 245 listen = {
246 [TaskType.DrawHero] = {{1, 1, f("count")}}, 246 [TaskType.DrawHero] = {{1, 1, f("count")}},
247 [TaskType.BonusPass]= {{2, 1}}, 247 [TaskType.BonusPass]= {{2, 1}},
248 - [TaskType.AdvPass]= {{3, 1}}, 248 + [TaskType.AdvStart]= {{3, 1}},
249 [TaskType.DinerLevelUp]= {{4, 2, f("level")}}, 249 [TaskType.DinerLevelUp]= {{4, 2, f("level")}},
250 [TaskType.HeroLvlCollect]= {{5, 3}}, -- x名y级英雄 250 [TaskType.HeroLvlCollect]= {{5, 3}}, -- x名y级英雄
251 [TaskType.AdvHang]= {{6, 1}}, ---- 251 [TaskType.AdvHang]= {{6, 1}}, ----