添加大树怪

Assets/Scenes/testCombat.scene

@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameLogic/Combat/Buff/BuffBasic.cs

@@ -10,6 +10,15 @@ namespace GameLogic.Combat.Buff
 {
     public class BuffBasic : CObject
     {
+        public CombatHeroEntity Source
+        {
+            get { return source; }
+        }
+
+        public CombatHeroEntity CombatHeroEntity
+        {
+            get { return combatHeroEntity; }
+        }
         protected CombatHeroEntity combatHeroEntity;
         public BuffInfo buffInf;
         protected CombatHeroEntity source;

Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillSlots.cs

@@ -234,11 +234,7 @@ namespace GameLogic.Combat.Hero.Turntable
                 }
 
                 
-                TriggerSkillSlotsEventData triggerSkillSlotsEventData = TriggerSkillSlotsEventData.Create();
-                triggerSkillSlotsEventData.SkillBasic = SkillBasic;
-                triggerSkillSlotsEventData.SkillSlots = this;
-                triggerSkillSlotsEventData.triggerType = triggerType;
-                CombatEventManager.Instance.Dispatch(CombatEventType.TriggerSkillSlots, triggerSkillSlotsEventData);
+             
                 switch (SkillBasic.wuXingType)
                 {
                     case WuXingType.Gold:
@@ -285,6 +281,11 @@ namespace GameLogic.Combat.Hero.Turntable
                 }
 
                 triggerCount = 0;
+                TriggerSkillSlotsEventData triggerSkillSlotsEventData = TriggerSkillSlotsEventData.Create();
+                triggerSkillSlotsEventData.SkillBasic = SkillBasic;
+                triggerSkillSlotsEventData.SkillSlots = this;
+                triggerSkillSlotsEventData.triggerType = triggerType;
+                CombatEventManager.Instance.Dispatch(CombatEventType.TriggerSkillSlots, triggerSkillSlotsEventData);
             }
 
             useTriggerType = triggerType;

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

@@ -0,0 +1,50 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 血祭神通
+    /// 所有流血状态照成的伤害会转换成充能值，2圈后对全体敌人造成{0}%充能值的伤害
+    /// </summary>
+    public class S2011 : SkillBasic
+    {
+        private long addHarm;
+        protected override void ProUseSkill()
+        {
+        }
+
+        protected override void ProActiveSkill()
+        {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
+        }
+
+        protected override void ProDispose()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroInjured, HeroInjured);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
+        }
+
+        private void TriggerSkillSlots(IEventData ieventData)
+        {
+            
+        }
+
+        private void HeroInjured(IEventData ieventData)
+        {
+            HeroInjuredEventData heroInjuredEventData = ieventData as HeroInjuredEventData;
+            b_1011 b1011=  heroInjuredEventData.HarmReturnInfo.triggerData.Source as b_1011;
+            if (b1011 == null||b1011.Source!=CombatHeroEntity)
+            {
+                return;
+            }
+
+            long harm = heroInjuredEventData.HarmReturnInfo.att;
+            addHarm+=harm;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/S2011.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1bd19bd16b7647b58baf873d23cf11cc
+timeCreated: 1752825279

UserSettings/Layouts/default-2022.dwlt

@@ -121,7 +121,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 349
+  controlID: 236
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -140,10 +140,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 556
+    width: 650
     height: 1299
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -166,14 +166,14 @@ MonoBehaviour:
   - {fileID: 9}
   m_Position:
     serializedVersion: 2
-    x: 556
+    x: 650
     y: 0
-    width: 973
+    width: 879
     height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 53
+  controlID: 87
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -185,24 +185,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TransitionLibraryWindow
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 973
+    width: 879
     height: 645
-  m_MinSize: {x: 102, y: 121}
+  m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
   - {fileID: 17}
   - {fileID: 14}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -220,10 +220,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 645
-    width: 973
+    width: 879
     height: 654
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -253,7 +253,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 70
+  controlID: 171
   draggingID: 0
 --- !u!114 &11
 MonoBehaviour:
@@ -274,8 +274,8 @@ MonoBehaviour:
     y: 0
     width: 557
     height: 671
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -326,8 +326,8 @@ MonoBehaviour:
     y: 0
     width: 474
     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}
@@ -670,7 +670,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 555
+    width: 649
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -724,23 +724,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 555
+      width: 649
       height: 1257
