wasteland / server

Commit a5b98c306f88644197e68c098ce5f1334ae2d690

Authored by chenyueqi
1 parent 7cde0c44

引导调整

Showing 2 changed files with 9 additions and 23 deletions   Show diff stats
Inline Side-by-side
src/actions/HangAction.lua
  Show/Hide comments   View file @a5b98c3
@@ -162,16 +162,6 @@ function _M.startRpc( agent, data ) @@ -162,16 +162,6 @@ function _M.startRpc( agent, data )
162 162
163 role:updateProperty({field = "hangInfo", value = hangInfo}) 163 role:updateProperty({field = "hangInfo", value = hangInfo})
164 164
165 - -- 指定当前引导的步骤  
166 - if carbonId == 10101 then  
167 - role:saveGuide(5,11)  
168 - elseif carbonId == 10102 then  
169 - role:saveGuide(8,2)  
170 - elseif carbonId == 10103 then  
171 - role:saveGuide(9,2)  
172 - elseif carbonId == 10220 then  
173 - role:saveGuide(22,1)  
174 - end  
175 role:mylog("hang_action", {desc = "startHang", int1 = carbonId}) 165 role:mylog("hang_action", {desc = "startHang", int1 = carbonId})
176 SendPacket(actionCodes.Hang_startRpc, '') 166 SendPacket(actionCodes.Hang_startRpc, '')
177 return true 167 return true
@@ -262,12 +252,7 @@ function _M.endBattleRpc(agent, data) @@ -262,12 +252,7 @@ function _M.endBattleRpc(agent, data)
262 252
263 -- 引导 253 -- 引导
264 if carbonId == 10101 then 254 if carbonId == 10101 then
265 - role:finishGuide(5)  
266 - elseif carbonId == 10102 then  
267 - role:finishGuide(8)  
268 - role:saveGuide(9, 2)  
269 - elseif carbonId == 10103 then  
270 - role:finishGuide(9) 255 + role:finishGuide(6)
271 elseif carbonId == 20101 then 256 elseif carbonId == 20101 then
272 role:finishGuide(22) 257 role:finishGuide(22)
273 end 258 end
@@ -341,7 +326,7 @@ function _M.roleFormatRpc(agent , data) @@ -341,7 +326,7 @@ function _M.roleFormatRpc(agent , data)
341 hangTeam.leader = msg.leader 326 hangTeam.leader = msg.leader
342 hangTeam.supports = supports 327 hangTeam.supports = supports
343 role:saveHangTeam(hangTeam) 328 role:saveHangTeam(hangTeam)
344 - role:saveGuide(5,8) 329 + role:finishGuide(5)
345 SendPacket(actionCodes.Hang_roleFormatRpc, '') 330 SendPacket(actionCodes.Hang_roleFormatRpc, '')
346 return true 331 return true
347 end 332 end
src/actions/HeroAction.lua
  Show/Hide comments   View file @a5b98c3
@@ -54,9 +54,6 @@ function _M.levelUpRpc( agent, data ) @@ -54,9 +54,6 @@ function _M.levelUpRpc( agent, data )
54 hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分 54 hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分
55 }) 55 })
56 56
57 - if hero:getProperty("type") == 103 then  
58 - role:finishGuide(7)  
59 - end  
60 hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")}) 57 hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")})
61 58
62 role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")}) 59 role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
@@ -129,6 +126,10 @@ function _M.wakeRpc(agent, data) @@ -129,6 +126,10 @@ function _M.wakeRpc(agent, data)
129 hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..} 126 hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
130 }) 127 })
131 128
  129 + if hero:getProperty("type") == 204 then
  130 + role:finishGuide(7)
  131 + end
  132 +
132 SendPacket(actionCodes.Hero_wakeRpc, '') 133 SendPacket(actionCodes.Hero_wakeRpc, '')
133 134
134 role:checkTaskEnter("HeroStarCollect", {}) 135 role:checkTaskEnter("HeroStarCollect", {})
@@ -847,8 +848,8 @@ function _M.drawHeroRpc(agent, data) @@ -847,8 +848,8 @@ function _M.drawHeroRpc(agent, data)
847 role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}}) 848 role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
848 849
849 local guideHero 850 local guideHero
850 - if role:getProperty("newerGuide") == "11=1" then  
851 - guideHero = globalCsv.newdraw_hero_item_id or 613 851 + if role:getProperty("newerGuide") == "8=1" then
  852 + guideHero = globalCsv.newdraw_hero_item_id or 503
852 end 853 end
853 854
854 local ssrCount = 0 855 local ssrCount = 0
@@ -903,7 +904,7 @@ function _M.drawHeroRpc(agent, data) @@ -903,7 +904,7 @@ function _M.drawHeroRpc(agent, data)
903 if ssrCount > 0 then 904 if ssrCount > 0 then
904 role:checkTaskEnter("DrawSSR", {count = ssrCount}) 905 role:checkTaskEnter("DrawSSR", {count = ssrCount})
905 end 906 end
906 - role:finishGuide(11) 907 + role:finishGuide(8)
907 908
908 role:log("gacha", { 909 role:log("gacha", {
909 gacha_id = poolId, -- 卡池ID 910 gacha_id = poolId, -- 卡池ID