Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
2e101901dc
@ -32,7 +32,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListRe
|
|||||||
|
|
||||||
list, err := this.module.modelHunting.getHuntingList(session.GetUserId())
|
list, err := this.module.modelHunting.getHuntingList(session.GetUserId())
|
||||||
if mgo.MongodbNil == err {
|
if mgo.MongodbNil == err {
|
||||||
result := &pb.DBHunting{
|
list = &pb.DBHunting{
|
||||||
Id: primitive.NewObjectID().Hex(),
|
Id: primitive.NewObjectID().Hex(),
|
||||||
Uid: session.GetUserId(),
|
Uid: session.GetUserId(),
|
||||||
Boss: make(map[int32]int32),
|
Boss: make(map[int32]int32),
|
||||||
@ -40,12 +40,12 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListRe
|
|||||||
}
|
}
|
||||||
_cfg := this.module.configure.GetHuntingBossTypeConfigData()
|
_cfg := this.module.configure.GetHuntingBossTypeConfigData()
|
||||||
for k := range _cfg {
|
for k := range _cfg {
|
||||||
result.Boss[k] = 0
|
list.Boss[k] = 0
|
||||||
str := strconv.Itoa(int(k)) + "_1"
|
str := strconv.Itoa(int(k)) + "_1"
|
||||||
result.BossTime[str] = 0
|
list.BossTime[str] = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
this.module.modelHunting.Add(session.GetUserId(), result)
|
this.module.modelHunting.Add(session.GetUserId(), list)
|
||||||
conf := this.module.configure.GetGlobalConf()
|
conf := this.module.configure.GetGlobalConf()
|
||||||
if conf == nil {
|
if conf == nil {
|
||||||
code = pb.ErrorCode_ConfigNoFound
|
code = pb.ErrorCode_ConfigNoFound
|
||||||
|
Loading…
Reference in New Issue
Block a user