From 3d87c00b77c378056e3e433eaa45e9c06b39d4c1 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Wed, 28 Dec 2022 10:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=B1=E9=9B=84=E6=8B=9B?=
 =?UTF-8?q?=E5=8B=9F=E7=A7=80=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go                       |  2 ++
 modules/equipment/module.go           | 18 ++++++++++++++++++
 modules/mainline/api_challengeover.go |  2 +-
 modules/worldtask/api_finish.go       |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/comm/imodule.go b/comm/imodule.go
index 5648fd7b3..5a4a60bc7 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -130,6 +130,8 @@ type (
 		QueryEquipmentAmount(uid string, equipmentId string) (amount uint32)
 		//添加新武器
 		AddNewEquipments(session IUserSession, cIds map[string]uint32, bPush bool) (change []*pb.DB_Equipment, code pb.ErrorCode)
+		//添加所有装备
+		AddAllEquipments(session IUserSession) (code pb.ErrorCode)
 		//创建装备
 		NewEquipment(uid, cid string) (code pb.ErrorCode, equip *pb.DB_Equipment)
 		//添加装备
diff --git a/modules/equipment/module.go b/modules/equipment/module.go
index 440af04ea..646265dec 100644
--- a/modules/equipment/module.go
+++ b/modules/equipment/module.go
@@ -110,6 +110,24 @@ func (this *Equipment) AddNewEquipments(session comm.IUserSession, cIds map[stri
 	return
 }
 
+func (this *Equipment) AddAllEquipments(session comm.IUserSession) (code pb.ErrorCode) {
+	var (
+		configure *cfg.GameEquip
+		cIds      map[string]uint32
+		err       error
+	)
+	if configure, err = this.configure.GetEquipmentConfigure(); err != nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+	cIds = make(map[string]uint32)
+	for _, v := range configure.GetDataList() {
+		cIds[v.Id] = 1
+	}
+	_, code = this.AddNewEquipments(session, cIds, true)
+	return
+}
+
 //删除武器
 func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []string, bPush bool) (code pb.ErrorCode) {
 	var (
diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go
index 65d6b06fa..e467304e5 100644
--- a/modules/mainline/api_challengeover.go
+++ b/modules/mainline/api_challengeover.go
@@ -75,7 +75,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
 	if len(hero) > 0 {
 		ishave := this.module.ModuleUser.CheckTujianHero(session, hero)
 		for i, v := range ishave {
-			if v {
+			if !v {
 				newhero = append(newhero, hero[i])
 			}
 		}
diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go
index d07ea6e7d..c1d8a0978 100644
--- a/modules/worldtask/api_finish.go
+++ b/modules/worldtask/api_finish.go
@@ -116,7 +116,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 		if len(hero) > 0 {
 			ishave := this.module.ModuleUser.CheckTujianHero(session, hero)
 			for i, v := range ishave {
-				if v {
+				if !v {
 					newhero = append(newhero, hero[i])
 				}
 			}