Merge remote-tracking branch 'remotes/origin/master' into ios_test

GameClient/.idea/.idea.GameClient/.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Assets/Game/CSShare" vcs="Git" />
   </component>
 </project>

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

@@ -430,6 +430,10 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
             List<SuitFosterCfg> fosterCfgs = SuitFosterCfgArray.Instance.GetCfgsBysuitId(itemCfg.suitId);
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(fosterCfgs[0].suitId2);
+            if (suitCfg == null)
+            {
+             Log.Error($"");   
+            }
             for (int i = 0; i < suitCfg.partsArr.Length; i++)
             {
                 ItemCfg itemPartCfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[i]);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BlindBox/UI_BlindBoxUI.cs

@@ -8,7 +8,6 @@ namespace UI.BlindBox
     {
         public GComponent target;
         public GGraph m_effect;
-        public GGroup m_bg;
         public GButton m_ruleBtn;
         public GTextField m_txtTime;
         public GTextField m_txtDesc;
@@ -69,7 +68,6 @@ namespace UI.BlindBox
         private void Init(GComponent comp)
         {
             m_effect = (GGraph)comp.GetChild("effect");
-            m_bg = (GGroup)comp.GetChild("bg");
             m_ruleBtn = (GButton)comp.GetChild("ruleBtn");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
@@ -86,7 +84,6 @@ namespace UI.BlindBox
         public void Dispose(bool disposeTarget = false)
         {
             m_effect = null;
-            m_bg = null;
             m_ruleBtn = null;
             m_txtTime = null;
             m_txtDesc = null;

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxView.cs

@@ -73,7 +73,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.visible = false;
+            //_ui.m_bg.visible = false;
             _ui.m_t1.Play();
             clickBlankToClose = false;
             itemcfg = ItemCfgArray.Instance.GetCfg(blindBoxCfg.CostID);