From b102f801884db7b35b4637dda7e55c7d5a068185 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 5 Sep 2023 16:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=8C=BA=E6=9C=8Did=20?=
 =?UTF-8?q?=E5=92=8C=E5=94=AF=E4=B8=80id=20=E6=9F=A5=E8=AF=A2=E5=9D=90?=
 =?UTF-8?q?=E9=AA=91=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go                |  3 ++
 modules/dragon/model_dragon.go | 64 ++++++++++++++++------------------
 modules/dragon/module.go       | 22 ++++++++++++
 modules/modulebase.go          |  4 +--
 4 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/comm/imodule.go b/comm/imodule.go
index 4d8258272..7500dd652 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -660,5 +660,8 @@ type (
 		QueryBigDragonList(uid string) (dragon []*pb.DBDragon, err error)
 		// 通过ID 查询龙的信息
 		QueryDragonById(uid string, dragonid string) (dragon *pb.DBDragon, err error)
+
+		// 跨服接口 通过 服务器标签和唯一id 获取坐骑信息
+		QueryDragonByTagAndOid(tag string, objId string) (dragon *pb.DBDragon, err error)
 	}
 )
diff --git a/modules/dragon/model_dragon.go b/modules/dragon/model_dragon.go
index b87c10c9f..af81204e0 100644
--- a/modules/dragon/model_dragon.go
+++ b/modules/dragon/model_dragon.go
@@ -82,10 +82,19 @@ func (this *ModelDragon) CreateDragon(session comm.IUserSession, dragons map[str
 				return
 			}
 		}
-		bFound := false
+		dragon = &pb.DBDragon{
+			Id:       primitive.NewObjectID().Hex(),
+			Uid:      uid,
+			Dragonid: dragonCfgId,
+			Lv:       lv,
+			Exp:      0,
+			Property: map[string]int32{},
+			Play:     map[int32]*pb.PlayData{},
+			Rtime:    configure.Now().Unix(),
+		}
 		for _, obj := range dragonList {
 			if obj.Dragonid == dragonCfgId { // 重复获得 直接返回
-				bFound = true
+				dragon.Id = obj.Id
 				update := make(map[string]interface{}, 0)
 				update["lv"] = lv // 更新等级
 				if err = this.UpdateDragonData(session.GetUserId(), obj.Id, update); err != nil {
@@ -99,40 +108,29 @@ func (this *ModelDragon) CreateDragon(session comm.IUserSession, dragons map[str
 				break
 			}
 		}
-		if !bFound {
-			dragon = &pb.DBDragon{
-				Id:       primitive.NewObjectID().Hex(),
-				Uid:      uid,
-				Dragonid: dragonCfgId,
-				Lv:       lv,
-				Exp:      0,
-				Property: map[string]int32{},
-				Play:     map[int32]*pb.PlayData{},
-				Rtime:    configure.Now().Unix(),
-			}
-			if conf, err := this.module.configure.GetDragonConfById(dragonCfgId, lv); err == nil {
-				if c, err := this.module.configure.GetDragonMount(dragonCfgId, 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["itemsprint"] = c.Itemsprint
-					dragon.Property["caddtime"] = c.Caddtime
-					dragon.Property["csubtime"] = c.Csubtime
-				}
-			}
 
-			if dbModel != nil {
-				if dbModel, err1 := this.module.GetDBModelByUid(uid, this.TableName); err1 == nil {
-					err = dbModel.AddList(uid, dragonCfgId, dragon)
-				}
-			} else {
-				err = this.AddList(uid, dragonCfgId, dragon)
+		if conf, err := this.module.configure.GetDragonConfById(dragonCfgId, lv); err == nil {
+			if c, err := this.module.configure.GetDragonMount(dragonCfgId, 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["itemsprint"] = c.Itemsprint
+				dragon.Property["caddtime"] = c.Caddtime
+				dragon.Property["csubtime"] = c.Csubtime
 			}
 		}
+
+		if dbModel != nil {
+			if dbModel, err1 := this.module.GetDBModelByUid(uid, this.TableName); err1 == nil {
+				err = dbModel.AddList(uid, dragonCfgId, dragon)
+			}
+		} else {
+			err = this.AddList(uid, dragonCfgId, dragon)
+		}
 	}
 	chanegList = append(chanegList, dragon)
 	session.SendMsg(string(this.module.GetType()), "change", &pb.DragonChangePush{
diff --git a/modules/dragon/module.go b/modules/dragon/module.go
index 3a009ee3b..351383ffe 100644
--- a/modules/dragon/module.go
+++ b/modules/dragon/module.go
@@ -8,6 +8,10 @@ import (
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
+	"go_dreamfactory/sys/db"
+	"time"
+
+	"go.mongodb.org/mongo-driver/bson"
 )
 
 func NewModule() core.IModule {
@@ -126,3 +130,21 @@ func (this *Dragon) QueryDragonById(uid string, dragonid string) (dragon *pb.DBD
 	err = fmt.Errorf("not found dragon dragonid:%s", dragonid)
 	return
 }
+
+// 通过区服id 和唯一id 查询坐骑信息
+func (this *Dragon) QueryDragonByTagAndOid(tag string, objId string) (dragon *pb.DBDragon, err error) {
+	var (
+		conn  *db.DBConn
+		model *db.DBModel
+	)
+	if conn, err = db.ServerDBConn(tag); err != nil {
+		return
+	}
+	dragon = &pb.DBDragon{}
+	model = db.NewDBModel(this.modelDragon.TableName, time.Hour, conn)
+	if model.DB.FindOne(comm.TableHero, bson.M{"_id": objId}).Decode(dragon); err != nil {
+		return
+	}
+
+	return
+}
diff --git a/modules/modulebase.go b/modules/modulebase.go
index 48976d2ff..fbdda3575 100644
--- a/modules/modulebase.go
+++ b/modules/modulebase.go
@@ -469,7 +469,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
 		case comm.PandaType:
 			panda[v.T] = 1
 		case comm.MountsType:
-			mts[v.T] = 1
+			mts[v.T] = v.N // N　表示等级
 		case comm.PerType:
 			per[v.T] = 1
 		default:
@@ -691,7 +691,7 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
 		case comm.PandaType:
 			panda[v.T] = 1
 		case comm.MountsType:
-			mts[v.T] = 1
+			mts[v.T] += v.N
 		case comm.PerType:
 			per[v.T] = 1
 		default: