diff --git a/logic/service/fight/boss/NewSeIdx_699.go b/logic/service/fight/boss/NewSeIdx_699.go index 92757b157..4dcf93427 100644 --- a/logic/service/fight/boss/NewSeIdx_699.go +++ b/logic/service/fight/boss/NewSeIdx_699.go @@ -3,8 +3,6 @@ package effect import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - - "github.com/alpacahq/alpacadecimal" ) // 60. "20%弹60点固定伤害" StarLevel="0 @@ -29,7 +27,7 @@ func (e *NewSel699) Skill_Use_ex() bool { e.Ctx().Opp.Damage(e.Ctx().Our, &info.DamageZone{ Type: info.DamageType.Fixed, - Damage: alpacadecimal.Min(e.Ctx().Opp.SumDamage, e.Args()[1]), + Damage: e.Args()[1], //alpacadecimal.Min(e.Ctx().Opp.SumDamage, e.Args()[1]), }) return true diff --git a/logic/service/fight/boss/NewSeIdx_700.go b/logic/service/fight/boss/NewSeIdx_700.go index acc6b0fbc..2fa358c31 100644 --- a/logic/service/fight/boss/NewSeIdx_700.go +++ b/logic/service/fight/boss/NewSeIdx_700.go @@ -13,7 +13,7 @@ type NewSel700 struct { NewSel0 } -func (e *NewSel700) Skill_Use() bool { +func (e *NewSel700) Skill_Use_ex() bool { if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime { return true } diff --git a/modules/player/service/pet.go b/modules/player/service/pet.go index fe257563d..c0fcee023 100644 --- a/modules/player/service/pet.go +++ b/modules/player/service/pet.go @@ -59,7 +59,7 @@ func (s *PetService) UPdatePrice(ctime uint32, Price uint32, is_sale uint32) err } var p model.Pet s.dbm(s.Model).Where("catch_time", ctime).Scan(&p) - if p.SalePrice!=0&&p.SalePrice != Price && utils.IsToday(p.UpdateTime) { //说明要修改价格 + if p.SalePrice != 0 && p.SalePrice != Price && utils.IsToday(p.UpdateTime) { //说明要修改价格 return fmt.Errorf("一天只允许改价一次") } res0, err := s.dbm(s.Model). @@ -302,6 +302,18 @@ func NewPetService(userid uint32) *PetService { userid: userid, Service: &cool.Service{ Model: model.NewPet(), + ListQueryOp: &cool.QueryOp{ + FieldEQ: []string{"player_id", "free", "is_sale"}, + Where: func(ctx context.Context) [][]interface{} { + + return [][]interface{}{ + // {"player_id", userId, true}, + {"free", 1, true}, + {"is_vip", 0, true}, + } + + }, + }, PageQueryOp: &cool.QueryOp{ FieldEQ: []string{"player_id", "free", "is_sale"}, Where: func(ctx context.Context) [][]interface{} {