Merge remote-tracking branch 'remotes/origin/guodong' into zhaoyang

GameClient/Assets/Editor/Excel/Scanner/InstanceZonesScanner.cs

@@ -77,7 +77,7 @@ namespace GFGEditor
             {
                 foreach (var cfg in dataArray)
                 {
-                    var key = CalculateHelper.GenerateInstanceZonesLevelStateKey(cfg.type, ConstInstanceZonesSubType.Normal, cfg.id);
+                    var key = CalculateHelper.GenerateInstanceZonesLevelStateKey(cfg.type, cfg.subType, cfg.id);
                     levelCountDIc.TryGetValue(key, out var count);
                     var names = new string[] { "_" + nameof(cfg.levelCount) };
                     var values = new string[] { "" + count };