server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2021-04-29 15:34:14 +08:00
parent aff5f45a95
commit 8c98601a31
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/gameserver/android.ai.cc
View File

@ -494,11 +494,6 @@ void AndroidNewAI::UpdateThinking()
} }
} else { } else {
Creature* target = GetTarget(); Creature* target = GetTarget();
#ifdef DEBUG
if (App::Instance()->HasFlag(20)) {
target = nullptr;
}
#endif
if (target) { if (target) {
node_.target.Attach(target); node_.target.Attach(target);
ChangeToStateNewAI(ASE_Attack); ChangeToStateNewAI(ASE_Attack);
@ -528,6 +523,12 @@ void AndroidNewAI::UpdateAttack()
ChangeToStateNewAI(ASE_Thinking); ChangeToStateNewAI(ASE_Thinking);
return; return;
} }
#ifdef DEBUG
if (App::Instance()->HasFlag(20)) {
ChangeToStateNewAI(ASE_Thinking);
return;
}
#endif
float distance = myself->GetPos().Distance(node_.target.Get()->GetPos()); float distance = myself->GetPos().Distance(node_.target.Get()->GetPos());
if (distance > GetAttackRange()) { if (distance > GetAttackRange()) {
if (ai_meta->i->pursuit_radius() <= 0) { if (ai_meta->i->pursuit_radius() <= 0) {

2
server/gameserver/player.cc
View File

@ -1115,7 +1115,7 @@ void Player::_CMExecCommand(f8::MsgHdr& hdr, const cs::CMExecCommand& msg)
if (cmds.empty()) { if (cmds.empty()) {
App::Instance()->UnSetFlag(20); App::Instance()->UnSetFlag(20);
} else { } else {
if (cmds[0] == "peace") { if (cmds[1] == "peace") {
App::Instance()->SetFlag(20); App::Instance()->SetFlag(20);
} }
} }