Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit e765ef347b09bf02ed7f24b9c49d3874adfb52bf
+Subproject commit 7672b26a41f28101af7075414424d6c784acfba4

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

@@ -131,7 +131,7 @@ namespace GFGGame
                     break;
                 case ConstFunctionId.TAO_ZHUANG_TU_JIAN:
                     this.Hide();
-                    ViewManager.Show(ViewName.SUIT_GUIDE_VIEW);
+                    ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, null, _fromeViewDatas);
                     break;
                 case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
                     this.Hide();