This commit is contained in:
meixiongfeng 2023-06-06 15:48:53 +08:00
parent de2b0b51d2
commit e6a56d5563
3 changed files with 20 additions and 18 deletions

View File

@ -90,7 +90,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_HuntingLvErr, Code: pb.ErrorCode_HuntingLvErr,
Title: pb.ErrorCode_HuntingLvErr.ToString(), Title: pb.ErrorCode_HuntingLvErr.ToString(),
Message: fmt.Sprintf("关卡体力参数异常:%d,预扣体力:%d", session.GetUserId(), v), Message: fmt.Sprintf("关卡体力参数异常:%s,预扣体力:%d", session.GetUserId(), v),
} }
return return
} }

View File

@ -69,20 +69,21 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_HuntingLvErr, Code: pb.ErrorCode_HuntingLvErr,
Title: pb.ErrorCode_HuntingLvErr.ToString(), Title: pb.ErrorCode_HuntingLvErr.ToString(),
Message: fmt.Sprintf("关卡体力参数异常:%d,预扣体力:%d", session.GetUserId(), v), Message: fmt.Sprintf("关卡体力参数异常,uid:%s,预扣体力:%d", session.GetUserId(), v),
} }
return return
} }
curChapter.Ps[req.StageId] = 0 // 清空预扣体力值 curChapter.Ps[req.StageId] = 0 // 清空预扣体力值
update["ps"] = curChapter.Ps update["ps"] = curChapter.Ps
if !isWin { // 战斗失败返还扣除的体力 if !isWin { // 战斗失败返还扣除的体力
if errdata = this.module.DispenseRes(session, stageConf.PsConsume, true); errdata != nil { // 返还预扣体力 if errdata = this.module.DispenseRes(session, stageConf.PsConsume, true); errdata != nil { // 返还预扣体力
return return
} }
this.module.modelMline.modifyMlineData(session.GetUserId(), curChapter.Id, update) this.module.modelMline.modifyMlineData(session.GetUserId(), curChapter.Id, update)
//code = pb.ErrorCode_BattleNoWin // errdata = &pb.ErrorData{
// Code: pb.ErrorCode_BattleNoWin, // 战斗失败了
// Title: pb.ErrorCode_BattleNoWin.ToString(),
// }
rsp.Data = curChapter rsp.Data = curChapter
session.SendMsg(string(this.module.GetType()), MlineChallengeOverResp, rsp) // 数据推送 session.SendMsg(string(this.module.GetType()), MlineChallengeOverResp, rsp) // 数据推送
return return

View File

@ -1,6 +1,7 @@
package viking package viking
import ( import (
"fmt"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
@ -87,17 +88,20 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
mapData["boss"] = viking.Boss mapData["boss"] = viking.Boss
errdata, bWin = this.module.battle.CheckBattleReport(session, req.Report) errdata, bWin = this.module.battle.CheckBattleReport(session, req.Report)
// if errdata = this.module.ModuleItems.RecoverTicket(session); errdata != nil {
// return
// }
if !bWin { // 战斗失败了 直接返回
if v, ok := viking.Ps[req.BossId]; ok && v > 0 { if v, ok := viking.Ps[req.BossId]; ok && v > 0 {
if errdata = this.module.DispenseRes(session, vikingCfg.PsConsume, true); errdata != nil { // 返还预扣体力 errdata = &pb.ErrorData{
return Code: pb.ErrorCode_HuntingLvErr,
Title: pb.ErrorCode_HuntingLvErr.ToString(),
Message: fmt.Sprintf("关卡体力参数异常,uid:%s,预扣体力:%d", session.GetUserId(), v),
} }
return
} }
viking.Ps[req.BossId] = 0 // 清空预扣体力值 viking.Ps[req.BossId] = 0 // 清空预扣体力值
mapData["ps"] = viking.Ps mapData["ps"] = viking.Ps
if !bWin { // 战斗失败了 直接返回
if errdata = this.module.DispenseRes(session, vikingCfg.PsConsume, true); errdata != nil { // 返还预扣体力
return
}
errdata = this.module.ModifyVikingData(session.GetUserId(), mapData) errdata = this.module.ModifyVikingData(session.GetUserId(), mapData)
session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{ session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{
Data: viking, Data: viking,
@ -105,9 +109,6 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
return return
} }
// if errdata = this.module.ConsumeRes(session, vikingCfg.PsConsume, true); errdata != nil {
// return
// }
key := strconv.Itoa(int(req.BossId)) + "_" + strconv.Itoa(int(req.Difficulty)) key := strconv.Itoa(int(req.BossId)) + "_" + strconv.Itoa(int(req.Difficulty))
if viking.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励 if viking.BossTime[key] == 0 { // 新关卡挑战通过 发放首通奖励