From 55a616a27c90bcd527b79aaad7aa68b364676ea5 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 7 Sep 2023 11:12:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?gm=20=E4=BF=AE=E6=94=B9=E5=9D=90=E9=AA=91?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go          |  3 +++
 modules/dragon/module.go | 32 ++++++++++++++++++++++++++++++++
 modules/gm/module.go     | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/comm/imodule.go b/comm/imodule.go
index 728fb3bf0..075700f79 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -661,5 +661,8 @@ type (
 
 		// 跨服接口 通过 服务器标签和唯一id 获取坐骑信息
 		QueryDragonByTagAndOid(tag string, objId []string) (dragon []*pb.DBDragon, err error)
+
+		// Gm 调整龙的等级
+		GMModifyDragonLv(uid string, cid string, lv int32) (dragon *pb.DBDragon, err error)
 	}
 )
diff --git a/modules/dragon/module.go b/modules/dragon/module.go
index 8c55c2311..bd1459aef 100644
--- a/modules/dragon/module.go
+++ b/modules/dragon/module.go
@@ -165,3 +165,35 @@ func (this *Dragon) QueryDragonByTagAndOid(tag string, objId []string) (dragon [
 	}
 	return
 }
+
+// gm 修改龙等级
+func (this *Dragon) GMModifyDragonLv(uid string, cid string, lv int32) (dragon *pb.DBDragon, err error) {
+	dragons, _ := this.modelDragon.GetDragonList(uid)
+	for _, v := range dragons {
+		if v.Dragonid == cid {
+			update := make(map[string]interface{}, 0)
+			v.Lv = lv
+			if conf, err := this.configure.GetDragonConfById(cid, lv); err == nil {
+				if c, err := this.configure.GetDragonMount(cid, conf.Type); err == nil {
+					dragon.Property["stime"] = c.Stime
+					dragon.Property["etime"] = c.Etime
+					dragon.Property["hp"] = c.Hp
+					dragon.Property["moderate"] = c.Moderate
+					dragon.Property["sprint"] = c.Sprint
+					dragon.Property["acceleration"] = c.Acceleration
+					dragon.Property["deceleration"] = c.Deceleration
+					dragon.Property["caddtime"] = c.Caddtime
+					dragon.Property["csubtime"] = c.Csubtime
+					update["property"] = dragon.Property
+				}
+			}
+			update["lv"] = lv
+			this.modelDragon.UpdateDragonData(uid, v.Id, update)
+			dragon = v
+			return
+		}
+
+	}
+	err = fmt.Errorf("not found config:%s", cid)
+	return
+}
diff --git a/modules/gm/module.go b/modules/gm/module.go
index 72d5084a6..ad91f0aef 100644
--- a/modules/gm/module.go
+++ b/modules/gm/module.go
@@ -719,6 +719,38 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
 
 				module1.(comm.ILibrary).GMCreateFavorability(session.GetUserId())
 
+				this.Debug("使用bingo命令:uid = %s ",
+					log.Field{Key: "uid", Value: session.GetUserId()},
+					log.Field{Key: "0", Value: datas[0]},
+				)
+			} else if len(datas) == 3 && (datas[0] == "changedragonlv") {
+				var (
+					err error
+					lv  int
+				)
+
+				lv, err = strconv.Atoi(datas[2])
+				if err != nil {
+					errdata = &pb.ErrorData{
+						Code:  pb.ErrorCode_ReqParameterError,
+						Title: pb.ErrorCode_ReqParameterError.ToString(),
+					}
+					return
+				}
+				module1, err := this.service.GetModule(comm.ModuleDragon)
+				if err != nil {
+					return
+				}
+
+				if _, err = module1.(comm.IDragon).GMModifyDragonLv(session.GetUserId(), datas[1], int32(lv)); err != nil {
+					errdata = &pb.ErrorData{
+						Code:    pb.ErrorCode_ReqParameterError,
+						Title:   pb.ErrorCode_ReqParameterError.ToString(),
+						Message: err.Error(),
+					}
+					return
+				}
+
 				this.Debug("使用bingo命令:uid = %s ",
 					log.Field{Key: "uid", Value: session.GetUserId()},
 					log.Field{Key: "0", Value: datas[0]},

From 0aef4c74c2dfc90b7d62482f5c5b12c4d3b0955f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 7 Sep 2023 11:14:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/gm/module.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/gm/module.go b/modules/gm/module.go
index d26bf0666..8928304eb 100644
--- a/modules/gm/module.go
+++ b/modules/gm/module.go
@@ -770,7 +770,6 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
 						Message: err.Error(),
 					}
 				}
->>>>>>> b15e4e2a3a601f09b5bd8577d94611771e4c807d
 				this.Debug("使用bingo命令:uid = %s ",
 					log.Field{Key: "uid", Value: session.GetUserId()},
 					log.Field{Key: "0", Value: datas[0]},