卡牌

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

@@ -61,7 +61,7 @@ namespace GFGGame
         {
             List<string> resources = new List<string>();
             resources.Add(itemCfg.res);
-            if (itemCfg.cardRes! != "")
+            if (itemCfg.cardRes != "")
             {
                 resources.Add(itemCfg.cardRes);
             }
@@ -222,9 +222,10 @@ namespace GFGGame
                     {
                         if (key == ConstCardState.STATE_FULL_LV && cardList[i].lv == maxLv ||
                             key == ConstCardState.STATE_LV && cardList[i].lv < maxLv ||
-                            key == ConstCardState.STATE_FULL_STAR && isFullStar(cardList[i].id, cardList[i].star) ||
-                            key == ConstCardState.STATE_STAR && !isFullStar(cardList[i].id, cardList[i].star))
+                            key == ConstCardState.STATE_FULL_STAR && isFullStar(cardList[i].id, cardList[i].star, false) ||
+                            key == ConstCardState.STATE_STAR && !isFullStar(cardList[i].id, cardList[i].star, false))
                         {
+                            if (_cardList.IndexOf(cardList[i]) >= 0) continue;//一张卡片同时满足星级和等级条件时，不能重复添加
                             _cardList.Add(cardList[i]);
 
                             continue;

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

@@ -91,7 +91,7 @@ namespace GFGGame
         {
 
             ViewManager.Show(ViewName.CARD_FOSTER_VIEW, (context.data as GObject).data, new object[] { ViewName.CARD_DETAIL_VIEW, _ui.m_listRole.selectedIndex });
-            this.Clear();
+            // this.Clear();
 
         }
         private void RenderListRoleItem(int index, GObject obj)
@@ -101,7 +101,6 @@ namespace GFGGame
         private void OnClickListRoleItem(EventContext context)
         {
             int index = (int)(context.data as GObject).data;
-            // this._selectType = index == 0 ? 0 : listRoleCount - index;
             this.UpdateCardList(index);
 
         }
@@ -111,7 +110,7 @@ namespace GFGGame
         /*******************************************************监听函数**************************************************/
         private void OnclickBtnFilter()
         {
-            ViewManager.Show(ViewName.CARD_FILTER_VIEW);
+            ViewManager.Show(ViewName.CARD_FILTER_VIEW, null, new object[] { ViewName.CARD_DETAIL_VIEW, _ui.m_listRole.selectedIndex });
         }
         private void OnClickBtnBack()
         {

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

@@ -116,12 +116,7 @@ namespace GFGGame
         }
         private void OnClickBtnGo()
         {
-            //this.viewData = this._selectList;
-            ViewManager.Hide(ViewName.CARD_FILTER_VIEW);
-
-            ViewManager.Show(ViewName.CARD_DETAIL_VIEW);
-
-            //ViewManager.GoBackFrom(ViewName.CARD_FILTER_VIEW);
+            ViewManager.GoBackFrom(ViewName.CARD_FILTER_VIEW);
         }
         protected override void OnHide()
         {