修改bug

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -195,7 +195,11 @@ namespace GameLogic.Combat.CombatType
                 testHeroInfoConfig.CopyToCombatHeroInfo((combatHeroInfo));
                 Vector3 pos = startPos + quaternion * enemyHeroPosOff[index];
                 cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), combatHeroInfo, pos,
-                    delegate(CombatHeroEntity entity) { combatController.CombatHeroController.AddHero(entity); }));
+                    delegate(CombatHeroEntity entity)
+                    {
+                        combatController.CombatHeroController.AddHero(entity);
+                        entity.CombatAIBasic.ChangeState(CombatHeroStateType.Active);
+                    }));
             }
         }
 

Assets/Scripts/GameLogic/Combat/Skill/S9013.cs

@@ -31,6 +31,8 @@ namespace GameLogic.Combat.Skill
         protected override void ProActiveSkill()
         {
             count = 0;
+            _currTime = 0;
+            addHp = 0;
             isActiveFuHuo = false;
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
         }

Assets/Scripts/GameLogic/Combat/Skill/S9022.cs

@@ -23,6 +23,9 @@ namespace GameLogic.Combat.Skill
         private TimeLineEventLogicGroupBasic _loopTimeLine;
         protected override void ProActiveSkill()
         {
+            currAddV = 0;
+            currTime = 0;
+            isUpdate = false;
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
         }
 

Assets/Scripts/GameLogic/Combat/Skill/S9064.cs

@@ -25,6 +25,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProUseSkill()
         {
+            _isUpdate = false;
             ActivationTimeLineData("9064");
             CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
                 .GetThis<CombatHeroEntity>()

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -66,6 +66,7 @@ namespace GameLogic.Combat
             if (startCombatInfo.CombatType == CombatType.CombatType.TestCombat)
             {
                 await CombatPanel.OpenCombatPanel();
+                CombatController.ChangeState(CombatController.fight);
             }
 
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);

Assets/StreamingAssets/assetBundle.zip.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -70,7 +70,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 1}
-  m_TargetSize: {x: 1170, y: 2532}
+  m_TargetSize: {x: 961, y: 2081}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -698,8 +698,8 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 484c0200
-      m_LastClickedID: 150600
+      m_SelectedIDs: 
+      m_LastClickedID: 0
       m_ExpandedIDs: 0aceedff94d1edffc2d4edffbcd5edffc6d5edffd0d5edffdad5edff28d7edff9c65efffc665efffca65efffce65efffdc65efff12e8faff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
@@ -785,7 +785,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: gamer
+    m_NameFilter: TESTC
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -797,7 +797,7 @@ MonoBehaviour:
     m_Folders:
     - Assets
     m_Globs: []
-    m_OriginalText: gamer
+    m_OriginalText: TESTC
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
@@ -865,9 +865,9 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 484c0200
-    m_LastClickedInstanceID: 150600
-    m_HadKeyboardFocusLastEvent: 0
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -947,9 +947,9 @@ MonoBehaviour:
     width: 571
     height: 1286
   m_SerializedDataModeController:
-    m_DataMode: 1
-    m_PreferredDataMode: 1
-    m_SupportedDataModes: 010000000200000003000000
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -963,7 +963,7 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 305
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker: