From 65591dd0f644b308d9741c3afe377ceecef530be Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 8 Dec 2023 19:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_eventlottery.json     | 992 ++++++++++++++--------------
 bin/json/game_fightglobalevent.json |   4 +-
 bin/json/game_gamesummarytab.json   |   8 +-
 bin/json/game_monsterformat.json    |  14 +-
 bin/json/game_repeatall.json        |  34 +-
 bin/json/game_skillbuff.json        |  34 +
 6 files changed, 544 insertions(+), 542 deletions(-)

diff --git a/bin/json/game_eventlottery.json b/bin/json/game_eventlottery.json
index bb3f4ec4b..d92865ddb 100644
--- a/bin/json/game_eventlottery.json
+++ b/bin/json/game_eventlottery.json
@@ -334,8 +334,8 @@
     "GroupId": 14010100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14110102,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -345,8 +345,8 @@
     "GroupId": 14010100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14110103,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -356,7 +356,7 @@
     "GroupId": 14010100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14110104,
     "SubGroupNum": 1,
@@ -367,8 +367,8 @@
     "GroupId": 14010100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14110105,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -389,8 +389,8 @@
     "GroupId": 14010200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14110202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -400,8 +400,8 @@
     "GroupId": 14010200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14110203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -411,7 +411,7 @@
     "GroupId": 14010200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14110204,
     "SubGroupNum": 1,
@@ -422,8 +422,8 @@
     "GroupId": 14010200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14110205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -444,8 +444,8 @@
     "GroupId": 14010300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14110302,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -455,8 +455,8 @@
     "GroupId": 14010300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14110303,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -466,7 +466,7 @@
     "GroupId": 14010300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14110304,
     "SubGroupNum": 1,
@@ -477,8 +477,8 @@
     "GroupId": 14010300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14110305,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -499,8 +499,8 @@
     "GroupId": 14020100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120102,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -510,8 +510,8 @@
     "GroupId": 14020100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120103,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -521,7 +521,7 @@
     "GroupId": 14020100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14120104,
     "SubGroupNum": 1,
@@ -532,8 +532,8 @@
     "GroupId": 14020100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120105,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -554,8 +554,8 @@
     "GroupId": 14020200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -565,8 +565,8 @@
     "GroupId": 14020200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -576,7 +576,7 @@
     "GroupId": 14020200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14120204,
     "SubGroupNum": 1,
@@ -587,8 +587,8 @@
     "GroupId": 14020200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -609,8 +609,8 @@
     "GroupId": 14020300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120302,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -620,8 +620,8 @@
     "GroupId": 14020300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120303,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -631,7 +631,7 @@
     "GroupId": 14020300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14120304,
     "SubGroupNum": 1,
@@ -642,8 +642,8 @@
     "GroupId": 14020300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120305,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -664,8 +664,8 @@
     "GroupId": 14020500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120502,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -675,8 +675,8 @@
     "GroupId": 14020500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120503,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -686,7 +686,7 @@
     "GroupId": 14020500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14120504,
     "SubGroupNum": 1,
@@ -697,8 +697,8 @@
     "GroupId": 14020500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120505,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -719,8 +719,8 @@
     "GroupId": 14020600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120602,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -730,8 +730,8 @@
     "GroupId": 14020600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120603,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -741,7 +741,7 @@
     "GroupId": 14020600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14120604,
     "SubGroupNum": 1,
@@ -752,8 +752,8 @@
     "GroupId": 14020600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14120605,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -774,8 +774,8 @@
     "GroupId": 14030100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130102,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -785,8 +785,8 @@
     "GroupId": 14030100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130103,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -796,7 +796,7 @@
     "GroupId": 14030100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14130104,
     "SubGroupNum": 1,
@@ -807,8 +807,8 @@
     "GroupId": 14030100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130105,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -829,8 +829,8 @@
     "GroupId": 14030200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -840,8 +840,8 @@
     "GroupId": 14030200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -851,7 +851,7 @@
     "GroupId": 14030200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14130204,
     "SubGroupNum": 1,
@@ -862,8 +862,8 @@
     "GroupId": 14030200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -884,8 +884,8 @@
     "GroupId": 14030300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130302,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -895,8 +895,8 @@
     "GroupId": 14030300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130303,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -906,7 +906,7 @@
     "GroupId": 14030300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14130304,
     "SubGroupNum": 1,
@@ -917,8 +917,8 @@
     "GroupId": 14030300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130305,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -939,8 +939,8 @@
     "GroupId": 14030500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130502,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -950,8 +950,8 @@
     "GroupId": 14030500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130503,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -961,7 +961,7 @@
     "GroupId": 14030500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14130504,
     "SubGroupNum": 1,
@@ -972,8 +972,8 @@
     "GroupId": 14030500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130505,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -994,8 +994,8 @@
     "GroupId": 14030600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130602,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1005,8 +1005,8 @@
     "GroupId": 14030600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130603,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1016,7 +1016,7 @@
     "GroupId": 14030600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14130604,
     "SubGroupNum": 1,
@@ -1027,8 +1027,8 @@
     "GroupId": 14030600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14130605,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1049,8 +1049,8 @@
     "GroupId": 14040100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140102,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1060,8 +1060,8 @@
     "GroupId": 14040100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140103,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1071,7 +1071,7 @@
     "GroupId": 14040100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14140104,
     "SubGroupNum": 1,
@@ -1082,8 +1082,8 @@
     "GroupId": 14040100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140105,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1104,8 +1104,8 @@
     "GroupId": 14040200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1115,8 +1115,8 @@
     "GroupId": 14040200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1126,7 +1126,7 @@
     "GroupId": 14040200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14140204,
     "SubGroupNum": 1,
@@ -1137,8 +1137,8 @@
     "GroupId": 14040200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1159,8 +1159,8 @@
     "GroupId": 14040300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140302,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1170,8 +1170,8 @@
     "GroupId": 14040300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140303,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1181,7 +1181,7 @@
     "GroupId": 14040300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14140304,
     "SubGroupNum": 1,
@@ -1192,8 +1192,8 @@
     "GroupId": 14040300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140305,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1214,8 +1214,8 @@
     "GroupId": 14040500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140502,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1225,8 +1225,8 @@
     "GroupId": 14040500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140503,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1236,7 +1236,7 @@
     "GroupId": 14040500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14140504,
     "SubGroupNum": 1,
@@ -1247,8 +1247,8 @@
     "GroupId": 14040500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140505,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1269,8 +1269,8 @@
     "GroupId": 14040600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140602,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1280,8 +1280,8 @@
     "GroupId": 14040600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140603,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1291,7 +1291,7 @@
     "GroupId": 14040600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14140604,
     "SubGroupNum": 1,
@@ -1302,8 +1302,8 @@
     "GroupId": 14040600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140605,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1324,8 +1324,8 @@
     "GroupId": 14040900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140902,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1335,8 +1335,8 @@
     "GroupId": 14040900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140903,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1346,7 +1346,7 @@
     "GroupId": 14040900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14140904,
     "SubGroupNum": 1,
@@ -1357,8 +1357,8 @@
     "GroupId": 14040900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14140905,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1379,8 +1379,8 @@
     "GroupId": 14041000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14141002,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1390,8 +1390,8 @@
     "GroupId": 14041000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14141003,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1401,7 +1401,7 @@
     "GroupId": 14041000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14141004,
     "SubGroupNum": 1,
@@ -1412,8 +1412,8 @@
     "GroupId": 14041000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14141005,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1434,8 +1434,8 @@
     "GroupId": 14050100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150102,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1445,8 +1445,8 @@
     "GroupId": 14050100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150103,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1456,7 +1456,7 @@
     "GroupId": 14050100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14150104,
     "SubGroupNum": 1,
