From c934218f472251ccddd53b028ae43ad1763793a6 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 31 Aug 2022 13:34:06 +0800
Subject: [PATCH] bugs

---
 modules/comp_configure.go          | 9 +++++----
 modules/gourmet/model_gourmet.go   | 2 +-
 modules/hunting/comp_configure.go  | 4 +---
 modules/mail/configure_comp.go     | 6 +++---
 modules/mainline/comp_configure.go | 2 +-
 modules/smithy/model_smithy.go     | 4 +++-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/comp_configure.go b/modules/comp_configure.go
index e8cfd20fb..bc3e9061c 100644
--- a/modules/comp_configure.go
+++ b/modules/comp_configure.go
@@ -167,8 +167,9 @@ func (this *MCompConfigure) GetDropData(dropId int32) (data []*cfg.GameDropData)
 }
 
 // todo 调用drop 表 获取掉落信息
-func (this *MCompConfigure) GetMultipleDropReward(count, dropId int32, Items []*pb.UserAssets) {
+func (this *MCompConfigure) GetMultipleDropReward(count, dropId int32, items []*pb.UserAssets) (resData []*pb.UserAssets) {
 	res := make([]*cfg.Gameatn, 0)
+
 	for i := 0; i < int(count); i++ {
 		data := this.GetDropData(dropId)
 		szW := make([]int32, 0)
@@ -182,21 +183,21 @@ func (this *MCompConfigure) GetMultipleDropReward(count, dropId int32, Items []*
 	}
 	for _, v := range res {
 		bFind := false
-		for _, v1 := range Items {
+		for _, v1 := range items {
 			if v.A == v1.A && v.T == v1.T {
 				v1.N += v.N
 				bFind = true
 			}
 		}
 		if !bFind {
-			Items = append(Items, &pb.UserAssets{
+			items = append(items, &pb.UserAssets{
 				A: v.A,
 				T: v.T,
 				N: v.N,
 			})
 		}
 	}
-
+	resData = append(resData, items...)
 	return
 }
 func (this *MCompConfigure) GetDropReward(dropId int32, Items []*cfg.Gameatn) {
diff --git a/modules/gourmet/model_gourmet.go b/modules/gourmet/model_gourmet.go
index 78f327b27..760a1ef6e 100644
--- a/modules/gourmet/model_gourmet.go
+++ b/modules/gourmet/model_gourmet.go
@@ -105,7 +105,7 @@ func (this *modelGourmet) CalculationGourmet(uid string, gourmet *pb.DBGourmet)
 				gourmet.OrderCostTime = 0                                              // 清空当天的订单时长
 			}
 			order.FoodCount--
-			this.module.configure.GetMultipleDropReward(_gourmetcfg.Using, _gourmetcfg.Propsgroup, gourmet.Items) // 获取掉落奖励
+			gourmet.Items = this.module.configure.GetMultipleDropReward(_gourmetcfg.Using, _gourmetcfg.Propsgroup, gourmet.Items) // 获取掉落奖励
 
 			if curTime > costTime {
 				gourmet.OrderCostTime += int32(curTime - costTime)
diff --git a/modules/hunting/comp_configure.go b/modules/hunting/comp_configure.go
index 530b4d122..2d9813e2a 100644
--- a/modules/hunting/comp_configure.go
+++ b/modules/hunting/comp_configure.go
@@ -2,7 +2,6 @@ package hunting
 
 import (
 	"go_dreamfactory/lego/core"
-	"go_dreamfactory/lego/core/cbase"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/sys/configure"
@@ -17,7 +16,6 @@ const (
 
 ///配置管理基础组件
 type configureComp struct {
-	cbase.ModuleCompBase
 	hlock sync.RWMutex
 	modules.MCompConfigure
 	_vikingMap map[int64]*cfg.GameHuntingBossData
@@ -25,7 +23,7 @@ type configureComp struct {
 
 //组件初始化接口
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
-	err = this.ModuleCompBase.Init(service, module, comp, options)
+	err = this.MCompConfigure.Init(service, module, comp, options)
 
 	this._vikingMap = make(map[int64]*cfg.GameHuntingBossData, 0)
 	configure.RegisterConfigure(game_vikingboss, cfg.NewGameHuntingBoss, func() {
diff --git a/modules/mail/configure_comp.go b/modules/mail/configure_comp.go
index 34790e964..7645e5912 100644
--- a/modules/mail/configure_comp.go
+++ b/modules/mail/configure_comp.go
@@ -2,15 +2,15 @@ package mail
 
 import (
 	"go_dreamfactory/lego/core"
-	"go_dreamfactory/lego/core/cbase"
+	"go_dreamfactory/modules"
 )
 
 // 邮件配置管理组件
 type Configure_Comp struct {
-	cbase.ModuleCompBase
+	modules.MCompConfigure
 }
 
 func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
-	this.ModuleCompBase.Init(service, module, comp, options)
+	this.MCompConfigure.Init(service, module, comp, options)
 	return
 }
diff --git a/modules/mainline/comp_configure.go b/modules/mainline/comp_configure.go
index 45c5b92ae..45d2f2cba 100644
--- a/modules/mainline/comp_configure.go
+++ b/modules/mainline/comp_configure.go
@@ -22,7 +22,7 @@ type configureComp struct {
 
 //组件初始化接口
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
-	err = this.ModuleCompBase.Init(service, module, comp, options)
+	err = this.MCompConfigure.Init(service, module, comp, options)
 	this.module = module.(*Mainline)
 	err = this.LoadMultiConfigure(map[string]interface{}{
 		game_mainlinechapter:   cfg.NewGameMainlineChapter,
diff --git a/modules/smithy/model_smithy.go b/modules/smithy/model_smithy.go
index 5f330a073..c7508110c 100644
--- a/modules/smithy/model_smithy.go
+++ b/modules/smithy/model_smithy.go
@@ -103,7 +103,9 @@ func (this *modelSmithy) CalculationSmithy(uid string, Smithy *pb.DBSmithy) {
 				Smithy.OrderCostTime = 0                                 // 清空当天的订单时长
 			}
 			order.Count--
-			this.module.configure.GetMultipleDropReward(1, _Smithycfg.Drop, Smithy.Items) // 获取掉落奖励
+
+			Smithy.Items = this.module.configure.GetMultipleDropReward(1, _Smithycfg.Drop, Smithy.Items) // 获取掉落奖励
+
 			mapData["items"] = Smithy.Items
 			if curTime > costTime {
 				Smithy.OrderCostTime += int32(curTime - costTime)