修改配置

Assets/Art/GuaiWuTimeline/Guaiwu01.playable

@@ -636,7 +636,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}

Assets/Scenes/testCombat.scene

@@ -1218,7 +1218,7 @@ MonoBehaviour:
   - modelName: Hero01
     hp: 1000
     att: 30
-    attSpeed: 3
+    attSpeed: 1
     attDis: 2
     skillId: 1b270000ab860100
   - modelName: Hero02

Assets/Scripts/Core/Utility/Parabola3DPath.cs

@@ -76,6 +76,7 @@ namespace Core.Utility
 
         public Vector3 GetPositionAtTime(float t)
         {
+            t = Mathf.Clamp(t, 0, 1);
             // 计算每个轴的位移
             float deltaX = initialVelocity.x * t;
             float deltaY = initialVelocity.y * t - 0.5f * gravity * t * t;

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

@@ -1,3 +1,4 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using GameLogic.Combat.CombatTool;
 
 namespace GameLogic.Combat.Hero.State
@@ -10,7 +11,24 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProEnter()
         {
-            CombatController.currActiveCombat.CombatHeroController.RemoveDieHero(combatHeroEntity);
+            TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
+                combatHeroEntity.combatHeroTimeLineControl.TimeLineData
+                    .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("die", null);
+            if (timeLineEventLogicGroup != null)
+            {
+                timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
+                timeLineEventLogicGroup.TimeLineUpdateEnd = delegate
+                {
+                    CombatController.currActiveCombat.CombatHeroController.RemoveDieHero(combatHeroEntity);
+                };
+                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
+            }
+            else
+            {
+                CombatController.currActiveCombat.CombatHeroController.RemoveDieHero(combatHeroEntity);
+            }
+
+           
             // combatHeroEntity.Dispose();
         }
     }

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

@@ -639,7 +639,7 @@ namespace GameLogic.Combat.Skill
         public void Leave(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider,GameObject gameObject)
         {
             HeroEntityMono heroEntityMono = collider.gameObject.GetComponent<HeroEntityMono>();
-            if (heroEntityMono == null)
+            if (heroEntityMono == null||CombatHeroEntity==null)
             {
                 return;
             }

Assets/Scripts/GameLogic/CombatScenesTool/CombatEquipFallManager.cs

@@ -56,7 +56,7 @@ namespace GameLogic.CombatScenesTool
                 else if (stateIndex == 1)
                 {
                     _currTime += t;
-                    if (_currTime > 3)
+                    if (_currTime > 2)
                     {
                         stateIndex = 2;
                         _currTime = 0;
@@ -103,24 +103,24 @@ namespace GameLogic.CombatScenesTool
                     equipFallObject.GameObjectPool = pool;
                     Parabola3DPath parabolaPath = CObjectPool.Instance.Fetch<Parabola3DPath>();
                     Vector3 startPos = worldPos;
-                    float x = Random.Range(-3, 3);
-                    float z = Random.Range(-3, 3);
+                    float x = Random.Range(-2.5f, 2.5f);
+                    float z = Random.Range(-2.5f, 2.5f);
                     if (x < 0)
                     {
-                        x = Mathf.Clamp(x, -1, -3);
+                        x = Mathf.Clamp(x, -1, -2.5f);
                     }
                     else
                     {
-                        x = Mathf.Clamp(x, 1, 3);
+                        x = Mathf.Clamp(x, 1, 2.5f);
                     }
 
                     if (z < 0)
                     {
-                        z = Mathf.Clamp(z, -1, -3);
+                        z = Mathf.Clamp(z, -1, -2.5f);
                     }
                     else
                     {
-                        z = Mathf.Clamp(z, 1, 3);
+                        z = Mathf.Clamp(z, 1, 2.5f);
                     }
 
                     Vector3 endPos = startPos + new Vector3(x, 0, z);

UserSettings/Layouts/default-2022.dwlt

@@ -14,12 +14,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 8
+    x: 2
     y: 51
-    width: 2544
-    height: 1333
+    width: 2550
+    height: 1331
   m_ShowMode: 4
-  m_Title: Game
+  m_Title: Scene
   m_RootView: {fileID: 10}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -40,11 +40,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 682
-    width: 824
-    height: 259
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+    y: 630
+    width: 691
+    height: 317
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -67,14 +67,14 @@ MonoBehaviour:
   - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 1042
+    x: 873
     y: 0
-    width: 824
-    height: 941
+    width: 691
+    height: 947
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 96
+  controlID: 83
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -91,10 +91,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 543
+    x: 454
     y: 0
-    width: 499
-    height: 941
+    width: 419
+    height: 947
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 24}
@@ -117,10 +117,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1866
+    x: 1564
     y: 0
-    width: 382
-    height: 1283
+    width: 446
+    height: 1281
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 19}
@@ -144,9 +144,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 941
-    width: 1866
-    height: 342
+    y: 947
+    width: 1564
+    height: 334
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 23}
@@ -174,12 +174,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2544
-    height: 1283
+    width: 2550
+    height: 1281
   m_MinSize: {x: 500, y: 150}
   m_MaxSize: {x: 40480, y: 24288}
   vertical: 0
