修改bug

Assets/Art/Chapter/Chapter01.prefab

@@ -101,7 +101,7 @@ Transform:
   m_GameObject: {fileID: 309867417184024561}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.77, y: 0, z: -1.22}
+  m_LocalPosition: {x: -4.62, y: 0, z: -8.58}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -133,7 +133,7 @@ Transform:
   m_GameObject: {fileID: 571460846987654038}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -5.77, y: 0, z: 3.17}
+  m_LocalPosition: {x: -6.08, y: 0, z: -8.58}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -165,7 +165,7 @@ Transform:
   m_GameObject: {fileID: 584089170384335820}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -3.01, y: 0, z: -3.46}
+  m_LocalPosition: {x: -9.07, y: 0, z: -5.77}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -603,7 +603,7 @@ Transform:
   m_GameObject: {fileID: 2889610719925109127}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 4.55, y: 0, z: -3.03}
+  m_LocalPosition: {x: 6.89, y: 0, z: -14.49}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -696,7 +696,7 @@ Transform:
   m_GameObject: {fileID: 4229958501992864192}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.77, y: 0, z: -1.22}
+  m_LocalPosition: {x: -3.51, y: 0, z: -4.64}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -728,7 +728,7 @@ Transform:
   m_GameObject: {fileID: 5058045354685725676}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -3.01, y: 0, z: -3.46}
+  m_LocalPosition: {x: 0.89, y: 0, z: -7.29}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -760,7 +760,7 @@ Transform:
   m_GameObject: {fileID: 5666246559199764594}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -5.77, y: 0, z: 3.17}
+  m_LocalPosition: {x: 11.33, y: 0, z: -3.81}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2390,7 +2390,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7511078895408508815, guid: bc723e794e7407c4e892aa4bad09f635, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -2.05
+      value: -1.6
       objectReference: {fileID: 0}
     - target: {fileID: 7511078895408508815, guid: bc723e794e7407c4e892aa4bad09f635, type: 3}
       propertyPath: m_LocalPosition.y
@@ -2398,7 +2398,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7511078895408508815, guid: bc723e794e7407c4e892aa4bad09f635, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 18.28
+      value: 16.71
       objectReference: {fileID: 0}
     - target: {fileID: 7511078895408508815, guid: bc723e794e7407c4e892aa4bad09f635, type: 3}
       propertyPath: m_LocalRotation.w

Assets/Art/Chapter/Chapter02.prefab

@@ -211,7 +211,7 @@ Transform:
   m_GameObject: {fileID: 1024304339749364568}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 7.32, y: 1, z: 0.28}
+  m_LocalPosition: {x: 7.94, y: 1, z: -5.59}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -243,7 +243,7 @@ Transform:
   m_GameObject: {fileID: 1340324639198819751}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 8.06, y: 1, z: 3.44}
+  m_LocalPosition: {x: -7.91, y: 1, z: -8.72}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -483,7 +483,7 @@ Transform:
   m_GameObject: {fileID: 2176945933122915183}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1.54, y: 1, z: -3.16}
+  m_LocalPosition: {x: -5.99, y: 1, z: -4.47}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -590,7 +590,7 @@ Transform:
   m_GameObject: {fileID: 3520326436294203706}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 5.93, y: 0, z: -0.28}
+  m_LocalPosition: {x: 14.27, y: 0, z: -4.75}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -811,7 +811,7 @@ Transform:
   m_GameObject: {fileID: 3990350792359329656}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -5.23, y: 0, z: -7.55}
+  m_LocalPosition: {x: 1.31, y: 0, z: -14}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1166,7 +1166,7 @@ Transform:
   m_GameObject: {fileID: 5800267960652267684}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 4.55, y: 0, z: -3.03}
+  m_LocalPosition: {x: 8.3, y: 0, z: -8.27}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1402,7 +1402,7 @@ Transform:
   m_GameObject: {fileID: 6659104654675806319}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2.73, y: 0, z: -3.43}
+  m_LocalPosition: {x: -6.78, y: 0, z: -12.82}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1509,7 +1509,7 @@ Transform:
   m_GameObject: {fileID: 8739079611821122249}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -4.47, y: 1, z: -1.42}
+  m_LocalPosition: {x: -4.53, y: 1, z: -9.15}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Res/UI/HeroDetailPanel.prefab