@@ -1467,8 +1467,8 @@
     "GroupId": 14050100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150105,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1489,8 +1489,8 @@
     "GroupId": 14050200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1500,8 +1500,8 @@
     "GroupId": 14050200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1511,7 +1511,7 @@
     "GroupId": 14050200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14150204,
     "SubGroupNum": 1,
@@ -1522,8 +1522,8 @@
     "GroupId": 14050200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1544,8 +1544,8 @@
     "GroupId": 14050300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150302,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1555,8 +1555,8 @@
     "GroupId": 14050300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150303,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1566,7 +1566,7 @@
     "GroupId": 14050300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14150304,
     "SubGroupNum": 1,
@@ -1577,8 +1577,8 @@
     "GroupId": 14050300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150305,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1599,8 +1599,8 @@
     "GroupId": 14050500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150502,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1610,8 +1610,8 @@
     "GroupId": 14050500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150503,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1621,7 +1621,7 @@
     "GroupId": 14050500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14150504,
     "SubGroupNum": 1,
@@ -1632,8 +1632,8 @@
     "GroupId": 14050500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150505,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1654,8 +1654,8 @@
     "GroupId": 14050600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150602,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1665,8 +1665,8 @@
     "GroupId": 14050600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150603,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1676,7 +1676,7 @@
     "GroupId": 14050600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14150604,
     "SubGroupNum": 1,
@@ -1687,8 +1687,8 @@
     "GroupId": 14050600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150605,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1709,8 +1709,8 @@
     "GroupId": 14050900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150902,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1720,8 +1720,8 @@
     "GroupId": 14050900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150903,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1731,7 +1731,7 @@
     "GroupId": 14050900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14150904,
     "SubGroupNum": 1,
@@ -1742,8 +1742,8 @@
     "GroupId": 14050900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14150905,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1764,8 +1764,8 @@
     "GroupId": 14051000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14151002,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1775,8 +1775,8 @@
     "GroupId": 14051000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14151003,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1786,7 +1786,7 @@
     "GroupId": 14051000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14151004,
     "SubGroupNum": 1,
@@ -1797,8 +1797,8 @@
     "GroupId": 14051000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14151005,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1819,8 +1819,8 @@
     "GroupId": 14060100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160102,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1830,8 +1830,8 @@
     "GroupId": 14060100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160103,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1841,7 +1841,7 @@
     "GroupId": 14060100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14160104,
     "SubGroupNum": 1,
@@ -1852,8 +1852,8 @@
     "GroupId": 14060100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160105,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1874,8 +1874,8 @@
     "GroupId": 14060200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1885,8 +1885,8 @@
     "GroupId": 14060200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1896,7 +1896,7 @@
     "GroupId": 14060200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14160204,
     "SubGroupNum": 1,
@@ -1907,8 +1907,8 @@
     "GroupId": 14060200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1929,8 +1929,8 @@
     "GroupId": 14060300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160302,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1940,8 +1940,8 @@
     "GroupId": 14060300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160303,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1951,7 +1951,7 @@
     "GroupId": 14060300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14160304,
     "SubGroupNum": 1,
@@ -1962,8 +1962,8 @@
     "GroupId": 14060300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160305,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1984,8 +1984,8 @@
     "GroupId": 14060500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160502,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -1995,8 +1995,8 @@
     "GroupId": 14060500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160503,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2006,7 +2006,7 @@
     "GroupId": 14060500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14160504,
     "SubGroupNum": 1,
@@ -2017,8 +2017,8 @@
     "GroupId": 14060500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160505,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2039,8 +2039,8 @@
     "GroupId": 14060600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160602,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2050,8 +2050,8 @@
     "GroupId": 14060600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160603,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2061,7 +2061,7 @@
     "GroupId": 14060600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14160604,
     "SubGroupNum": 1,
@@ -2072,8 +2072,8 @@
     "GroupId": 14060600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160605,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2094,8 +2094,8 @@
     "GroupId": 14060900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160902,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2105,8 +2105,8 @@
     "GroupId": 14060900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160903,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2116,7 +2116,7 @@
     "GroupId": 14060900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14160904,
     "SubGroupNum": 1,
