Merge remote-tracking branch 'remotes/org/master' into xiaojie

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

@@ -74,8 +74,17 @@ namespace GFGGame
 
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
 
-            item.m_txtName.text = shopCfg.itemName;
-            item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+            try
+            {
+                item.m_txtName.text = shopCfg.itemName;
+                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+            
 
             item.m_grpDiscount.visible = shopCfg.Price < shopCfg.originalPrice;
             if (item.m_grpDiscount.visible)