diff --git a/src/actions/HangAction.lua b/src/actions/HangAction.lua index 2b56e2b..6e210a7 100644 --- a/src/actions/HangAction.lua +++ b/src/actions/HangAction.lua @@ -162,16 +162,6 @@ function _M.startRpc( agent, data ) role:updateProperty({field = "hangInfo", value = hangInfo}) - -- 指定当前引导的步骤 - if carbonId == 10101 then - role:saveGuide(5,11) - elseif carbonId == 10102 then - role:saveGuide(8,2) - elseif carbonId == 10103 then - role:saveGuide(9,2) - elseif carbonId == 10220 then - role:saveGuide(22,1) - end role:mylog("hang_action", {desc = "startHang", int1 = carbonId}) SendPacket(actionCodes.Hang_startRpc, '') return true @@ -262,12 +252,7 @@ function _M.endBattleRpc(agent, data) -- 引导 if carbonId == 10101 then - role:finishGuide(5) - elseif carbonId == 10102 then - role:finishGuide(8) - role:saveGuide(9, 2) - elseif carbonId == 10103 then - role:finishGuide(9) + role:finishGuide(6) elseif carbonId == 20101 then role:finishGuide(22) end @@ -341,7 +326,7 @@ function _M.roleFormatRpc(agent , data) hangTeam.leader = msg.leader hangTeam.supports = supports role:saveHangTeam(hangTeam) - role:saveGuide(5,8) + role:finishGuide(5) SendPacket(actionCodes.Hang_roleFormatRpc, '') return true end diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua index b5418ca..04c05e2 100644 --- a/src/actions/HeroAction.lua +++ b/src/actions/HeroAction.lua @@ -54,9 +54,6 @@ function _M.levelUpRpc( agent, data ) hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分 }) - if hero:getProperty("type") == 103 then - role:finishGuide(7) - end hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")}) role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")}) @@ -129,6 +126,10 @@ function _M.wakeRpc(agent, data) hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..} }) + if hero:getProperty("type") == 204 then + role:finishGuide(7) + end + SendPacket(actionCodes.Hero_wakeRpc, '') role:checkTaskEnter("HeroStarCollect", {}) @@ -847,8 +848,8 @@ function _M.drawHeroRpc(agent, data) role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}}) local guideHero - if role:getProperty("newerGuide") == "11=1" then - guideHero = globalCsv.newdraw_hero_item_id or 613 + if role:getProperty("newerGuide") == "8=1" then + guideHero = globalCsv.newdraw_hero_item_id or 503 end local ssrCount = 0 @@ -903,7 +904,7 @@ function _M.drawHeroRpc(agent, data) if ssrCount > 0 then role:checkTaskEnter("DrawSSR", {count = ssrCount}) end - role:finishGuide(11) + role:finishGuide(8) role:log("gacha", { gacha_id = poolId, -- 卡池ID -- libgit2 0.21.2