Commit 551a935ba50e0250864c8b367c7b81cc0d4f0f95
Merge branch 'develop' into tr/publish
Showing
5 changed files
with
5 additions
and
4 deletions
Show diff stats
config/develop.lua
src/actions/HeroAction.lua
| @@ -738,7 +738,7 @@ function _M.drawHeroRpc(agent, data) | @@ -738,7 +738,7 @@ function _M.drawHeroRpc(agent, data) | ||
| 738 | 738 | ||
| 739 | if btype == 1 then | 739 | if btype == 1 then |
| 740 | -- 判断定向卡池活动开启 | 740 | -- 判断定向卡池活动开启 |
| 741 | - if not role.activity:isOpen("RaceDraw") then | 741 | + if not role.activity:isOpen("SsrUpPoolChange") then |
| 742 | return | 742 | return |
| 743 | end | 743 | end |
| 744 | end | 744 | end |
src/adv/AdvBattle.lua
| @@ -76,6 +76,7 @@ function Battle:initPlayer() | @@ -76,6 +76,7 @@ function Battle:initPlayer() | ||
| 76 | end | 76 | end |
| 77 | player.exp = 0 | 77 | player.exp = 0 |
| 78 | player.sp = getAdvLvAttrUp(advAddAttrs, "sp", 100) | 78 | player.sp = getAdvLvAttrUp(advAddAttrs, "sp", 100) |
| 79 | + player.spMax = player.sp | ||
| 79 | player.growth = {} | 80 | player.growth = {} |
| 80 | player.passives = {} | 81 | player.passives = {} |
| 81 | 82 |
src/models/Activity.lua
| @@ -18,7 +18,7 @@ Activity.ActivityType = { | @@ -18,7 +18,7 @@ Activity.ActivityType = { | ||
| 18 | DrawHero = 12, --抽卡周 招募 | 18 | DrawHero = 12, --抽卡周 招募 |
| 19 | AdvDraw = 13, --拾荒抽周 资助 | 19 | AdvDraw = 13, --拾荒抽周 资助 |
| 20 | OpenBox = 14, --拆解周 时钟箱 | 20 | OpenBox = 14, --拆解周 时钟箱 |
| 21 | - RaceDraw = 15, -- 定向招募活动 | 21 | + --RaceDraw = 15, -- 定向招募活动 |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | 24 |