From d28a2f3e6557714e07fd2572b38b9f35bf221a8b Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Wed, 18 Oct 2023 18:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8D=95=E7=BE=8A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/parkour/ai.go        | 10 ++++------
 modules/parkour/api_avoid.go |  2 +-
 modules/parkour/api_qte.go   |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/parkour/ai.go b/modules/parkour/ai.go
index 641338909..073b9c859 100644
--- a/modules/parkour/ai.go
+++ b/modules/parkour/ai.go
@@ -153,10 +153,10 @@ func (this *aiComp) ExceAiHandle_Avoid(_ai *AI, handle *AIHandle) {
 	weights = append(weights, _ai.Conf.BumpSuccessWeight...)
 	indexhandle = comm.GetRandW(weights)
 	if indexhandle == 0 { //失败
-		go this.module.avoid(_ai.Bid, _ai.Uid, nil)
+		go this.module.avoid(_ai.Bid, _ai.Uid, 0, nil)
 	} else {
 		conf = this.avoidConf[indexhandle-1]
-		go this.module.avoid(_ai.Bid, _ai.Uid, conf)
+		go this.module.avoid(_ai.Bid, _ai.Uid, conf.Distance, conf)
 	}
 	handle.cd = _ai.Conf.BumpCD
 }
@@ -171,12 +171,10 @@ func (this *aiComp) ExceAiHandle_Shot(_ai *AI, handle *AIHandle) {
 	weights = append(weights, _ai.Conf.CatchQteFailWeight)
 	weights = append(weights, _ai.Conf.CatchQteSuccessWeight...)
 	indexhandle = comm.GetRandW(weights)
-	if indexhandle == 0 { //失败
-		go this.module.qte(_ai.Bid, _ai.Uid, nil)
-	} else {
+	if indexhandle > 0 { //失败
 		conf = this.shotConf[indexhandle-1]
 		go func() {
-			this.module.qte(_ai.Bid, _ai.Uid, conf)
+			this.module.qte(_ai.Bid, _ai.Uid, conf.Time, conf)
 			this.module.shot(_ai.Bid, _ai.Uid)
 		}()
 	}
diff --git a/modules/parkour/api_avoid.go b/modules/parkour/api_avoid.go
index 347f7e727..64d4d970a 100644
--- a/modules/parkour/api_avoid.go
+++ b/modules/parkour/api_avoid.go
@@ -37,7 +37,7 @@ func (this *apiComp) Avoid(session comm.IUserSession, req *pb.ParkourAvoidReq) (
 	_, ok = this.module.battles[req.Battleid]
 	this.module.lock.RUnlock()
 	if ok {
-		go this.module.avoid(req.Battleid, session.GetUserId(), conf)
+		go this.module.avoid(req.Battleid, session.GetUserId(), req.Distance, conf)
 	} else {
 		errdata = &pb.ErrorData{
 			Code:  pb.ErrorCode_ReqParameterError,
diff --git a/modules/parkour/api_qte.go b/modules/parkour/api_qte.go
index 5137145bb..d80bf87e1 100644
--- a/modules/parkour/api_qte.go
+++ b/modules/parkour/api_qte.go
@@ -35,7 +35,7 @@ func (this *apiComp) QTE(session comm.IUserSession, req *pb.ParkourQTEReq) (errd
 	_, ok = this.module.battles[req.Battleid]
 	this.module.lock.RUnlock()
 	if ok {
-		go this.module.qte(req.Battleid, session.GetUserId(), conf)
+		go this.module.qte(req.Battleid, session.GetUserId(), req.Time, conf)
 	} else {
 		errdata = &pb.ErrorData{
 			Code:  pb.ErrorCode_ReqParameterError,