Преглед изворни кода

守护模式 目标点 逃跑数量修正

mengyin пре 2 година
родитељ
комит
3e4deefb61

+ 26 - 26
Assets/Scene/BattleScenes/YLBattle_Defend.unity

@@ -160,37 +160,37 @@ PrefabInstance:
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 19.04
+      value: -41
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 2.906
+      value: 3.62
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 13.43
+      value: 3.34
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9998991
+      value: 0.70430416
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 3.3701254e-11
+      value: -9.330094e-10
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.014210403
+      value: 0.70989835
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.0000000030226388
+      value: 0.00000008367993
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
@@ -200,7 +200,7 @@ PrefabInstance:
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -1.628
+      value: 90.453
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
@@ -268,37 +268,37 @@ PrefabInstance:
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 18.66
+      value: -27.63506
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 2.906
+      value: 3.619999
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 26.79
+      value: 3.234447
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9998991
+      value: 0.70430416
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 3.3701254e-11
+      value: -9.330094e-10
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.014210403
+      value: 0.70989835
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.0000000030226388
+      value: 0.00000008367993
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
@@ -308,7 +308,7 @@ PrefabInstance:
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -1.628
+      value: 90.453
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
@@ -376,37 +376,37 @@ PrefabInstance:
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 19.37
+      value: -52.584404
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 2.906
+      value: 3.619999
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 1.85
+      value: 3.4308772
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9998991
+      value: 0.70430416
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 3.3701254e-11
+      value: -9.330094e-10
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.014210403
+      value: 0.70989835
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.0000000030226388
+      value: 0.00000008367993
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
@@ -416,7 +416,7 @@ PrefabInstance:
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -1.628
+      value: 90.453
       objectReference: {fileID: 0}
     - target: {fileID: 4685278651037015470, guid: 7ad7a2bd1d709494780bcc554bc5d147,
         type: 3}
@@ -1941,7 +1941,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1037602317}
   m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
-  m_LocalPosition: {x: 24.71, y: 20, z: -3.59}
+  m_LocalPosition: {x: 23.51, y: 18.7, z: -3.96}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -9881,7 +9881,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1023284842215788355}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 22.16, y: 23.07, z: 3.69}
+  m_LocalPosition: {x: 20.9, y: 23.07, z: 3.24}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

+ 5 - 2
Assets/Scripts/Core/BehaviorDesignerExtend/New/ActionMoveToTarget.cs

@@ -1,6 +1,7 @@
 using BehaviorDesigner.Runtime.Tasks.EnemyAI;
 using UnityEngine;
 using UnityEngine.AI;
+using UnityGameFramework.Runtime;
 
 namespace BehaviorDesigner.Runtime.Tasks.Movement
 {
@@ -98,9 +99,11 @@ namespace BehaviorDesigner.Runtime.Tasks.Movement
             //        return TaskStatus.Success;
             //    }
             //}
-
-            if (Vector3.Distance(transform.position, targetEndObj.Value.position) < 3)
+            SetDestination(movePos);
+            if (Vector3.Distance(transform.position, targetEndObj.Value.position) < 1.5f)
             {
+                EventComponent eventCmpt = GameEntry.GetComponent<EventComponent>();
+                eventCmpt.FireNow(this, new DefenseEventEscapeNum());
                 RoleManager.Instance.DeleteRole(role);
             }
             //else

+ 2 - 6
Assets/Scripts/Core/Client/NewBattle/Managers/RoleManager.cs

@@ -1354,18 +1354,14 @@ public class RoleManager : MonoBehaviour
                     }
                 }
             }
-            EventComponent eventCmpt = GameEntry.GetComponent<EventComponent>();
-            if ((BattleDefine.EBattleSceneType) int.Parse(gateMo.battleType) == BattleDefine.EBattleSceneType.EBattleType_Defense)
-            {
-                eventCmpt.FireNow(this, new DefenseEventEscapeNum());
-            }
+            
 
             if (role.roleType == RoleType.Boss)
             {
                 this._bossLive = false;
             }
             // ----------- 孵化器 同步 列表刷新 S -----------------------
-            
+            EventComponent eventCmpt = GameEntry.GetComponent<EventComponent>();
             eventCmpt.FireNow(this, new BattleEventRemoveUnit(role));
             // ----------- 孵化器 同步 列表刷新 E -----------------------
             DestoryRole(role, delayTime);