Commit 6ce6fac7002f15a6eb44cd681e06a0c19f22995c
1 parent
6d2df562
冒险任务bug
Showing
1 changed file
with
9 additions
and
7 deletions
Show diff stats
src/adv/Adv.lua
| @@ -1076,12 +1076,13 @@ end | @@ -1076,12 +1076,13 @@ end | ||
| 1076 | local function clickChoose(self, room, block, params) | 1076 | local function clickChoose(self, room, block, params) |
| 1077 | local choose = params.choose | 1077 | local choose = params.choose |
| 1078 | local chooseData = csvdb["event_chooseCsv"][block.event.id] | 1078 | local chooseData = csvdb["event_chooseCsv"][block.event.id] |
| 1079 | + local oldId = block.event.id | ||
| 1079 | local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "choose") | 1080 | local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "choose") |
| 1080 | if not status then return end | 1081 | if not status then return end |
| 1081 | - self:checkAdvUnlock(3, block.event.id) | ||
| 1082 | - self:checkTask(Adv.TaskType.Choose, 1, block.event.id) | ||
| 1083 | - self:checkAchievement(Adv.AchievType.Choose, 1, block.event.id) | ||
| 1084 | - self:checkAchievement(Adv.AchievType.ChooseBySelect, 1, block.event.id, choose) | 1082 | + self:checkAdvUnlock(3, oldId) |
| 1083 | + self:checkTask(Adv.TaskType.Choose, 1, oldId) | ||
| 1084 | + self:checkAchievement(Adv.AchievType.Choose, 1, oldId) | ||
| 1085 | + self:checkAchievement(Adv.AchievType.ChooseBySelect, 1, oldId, choose) | ||
| 1085 | if clearBlock then | 1086 | if clearBlock then |
| 1086 | block:clear() | 1087 | block:clear() |
| 1087 | end | 1088 | end |
| @@ -1178,12 +1179,13 @@ end | @@ -1178,12 +1179,13 @@ end | ||
| 1178 | local function clickBuild(self, room, block, params) | 1179 | local function clickBuild(self, room, block, params) |
| 1179 | local choose = params.choose | 1180 | local choose = params.choose |
| 1180 | local chooseData = csvdb["event_buildingCsv"][block.event.id] | 1181 | local chooseData = csvdb["event_buildingCsv"][block.event.id] |
| 1182 | + local oldId = block.event.id | ||
| 1181 | local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "build") | 1183 | local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "build") |
| 1182 | if not status then return end | 1184 | if not status then return end |
| 1183 | 1185 | ||
| 1184 | - self:checkTask(Adv.TaskType.Build, 1, block.event.id) | ||
| 1185 | - self:checkAchievement(Adv.AchievType.Build, 1, block.event.id) | ||
| 1186 | - self:checkAchievement(Adv.AchievType.BuildBySelect, 1, block.event.id, choose) | 1186 | + self:checkTask(Adv.TaskType.Build, 1, oldId) |
| 1187 | + self:checkAchievement(Adv.AchievType.Build, 1, oldId) | ||
| 1188 | + self:checkAchievement(Adv.AchievType.BuildBySelect, 1, oldId, choose) | ||
| 1187 | 1189 | ||
| 1188 | if clearBlock then | 1190 | if clearBlock then |
| 1189 | block:clear() | 1191 | block:clear() |