Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -19,7 +19,7 @@
       <item url="ui://h9mv1l71wlc22" icon="ui://h9mv1l71qyr6h" selectedIcon="ui://h9mv1l71qyr6k"/>
       <item url="ui://h9mv1l71wlc22" icon="ui://h9mv1l71qyr6g" selectedIcon="ui://h9mv1l71qyr6u"/>
     </list>
-    <list id="n10_wlc2" name="list" xy="76,445" size="928,643" layout="flow_hz" selectionMode="multipleSingleClick" overflow="scroll" lineGap="45" colGap="25" defaultItem="ui://h9mv1l71hvn0a" align="center">
+    <list id="n10_wlc2" name="list" xy="76,445" size="928,643" layout="flow_hz" selectionMode="multipleSingleClick" overflow="scroll" lineGap="45" colGap="25" defaultItem="ui://h9mv1l71hvn0a" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -28,7 +28,7 @@
     </list>
     <text id="n21_qyr6" name="txtNone" xy="380,736" size="256,49" fontSize="36" color="#cfbf9c" vars="true" text="暂无物品可分解"/>
     <text id="n11_wlc2" name="txtShow" xy="301,1150" size="478,44" fontSize="32" color="#917960" align="center" ubb="true" autoSize="none" text="分解0件凡品可获得"/>
-    <list id="n12_wlc2" name="listReward" xy="36,1217" size="1008,263" layout="row" colGap="70" defaultItem="ui://h9mv1l71wlc24" align="center">
+    <list id="n12_wlc2" name="listReward" xy="36,1217" size="1008,263" layout="row" colGap="70" defaultItem="ui://h9mv1l71wlc24" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

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

@@ -163,38 +163,38 @@ namespace GFGGame
                 GetSuitItemController.AddItemId(itemId);
             }
         }
-        //检测当前穿戴是否是一件完整套装，且只穿了一件套装,返回套装id
-        public static int CheckCurDressIsSuit()
-        {
-            if (EquipDataCache.cacher.suitId > 0) return EquipDataCache.cacher.suitId;
-
-            var equipDatas = EquipDataCache.cacher.equipDatas;
-            int dressSuitId = 0;
-            List<int> _equipDatas = new List<int>();
-            for (int i = 0; i < equipDatas.Count; i++)
-            {
-                if (DressUpMenuItemDataManager.CheckIsSceneType(equipDatas[i])) continue;
-                if (equipDatas[i] != ConstItemID.DEFULT_FA_XING && equipDatas[i] != ConstItemID.DEFULT_LIAN_YI_QUN && equipDatas[i] != ConstItemID.DEFULT_NEI_DA && equipDatas[i] != ConstItemID.DEFULT_XIA_ZHUANG)
-                {
-                    int suitId = SuitCfgManager.Instance.GetItemSuitId(equipDatas[i]);
-                    if (suitId <= 0) return 0;//有任何不属于套装的部件且不是原始服装，则当前穿戴不属于套装
-
-                    if (dressSuitId != 0 && dressSuitId != suitId) return 0;//当前穿戴不同套装的部件，则当前穿戴不属于套装
-                    dressSuitId = suitId;
-
-                    _equipDatas.Add(equipDatas[i]);
-                }
-            }
-            if (dressSuitId == 0) return dressSuitId;
-            int[] itemIds = SuitCfgManager.Instance.GetSuitItems(dressSuitId);
-            for (int i = 0; i < itemIds.Length; i++)
-            {
-                if (DressUpMenuItemDataManager.CheckIsSceneType(itemIds[i])) continue;
-                if (_equipDatas.IndexOf(itemIds[i]) < 0) return 0;//套装部件穿戴不完整
-            }
-
-            return dressSuitId;
-        }
+        // //检测当前穿戴是否是一件完整套装，且只穿了一件套装,返回套装id
+        // public static int CheckCurDressIsSuit()
+        // {
+        //     if (EquipDataCache.cacher.suitId > 0) return EquipDataCache.cacher.suitId;
+
+        //     var equipDatas = EquipDataCache.cacher.equipDatas;
+        //     int dressSuitId = 0;
+        //     List<int> _equipDatas = new List<int>();
+        //     for (int i = 0; i < equipDatas.Count; i++)
+        //     {
+        //         if (DressUpMenuItemDataManager.CheckIsSceneType(equipDatas[i])) continue;
+        //         if (equipDatas[i] != ConstItemID.DEFULT_FA_XING && equipDatas[i] != ConstItemID.DEFULT_LIAN_YI_QUN && equipDatas[i] != ConstItemID.DEFULT_NEI_DA && equipDatas[i] != ConstItemID.DEFULT_XIA_ZHUANG)
+        //         {
+        //             int suitId = SuitCfgManager.Instance.GetItemSuitId(equipDatas[i]);
+        //             if (suitId <= 0) return 0;//有任何不属于套装的部件且不是原始服装，则当前穿戴不属于套装
+
+        //             if (dressSuitId != 0 && dressSuitId != suitId) return 0;//当前穿戴不同套装的部件，则当前穿戴不属于套装
+        //             dressSuitId = suitId;
+
+        //             _equipDatas.Add(equipDatas[i]);
+        //         }
+        //     }
+        //     if (dressSuitId == 0) return dressSuitId;
+        //     int[] itemIds = SuitCfgManager.Instance.GetSuitItems(dressSuitId);
+        //     for (int i = 0; i < itemIds.Length; i++)
+        //     {
+        //         if (DressUpMenuItemDataManager.CheckIsSceneType(itemIds[i])) continue;
+        //         if (_equipDatas.IndexOf(itemIds[i]) < 0) return 0;//套装部件穿戴不完整
+        //     }
+
+        //     return dressSuitId;
+        // }
 
         public static List<int> GetSuitIDList()
         {

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -154,7 +154,7 @@ namespace GFGGame
                 DressUpUtil.AddItem(value, _sceneObj, _needSetMask);
                 score += DressUpMenuItemDataManager.GetItemScore(value);
             }