@@ -8088,6 +8088,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8449,6 +8451,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -10442,6 +10446,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -12174,6 +12180,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -13167,6 +13175,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -15615,6 +15625,8 @@ PlayableDirector:
     value: {fileID: 8323024823130982353}
   - key: {fileID: 7089825263001972541, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
     value: {fileID: 4187952801782332659}
+  - key: {fileID: -3648922518979620870, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
+    value: {fileID: 8323024823130982353}
   m_ExposedReferences:
     m_References: []
 --- !u!225 &4187952801782332659
@@ -16853,6 +16865,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -17318,6 +17332,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -18209,6 +18225,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -18419,6 +18437,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:

Assets/Res/UIPlayable/HeroDetailPanelTimeline.playable

@@ -1,5 +1,61 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8155157172307244057
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 11aa0b29ff13eab449a39fa0f8c3c506, type: 3}
+  m_Name: RectTransformAnimationClip(Clone)(Clone)
+  m_EditorClassIdentifier: 
+  template:
+    _loopDuration: 0
+    _loopType: 0
+    _curve:
+      _curveType: 1
+      _easeType: 0
+      _animationCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 0
+          inSlope: 2
+          outSlope: 2
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0
+        - serializedVersion: 3
+          time: 1
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    _controlPosition: 0
+    _controlSize: 0
+    _controlRotation: 0
+    _controlScale: 1
+    _startValue:
+      _anchoredPosition: {x: 0, y: 0, z: 0}
+      _sizeDelta: {x: 0, y: 0}
+      _localRotation: {x: 0, y: 0, z: 0}
+      _localScale: {x: 1.1, y: 1.1, z: 1}
+    _endValue:
+      _anchoredPosition: {x: 0, y: 0, z: 0}
+      _sizeDelta: {x: 0, y: 0}
+      _localRotation: {x: 0, y: 0, z: 0}
+      _localScale: {x: 1, y: 1, z: 1}
 --- !u!114 &-6019252560737163005
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -92,6 +148,98 @@ MonoBehaviour:
     m_DisplayName: RectTransformAnimationClip
   m_Markers:
     m_Objects: []
+--- !u!114 &-3648922518979620870
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab997e120f9c3184195588497850c91e, type: 3}
+  m_Name: Rect Transform Animation Track (1)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0.4
+    m_ClipIn: 0
+    m_Asset: {fileID: -8155157172307244057}
+    m_Duration: 0.1333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -3648922518979620870}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: RectTransformAnimationClip
+  m_Markers:
+    m_Objects: []
 --- !u!114 &-3517064595543215121
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -188,12 +336,12 @@ MonoBehaviour:
       _anchoredPosition: {x: 0, y: 0, z: 0}
       _sizeDelta: {x: 0, y: 0}
       _localRotation: {x: 0, y: 0, z: 0}
-      _localScale: {x: 0.8, y: 0.8, z: 0}
+      _localScale: {x: 0.8, y: 0.8, z: 1}
     _endValue:
       _anchoredPosition: {x: 0, y: 0, z: 0}
       _sizeDelta: {x: 0, y: 0}
       _localRotation: {x: 0, y: 0, z: 0}
-      _localScale: {x: 1.1, y: 1.1, z: 0}
+      _localScale: {x: 1.1, y: 1.1, z: 1}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -210,6 +358,7 @@ MonoBehaviour:
   m_Tracks:
   - {fileID: -6019252560737163005}
   - {fileID: 7089825263001972541}
+  - {fileID: -3648922518979620870}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 30

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -145,7 +145,7 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
             combatHeroAnimtion = new CombatHeroGPUAnimtion();
         }
 
-
+        poolInterface.own.SetActive(true);
         combatHeroAnimtion.Init(this);
         CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
         if (!IsEnemy)
@@ -155,7 +155,7 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
             EventManager.Instance.Dispatch(CustomEventType.CreateHeroHp, createHeroHpEventData);
         }
 
-        poolInterface.own.SetActive(true);
+       
         callBack?.Invoke(this);
 #endif
         return this;

Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/GPURender.cs

@@ -1,4 +1,5 @@
 using System;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 
 namespace GameLogic.Combat.Hero.HeroGPU
@@ -40,6 +41,7 @@ namespace GameLogic.Combat.Hero.HeroGPU
             {
                 return;
             }
+
             _materialPropertyBlock.Clear();
 
             // Matrix4x4[] instData = new Matrix4x4[count];