@@ -2127,8 +2127,8 @@
     "GroupId": 14060900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14160905,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2149,8 +2149,8 @@
     "GroupId": 14061000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14161002,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2160,8 +2160,8 @@
     "GroupId": 14061000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14161003,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2171,7 +2171,7 @@
     "GroupId": 14061000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14161004,
     "SubGroupNum": 1,
@@ -2182,8 +2182,8 @@
     "GroupId": 14061000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14161005,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2204,8 +2204,8 @@
     "GroupId": 14070100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170102,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2215,8 +2215,8 @@
     "GroupId": 14070100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170103,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2226,7 +2226,7 @@
     "GroupId": 14070100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14170104,
     "SubGroupNum": 1,
@@ -2237,8 +2237,8 @@
     "GroupId": 14070100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170105,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2259,8 +2259,8 @@
     "GroupId": 14070200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2270,8 +2270,8 @@
     "GroupId": 14070200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2281,7 +2281,7 @@
     "GroupId": 14070200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14170204,
     "SubGroupNum": 1,
@@ -2292,8 +2292,8 @@
     "GroupId": 14070200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2314,8 +2314,8 @@
     "GroupId": 14070300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170302,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2325,8 +2325,8 @@
     "GroupId": 14070300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170303,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2336,7 +2336,7 @@
     "GroupId": 14070300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14170304,
     "SubGroupNum": 1,
@@ -2347,8 +2347,8 @@
     "GroupId": 14070300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170305,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2369,8 +2369,8 @@
     "GroupId": 14070500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170502,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2380,8 +2380,8 @@
     "GroupId": 14070500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170503,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2391,7 +2391,7 @@
     "GroupId": 14070500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14170504,
     "SubGroupNum": 1,
@@ -2402,8 +2402,8 @@
     "GroupId": 14070500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170505,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2424,8 +2424,8 @@
     "GroupId": 14070600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170602,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2435,8 +2435,8 @@
     "GroupId": 14070600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170603,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2446,7 +2446,7 @@
     "GroupId": 14070600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14170604,
     "SubGroupNum": 1,
@@ -2457,8 +2457,8 @@
     "GroupId": 14070600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170605,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2479,8 +2479,8 @@
     "GroupId": 14070900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170902,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2490,8 +2490,8 @@
     "GroupId": 14070900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170903,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2501,7 +2501,7 @@
     "GroupId": 14070900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14170904,
     "SubGroupNum": 1,
@@ -2512,8 +2512,8 @@
     "GroupId": 14070900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14170905,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2534,8 +2534,8 @@
     "GroupId": 14071000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14171002,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2545,8 +2545,8 @@
     "GroupId": 14071000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14171003,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2556,7 +2556,7 @@
     "GroupId": 14071000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14171004,
     "SubGroupNum": 1,
@@ -2567,8 +2567,8 @@
     "GroupId": 14071000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14171005,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2589,8 +2589,8 @@
     "GroupId": 14080100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180102,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2600,8 +2600,8 @@
     "GroupId": 14080100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180103,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2611,7 +2611,7 @@
     "GroupId": 14080100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14180104,
     "SubGroupNum": 1,
@@ -2622,8 +2622,8 @@
     "GroupId": 14080100,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180105,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2644,8 +2644,8 @@
     "GroupId": 14080200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2655,8 +2655,8 @@
     "GroupId": 14080200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2666,7 +2666,7 @@
     "GroupId": 14080200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14180204,
     "SubGroupNum": 1,
@@ -2677,8 +2677,8 @@
     "GroupId": 14080200,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2699,8 +2699,8 @@
     "GroupId": 14080300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180302,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2710,8 +2710,8 @@
     "GroupId": 14080300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180303,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2721,7 +2721,7 @@
     "GroupId": 14080300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14180304,
     "SubGroupNum": 1,