-  controlID: 226
+  controlID: 228
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -196,10 +196,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2248
+    x: 2010
     y: 0
-    width: 296
-    height: 1283
+    width: 540
+    height: 1281
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 20}
@@ -224,8 +224,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 543
-    height: 941
+    width: 454
+    height: 947
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 21}
@@ -253,8 +253,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
-    height: 1333
+    width: 2550
+    height: 1331
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -278,7 +278,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
+    width: 2550
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -299,8 +299,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1313
-    width: 2544
+    y: 1311
+    width: 2550
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -323,12 +323,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1866
-    height: 1283
+    width: 1564
+    height: 1281
   m_MinSize: {x: 300, y: 150}
   m_MaxSize: {x: 24288, y: 24288}
   vertical: 1
-  controlID: 112
+  controlID: 81
   draggingID: 0
 --- !u!114 &14
 MonoBehaviour:
@@ -350,12 +350,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1866
-    height: 941
+    width: 1564
+    height: 947
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 95
+  controlID: 82
   draggingID: 0
 --- !u!114 &15
 MonoBehaviour:
@@ -374,8 +374,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 824
-    height: 682
+    width: 691
+    height: 630
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 22}
@@ -496,10 +496,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1050
-    y: 763
-    width: 822
-    height: 238
+    x: 875
+    y: 711
+    width: 689
+    height: 296
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -517,7 +517,7 @@ MonoBehaviour:
     m_IsLocked: 0
   m_SequenceHierarchy: {fileID: 0}
   m_SequencePath:
-    m_SelectionRoot: 0
+    m_SelectionRoot: 263324
     m_SubElements: []
 --- !u!114 &18
 MonoBehaviour:
@@ -609,10 +609,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1874
+    x: 1566
     y: 81
-    width: 380
-    height: 1262
+    width: 444
+    height: 1260
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -634,7 +634,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI/Combat
+    - Assets/Art/ArtHero
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -642,16 +642,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI/Combat
+  - Assets/Art/ArtHero
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 102}
-    m_SelectedIDs: 4c7f0200
-    m_LastClickedID: 163660
-    m_ExpandedIDs: 00000000787c02007a7c02007c7c02007e7c0200807c0200827c0200847c0200867c0200887c02008a7c02008c7c02008e7c0200907c020000ca9a3b
+    scrollPos: {x: 0, y: 111}
+    m_SelectedIDs: 66ae0000
+    m_LastClickedID: 44646
+    m_ExpandedIDs: 000000000cac00000eac000010ac000012ac000014ac000016ac000018ac00001aac00001cac00001eac000020ac000022ac000024ac000070ae0000bcae0000c8ae000032e80000f0eb000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -679,7 +679,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000787c02007a7c02007c7c02007e7c0200807c0200827c0200847c0200867c0200887c02008a7c02008c7c02008e7c0200907c0200
+    m_ExpandedIDs: 000000000cac00000eac000010ac000012ac000014ac000016ac000018ac00001aac00001cac00001eac000020ac000022ac000024ac0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -707,21 +707,21 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c62300000000000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb000050f90000e4230100847d00006c7f05001a800500ce7f0500
+    m_ExpandedInstanceIDs: c62300000000000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb000050f90000e4230100847d00006c7f05001a800500ce7f05000ce80000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: Guaiwu01
+      m_OriginalName: Guaiwu01
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 58988
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 5}
     m_CreateAssetUtility:
