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

GameClient/Assets/Editor/Excel/ExcelScanner.cs

@@ -21,6 +21,7 @@ namespace GFGEditor
 
             GiftBagScanner.StartScan();
             FieldScanner.StartScan();
+            // SuitGuideScanner.StartScan();
         }
     }
 }

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

@@ -148,10 +148,10 @@ namespace GFGGame
             switch (_menuType)
             {
                 case ConstSuitGuideTypeId.TYPE_1:
-                    _menuTypeDataArray = new int[] { 0, 1, 2, 3, 4, 5 };
+                    _menuTypeDataArray = new int[] { 0, 1, 2, 3, 4, 5, 6, 7 };
                     break;
                 default:
-                    _menuTypeDataArray = new int[] { 6, 7, 8, 9, 10 };
+                    _menuTypeDataArray = new int[] { 8, 9, 10, 11, 12, 13 };
                     break;
             }
             _ui.m_listType.numItems = _menuTypeDataArray.Length;