卡牌技能

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

@@ -153,10 +153,7 @@ namespace GFGGame
         {
             skillScore = 0;
             showCard = false;
-            // if (!SkillDataManager.Instance.dicPassivitySkill.TryGetValue(InstanceZonesDataManager.currentCardId, out Dictionary<int, List<PassivitySkillCfg>> cfgs))
-            // {
-            //     return;
-            // }
+
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgs(InstanceZonesDataManager.currentCardId);
             if (skillCfgs.Count == 0) return;
 
@@ -165,7 +162,6 @@ namespace GFGGame
                 PassivitySkillCfg skillCfg = skillCfgs[i];
                 int skillLv = SkillDataManager.Instance.GetSkillLv(InstanceZonesDataManager.currentCardId, skillCfg.skillId);
                 PassivitySkillLvlCfg skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfg(skillLv, skillCfg.skillId);
-                // int skillLv = SkillDataManager.Instance.GetSkillLv(InstanceZonesDataManager.currentCardId, cfg.skillId);
 
                 if (partId == skillCfg.subTypes || skillCfg.subTypes == 0)
                 {
@@ -175,7 +171,6 @@ namespace GFGGame
                         //卡牌中包含主技能且此技能被触发，在评分阶段才展示卡牌效果，一张卡牌只要有一个技能需要显示，那就直接显示
                         showCard = true;
                     }
-                    // Debug.Log(" i:" + i + "   cardScore:" + skillScore);
                     skillScore += mainScore * skillLvCfg.count / 100 * isProbability;
                 }
             }

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

@@ -111,6 +111,8 @@ namespace GFGGame
             this.UpdateNormal();
             this.UpdateCardRes();
             this.UpdateUpLvView();
+            this.UpdateUpStarView();
+            this.UpdateUpSkillView();
             _comFosterBottom.m_ctrlTab.selectedIndex = this._selectTab;
         }
         private void ClearItemsCountList()
@@ -430,7 +432,7 @@ namespace GFGGame
                 {
                     if (_showLv - lv >= 1)
                     {
-                        this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
+                        // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
                         ViewManager.Show(ViewName.CARD_UP_VIEW, new object[] { _cardData.scores, "lv", lv, _showLv }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
                     }
                     this.UpdateCommon();
@@ -586,7 +588,7 @@ namespace GFGGame
                 this.UpdateCommon();
                 this.UpdateUpStarView();
 
-                this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
+                // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
                 ViewManager.Show(ViewName.CARD_UP_VIEW, new object[] { _cardData.scores, "star", _cardData.star - 1, _cardData.star }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
             }
         }
@@ -680,6 +682,7 @@ namespace GFGGame
             {
                 this.UpdateUpSkillView();
             }
+            this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
         }
         private void OnItemChangeListener()
         {

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

@@ -56,7 +56,7 @@ namespace GFGGame
             int skillLv = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
             UpdateComLv(_ui.m_comCurLV, skillLv, skillLv + "级");
 
-            if (PassivitySkillLvlCfgArray.Instance.GetCfg(skillLv, _skillId) == null) //已满级
+            if (PassivitySkillLvlCfgArray.Instance.GetCfg(skillLv + 1, _skillId) == null) //已满级
             {
                 _ui.m_c1.selectedIndex = 1;
                 return;

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

@@ -48,11 +48,20 @@ namespace GFGGame
 
         private void UpdateView(int index)
         {
+            // CardData cardData = cardList[index];
+            _ui.m_loaScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _scoreType);
+
             int cardId = cardList[index].id;
+            _ui.m_txtName.text = "";
+            _ui.m_txtDiscribe.text = "";
+
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
-            _ui.m_txtName.text = cfg == null ? "" : cfg.name;
-            _ui.m_txtDiscribe.text = cfg == null ? "" : cfg.describe;
-            _ui.m_loaScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _scoreType);
+            if (cfg == null) return;
+            int skillId = ScoreSystemData.Instance.GetShowSkillCfg(cardId).skillId;
+            int skillLv = SkillDataManager.Instance.GetSkillLv(cardId, skillId);
+            PassivitySkillLvlCfg skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfg(skillLv, skillId);
+            _ui.m_txtName.text = cfg.name;
+            _ui.m_txtDiscribe.text = string.Format(cfg.describe, skillLvCfg.probability, skillLvCfg.count);
         }
         private void RenderListCardItem(int index, GObject obj)
         {