竞技场删除穿戴时卡牌也清除

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

@@ -265,8 +265,7 @@ namespace GFGGame
         /// <returns></returns>
         public long GetSkillFightScore(double itemScoreSum, int baseScore, int cardId, int cardScore, List<int> skillLvs)
         {
-            // double itemSum = itemScoreSum;
-            long skillScore = 0;
+            float skillScore = 0;
             float skillBaseScore = (long)itemScoreSum + cardScore + baseScore;
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             for (int j = 0; j < skillCfgs.Count; j++)
@@ -274,10 +273,9 @@ namespace GFGGame
                 if (skillLvs.Count == 0) continue;
                 PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLvs[j], skillCfgs[j].skillId);
                 if (skillLvlCfg == null) continue;
-                float _skillScore = skillBaseScore * ((float)skillLvlCfg.fightPowerParam / 10000f);
-                skillScore += (long)Math.Ceiling(_skillScore);
+                skillScore += skillBaseScore * ((float)skillLvlCfg.fightPowerParam / 10000f);
             }
-            return skillScore;
+            return (long)Math.Ceiling(skillScore); ;
         }
 
         /// <summary>

GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -17,7 +17,7 @@ namespace GFGGame
         // private DressUpObj _dressUpData = new DressUpObj();
         private ArenaDataManager _dataManager;
         private FightData _roleData;
-        public List<int> _itemList;
+        public List<int> _itemList;//记录打开界面时的穿戴数据（保存后会更新）
         private float listType1X = 0;
         private float partsListX = 0;
         private DressUpListType currentListType;
@@ -372,6 +372,7 @@ namespace GFGGame
         private void OnClickBtnDelete()
         {
             MyDressUpHelper.dressUpObj.TakeOffAll();
+            _roleData.cardId = 0;
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);