@@ -2732,8 +2732,8 @@
     "GroupId": 14080300,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180305,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2754,8 +2754,8 @@
     "GroupId": 14080500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180502,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2765,8 +2765,8 @@
     "GroupId": 14080500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180503,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2776,7 +2776,7 @@
     "GroupId": 14080500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14180504,
     "SubGroupNum": 1,
@@ -2787,8 +2787,8 @@
     "GroupId": 14080500,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180505,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2809,8 +2809,8 @@
     "GroupId": 14080600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180602,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2820,8 +2820,8 @@
     "GroupId": 14080600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180603,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2831,7 +2831,7 @@
     "GroupId": 14080600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14180604,
     "SubGroupNum": 1,
@@ -2842,8 +2842,8 @@
     "GroupId": 14080600,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180605,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2864,8 +2864,8 @@
     "GroupId": 14080900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180902,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2875,8 +2875,8 @@
     "GroupId": 14080900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180903,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2886,7 +2886,7 @@
     "GroupId": 14080900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14180904,
     "SubGroupNum": 1,
@@ -2897,8 +2897,8 @@
     "GroupId": 14080900,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14180905,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2919,8 +2919,8 @@
     "GroupId": 14081000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14181002,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2930,8 +2930,8 @@
     "GroupId": 14081000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14181003,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2941,7 +2941,7 @@
     "GroupId": 14081000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
+    "SubGroupId": 1002,
     "SubGroupType": 1,
     "EventID": 14181004,
     "SubGroupNum": 1,
