修改功法装配逻辑

Assets/Res/Config/EventConditionConfig.json

@@ -74,10 +74,7 @@
       "ConditionType": 8,
       "finishCount": 1,
       "SkiptoIds": [
-        1,
-        2,
-        3,
-        4
+        5
       ]
     },
     {

Assets/Res/Config/LanguageChineseConfig.json

@@ -37226,7 +37226,7 @@
     },
     {
       "ID": 10047,
-      "txt": "0"
+      "txt": "使用神识"
     }
   ]
 }

Assets/Res/Config/SkiptoConfig.json

@@ -12,21 +12,28 @@
       "SkipType": 2,
       "SkipID": 2,
       "SkipTxt1": 3258,
-      "SkipTxt2": 405487
+      "SkipTxt2": -1
     },
     {
       "ID": 3,
       "SkipType": 3,
       "SkipID": 3,
       "SkipTxt1": 3259,
-      "SkipTxt2": 405488
+      "SkipTxt2": -1
     },
     {
       "ID": 4,
       "SkipType": 4,
       "SkipID": 4,
       "SkipTxt1": 3260,
-      "SkipTxt2": 405489
+      "SkipTxt2": -1
+    },
+    {
+      "ID": 5,
+      "SkipType": 5,
+      "SkipID": 5,
+      "SkipTxt1": 10047,
+      "SkipTxt2": -1
     }
   ]
 }

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -42,7 +42,7 @@ namespace Fort23.Mono
         {
             Btn_Shop.onClick.AddListener(async () => { Btn_Shop_Click(); });
 
-            bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); }); });
+            bnt_shengShi.onClick.AddListener(() => { Bnt_ShengShi_Click();});
             Btn_GongFa.onClick.AddListener(async () => { Btn_GongFa_Click(); });
             Btn_HeroInfomation.onClick.AddListener(async () => { Btn_HeroInfomation_Click(); });
             Btn_DongFu.onClick.AddListener(async () => { Bne_dongfu_Click(); });
@@ -80,6 +80,11 @@ namespace Fort23.Mono
             MenuRoot.SetActive(false);
         }
 
+        public async void Bnt_ShengShi_Click()
+        {
+            DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); }); 
+        }
+        
         public async void Btn_Shop_Click()
         {
             if (currentOpenUIPanel is ShopPanel)

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -735,85 +735,85 @@ namespace Fort23.Mono
 
             if (!max)
             {
-                if (isClick)
-                {
-                    int index = 0;
-
-                    //金
-                    if (skillConfig.skillConfig.attribute == 1)
-                    {
-                        index = 0;
-                    }
-
-                    //木
-                    if (skillConfig.skillConfig.attribute == 2)
-                    {
-                        index = 1;
-                    }
-
-                    //水
-                    if (skillConfig.skillConfig.attribute == 4)
-                    {
-                        index = 2;
-                    }
-
-                    //火
-                    if (skillConfig.skillConfig.attribute == 8)
-                    {
-                        index = 3;
-                    }
-
-                    //土
-                    if (skillConfig.skillConfig.attribute == 16)
-                    {
-                        index = 4;
-                    }
-
-                    bool isSuccess = false;
-
-                    //先上对应位置
-                    foreach (var i in indexList[index])
-                    {
-                        if (allKongSkill[i].SkillInfo == null)
-                        {
-                            allKongSkill[i].SetSKill(skillConfig);
-                            allUseSkill[i] = skillConfig;
-                            isSuccess = true;
-                            break;
-                        }
-                    }
-
-                    //对应位置已经上了 ，就随便找给位置上
-                    if (!isSuccess)
-                    {
-                        for (var i = 0; i < allKongSkill.Count; i++)
-                        {
-                            if (allKongSkill[i].SkillInfo == null)
-                            {
-                                allKongSkill[i].SetSKill(skillConfig);
-                                allUseSkill[i] = skillConfig;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (isSuccess)
-                    {
-                        BaoChun();
-                        ChangeFuZhuYingXiang();
-                        UpdateSkillWidget();
-                        showSkillInfo.Sort(Sort);
-                        Content.Init(this, showSkillInfo.Count);
-                    }
-                    else
-                    {
-                        for (int i = 0; i < allKongSkill.Count; i++)
-                        {
-                            allKongSkill[i].SelectState(true);
-                        }
-                    }
-                }
-                else
+                // if (isClick)
+                // {
+                //     int index = 0;
+                //
+                //     //金
+                //     if (skillConfig.skillConfig.attribute == 1)
+                //     {
+                //         index = 0;
+                //     }
+                //
+                //     //木
+                //     if (skillConfig.skillConfig.attribute == 2)
+                //     {
+                //         index = 1;
+                //     }
+                //
+                //     //水
+                //     if (skillConfig.skillConfig.attribute == 4)
+                //     {
+                //         index = 2;
+                //     }
+                //
+                //     //火
+                //     if (skillConfig.skillConfig.attribute == 8)
+                //     {
+                //         index = 3;
+                //     }
+                //
+                //     //土
+                //     if (skillConfig.skillConfig.attribute == 16)
+                //     {
+                //         index = 4;
+                //     }
+                //
+                //     bool isSuccess = false;
+                //
+                //     //先上对应位置
+                //     foreach (var i in indexList[index])
+                //     {
+                //         if (allKongSkill[i].SkillInfo == null)
+                //         {
+                //             allKongSkill[i].SetSKill(skillConfig);
+                //             allUseSkill[i] = skillConfig;
+                //             isSuccess = true;
+                //             break;
+                //         }
+                //     }
+                //
+                //     //对应位置已经上了 ，就随便找给位置上
+                //     if (!isSuccess)
+                //     {
+                //         for (var i = 0; i < allKongSkill.Count; i++)
+                //         {
+                //             if (allKongSkill[i].SkillInfo == null)
+                //             {
+                //                 allKongSkill[i].SetSKill(skillConfig);
+                //                 allUseSkill[i] = skillConfig;
+                //                 break;
+                //             }
+                //         }
+                //     }
+                //
+                //     if (isSuccess)
+                //     {
+                //         BaoChun();
+                //         ChangeFuZhuYingXiang();
+                //         UpdateSkillWidget();
+                //         showSkillInfo.Sort(Sort);
+                //         Content.Init(this, showSkillInfo.Count);
+                //     }
+                //     else
+                //     {
+                //         for (int i = 0; i < allKongSkill.Count; i++)
+                //         {
+                //             allKongSkill[i].SelectState(true);
+                //         }
+                //     }
+                // }
+                // else
                 {
                     selectSkillConfig = skillConfig;
                     _isSelectSkill = true;

Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -34,6 +34,10 @@ namespace Mono.Utility
                 case 4:
                     UIManager.Instance.GetComponent<AppBarPanel>().Btn_Shop_Click();
                     return;
+                //实用神识界面
+                case 5:
+                    UIManager.Instance.GetComponent<AppBarPanel>().Bnt_ShengShi_Click();
+                    return;
 
                 default:
                     return;