From deb6355d36269d9f9413b9e702cd22633db447a4 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 15 Mar 2023 17:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A6=E5=8F=91=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/model_hero.go |  2 --
 modules/hero/module.go     | 11 ++++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 81a4ce225..bee4478cf 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -75,7 +75,6 @@ func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData {
 		}
 
 		skills := []*pb.SkillData{}
-
 		if heroCfg.Skill1 != 0 {
 			skills = append(skills, &pb.SkillData{SkillID: heroCfg.Skill1, SkillLv: 1})
 		}
@@ -86,7 +85,6 @@ func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData {
 			skills = append(skills, &pb.SkillData{SkillID: heroCfg.Skill3, SkillLv: 1})
 		}
 		hero.NormalSkill = skills
-
 	}
 
 	return nil
diff --git a/modules/hero/module.go b/modules/hero/module.go
index 0efb2818b..918d90cc0 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -166,12 +166,14 @@ func (this *Hero) SendRdTask(session comm.IUserSession) {
 			equipmap[v.SuiteExtId][v.Suite2Star]++
 		}
 	}
-
+	var szTask []*comm.TaskParam
 	for k, v := range equipmap {
 		for k1, v1 := range v {
-			this.ModuleRtask.SendToRtask(session, comm.Rtype46, v1, k1, k)
+			szTask = append(szTask, comm.GettaskParam(comm.Rtype46, v1, k1, k))
+			//this.ModuleRtask.SendToRtask(session, comm.Rtype46, v1, k1, k)
 		}
 	}
+	go this.ModuleRtask.TriggerTask(session.GetUserId(), szTask...)
 }
 
 //英雄列表
@@ -421,11 +423,10 @@ func (this *Hero) QueryCrossHeroinfo(oid string) (hero *pb.DBHero, err error) {
 				"_id": oid,
 			})
 			hero = &pb.DBHero{}
-			if err = sr.Decode(hero); err == nil {
-				return
-			} else {
+			if err = sr.Decode(hero); err != nil {
 				this.modelHero.moduleHero.Errorf("find hero error: %v", err)
 			}
+			return
 		}
 	} else { // 不是跨服就查本服 注意 这个接口是给跨服玩法调用 理论上这个分支是不会执行的
 		if res := this.modelHero.DB.FindOne(comm.TableHero, bson.M{