@@ -2952,8 +2952,8 @@
     "GroupId": 14081000,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
     "EventID": 14181005,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2974,8 +2974,8 @@
     "GroupId": 15020401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15020402,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2985,8 +2985,8 @@
     "GroupId": 15020401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15020403,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -2996,8 +2996,8 @@
     "GroupId": 15020401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15020404,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3007,8 +3007,8 @@
     "GroupId": 15020401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15020405,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3029,8 +3029,8 @@
     "GroupId": 15030401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15030402,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3040,8 +3040,8 @@
     "GroupId": 15030401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15030403,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3051,8 +3051,8 @@
     "GroupId": 15030401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15030404,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3062,8 +3062,8 @@
     "GroupId": 15030401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15030405,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3084,8 +3084,8 @@
     "GroupId": 15040401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15040402,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3095,8 +3095,8 @@
     "GroupId": 15040401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15040403,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3106,8 +3106,8 @@
     "GroupId": 15040401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15040404,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3117,8 +3117,8 @@
     "GroupId": 15040401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15040405,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3139,8 +3139,8 @@
     "GroupId": 15040801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15040802,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3150,8 +3150,8 @@
     "GroupId": 15040801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15040803,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3161,8 +3161,8 @@
     "GroupId": 15040801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15040804,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3172,8 +3172,8 @@
     "GroupId": 15040801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15040805,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3194,8 +3194,8 @@
     "GroupId": 15050401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15050402,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3205,8 +3205,8 @@
     "GroupId": 15050401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15050403,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3216,8 +3216,8 @@
     "GroupId": 15050401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15050404,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3227,8 +3227,8 @@
     "GroupId": 15050401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15050405,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3249,8 +3249,8 @@
     "GroupId": 15050801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15050802,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3260,8 +3260,8 @@
     "GroupId": 15050801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15050803,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3271,8 +3271,8 @@
     "GroupId": 15050801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15050804,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3282,8 +3282,8 @@
     "GroupId": 15050801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15050805,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3304,8 +3304,8 @@
     "GroupId": 15060401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15060402,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3315,8 +3315,8 @@
     "GroupId": 15060401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15060403,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3326,8 +3326,8 @@
     "GroupId": 15060401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15060404,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3337,8 +3337,8 @@
     "GroupId": 15060401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15060405,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3359,8 +3359,8 @@
     "GroupId": 15060801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15060802,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3370,8 +3370,8 @@
     "GroupId": 15060801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15060803,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3381,8 +3381,8 @@
     "GroupId": 15060801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15060804,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3392,8 +3392,8 @@
     "GroupId": 15060801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15060805,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3414,8 +3414,8 @@
     "GroupId": 15070401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15070402,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3425,8 +3425,8 @@
     "GroupId": 15070401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15070403,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3436,8 +3436,8 @@
     "GroupId": 15070401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15070404,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3447,8 +3447,8 @@
     "GroupId": 15070401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15070405,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3469,8 +3469,8 @@
     "GroupId": 15070801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15070802,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3480,8 +3480,8 @@
     "GroupId": 15070801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15070803,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3491,8 +3491,8 @@
     "GroupId": 15070801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15070804,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3502,8 +3502,8 @@
     "GroupId": 15070801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15070805,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3524,8 +3524,8 @@
     "GroupId": 15080401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15080402,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3535,8 +3535,8 @@
     "GroupId": 15080401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15080403,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3546,8 +3546,8 @@
     "GroupId": 15080401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15080404,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3557,8 +3557,8 @@
     "GroupId": 15080401,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15080405,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3579,8 +3579,8 @@
     "GroupId": 15080801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15080802,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3590,8 +3590,8 @@
     "GroupId": 15080801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15080803,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3601,8 +3601,8 @@
     "GroupId": 15080801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15080804,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3612,8 +3612,8 @@
     "GroupId": 15080801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 15080805,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3634,8 +3634,8 @@
     "GroupId": 28110501,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28110502,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3645,8 +3645,8 @@
     "GroupId": 28110501,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28110503,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3656,8 +3656,8 @@
     "GroupId": 28110501,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28110504,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3667,8 +3667,8 @@
     "GroupId": 28110501,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28110505,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3689,8 +3689,8 @@
     "GroupId": 28120801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28120802,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3700,8 +3700,8 @@
     "GroupId": 28120801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28120803,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3711,8 +3711,8 @@
     "GroupId": 28120801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28120804,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3722,8 +3722,8 @@
     "GroupId": 28120801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28120805,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3744,8 +3744,8 @@
     "GroupId": 28130801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28130802,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3755,8 +3755,8 @@
     "GroupId": 28130801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28130803,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3766,8 +3766,8 @@
     "GroupId": 28130801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28130804,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3777,8 +3777,8 @@
     "GroupId": 28130801,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28130805,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3799,8 +3799,8 @@
     "GroupId": 28141201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28141202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3810,8 +3810,8 @@
     "GroupId": 28141201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28141203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3821,8 +3821,8 @@
     "GroupId": 28141201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28141204,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3832,8 +3832,8 @@
     "GroupId": 28141201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28141205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3854,8 +3854,8 @@
     "GroupId": 28151201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28151202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3865,8 +3865,8 @@
     "GroupId": 28151201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28151203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3876,8 +3876,8 @@
     "GroupId": 28151201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28151204,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3887,8 +3887,8 @@
     "GroupId": 28151201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28151205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3909,8 +3909,8 @@
     "GroupId": 28161201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28161202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3920,8 +3920,8 @@
     "GroupId": 28161201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28161203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3931,8 +3931,8 @@
     "GroupId": 28161201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28161204,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3942,8 +3942,8 @@
     "GroupId": 28161201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28161205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3964,8 +3964,8 @@
     "GroupId": 28171201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28171202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3975,8 +3975,8 @@
     "GroupId": 28171201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28171203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3986,8 +3986,8 @@
     "GroupId": 28171201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28171204,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -3997,8 +3997,8 @@
     "GroupId": 28171201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28171205,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -4019,8 +4019,8 @@
     "GroupId": 28181201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1002,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28181202,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -4030,8 +4030,8 @@
     "GroupId": 28181201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1003,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28181203,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -4041,8 +4041,8 @@
     "GroupId": 28181201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1004,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28181204,
     "SubGroupNum": 1,
     "EventWt": 1000
@@ -4052,8 +4052,8 @@
     "GroupId": 28181201,
     "GroupType": 2,
     "SubGroupWt": 1000,