-            int dressSuitId = DressUpMenuSuitDataManager.CheckCurDressIsSuit();
+            int dressSuitId = CheckCurDressIsSuit();
             if (dressSuitId > 0) _suitId = dressSuitId;
         }
 
@@ -171,7 +171,38 @@ namespace GFGGame
                 score -= DressUpMenuItemDataManager.GetItemScore(value);
             }
         }
+        //检测当前穿戴是否是一件完整套装，且只穿了一件套装,返回套装id
+        public int CheckCurDressIsSuit()
+        {
+            if (_suitId > 0) return _suitId;
 
+            // var equipDatas = _equipDatas;
+            int dressSuitId = 0;
+            List<int> _equipDatas = new List<int>();
+            for (int i = 0; i < _equipDatas.Count; i++)
+            {
+                if (DressUpMenuItemDataManager.CheckIsSceneType(_equipDatas[i])) continue;
+                if (_equipDatas[i] != ConstItemID.DEFULT_FA_XING && _equipDatas[i] != ConstItemID.DEFULT_LIAN_YI_QUN && _equipDatas[i] != ConstItemID.DEFULT_NEI_DA && _equipDatas[i] != ConstItemID.DEFULT_XIA_ZHUANG)
+                {
+                    int suitId = SuitCfgManager.Instance.GetItemSuitId(_equipDatas[i]);
+                    if (suitId <= 0) return 0;//有任何不属于套装的部件且不是原始服装，则当前穿戴不属于套装
+
+                    if (dressSuitId != 0 && dressSuitId != suitId) return 0;//当前穿戴不同套装的部件，则当前穿戴不属于套装
+                    dressSuitId = suitId;
+
+                    _equipDatas.Add(_equipDatas[i]);
+                }
+            }
+            if (dressSuitId == 0) return dressSuitId;
+            int[] itemIds = SuitCfgManager.Instance.GetSuitItems(dressSuitId);
+            for (int i = 0; i < itemIds.Length; i++)
+            {
+                if (DressUpMenuItemDataManager.CheckIsSceneType(itemIds[i])) continue;
+                if (_equipDatas.IndexOf(itemIds[i]) < 0) return 0;//套装部件穿戴不完整
+            }
+
+            return dressSuitId;
+        }
         /// <summary>
         /// 仅判断换装部件是否已穿着
         /// </summary>
@@ -295,13 +326,13 @@ namespace GFGGame
                 //是否有内搭
                 bool hasNeiDa = false;
                 //是否有上衣
-                 bool hasShangYi = false;
+                bool hasShangYi = false;
                 //是否有下装
                 bool hasXiaZhuang = false;
                 //是否有默认内搭
-                 bool hasNeiDaDefault = false;
+                bool hasNeiDaDefault = false;
                 //是否有默认下装
