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

Assets/Res/Config/FabaoConfig.json

@@ -16,22 +16,6 @@
       ],
       "SkillGroupID": 3101
     },
-    {
-      "ID": 10002,
-      "ItemID": 10002,
-      "name": "破天斧",
-      "Type": 1,
-      "magicAttribute": 1,
-      "model": "fb_xuanguidun",
-      "fragmentID": 11002,
-      "ShuxingIDs": [
-        2
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3102
-    },
     {
       "ID": 10003,
       "ItemID": 10003,
@@ -48,38 +32,6 @@
       ],
       "SkillGroupID": 3201
     },
-    {
-      "ID": 10004,
-      "ItemID": 10004,
-      "name": "混沌珠",
-      "Type": 1,
-      "magicAttribute": 2,
-      "model": "fb_3202",
-      "fragmentID": 11004,
-      "ShuxingIDs": [
-        1
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3202
-    },
-    {
-      "ID": 10005,
-      "ItemID": 10005,
-      "name": "琉璃宝塔",
-      "Type": 1,
-      "magicAttribute": 2,
-      "model": "fb_linglongta",
-      "fragmentID": 11005,
-      "ShuxingIDs": [
-        2
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3203
-    },
     {
       "ID": 10006,
       "ItemID": 10006,
@@ -96,54 +48,6 @@
       ],
       "SkillGroupID": 3301
     },
-    {
-      "ID": 10007,
-      "ItemID": 10007,
-      "name": "玉莲守心灯",
-      "Type": 1,
-      "magicAttribute": 4,
-      "model": "fb_3302",
-      "fragmentID": 11007,
-      "ShuxingIDs": [
-        1
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3302
-    },
-    {
-      "ID": 10008,
-      "ItemID": 10008,
-      "name": "融灵塔",
-      "Type": 1,
-      "magicAttribute": 8,
-      "model": "fb_3401",
-      "fragmentID": 11008,
-      "ShuxingIDs": [
-        2
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3401
-    },
-    {
-      "ID": 10009,
-      "ItemID": 10009,
-      "name": "禁元珠",
-      "Type": 1,
-      "magicAttribute": 8,
-      "model": "fb_BossPing",
-      "fragmentID": 11009,
-      "ShuxingIDs": [
-        1
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3402
-    },
     {
       "ID": 10010,
       "ItemID": 10010,
@@ -159,22 +63,6 @@
         100
       ],
       "SkillGroupID": 3501
-    },
-    {
-      "ID": 10011,
-      "ItemID": 10011,
-      "name": "天殇血刃剑",
-      "Type": 1,
-      "magicAttribute": 16,
-      "model": "fb_ding1",
-      "fragmentID": 11011,
-      "ShuxingIDs": [
-        1
-      ],
-      "ShuxingPara": [
-        100
-      ],
-      "SkillGroupID": 3502
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -2,23 +2,23 @@
   "configList": [
     {
       "ID": 1,
-      "txt": "亞瑟·龍焰"
+      "txt": "主角"
     },
     {
       "ID": 2,
-      "txt": "萊恩·天戟"
+      "txt": "小怪1"
     },
     {
       "ID": 3,
-      "txt": "達米安·虎嘯"
+      "txt": "小怪2"
     },
     {
       "ID": 4,
-      "txt": "維克多·鐵拳"
+      "txt": "小怪3"
     },
     {
       "ID": 5,
-      "txt": "加雷斯·風暴"
+      "txt": "BOSS1"
     },
     {
       "ID": 6,

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

@@ -154,7 +154,10 @@ namespace Fort23.Mono
                 {
                     if (skills[i] == null)
                         continue;
-                    if(!IsMainGongFaChange(skills[i].skillConfig))
+                    if (!IsMainGongFaChange(skills[i].skillConfig))
+                        continue;
+
+                    if (!IsPassiveGongFaChange(skills[i].skillConfig))
                         continue;
                     allKongSkill[indexList[i]].SetSKill(skills[i]);
                     allUseSkill[indexList[i]] = skills[i];
@@ -508,13 +511,27 @@ namespace Fort23.Mono
             //直接上功法
             if (skillKongWidget.SkillInfo == null && dianjiSkillKongWidget == null && selectSkillConfig != null)
             {
-                if (!IsMainGongFaChange(selectSkillConfig.skillConfig))
+                if (selectSkillConfig.skillConfig.SkillType == 1)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
-                    CloseSelect();
-                    return;
+                    if (!IsMainGongFaChange(selectSkillConfig.skillConfig))
+                    {
+                        TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
+                        CloseSelect();
+                        return;
+                    }
                 }
 
+                if (selectSkillConfig.skillConfig.SkillType == 2)
+                {
+                    if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig))
+                    {
+                        TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
+                        CloseSelect();
+                        return;
+                    }
+                }
+
+
                 isAlter = true;
 
                 skillKongWidget.SetSKill(selectSkillConfig);
@@ -524,12 +541,27 @@ namespace Fort23.Mono
             //替换功法
             else if (skillKongWidget.SkillInfo != null && dianjiSkillKongWidget == null && selectSkillConfig != null)
             {
-                if (!IsMainGongFaChange(selectSkillConfig.skillConfig) &&   allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 1)
+                if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 1)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
-                    CloseSelect();
-                    return;
+                    if (!IsMainGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 1)
+                    {
+                        TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
+                        CloseSelect();
+                        return;
+                    }
+                }
+
+                if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 2)
+                {
+                    if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 2)
+                    {
+                        TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
+                        CloseSelect();
+                        return;
+                    }
                 }
+
+
                 isAlter = true;
                 allUseSkill[skillKongWidget.SkillInfo.index] = null;
                 skillKongWidget.SetSKill(selectSkillConfig);
@@ -669,7 +701,7 @@ namespace Fort23.Mono
             }
 
 
-            Text_GongFaCount.text = $"功法数量{GetMainGongFaCount()}/4";
+            Text_GongFaCount.text = $"功法数量{GetMainGongFaCount()}/{PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum}";
         }
 
         private async void OnClick(ItemWidgetBasic obj)
