From 6c494835adff43c79b2a9f4fa50dc2f4b77b9451 Mon Sep 17 00:00:00 2001
From: flswld <flswld@flswld.com>
Date: Thu, 30 Mar 2023 19:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gs/game/lua_trigger.go       |  2 +-
 gs/game/player_fight_sync.go |  1 +
 gs/game/player_quest.go      | 42 ++++++++++++++++++++++++------------
 gs/game/player_world.go      |  3 ++-
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/gs/game/lua_trigger.go b/gs/game/lua_trigger.go
index d15d17be..021496c9 100644
--- a/gs/game/lua_trigger.go
+++ b/gs/game/lua_trigger.go
@@ -79,7 +79,7 @@ func (g *Game) SceneRegionTriggerCheck(player *model.Player, scene *Scene, oldPo
 						}
 						for _, triggerDataConfig := range gdconf.GetTriggerDataMap() {
 							if triggerDataConfig.TriggerName == triggerConfig.Name {
-								g.TriggerQuest(player, constant.QUEST_FINISH_COND_TYPE_TRIGGER_FIRE, triggerDataConfig.TriggerId)
+								g.TriggerQuest(player, constant.QUEST_FINISH_COND_TYPE_TRIGGER_FIRE, "", triggerDataConfig.TriggerId)
 							}
 						}
 					}
diff --git a/gs/game/player_fight_sync.go b/gs/game/player_fight_sync.go
index 57dd9be3..20a3ba45 100644
--- a/gs/game/player_fight_sync.go
+++ b/gs/game/player_fight_sync.go
@@ -436,6 +436,7 @@ func (g *Game) EvtDoSkillSuccNotify(player *model.Player, payloadMsg pb.Message)
 	logger.Debug("EvtDoSkillSuccNotify: %v", req)
 	// 处理技能开始的耐力消耗
 	g.SkillStartStamina(player, req.CasterId, req.SkillId)
+	g.TriggerQuest(player, constant.QUEST_FINISH_COND_TYPE_SKILL, "", int32(req.SkillId))
 }
 
 func (g *Game) EvtAvatarEnterFocusNotify(player *model.Player, payloadMsg pb.Message) {
diff --git a/gs/game/player_quest.go b/gs/game/player_quest.go
index 8b9f003b..4203de5a 100644
--- a/gs/game/player_quest.go
+++ b/gs/game/player_quest.go
@@ -147,8 +147,20 @@ func (g *Game) AcceptQuest(player *model.Player, notifyClient bool) {
 	}
 }
 
+func matchParamEqual(param1 []int32, param2 []int32, num int) bool {
+	if len(param1) != num || len(param2) != num {
+		return false
+	}
+	for i := 0; i < num; i++ {
+		if param1[i] != param2[i] {
+			return false
+		}
+	}
+	return true
+}
+
 // TriggerQuest 触发任务
-func (g *Game) TriggerQuest(player *model.Player, cond int32, param ...int32) {
+func (g *Game) TriggerQuest(player *model.Player, cond int32, complexParam string, param ...int32) {
 	dbQuest := player.GetDbQuest()
 	updateQuestIdList := make([]uint32, 0)
 	for _, quest := range dbQuest.GetQuestMap() {
@@ -163,29 +175,31 @@ func (g *Game) TriggerQuest(player *model.Player, cond int32, param ...int32) {
 			switch cond {
 			case constant.QUEST_FINISH_COND_TYPE_TRIGGER_FIRE:
 				// 场景触发器跳了 参数1:触发器id
-				if len(questCond.Param) != 1 {
-					continue
-				}
-				if len(param) != 1 {
-					continue
-				}
-				if questCond.Param[0] != param[0] {
+				ok := matchParamEqual(questCond.Param, param, 1)
+				if !ok {
 					continue
 				}
 				dbQuest.ForceFinishQuest(quest.QuestId)
 				updateQuestIdList = append(updateQuestIdList, quest.QuestId)
 			case constant.QUEST_FINISH_COND_TYPE_UNLOCK_TRANS_POINT:
 				// 解锁传送锚点 参数1:场景id 参数2:传送锚点id
-				if len(questCond.Param) != 2 {
+				ok := matchParamEqual(questCond.Param, param, 2)
+				if !ok {
 					continue
 				}
-				if len(param) != 2 {
+				dbQuest.ForceFinishQuest(quest.QuestId)
+				updateQuestIdList = append(updateQuestIdList, quest.QuestId)
+			case constant.QUEST_FINISH_COND_TYPE_COMPLETE_TALK:
+				// 与NPC对话 参数1:对话id
+				ok := matchParamEqual(questCond.Param, param, 1)
+				if !ok {
 					continue
 				}
-				if questCond.Param[0] != param[0] {
-					continue
-				}
-				if questCond.Param[1] != param[1] {
+				dbQuest.ForceFinishQuest(quest.QuestId)
+				updateQuestIdList = append(updateQuestIdList, quest.QuestId)
+			case constant.QUEST_FINISH_COND_TYPE_LUA_NOTIFY:
+				// LUA侧通知 复杂参数
+				if questCond.ComplexParam != complexParam {
 					continue
 				}
 				dbQuest.ForceFinishQuest(quest.QuestId)
diff --git a/gs/game/player_world.go b/gs/game/player_world.go
index 50e8aa5a..97a9654b 100644
--- a/gs/game/player_world.go
+++ b/gs/game/player_world.go
@@ -69,7 +69,7 @@ func (g *Game) UnlockTransPointReq(player *model.Player, payloadMsg pb.Message)
 	}
 	dbScene.UnlockPoint(req.PointId)
 
-	g.TriggerQuest(player, constant.QUEST_FINISH_COND_TYPE_UNLOCK_TRANS_POINT, int32(req.SceneId), int32(req.PointId))
+	g.TriggerQuest(player, constant.QUEST_FINISH_COND_TYPE_UNLOCK_TRANS_POINT, "", int32(req.SceneId), int32(req.PointId))
 
 	g.SendMsg(cmd.ScenePointUnlockNotify, player.PlayerID, player.ClientSeq, &proto.ScenePointUnlockNotify{
 		SceneId:         req.SceneId,
@@ -206,6 +206,7 @@ func (g *Game) ChangeGameTimeReq(player *model.Player, payloadMsg pb.Message) {
 
 func (g *Game) NpcTalkReq(player *model.Player, payloadMsg pb.Message) {
 	req := payloadMsg.(*proto.NpcTalkReq)
+	g.TriggerQuest(player, constant.QUEST_FINISH_COND_TYPE_COMPLETE_TALK, "", int32(req.TalkId))
 	rsp := &proto.NpcTalkRsp{
 		CurTalkId:   req.TalkId,
 		NpcEntityId: req.NpcEntityId,