修复了rpc模块中日志输出时参数拼接错误的问题,同时修正了RegisterLogic函数中端口映射的逻辑错误。 feat(socket): 替换错误处理方式为panic 在ServerEvent.go中将网络启动失败的返回错误改为panic处理,提高错误可见性。 feat(fight): 增加战斗加载进度控制 在LoadPercent函数中增加对FightC非
194 lines
5.1 KiB
Go
194 lines
5.1 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/data/xmlres"
|
|
"blazing/common/socket/errorcode"
|
|
|
|
"blazing/logic/service/fight"
|
|
"blazing/logic/service/fight/info"
|
|
"blazing/logic/service/player"
|
|
"blazing/modules/blazing/model"
|
|
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
)
|
|
|
|
// 挑战地图boss
|
|
func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
if !c.CanFight() {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
|
|
}
|
|
|
|
var petid int
|
|
var mo *model.PetInfo
|
|
moinfo := &model.PlayerInfo{}
|
|
|
|
if c.Info.MapID == 515 && data.BossId == 0 { //说明是新手,随机生成
|
|
switch c.Info.PetList[0].ID {
|
|
|
|
case 1:
|
|
petid = 4
|
|
|
|
case 7:
|
|
petid = 1
|
|
|
|
case 4:
|
|
petid = 7
|
|
}
|
|
|
|
mo = c.GenPetInfo(
|
|
int(petid), 24, //24个体
|
|
-1,
|
|
0, //野怪没特性
|
|
0,
|
|
2)
|
|
moinfo.Nick = xmlres.PetMAP[int(mo.ID)].DefName
|
|
moinfo.PetList = append(moinfo.PetList, *mo)
|
|
} else {
|
|
|
|
mdata, ok := xmlres.MonsterMap[int(c.Info.MapID)]
|
|
if !ok {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
|
}
|
|
if len(mdata.Bosses) == 0 {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
|
}
|
|
for _, bc := range mdata.Bosses {
|
|
if bc.Id == nil {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
|
|
|
}
|
|
if uint32(*bc.Id) == data.BossId {
|
|
for _, bm := range bc.BossMon {
|
|
mo = c.GenPetInfo(
|
|
gconv.Int(bm.MonID), 24, //24个体
|
|
-1,
|
|
0, //野怪没特性
|
|
0,
|
|
2)
|
|
|
|
mo.Level = uint32(bm.Lv)
|
|
mo.CalculatePetPane()
|
|
mo.Hp = uint32(bm.Hp)
|
|
mo.MaxHp = uint32(bm.Hp)
|
|
moinfo.PetList = append(moinfo.PetList, *mo)
|
|
|
|
}
|
|
moinfo.Nick = xmlres.PetMAP[int(mo.ID)].DefName
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ai := player.NewAI_player(moinfo)
|
|
fight.NewFight(info.BattleMode.MULTI_MODE, info.BattleStatus.FIGHT_WITH_BOSS, c, ai)
|
|
|
|
return nil, -1
|
|
}
|
|
|
|
// 战斗野怪
|
|
func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
if !c.CanFight() {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
|
|
}
|
|
refpet := c.OgreInfo.Data[data.Number]
|
|
if refpet.Id == 0 {
|
|
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
|
}
|
|
mo := c.GenPetInfo(
|
|
int(refpet.Id), -1,
|
|
-1,
|
|
0, //野怪没特性
|
|
int(refpet.Shiny),
|
|
int(refpet.Lv))
|
|
|
|
if c.FightC != nil {
|
|
return nil, errorcode.ErrorCodes.ErrOnlineOver6HoursCannotFight
|
|
}
|
|
moinfo := &model.PlayerInfo{}
|
|
moinfo.Nick = xmlres.PetMAP[int(mo.ID)].DefName
|
|
moinfo.PetList = append(moinfo.PetList, *mo)
|
|
ai := player.NewAI_player(moinfo)
|
|
|
|
fight.NewFight(info.BattleMode.MULTI_MODE, info.BattleStatus.FIGHT_WITH_NPC, c, ai)
|
|
|
|
return nil, -1
|
|
}
|
|
|
|
// 准备战斗
|
|
func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.FightC.ReadyFight(c)
|
|
return nil, -1
|
|
}
|
|
|
|
// 接收战斗或者取消战斗的包
|
|
func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
if !c.CanFight() {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
|
|
}
|
|
if ok, p1 := c.AgreeBattle(data.UserID, data.Flag, data.Mode); ok {
|
|
fight.NewFight(data.Mode, info.BattleStatus.FIGHT_WITH_PLAYER, c, p1) ///开始对战,房主方以及被邀请方
|
|
}
|
|
return nil, -1
|
|
}
|
|
|
|
// 邀请其他人进行战斗
|
|
func (h Controller) OnPlayerInviteOtherFight(data *fight.InviteToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
if !c.CanFight() {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
|
|
}
|
|
|
|
c.InvitePlayerToBattle(&info.PVPinfo{PlayerID: data.UserID, Mode: data.Mode})
|
|
|
|
return nil, 0
|
|
}
|
|
|
|
// 取消和他人战斗
|
|
func (h Controller) OnPlayerCanceledOtherInviteFight(data *fight.InviteFightCancelInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
c.CancelBattle()
|
|
|
|
return nil, 0
|
|
}
|
|
|
|
// 使用技能包
|
|
func (h Controller) UseSkill(data *fight.UseSkillInInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
if c.FightC != nil {
|
|
c.FightC.UseSkill(c, int32(data.SkillId))
|
|
}
|
|
|
|
return nil, 0
|
|
}
|
|
|
|
// 战斗逃跑
|
|
func (h Controller) Escape(data *fight.EscapeFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.FightC.Over(c, info.BattleOverReason.PlayerEscape)
|
|
return nil, 0
|
|
}
|
|
|
|
// 切换精灵
|
|
func (h Controller) ChangePet(data *fight.ChangePetInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.FightC.ChangePet(c, data.CatchTime)
|
|
return nil, -1
|
|
}
|
|
|
|
// 切换精灵
|
|
func (h Controller) Capture(data *fight.CatchMonsterInboundInfo, c *player.Player) (result *info.CatchMonsterOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.FightC.Capture(c, data.CapsuleId)
|
|
return nil, -1
|
|
}
|
|
|
|
// 加载进度
|
|
func (h Controller) LoadPercent(data *fight.LoadPercentInboundInfo, c *player.Player) (result *info.LoadPercentOutboundInfo, err errorcode.ErrorCode) {
|
|
if c.FightC != nil {
|
|
|
|
c.FightC.LoadPercent(c, int32(data.Percent))
|
|
}
|
|
|
|
return nil, -1
|
|
}
|