重构
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"blazing/common/data/entity"
|
||||
"blazing/common/data/socket"
|
||||
"blazing/common/socket/errorcode"
|
||||
"blazing/common/socket/handler"
|
||||
"blazing/logic/service/fight"
|
||||
@@ -9,14 +9,14 @@ import (
|
||||
"blazing/modules/blazing/model"
|
||||
)
|
||||
|
||||
func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *entity.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *socket.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
c.IsFighting = true
|
||||
t1 := handler.NewTomeeHeader(2503, c.UserID)
|
||||
t1 := handler.NewTomeeHeader(2503, c.Info.UserID)
|
||||
ttt := info.NoteReadyToFightInfo{
|
||||
OwnerID: data.Head.UserID,
|
||||
FightId: 3,
|
||||
}
|
||||
ttt.OurInfo = info.FightUserInfo{UserID: c.UserID}
|
||||
ttt.OurInfo = info.FightUserInfo{UserID: c.Info.UserID}
|
||||
|
||||
ttt.OurPetList = []info.ReadyFightPetInfo{{ID: 300,
|
||||
Level: 100,
|
||||
@@ -41,13 +41,13 @@ func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundIn
|
||||
c.SendPack(t1.Pack(&ttt))
|
||||
return nil, -1
|
||||
}
|
||||
func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *entity.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *socket.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
|
||||
t1 := handler.NewTomeeHeader(2504, c.UserID)
|
||||
t1 := handler.NewTomeeHeader(2504, c.Info.UserID)
|
||||
rett := fight.FightStartOutboundInfo{
|
||||
IsCanAuto: 0,
|
||||
Info1: fight.FightPetInfo{PetID: 300,
|
||||
UserID: c.UserID,
|
||||
UserID: c.Info.UserID,
|
||||
Hp: 1000,
|
||||
MaxHp: 1000,
|
||||
Level: 1,
|
||||
@@ -72,7 +72,7 @@ func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *entit
|
||||
/**
|
||||
* 接收战斗或者取消战斗的包
|
||||
*/
|
||||
func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *entity.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *socket.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
||||
|
||||
return nil, -1
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user