@@ -57,20 +59,25 @@ namespace GameLogic.Combat.Hero.HeroGPU
             for (int i = 0; i < count; i++)
             {
                 HeroGPUMono heroGPUMono = gpuMonoList[i];
+                if (!heroGPUMono.gameObject.activeSelf)
+                {
+                    continue;
+                }
+
                 instData.Add(heroGPUMono.rootTrans.localToWorldMatrix);
-                animtionStata.Add( heroGPUMono.animtionState);
+                animtionStata.Add(heroGPUMono.animtionState);
                 edgeColor.Add(heroGPUMono.edgecolor);
-                edgeStrength.Add( heroGPUMono.edgeStength);
-                injuriedStrength.Add( heroGPUMono.injuriedStrength);
-                enableAnimations.Add( 1);
+                edgeStrength.Add(heroGPUMono.edgeStength);
+                injuriedStrength.Add(heroGPUMono.injuriedStrength);
+                enableAnimations.Add(1);
             }
-            
+
             _materialPropertyBlock.SetFloatArray(shader_enableShaderId, enableAnimations.ToArray());
             _materialPropertyBlock.SetMatrixArray(shader_animtionStateId, animtionStata.ToArray());
             _materialPropertyBlock.SetVectorArray(shader_edgeColor, edgeColor.ToArray());
             _materialPropertyBlock.SetFloatArray(shader_edgeStrength, edgeStrength.ToArray());
             _materialPropertyBlock.SetFloatArray(shader_injuriedStrength, injuriedStrength.ToArray());
-            Graphics.RenderMeshInstanced(rp, Mesh, 0, instData.ToArray(), count,0);
+            Graphics.RenderMeshInstanced(rp, Mesh, 0, instData.ToArray(), instData.Count, 0);
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroActiveState.cs

@@ -7,7 +7,10 @@ namespace GameLogic.Combat.Hero.State
         public CombatHeroActiveState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
         }
-
+        public override bool IsUpdateLockTarget()
+        {
+            return false;
+        }
         protected override void ProEnter()
         {
             TimeLineEventLogicGroupBasic timeLineEventLogicGroup =

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroMoveState.cs

@@ -42,8 +42,8 @@ namespace GameLogic.Combat.Hero.State
             }
 
             combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
-            // combatHeroEntity.CombatAIBasic.NavMeshAgent.obstacleAvoidanceType =
-            //     ObstacleAvoidanceType.HighQualityObstacleAvoidance;
+            combatHeroEntity.CombatAIBasic.NavMeshAgent.obstacleAvoidanceType =
+                ObstacleAvoidanceType.HighQualityObstacleAvoidance;
             combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 40;
         }
 

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroXiuMianState.cs

@@ -11,6 +11,7 @@ namespace GameLogic.Combat.Hero.State
     public class CombatHeroXiuMianState : CombatHeroStateBasic
     {
         private TimerEntity _timerEntity;
+
         public CombatHeroXiuMianState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
         }
@@ -22,6 +23,7 @@ namespace GameLogic.Combat.Hero.State
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
                 return;
             }
+
             combatHeroEntity.CombatAIBasic.isAlert = true;
             combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = true;
             CombatEventManager.Instance.AddEventListener(CombatEventType.ActiveCombat, ActiveCombat);
@@ -36,6 +38,7 @@ namespace GameLogic.Combat.Hero.State
             }
             else
             {
+                combatHeroEntity.GameObject.SetActive(false);
                 FinishTimeLine();
             }
         }
@@ -50,9 +53,10 @@ namespace GameLogic.Combat.Hero.State
 
         protected void ActiveHero()
         {
-            _timerEntity= TimerComponent.Instance.AddTimer(CombatCalculateTool.Instance.GetOdd(0, 2000),
+            _timerEntity = TimerComponent.Instance.AddTimer(CombatCalculateTool.Instance.GetOdd(0, 2000),
                 delegate
                 {
+                    combatHeroEntity.GameObject.SetActive(true);
                     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Active);
                 });
         }
@@ -68,6 +72,11 @@ namespace GameLogic.Combat.Hero.State
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.ActiveCombat, ActiveCombat);
         }
 
+        public override bool IsUpdateLockTarget()
+        {
+            return false;
+        }
+
         protected override void ProDispose()
         {
             TimerComponent.Instance.Remove(_timerEntity);