From 99affaf831d0e3a58d46aa1482c41caa259e3de7 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 18 Apr 2023 20:10:57 +0800
Subject: [PATCH] =?UTF-8?q?npc=E8=B8=A2=E9=A6=86=20=E9=A2=86=E5=A5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/practice/api_npcdialog.go | 45 ++++++++++++++++---------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/modules/practice/api_npcdialog.go b/modules/practice/api_npcdialog.go
index 5a3a9835f..fc5ed60e6 100644
--- a/modules/practice/api_npcdialog.go
+++ b/modules/practice/api_npcdialog.go
@@ -3,6 +3,7 @@ package practice
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/sys/configure"
 )
 
 //参数校验
@@ -13,32 +14,32 @@ func (this *apiComp) NPCDialogCheck(session comm.IUserSession, req *pb.PracticeN
 
 ///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
+	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
 	// 	return
 	// }
-	// if room.Npcstate != 2 {
-	// 	code = pb.ErrorCode_ReqParameterError
+	// if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success {
 	// 	return
 	// }
-	// // 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,
-	// })
+	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
 }