根据提供的code differences信息,由于没有具体的代码变更内容,我将生成一个通用的commit message模板:
``` docs(changelog): 更新版本更新日志 - 添加新功能说明 - 修复已知问题记录 - 更新相关文档内容 ```
This commit is contained in:
@@ -31,15 +31,13 @@ func (f *FightC) battleLoop() {
|
||||
for !f.closefight {
|
||||
|
||||
f.Round++
|
||||
//fmt.Printf("—— 第 %d 回合开始 ——\n", f.Round)
|
||||
// AI自动技能
|
||||
|
||||
actions := f.collectPlayerActions(ourID, oppID)
|
||||
if f.closefight {
|
||||
|
||||
break
|
||||
}
|
||||
println("进入回合", f.Round)
|
||||
|
||||
f.resolveRound(actions[ourID], actions[oppID])
|
||||
|
||||
}
|
||||
@@ -89,6 +87,7 @@ func (f *FightC) battleLoop() {
|
||||
defer f.Our.Player.(*player.Player).Service.Barge.Update(f.Opp.Player.GetInfo().PetList[0].ID, true)
|
||||
|
||||
}
|
||||
f.Our.Player.(*player.Player).GenMonster()
|
||||
}
|
||||
|
||||
//大乱斗,给个延迟
|
||||
@@ -109,8 +108,7 @@ func (f *FightC) battleLoop() {
|
||||
f.callback(f.FightOverInfo) //先执行回调,再执行返回信息,在回调内修改战斗判断
|
||||
|
||||
}
|
||||
// close(f.actionChan)
|
||||
fmt.Println(f.ownerID, "战斗循环结束")
|
||||
|
||||
close(f.over)
|
||||
|
||||
}
|
||||
@@ -191,8 +189,7 @@ func (f *FightC) collectPlayerActions(ourID, oppID uint32) map[uint32]action.Bat
|
||||
if f.Info.Status == info.BattleMode.FIGHT_WITH_NPC && pid == 0 {
|
||||
f.Switch = make(map[uint32]*action.ActiveSwitchAction)
|
||||
f.Our.Player.SendPackCmd(2407, &ret.Reason)
|
||||
// f.Opp.GetAction()
|
||||
println("开始执行NPC死切动作")
|
||||
|
||||
}
|
||||
continue
|
||||
}
|
||||
@@ -310,7 +307,7 @@ func (f *FightC) handleItemAction(a *action.UseItemAction) {
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
r := f.GetInputByAction(a, false).Player.(*player.Player).Service.Item.CheakItem(a.ItemID)
|
||||
r := f.GetInputByAction(a, false).Player.(*player.Player).Service.Item.CheakItem(uint32(a.ItemID))
|
||||
if r < 1 {
|
||||
return
|
||||
}
|
||||
@@ -400,7 +397,7 @@ func (f *FightC) handleSkillActions(a1, a2 action.BattleActionI) {
|
||||
}
|
||||
|
||||
f.enterturn(s1, s2)
|
||||
fmt.Println("玩家执行技能:", s1.PlayerID, s1.Info.ID, s2.PlayerID, s2.Info.ID)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user