From 6343b80000e122155d7d2afdaa10b64ed1c8d94a Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 28 Nov 2023 14:58:31 +0800
Subject: [PATCH] =?UTF-8?q?GM=20=E5=88=9B=E5=BB=BA=E5=9D=90=E9=AA=91?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=AF=B9=E5=B7=B2=E7=BB=8F=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E5=9D=90=E9=AA=91=E5=81=9A=E5=B1=9E=E6=80=A7=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 comm/imodule.go                |  2 --
 modules/dragon/model_dragon.go | 21 +++++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/comm/imodule.go b/comm/imodule.go
index b1b4974ca..54338a714 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -416,8 +416,6 @@ type (
 		BingoJumpTask(session IUserSession, groupId, rtaskId int32) error
 		// 通过任务ID bingo
 		JumpTaskByTaskId(session IUserSession, rtaskId int32) error
-		// 查询我的世界任务
-		GetMyWorldtask(uid string) *pb.DBWorldtask
 		//接取商队任务 //接口废弃
 		AcceptCaravanTask(session IUserSession, groupId int32) (task *pb.Worldtask, errdata *pb.ErrorData)
 		//更新接取任务
diff --git a/modules/dragon/model_dragon.go b/modules/dragon/model_dragon.go
index defb82a84..7323a8fba 100644
--- a/modules/dragon/model_dragon.go
+++ b/modules/dragon/model_dragon.go
@@ -120,18 +120,27 @@ func (this *ModelDragon) CreateDragon(session comm.IUserSession, dragons map[str
 				dragon.Property["csubtime"] = c.Csubtime
 			}
 		}
-		if !bNewDragon {
-			continue
-		}
+
 		for k := range this.module.configure.GetDragonAttributeConf() {
 			dragon.Lvitem[k] = 1
 		}
 
-		if dbModel != nil {
-			err = dbModel.AddList(uid, dragon.Id, dragon)
+		if bNewDragon {
+			if dbModel != nil {
+				err = dbModel.AddList(uid, dragon.Id, dragon)
+			} else {
+				err = this.AddList(uid, dragon.Id, dragon)
+			}
 		} else {
-			err = this.AddList(uid, dragon.Id, dragon)
+			update := make(map[string]interface{}, 0)
+			update["property"] = dragon.Property
+			if dbModel != nil {
+				err = dbModel.ChangeList(uid, dragon.Id, update)
+			} else {
+				err = this.ChangeList(uid, dragon.Id, update)
+			}
 		}
+
 		if err != nil {
 			errdata = &pb.ErrorData{
 				Code:    pb.ErrorCode_DBError,