From 2d7405baea1ce4837d1ecea13d241f13456af587 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 15 Jul 2022 13:42:08 +0800
Subject: [PATCH] update

---
 cmd/robot/user.go          | 18 ++++++++++++++++--
 modules/hero/api_awaken.go | 11 +++++++++++
 modules/user/api_res.go    | 17 +++++++----------
 modules/user/module.go     |  2 ++
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/cmd/robot/user.go b/cmd/robot/user.go
index acf2fe5aa..78d6629a1 100644
--- a/cmd/robot/user.go
+++ b/cmd/robot/user.go
@@ -24,9 +24,23 @@ var user_builders = []*TestCase{
 		subType:  "addres",
 		req: &pb.UserAddResReq{
 			Res: &pb.UserAssets{
-				A: "attr",
+				A: "item",
+				T: "10011",
+				N: 13,
+			},
+		},
+		rsp: &pb.UserAddResResp{},
+		//enabled: true,
+	},
+	{
+		desc:     "添加资源",
+		mainType: string(comm.ModuleUser),
+		subType:  "addres",
+		req: &pb.UserAddResReq{
+			Res: &pb.UserAssets{
+				A: "item",
 				T: "10001",
-				N: 12,
+				N: 1,
 			},
 		},
 		rsp:     &pb.UserAddResResp{},
diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index 47aa8488b..3fd2dc0e0 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -86,6 +86,17 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 			property[awakenData.Phasebonus[0]] += int32(value)
 		}
 		this.module.modelHero.mergeMainProperty(session.GetUserId(), _hero.Id, property)
+
+		_heroMap := map[string]interface{}{
+			"juexingLv": _hero.JuexingLv + 1,
+		}
+		// 保存数据
+		err1 = this.module.modelHero.modifyHeroData(session.GetUserId(), _hero.Id, _heroMap)
+		if err1 != nil {
+			code = pb.ErrorCode_DBError
+			this.module.Errorf("update hero skill failed:%v", err1)
+			return
+		}
 	}
 
 	err1 = this.module.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
diff --git a/modules/user/api_res.go b/modules/user/api_res.go
index 4478273c4..f6f09b5a2 100644
--- a/modules/user/api_res.go
+++ b/modules/user/api_res.go
@@ -20,15 +20,6 @@ func (this *apiComp) AddRes(session comm.IUserSession, req *pb.UserAddResReq) (c
 		return
 	}
 
-	rsp := &pb.UserAddResResp{}
-
-	defer func() {
-		if err := session.SendMsg(string(this.module.GetType()), UserSubTypeAddRes, rsp); err != nil {
-			code = pb.ErrorCode_SystemError
-			return
-		}
-	}()
-
 	user := this.module.modelUser.GetUser(session.GetUserId())
 	if user == nil {
 		code = pb.ErrorCode_UserSessionNobeing
@@ -42,6 +33,12 @@ func (this *apiComp) AddRes(session comm.IUserSession, req *pb.UserAddResReq) (c
 	}
 	res = append(res, atn)
 	code = this.module.DispenseRes(session.GetUserId(), res, true)
-	rsp.Res = req.Res
+	if code == pb.ErrorCode_Success {
+		rsp := &pb.UserAddResResp{
+			Res: req.Res,
+		}
+		session.SendMsg(string(this.module.GetType()), UserSubTypeAddRes, rsp)
+	}
+
 	return
 }
diff --git a/modules/user/module.go b/modules/user/module.go
index 11f74c78e..74c1d7b98 100644
--- a/modules/user/module.go
+++ b/modules/user/module.go
@@ -122,6 +122,8 @@ func (this *User) AddAttributeValue(uid string, attr string, add int32, bPush bo
 		}
 		_change.Diamond += add
 		update[comm.ResDiamond] = user.Diamond + add
+	default:
+		code = pb.ErrorCode_Unknown
 	}
 
 	if len(update) == 0 {