diff --git a/common/socket/ServerEvent.go b/common/socket/ServerEvent.go index abf0bd48..b87a1893 100644 --- a/common/socket/ServerEvent.go +++ b/common/socket/ServerEvent.go @@ -63,7 +63,7 @@ func (s *Server) OnTick() (delay time.Duration, action gnet.Action) { func (s *Server) OnBoot(eng gnet.Engine) gnet.Action { s.eng = eng - cool.Loger.Infof(context.Background(), "syslog server is listening on %s\n", s.addr) + cool.Loger.Infof(context.Background(), " server is listening on %s\n", s.addr) return gnet.None } diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go index 9c90fe9d..fef28bcc 100644 --- a/logic/service/fight/fightc.go +++ b/logic/service/fight/fightc.go @@ -534,13 +534,14 @@ func (f *FightC) enterturn(fattack, sattack *action.SelectSkillAction) { var attacker, defender *input.Input //开始回合操作 for i := 0; i < 2; i++ { - + var oldskill interface{} if i == 0 { // attacker, defender = f.First, f.Second + oldskill, _ = deepcopy.Anything(fattack.Skill) //备份技能 } else { attacker, defender = f.Second, f.First - + oldskill, _ = deepcopy.Anything(sattack.Skill) //备份技能 } attacker.Exec(func(t input.Effect) bool { //回合开始前 @@ -557,9 +558,7 @@ func (f *FightC) enterturn(fattack, sattack *action.SelectSkillAction) { canuseskill = false } - var oldskill interface{} - oldskill, _ = deepcopy.Anything(fattack.Skill) //备份技能 canuseskillok := attacker.Exec(func(t input.Effect) bool { //这个是能否使用技能 //结算状态 //然后这里还可以处理自爆类 @@ -570,9 +569,13 @@ func (f *FightC) enterturn(fattack, sattack *action.SelectSkillAction) { }) if canuseskill && canuseskillok { //可以使用技能 - - f.processSkillAttack(attacker, defender, fattack) - fattack.Skill = oldskill.(*info.SkillEntity) //还原技能效果 + if i == 0 { // + f.processSkillAttack(attacker, defender, fattack) + fattack.Skill = oldskill.(*info.SkillEntity) //还原技能效果 + } else { + f.processSkillAttack(attacker, defender, sattack) + sattack.Skill = oldskill.(*info.SkillEntity) //还原技能效果 + } } diff --git a/logic/service/fight/info/BattleSkillEntity.go b/logic/service/fight/info/BattleSkillEntity.go index 4ed326e9..f6a18641 100644 --- a/logic/service/fight/info/BattleSkillEntity.go +++ b/logic/service/fight/info/BattleSkillEntity.go @@ -64,9 +64,9 @@ func CreateSkill(skill *model.SkillInfo, rand *rand.Rand, pet *BattlePetEntity) //如果PP是-1 ,那就是无限PP // ID小于10001的视为无效技能 - if skill.ID < 10001 { - return nil - } + // if skill.ID < 10001 { + // return nil + // } var ret SkillEntity ret.Rand = rand @@ -76,8 +76,11 @@ func CreateSkill(skill *model.SkillInfo, rand *rand.Rand, pet *BattlePetEntity) if !ok { glog.Error(context.Background(), "技能ID无效", "id", skill.ID) + } else { + ret.Move = move + } - ret.Move = move + // // 解析副作用参数 // sideEffectArgs := parseSideEffectArgs(move.SideEffectArg) // tt := strings.Split(move.SideEffect, " ")