diff --git a/logic/controller/item_use.go b/logic/controller/item_use.go index a8e597d20..952a49c32 100644 --- a/logic/controller/item_use.go +++ b/logic/controller/item_use.go @@ -67,7 +67,7 @@ func (h Controller) UsePetItemOutOfFight(data *item.C2S_USE_PET_ITEM_OUT_OF_FIGH result = &item.S2C_USE_PET_ITEM_OUT_OF_FIGHT{} currentPet.CalculatePetPane(false) copier.Copy(&result, currentPet) - defer c.Service.Info.Save(*c.Info) + // defer c.Service.Info.Save(*c.Info) return result, 0 } diff --git a/logic/service/fight/loop.go b/logic/service/fight/loop.go index 5bd7a1c15..996e1b03a 100644 --- a/logic/service/fight/loop.go +++ b/logic/service/fight/loop.go @@ -33,6 +33,8 @@ func (f *FightC) battleLoop() { head.Result = uint32(errorcode.ErrorCodes.ErrSystemBusyTryLater) p.SendPack(head.Pack(nil)) + + p.Service.Info.Save(*p.Info) } }) @@ -132,12 +134,6 @@ func (f *FightC) battleLoop() { f.callback(f.FightOverInfo) //先执行回调,再执行返回信息,在回调内修改战斗判断 } - f.Broadcast(func(ff *input.Input) { - - if p, ok := ff.Player.(*player.Player); ok { - p.Service.Info.Save(*p.Info) - } - }) close(f.over) diff --git a/logic/service/fight/new.go b/logic/service/fight/new.go index 5ae77b495..6585b3cfa 100644 --- a/logic/service/fight/new.go +++ b/logic/service/fight/new.go @@ -71,9 +71,9 @@ func NewFight(p1, p2 common.PlayerI, fn func(info.FightOverInfo)) (*FightC, erro f.Broadcast(func(ff *input.Input) { ff.Player.SendPackCmd(2503, &f.ReadyInfo) - if p, ok := ff.Player.(*player.Player); ok { - p.Service.Info.Save(*p.Info) - } + // if p, ok := ff.Player.(*player.Player); ok { + // p.Service.Info.Save(*p.Info) + // } }) cool.Cron.AfterFunc(loadtime, func() { diff --git a/modules/player/service/item.go b/modules/player/service/item.go index b63673e50..8480e102e 100644 --- a/modules/player/service/item.go +++ b/modules/player/service/item.go @@ -67,6 +67,7 @@ func NewItemService(id uint32) *ItemService { "player_id": "角色名称不能重复", }, PageQueryOp: &cool.QueryOp{ KeyWordField: []string{"player_id"}, + FieldEQ: []string{"player_id"}, Where: func(ctx context.Context) [][]interface{} { var ( //admin = cool.GetAdmin(ctx) diff --git a/modules/player/service/pet.go b/modules/player/service/pet.go index 0cc462853..b1312391a 100644 --- a/modules/player/service/pet.go +++ b/modules/player/service/pet.go @@ -163,6 +163,7 @@ func NewPetService(userid uint32) *PetService { Service: &cool.Service{ Model: model.NewPet(), PageQueryOp: &cool.QueryOp{ + FieldEQ: []string{"player_id", "free"}, Where: func(ctx context.Context) [][]interface{} { var ( admin = cool.GetAdmin(ctx) @@ -175,8 +176,8 @@ func NewPetService(userid uint32) *PetService { } } else { return [][]interface{}{ - {"player_id", userId, true}, - {"free", 1, true}, + // {"player_id", userId, true}, + // {"free", 1, true}, } }