-                 bool hasXiaZhuangDefault = false;
+                bool hasXiaZhuangDefault = false;
                 for (int i = 0; i < _equipDatas.Count; i++)
                 {
                     int itemID = (int)_equipDatas[i];
@@ -341,7 +372,7 @@ namespace GFGGame
                 }
                 if (!hasLianYiQun)
                 {
-                    if(!hasShangYi && (!hasNeiDa || hasNeiDaDefault) && (!hasXiaZhuang || hasXiaZhuangDefault))
+                    if (!hasShangYi && (!hasNeiDa || hasNeiDaDefault) && (!hasXiaZhuang || hasXiaZhuangDefault))
                     {
                         Remove(ConstItemID.DEFULT_XIA_ZHUANG);
                         Remove(ConstItemID.DEFULT_NEI_DA);
@@ -358,7 +389,7 @@ namespace GFGGame
                             Add(ConstItemID.DEFULT_NEI_DA);
                         }
                     }
-                    
+
                 }
             }
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeRuleView.cs

@@ -43,7 +43,7 @@ namespace GFGGame
             int id = DecomposeDataManager.Instance.GetRewardList()[index];
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
 
-            string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+            string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             _strName += (itemCfg.name + (index == DecomposeDataManager.Instance.GetRewardList().Count - 1 ? "。" : "、"));
             UI_ListRewardItem.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -108,7 +108,7 @@ namespace GFGGame
             UI_ListItem item = UI_ListItem.Proxy(obj);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_clothingDatas[index]);
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
-            string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+            string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             item.m_txtName.text = itemCfg.name;
             item.m_imgSelect.visible = false;
@@ -238,7 +238,7 @@ namespace GFGGame
             DecomposeCfg decomposeCfg = DecomposeCfgArray.Instance.GetCfg(_curRarity);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(decomposeCfg.itemsArr[index][0]);
             item.m_txtCount.text = (decomposeCfg.itemsArr[index][1] * _decomposeCount).ToString();
-            string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+            string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             item.target.data = itemCfg;
             UI_ListRewardItem.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -110,7 +110,7 @@ namespace GFGGame
             else
             {
                 name = itemCfg.name;
-                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
                 iconRes = itemCfg.res;
             }
 

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

@@ -394,7 +394,7 @@ namespace GFGGame
                     .SetRightButton(true, "好的");
                 return;
             }