@@ -755,10 +755,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2256
+    x: 2012
     y: 81
-    width: 295
-    height: 1262
+    width: 539
+    height: 1260
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -802,10 +802,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
+    x: 2
     y: 81
-    width: 542
-    height: 920
+    width: 453
+    height: 926
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -819,9 +819,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 6ed8feff
+      m_SelectedIDs: 9c040400
+      m_LastClickedID: 263324
+      m_ExpandedIDs: 4088faff0604040014040400160404001c040400200404003204040034040400360404004c040400580404005e04040068040400700404007204040076040400900404009c0404009e040400aa040400b0040400
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -865,10 +865,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1050
+    x: 875
     y: 81
-    width: 822
-    height: 661
+    width: 689
+    height: 609
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -923,7 +923,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -975,7 +975,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 1
@@ -1001,7 +1001,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -1014,7 +1014,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -1066,7 +1066,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -1079,7 +1079,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -1092,7 +1092,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -1232,17 +1232,17 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
   m_Gizmos: 1
-  m_OverrideSceneCullingMask: 6917529027641081856
-  m_SceneIsLit: 1
+  m_OverrideSceneCullingMask: 0
+  m_SceneIsLit: 0
   m_SceneLighting: 1
   m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 25.205107, y: -11.630508, z: 3.5887794}
+    m_Target: {x: -1.9354047, y: 0.029927328, z: 0.4328934}
     speed: 2
-    m_Value: {x: 25.205107, y: -11.630508, z: 3.5887794}
+    m_Value: {x: -1.9354047, y: 0.029927328, z: 0.4328934}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1253,7 +1253,7 @@ MonoBehaviour:
   m_SceneViewState:
     m_AlwaysRefresh: 0
     showFog: 1
-    showSkybox: 1
+    showSkybox: 0
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -1288,13 +1288,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.2558265, y: -0.74193513, z: 0.40372384, w: -0.4702544}
+    m_Target: {x: -0.09607802, y: 0.87582594, z: -0.19519861, w: -0.43086752}
     speed: 2
-    m_Value: {x: -0.25582048, y: -0.7419177, z: 0.40371436, w: -0.47024333}
+    m_Value: {x: -0.09542921, y: 0.87609524, z: -0.19387963, w: -0.43100005}
   m_Size:
-    m_Target: 18.695011
+    m_Target: 3.663054
     speed: 2
-    m_Value: 18.695011
+    m_Value: 3.5053148
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1341,10 +1341,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
-    y: 1022
-    width: 1865
-    height: 321
+    x: 2
+    y: 1028
+    width: 1563
+    height: 313
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1375,10 +1375,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 551
+    x: 456
     y: 81
-    width: 497
-    height: 920
+    width: 417
+    height: 926
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1433,23 +1433,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 497
-      height: 899
-    m_Scale: {x: 0.5535714, y: 0.5535714}
-    m_Translation: {x: 248.5, y: 449.5}
+      width: 417
+      height: 905
+    m_Scale: {x: 0.556, y: 0.556}
+    m_Translation: {x: 208.5, y: 452.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -448.90326
-      y: -812.00006
-      width: 897.8065
-      height: 1624.0001
+      x: -375
+      y: -813.84894
+      width: 750
+      height: 1627.6979
     m_MinimalGUI: 1
-  m_defaultScale: 0.5535714
-  m_LastWindowPixelSize: {x: 497, y: 920}
+  m_defaultScale: 0.556
+  m_LastWindowPixelSize: {x: 417, y: 926}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000