DESKTOP-FB72PO8\Administrator 3 veckor sedan
förälder
incheckning
910f383143

+ 23 - 3
Assets/Scenes/testCombat.scene

@@ -2185,15 +2185,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
-      value: 60
+      value: 200
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.size
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 43373
+      value: 4337300
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].mu
@@ -2239,10 +2243,18 @@ PrefabInstance:
       propertyPath: enemyHeroInfo.Array.data[0].level
       value: 150
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].level
+      value: 150
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
       value: 9201
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].heroID
+      value: 9201
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillLevel
       value: 30
@@ -2251,6 +2263,14 @@ PrefabInstance:
       propertyPath: myHeroInfo.Array.data[0].skillStart
       value: 4
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].skillLevel
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[1].skillStart
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.size
       value: 0

+ 1 - 1
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -99,7 +99,7 @@ namespace GameLogic.Combat.Hero
 
             if (!_combatHeroEntity.IsEnemy)
             {
-                float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum * 3;
+                float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum * 2;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
                     cd + SkillTurntable.skillAddSkillCd);
             }

+ 5 - 0
Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs

@@ -79,6 +79,7 @@ namespace GameLogic.Combat.Hero.Turntable
 
             _removeTime = 0;
             skillAddSkillCd = 0;
+            int currSkillCount=0;
             if (allSkill != null)
             {
                 for (int i = 0; i < allSkill.Length; i++)
@@ -96,6 +97,10 @@ namespace GameLogic.Combat.Hero.Turntable
                         continue;
                     }
 
+                    if (skillConfig.SkillType == 1)
+                    {
+                    }
+
                     skillAddSkillCd+=skillConfig.addcd;
                     SetSkill(skillInfo.index, skillBasic);
 

+ 48 - 0
Assets/Scripts/GameLogic/Combat/Skill/S9011.cs

@@ -0,0 +1,48 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 玄冰神翎  凤凰煽动翅膀,再翅膀前方行程类似于羽毛的冰箭,生成{0}枚冰箭,对敌人造成水属性伤害,并施加一层寒气
+    /// </summary>
+    public class S9011 : SkillBasic
+    {
+        protected override void ProUseSkill()
+        {
+            ballisticsCount = (int)effectValue[0];
+            for (int i = 0; i < effectValue[0]; i++)
+            {
+                CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget
+                    .GetThis<CombatHeroEntity>()
+                    .GetMainHotPoin<CombatHeroHitPoint>();
+                BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
+                currTarget.Add(combatHeroHitPoint);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+                ActivationTimeLineData("1101", currTarget: currTarget,
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+            }
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData, ISkillFeatures skillFeatures)
+        {
+            float harmBl = effectValue[1];
+
+
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                harmBl);
+
+            HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
+                AttType.Skill, triggerData,
+                wuXingType, skillFeatures,
+                HarmType.Default);
+            // if(harmReturnInfo.isInvalid)
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 95f8ecb2dd214403be4745664de143df
+timeCreated: 1750301607

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 612 - 110
UserSettings/Layouts/default-2022.dwlt


Vissa filer visades inte eftersom för många filer har ändrats