From c501d3c205316677154fe5ee54ff5f2254c2e076 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 18 Apr 2023 18:37:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B8=A2=E9=A6=86=E6=88=90=E5=8A=9F=E4=B8=8D?=
 =?UTF-8?q?=E9=80=9A=E5=85=B3=E5=89=A7=E6=83=85=E8=8E=B7=E5=BE=97=E5=A5=96?=
 =?UTF-8?q?=E5=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/practice/api_npcbattklefinish.go |  2 +-
 modules/practice/api_npcdialog.go        | 47 ++++++++++++------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go
index 831ba607b..a33a4cebb 100644
--- a/modules/practice/api_npcbattklefinish.go
+++ b/modules/practice/api_npcbattklefinish.go
@@ -34,7 +34,7 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic
 	}
 
 	if req.Report.WinSide == 1 {
-		room.Npcstate = 2 //稍后 状态改成3。让客户端先处理协议
+		room.Npcstate = 3
 		if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil {
 			code = pb.ErrorCode_ConfigNoFound
 			return
diff --git a/modules/practice/api_npcdialog.go b/modules/practice/api_npcdialog.go
index bf771aaee..5a3a9835f 100644
--- a/modules/practice/api_npcdialog.go
+++ b/modules/practice/api_npcdialog.go
@@ -3,7 +3,6 @@ package practice
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-	"go_dreamfactory/sys/configure"
 )
 
 //参数校验
@@ -12,34 +11,34 @@ func (this *apiComp) NPCDialogCheck(session comm.IUserSession, req *pb.PracticeN
 	return
 }
 
-///npc 领取对白奖励
+///npc  此协议废弃 不用
 func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode, data *pb.ErrorData) {
-	var (
-		err  error
-		room *pb.DBPracticeRoom
-		// conf *cfg.GameDispatch_BattleData
-	)
-	if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil {
-		code = pb.ErrorCode_DBError
-		return
-	}
-	if room.Npcstate != 2 {
-		code = pb.ErrorCode_ReqParameterError
-		return
-	}
-	// if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil {
-	// 	code = pb.ErrorCode_ConfigNoFound
+	// var (
+	// 	err  error
+	// 	room *pb.DBPracticeRoom
+	// 	// conf *cfg.GameDispatch_BattleData
+	// )
+	// if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil {
+	// 	code = pb.ErrorCode_DBError
 	// 	return
 	// }
-	// if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success {
+	// if room.Npcstate != 2 {
+	// 	code = pb.ErrorCode_ReqParameterError
 	// 	return
 	// }
-	room.Npcstate = 3
-	room.Refresh = configure.Now().Unix()
-	this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{
-		"npcstate": room.Npcstate,
-		"refresh":  room.Refresh,
-	})
+	// // if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil {
+	// // 	code = pb.ErrorCode_ConfigNoFound
+	// // 	return
+	// // }
+	// // if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success {
+	// // 	return
+	// // }
+	// room.Npcstate = 3
+	// room.Refresh = configure.Now().Unix()
+	// this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{
+	// 	"npcstate": room.Npcstate,
+	// 	"refresh":  room.Refresh,
+	// })
 	session.SendMsg(string(this.module.GetType()), "npcdialog", &pb.PracticeNPCDialogResp{Issucc: true})
 	return
 }