wasteland / server

Commit 1988e15ade745ec730e33bc67b2419f5445b27bf

Authored by zhouhaihai
2 parents 550989a7 bcbb0c7b

Merge branch 'bugfix' into develop 

* bugfix:
  3星解锁 cg
Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/actions/HeroAction.lua
  Show/Hide comments   View file @1988e15
... ... @@ -116,7 +116,7 @@ function _M.wakeRpc(agent, data)
116 116  
117 117 local curLevel = hero:getProperty("wakeL")
118 118 role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
119   - if curLevel == 4 then -- 解锁cg
  119 + if curLevel == 3 then -- 解锁cg
120 120 role:checkTaskEnter("WakeCG", {heroType = typ})
121 121 end
122 122 hero:mylog({desc = "wake", int1 = hero:getProperty("wakeL")})
... ...
src/models/RolePlugin.lua
  Show/Hide comments   View file @1988e15
... ... @@ -444,7 +444,9 @@ function RolePlugin.bind(Role)
444 444 type= heroType,
445 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 450 local newHero = require("models.Hero").new(heroInfo)
449 451 newHero:create()
450 452 newHero.owner = self
... ...