Browse Source

修改bug

DESKTOP-FB72PO8\Administrator 2 months ago
parent
commit
a3eb77f16d

+ 16 - 1
Assets/Scripts/GameLogic/Combat/Buff/BuffBasic.cs

@@ -16,12 +16,20 @@ namespace GameLogic.Combat.Buff
         protected TriggerData _triggerData;
         protected float _currTime;
 
+        public int buffCount {
+            get
+            {
+                return buffInf.count;
+            }
+        }
+
         public void Init(CombatHeroEntity combatHeroEntity, CombatHeroEntity source, BuffInfo buffInfo)
         {
             this.combatHeroEntity = combatHeroEntity;
             this.buffInf = buffInfo;
             this.source = source;
             ProInit();
+            UpdateEffect();
         }
 
         protected virtual void ProInit()
@@ -31,11 +39,18 @@ namespace GameLogic.Combat.Buff
         public override void ActiveObj()
         {
         }
+        public void UpdateEffect()
+        {
+            ProUpdateEffect();
+        }
+        protected virtual void ProUpdateEffect()
+        {
+        }
 
         public TimeLineEventLogicGroupBasic ActivationTimeLineData(string groupName,
             BetterList<ILifetCycleHitPoint> currTarget = null,
             Vector3[] customizePos = null, System.Action finishCallBack = null, float startTime = default,
-            object extraData = null,int indexCount=0)
+            object extraData = null, int indexCount = 0)
         {
             TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
                 source.combatHeroTimeLineControl

+ 11 - 17
Assets/Scripts/GameLogic/Combat/Buff/b_1001.cs

@@ -5,35 +5,29 @@ using GameLogic.Player;
 namespace GameLogic.Combat.Buff
 {
     /// <summary>
-    /// 燃烧爆炸
+    /// 寒气 每到寒气对敌人的功法运转速度降低1%,10道寒气后,敌人将会被冻结,功法不在运转。火系功法能清除1层
     /// </summary>
     public class b_1001 : BuffBasic
     {
-        TimeLineEventLogicGroupBasic _timeLineEventLogicGroupBasic;
-
+        private float lasetAddValue;
         protected override void ProInit()
         {
-            string timeLineName = buffInf.BuffConfig.scriptsName.ToString();
-            _timeLineEventLogicGroupBasic = ActivationTimeLineData(timeLineName);
+            
         }
 
-        protected override void ProUpdate(float t)
-        {
-            if (_currTime >= 0.2f)
-            {
-                ActivationTimeLineData("b_1001_1");
 
-                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(source.CurrCombatHeroInfo.attack.Value,
-                    buffInf.BuffConfig.effectValue[0]);
-                HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(source, combatHeroEntity,
-                    v, AttType.Buff, _triggerData,WuXingType.Null);
-                combatHeroEntity.BuffControl.RemoveBuff(this);
-            }
+        protected override void ProUpdateEffect()
+        {
+            combatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= lasetAddValue;
+            lasetAddValue = 0;
+            lasetAddValue = buffCount * buffInf.BuffConfig.effectValue[0];
+            
         }
 
         public override void Dispose()
         {
-            _timeLineEventLogicGroupBasic.BreakTimeLine(combatHeroEntity);
+            combatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= lasetAddValue;
+            lasetAddValue = 0;
         }
     }
 }

+ 10 - 0
Assets/Scripts/GameLogic/Combat/Buff/b_1002.cs

@@ -0,0 +1,10 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 冻结,敌人不能做任何作用,功法将会被封住。部分法宝可以释放
+    /// </summary>
+    public class b_1002 : BuffBasic
+    {
+        
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Buff/b_1002.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5e15c268a1b841798ba9fce04aa8d9f5
+timeCreated: 1743151459

+ 4 - 1
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -36,7 +36,10 @@ public class CombatHeroInfo
     public HeroPowerUpConfig powerUpConfig;
     public MonsterPowerUpConfig MonsterPowerUpConfig;
     public HeroPromoteConfig promoteConfig;
-
+    /// <summary>
+    /// 添加的攻击速度比例%
+    /// </summary>
+    public float addAttSpeed_bl = (float)2;
     /// <summary>
     /// 金
     /// </summary>

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/S2001.cs

@@ -5,6 +5,9 @@ using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace GameLogic.Combat.Skill
 {
+    /// <summary>
+    /// 烈焰剑  向前方发出一柄剑,对敌人造成火系伤害,对敌人施加一层灼热,比有10%概率对敌人造成1火伤势
+    /// </summary>
     public class S2001: SkillBasic
     {
         protected override void ProUseSkill()

+ 38 - 38
UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Inspector
   m_RootView: {fileID: 7}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -43,8 +43,8 @@ MonoBehaviour:
     y: 553
     width: 751
     height: 389
-  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: 13}
   m_Panes:
   - {fileID: 13}
@@ -101,7 +101,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 150}
   m_MaxSize: {x: 8096, y: 24288}
   vertical: 1
-  controlID: 80
+  controlID: 43
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -232,7 +232,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 150}
   m_MaxSize: {x: 32384, y: 24288}
   vertical: 0
-  controlID: 79
+  controlID: 42
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -2558,23 +2558,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 3caa0000
-      m_LastClickedID: 43580
-      m_ExpandedIDs: 00b0f9ffd2fefaff6efffaff78fffaffd232fbffd832fbff6a33fbff6e33fbff7833fbff9275fbff9875fbffc275fbff0e76fbff2a76fbff2e76fbff3876fbff3ef6ffff4cf6ffff62f6ffff6cf6ffff76f6ffff80f6ffff8af6ffff94f6ffffa8f6ffff78fafffff4ffffff
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: c4e3faff7e02feffca02fefff202feff1a03feffd40bfeff320cfeffc6f5ffffe6f7ffff00faffff10faffff20faffff30faffff40faffff5cfaffff60faffff78faffff48aa0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: CombatRoot
-        m_OriginalName: CombatRoot
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -2332
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 11}
       m_SearchString: 
@@ -2676,7 +2676,7 @@ MonoBehaviour:
     m_SkipHidden: 1
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameLogic/Paritcle/ParitcleLogic
+    - Assets/Art/VFX/FXPrefabs
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -2684,16 +2684,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameLogic/Paritcle/ParitcleLogic
+  - Assets/Art/VFX/FXPrefabs
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 1220}
-    m_SelectedIDs: 6aba0100
-    m_LastClickedID: 113258
-    m_ExpandedIDs: 00000000e4b20000e6b20000e8b20000eab20000ecb20000eeb20000f0b20000f2b20000f4b20000f6b20000f8b20000fab20000feb2000088b30000d2b3000086b4000088b4000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 196}
+    m_SelectedIDs: 4af50000
+    m_LastClickedID: 62794
+    m_ExpandedIDs: 00000000f6b30000f8b30000fab30000fcb30000feb3000000b4000002b4000004b4000006b4000008b400000ab400000cb400000eb4000098b40000deb400004cf3000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2721,7 +2721,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000e4b20000e6b20000e8b20000eab20000ecb20000eeb20000f0b20000f2b20000f4b20000f6b20000f8b20000fab20000fcb20000feb20000
+    m_ExpandedIDs: 00000000f6b30000f8b30000fab30000fcb30000feb3000000b4000002b4000004b4000006b4000008b400000ab400000cb400000eb40000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2752,18 +2752,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: bc7400008ebd000008bd0000300b0100b0ae00005cdf0000c8480100f630010094b1000014b3000090b4000088b4000042b40000aab40000fcb3000044b30000a2b400007cb400008cb4000048a501003eb2000022b2000070de000056dc000020af00001cad00001aad000074c8000070c800000eac0000e4f90200ccd70200eaf90200f0f90200f6f902005cd10000dab300004cb20000d4b30000eab300000000000006960200beac0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: bg_priest
-      m_OriginalName: bg_priest
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 129836
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 3}
     m_CreateAssetUtility:
@@ -2773,7 +2773,7 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 0}
+    m_ScrollPosition: {x: 0, y: 47.5}
     m_GridSize: 16
   m_SkipHiddenPackages: 1
   m_DirectoriesAreaWidth: 318
@@ -3265,14 +3265,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -13.180857, y: 36.897987, z: 212.44244}
+    m_Target: {x: 0.020751685, y: -2.536817, z: -0.0022228418}
     speed: 2
-    m_Value: {x: -13.180857, y: 36.897987, z: 212.44244}
+    m_Value: {x: 0.020751685, y: -2.536817, z: -0.0022228418}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -3300,17 +3300,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -3318,17 +3318,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.29834273, y: -0.19472952, z: 0.060921025, w: 0.9327287}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: 0.29824996, y: -0.19466898, z: 0.06090208, w: 0.93243873}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 41.242725
+    m_Target: 1.1974634
     speed: 2
-    m_Value: 41.242725
+    m_Value: 1.1974634
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -3344,7 +3344,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: 0.37477773, y: 0.026720107, z: -0.010768388, w: 0.9267013}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: