ef7595a218
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight): 移除调试打印语句并修复宠物类型验证逻辑 移除了PetKing函数中的调试打印语句，确保不再输出调试信息到控制台。 同时保持了宠物类型验证的核心逻辑不变。 fix(fight): 修正boss技能伤害计算公式 修改了NewSel323的OnSkill方法中伤害计算的公式， 将原来的百分比计算方式调整为正确的血量差值计算方式。 feat(space): 调整空间定时器间隔时间 将Space.Next方法的时间间隔从6-30秒大幅增加到10-30分钟， 以适应实际的游戏节奏需求。 refactor(config): 更新宠物基础配置模型结构 移除了PetBaseConfig中Hp字段的not null约束， 使配置更加灵活。 feat(config): 扩展地图坑位配置支持新功能 为map_pit配置添加了MustTask必做任务字段和DropItemIds掉落物ID列表， 同时为item和pet服务增加了列表查询操作的等值过滤支持。 ```
99 lines
2.6 KiB
Go
99 lines
2.6 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
"blazing/modules/player/model"
|
|
|
|
"blazing/logic/service/common"
|
|
"blazing/logic/service/fight"
|
|
"blazing/logic/service/fight/info"
|
|
"blazing/logic/service/player"
|
|
)
|
|
|
|
//大乱斗
|
|
|
|
func (h Controller) PetMelee(data *fight.StartPetWarInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.Fightinfo.Mode = info.BattleMode.PET_MELEE
|
|
c.Fightinfo.Status = info.BattleMode.PET_MELEE
|
|
|
|
err = c.JoinFight(func(p common.PlayerI) bool {
|
|
_, err = fight.NewFight(p, c, func(foi model.FightOverInfo) {
|
|
if foi.Reason == 0 { //我放获胜
|
|
|
|
if foi.WinnerId == c.GetInfo().UserID {
|
|
c.Info.MessWin += 1
|
|
c.MessWin(true)
|
|
p.MessWin(false)
|
|
|
|
} else {
|
|
p.GetInfo().MessWin += 1
|
|
p.MessWin(true)
|
|
c.MessWin(false)
|
|
}
|
|
|
|
}
|
|
if foi.Reason == model.BattleOverReason.PlayerOffline {
|
|
if foi.WinnerId == c.GetInfo().UserID {
|
|
|
|
p.MessWin(false)
|
|
|
|
} else {
|
|
|
|
c.MessWin(false)
|
|
}
|
|
}
|
|
|
|
}) ///开始对战,房主方以及被邀请方
|
|
return err <= 0
|
|
})
|
|
|
|
return
|
|
}
|
|
func (h Controller) PetKing(data *fight.PetKingJoinInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.Fightinfo.Status = info.BattleMode.PET_TOPLEVEL
|
|
var ElementTypeNumbers = []int{1, 2, 3, 5, 11, 4, 6, 7, 9}
|
|
|
|
switch data.Type {
|
|
case 5:
|
|
c.Fightinfo.Mode = info.BattleMode.SINGLE_MODE
|
|
case 6:
|
|
c.Fightinfo.Mode = info.BattleMode.MULTI_MODE
|
|
case 11:
|
|
//草","水","火","电","战斗","飞行","机械","地面","冰"
|
|
// 按顺序：草、水、火、电、战斗、飞行、机械、地面、冰
|
|
|
|
//println("11", c.GetPetInfo()[0].Type(), ElementTypeNumbers[data.FightType-1])
|
|
if c.GetPetInfo()[0].Type() != int(ElementTypeNumbers[data.FightType-1]) {
|
|
return nil, errorcode.ErrorCode(errorcode.ErrorCodes.ErrVictoryConditionNotMet)
|
|
}
|
|
c.Fightinfo.Mode = info.BattleMode.SINGLE_MODE
|
|
c.Fightinfo.FightType = data.FightType
|
|
}
|
|
err = c.JoinFight(func(p common.PlayerI) bool {
|
|
_, err = fight.NewFight(p, c, func(foi model.FightOverInfo) {
|
|
if foi.Reason == 0 { //我放获胜
|
|
switch data.Type {
|
|
case 11:
|
|
if foi.WinnerId == c.GetInfo().UserID {
|
|
c.ItemAdd(80000000+int64(ElementTypeNumbers[data.FightType-1]), 1)
|
|
} else {
|
|
p.ItemAdd(80000000+int64(ElementTypeNumbers[data.FightType-1]), 1)
|
|
}
|
|
default:
|
|
if foi.WinnerId == c.GetInfo().UserID {
|
|
c.Info.MonKingWin += 1
|
|
} else {
|
|
p.GetInfo().MonKingWin += 1
|
|
}
|
|
}
|
|
|
|
}
|
|
}) ///开始对战,房主方以及被邀请方
|
|
return err <= 0
|
|
})
|
|
|
|
return
|
|
}
|