-    "SubGroupId": 1005,
-    "SubGroupType": 1,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
     "EventID": 28181205,
     "SubGroupNum": 1,
     "EventWt": 1000
diff --git a/bin/json/game_fightglobalevent.json b/bin/json/game_fightglobalevent.json
index 59381e5cd..26dee43f6 100644
--- a/bin/json/game_fightglobalevent.json
+++ b/bin/json/game_fightglobalevent.json
@@ -941,7 +941,7 @@
       "text": ""
     },
     "When": 1,
-    "FromCheck": "Side=1",
+    "FromCheck": "",
     "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
@@ -962,7 +962,7 @@
       "text": ""
     },
     "When": 20,
-    "FromCheck": "Side=1",
+    "FromCheck": "",
     "TargetCheck": "Side=2,Hpproless=100",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json
index cb5ffacc6..f21ec7595 100644
--- a/bin/json/game_gamesummarytab.json
+++ b/bin/json/game_gamesummarytab.json
@@ -7,8 +7,8 @@
       "text": "探险旅程"
     },
     "mapPos": {
-      "x": -1121,
-      "y": 583
+      "x": -1428,
+      "y": 399
     },
     "scale": 0.4,
     "usetext": {
@@ -24,8 +24,8 @@
       "text": "冒险之旅"
     },
     "mapPos": {
-      "x": -1121,
-      "y": 583
+      "x": -1428,
+      "y": 399
     },
     "scale": 0.4,
     "usetext": {
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 70c305454..84e68cd0c 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -239845,11 +239845,11 @@
   },
   {
     "Id": 720025,
-    "pos": 1,
+    "pos": 4,
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 51012,
+    "heroid": 51050,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -239905,7 +239905,7 @@
   },
   {
     "Id": 720025,
-    "pos": 4,
+    "pos": 1,
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
@@ -239914,13 +239914,13 @@
     "equip": [],
     "newskill": [],
     "lv": 50,
-    "hppro": 1,
-    "atkpro": 1,
+    "hppro": 10,
+    "atkpro": 5,
     "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 87,
+    "speed": 95,
     "modelsize": 1
   },
   {
@@ -239929,7 +239929,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 51012,
+    "heroid": 51052,
     "star": 3,
     "equip": [],
     "newskill": [],
diff --git a/bin/json/game_repeatall.json b/bin/json/game_repeatall.json
index 7cfbc67d1..0637a088a 100644
--- a/bin/json/game_repeatall.json
+++ b/bin/json/game_repeatall.json
@@ -1,33 +1 @@
-[
-  {
-    "key": 1,
-    "optionName": {
-      "key": "achieve_achieve_all_achieve_group_id_02",
-      "text": "清扫场地"
-    },
-    "model": "20030_扫地点1号",
-    "actionType": 1,
-    "actionParam": "3#camerapose_2",
-    "num": 1,
-    "triggerWeight": [
-      100,
-      0
-    ],
-    "triggerOne": [
-      7000050
-    ],
-    "triggerTwo": [
-      {
-        "a": "item",
-        "t": "10000001",
-        "n": 5
-      }
-    ],
-    "triggerThree": 0,
-    "cdText": {
-      "key": "repeat_repeat_all_cdtxt_01",
-      "text": "地面干净了不少。"
-    },
-    "cdtime": 10
-  }
-]
\ No newline at end of file
+[]
\ No newline at end of file
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 921ae091d..772fc25c2 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -12542,5 +12542,39 @@
     "buffpos": "",
     "forbidFloat": 0,
     "ReplaceBuffID": 0
+  },
+  {
+    "Id": 390001547,
+    "Name": {
+      "key": "skill_skill_buff_Name_390001547",
+      "text": "[color=#37d8a9]伤害减免[/color]"
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_390001547",
+      "text": "减免自身防御20%的伤害。"
+    },
+    "BuffType": 82,
+    "EffectArgu": [
+      5,
+      200
+    ],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      3
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 99,
+    "SameID": true,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0,
+    "ReplaceBuffID": 0
   }
 ]
\ No newline at end of file