-    m_Scale: {x: 0.74, y: 0.74}
-    m_Translation: {x: 277.5, y: 628.5}
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 324.5, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -375
-      y: -849.32434
-      width: 750
-      height: 1698.6487
+      x: -419.24265
+      y: -812
+      width: 838.4853
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.74
-  m_LastWindowPixelSize: {x: 555, y: 1278}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 649, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -766,10 +766,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 556
+    x: 650
     y: 73
-    width: 971
-    height: 625
+    width: 877
+    height: 624
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -824,7 +824,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -876,7 +876,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -902,7 +902,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -915,7 +915,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -967,7 +967,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -980,7 +980,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -993,7 +993,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -1154,9 +1154,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.7830182, y: 19.149546, z: 46.595665}
+    m_Target: {x: -22.807297, y: -0.99843895, z: -6.5913196}
     speed: 2
-    m_Value: {x: 0.7830182, y: 19.149546, z: 46.595665}
+    m_Value: {x: -22.807297, y: -0.99843895, z: -6.5913196}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1202,13 +1202,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.25877947, y: -0.19685788, z: 0.05319247, w: 0.9443755}
+    m_Target: {x: 0.23812318, y: -0.47960052, z: 0.13616201, w: 0.83374864}
     speed: 2
-    m_Value: {x: 0.25872844, y: -0.19681908, z: 0.053181984, w: 0.94418937}
+    m_Value: {x: 0.23807602, y: -0.4795055, z: 0.13613504, w: 0.8335835}
   m_Size:
-    m_Target: 3.9619937
+    m_Target: 2.8040895
     speed: 2
-    m_Value: 3.9619937
+    m_Value: 2.8040895
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1365,9 +1365,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 556
+    x: 650
     y: 718
-    width: 971
+    width: 877
     height: 633
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1425,9 +1425,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 0ad9ffff
-      m_LastClickedID: -9974
-      m_ExpandedIDs: 566ff8ff766ff8ff8674f8ff8e74f8ff688bf8ff6e8bf8ff4ce6ffff
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 6abcfbff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1496,7 +1496,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/ArtHero
+    - Assets/Art/VFX/FXPrefabs
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1504,16 +1504,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/ArtHero
+  - Assets/Art/VFX/FXPrefabs
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 143}
-    m_SelectedIDs: c8030100
-    m_LastClickedID: 66504
-    m_ExpandedIDs: 00000000ac030100ae030100b0030100b2030100b4030100b6030100b8030100ba030100bc030100be030100c0030100c2030100c4030100c6030100c8030100ca030100cc030100ce030100d0030100d2030100d4030100d6030100d8030100da030100dc030100de030100e0030100e2030100e4030100e60301009e040100de040100e6040100f4920100f69201004252020000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 671}
+    m_SelectedIDs: 62070100
+    m_LastClickedID: 67426
+    m_ExpandedIDs: 0000000032eb000034eb000036eb000038eb00003aeb00003ceb00003eeb000040eb000042eb000044eb000046eb000048eb00004aeb00004ceb00004eeb000050eb000052eb000054eb000056eb000058eb00005aeb00005ceb00005eeb000060eb000062eb000064eb000066eb000068eb00006aeb00006ceb0000b2ee0000d8ee000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1541,7 +1541,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000ac030100ae030100b0030100b2030100b4030100b6030100b8030100ba030100bc030100be030100c0030100c2030100c4030100c6030100c8030100ca030100cc030100ce030100d0030100d2030100d4030100d6030100d8030100da030100dc030100de030100e0030100e2030100e4030100e6030100
+    m_ExpandedIDs: 0000000032eb000034eb000036eb000038eb00003aeb00003ceb00003eeb000040eb000042eb000044eb000046eb000048eb00004aeb00004ceb00004eeb000050eb000052eb000054eb000056eb000058eb00005aeb00005ceb00005eeb000060eb000062eb000064eb000066eb000068eb00006aeb00006ceb0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1572,15 +1572,15 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100ae5a010094b001004e610100a2d1010038890300a6aa0000feaa0000d2530400a4530400
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Boss_BeiHaiGui
-      m_OriginalName: Boss_BeiHaiGui
+      m_Name: Boss_Tree
+      m_OriginalName: Boss_Tree
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 68124
+      m_UserData: 61288
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0