卡牌技能

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -98,7 +98,7 @@
     <group id="n55_l2by" name="grpStar" xy="11,1221" size="1056,435" advanced="true">
       <gearDisplay controller="ctrlTab" pages="1"/>
     </group>
-    <list id="n77_rhha" name="listSkill" xy="76,1241" size="928,412" visible="false" overflow="hidden" lineGap="33" defaultItem="ui://7l6lvkayrhha9k">
+    <list id="n77_rhha" name="listSkill" xy="76,1241" size="928,412" overflow="hidden" lineGap="33" defaultItem="ui://7l6lvkayrhha9k">
       <gearDisplay controller="ctrlTab" pages="2"/>
       <item/>
       <item/>

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit dc3ebcc633a921372983dbae1623ffb4f941d529
+Subproject commit 682a5cd4e9e069a58269095e00b85c3ad05e808e

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -137,6 +137,8 @@ namespace GFGGame
                 GuideDataManager.InitServerData(result.roleGuideList);
                 DressUpMenuSuitDataManager.InitServerData(result.systemSuitList);
                 CardDataManager.InitServerData(result.roleCardList);
+                SkillDataManager.Instance.InitServerData(result.roleSkillList);
+                SkillDataManager.Instance.SetDicPassivitySkillCfg();
             }
             else
             {
@@ -147,6 +149,9 @@ namespace GFGGame
                 GuideDataManager.InitServerData(null);
                 DressUpMenuSuitDataManager.InitServerData(null);
                 CardDataManager.InitServerData(null);
+                SkillDataManager.Instance.InitServerData(null);
+                SkillDataManager.Instance.SetDicPassivitySkillCfg();
+
             }
             GetSuitItemController.enable = true;
             RoleDataHandler.StartUpdate();
@@ -191,6 +196,7 @@ namespace GFGGame
             CardDataManager.Clear();
             DecomposeDataManager.Instance.Clear();
             PhotographDataManager.Instance.Clear();
+            SkillDataManager.Instance.Clear();
             if (logout)
             {
                 Logout();

GameClient/Assets/Game/HotUpdate/Data/SkillDataManager.cs

@@ -13,6 +13,7 @@ namespace GFGGame
         public const string SKILL_SHIELD = "shield";
 
         public Dictionary<int, Dictionary<int, SkillData>> skillData = new Dictionary<int, Dictionary<int, SkillData>>();
+        public Dictionary<int, Dictionary<int, List<PassivitySkillCfg>>> dicPassivitySkill = new Dictionary<int, Dictionary<int, List<PassivitySkillCfg>>>();
 
         public void Clear()
         {
@@ -29,14 +30,30 @@ namespace GFGGame
                     {
                         this.skillData[skillData.cardId] = new Dictionary<int, SkillData>();
                     }
-                    // if(!this.skillData[skillData.cardId].ContainsKey(skillData.skillId)){
 
-                    // }this.skillData[skillData.cardId][skillData.skillId]=
                     this.skillData[skillData.cardId][skillData.skillId] = skillData;
                 }
             }
         }
+        public void SetDicPassivitySkillCfg()
+        {
+            if (dicPassivitySkill.Count > 0) return;
+            PassivitySkillCfg[] dataArray = PassivitySkillCfgArray.Instance.dataArray;
+            for (int i = 0; i < dataArray.Length; i++)
+            {
+                if (!dicPassivitySkill.ContainsKey(dataArray[i].cardId))
+                {
+                    dicPassivitySkill[dataArray[i].cardId] = new Dictionary<int, List<PassivitySkillCfg>>();
+                }
+                PassivitySkillCfg passivitySkillCfgs = dataArray[i];
 
+                if (!dicPassivitySkill[passivitySkillCfgs.cardId].ContainsKey(passivitySkillCfgs.skillId))
+                {
+                    dicPassivitySkill[passivitySkillCfgs.cardId][passivitySkillCfgs.skillId] = new List<PassivitySkillCfg>();
+                }
+                dicPassivitySkill[passivitySkillCfgs.cardId][passivitySkillCfgs.skillId].Add(passivitySkillCfgs);
+            }
+        }
         public void UpSkill(int cardId, int skillId)
         {
             if (!this.skillData.ContainsKey(cardId))
@@ -70,38 +87,26 @@ namespace GFGGame
             return npcSkillDic;
         }
 
-        public CardSkillCfg GetCardSkillCfg(int cardId, int skillId)
+        public SkillData GetSkillData(int cardId, int skillId)
         {
-            CardSkillCfg[] cardSkillCfgs = CardSkillCfgArray.Instance.GetCfgs(cardId);
-            CardSkillCfg cardSkillCfg = null;
-            for (int i = 0; i < cardSkillCfgs.Length; i++)
+            SkillData skillData;
+            if (SkillDataManager.Instance.skillData.ContainsKey(cardId) && SkillDataManager.Instance.skillData[cardId].ContainsKey(skillId))
             {
-                if (cardSkillCfgs[i].skillId == skillId)
-                {
-                    cardSkillCfg = cardSkillCfgs[i];
-                }
+                skillData = SkillDataManager.Instance.skillData[cardId][skillId];
             }
-            return cardSkillCfg;
-        }
-
-        public PassivitySkillCfg GetPassivitySkillCfg(int cardId, int skillId)
-        {
-            PassivitySkillCfg[] passivitySkillCfgs = PassivitySkillCfgArray.Instance.GetCfgs(cardId);
-            PassivitySkillCfg passivitySkillCfg = null;
-            for (int i = 0; i < passivitySkillCfgs.Length; i++)
+            else
             {
-                if (passivitySkillCfgs[i].skillId == skillId)
-                {
-                    passivitySkillCfg = passivitySkillCfgs[i];
-                }
+                skillData = new SkillData();
+                skillData.cardId = cardId;
+                skillData.skillId = skillId;
+                skillData.lv = 1;
             }
-            return passivitySkillCfg;
+            return skillData;
         }
 