@@ -695,7 +727,7 @@ namespace Fort23.Mono
                 Btn_RemoveGongFa.gameObject.SetActive(false);
 
 
-                if (!IsMainGongFaChange(skillWidget.skillConfigId.skillConfig))
+                if (!IsMainGongFaChange(skillWidget.skillConfigId.skillConfig) || !IsPassiveGongFaChange(skillWidget.skillConfigId.skillConfig))
                 {
                     SelectSkill(skillWidget.skillConfigId, true);
                 }
@@ -706,6 +738,10 @@ namespace Fort23.Mono
             }
         }
 
+        /// <summary>
+        /// 获得主功法数量
+        /// </summary>
+        /// <returns></returns>
         private int GetMainGongFaCount()
         {
             int count = 0;
@@ -720,9 +756,39 @@ namespace Fort23.Mono
             return count;
         }
 
+        /// <summary>
+        /// 获得被动功法数量
+        /// </summary>
+        /// <returns></returns>
+        private int GetPassiveGongFaCount()
+        {
+            int count = 0;
+            for (var i = 0; i < allUseSkill.Length; i++)
+            {
+                if (allUseSkill[i] != null && allUseSkill[i].skillConfig.SkillType == 2)
+                {
+                    count++;
+                }
+            }
+
+            return count;
+        }
+
         private bool IsMainGongFaChange(SkillConfig s)
         {
-            if (GetMainGongFaCount() < 4 || s.SkillType != 1)
+            if (GetMainGongFaCount() < PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum || s.SkillType != 1)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private bool IsPassiveGongFaChange(SkillConfig s)
+        {
+            if (GetPassiveGongFaCount() < PlayerManager.Instance.myHero.powerUpConfig.MaxPassiveGongfaNum || s.SkillType != 2)
             {
                 return true;
             }
@@ -730,7 +796,6 @@ namespace Fort23.Mono
             {
                 return false;
             }
-          
         }
 
         public void HindIScorllListWidget(IScorllListWidget widget)

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Fort23.Core;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 
 namespace Fort23.Mono
 {
@@ -52,6 +53,11 @@ namespace Fort23.Mono
         private async void OnClick(ItemWidgetBasic obj)
         {
             BtnFaBaoWidget btnFaBaoWidget = obj as BtnFaBaoWidget;
+            if (btnFaBaoWidget.index > PlayerManager.Instance.myHero.powerUpConfig.MaxFabaoNum - 1)
+            {
+                TipMessagePanel.OpenTipMessagePanel("当前位置未解锁");
+                return;
+            }
             SelectFaBaoPanel selectFaBaoPanel = await SelectFaBaoPanel.OpenPanel(btnFaBaoWidget.index);
             await selectFaBaoPanel.UIClosed();
             foreach (var b in btnFaBaoWidgets)