diff --git a/logic/service/player/ai.go b/logic/service/player/ai.go index aab9d3d79..8917f1edb 100644 --- a/logic/service/player/ai.go +++ b/logic/service/player/ai.go @@ -1,8 +1,16 @@ package player +import "blazing/modules/player/model" + type AI_player struct { baseplayer CanCapture int BossScript string } + +func (p *AI_player) GetPetInfo(_ uint32) []model.PetInfo { + ret := make([]model.PetInfo, 0, len(p.Info.PetList)) + ret = append(ret, p.Info.PetList...) + return ret +} diff --git a/modules/player/service/item.go b/modules/player/service/item.go index 470502a77..9f6222992 100644 --- a/modules/player/service/item.go +++ b/modules/player/service/item.go @@ -61,7 +61,7 @@ func (s *ItemService) UPDATE(id uint32, count int) error { if ok { updateModel := s.dbm(s.Model).Where("item_id", id) if count < 0 { - updateModel = updateModel.Where("item_cnt + ? > 0", count) + updateModel = updateModel.Where("item_cnt + ? >= 0", count) } result, err := updateModel.Increment("item_cnt", count) diff --git a/modules/player/service/pet_fusion_tx.go b/modules/player/service/pet_fusion_tx.go index 5f2c8e60c..5abc44dc5 100644 --- a/modules/player/service/pet_fusion_tx.go +++ b/modules/player/service/pet_fusion_tx.go @@ -173,7 +173,7 @@ func updateItemCountTx(tx gdb.TX, userID uint32, id uint32, count int) error { Where("is_vip", cool.Config.ServerInfo.IsVip). Where("item_id", id) if count < 0 { - updateModel = updateModel.Where("item_cnt + ? > 0", count) + updateModel = updateModel.Where("item_cnt + ? >= 0", count) } result, err := updateModel.Increment("item_cnt", count)