修改bug

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

@@ -54,9 +54,7 @@ namespace GameLogic.Combat.Hero
                 bool isEnd = timeLineEventLogicGroupBasic.Update(deltaTime);
                 if (isEnd)
                 {
-                   
-                    _currRunEventLogicGroupList.RemoveAt(i);
-                    i--;
+                    _currRunEventLogicGroupList.Remove(timeLineEventLogicGroupBasic);
                     CObjectPool.Instance.Recycle(timeLineEventLogicGroupBasic);
                 }
             }

UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Console
   m_RootView: {fileID: 7}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -74,7 +74,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 35
+  controlID: 24
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -95,8 +95,8 @@ MonoBehaviour:
     y: 0
     width: 541
     height: 440
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -152,7 +152,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 58
+  controlID: 123
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -230,7 +230,7 @@ MonoBehaviour:
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 200
+  controlID: 139
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -277,7 +277,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 57
+  controlID: 23
   draggingID: 0
 --- !u!114 &12
 MonoBehaviour:
@@ -298,8 +298,8 @@ MonoBehaviour:
     y: 0
     width: 263
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -350,8 +350,8 @@ MonoBehaviour:
     y: 0
     width: 438
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -367,7 +367,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: AnimatorControllerTool
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -376,15 +376,15 @@ MonoBehaviour:
     y: 0
     width: 604
     height: 859
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 24}
   m_Panes:
   - {fileID: 24}
   - {fileID: 17}
   - {fileID: 16}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -559,15 +559,16 @@ MonoBehaviour:
     - {fileID: 7813710424225025242, guid: 965d15d735575274896b1aca47c37250, type: 2}
     - {fileID: -5089597649012980088, guid: 5a66fd6a72cb7af4381a35be43163796, type: 2}
     - {fileID: -5089597649012980088, guid: c6d72984d2477a746861eb76fe0bdea9, type: 2}
+    - {fileID: -5089597649012980088, guid: d3cc129dd5d1af544a9bcaf9869759cb, type: 2}
     m_ValueSerializationHelper:
-    - e00: 0.5623966
+    - e00: 0.3263158
       e01: 0
       e02: 0
-      e03: 128.44698
+      e03: -1.3157959
       e10: 0
-      e11: 0.5623966
+      e11: 0.3263158
       e12: 0
-      e13: 158.5154
+      e13: 358.7105
       e20: 0
       e21: 0
       e22: 1
@@ -688,10 +689,26 @@ MonoBehaviour:
       e31: 0
       e32: 0
       e33: 1
+    - e00: 0.3263158
+      e01: 0
+      e02: 0
+      e03: -1.3157959
+      e10: 0
+      e11: 0.3263158
+      e12: 0
+      e13: 360.04218
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
   m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: 0325389693ca4a745b34f45418f1b0e8, type: 2}
+  m_AnimatorController: {fileID: 9100000, guid: c6d72984d2477a746861eb76fe0bdea9, type: 2}
   m_BreadCrumbs:
-  - m_Target: {fileID: -8315694826801552787, guid: 0325389693ca4a745b34f45418f1b0e8, type: 2}
+  - m_Target: {fileID: -5089597649012980088, guid: c6d72984d2477a746861eb76fe0bdea9, type: 2}
     m_ScrollPosition: {x: 0, y: 0}
   stateMachineGraph: {fileID: 0}
   stateMachineGraphGUI: {fileID: 0}
@@ -745,7 +762,7 @@ MonoBehaviour:
     m_IsLocked: 0
   m_SequenceHierarchy: {fileID: 0}
   m_SequencePath:
-    m_SelectionRoot: 190458
+    m_SelectionRoot: 0
     m_SubElements: []
 --- !u!114 &19
 MonoBehaviour:
@@ -820,21 +837,21 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 089becff8a42f0ff9042f0ff8ea5f0ff94a5f0ffe2f8f0ff6efdf0ff74fdf0ff8030f1ff8630f1ff0c39f1ff1a39f1ff6e3ff1ff2abaf1ffb2bef2ff2ee5f2ff70e9f2ff90e9f2ff94e9f2ff9ee9f2ff94fbf7ffa0fbf7ff4c34f8ff5834f8ffe660f8ff709df8ff8c9df8ffa89df8ffbc9df8ffc29df8ff56c6f8ff72c6f8ff86c6f8ff8cc6f8ff2ad8f9ffaadef9ffaedef9ff60dff9ff10e0f9ffd055faffd455faffe255faffd636fdfff236fdff0637fdff0c37fdff56a5feff72a5feff8ea5feffa2a5feff9086ffff9c86ffff0eefffffecb900001aba00002eba00003aba0000
+      m_ExpandedIDs: 566dfeff8885feff9285feff488dfeff7c90feff8690feff7cbdfeff5cc0feff1a09ffff900affff5833ffff7435fffffe42ffffbe54ffffc454ffff84faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: ctrl
+        m_OriginalName: ctrl
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -103098
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 12}
       m_SearchString: 
