liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-12-30 11:18:18 +08:00
commit c48d442cc1
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/arena/api_challenge.go
View File

@ -125,6 +125,8 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge
} }
return return
} }
bule.Integral = red.Integral
bule.Dan = red.Dan
} }
redplay := &pb.ArenaPlayer{ redplay := &pb.ArenaPlayer{
Uinfo: red.Uinfo, Uinfo: red.Uinfo,

45
modules/parkour/module.go
View File

@ -467,7 +467,6 @@ func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) {
battle *RaceItem battle *RaceItem
ok bool ok bool
side int32 side int32
sessions []comm.IUserSession = make([]comm.IUserSession, 0)
conf *cfg.GameQualifyingData conf *cfg.GameQualifyingData
lvconf *cfg.GameBuzkashiLvData lvconf *cfg.GameBuzkashiLvData
danconf *cfg.GameQualifyingData danconf *cfg.GameQualifyingData
@ -571,28 +570,6 @@ func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) {
} }
} }
} }
for _, v := range battle.Session {
if errdata, award[v.GetUserId()] = this.DispenseAtno(v, awards[v.GetUserId()], true); errdata != nil {
this.Errorln(errdata)
return
}
v.SendMsg(string(this.GetType()), "raceover", &pb.ParkourRaceOverPush{
Winside: side,
Race: &pb.DBRace{
Id: battle.Id,
Redmember: battle.RedMember,
Redscores: battle.RedScore,
Bulemember: battle.BuleMember,
Bulescores: battle.BuleScore,
},
Award: award[v.GetUserId()],
})
go this.AsynHandleSession(v.Clone(), func(session comm.IUserSession) {
this.ModuleBuried.TriggerBuried(v, comm.GetBuriedParam(comm.Rtype234, 1))
this.WriteUserLog(session.GetUserId(), "", 0, "ParkourRaceOverPush", award[v.GetUserId()])
})
sessions = append(sessions, v)
}
for _, v := range battle.RedMember { for _, v := range battle.RedMember {
if !v.Isai { if !v.Isai {
@ -633,6 +610,28 @@ func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) {
} }
} }
} }
for _, v := range battle.Session {
if errdata, award[v.GetUserId()] = this.DispenseAtno(v, awards[v.GetUserId()], true); errdata != nil {
this.Errorln(errdata)
return
}
this.ModuleBuried.TriggerBuried(v, comm.GetBuriedParam(comm.Rtype234, 1))
v.SendMsg(string(this.GetType()), "raceover", &pb.ParkourRaceOverPush{
Winside: side,
Race: &pb.DBRace{
Id: battle.Id,
Redmember: battle.RedMember,
Redscores: battle.RedScore,
Bulemember: battle.BuleMember,
Bulescores: battle.BuleScore,
},
Award: award[v.GetUserId()],
})
this.WriteUserLog(v.GetUserId(), "", 0, "ParkourRaceOverPush", award[v.GetUserId()])
v.Push()
this.PutUserSession(v)
}
} }
} }