Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
21894ab024
@ -463,5 +463,10 @@ func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.Batt
|
||||
// this.ModuleBuried.SendToRtask(session, comm.Rtype157, int32(report.Info.Ptype), v)
|
||||
go this.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype157, int32(report.Info.Ptype), v))
|
||||
}
|
||||
return nil, true
|
||||
|
||||
if (report.WinSide == 1 && report.Info.RedCompId == session.GetUserId()) || (report.WinSide == 2 && report.Info.BlueCompId == session.GetUserId()) {
|
||||
return nil, true
|
||||
} else {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
|
@ -135,6 +135,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
|
||||
}
|
||||
if int(shopData.RefreshnumgoldShop) < refresh {
|
||||
isrefresh = true
|
||||
shopData.RefreshnumgoldShop++
|
||||
}
|
||||
}
|
||||
if !isrefresh {
|
||||
|
Loading…
Reference in New Issue
Block a user