@@ -936,7 +953,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/ArtHero
+    - Assets/Art/VFX/FXPrefabs
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -944,30 +961,30 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/ArtHero
+  - Assets/Art/VFX/FXPrefabs
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: d01c0100
-    m_LastClickedID: 72912
-    m_ExpandedIDs: 00000000fcba0000feba000000bb000002bb000004bb000006bb000008bb00000abb00000cbb00000ebb000010bb000012bb000014bb000016bb000018bb00001abb00001cbb00001ebb000020bb000022bb000024bb000026bb000028bb00002abb00002cbb00002ebb000030bb000032bb000034bb000036bb000038bb00003abb00003cbb00003ebb000040bb000042bb000044bb000046bb000048bb00004cbb00004ebb000050bb000052bb000054bb000056bb000058bb00005abb0000aebd0000c0bd0000c4bd000086be0000e21c01000467020000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 278}
+    m_SelectedIDs: 7ae60000
+    m_LastClickedID: 59002
+    m_ExpandedIDs: 000000005aa400005ca400005ea4000060a4000062a4000064a4000066a4000068a400006aa400006ca400006ea4000070a4000072a4000074a4000076a4000078a400007aa400007ca400007ea4000080a4000082a4000084a4000086a4000088a400008aa400008ca400008ea4000090a4000092a4000094a4000096a4000098a400009aa400009ca400009ea40000a0a40000a2a40000a4a40000a6a40000a8a40000aaa40000aca40000aea40000b0a40000b2a40000b4a40000b6a40000b8a400001aa700003ca7000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: PottingMobileSDK
-      m_OriginalName: PottingMobileSDK
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 48578
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 13}
     m_SearchString: 
@@ -981,7 +998,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000fcba0000feba000000bb000002bb000004bb000006bb000008bb00000abb00000cbb00000ebb000010bb000012bb000014bb000016bb000018bb00001abb00001cbb00001ebb000020bb000022bb000024bb000026bb000028bb00002abb00002cbb00002ebb000030bb000032bb000034bb000036bb000038bb00003abb00003cbb00003ebb000040bb000042bb000044bb000046bb000048bb00004abb00004cbb00004ebb000050bb000052bb000054bb000056bb000058bb00005abb0000
+    m_ExpandedIDs: 000000005aa400005ca400005ea4000060a4000062a4000064a4000066a4000068a400006aa400006ca400006ea4000070a4000072a4000074a4000076a4000078a400007aa400007ca400007ea4000080a4000082a4000084a4000086a4000088a400008aa400008ca400008ea4000090a4000092a4000094a4000096a4000098a400009aa400009ca400009ea40000a0a40000a2a40000a4a40000a6a40000a8a40000aaa40000aca40000aea40000b0a40000b2a40000b4a40000b6a40000b8a40000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1012,15 +1029,15 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010076f00000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: GuaiwuBoss02_anim
-      m_OriginalName: GuaiwuBoss02_anim
+      m_Name: fx_01np_zw_sk1_zd
+      m_OriginalName: fx_01np_zw_sk1_zd
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 46596
+      m_UserData: 58994
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
@@ -1102,7 +1119,7 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 0
+    m_VSlider: 1
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
@@ -1115,18 +1132,18 @@ MonoBehaviour:
       y: 21
       width: 643
       height: 817
-    m_Scale: {x: 0.5030788, y: 0.5030788}
-    m_Translation: {x: 321.5, y: 408.5}
+    m_Scale: {x: 0.6534552, y: 0.6534552}
+    m_Translation: {x: 321.5, y: 461.38974}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -639.0649
-      y: -812
-      width: 1278.1298
-      height: 1624
+      x: -492.00006
+      y: -706.0771
+      width: 984.0001
+      height: 1250.277
     m_MinimalGUI: 1
   m_defaultScale: 0.5030788
   m_LastWindowPixelSize: {x: 643, y: 838}
@@ -1530,9 +1547,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -2.5253806, y: 6.5943775, z: 24.328283}
+    m_Target: {x: 0.18199998, y: 0.74, z: 4.39}
     speed: 2
-    m_Value: {x: -4.23, y: 0.70000005, z: 1.5845656}
+    m_Value: {x: 0.18199998, y: 0.74, z: 4.39}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1578,13 +1595,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.06666337, y: -0.5457225, z: 0.043753672, w: 0.8343608}
+    m_Target: {x: -0.060220648, y: -0.7164632, z: -0.062226947, w: 0.6924706}
     speed: 2
-    m_Value: {x: 0.066652395, y: -0.54563266, z: 0.04374647, w: 0.83422345}
+    m_Value: {x: -0.0602106, y: -0.71634364, z: -0.062216565, w: 0.69235504}
   m_Size:
-    m_Target: 13.386118
+    m_Target: 3.3633764
     speed: 2
-    m_Value: 1.001051
+    m_Value: 3.3633764
   m_Ortho:
     m_Target: 0
     speed: 2