Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_ListSelectorItem.cs

@@ -10,6 +10,7 @@ namespace UI.Bag
         public GTextInput m_txtSelNum;
         public GButton m_btnReduce;
         public GButton m_btnAdd;
+        public GLoader m_loaBg;
         public GLoader m_loaIcon;
         public GTextField m_txtNum;
         public const string URL = "ui://2bsz6nelv5notmb";
@@ -62,6 +63,7 @@ namespace UI.Bag
             m_txtSelNum = (GTextInput)comp.GetChild("txtSelNum");
             m_btnReduce = (GButton)comp.GetChild("btnReduce");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
         }
@@ -70,6 +72,7 @@ namespace UI.Bag
             m_txtSelNum = null;
             m_btnReduce = null;
             m_btnAdd = null;
+            m_loaBg = null;
             m_loaIcon = null;
             m_txtNum = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/Views/Bag/GiftBoxSelectorView.cs

@@ -18,6 +18,13 @@ namespace GFGGame
         private int _selCount; //选择的数量
         private Dictionary<int, int> _selDic; //选择礼包内的物品<物品id,数量>
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
+        private List<string> _itemQualityRes = new List<string>() 
+                      { "",
+                        "wpk_db_fp", 
+                        "wpk_db_zx",
+                        "wpk_db_dc", 
+                        "wpk_db_ty",
+                        "wp_baseboard1"};
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
 
@@ -138,6 +145,7 @@ namespace GFGGame
 
             int[] itemChildArr = itemCfg.itemsArr[index];
             ItemCfg itemCfgChild = ItemCfgArray.Instance.GetCfg(itemChildArr[0]);
+            uiItemChild.m_loaBg.url = ResPathUtil.GetCommonGameResPath(_itemQualityRes[itemCfgChild.rarity]);
             uiItemChild.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfgChild);
             uiItemChild.m_loaIcon.onClick.Add(OnListSelectorItemClick);
             uiItemChild.m_txtNum.text = itemChildArr[1].ToString();

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

@@ -225,6 +225,7 @@ namespace GFGGame
                         if (studioCfg.funId == typeof(StudioFilingView).Name)
                         {
                             StudioDataManager.Instance.filingChapterId = studioCfg.id;
+                            StudioDataManager.Instance.npcFilingChapterId = studioCfg.id;
                             if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
                             {
                                 ViewManager.Show<StudioFilingView>(studioCfg.id);