Commit e6439157d0efd51dbdd76c5744ffa0e14a0186fc
1 parent
acfc2f02
故事事件
Showing
2 changed files
with
7 additions
and
0 deletions
Show diff stats
src/GlobalVar.lua
| @@ -148,6 +148,7 @@ AdvBackEventType = { | @@ -148,6 +148,7 @@ AdvBackEventType = { | ||
| 148 | Task = 23, --接收任务 | 148 | Task = 23, --接收任务 |
| 149 | Artifact = 24, --获得神器 | 149 | Artifact = 24, --获得神器 |
| 150 | Level = 25, -- 升级 | 150 | Level = 25, -- 升级 |
| 151 | + LinkChooseOver = 26, -- 连锁事件结束 | ||
| 151 | } | 152 | } |
| 152 | 153 | ||
| 153 | AdvScoreType = { | 154 | AdvScoreType = { |
src/adv/Adv.lua
| @@ -709,8 +709,14 @@ local function clickLinkChoose(self, room, block, params) | @@ -709,8 +709,14 @@ local function clickLinkChoose(self, room, block, params) | ||
| 709 | self.lchoose[startId] = (self.lchoose[startId] or 0) + 1 | 709 | self.lchoose[startId] = (self.lchoose[startId] or 0) + 1 |
| 710 | self:checkAchievement(Adv.AchievType.LinkChoose, 1, startId) | 710 | self:checkAchievement(Adv.AchievType.LinkChoose, 1, startId) |
| 711 | self:checkAdvUnlock(4, startId) | 711 | self:checkAdvUnlock(4, startId) |
| 712 | + self.lchoose.cur = self.lchoose.cur or {} | ||
| 713 | + table.insert(self.lchoose.cur, {block.event.id, choose}) | ||
| 714 | + self:pushBackEvent(AdvBackEventType.LinkChooseOver, self.lchoose.cur) | ||
| 715 | + self.lchoose.cur = nil | ||
| 712 | else | 716 | else |
| 713 | self.lchoose.ing = block.event.id + 1 --后面会出现后继事件 | 717 | self.lchoose.ing = block.event.id + 1 --后面会出现后继事件 |
| 718 | + self.lchoose.cur = self.lchoose.cur or {} | ||
| 719 | + table.insert(self.lchoose.cur, {block.event.id, choose}) | ||
| 714 | end | 720 | end |
| 715 | 721 | ||
| 716 | if clearBlock then | 722 | if clearBlock then |