From 21dabd2f98c076756826fb9bd3d2c956d28bc21f Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 19 Aug 2022 18:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/const.go                | 12 ++++++------
 modules/rtask/model_rtask.go | 15 ++++++++++-----
 modules/rtask/module.go      |  5 +++++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/comm/const.go b/comm/const.go
index 1f793be15..d2e1f7bcc 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -186,12 +186,12 @@ const (
 
 // 随机任务类型
 const (
-	RtaskTypeHeroTarget   TaskType = 1 //英雄指定
-	RtaskTypeHeroLvTarget TaskType = 2 //指定英雄的等级
-	RtaskTypeEquipNum     TaskType = 3 //装备数量
-	RtaskTypePoltId       TaskType = 4 //剧情ID
-	RtaskTypeTaskDay      TaskType = 5 //每日任务
-
+	RtaskTypeHeroTarget     TaskType = 1 //英雄指定
+	RtaskTypeHeroLvTarget   TaskType = 4 //指定英雄的等级
+	RtaskTypeEquipNum       TaskType = 5 //指定英雄的装备数量
+	RtaskTypePoltId         TaskType = 2 //剧情ID
+	RtaskTypeTaskDay        TaskType = 3 //每日任务
+	RtaskTypeHeroStarTarget TaskType = 6 //指定英雄的星级
 )
 
 const (
diff --git a/modules/rtask/model_rtask.go b/modules/rtask/model_rtask.go
index 788ac57cf..502ec8dd4 100644
--- a/modules/rtask/model_rtask.go
+++ b/modules/rtask/model_rtask.go
@@ -60,27 +60,32 @@ func (this *ModelRtask) doRtaskHandle(uid string, param *pb.RtaskParam) (rtaskId
 	return
 }
 
-// 1 英雄指定
+// 英雄指定
 func (this *ModelRtask) HeroTarget(cfg *cfg.GameRdtaskCondiData, tp *pb.RtaskParam) (ok bool) {
 	return cfg.Data1 == tp.Param1
 }
 
-// 2 指定英雄的等级
+// 指定英雄的等级
 func (this *ModelRtask) HeroLvTarget(cfg *cfg.GameRdtaskCondiData, tp *pb.RtaskParam) (ok bool) {
 	return cfg.Data1 == tp.Param1 && cfg.Data1 == tp.Param2
 }
 
-// 3 指定英雄的指定装备的数量
+// 指定英雄的指定装备的数量
 func (this *ModelRtask) EquipNum(cfg *cfg.GameRdtaskCondiData, tp *pb.RtaskParam) (ok bool) {
 	return cfg.Data1 == tp.Param1 && cfg.Data2 == tp.Param2 && cfg.Data3 == tp.Param3
 }
 
-// 4 剧情ID
+// 剧情ID
 func (this *ModelRtask) PoltId(cfg *cfg.GameRdtaskCondiData, tp *pb.RtaskParam) (ok bool) {
 	return cfg.Data1 == tp.Param1
 }
 
-// 5 每日任务
+// 每日任务
 func (this *ModelRtask) TaskDay(cfg *cfg.GameRdtaskCondiData, tp *pb.RtaskParam) (ok bool) {
 	return cfg.Data1 == tp.Param1
 }
+
+// 指定英雄的星级
+func (this *ModelRtask) HeroStarTarget(cfg *cfg.GameRdtaskCondiData, tp *pb.RtaskParam) (ok bool) {
+	return cfg.Data1 == tp.Param1 && cfg.Data2 == tp.Param2
+}
diff --git a/modules/rtask/module.go b/modules/rtask/module.go
index b00e47178..7a73a6dc9 100644
--- a/modules/rtask/module.go
+++ b/modules/rtask/module.go
@@ -88,6 +88,11 @@ func (this *ModuleRtask) initRtaskHandle() {
 								cfg: typeCfg,
 								fn:  this.modelRtask.HeroLvTarget,
 							})
+						case comm.RtaskTypeHeroStarTarget:
+							handlers = append(handlers, &rtaskCondi{
+								cfg: typeCfg,
+								fn:  this.modelRtask.HeroStarTarget,
+							})
 						case comm.RtaskTypeEquipNum:
 							handlers = append(handlers, &rtaskCondi{
 								cfg: typeCfg,