-            int _suitId = DressUpMenuSuitDataManager.CheckCurDressIsSuit(); ;
+            int _suitId = EquipDataCache.cacher.CheckCurDressIsSuit(); ;
             if (_fightCfg.needItemId > 0 && (_suitId <= 0 && EquipDataCache.cacher.equipDatas.IndexOf(_fightCfg.needItemId) < 0 || _suitId > 0 && Array.IndexOf(SuitCfgArray.Instance.GetCfg(_suitId).partsArr, _fightCfg.needItemId) < 0) || _fightCfg.needSuitId > 0 && _suitId != _fightCfg.needSuitId)
             {
                 AlertUI.Show("未穿戴必须品~").SetRightButton(true, "好的");
@@ -741,7 +741,7 @@ namespace GFGGame
                 DressUpMenuItemDataManager.RemoveNewDressItem(_currentMenuType, id);
 
                 RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
-                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
             }
             if (listItem.target.data == null)
             {
@@ -779,7 +779,7 @@ namespace GFGGame
             listItem.m_iconSelected.visible = EquipDataCache.cacher.CheckDressUpItemIsOn(id);
             listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
-            ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+            ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
 
             listItem.m_ScoreType.visible = true;
             // int mainScore;
@@ -801,7 +801,7 @@ namespace GFGGame
         private void UpdateListPartsSelected()
         {
             int count = _ui.m_partsList.m_list.numChildren;
-            int suitId = DressUpMenuSuitDataManager.CheckCurDressIsSuit();
+            int suitId = EquipDataCache.cacher.CheckCurDressIsSuit();
 
             for (int i = 0; i < count; i++)
             {
@@ -824,7 +824,7 @@ namespace GFGGame
         private void UpdateListSuitPartsSelected()
         {
             int count = _ui.m_partsList2.m_list.numChildren;
-            int suitId = DressUpMenuSuitDataManager.CheckCurDressIsSuit();
+            int suitId = EquipDataCache.cacher.CheckCurDressIsSuit();
 
             for (int i = 0; i < count; i++)
             {

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

@@ -605,7 +605,7 @@ namespace GFGGame
                 listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
 
                 RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
-                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
 
                 listItem.m_ScoreType.visible = true;
                 int mainScore;
@@ -657,7 +657,7 @@ namespace GFGGame
             listItem.m_iconSelected.visible = !_ui.m_btnAction.grayed || EquipDataCache.cacher.CheckDressUpItemIsOn(id);
             listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
-            ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+            ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
 
             listItem.m_ScoreType.visible = true;
             int mainScore;
@@ -677,7 +677,7 @@ namespace GFGGame
         private void UpdateListPartsSelected()
         {
             int count = _ui.m_partsList.m_list.numChildren;
-            int suitId = DressUpMenuSuitDataManager.CheckCurDressIsSuit();
+            int suitId = EquipDataCache.cacher.CheckCurDressIsSuit();
 
             for (int i = 0; i < count; i++)
             {
@@ -702,7 +702,7 @@ namespace GFGGame
         private void UpdateListSuitPartsSelected()
         {
             int count = _ui.m_partsList2.m_list.numChildren;
-            int suitId = DressUpMenuSuitDataManager.CheckCurDressIsSuit();
+            int suitId = EquipDataCache.cacher.CheckCurDressIsSuit();
             for (int i = 0; i < count; i++)
             {
                 UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList2.m_list.GetChildAt(i));

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -48,10 +48,7 @@ namespace GFGGame
         }
         protected override void AddEventListener()
         {
-            EventAgent.AddEventListener(ConstMessage.SUIT_GUIDE_BOX_BONUS, () =>
-           {
-               _ui.m_listGuide.numItems = _listGuideDatas.Length;
-           });
+            EventAgent.AddEventListener(ConstMessage.SUIT_GUIDE_BOX_BONUS, UpdateList);
             EventAgent.AddEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
         }
         protected override void OnShown()
@@ -73,10 +70,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.SUIT_GUIDE_BOX_BONUS, () =>
-           {
-               _ui.m_listGuide.numItems = _listGuideDatas.Length;
-           });
+            EventAgent.RemoveEventListener(ConstMessage.SUIT_GUIDE_BOX_BONUS, UpdateList);
             EventAgent.RemoveEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
         }
         private void OnClickBtnBack()
@@ -84,7 +78,10 @@ namespace GFGGame
             // this.Hide();
             ViewManager.GoBackFrom(ViewName.FIELD_GUIDE_VIEW);
         }
-
+        private void UpdateList()
+        {
+            _ui.m_listGuide.numItems = _listGuideDatas.Length;
+        }
         private void ListBannerItemRenderer(int index, GObject item)
         {
             UI_ButtonBannerPage listItem = UI_ButtonBannerPage.Proxy(item);

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -67,8 +67,10 @@ namespace GFGGame
             base.OnShown();
             if (_sceneObject == null)
             {
+                CustomSuitData customSuit = CustomSuitDataManager.GetSuitList(CustomSuitDataManager.currentIndex);
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
                 EquipDataCache.cacher.setSceneObj(_sceneObject);
+                EquipDataCache.cacher.AddOrRemove(customSuit.bg, true);
             }
             _ui.m_grpSlogan.visible = false;
             FriendDataManager.Instance.UpdateFriendList(true);

GameClient/Assets/Game/HotUpdate/Views/Login/LoginInputView.cs

@@ -21,6 +21,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_LoginInputUI.PACKAGE_NAME;
             _ui = UI_LoginInputUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -52,10 +52,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, () =>
-            {
-                _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
-            });
+            EventAgent.AddEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
             EventAgent.AddEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
             EventAgent.AddEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
         }
@@ -85,10 +82,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, () =>
-            {
-                _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
-            });
+            EventAgent.RemoveEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
             EventAgent.RemoveEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
             EventAgent.RemoveEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
         }
@@ -96,6 +90,7 @@ namespace GFGGame
         {
             this.Hide();
         }
+
         private void OnComTabChange()
         {
             _ui.m_c1.selectedIndex = _ui.m_comTab.m_c1.selectedIndex;
@@ -107,6 +102,10 @@ namespace GFGGame
             _ui.m_listGift.ScrollToView(0);
             _ui.m_listExchange.ScrollToView(0);
         }
+        private void UpdateList()
+        {
+            _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
+        }
         private void UpdateGiftBagList()
         {
             _giftCfgs = RechargeDataManager.Instance.GetGiftBagCfgs();
@@ -140,7 +139,7 @@ namespace GFGGame
             {
                 item.target.onClick.Add(() =>
                 {
-                    if(!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
+                    if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
                     {
                         RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
                         LogServerHelper.SendNodeLog((int)PlayParticipationEnum.SHANG_CHENG, 2);

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -77,7 +77,7 @@ namespace GFGGame
             LogServerHelper.SendNodeLog((int)PlayParticipationEnum.ZHI_WU_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFabricView).FullName, true)) return;
-            ViewManager.Show<StudioFabricView>(new object[] { 0, 0 }, new object[] { typeof(StudioView).Name, this.viewData });
+            ViewManager.Show<StudioFabricView>(new object[] { 0, 0 }, new object[] { typeof(StudioView).FullName, this.viewData });
             this.Hide();
 
         }