Browse Source

恭喜获得物品和分解界面物品 上的item类型调整

huangxiaoyue 2 years ago
parent
commit
37cb6bdea0

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs

@@ -8,7 +8,6 @@ namespace UI.CommonGame
     {
     {
         public GComponent target;
         public GComponent target;
         public Controller m_QualityType;
         public Controller m_QualityType;
-        public Controller m_ItemType;
         public Controller m_ViewType;
         public Controller m_ViewType;
         public Controller m_TouchType;
         public Controller m_TouchType;
         public Controller m_NewType;
         public Controller m_NewType;
@@ -71,7 +70,6 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_QualityType = comp.GetController("QualityType");
             m_QualityType = comp.GetController("QualityType");
-            m_ItemType = comp.GetController("ItemType");
             m_ViewType = comp.GetController("ViewType");
             m_ViewType = comp.GetController("ViewType");
             m_TouchType = comp.GetController("TouchType");
             m_TouchType = comp.GetController("TouchType");
             m_NewType = comp.GetController("NewType");
             m_NewType = comp.GetController("NewType");
@@ -90,7 +88,6 @@ namespace UI.CommonGame
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_QualityType = null;
             m_QualityType = null;
-            m_ItemType = null;
             m_ViewType = null;
             m_ViewType = null;
             m_TouchType = null;
             m_TouchType = null;
             m_NewType = null;
             m_NewType = null;

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -110,7 +110,6 @@ namespace GFGGame
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
             item.m_ViewType.selectedIndex = 1;
             item.m_ViewType.selectedIndex = 1;
-            item.m_ItemType.selectedIndex = 1;
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             item.m_txtName.text = itemCfg.name;
             item.m_txtName.text = itemCfg.name;
             long itemHasCount = DecomposeDataManager.Instance.ItemCanDecomposeCount(itemCfg.id);
             long itemHasCount = DecomposeDataManager.Instance.ItemCanDecomposeCount(itemCfg.id);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/RarityIconController.cs

@@ -24,7 +24,7 @@ namespace GFGGame
             else
             else
             {
             {
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
-                if(itemCfg.itemType == ConstItemType.DRESS_UP)
+                if(itemCfg.itemType == ConstItemType.DRESS_UP || itemCfg.itemType == ConstItemType.CARD)
                     rarity = itemCfg.rarity;
                     rarity = itemCfg.rarity;
             }
             }
             
             

+ 14 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -136,6 +136,9 @@ namespace GFGGame
             string name = "";
             string name = "";
             string iconRes = "";
             string iconRes = "";
             string ext = "png";
             string ext = "png";
+            int rarity = 0;
+            int id = 0;
+            bool isSuit = false;
 
 
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_listItemDatas[index].id);
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_listItemDatas[index].id);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_listItemDatas[index].id);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_listItemDatas[index].id);
@@ -144,19 +147,29 @@ namespace GFGGame
             {
             {
                 name = suitCfg.name;
                 name = suitCfg.name;
                 iconRes = suitCfg.res;
                 iconRes = suitCfg.res;
+                rarity = suitCfg.rarity;
+                id = suitCfg.id;
+                isSuit = true;
             }
             }
             else
             else
             {
             {
                 name = itemCfg.name;
                 name = itemCfg.name;
                 ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
                 ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
                 iconRes = itemCfg.res;
                 iconRes = itemCfg.res;
+                id = itemCfg.id;
+                isSuit = false;
+                if (itemCfg.itemType == ConstItemType.DRESS_UP)
+                    rarity = itemCfg.rarity;
             }
             }
 
 
             item.m_txtName.text = name;
             item.m_txtName.text = name;
             // item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("{0}", _listItemDatas[index].num);
             // item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("{0}", _listItemDatas[index].num);
             item.m_txtCount.text = string.Format("{0}", _listItemDatas[index].num);
             item.m_txtCount.text = string.Format("{0}", _listItemDatas[index].num);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(iconRes, ext);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(iconRes, ext);
-            item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
+            if(rarity > 0)
+                item.m_QualityType.selectedIndex = rarity - 1;
+
+            RarityIconController.UpdateRarityIcon(item.m_loaRarity, id, false, isSuit);
 
 
             item.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
             item.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
             //特效("ui_ck", "ui_ck_zl");
             //特效("ui_ck", "ui_ck_zl");

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_fui.bytes