From 261988250a94a8afe8983df84ef99bb83781b587 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 10 Nov 2022 14:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=8F=E8=84=B8=E5=9F=8B=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/privilege/module.go | 31 ++++++++++++++++++-------------
 modules/user/api_create.go  |  4 ++++
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/modules/privilege/module.go b/modules/privilege/module.go
index c8b69aed8..260e6f8d8 100644
--- a/modules/privilege/module.go
+++ b/modules/privilege/module.go
@@ -7,7 +7,6 @@ import (
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
-	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/sys/db"
 	"go_dreamfactory/utils"
 
@@ -123,16 +122,19 @@ func (this *Privilege) CreatePrivilegeCard(session comm.IUserSession, cId string
 		this.SendDailyMail(session, session.GetUserId(), 1)
 	}
 
-	if code = this.DispenseRes(session, []*cfg.Gameatn{conf.DisposableReward}, true); code != pb.ErrorCode_Success {
+	if code = this.DispenseRes(session, conf.DisposableReward, true); code != pb.ErrorCode_Success {
 		return
 	}
 	atn.T = conf.Id
 	res = append(res, atn) // 加资源
-	res = append(res, &pb.UserAssets{
-		A: conf.DisposableReward.A,
-		T: conf.DisposableReward.T,
-		N: conf.DisposableReward.N,
-	})
+	for _, v := range conf.DisposableReward {
+		res = append(res, &pb.UserAssets{
+			A: v.A,
+			T: v.T,
+			N: v.N,
+		})
+	}
+
 	// 推送
 	session.SendMsg(string(this.GetType()), PrivilegeGetListResp, &pb.PrivilegeGetListResp{Data: []*pb.DBPrivilege{data}})
 	return
@@ -163,18 +165,21 @@ func (this *Privilege) RenewPrivilegeCard(session comm.IUserSession, cId string)
 				mapData["eTime"] = v.ETime
 				this.modelPrivilege.modifyPrivilegeData(session.GetUserId(), v.Id, mapData)
 				// 发放奖励
-				if code = this.DispenseRes(session, []*cfg.Gameatn{conf.DisposableReward}, true); code != pb.ErrorCode_Success {
+				if code = this.DispenseRes(session, conf.DisposableReward, true); code != pb.ErrorCode_Success {
 					break
 				}
 
 				session.SendMsg(string(this.GetType()), PrivilegeGetListResp, &pb.PrivilegeGetListResp{Data: []*pb.DBPrivilege{v}})
 				atn.T = conf.Id
 				res = append(res, atn) // 加资源
-				res = append(res, &pb.UserAssets{
-					A: conf.DisposableReward.A,
-					T: conf.DisposableReward.T,
-					N: conf.DisposableReward.N,
-				})
+				for _, v := range conf.DisposableReward {
+					res = append(res, &pb.UserAssets{
+						A: v.A,
+						T: v.T,
+						N: v.N,
+					})
+				}
+
 			} else {
 				code = pb.ErrorCode_PrivilegeRenewTime
 			}
diff --git a/modules/user/api_create.go b/modules/user/api_create.go
index 3aa95ce8e..0e8da982f 100644
--- a/modules/user/api_create.go
+++ b/modules/user/api_create.go
@@ -82,5 +82,9 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (c
 	if err := session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{IsSucc: true}); err != nil {
 		code = pb.ErrorCode_SystemError
 	}
+
+	if req.Figure != 0 {
+		this.module.ModuleRtask.SendToRtask(session, comm.Rtype72, 1)
+	}
 	return
 }