Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3371,7 +3371,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 210, y: 43.2862}
+  m_SizeDelta: {x: 0, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Scenes/testCombat.scene

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

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

@@ -0,0 +1,77 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 蚀骨腐血掌
+    /// 快手释放{0}掌，对敌人照成木系伤害，对敌人照成伤害，并有几率对敌人施加1层毒，如果敌人毒超过{1}层，
+    /// 则每层毒对敌人的伤害提升{2}%，并有几率施加一层噬魂
+    /// </summary>
+    public class S1302 : SkillBasic
+    {
+        private int currCount;
+        private Vector3 startPos;
+        private Vector3 fangXiang;
+
+        protected override void ProUseSkill()
+        {
+            currCount = 0;
+
+            ActivationTimeLineData("1301");
+            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);
+                Vector3 p = CombatHeroEntity.GameObject.transform.TransformPoint(new Vector3(Random.Range(-1f, 2f),
+                    Random.Range(2f, 3f), Random.Range(0.5f, 1f)));
+
+                ActivationTimeLineData("1301_fashe", currTarget: currTarget,
+                    customizePos: new Vector3[] { p }, indexCount: i);
+            }
+        }
+
+        // private void Launch()
+        // {
+        //     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("duzhen_fashe", currTarget: currTarget,
+        //         customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+        // }
+
+        protected override void ProTimelineFxLogicInit(string groupName, ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData, ISkillFeatures skillFeatures)
+        {
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                effectValue[1]);
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData,
+                wuXingType, skillFeatures,
+                HarmType.Default);
+
+            int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
+            if (odds < effectValue[2])
+            {
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1);
+                targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e6d31134a9b74ef6987ee764c64c3d78
+timeCreated: 1750649022

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanel.cs

@@ -19,6 +19,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
         public void CustomInit(int type, int xw)
@@ -40,7 +41,7 @@ namespace Fort23.Mono
         public static async CTask<HeroBreakthroughFailPanel> OpenPanel(int type, int xw)
         {
             HeroBreakthroughFailPanel heroBreakthroughFailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughFailPanel>(null, UILayer.Top);
-            heroBreakthroughFailPanel.CustomInit(type,xw);
+            heroBreakthroughFailPanel.CustomInit(type, xw);
             return heroBreakthroughFailPanel;
         }
     }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -4,6 +4,7 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat;
+using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
 using UnityEngine;
 using UnityEngine.UI;
@@ -175,6 +176,8 @@ namespace Fort23.Mono
                             RefenceSuccessProbability(PlayerManager.Instance.myHero);
                             // UIManager.Instance.ShowLastHindAllShowPanel();
                         }
+
+                        CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
                     });
             });
         }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -130,29 +130,50 @@ namespace Fort23.Mono
                         xianTuLogInfoData.id = eventConfig.ID;
                         xianTuLogInfoData.message = LanguageManager.Instance.Text(eventConfig.EventName);
                         showXianTuLogInfoData.Add(xianTuLogInfoData);
-                        foreach (var eventListSelectEventLinkId in eventList.selectEventLinkIds)
+                        for (var i = 0; i < eventList.selectEventLinkIds.Count; i++)
                         {
-                            EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventListSelectEventLinkId);
+                            EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.selectEventLinkIds[i]);
                             if (eventLinkConfig.LanID != null)
                             {
-                                foreach (var i in eventLinkConfig.LanID)
+                                for (var i1 = 0; i1 < eventLinkConfig.LanID.Length; i1++)
                                 {
                                     XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
                                     xianTuLogInfoData1.type = 3;
                                     xianTuLogInfoData1.id = eventConfig.ID;
                                     if (eventLinkConfig.NPCID != 0)
                                     {
-                                        xianTuLogInfoData1.message = $"<color=#A6A6A6>{LanguageManager.Instance.Text(i)}</color>";
+                                        xianTuLogInfoData1.message = $"<color=#A6A6A6>{LanguageManager.Instance.Text(eventLinkConfig.LanID[i1])}</color>";
                                     }
                                     else
                                     {
-                                        xianTuLogInfoData1.message = $"<color=#867169>{LanguageManager.Instance.Text(i)}</color>";
+                                        xianTuLogInfoData1.message = $"<color=#867169>{LanguageManager.Instance.Text(eventLinkConfig.LanID[i1])}</color>";
                                     }
 
 
                                     showXianTuLogInfoData.Add(xianTuLogInfoData1);
                                 }
                             }
+
+                            //选项文本
+                            if (eventLinkConfig.optionType == 1 && eventList.selectEventLinkIds.Count > i+1)
+                            {
+                                XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
+                                xianTuLogInfoData1.type = 3;
+                                xianTuLogInfoData1.id = eventConfig.ID;
+                                int index = eventLinkConfig.optionPara1.ToList().IndexOf(eventList.selectEventLinkIds[i+1]);
+                                if (eventLinkConfig.NPCID != 0)
+                                {
+                                    xianTuLogInfoData1.message = $"<color=#A6A6A6>选项：{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
+                                }
+                                else
+                                {
+                                    xianTuLogInfoData1.message = $"<color=#867169>选项：{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
+                                }
+                                
+                                showXianTuLogInfoData.Add(xianTuLogInfoData1);
+                            }
+                            
+                         
                         }
                     }
                 }