Commit eddff937978484fbabfd1d6d570452908f1ba2bd
Merge branch 'bugfix' into tr/cb
* bugfix: 3星解锁 cg 增加神器标签
Showing
2 changed files
with
4 additions
and
2 deletions
Show diff stats
src/actions/HeroAction.lua
| @@ -114,7 +114,7 @@ function _M.wakeRpc(agent, data) | @@ -114,7 +114,7 @@ function _M.wakeRpc(agent, data) | ||
| 114 | 114 | ||
| 115 | local curLevel = hero:getProperty("wakeL") | 115 | local curLevel = hero:getProperty("wakeL") |
| 116 | role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel}) | 116 | role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel}) |
| 117 | - if curLevel == 4 then -- 解锁cg | 117 | + if curLevel == 3 then -- 解锁cg |
| 118 | role:checkTaskEnter("WakeCG", {heroType = typ}) | 118 | role:checkTaskEnter("WakeCG", {heroType = typ}) |
| 119 | end | 119 | end |
| 120 | hero:mylog({desc = "wake", int1 = hero:getProperty("wakeL")}) | 120 | hero:mylog({desc = "wake", int1 = hero:getProperty("wakeL")}) |
src/models/RolePlugin.lua
| @@ -444,7 +444,9 @@ function RolePlugin.bind(Role) | @@ -444,7 +444,9 @@ function RolePlugin.bind(Role) | ||
| 444 | type= heroType, | 444 | type= heroType, |
| 445 | wakeL = globalCsv.unit_wake_initLevel[unitData.rare], | 445 | wakeL = globalCsv.unit_wake_initLevel[unitData.rare], |
| 446 | } | 446 | } |
| 447 | - | 447 | + if heroInfo.wakeL == 3 then |
| 448 | + self:checkTaskEnter("WakeCG", {heroType = typ}) | ||
| 449 | + end | ||
| 448 | local newHero = require("models.Hero").new(heroInfo) | 450 | local newHero = require("models.Hero").new(heroInfo) |
| 449 | newHero:create() | 451 | newHero:create() |
| 450 | newHero.owner = self | 452 | newHero.owner = self |