Commit 0261a1992f12fb481e217fd95d15c1ca584f53a1
Merge branch 'bugfix' into tr/cb
* bugfix: 引导用到的剧情的奖励可以直接领
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
src/actions/RoleAction.lua
| @@ -679,7 +679,7 @@ function _M.storyBookRewardRpc(agent, data) | @@ -679,7 +679,7 @@ function _M.storyBookRewardRpc(agent, data) | ||
| 679 | if status == -1 then return end | 679 | if status == -1 then return end |
| 680 | 680 | ||
| 681 | if not status or status ~= 1 then | 681 | if not status or status ~= 1 then |
| 682 | - if storyBookData.unlockType == 1 and role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) then -- 挂机剧情正在挂机也可以领奖 | 682 | + if storyBookData.unlockType == 1 and (role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) or storyId == 1 or storyId == 2) then -- 挂机剧情正在挂机也可以领奖 |
| 683 | else | 683 | else |
| 684 | return | 684 | return |
| 685 | end | 685 | end |