From 06ff506672d626c709f1b9e2d74422532d3b31d0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 16 Aug 2023 17:24:22 +0800
Subject: [PATCH] 1

---
 server/bin/exported/android_attack_new.xml | 21 ++++++++++++++-------
 server/gameserver/base_agent.cc            |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/server/bin/exported/android_attack_new.xml b/server/bin/exported/android_attack_new.xml
index 5be87b48..ef0c768b 100644
--- a/server/bin/exported/android_attack_new.xml
+++ b/server/bin/exported/android_attack_new.xml
@@ -13,13 +13,20 @@
         <property ResultOption="BT_INVALID" />
       </node>
     </node>
-    <node class="Action" id="5">
-      <property Method="Self.BaseAgent::CoShot()" />
-      <property ResultOption="BT_INVALID" />
-    </node>
-    <node class="Action" id="2">
-      <property Method="Self.BaseAgent::CoMoveToCurrentTarget(60)" />
-      <property ResultOption="BT_INVALID" />
+    <node class="IfElse" id="6">
+      <node class="Condition" id="7">
+        <property Operator="Greater" />
+        <property Opl="Self.BaseAgent::GetAttackRange()" />
+        <property Opr="Self.BaseAgent::GetCurrentTargetDistance()" />
+      </node>
+      <node class="Action" id="5">
+        <property Method="Self.BaseAgent::CoShot()" />
+        <property ResultOption="BT_INVALID" />
+      </node>
+      <node class="Action" id="2">
+        <property Method="Self.BaseAgent::CoMoveToCurrentTarget(60)" />
+        <property ResultOption="BT_INVALID" />
+      </node>
     </node>
   </node>
 </behavior>
\ No newline at end of file
diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc
index f9811b33..83ec15df 100644
--- a/server/gameserver/base_agent.cc
+++ b/server/gameserver/base_agent.cc
@@ -511,7 +511,7 @@ behaviac::EBTStatus BaseAgent::CoShot()
         return behaviac::BT_FAILURE;
     }
     glm::vec3 dir = GetOwner()->GetPos().CalcDir(current_target_.Get()->GetPos());
-    if (GlmHelper::Norm(dir) > 150) {
+    if (GlmHelper::Norm(dir) > GetAttackRange()) {
         return behaviac::BT_FAILURE;
     }
     bool shot_ok = false;