Merge branch 'develop' into dev_slots
This commit is contained in:
commit
64c5617bd8
|
@ -3251,7 +3251,7 @@ func CSUpdateAttribute(s *netlib.Session, packetId int, data interface{}, sid in
|
|||
send()
|
||||
return nil
|
||||
}
|
||||
if msg.GuideId == 1 {
|
||||
if msg.GuideId == common.GuideIdNewPlayer {
|
||||
if p.GuideStep >= 0 && p.GuideStep < model.GameParamData.GuideStepMaxNum {
|
||||
p.GuideStep = -1 // 跳过引导为 -1
|
||||
pack.OpRetCode = player_proto.OpResultCode_OPRC_Sucess
|
||||
|
@ -3269,6 +3269,7 @@ func CSUpdateAttribute(s *netlib.Session, packetId int, data interface{}, sid in
|
|||
return nil
|
||||
}
|
||||
p.GuideStep = int32(msg.GetParam()[0])
|
||||
p.GuideData[msg.GetGuideId()] = int32(msg.GetParam()[0])
|
||||
pack.OpRetCode = player_proto.OpResultCode_OPRC_Sucess
|
||||
send()
|
||||
return nil
|
||||
|
|
Loading…
Reference in New Issue