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,