From 99edf413623da24df8199cf087c390eafac695b2 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Mon, 26 Dec 2022 15:27:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=81=93=E5=85=B7=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go               | 4 ++--
 modules/equipment/api_forg.go | 2 +-
 modules/equipment/module.go   | 5 ++---
 modules/items/module.go       | 5 ++---
 modules/modulebase.go         | 6 +++---
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/comm/imodule.go b/comm/imodule.go
index c5d2e995d..9c59739bb 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -34,7 +34,7 @@ type (
 		///添加单个物品到背包 (可以加物品和减物品)
 		AddItem(session IUserSession, itemid string, addnum int32, bPush bool) (code pb.ErrorCode)
 		///添加多个物品到背包 (可以加物品和减物品)
-		AddItems(session IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode)
+		AddItems(session IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, code pb.ErrorCode)
 	}
 
 	//英雄
@@ -129,7 +129,7 @@ type (
 		//查询服务资源数量 参数武器配置id
 		QueryEquipmentAmount(uid string, equipmentId string) (amount uint32)
 		//添加新武器
-		AddNewEquipments(session IUserSession, cIds map[string]uint32, bPush bool) (code pb.ErrorCode)
+		AddNewEquipments(session IUserSession, cIds map[string]uint32, bPush bool) (change []*pb.DB_Equipment, code pb.ErrorCode)
 		//创建装备
 		NewEquipment(uid, cid string) (code pb.ErrorCode, equip *pb.DB_Equipment)
 		//添加装备
diff --git a/modules/equipment/api_forg.go b/modules/equipment/api_forg.go
index 629cbe13a..2e715bca0 100644
--- a/modules/equipment/api_forg.go
+++ b/modules/equipment/api_forg.go
@@ -54,7 +54,7 @@ func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (
 		return
 	}
 
-	if code = this.module.AddNewEquipments(session, equis, true); code != pb.ErrorCode_Success {
+	if _, code = this.module.AddNewEquipments(session, equis, true); code != pb.ErrorCode_Success {
 		return
 	}
 
diff --git a/modules/equipment/module.go b/modules/equipment/module.go
index e4f7b236e..440af04ea 100644
--- a/modules/equipment/module.go
+++ b/modules/equipment/module.go
@@ -95,10 +95,9 @@ func (this *Equipment) QueryEquipmentAmount(uid string, equipmentId string) (amo
 }
 
 //添加武器
-func (this *Equipment) AddNewEquipments(session comm.IUserSession, cIds map[string]uint32, bPush bool) (code pb.ErrorCode) {
+func (this *Equipment) AddNewEquipments(session comm.IUserSession, cIds map[string]uint32, bPush bool) (change []*pb.DB_Equipment, code pb.ErrorCode) {
 	var (
-		err    error
-		change []*pb.DB_Equipment
+		err error
 	)
 	if change, err = this.modelEquipment.AddEquipments(session, cIds); err != nil {
 		this.Errorf("err%v", err)
diff --git a/modules/items/module.go b/modules/items/module.go
index f48e76b2d..11779d015 100644
--- a/modules/items/module.go
+++ b/modules/items/module.go
@@ -125,10 +125,9 @@ func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int3
 }
 
 ///添加多个物品到背包 (可以加物品和减物品)
-func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode) {
+func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, code pb.ErrorCode) {
 	var (
-		err    error
-		change []*pb.DB_UserItemData
+		err error
 	)
 
 	defer this.Debugf("给用户添加物品 uId:%s items:%v items:%v", session.GetUserId(), items, err == nil)
diff --git a/modules/modulebase.go b/modules/modulebase.go
index 9352ec77d..d65afb8a9 100644
--- a/modules/modulebase.go
+++ b/modules/modulebase.go
@@ -307,7 +307,7 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn
 		}
 	}
 	if len(items) > 0 {
-		code = this.ModuleItems.AddItems(session, items, bPush)
+		_, code = this.ModuleItems.AddItems(session, items, bPush)
 		if code != pb.ErrorCode_Success {
 			return
 		}
@@ -356,7 +356,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
 		this.Debugf("发放用户资源: %v [%v]", attrs, code)
 	}
 	if len(items) > 0 { //道具资源
-		code = this.ModuleItems.AddItems(session, items, bPush)
+		_, code = this.ModuleItems.AddItems(session, items, bPush)
 		this.Debugf("发放道具资源: %v [%v]", items, code)
 	}
 	if len(heros) > 0 { //卡片资源
@@ -364,7 +364,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
 		this.Debugf("发放英雄资源: %v [%v]", heros, code)
 	}
 	if len(equips) > 0 {
-		code = this.ModuleEquipment.AddNewEquipments(session, equips, bPush)
+		_, code = this.ModuleEquipment.AddNewEquipments(session, equips, bPush)
 		this.Debugf("发放装备资源: %v [%v]", equips, code)
 	}
 	if len(vip) > 0 { //卡片资源