-        public SkillData GetSkillData(int cardId, int skillId)
+        public PassivitySkillCfg GetPassivitySkillCfg(int cardId, int skillId, int lv)
         {
-            SkillData skillData = SkillDataManager.Instance.skillData.ContainsKey(cardId) && SkillDataManager.Instance.skillData[cardId].ContainsKey(skillId) ? SkillDataManager.Instance.skillData[cardId][skillId] : null;
-            return skillData;
+            return dicPassivitySkill[cardId][skillId][lv];
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Net/Entity/GameResult.cs

@@ -12,6 +12,7 @@ namespace GFGGame
         public List<GuideData> roleGuideList;
         public List<SystemSuit> systemSuitList;
         public List<RoleCard> roleCardList;
+        public List<SkillData> roleSkillList;
     }
 
     public class RoleInfo

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -5,6 +5,8 @@ using UI_ComConsume = UI.Card.UI_ComConsume;
 using System.Collections.Generic;
 using UnityEngine;
 using System.Timers;
+using System.Collections;
+using System.Linq;
 
 namespace GFGGame
 {
@@ -575,28 +577,29 @@ namespace GFGGame
 
         private void UpdateUpSkillView()
         {
-            PassivitySkillCfg[] skillScores = PassivitySkillCfgArray.Instance.GetCfgs(_viewData.id);
-            _comFosterBottom.m_listSkill.numItems = skillScores.Length;
-
+            if (_comFosterBottom.m_listSkill.data == null)
+            {
+                _comFosterBottom.m_listSkill.data = new List<int>(SkillDataManager.Instance.dicPassivitySkill[_viewData.id].Keys);
+            }
+            _comFosterBottom.m_listSkill.numItems = SkillDataManager.Instance.dicPassivitySkill[_viewData.id].Keys.Count;
         }
 
         private void RenderListSkilItem(int index, GObject obj)
         {
             UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
-            PassivitySkillCfg skillScoreCfg = PassivitySkillCfgArray.Instance.GetCfgs(_viewData.id)[index];
-            item.m_txtName.text = skillScoreCfg.name;
-
-            CardSkillCfg[] skillCfgs = CardSkillCfgArray.Instance.GetCfgs(skillScoreCfg.skillId);
-            SkillData skillData = SkillDataManager.Instance.skillData.ContainsKey(skillScoreCfg.id) && SkillDataManager.Instance.skillData[skillScoreCfg.skillId].ContainsKey(skillScoreCfg.skillId) ? SkillDataManager.Instance.skillData[skillScoreCfg.id][skillScoreCfg.skillId] : null;
-            int lv = skillData == null ? 1 : skillData.lv;
-            item.m_txtLv.text = string.Format("{0}级", lv);
-            item.m_btnUp.visible = lv == skillCfgs.Length ? false : true;
+
+            int skillId = (_comFosterBottom.m_listSkill.data as List<int>)[index];
+            SkillData skillData = SkillDataManager.Instance.GetSkillData(_viewData.id, skillId);
+            List<PassivitySkillCfg> skillScoreCfgs = SkillDataManager.Instance.dicPassivitySkill[_viewData.id][skillId];
+            item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(skillScoreCfgs[0].res);
+            item.m_txtName.text = skillScoreCfgs[0].name;
+            item.m_txtLv.text = string.Format("{0}级", skillData.lv);
+            item.m_btnUp.visible = skillData.lv == skillScoreCfgs.Count ? false : true;
             if (item.m_btnUp.data == null)
             {
-                // item.m_btnUp.data = skillScoreCfg;
                 item.m_btnUp.onClick.Add(() =>
                 {
-                    ViewManager.Show<CardSkillView>(new object[] { skillScoreCfg.id, skillScoreCfg.skillId });
+                    ViewManager.Show<CardSkillView>(new object[] { _viewData.id, skillId });
                 });
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -36,8 +36,8 @@ namespace GFGGame
 
             _cardId = (int)(viewData as object[])[0];
             _skillId = (int)(viewData as object[])[1];
-            cardSkillCfg = SkillDataManager.Instance.GetCardSkillCfg(_cardId, _skillId);
-            passivitySkillCfg = SkillDataManager.Instance.GetPassivitySkillCfg(_cardId, _skillId);
+            SkillData skillData = SkillDataManager.Instance.GetSkillData(_cardId, _skillId);
+            passivitySkillCfg = SkillDataManager.Instance.GetPassivitySkillCfg(_cardId, _skillId, skillData.lv);
 
             _ui.m_txtName.text = passivitySkillCfg.name;
             UpdateView();

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -51,7 +51,7 @@ namespace GFGGame
             int cardId = cardList[index].id;
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
             _ui.m_txtName.text = cfg == null ? "" : cfg.name;
-            _ui.m_txtDiscribe.text = cfg == null ? "" : cfg.describe1;
+            _ui.m_txtDiscribe.text = cfg == null ? "" : cfg.describe;
             _ui.m_loaScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _scoreType);
         }
         private void RenderListCardItem(int index, GObject obj)