diff --git a/bin/json/game_accumulate.json b/bin/json/game_accumulate.json
new file mode 100644
index 000000000..7365d538b
--- /dev/null
+++ b/bin/json/game_accumulate.json
@@ -0,0 +1,227 @@
+[
+  {
+    "integral": 1000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 100000
+      }
+    ]
+  },
+  {
+    "integral": 2000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 200000
+      }
+    ]
+  },
+  {
+    "integral": 3000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 300000
+      }
+    ]
+  },
+  {
+    "integral": 4000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 400000
+      }
+    ]
+  },
+  {
+    "integral": 5000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 500000
+      }
+    ]
+  },
+  {
+    "integral": 6000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 600000
+      }
+    ]
+  },
+  {
+    "integral": 7000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 700000
+      }
+    ]
+  },
+  {
+    "integral": 8000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 800000
+      }
+    ]
+  },
+  {
+    "integral": 9000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 900000
+      }
+    ]
+  },
+  {
+    "integral": 10000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000000
+      }
+    ]
+  },
+  {
+    "integral": 11000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1100000
+      }
+    ]
+  },
+  {
+    "integral": 12000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1200000
+      }
+    ]
+  },
+  {
+    "integral": 13000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1300000
+      }
+    ]
+  },
+  {
+    "integral": 14000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1400000
+      }
+    ]
+  },
+  {
+    "integral": 15000,
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1500000
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/bin/json/game_activereward.json b/bin/json/game_activereward.json
index 49f6a4c3d..932e88a92 100644
--- a/bin/json/game_activereward.json
+++ b/bin/json/game_activereward.json
@@ -8,16 +8,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 150
-      },
-      {
-        "a": "item",
-        "t": "17010000",
-        "n": 50
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000000
       }
     ],
     "action": "main_weektask_action_1_act",
@@ -33,15 +23,10 @@
         "t": "diamond",
         "n": 150
       },
-      {
-        "a": "item",
-        "t": "17010000",
-        "n": 100
-      },
       {
         "a": "attr",
         "t": "gold",
-        "n": 1000000
+        "n": 500000
       }
     ],
     "action": "main_weektask_action_1_act",
@@ -57,15 +42,10 @@
         "t": "diamond",
         "n": 150
       },
-      {
-        "a": "item",
-        "t": "17010000",
-        "n": 100
-      },
       {
         "a": "attr",
         "t": "gold",
-        "n": 1000000
+        "n": 600000
       }
     ],
     "action": "main_weektask_action_1_act",
@@ -81,15 +61,10 @@
         "t": "diamond",
         "n": 150
       },
-      {
-        "a": "item",
-        "t": "17010000",
-        "n": 100
-      },
       {
         "a": "attr",
         "t": "gold",
-        "n": 1000000
+        "n": 600000
       }
     ],
     "action": "main_weektask_action_1_act",
diff --git a/bin/json/game_annulartask_library.json b/bin/json/game_annulartask_library.json
index cc2c4e155..75bfb379f 100644
--- a/bin/json/game_annulartask_library.json
+++ b/bin/json/game_annulartask_library.json
@@ -1,11 +1,11 @@
 [
   {
-    "id": 1,
+    "id": 2,
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1010,
-    "itemwt": 1000,
+    "itemid": 1130,
+    "itemwt": 10000,
     "min": 0
   },
   {
@@ -13,26 +13,26 @@
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1030,
-    "itemwt": 1000,
+    "itemid": 1180,
+    "itemwt": 30000,
     "min": 0
   },
   {
-    "id": 5,
+    "id": 6,
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1050,
-    "itemwt": 1000,
+    "itemid": 1290,
+    "itemwt": 30000,
     "min": 0
   },
   {
-    "id": 8,
+    "id": 7,
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1080,
-    "itemwt": 1000,
+    "itemid": 1020,
+    "itemwt": 10000,
     "min": 0
   },
   {
@@ -40,26 +40,8 @@
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1090,
-    "itemwt": 1000,
-    "min": 0
-  },
-  {
-    "id": 10,
-    "assembleid": 60000020,
-    "lvstart": 1,
-    "lvend": 999,
-    "itemid": 1100,
-    "itemwt": 1000,
-    "min": 0
-  },
-  {
-    "id": 11,
-    "assembleid": 60000020,
-    "lvstart": 1,
-    "lvend": 999,
-    "itemid": 1110,
-    "itemwt": 1000,
+    "itemid": 1190,
+    "itemwt": 30000,
     "min": 0
   },
   {
@@ -67,26 +49,8 @@
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1120,
-    "itemwt": 1000,
-    "min": 0
-  },
-  {
-    "id": 13,
-    "assembleid": 60000030,
-    "lvstart": 1,
-    "lvend": 999,
-    "itemid": 1130,
-    "itemwt": 1000,
-    "min": 0
-  },
-  {
-    "id": 14,
-    "assembleid": 60000030,
-    "lvstart": 1,
-    "lvend": 999,
-    "itemid": 1140,
-    "itemwt": 1000,
+    "itemid": 1300,
+    "itemwt": 30000,
     "min": 0
   },
   {
@@ -94,8 +58,8 @@
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1150,
-    "itemwt": 1000,
+    "itemid": 1200,
+    "itemwt": 30000,
     "min": 0
   },
   {
@@ -103,44 +67,17 @@
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1160,
-    "itemwt": 1000,
-    "min": 0
-  },
-  {
-    "id": 17,
-    "assembleid": 60000030,
-    "lvstart": 1,
-    "lvend": 999,
-    "itemid": 1170,
-    "itemwt": 1000,
+    "itemid": 1260,
+    "itemwt": 10000,
     "min": 0
   },
   {
     "id": 18,
-    "assembleid": 60000040,
+    "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1180,
-    "itemwt": 1000,
-    "min": 0
-  },
-  {
-    "id": 19,
-    "assembleid": 60000040,
-    "lvstart": 1,
-    "lvend": 999,
-    "itemid": 1190,
-    "itemwt": 1000,
-    "min": 0
-  },
-  {
-    "id": 20,
-    "assembleid": 60000040,
-    "lvstart": 1,
-    "lvend": 999,
-    "itemid": 1200,
-    "itemwt": 1000,
+    "itemid": 1310,
+    "itemwt": 30000,
     "min": 0
   },
   {
@@ -149,16 +86,7 @@
     "lvstart": 1,
     "lvend": 999,
     "itemid": 1210,
-    "itemwt": 1000,
-    "min": 0
-  },
-  {
-    "id": 22,
-    "assembleid": 60000040,
-    "lvstart": 1,
-    "lvend": 999,
-    "itemid": 1220,
-    "itemwt": 1000,
+    "itemwt": 30000,
     "min": 0
   },
   {
@@ -166,35 +94,35 @@
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1230,
-    "itemwt": 1000,
+    "itemid": 1110,
+    "itemwt": 10000,
     "min": 0
   },
   {
     "id": 24,
-    "assembleid": 60000050,
+    "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1240,
-    "itemwt": 1000,
+    "itemid": 1320,
+    "itemwt": 30000,
     "min": 0
   },
   {
-    "id": 25,
+    "id": 27,
     "assembleid": 60000050,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1250,
-    "itemwt": 1000,
+    "itemid": 1220,
+    "itemwt": 30000,
     "min": 0
   },
   {
-    "id": 26,
+    "id": 30,
     "assembleid": 60000050,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 1260,
-    "itemwt": 1000,
+    "itemid": 1330,
+    "itemwt": 30000,
     "min": 0
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_annulartaskall.json b/bin/json/game_annulartaskall.json
index f80a913cc..5384e2f8b 100644
--- a/bin/json/game_annulartaskall.json
+++ b/bin/json/game_annulartaskall.json
@@ -12,8 +12,13 @@
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 8200
+        "t": "diamond",
+        "n": 50
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 50
       }
     ]
   },
@@ -30,8 +35,13 @@
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 8300
+        "t": "diamond",
+        "n": 50
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 50
       }
     ]
   },
@@ -48,8 +58,13 @@
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 8400
+        "t": "diamond",
+        "n": 50
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 50
       }
     ]
   },
@@ -66,8 +81,13 @@
     "reward": [
       {
         "a": "attr",
-        "t": "gold",
-        "n": 8500
+        "t": "diamond",
+        "n": 50
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 50
       }
     ]
   }
diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index 3e53d732a..bffecd295 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -391,7 +391,7 @@
     "battleScenes": [
       "scenesfight_07"
     ],
-    "HideAlienSpace": 0,
+    "HideAlienSpace": 1,
     "ShowBuff": 0,
     "battleEvents": [],
     "ScoreGroupID": 0,
@@ -439,7 +439,7 @@
     "battleScenes": [
       "scenesfight_05_01"
     ],
-    "HideAlienSpace": 0,
+    "HideAlienSpace": 1,
     "ShowBuff": 0,
     "battleEvents": [],
     "ScoreGroupID": 0,
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 20d892662..6f75a26f2 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -25128,7 +25128,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 2
+      "n": 1
     },
     "NPC": 60081,
     "value": 1,
@@ -25152,7 +25152,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 3
+      "n": 1
     },
     "NPC": 60081,
     "value": 1,
@@ -25176,7 +25176,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 4
+      "n": 1
     },
     "NPC": 60081,
     "value": 1,
@@ -25200,7 +25200,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 5
+      "n": 1
     },
     "NPC": 60081,
     "value": 1,
@@ -25224,7 +25224,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 6
+      "n": 1
     },
     "NPC": 0,
     "value": 2,
@@ -25246,7 +25246,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 2
+      "n": 1
     },
     "NPC": 0,
     "value": 2,
@@ -25268,7 +25268,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 3
+      "n": 1
     },
     "NPC": 0,
     "value": 2,
@@ -25290,7 +25290,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 4
+      "n": 1
     },
     "NPC": 0,
     "value": 2,
@@ -25312,7 +25312,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 5
+      "n": 1
     },
     "NPC": 0,
     "value": 2,
@@ -25334,7 +25334,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 6
+      "n": 1
     },
     "NPC": 60181,
     "value": 1,
@@ -25358,7 +25358,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 7
+      "n": 1
     },
     "NPC": 60191,
     "value": 1,
@@ -25382,7 +25382,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 8
+      "n": 1
     },
     "NPC": 60201,
     "value": 1,
@@ -25406,7 +25406,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 9
+      "n": 1
     },
     "NPC": 60211,
     "value": 1,
@@ -25430,7 +25430,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 10
+      "n": 1
     },
     "NPC": 60221,
     "value": 1,
@@ -25454,7 +25454,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 11
+      "n": 1
     },
     "NPC": 60231,
     "value": 1,
@@ -25478,7 +25478,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 12
+      "n": 1
     },
     "NPC": 60241,
     "value": 1,
@@ -25500,7 +25500,7 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 13
+      "n": 1
     },
     "NPC": 60251,
     "value": 1,
@@ -25522,11 +25522,415 @@
     "head": {
       "a": "attr",
       "t": "gold",
-      "n": 14
+      "n": 1
     },
     "NPC": 60261,
     "value": 1,
     "filter": [],
     "filter2": []
+  },
+  {
+    "id": 50000037,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_905",
+      "text": "检查所有可疑点4"
+    },
+    "type": 206,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60271,
+    "value": 1,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000038,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_906",
+      "text": "检查所有可疑点5"
+    },
+    "type": 206,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60281,
+    "value": 1,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 50000039,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_907",
+      "text": "找对象聊天1"
+    },
+    "type": 187,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60291,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000040,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_908",
+      "text": "找对象聊天2"
+    },
+    "type": 187,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60301,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000041,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_909",
+      "text": "找对象聊天3"
+    },
+    "type": 187,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60311,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000042,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_910",
+      "text": "找对象聊天4"
+    },
+    "type": 187,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60321,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000043,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_911",
+      "text": "找对象聊天5"
+    },
+    "type": 187,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60331,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000044,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_912",
+      "text": "找对象聊天6"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60341,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000045,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_913",
+      "text": "找对象聊天7"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60351,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000046,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_914",
+      "text": "找对象聊天8"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60361,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000047,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_915",
+      "text": "找对象聊天9"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60371,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000048,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_916",
+      "text": "找对象聊天10"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60381,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000049,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_917",
+      "text": "找对象聊天11"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60391,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000050,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_918",
+      "text": "找对象聊天12"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60401,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000051,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_919",
+      "text": "找对象聊天13"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60411,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000052,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_920",
+      "text": "找对象聊天14"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60421,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
+  },
+  {
+    "id": 50000053,
+    "rtype": 2,
+    "ctype": 3,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_921",
+      "text": "找对象聊天15"
+    },
+    "type": 20001,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "NPC": 60431,
+    "value": 1,
+    "filter": [
+      12870
+    ],
+    "filter2": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json
index a0f3d0613..7e48ee691 100644
--- a/bin/json/game_caravancity.json
+++ b/bin/json/game_caravancity.json
@@ -61,7 +61,7 @@
       3000
     ],
     "Orspecial": 1000,
-    "checktime": 1800,
+    "checktime": 1,
     "extalk": 11001,
     "ortalk": 11002,
     "sptalk": 11003,
@@ -132,7 +132,7 @@
       3001
     ],
     "Orspecial": 1000,
-    "checktime": 1800,
+    "checktime": 1,
     "extalk": 11001,
     "ortalk": 11002,
     "sptalk": 11003,
@@ -204,7 +204,7 @@
       3002
     ],
     "Orspecial": 1000,
-    "checktime": 1800,
+    "checktime": 1,
     "extalk": 11001,
     "ortalk": 11002,
     "sptalk": 11003,
@@ -276,7 +276,7 @@
       3003
     ],
     "Orspecial": 1000,
-    "checktime": 1800,
+    "checktime": 1,
     "extalk": 11001,
     "ortalk": 11002,
     "sptalk": 11003,
@@ -347,7 +347,7 @@
       3004
     ],
     "Orspecial": 1000,
-    "checktime": 1800,
+    "checktime": 1,
     "extalk": 11001,
     "ortalk": 11002,
     "sptalk": 11003,
diff --git a/bin/json/game_caravanreward.json b/bin/json/game_caravanreward.json
index 1336106d4..1d5d0f050 100644
--- a/bin/json/game_caravanreward.json
+++ b/bin/json/game_caravanreward.json
@@ -56,7 +56,7 @@
   },
   {
     "id": 6,
-    "key": 0,
+    "key": -10,
     "reward": [
       {
         "a": "attr",
diff --git a/bin/json/game_caravanthing.json b/bin/json/game_caravanthing.json
index 0fd6c6473..c8de86435 100644
--- a/bin/json/game_caravanthing.json
+++ b/bin/json/game_caravanthing.json
@@ -6,6 +6,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -36,6 +37,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -66,6 +68,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -96,6 +99,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -126,6 +130,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -156,6 +161,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -186,6 +192,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -216,6 +223,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -246,6 +254,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -276,6 +285,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -306,6 +316,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -336,6 +347,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -366,6 +378,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -396,6 +409,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -426,6 +440,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -456,6 +471,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -486,6 +502,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -516,6 +533,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -546,6 +564,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
@@ -576,6 +595,7 @@
       5,
       15
     ],
+    "changetime": 600,
     "PriceChangeWeight": [
       40,
       20,
diff --git a/bin/json/game_equipattrlibrarys.json b/bin/json/game_equipattrlibrarys.json
index 6b4023b85..32d953969 100644
--- a/bin/json/game_equipattrlibrarys.json
+++ b/bin/json/game_equipattrlibrarys.json
@@ -78,7 +78,7 @@
     "key": 6,
     "libraryid": 1101,
     "attrkey": "atkpro",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 200,
     "Addition": [
@@ -93,7 +93,7 @@
     "key": 7,
     "libraryid": 1101,
     "attrkey": "defpro",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 200,
     "Addition": [
@@ -108,7 +108,7 @@
     "key": 8,
     "libraryid": 1101,
     "attrkey": "hppro",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 200,
     "Addition": [
@@ -183,7 +183,7 @@
     "key": 13,
     "libraryid": 1301,
     "attrkey": "atkpro",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 250,
     "Addition": [
@@ -198,7 +198,7 @@
     "key": 14,
     "libraryid": 1301,
     "attrkey": "defpro",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -213,7 +213,7 @@
     "key": 15,
     "libraryid": 1301,
     "attrkey": "hppro",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -243,7 +243,7 @@
     "key": 17,
     "libraryid": 1301,
     "attrkey": "cridam",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 60,
     "Addition": [
@@ -318,7 +318,7 @@
     "key": 22,
     "libraryid": 1501,
     "attrkey": "atkpro",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -333,7 +333,7 @@
     "key": 23,
     "libraryid": 1501,
     "attrkey": "defpro",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -348,7 +348,7 @@
     "key": 24,
     "libraryid": 1501,
     "attrkey": "hppro",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 250,
     "Addition": [
@@ -363,7 +363,7 @@
     "key": 25,
     "libraryid": 1501,
     "attrkey": "effhit",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -378,7 +378,7 @@
     "key": 26,
     "libraryid": 1501,
     "attrkey": "effre",
-    "attrvar": 42,
+    "attrvar": 39,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -468,7 +468,7 @@
     "key": 32,
     "libraryid": 1102,
     "attrkey": "atkpro",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -483,7 +483,7 @@
     "key": 33,
     "libraryid": 1102,
     "attrkey": "defpro",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 200,
     "Addition": [
@@ -498,7 +498,7 @@
     "key": 34,
     "libraryid": 1102,
     "attrkey": "hppro",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 200,
     "Addition": [
@@ -573,7 +573,7 @@
     "key": 39,
     "libraryid": 1302,
     "attrkey": "atkpro",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -588,7 +588,7 @@
     "key": 40,
     "libraryid": 1302,
     "attrkey": "defpro",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 250,
     "Addition": [
@@ -603,7 +603,7 @@
     "key": 41,
     "libraryid": 1302,
     "attrkey": "hppro",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -633,7 +633,7 @@
     "key": 43,
     "libraryid": 1302,
     "attrkey": "cridam",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 90,
     "Addition": [
@@ -708,7 +708,7 @@
     "key": 48,
     "libraryid": 1502,
     "attrkey": "atkpro",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -723,7 +723,7 @@
     "key": 49,
     "libraryid": 1502,
     "attrkey": "defpro",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -738,7 +738,7 @@
     "key": 50,
     "libraryid": 1502,
     "attrkey": "hppro",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -753,7 +753,7 @@
     "key": 51,
     "libraryid": 1502,
     "attrkey": "effhit",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 250,
     "Addition": [
@@ -768,7 +768,7 @@
     "key": 52,
     "libraryid": 1502,
     "attrkey": "effre",
-    "attrvar": 51,
+    "attrvar": 46,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -858,7 +858,7 @@
     "key": 58,
     "libraryid": 1103,
     "attrkey": "atkpro",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -873,7 +873,7 @@
     "key": 59,
     "libraryid": 1103,
     "attrkey": "defpro",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -888,7 +888,7 @@
     "key": 60,
     "libraryid": 1103,
     "attrkey": "hppro",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 200,
     "Addition": [
@@ -963,7 +963,7 @@
     "key": 65,
     "libraryid": 1303,
     "attrkey": "atkpro",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -978,7 +978,7 @@
     "key": 66,
     "libraryid": 1303,
     "attrkey": "defpro",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -993,7 +993,7 @@
     "key": 67,
     "libraryid": 1303,
     "attrkey": "hppro",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 250,
     "Addition": [
@@ -1023,7 +1023,7 @@
     "key": 69,
     "libraryid": 1303,
     "attrkey": "cridam",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -1098,7 +1098,7 @@
     "key": 74,
     "libraryid": 1503,
     "attrkey": "atkpro",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1113,7 +1113,7 @@
     "key": 75,
     "libraryid": 1503,
     "attrkey": "defpro",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1128,7 +1128,7 @@
     "key": 76,
     "libraryid": 1503,
     "attrkey": "hppro",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -1143,7 +1143,7 @@
     "key": 77,
     "libraryid": 1503,
     "attrkey": "effhit",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -1158,7 +1158,7 @@
     "key": 78,
     "libraryid": 1503,
     "attrkey": "effre",
-    "attrvar": 59,
+    "attrvar": 54,
     "attrvar_correct": 1000,
     "probability": 250,
     "Addition": [
@@ -1248,7 +1248,7 @@
     "key": 84,
     "libraryid": 1104,
     "attrkey": "atkpro",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1263,7 +1263,7 @@
     "key": 85,
     "libraryid": 1104,
     "attrkey": "defpro",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1278,7 +1278,7 @@
     "key": 86,
     "libraryid": 1104,
     "attrkey": "hppro",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1353,7 +1353,7 @@
     "key": 91,
     "libraryid": 1304,
     "attrkey": "atkpro",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1368,7 +1368,7 @@
     "key": 92,
     "libraryid": 1304,
     "attrkey": "defpro",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1383,7 +1383,7 @@
     "key": 93,
     "libraryid": 1304,
     "attrkey": "hppro",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1413,7 +1413,7 @@
     "key": 95,
     "libraryid": 1304,
     "attrkey": "cridam",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -1488,7 +1488,7 @@
     "key": 100,
     "libraryid": 1504,
     "attrkey": "atkpro",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1503,7 +1503,7 @@
     "key": 101,
     "libraryid": 1504,
     "attrkey": "defpro",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1518,7 +1518,7 @@
     "key": 102,
     "libraryid": 1504,
     "attrkey": "hppro",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -1533,7 +1533,7 @@
     "key": 103,
     "libraryid": 1504,
     "attrkey": "effhit",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -1548,7 +1548,7 @@
     "key": 104,
     "libraryid": 1504,
     "attrkey": "effre",
-    "attrvar": 68,
+    "attrvar": 62,
     "attrvar_correct": 1000,
     "probability": 125,
     "Addition": [
@@ -2028,7 +2028,7 @@
     "key": 136,
     "libraryid": 1106,
     "attrkey": "atkpro",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 1,
     "Addition": [
@@ -2043,7 +2043,7 @@
     "key": 137,
     "libraryid": 1106,
     "attrkey": "defpro",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -2058,7 +2058,7 @@
     "key": 138,
     "libraryid": 1106,
     "attrkey": "hppro",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -2133,7 +2133,7 @@
     "key": 143,
     "libraryid": 1306,
     "attrkey": "atkpro",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 200,
     "Addition": [
@@ -2148,7 +2148,7 @@
     "key": 144,
     "libraryid": 1306,
     "attrkey": "defpro",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 1,
     "Addition": [
@@ -2163,7 +2163,7 @@
     "key": 145,
     "libraryid": 1306,
     "attrkey": "hppro",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -2193,7 +2193,7 @@
     "key": 147,
     "libraryid": 1306,
     "attrkey": "cridam",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -2268,7 +2268,7 @@
     "key": 152,
     "libraryid": 1506,
     "attrkey": "atkpro",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 60,
     "Addition": [
@@ -2283,7 +2283,7 @@
     "key": 153,
     "libraryid": 1506,
     "attrkey": "defpro",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 3,
     "Addition": [
@@ -2298,7 +2298,7 @@
     "key": 154,
     "libraryid": 1506,
     "attrkey": "hppro",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -2313,7 +2313,7 @@
     "key": 155,
     "libraryid": 1506,
     "attrkey": "effhit",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
@@ -2328,7 +2328,7 @@
     "key": 156,
     "libraryid": 1506,
     "attrkey": "effre",
-    "attrvar": 85,
+    "attrvar": 78,
     "attrvar_correct": 1000,
     "probability": 100,
     "Addition": [
diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json
index dcfa192de..2b34a7c07 100644
--- a/bin/json/game_gamesummarytab.json
+++ b/bin/json/game_gamesummarytab.json
@@ -17,7 +17,7 @@
     "layer": 1,
     "name": {
       "key": "gamesummary_fathernode_name_2",
-      "text": "冒险关卡"
+      "text": "冒险之旅"
     },
     "mapPos": {
       "x": -2363,
@@ -95,7 +95,7 @@
     "layer": 0,
     "name": {
       "key": "gamesummary_fathernode_name_11",
-      "text": "迷宫玩法"
+      "text": "石阵秘境"
     },
     "mapPos": {
       "x": -1037,
diff --git a/bin/json/game_guidance.json b/bin/json/game_guidance.json
index 190997131..e40139df4 100644
--- a/bin/json/game_guidance.json
+++ b/bin/json/game_guidance.json
@@ -3,78 +3,143 @@
     "id": 1,
     "exp": "日常任务",
     "jumpid": 109,
-    "index": 20
+    "index": 20,
+    "intr": {
+      "key": "guidance_1",
+      "text": "今日剩余任务：{0}/{1}"
+    },
+    "opencondid": "rdtask"
   },
   {
     "id": 2,
     "exp": "每日一练",
     "jumpid": 10002,
-    "index": 21
+    "index": 21,
+    "intr": {
+      "key": "guidance_2",
+      "text": "今日完成进度：{0}/{1}"
+    },
+    "opencondid": "daily_practice"
   },
   {
     "id": 3,
     "exp": "云朵先生签到",
     "jumpid": 719,
-    "index": 22
+    "index": 22,
+    "intr": {
+      "key": "guidance_3",
+      "text": "今日完成进度：{0}/{1}"
+    },
+    "opencondid": "puzzle"
   },
   {
     "id": 4,
     "exp": "巨怪商队跑商",
     "jumpid": 11001,
-    "index": 23
+    "index": 23,
+    "intr": {
+      "key": "guidance_4",
+      "text": "今日剩余车票：{0}"
+    },
+    "opencondid": "caravan"
   },
   {
     "id": 5,
     "exp": "公会签到",
     "jumpid": 804,
-    "index": 24
+    "index": 24,
+    "intr": {
+      "key": "guidance_5",
+      "text": "今日剩余签到：{0}"
+    },
+    "opencondid": "guild"
   },
   {
     "id": 6,
     "exp": "公会副本",
     "jumpid": 11005,
-    "index": 25
+    "index": 25,
+    "intr": {
+      "key": "guidance_6",
+      "text": "今日剩余挑战次数：{0}"
+    },
+    "opencondid": "guild"
   },
   {
     "id": 7,
     "exp": "公会任务",
     "jumpid": 161,
-    "index": 26
+    "index": 26,
+    "intr": {
+      "key": "guidance_7",
+      "text": "今日剩余任务：{0}"
+    },
+    "opencondid": "guild"
   },
   {
     "id": 8,
     "exp": "竞技挑战",
     "jumpid": 156,
-    "index": 27
+    "index": 27,
+    "intr": {
+      "key": "guidance_8",
+      "text": "今日剩余挑战券：{0}"
+    },
+    "opencondid": "arena"
   },
   {
     "id": 9,
     "exp": "熊猫武馆训练",
     "jumpid": 10002,
-    "index": 28
+    "index": 28,
+    "intr": {
+      "key": "guidance_9",
+      "text": "今日剩余训练次数：{0}"
+    },
+    "opencondid": "kungfu"
   },
   {
     "id": 10,
     "exp": "种族塔",
     "jumpid": 10018,
-    "index": 29
+    "index": 29,
+    "intr": {
+      "key": "guidance_10",
+      "text": "今日剩余可挑战关卡：{0}"
+    },
+    "opencondid": "kungfu"
   },
   {
     "id": 11,
     "exp": "维京远征",
     "jumpid": 11012,
-    "index": 30
+    "index": 30,
+    "intr": {
+      "key": "guidance_11",
+      "text": "今日剩余体力：{0}/{1}"
+    },
+    "opencondid": "vikingexpedition_entrance"
   },
   {
     "id": 12,
     "exp": "狩猎",
     "jumpid": 168,
-    "index": 31
+    "index": 31,
+    "intr": {
+      "key": "guidance_12",
+      "text": "今日剩余体力：{0}/{1}"
+    },
+    "opencondid": "hunting"
   },
   {
     "id": 13,
     "exp": "经验副本",
     "jumpid": 10013,
-    "index": 32
+    "index": 32,
+    "intr": {
+      "key": "guidance_13",
+      "text": "今日剩余体力：{0}/{1}"
+    },
+    "opencondid": "vikingexpedition_experience"
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 9676f498e..a7c7bd4ef 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -761,7 +761,7 @@
     ],
     "use_skip": 107,
     "upper_limit": 999,
-    "img": "wp_icon_10023",
+    "img": "wp_icon_10024",
     "intr": {
       "key": "item_item_intr_17",
       "text": "蕴含着光耀力量的神石，用于阵营招募抽取守护者"
@@ -933,7 +933,7 @@
     ],
     "use_skip": 107,
     "upper_limit": 999,
-    "img": "wp_icon_10023",
+    "img": "wp_icon_10024",
     "intr": {
       "key": "item_item_intr_21",
       "text": "蕴含着光耀力量的神石的碎片，消耗10个可用于阵营招募抽取守护者"
@@ -976,7 +976,7 @@
     ],
     "use_skip": 107,
     "upper_limit": 999,
-    "img": "wp_icon_10019",
+    "img": "wp_icon_10023",
     "intr": {
       "key": "item_item_intr_22",
       "text": "蕴含神秘力量的石头，消耗100个可以在许愿招募池内兑换英雄"
@@ -16379,12 +16379,94 @@
     "img": "wp_icon_jjcq",
     "intr": {
       "key": "item_item_intr_382",
-      "text": ""
+      "text": "可以用于开服活动中抽奖。"
     },
     "describe": {
       "key": "item_item_describe_382",
       "text": "此处是包装描述"
     },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": "10000039",
+    "name": {
+      "key": "item_item_name_374",
+      "text": "石阵秘境宝箱钥匙"
+    },
+    "usetype": 1,
+    "color": 4,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 11001,
+    "upper_limit": 999,
+    "img": "item_10000035",
+    "intr": {
+      "key": "item_item_intr_380",
+      "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。"
+    },
+    "describe": {
+      "key": "item_item_describe_380",
+      "text": "此处是包装描述"
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ]
+  },
+  {
+    "id": "17110001",
+    "name": {
+      "key": "item_item_name_374",
+      "text": "3种族招募卡自选箱"
+    },
+    "usetype": 4,
+    "color": 5,
+    "bagtype": 2,
+    "index": 1,
+    "special_type": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 999,
+    "img": "",
+    "intr": {
+      "key": "item_item_intr_383",
+      "text": "可以从中自由选择3种阵营招募卷的宝箱"
+    },
+    "describe": {
+      "key": "item_item_describe_383",
+      "text": ""
+    },
     "sale": [
       {
         "a": "attr",
diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json
index 84d216bef..7bb9487d7 100644
--- a/bin/json/game_lottery.json
+++ b/bin/json/game_lottery.json
@@ -1047,7 +1047,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 16000,
+    "min": 8000,
     "max": 16000,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1095,7 +1095,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 19800,
+    "min": 9900,
     "max": 19800,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1167,7 +1167,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 24000,
+    "min": 12000,
     "max": 24000,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1239,7 +1239,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 28600,
+    "min": 14300,
     "max": 28600,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1311,7 +1311,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 33600,
+    "min": 16800,
     "max": 33600,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1383,7 +1383,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 39000,
+    "min": 19500,
     "max": 39000,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1479,7 +1479,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 44800,
+    "min": 22400,
     "max": 44800,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1575,7 +1575,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 51000,
+    "min": 25500,
     "max": 51000,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1671,7 +1671,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 57600,
+    "min": 28800,
     "max": 57600,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1767,7 +1767,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 64600,
+    "min": 32300,
     "max": 64600,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1863,7 +1863,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 72000,
+    "min": 36000,
     "max": 72000,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -1959,7 +1959,7 @@
     },
     "itemdes": "阵营觉醒材料",
     "itemwt": 1000,
-    "min": 80000,
+    "min": 40000,
     "max": 80000,
     "VIPmin": 0,
     "VIPmax": 15,
@@ -6447,8 +6447,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 8000,
-    "max": 8000,
+    "min": 4000,
+    "max": 4000,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -6519,8 +6519,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 9900,
-    "max": 9900,
+    "min": 4950,
+    "max": 4950,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -6591,8 +6591,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 12000,
-    "max": 12000,
+    "min": 6000,
+    "max": 6000,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -6663,8 +6663,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 14300,
-    "max": 14300,
+    "min": 7150,
+    "max": 7150,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -6735,8 +6735,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 16800,
-    "max": 16800,
+    "min": 8400,
+    "max": 8400,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -6807,8 +6807,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 19500,
-    "max": 19500,
+    "min": 9750,
+    "max": 9750,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -6879,8 +6879,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 22400,
-    "max": 22400,
+    "min": 11200,
+    "max": 11200,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -6951,8 +6951,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 25500,
-    "max": 25500,
+    "min": 12750,
+    "max": 12750,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -7047,8 +7047,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 28800,
-    "max": 28800,
+    "min": 14400,
+    "max": 14400,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -7143,8 +7143,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 32300,
-    "max": 32300,
+    "min": 16150,
+    "max": 16150,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -7239,8 +7239,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 36000,
-    "max": 36000,
+    "min": 18000,
+    "max": 18000,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -7335,8 +7335,8 @@
     },
     "itemdes": "金币",
     "itemwt": 1000,
-    "min": 1,
-    "max": 1,
+    "min": 20000,
+    "max": 20000,
     "VIPmin": 0,
     "VIPmax": 15,
     "playerlvmin": 0,
@@ -23950,5 +23950,245 @@
     "playerlvmin": 0,
     "playerlvmax": 0,
     "notice": 0
+  },
+  {
+    "id": 999,
+    "lotteryid": 22001001,
+    "description": "冒险基金简单奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220001,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 1
+    },
+    "itemdes": "冒险基金简单奖励",
+    "itemwt": 1000,
+    "min": 200,
+    "max": 200,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 1000,
+    "lotteryid": 22001001,
+    "description": "冒险基金简单奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220001,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "10000003",
+      "n": 1
+    },
+    "itemdes": "冒险基金简单奖励",
+    "itemwt": 1000,
+    "min": 1,
+    "max": 1,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 1001,
+    "lotteryid": 22001002,
+    "description": "冒险基金普通奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220002,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 1
+    },
+    "itemdes": "冒险基金普通奖励",
+    "itemwt": 1000,
+    "min": 400,
+    "max": 400,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 1002,
+    "lotteryid": 22001002,
+    "description": "冒险基金普通奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220002,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "10000009",
+      "n": 1
+    },
+    "itemdes": "冒险基金普通奖励",
+    "itemwt": 1000,
+    "min": 20,
+    "max": 20,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 1003,
+    "lotteryid": 22001003,
+    "description": "冒险基金困难奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220002,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 1
+    },
+    "itemdes": "冒险基金困难奖励",
+    "itemwt": 1000,
+    "min": 800,
+    "max": 800,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 1004,
+    "lotteryid": 22001003,
+    "description": "冒险基金困难奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220003,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "17060007",
+      "n": 1
+    },
+    "itemdes": "冒险基金困难奖励",
+    "itemwt": 1000,
+    "min": 20,
+    "max": 20,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 1005,
+    "lotteryid": 22002001,
+    "description": "等级基金第一次奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220021,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "itemdes": "等级基金第一次奖励",
+    "itemwt": 1000,
+    "min": 300000,
+    "max": 300000,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 1006,
+    "lotteryid": 22002001,
+    "description": "等级基金第一次奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220021,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "10000001",
+      "n": 1
+    },
+    "itemdes": "等级基金第一次奖励",
+    "itemwt": 1000,
+    "min": 6,
+    "max": 6,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 1007,
+    "lotteryid": 22002002,
+    "description": "等级基金后续奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220022,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "itemdes": "等级基金后续奖励",
+    "itemwt": 1000,
+    "min": 100000,
+    "max": 100000,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 1008,
+    "lotteryid": 22002002,
+    "description": "等级基金后续奖励",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 220022,
+    "subtype": 2,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "10000001",
+      "n": 1
+    },
+    "itemdes": "等级基金后续奖励",
+    "itemwt": 1000,
+    "min": 2,
+    "max": 2,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_namelibrary.json b/bin/json/game_namelibrary.json
index ca589b9c9..6880ecbb1 100644
--- a/bin/json/game_namelibrary.json
+++ b/bin/json/game_namelibrary.json
@@ -807,7 +807,7 @@
     "id": 68,
     "surname": {
       "key": "name_name_surname_68",
-      "text": "随性的"
+      "text": "随意的"
     },
     "name": {
       "key": "name_name_name_68",
@@ -1371,7 +1371,7 @@
     "id": 115,
     "surname": {
       "key": "name_name_surname_115",
-      "text": "率性的"
+      "text": "率真的"
     },
     "name": {
       "key": "name_name_name_115",
@@ -1507,7 +1507,7 @@
     },
     "name": {
       "key": "name_name_name_126",
-      "text": "维基"
+      "text": "维级"
     },
     "sex": 1
   }
diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json
index 25ac01f04..7807aa9ef 100644
--- a/bin/json/game_navigation.json
+++ b/bin/json/game_navigation.json
@@ -135,7 +135,7 @@
     "sceneicon": "ty_qp_zhb",
     "functionname": {
       "key": "navigation_Sheet1_functionname_8",
-      "text": "冒险关卡"
+      "text": "冒险之旅"
     },
     "npcName": [
       "功能入口_主线"
diff --git a/bin/json/game_paypackage.json b/bin/json/game_paypackage.json
index d0567f667..9764755b0 100644
--- a/bin/json/game_paypackage.json
+++ b/bin/json/game_paypackage.json
@@ -25,12 +25,12 @@
       {
         "a": "attr",
         "t": "diamond",
-        "n": 50
+        "n": 20
       },
       {
-        "a": "attr",
-        "t": "ps",
-        "n": 50
+        "a": "item",
+        "t": "10000003",
+        "n": 1
       },
       {
         "a": "attr",
@@ -49,7 +49,7 @@
       "text": "每日礼包2"
     },
     "packagetype": "day_1",
-    "buy_num": 2,
+    "buy_num": 1,
     "packagename": {
       "key": "paypackage_paypackage_packagename_2",
       "text": "每日礼包2"
@@ -65,11 +65,6 @@
         "a": "item",
         "t": "10000003",
         "n": 3
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 120000
       }
     ]
   },
@@ -83,7 +78,7 @@
       "text": "每日礼包3"
     },
     "packagetype": "day_2",
-    "buy_num": 3,
+    "buy_num": 1,
     "packagename": {
       "key": "paypackage_paypackage_packagename_3",
       "text": "每日礼包3"
@@ -97,13 +92,8 @@
       },
       {
         "a": "item",
-        "t": "10000001",
-        "n": 6
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 300000
+        "t": "10000010",
+        "n": 20
       }
     ]
   },
@@ -117,7 +107,7 @@
       "text": "每日礼包4"
     },
     "packagetype": "day_3",
-    "buy_num": 3,
+    "buy_num": 1,
     "packagename": {
       "key": "paypackage_paypackage_packagename_4",
       "text": "每日礼包4"
@@ -131,47 +121,13 @@
       },
       {
         "a": "item",
-        "t": "10000009",
-        "n": 5
+        "t": "10000005",
+        "n": 3
       },
       {
         "a": "attr",
         "t": "gold",
-        "n": 300000
-      }
-    ]
-  },
-  {
-    "id": 5,
-    "type": 1,
-    "repeat_num": 0,
-    "refreshtime": 1,
-    "pagename": {
-      "key": "paypackage_paypackage_pagename_5",
-      "text": "每日礼包5"
-    },
-    "packagetype": "day_4",
-    "buy_num": 3,
-    "packagename": {
-      "key": "paypackage_paypackage_packagename_5",
-      "text": "每日礼包5"
-    },
-    "costitem": [],
-    "item": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 1280
-      },
-      {
-        "a": "item",
-        "t": "10000013",
-        "n": 5
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 300000
+        "n": 600000
       }
     ]
   },
@@ -214,7 +170,7 @@
       "text": "每周礼包2"
     },
     "packagetype": "week_2",
-    "buy_num": 2,
+    "buy_num": 1,
     "packagename": {
       "key": "paypackage_paypackage_packagename_7",
       "text": "每周礼包2"
@@ -228,13 +184,13 @@
       },
       {
         "a": "item",
-        "t": "10000010",
-        "n": 1
+        "t": "17010001",
+        "n": 15
       },
       {
-        "a": "item",
-        "t": "10000009",
-        "n": 2
+        "a": "attr",
+        "t": "gold",
+        "n": 800000
       }
     ]
   },
@@ -248,7 +204,7 @@
       "text": "每周礼包3"
     },
     "packagetype": "week_3",
-    "buy_num": 3,
+    "buy_num": 2,
     "packagename": {
       "key": "paypackage_paypackage_packagename_8",
       "text": "每周礼包3"
@@ -262,8 +218,8 @@
       },
       {
         "a": "item",
-        "t": "10000010",
-        "n": 3
+        "t": "10000006",
+        "n": 2
       }
     ]
   },
@@ -277,7 +233,7 @@
       "text": "每周礼包4"
     },
     "packagetype": "week_4",
-    "buy_num": 4,
+    "buy_num": 3,
     "packagename": {
       "key": "paypackage_paypackage_packagename_9",
       "text": "每周礼包4"
@@ -297,7 +253,7 @@
       {
         "a": "attr",
         "t": "gold",
-        "n": 5000000
+        "n": 3000000
       }
     ]
   },
@@ -317,64 +273,6 @@
       "text": "每周礼包5"
     },
     "costitem": [],
-    "item": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 4480
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 7500000
-      }
-    ]
-  },
-  {
-    "id": 11,
-    "type": 1,
-    "repeat_num": 0,
-    "refreshtime": 7,
-    "pagename": {
-      "key": "paypackage_paypackage_pagename_11",
-      "text": "每周礼包6"
-    },
-    "packagetype": "week_6",
-    "buy_num": 999,
-    "packagename": {
-      "key": "paypackage_paypackage_packagename_11",
-      "text": "每周礼包6"
-    },
-    "costitem": [],
-    "item": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 6480
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 10000000
-      }
-    ]
-  },
-  {
-    "id": 12,
-    "type": 1,
-    "repeat_num": 0,
-    "refreshtime": 7,
-    "pagename": {
-      "key": "paypackage_paypackage_pagename_12",
-      "text": "每周礼包7"
-    },
-    "packagetype": "week_6",
-    "buy_num": 999,
-    "packagename": {
-      "key": "paypackage_paypackage_packagename_12",
-      "text": "每周礼包7"
-    },
-    "costitem": [],
     "item": [
       {
         "a": "attr",
@@ -385,11 +283,6 @@
         "a": "item",
         "t": "10000001",
         "n": 60
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 10000000
       }
     ]
   },
@@ -403,7 +296,7 @@
       "text": "每月礼包1"
     },
     "packagetype": "month_2",
-    "buy_num": 5,
+    "buy_num": 1,
     "packagename": {
       "key": "paypackage_paypackage_packagename_13",
       "text": "每月礼包1"
@@ -413,12 +306,12 @@
       {
         "a": "attr",
         "t": "diamond",
-        "n": 980
+        "n": 300
       },
       {
         "a": "item",
-        "t": "10000006",
-        "n": 100
+        "t": "17060008",
+        "n": 30
       }
     ]
   },
@@ -432,7 +325,7 @@
       "text": "每月礼包2"
     },
     "packagetype": "month_2",
-    "buy_num": 5,
+    "buy_num": 2,
     "packagename": {
       "key": "paypackage_paypackage_packagename_14",
       "text": "每月礼包2"
@@ -442,12 +335,12 @@
       {
         "a": "attr",
         "t": "diamond",
-        "n": 980
+        "n": 680
       },
       {
         "a": "item",
-        "t": "17060008",
-        "n": 85
+        "t": "13000001",
+        "n": 300
       }
     ]
   },
@@ -461,7 +354,7 @@
       "text": "每月礼包3"
     },
     "packagetype": "month_2",
-    "buy_num": 5,
+    "buy_num": 3,
     "packagename": {
       "key": "paypackage_paypackage_packagename_15",
       "text": "每月礼包3"
@@ -471,12 +364,17 @@
       {
         "a": "attr",
         "t": "diamond",
-        "n": 980
+        "n": 1980
       },
       {
         "a": "item",
-        "t": "13000001",
-        "n": 300
+        "t": "10000013",
+        "n": 5
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1500000
       }
     ]
   },
@@ -500,12 +398,51 @@
       {
         "a": "attr",
         "t": "diamond",
-        "n": 980
+        "n": 4480
       },
       {
         "a": "item",
-        "t": "13000002",
-        "n": 20
+        "t": "17110001",
+        "n": 40
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 2500000
+      }
+    ]
+  },
+  {
+    "id": 17,
+    "type": 1,
+    "repeat_num": 0,
+    "refreshtime": 30,
+    "pagename": {
+      "key": "paypackage_paypackage_pagename_16",
+      "text": "每月礼包5"
+    },
+    "packagetype": "month_2",
+    "buy_num": 5,
+    "packagename": {
+      "key": "paypackage_paypackage_packagename_16",
+      "text": "每月礼包4"
+    },
+    "costitem": [],
+    "item": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 6480
+      },
+      {
+        "a": "item",
+        "t": "10000024",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 3000000
       }
     ]
   }
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
index fd3b48ab9..8c368c7e8 100644
--- a/bin/json/game_rdtasknpc.json
+++ b/bin/json/game_rdtasknpc.json
@@ -6610,8 +6610,8 @@
       "901"
     ],
     "event": [
-      2,
-      12960
+      10,
+      140
     ],
     "goto": 0
   },
@@ -6655,8 +6655,8 @@
       "901"
     ],
     "event": [
-      2,
-      12960
+      10,
+      140
     ],
     "goto": 0
   },
@@ -6700,8 +6700,8 @@
       "901"
     ],
     "event": [
-      2,
-      12960
+      10,
+      140
     ],
     "goto": 0
   },
@@ -6745,8 +6745,8 @@
       "901"
     ],
     "event": [
-      2,
-      12960
+      10,
+      140
     ],
     "goto": 0
   },
@@ -6790,8 +6790,8 @@
       "901"
     ],
     "event": [
-      2,
-      12960
+      10,
+      140
     ],
     "goto": 0
   },
@@ -7529,5 +7529,680 @@
       13010
     ],
     "goto": 0
+  },
+  {
+    "id": 60290,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-商人",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60291,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-公告",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60298,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-邮件",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60300,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-维京远征",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60301,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-招募",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60308,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-狩猎",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60310,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-藏书馆",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60311,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-魔药",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60318,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-剧情副本(旧时光)",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60320,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-竞技场",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60321,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-招募",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60328,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-烹饪",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60330,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-浇水拼图",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60331,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "WuGuanScene",
+      "阿宝",
+      "137"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60338,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "WuGuanScene",
+      "总教习",
+      "137"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60340,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-商人",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60341,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-公告",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60348,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-邮件",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60350,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-维京远征",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60351,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-招募",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60358,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-狩猎",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60360,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-藏书馆",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60361,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-魔药",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60368,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-剧情副本(旧时光)",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60370,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-竞技场",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60371,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-招募",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60378,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-烹饪",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60380,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-浇水拼图",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60381,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "WuGuanScene",
+      "阿宝",
+      "137"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60388,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "WuGuanScene",
+      "总教习",
+      "137"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60390,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-商人",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60391,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-公告",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60398,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-邮件",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60400,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-维京远征",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60401,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-招募",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60408,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-狩猎",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60410,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-藏书馆",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60411,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-魔药",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60418,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-剧情副本(旧时光)",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60420,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-竞技场",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60421,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-招募",
+      "901"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60428,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-烹饪",
+      "901"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60430,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-浇水拼图",
+      "901"
+    ],
+    "event": [
+      2,
+      12930
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60431,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "WuGuanScene",
+      "阿宝",
+      "137"
+    ],
+    "event": [
+      2,
+      12870
+    ],
+    "goto": 0
+  },
+  {
+    "id": 60438,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "WuGuanScene",
+      "总教习",
+      "137"
+    ],
+    "event": [
+      2,
+      12950
+    ],
+    "goto": 0
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json
index a4d245f31..1d66bdb85 100644
--- a/bin/json/game_recharge.json
+++ b/bin/json/game_recharge.json
@@ -22,7 +22,8 @@
     "channel": "0",
     "text": "0",
     "show": "6元",
-    "image": "cz_zs_01"
+    "image": "cz_zs_01",
+    "integral": 500
   },
   {
     "id": "gold30",
@@ -47,7 +48,8 @@
     "channel": "0",
     "text": "0",
     "show": "30元",
-    "image": "cz_zs_02"
+    "image": "cz_zs_02",
+    "integral": 600
   },
   {
     "id": "gold68",
@@ -72,7 +74,8 @@
     "channel": "0",
     "text": "0",
     "show": "68元",
-    "image": "cz_zs_02"
+    "image": "cz_zs_02",
+    "integral": 700
   },
   {
     "id": "gold128",
@@ -97,7 +100,8 @@
     "channel": "0",
     "text": "0",
     "show": "98元",
-    "image": "cz_zs_02"
+    "image": "cz_zs_02",
+    "integral": 800
   },
   {
     "id": "gold198",
@@ -122,7 +126,8 @@
     "channel": "0",
     "text": "0",
     "show": "128元",
-    "image": "cz_zs_03"
+    "image": "cz_zs_03",
+    "integral": 900
   },
   {
     "id": "gold328",
@@ -147,7 +152,8 @@
     "channel": "0",
     "text": "0",
     "show": "198元",
-    "image": "cz_zs_03"
+    "image": "cz_zs_03",
+    "integral": 1000
   },
   {
     "id": "gold448",
@@ -172,7 +178,8 @@
     "channel": "0",
     "text": "0",
     "show": "328元",
-    "image": "cz_zs_03"
+    "image": "cz_zs_03",
+    "integral": 1100
   },
   {
     "id": "gold648",
@@ -197,7 +204,8 @@
     "channel": "0",
     "text": "0",
     "show": "648元",
-    "image": "cz_zs_03"
+    "image": "cz_zs_03",
+    "integral": 1200
   },
   {
     "id": "lb6_1",
@@ -210,7 +218,8 @@
     "channel": "0",
     "text": "0",
     "show": "6元",
-    "image": ""
+    "image": "",
+    "integral": 1300
   },
   {
     "id": "day_1",
@@ -223,7 +232,8 @@
     "channel": "0",
     "text": "0",
     "show": "6元",
-    "image": ""
+    "image": "",
+    "integral": 1400
   },
   {
     "id": "day_2",
@@ -236,7 +246,8 @@
     "channel": "0",
     "text": "0",
     "show": "30元",
-    "image": ""
+    "image": "",
+    "integral": 1500
   },
   {
     "id": "day_3",
@@ -249,7 +260,8 @@
     "channel": "0",
     "text": "0",
     "show": "68元",
-    "image": ""
+    "image": "",
+    "integral": 1600
   },
   {
     "id": "day_4",
@@ -262,7 +274,8 @@
     "channel": "0",
     "text": "0",
     "show": "128元",
-    "image": ""
+    "image": "",
+    "integral": 1700
   },
   {
     "id": "week_1",
@@ -275,7 +288,8 @@
     "channel": "0",
     "text": "0",
     "show": "30元",
-    "image": ""
+    "image": "",
+    "integral": 1800
   },
   {
     "id": "week_2",
@@ -288,7 +302,8 @@
     "channel": "0",
     "text": "0",
     "show": "98元",
-    "image": ""
+    "image": "",
+    "integral": 1900
   },
   {
     "id": "week_3",
@@ -301,7 +316,8 @@
     "channel": "0",
     "text": "0",
     "show": "198元",
-    "image": ""
+    "image": "",
+    "integral": 2000
   },
   {
     "id": "week_4",
@@ -314,7 +330,8 @@
     "channel": "0",
     "text": "0",
     "show": "328元",
-    "image": ""
+    "image": "",
+    "integral": 2100
   },
   {
     "id": "week_5",
@@ -327,7 +344,8 @@
     "channel": "0",
     "text": "0",
     "show": "448元",
-    "image": ""
+    "image": "",
+    "integral": 2200
   },
   {
     "id": "week_6",
@@ -340,7 +358,8 @@
     "channel": "0",
     "text": "0",
     "show": "648元",
-    "image": ""
+    "image": "",
+    "integral": 2300
   },
   {
     "id": "month_1",
@@ -353,7 +372,8 @@
     "channel": "0",
     "text": "0",
     "show": "128元",
-    "image": ""
+    "image": "",
+    "integral": 2400
   },
   {
     "id": "month_2",
@@ -366,7 +386,8 @@
     "channel": "0",
     "text": "0",
     "show": "198元",
-    "image": ""
+    "image": "",
+    "integral": 2500
   },
   {
     "id": "month_3",
@@ -379,7 +400,8 @@
     "channel": "0",
     "text": "0",
     "show": "328元",
-    "image": ""
+    "image": "",
+    "integral": 2600
   },
   {
     "id": "yueka_lv1",
@@ -398,7 +420,8 @@
     "channel": "0",
     "text": "0",
     "show": "30元",
-    "image": ""
+    "image": "",
+    "integral": 2700
   },
   {
     "id": "yueka_lv2",
@@ -417,7 +440,8 @@
     "channel": "0",
     "text": "0",
     "show": "98元",
-    "image": ""
+    "image": "",
+    "integral": 2800
   },
   {
     "id": "passcheck_1",
@@ -430,7 +454,8 @@
     "channel": "0",
     "text": "0",
     "show": "98元",
-    "image": ""
+    "image": "",
+    "integral": 2900
   },
   {
     "id": "passcheck_2",
@@ -443,7 +468,8 @@
     "channel": "0",
     "text": "0",
     "show": "98元",
-    "image": ""
+    "image": "",
+    "integral": 3000
   },
   {
     "id": "drawcard_pack1",
@@ -456,6 +482,105 @@
     "channel": "0",
     "text": "0",
     "show": "30元",
-    "image": ""
+    "image": "",
+    "integral": 3100
+  },
+  {
+    "id": "passcheck_3",
+    "editionid": "debug",
+    "recharge_type": 6,
+    "monetaryunit": "￥",
+    "amount": 3000,
+    "vipexp": [],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "30元",
+    "image": "",
+    "integral": 3200
+  },
+  {
+    "id": "passcheck_4",
+    "editionid": "debug",
+    "recharge_type": 6,
+    "monetaryunit": "￥",
+    "amount": 6800,
+    "vipexp": [],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "68元",
+    "image": "",
+    "integral": 3300
+  },
+  {
+    "id": "passcheck_5",
+    "editionid": "debug",
+    "recharge_type": 6,
+    "monetaryunit": "￥",
+    "amount": 128000,
+    "vipexp": [],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "128元",
+    "image": "",
+    "integral": 3400
+  },
+  {
+    "id": "passcheck_6",
+    "editionid": "debug",
+    "recharge_type": 6,
+    "monetaryunit": "￥",
+    "amount": 3000,
+    "vipexp": [],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "30元",
+    "image": "",
+    "integral": 3500
+  },
+  {
+    "id": "passcheck_7",
+    "editionid": "debug",
+    "recharge_type": 6,
+    "monetaryunit": "￥",
+    "amount": 3000,
+    "vipexp": [],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "30元",
+    "image": "",
+    "integral": 3600
+  },
+  {
+    "id": "passcheck_8",
+    "editionid": "debug",
+    "recharge_type": 6,
+    "monetaryunit": "￥",
+    "amount": 3000,
+    "vipexp": [],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "30元",
+    "image": "",
+    "integral": 3700
+  },
+  {
+    "id": "passcheck_9",
+    "editionid": "debug",
+    "recharge_type": 6,
+    "monetaryunit": "￥",
+    "amount": 3000,
+    "vipexp": [],
+    "diamond_num_double": [],
+    "channel": "0",
+    "text": "0",
+    "show": "30元",
+    "image": "",
+    "integral": 3800
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_reddot.json b/bin/json/game_reddot.json
index 23dab7db3..1ec10993a 100644
--- a/bin/json/game_reddot.json
+++ b/bin/json/game_reddot.json
@@ -691,5 +691,14 @@
     "group": "",
     "path": "",
     "header": "红点出现：当聊天系统中公会，私聊，跨服，系统存在玩家未接受消息时，触发聊天红点。"
+  },
+  {
+    "id": 29101,
+    "msg_type": 2,
+    "show_type": 1,
+    "count_type": 1,
+    "group": "",
+    "path": "",
+    "header": ""
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index 23c127304..68d8d5b34 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -135,11 +135,11 @@
     "id": 10013,
     "title": {
       "key": "ruledesc_ruledesc_title_13",
-      "text": "冒险关卡说明"
+      "text": "冒险之旅说明"
     },
     "content": {
       "key": "ruledesc_ruledesc_content_13",
-      "text": "这里可以挑战冒险关卡并赢取巨量奖励。"
+      "text": "这里可以挑战冒险之旅并赢取巨量奖励。"
     }
   },
   {
diff --git a/bin/json/game_shopcentercontrol.json b/bin/json/game_shopcentercontrol.json
index ea3c36e11..971a35be4 100644
--- a/bin/json/game_shopcentercontrol.json
+++ b/bin/json/game_shopcentercontrol.json
@@ -9,9 +9,9 @@
     "index": 1,
     "slogan": {
       "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3000% bonus!",
-      "text": "购买礼包并通关所有简单模式主线，总计可获得超值3000%奖励！"
+      "text": "购买礼包并通关所有简单模式主线，总计可获得超值1200%奖励！"
     },
-    "point": "passcheck_4",
+    "point": "passcheck_3",
     "restriction": 1,
     "lv": 1,
     "on": 0,
@@ -30,11 +30,11 @@
     "index": 2,
     "slogan": {
       "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3001% bonus!",
-      "text": "购买礼包并通关所有困难模式主线，总计可获得超值3000%奖励！"
+      "text": "购买礼包并通关所有困难模式主线，总计可获得超值1200%奖励！"
     },
-    "point": "passcheck_5",
+    "point": "passcheck_4",
     "restriction": 1,
-    "lv": 2,
+    "lv": 1,
     "on": 0,
     "time": 0,
     "times": 0,
@@ -51,11 +51,11 @@
     "index": 3,
     "slogan": {
       "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3002% bonus!",
-      "text": "购买礼包并通关所有地狱模式主线，总计可获得超值3000%奖励！"
+      "text": "购买礼包并通关所有地狱模式主线，总计可获得超值1200%奖励！"
     },
-    "point": "passcheck_6",
+    "point": "passcheck_5",
     "restriction": 1,
-    "lv": 3,
+    "lv": 1,
     "on": 0,
     "time": 0,
     "times": 0,
@@ -72,9 +72,9 @@
     "index": 0,
     "slogan": {
       "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3003% bonus!",
-      "text": "购买礼包并达到相应的守护者等级，总计可获得超值3000%奖励！"
+      "text": "购买礼包并达到相应的守护者等级，总计可获得超值1800%奖励！"
     },
-    "point": "passcheck_7",
+    "point": "passcheck_6",
     "restriction": 1,
     "lv": 1,
     "on": 0,
@@ -95,7 +95,7 @@
       "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3004% bonus!",
       "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
     },
-    "point": "passcheck_8",
+    "point": "passcheck_7",
     "restriction": 1,
     "lv": 1,
     "on": 1,
@@ -116,7 +116,7 @@
       "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3005% bonus!",
       "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
     },
-    "point": "passcheck_9",
+    "point": "passcheck_8",
     "restriction": 1,
     "lv": 1,
     "on": 2,
@@ -137,7 +137,7 @@
       "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3006% bonus!",
       "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
     },
-    "point": "passcheck_10",
+    "point": "passcheck_9",
     "restriction": 1,
     "lv": 1,
     "on": 1,
diff --git a/bin/json/game_shopcenterfund.json b/bin/json/game_shopcenterfund.json
index 57343ec34..ba67f9b5d 100644
--- a/bin/json/game_shopcenterfund.json
+++ b/bin/json/game_shopcenterfund.json
@@ -3,77 +3,77 @@
     "id": 200001,
     "type": 2,
     "unlock": 5,
-    "group": 980,
+    "group": 22002001,
     "position": 1
   },
   {
     "id": 200002,
     "type": 2,
     "unlock": 10,
-    "group": 981,
+    "group": 22002002,
     "position": 2
   },
   {
     "id": 200003,
     "type": 2,
     "unlock": 15,
-    "group": 982,
+    "group": 22002002,
     "position": 3
   },
   {
     "id": 200004,
     "type": 2,
     "unlock": 20,
-    "group": 983,
+    "group": 22002002,
     "position": 4
   },
   {
     "id": 200005,
     "type": 2,
     "unlock": 25,
-    "group": 984,
+    "group": 22002002,
     "position": 5
   },
   {
     "id": 200006,
     "type": 2,
     "unlock": 30,
-    "group": 985,
+    "group": 22002002,
     "position": 6
   },
   {
     "id": 200007,
     "type": 2,
     "unlock": 35,
-    "group": 986,
+    "group": 22002002,
     "position": 7
   },
   {
     "id": 200008,
     "type": 2,
     "unlock": 40,
-    "group": 987,
+    "group": 22002002,
     "position": 8
   },
   {
     "id": 200009,
     "type": 2,
     "unlock": 45,
-    "group": 988,
+    "group": 22002002,
     "position": 9
   },
   {
     "id": 200010,
     "type": 2,
     "unlock": 50,
-    "group": 989,
+    "group": 22002002,
     "position": 10
   },
   {
     "id": 200011,
     "type": 2,
     "unlock": 55,
-    "group": 990,
+    "group": 22002002,
     "position": 11
   },
   {
diff --git a/bin/json/game_shopcentersubmeter.json b/bin/json/game_shopcentersubmeter.json
index 25b806afe..7d22545c8 100644
--- a/bin/json/game_shopcentersubmeter.json
+++ b/bin/json/game_shopcentersubmeter.json
@@ -3,252 +3,252 @@
     "id": 100001,
     "index": 1,
     "mianlevel": 20080,
-    "group": 980,
+    "group": 22001001,
     "position": 1
   },
   {
     "id": 100002,
     "index": 1,
     "mianlevel": 20080,
-    "group": 981,
+    "group": 22001001,
     "position": 2
   },
   {
     "id": 100003,
     "index": 1,
     "mianlevel": 20080,
-    "group": 982,
+    "group": 22001001,
     "position": 3
   },
   {
     "id": 100004,
     "index": 1,
     "mianlevel": 20080,
-    "group": 983,
+    "group": 22001001,
     "position": 4
   },
   {
     "id": 100005,
     "index": 1,
     "mianlevel": 20080,
-    "group": 984,
+    "group": 22001001,
     "position": 5
   },
   {
     "id": 100006,
     "index": 1,
     "mianlevel": 20080,
-    "group": 985,
+    "group": 22001001,
     "position": 6
   },
   {
     "id": 100007,
     "index": 1,
     "mianlevel": 20080,
-    "group": 986,
+    "group": 22001001,
     "position": 7
   },
   {
     "id": 100008,
     "index": 1,
     "mianlevel": 20080,
-    "group": 987,
+    "group": 22001001,
     "position": 8
   },
   {
     "id": 100009,
     "index": 1,
     "mianlevel": 20080,
-    "group": 988,
+    "group": 22001001,
     "position": 9
   },
   {
     "id": 100010,
     "index": 1,
     "mianlevel": 20080,
-    "group": 989,
+    "group": 22001001,
     "position": 10
   },
   {
     "id": 100011,
     "index": 1,
     "mianlevel": 20080,
-    "group": 990,
+    "group": 22001001,
     "position": 11
   },
   {
     "id": 100012,
     "index": 1,
     "mianlevel": 20080,
-    "group": 991,
+    "group": 22001001,
     "position": 12
   },
   {
     "id": 100013,
     "index": 2,
     "mianlevel": 20080,
-    "group": 992,
+    "group": 22001002,
     "position": 1
   },
   {
     "id": 100014,
     "index": 2,
     "mianlevel": 20080,
-    "group": 993,
+    "group": 22001002,
     "position": 2
   },
   {
     "id": 100015,
     "index": 2,
     "mianlevel": 20080,
-    "group": 994,
+    "group": 22001002,
     "position": 3
   },
   {
     "id": 100016,
     "index": 2,
     "mianlevel": 20080,
-    "group": 995,
+    "group": 22001002,
     "position": 4
   },
   {
     "id": 100017,
     "index": 2,
     "mianlevel": 20080,
-    "group": 996,
+    "group": 22001002,
     "position": 5
   },
   {
     "id": 100018,
     "index": 2,
     "mianlevel": 20080,
-    "group": 997,
+    "group": 22001002,
     "position": 6
   },
   {
     "id": 100019,
     "index": 2,
     "mianlevel": 20080,
-    "group": 998,
+    "group": 22001002,
     "position": 7
   },
   {
     "id": 100020,
     "index": 2,
     "mianlevel": 20080,
-    "group": 999,
+    "group": 22001002,
     "position": 8
   },
   {
     "id": 100021,
     "index": 2,
     "mianlevel": 20080,
-    "group": 1000,
+    "group": 22001002,
     "position": 9
   },
   {
     "id": 100022,
     "index": 2,
     "mianlevel": 20080,
-    "group": 1001,
+    "group": 22001002,
     "position": 10
   },
   {
     "id": 100023,
     "index": 2,
     "mianlevel": 20080,
-    "group": 1002,
+    "group": 22001002,
     "position": 11
   },
   {
     "id": 100024,
     "index": 2,
     "mianlevel": 20080,
-    "group": 1003,
+    "group": 22001002,
     "position": 12
   },
   {
     "id": 100025,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1004,
+    "group": 22001003,
     "position": 1
   },
   {
     "id": 100026,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1005,
+    "group": 22001003,
     "position": 2
   },
   {
     "id": 100027,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1006,
+    "group": 22001003,
     "position": 3
   },
   {
     "id": 100028,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1007,
+    "group": 22001003,
     "position": 4
   },
   {
     "id": 100029,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1008,
+    "group": 22001003,
     "position": 5
   },
   {
     "id": 100030,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1009,
+    "group": 22001003,
     "position": 6
   },
   {
     "id": 100031,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1010,
+    "group": 22001003,
     "position": 7
   },
   {
     "id": 100032,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1011,
+    "group": 22001003,
     "position": 8
   },
   {
     "id": 100033,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1012,
+    "group": 22001003,
     "position": 9
   },
   {
     "id": 100034,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1013,
+    "group": 22001003,
     "position": 10
   },
   {
     "id": 100035,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1014,
+    "group": 22001003,
     "position": 11
   },
   {
     "id": 100036,
     "index": 3,
     "mianlevel": 20080,
-    "group": 1015,
+    "group": 22001003,
     "position": 12
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index a6e3a83e5..ef638b98d 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -9,6 +9,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -27,6 +28,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 500,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -45,6 +47,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -64,6 +67,7 @@
     "BuffCheck": "Effect=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 1,
     "MaxEmitTimes": 0,
@@ -84,6 +88,7 @@
     "BuffCheck": "BuffID=390002003",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -102,6 +107,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -120,6 +126,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -138,6 +145,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -156,6 +164,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -174,6 +183,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -192,6 +202,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -210,6 +221,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -228,6 +240,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -246,6 +259,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -264,6 +278,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -282,6 +297,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -300,6 +316,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -318,6 +335,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -336,6 +354,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -354,6 +373,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -372,6 +392,7 @@
     "BuffCheck": "Effect=3,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -390,6 +411,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -408,6 +430,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -426,6 +449,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -445,6 +469,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -463,6 +488,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -481,6 +507,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -499,6 +526,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -517,6 +545,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -535,6 +564,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -553,6 +583,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -571,6 +602,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -589,6 +621,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 500,
+    "PasCorrection": 0,
     "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -608,6 +641,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -627,6 +661,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -645,6 +680,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -665,6 +701,7 @@
     "BuffCheck": "Effect=0",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -683,6 +720,7 @@
     "BuffCheck": "Effect=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -703,6 +741,7 @@
       "LeftSelf=1"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -722,6 +761,7 @@
     "BuffCheck": "Effect=3,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -740,6 +780,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -758,6 +799,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -776,6 +818,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -794,6 +837,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -812,6 +856,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -830,6 +875,7 @@
     "BuffCheck": "Effect=3,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -848,6 +894,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -866,6 +913,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -884,6 +932,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -902,6 +951,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -920,6 +970,7 @@
     "BuffCheck": "BuffID=390001202,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -938,6 +989,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -956,6 +1008,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -974,6 +1027,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -992,6 +1046,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1010,6 +1065,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1028,6 +1084,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1046,6 +1103,7 @@
     "BuffCheck": "Effect=1,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1064,6 +1122,7 @@
     "BuffCheck": "BuffID=390001214",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1082,6 +1141,7 @@
     "BuffCheck": "BuffID=390001214",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1100,6 +1160,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1118,6 +1179,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1136,6 +1198,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1154,6 +1217,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1172,6 +1236,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1192,6 +1257,7 @@
       "SelfHpproless=500"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1212,6 +1278,7 @@
       "FriendHpproless=500"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1231,6 +1298,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1251,6 +1319,7 @@
       "EffType=0,Result=1"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1267,6 +1336,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1285,6 +1355,7 @@
     "BuffCheck": "Effect=3,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1303,6 +1374,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1321,6 +1393,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1339,6 +1412,7 @@
     "BuffCheck": "Effect=3,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1357,6 +1431,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1375,6 +1450,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1393,6 +1469,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1411,6 +1488,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1429,6 +1507,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1447,6 +1526,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1465,6 +1545,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1483,6 +1564,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1501,6 +1583,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1519,6 +1602,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1537,6 +1621,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1555,6 +1640,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1573,6 +1659,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1591,6 +1678,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1609,6 +1697,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1625,6 +1714,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1643,6 +1733,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1661,6 +1752,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "RepeatSkill",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1677,6 +1769,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1695,6 +1788,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1713,6 +1807,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1731,6 +1826,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1749,6 +1845,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1767,6 +1864,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1785,6 +1883,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1805,6 +1904,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1824,6 +1924,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1844,6 +1945,7 @@
       "EffType=0,Result=1"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1864,6 +1966,7 @@
       "HasBuff=390001415"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1882,6 +1985,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1900,6 +2004,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1919,6 +2024,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1937,6 +2043,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1955,6 +2062,7 @@
     "BuffCheck": "BuffID=390001122,OverlayNumUp=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1973,6 +2081,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "DetonateBuff",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -1994,6 +2103,7 @@
       "SelfNoBuff=390001448"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2012,6 +2122,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2028,6 +2139,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 150,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2046,6 +2158,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 600,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2064,6 +2177,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2082,6 +2196,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2102,6 +2217,7 @@
       "EnemyHasBuff=390001008"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2120,6 +2236,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2138,6 +2255,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2158,6 +2276,7 @@
       "EffType=1,Result=1"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2176,6 +2295,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2194,6 +2314,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2212,6 +2333,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2230,6 +2352,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2248,6 +2371,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2266,6 +2390,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2284,6 +2409,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2304,6 +2430,7 @@
       "Alive=0"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2322,6 +2449,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2340,6 +2468,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2358,6 +2487,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2376,6 +2506,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2394,6 +2525,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2412,6 +2544,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2430,6 +2563,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2448,6 +2582,7 @@
     "BuffCheck": "BuffID=390001122",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2466,6 +2601,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2484,6 +2620,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2502,6 +2639,7 @@
     "BuffCheck": "Effect=1,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2520,6 +2658,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2538,6 +2677,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2556,6 +2696,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2574,6 +2715,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2592,6 +2734,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2610,6 +2753,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2628,6 +2772,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 250,
+    "PasCorrection": 0,
     "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2647,6 +2792,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2665,6 +2811,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2683,6 +2830,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2701,6 +2849,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2719,6 +2868,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2737,6 +2887,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2755,6 +2906,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2773,6 +2925,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2793,6 +2946,7 @@
       "Hpproless=300"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2811,6 +2965,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2829,6 +2984,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "DetonateBuff",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2848,6 +3004,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2866,6 +3023,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2884,6 +3042,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2902,6 +3061,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2920,6 +3080,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2938,6 +3099,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2956,6 +3118,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2974,6 +3137,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -2992,6 +3156,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3012,6 +3177,7 @@
       "RoleALive=34008,HasFriendRole=34008"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3032,6 +3198,7 @@
       "RoleALive=34008,HasFriendRole=34008"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3052,6 +3219,7 @@
       "RoleALive=24008,HasFriendRole=24008"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3072,6 +3240,7 @@
       "RoleALive=24008,HasFriendRole=24008"
     ],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3090,6 +3259,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "FightHpChangePas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3109,6 +3279,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3127,6 +3298,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3145,6 +3317,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3163,6 +3336,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 1,
@@ -3181,6 +3355,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 1,
@@ -3199,6 +3374,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 1,
@@ -3217,6 +3393,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 150,
+    "PasCorrection": 0,
     "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3236,6 +3413,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 150,
+    "PasCorrection": 0,
     "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3255,6 +3433,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3273,6 +3452,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3291,6 +3471,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3309,6 +3490,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3327,6 +3509,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3345,6 +3528,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3363,6 +3547,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3381,6 +3566,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3399,6 +3585,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3417,6 +3604,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3436,6 +3624,7 @@
     "BuffCheck": "BuffType=SHIELD,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3454,6 +3643,7 @@
     "BuffCheck": "BuffType=SHIELD,Succ=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3472,6 +3662,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3490,6 +3681,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3508,6 +3700,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3526,6 +3719,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3544,6 +3738,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 300,
+    "PasCorrection": 0,
     "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3563,6 +3758,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 400,
+    "PasCorrection": 0,
     "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3582,6 +3778,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3600,6 +3797,7 @@
     "BuffCheck": "",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3618,6 +3816,7 @@
     "BuffCheck": "EffType=3",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3636,6 +3835,7 @@
     "BuffCheck": "EffType=3",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3655,6 +3855,7 @@
     "BuffCheck": "EffType=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3673,6 +3874,7 @@
     "BuffCheck": "EffType=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3692,6 +3894,7 @@
     "BuffCheck": "EffType=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
@@ -3710,6 +3913,7 @@
     "BuffCheck": "EffType=1",
     "AddCon": [],
     "PasPr": 1000,
+    "PasCorrection": 0,
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
diff --git a/bin/json/game_stonebuff.json b/bin/json/game_stonebuff.json
index 3dc16c449..7d2e28ab5 100644
--- a/bin/json/game_stonebuff.json
+++ b/bin/json/game_stonebuff.json
@@ -5,7 +5,7 @@
     "SkillId": 770001111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -30,7 +30,7 @@
     "SkillId": 770001111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -55,7 +55,7 @@
     "SkillId": 770002111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -80,7 +80,7 @@
     "SkillId": 770002111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -105,7 +105,7 @@
     "SkillId": 770003111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -130,7 +130,7 @@
     "SkillId": 770003111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -155,7 +155,7 @@
     "SkillId": 770004111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -180,7 +180,7 @@
     "SkillId": 770004111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -205,7 +205,7 @@
     "SkillId": 770005111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -230,7 +230,7 @@
     "SkillId": 770005111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -255,7 +255,7 @@
     "SkillId": 770006111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -280,7 +280,7 @@
     "SkillId": 770006111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -305,7 +305,7 @@
     "SkillId": 770007111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -330,7 +330,7 @@
     "SkillId": 770007111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -355,7 +355,7 @@
     "SkillId": 770008111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 1,
@@ -380,7 +380,7 @@
     "SkillId": 770008111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 1,
@@ -405,7 +405,7 @@
     "SkillId": 770009111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -430,7 +430,7 @@
     "SkillId": 770009111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -455,7 +455,7 @@
     "SkillId": 770010111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -480,7 +480,7 @@
     "SkillId": 770010111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -505,7 +505,7 @@
     "SkillId": 770011111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -530,7 +530,7 @@
     "SkillId": 770011111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -555,7 +555,7 @@
     "SkillId": 770012111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -580,7 +580,7 @@
     "SkillId": 770012111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -605,7 +605,7 @@
     "SkillId": 770013111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -630,7 +630,7 @@
     "SkillId": 770013111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -655,7 +655,7 @@
     "SkillId": 770014111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -680,7 +680,7 @@
     "SkillId": 770014111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -705,7 +705,7 @@
     "SkillId": 770015111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -730,7 +730,7 @@
     "SkillId": 770015111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -755,7 +755,7 @@
     "SkillId": 770016111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -780,7 +780,7 @@
     "SkillId": 770016111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -805,7 +805,7 @@
     "SkillId": 770017111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -830,7 +830,7 @@
     "SkillId": 770017111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -855,7 +855,7 @@
     "SkillId": 770018111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -880,7 +880,7 @@
     "SkillId": 770018111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -905,7 +905,7 @@
     "SkillId": 770019111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -930,7 +930,7 @@
     "SkillId": 770019111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -955,7 +955,7 @@
     "SkillId": 770020111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -980,7 +980,7 @@
     "SkillId": 770020111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1005,7 +1005,7 @@
     "SkillId": 770021111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1030,7 +1030,7 @@
     "SkillId": 770021111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1055,7 +1055,7 @@
     "SkillId": 770022111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1080,7 +1080,7 @@
     "SkillId": 770022111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1105,7 +1105,7 @@
     "SkillId": 770023111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1130,7 +1130,7 @@
     "SkillId": 770023111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1155,7 +1155,7 @@
     "SkillId": 770024111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1180,7 +1180,7 @@
     "SkillId": 770024111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1205,7 +1205,7 @@
     "SkillId": 770025111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1230,7 +1230,7 @@
     "SkillId": 770025111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1255,7 +1255,7 @@
     "SkillId": 770026111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1280,7 +1280,7 @@
     "SkillId": 770026111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1305,7 +1305,7 @@
     "SkillId": 770027111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1330,7 +1330,7 @@
     "SkillId": 770027111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1355,7 +1355,7 @@
     "SkillId": 770028111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1380,7 +1380,7 @@
     "SkillId": 770028111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1405,7 +1405,7 @@
     "SkillId": 770029111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1430,7 +1430,7 @@
     "SkillId": 770029111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1455,7 +1455,7 @@
     "SkillId": 770030111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1480,7 +1480,7 @@
     "SkillId": 770030111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1505,7 +1505,7 @@
     "SkillId": 770031111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1530,7 +1530,7 @@
     "SkillId": 770031111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1555,7 +1555,7 @@
     "SkillId": 770032111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 1,
@@ -1580,7 +1580,7 @@
     "SkillId": 770032111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 1,
@@ -1605,7 +1605,7 @@
     "SkillId": 770033111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1630,7 +1630,7 @@
     "SkillId": 770033111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1655,7 +1655,7 @@
     "SkillId": 770034111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1680,7 +1680,7 @@
     "SkillId": 770034111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1705,7 +1705,7 @@
     "SkillId": 770035111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1730,7 +1730,7 @@
     "SkillId": 770035111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1755,7 +1755,7 @@
     "SkillId": 770036111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1780,7 +1780,7 @@
     "SkillId": 770036111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1805,7 +1805,7 @@
     "SkillId": 770037111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1830,7 +1830,7 @@
     "SkillId": 770037111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1855,7 +1855,7 @@
     "SkillId": 770038111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1880,7 +1880,7 @@
     "SkillId": 770038111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1905,7 +1905,7 @@
     "SkillId": 770039111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1930,7 +1930,7 @@
     "SkillId": 770039111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1955,7 +1955,7 @@
     "SkillId": 770040111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -1980,7 +1980,7 @@
     "SkillId": 770040111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2005,7 +2005,7 @@
     "SkillId": 770041111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2030,7 +2030,7 @@
     "SkillId": 770041111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2055,7 +2055,7 @@
     "SkillId": 770042111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2080,7 +2080,7 @@
     "SkillId": 770042111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2105,7 +2105,7 @@
     "SkillId": 770043111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2130,7 +2130,7 @@
     "SkillId": 770043111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2155,7 +2155,7 @@
     "SkillId": 770044111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2180,7 +2180,7 @@
     "SkillId": 770044111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2205,7 +2205,7 @@
     "SkillId": 770045111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2230,7 +2230,7 @@
     "SkillId": 770045111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2255,7 +2255,7 @@
     "SkillId": 770046111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2280,7 +2280,7 @@
     "SkillId": 770046111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2305,7 +2305,7 @@
     "SkillId": 770047111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2330,7 +2330,7 @@
     "SkillId": 770047111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2355,7 +2355,7 @@
     "SkillId": 770048111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2380,7 +2380,7 @@
     "SkillId": 770048111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2405,7 +2405,7 @@
     "SkillId": 770049111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2430,7 +2430,7 @@
     "SkillId": 770049111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2455,7 +2455,7 @@
     "SkillId": 770050111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2480,7 +2480,7 @@
     "SkillId": 770050111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2505,7 +2505,7 @@
     "SkillId": 770051111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2530,7 +2530,7 @@
     "SkillId": 770051111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2555,7 +2555,7 @@
     "SkillId": 770052111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2580,7 +2580,7 @@
     "SkillId": 770052111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2605,7 +2605,7 @@
     "SkillId": 770053111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2630,7 +2630,7 @@
     "SkillId": 770053111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2655,7 +2655,7 @@
     "SkillId": 770054111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2680,7 +2680,7 @@
     "SkillId": 770054111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2705,7 +2705,7 @@
     "SkillId": 770055111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2730,7 +2730,7 @@
     "SkillId": 770055111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2755,7 +2755,7 @@
     "SkillId": 770056111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2780,7 +2780,7 @@
     "SkillId": 770056111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2805,7 +2805,7 @@
     "SkillId": 770057111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2830,7 +2830,7 @@
     "SkillId": 770057111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2855,7 +2855,7 @@
     "SkillId": 770058111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2880,7 +2880,7 @@
     "SkillId": 770058111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2905,7 +2905,7 @@
     "SkillId": 770059111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2930,7 +2930,7 @@
     "SkillId": 770059111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "2",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -2955,7 +2955,7 @@
     "SkillId": 770060111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 1,
@@ -2980,7 +2980,7 @@
     "SkillId": 770060111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 1,
@@ -3005,7 +3005,7 @@
     "SkillId": 770061111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3030,7 +3030,7 @@
     "SkillId": 770061111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3055,7 +3055,7 @@
     "SkillId": 770062111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3080,7 +3080,7 @@
     "SkillId": 770062111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3105,7 +3105,7 @@
     "SkillId": 770063111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3130,7 +3130,7 @@
     "SkillId": 770063111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3155,7 +3155,7 @@
     "SkillId": 770064111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3180,7 +3180,7 @@
     "SkillId": 770064111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3205,7 +3205,7 @@
     "SkillId": 770065111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3230,7 +3230,7 @@
     "SkillId": 770065111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3255,7 +3255,7 @@
     "SkillId": 770066111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3280,7 +3280,7 @@
     "SkillId": 770066111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3305,7 +3305,7 @@
     "SkillId": 770067111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3330,7 +3330,7 @@
     "SkillId": 770067111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3355,7 +3355,7 @@
     "SkillId": 770068111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3380,7 +3380,7 @@
     "SkillId": 770068111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3405,7 +3405,7 @@
     "SkillId": 770069111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3430,7 +3430,7 @@
     "SkillId": 770069111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3455,7 +3455,7 @@
     "SkillId": 770070111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3480,7 +3480,7 @@
     "SkillId": 770070111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3505,7 +3505,7 @@
     "SkillId": 770071111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3530,7 +3530,7 @@
     "SkillId": 770071111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3555,7 +3555,7 @@
     "SkillId": 770072111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3580,7 +3580,7 @@
     "SkillId": 770072111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3605,7 +3605,7 @@
     "SkillId": 770073111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3630,7 +3630,7 @@
     "SkillId": 770073111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3655,7 +3655,7 @@
     "SkillId": 770074111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3680,7 +3680,7 @@
     "SkillId": 770074111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "1",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3705,7 +3705,7 @@
     "SkillId": 770075111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3730,7 +3730,7 @@
     "SkillId": 770075111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3755,7 +3755,7 @@
     "SkillId": 770076111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3780,7 +3780,7 @@
     "SkillId": 770076111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3805,7 +3805,7 @@
     "SkillId": 770077111,
     "BuffLevel": 1,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3830,7 +3830,7 @@
     "SkillId": 770077111,
     "BuffLevel": 2,
     "Quality": 1,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3855,7 +3855,7 @@
     "SkillId": 770078111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3880,7 +3880,7 @@
     "SkillId": 770078111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "3",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3905,7 +3905,7 @@
     "SkillId": 770079111,
     "BuffLevel": 1,
     "Quality": 3,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3930,7 +3930,7 @@
     "SkillId": 770079111,
     "BuffLevel": 2,
     "Quality": 3,
-    "BuffIcon": "5",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3955,7 +3955,7 @@
     "SkillId": 770080111,
     "BuffLevel": 1,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
@@ -3980,7 +3980,7 @@
     "SkillId": 770080111,
     "BuffLevel": 2,
     "Quality": 2,
-    "BuffIcon": "4",
+    "BuffIcon": "",
     "TargetType": 1,
     "CampType": 0,
     "TakeDataType": 0,
diff --git a/bin/json/game_taskactivereward.json b/bin/json/game_taskactivereward.json
index 49f6a4c3d..932e88a92 100644
--- a/bin/json/game_taskactivereward.json
+++ b/bin/json/game_taskactivereward.json
@@ -8,16 +8,6 @@
         "a": "attr",
         "t": "diamond",
         "n": 150
-      },
-      {
-        "a": "item",
-        "t": "17010000",
-        "n": 50
-      },
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000000
       }
     ],
     "action": "main_weektask_action_1_act",
@@ -33,15 +23,10 @@
         "t": "diamond",
         "n": 150
       },
-      {
-        "a": "item",
-        "t": "17010000",
-        "n": 100
-      },
       {
         "a": "attr",
         "t": "gold",
-        "n": 1000000
+        "n": 500000
       }
     ],
     "action": "main_weektask_action_1_act",
@@ -57,15 +42,10 @@
         "t": "diamond",
         "n": 150
       },
-      {
-        "a": "item",
-        "t": "17010000",
-        "n": 100
-      },
       {
         "a": "attr",
         "t": "gold",
-        "n": 1000000
+        "n": 600000
       }
     ],
     "action": "main_weektask_action_1_act",
@@ -81,15 +61,10 @@
         "t": "diamond",
         "n": 150
       },
-      {
-        "a": "item",
-        "t": "17010000",
-        "n": 100
-      },
       {
         "a": "attr",
         "t": "gold",
-        "n": 1000000
+        "n": 600000
       }
     ],
     "action": "main_weektask_action_1_act",
diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json
index c91d66098..3156cd3b7 100644
--- a/bin/json/game_taskround.json
+++ b/bin/json/game_taskround.json
@@ -3,6 +3,7 @@
     "key": 20001,
     "id_list": 1,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_1",
       "text": "本周竞技场挑战10次"
@@ -29,6 +30,7 @@
     "key": 20002,
     "id_list": 2,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_2",
       "text": "本周竞技场挑战30次"
@@ -55,6 +57,7 @@
     "key": 20003,
     "id_list": 3,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_3",
       "text": "本周竞技场挑战50次"
@@ -81,6 +84,7 @@
     "key": 20004,
     "id_list": 4,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_4",
       "text": "本周竞技场胜利10次"
@@ -107,6 +111,7 @@
     "key": 20005,
     "id_list": 5,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_5",
       "text": "本周竞技场胜利20次"
@@ -133,6 +138,7 @@
     "key": 20006,
     "id_list": 6,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_6",
       "text": "本周竞技场胜利30次"
@@ -159,6 +165,7 @@
     "key": 20007,
     "id_list": 7,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_7",
       "text": "本周累计经验副本消耗300体力"
@@ -185,6 +192,7 @@
     "key": 20008,
     "id_list": 8,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_8",
       "text": "本周累计经验副本消耗600体力"
@@ -211,6 +219,7 @@
     "key": 20009,
     "id_list": 9,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_9",
       "text": "本周累计经验副本消耗1000体力"
@@ -237,6 +246,7 @@
     "key": 20010,
     "id_list": 10,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_10",
       "text": "本周累计消耗3000000点金币"
@@ -263,6 +273,7 @@
     "key": 20011,
     "id_list": 11,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_11",
       "text": "本周累计消耗6000000点金币"
@@ -289,6 +300,7 @@
     "key": 20012,
     "id_list": 12,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_12",
       "text": "本周累计消耗10000000点金币"
@@ -315,6 +327,7 @@
     "key": 20013,
     "id_list": 13,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_13",
       "text": "本周累计装备副本消耗300体力"
@@ -341,6 +354,7 @@
     "key": 20014,
     "id_list": 14,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_14",
       "text": "本周累计装备副本消耗600体力"
@@ -367,6 +381,7 @@
     "key": 20015,
     "id_list": 15,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_15",
       "text": "本周累计装备副本消耗1000体力"
@@ -393,6 +408,7 @@
     "key": 20016,
     "id_list": 16,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_16",
       "text": "本周累计回响副本消耗300体力"
@@ -419,6 +435,7 @@
     "key": 20017,
     "id_list": 17,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_17",
       "text": "本周累计回响副本消耗600体力"
@@ -445,6 +462,7 @@
     "key": 20018,
     "id_list": 18,
     "id_tag": 2,
+    "open": "",
     "task_display": {
       "key": "task_task_round_task_display_18",
       "text": "本周累计回响副本消耗1000体力"
diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json
index 9a5d4e400..5ee548acf 100644
--- a/bin/json/game_worldall.json
+++ b/bin/json/game_worldall.json
@@ -444,5 +444,96 @@
       "text": ""
     },
     "reword": []
+  },
+  {
+    "id": 1270,
+    "name": {
+      "key": "worldtask_world_all_name_37",
+      "text": "日常测试27"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1280,
+    "name": {
+      "key": "worldtask_world_all_name_38",
+      "text": "日常测试28"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1290,
+    "name": {
+      "key": "worldtask_world_all_name_39",
+      "text": "日常测试29"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1300,
+    "name": {
+      "key": "worldtask_world_all_name_40",
+      "text": "日常测试30"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1310,
+    "name": {
+      "key": "worldtask_world_all_name_41",
+      "text": "日常测试31"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1320,
+    "name": {
+      "key": "worldtask_world_all_name_42",
+      "text": "日常测试32"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1330,
+    "name": {
+      "key": "worldtask_world_all_name_43",
+      "text": "日常测试33"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json
index 874cd654a..4e98f5615 100644
--- a/bin/json/game_worldbattle.json
+++ b/bin/json/game_worldbattle.json
@@ -376,5 +376,89 @@
       "n": 0
     },
     "carexe": 500
+  },
+  {
+    "id": 501,
+    "FormatList": [
+      700011
+    ],
+    "BattleReadyID": 126,
+    "EventList": [],
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 0
+    },
+    "carexe": 500
+  },
+  {
+    "id": 502,
+    "FormatList": [
+      700011
+    ],
+    "BattleReadyID": 126,
+    "EventList": [],
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 0
+    },
+    "carexe": 500
+  },
+  {
+    "id": 503,
+    "FormatList": [
+      700011
+    ],
+    "BattleReadyID": 126,
+    "EventList": [],
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 0
+    },
+    "carexe": 500
+  },
+  {
+    "id": 504,
+    "FormatList": [
+      700011
+    ],
+    "BattleReadyID": 126,
+    "EventList": [],
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 0
+    },
+    "carexe": 500
+  },
+  {
+    "id": 505,
+    "FormatList": [
+      700011
+    ],
+    "BattleReadyID": 126,
+    "EventList": [],
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 0
+    },
+    "carexe": 500
+  },
+  {
+    "id": 506,
+    "FormatList": [
+      700011
+    ],
+    "BattleReadyID": 126,
+    "EventList": [],
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 0
+    },
+    "carexe": 500
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_worldrd.json b/bin/json/game_worldrd.json
index 602d8ed9c..3f07a9bf5 100644
--- a/bin/json/game_worldrd.json
+++ b/bin/json/game_worldrd.json
@@ -89,7 +89,7 @@
       "key": "eventname_6",
       "text": "无事发生"
     },
-    "eventweight": 1000,
+    "eventweight": 40000,
     "eventtype": 0,
     "battleready": 0,
     "battleid": 0,
@@ -102,7 +102,7 @@
       "key": "eventname_7",
       "text": "打怪"
     },
-    "eventweight": 1000,
+    "eventweight": 30000,
     "eventtype": 1,
     "battleready": 126,
     "battleid": 101011,
@@ -111,37 +111,11 @@
   {
     "id": 8,
     "group": 1002,
-    "eventname": {
-      "key": "eventname_8",
-      "text": "打怪"
-    },
-    "eventweight": 1000,
-    "eventtype": 1,
-    "battleready": 126,
-    "battleid": 101011,
-    "getitem": []
-  },
-  {
-    "id": 9,
-    "group": 1002,
-    "eventname": {
-      "key": "eventname_9",
-      "text": "打怪"
-    },
-    "eventweight": 1000,
-    "eventtype": 1,
-    "battleready": 126,
-    "battleid": 101011,
-    "getitem": []
-  },
-  {
-    "id": 10,
-    "group": 1002,
     "eventname": {
       "key": "eventname_10",
       "text": "获取金币"
     },
-    "eventweight": 1000,
+    "eventweight": 10000,
     "eventtype": 2,
     "battleready": 0,
     "battleid": 0,
@@ -154,13 +128,13 @@
     ]
   },
   {
-    "id": 11,
+    "id": 9,
     "group": 1002,
     "eventname": {
       "key": "eventname_11",
       "text": "获取金币"
     },
-    "eventweight": 1000,
+    "eventweight": 10000,
     "eventtype": 2,
     "battleready": 0,
     "battleid": 0,
@@ -168,7 +142,7 @@
       {
         "a": "attr",
         "t": "gold",
-        "n": 20000
+        "n": 44004
       }
     ]
   }
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index d03b94a89..e4e7dfa0a 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -7252,5 +7252,889 @@
       }
     ],
     "module": []
+  },
+  {
+    "key": 100270,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 0,
+    "id_after": 0,
+    "group": 1270,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_163",
+      "text": "检查所有可疑点4"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_163",
+      "text": "检查所有可疑点4"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_163",
+      "text": "检查所有可疑点4"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60270,
+    "completetask": [
+      50000037
+    ],
+    "deliver_npc": 60278,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100280,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 0,
+    "id_after": 0,
+    "group": 1280,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_164",
+      "text": "检查所有可疑点5"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_164",
+      "text": "检查所有可疑点5"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_164",
+      "text": "检查所有可疑点5"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60280,
+    "completetask": [
+      50000038
+    ],
+    "deliver_npc": 60288,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100290,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 0,
+    "id_after": 100300,
+    "group": 1290,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_165",
+      "text": "1号连环第1个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_165",
+      "text": "1号连环第1个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_165",
+      "text": "1号连环第1个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60290,
+    "completetask": [
+      50000039
+    ],
+    "deliver_npc": 60298,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100300,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100290,
+    "id_after": 100310,
+    "group": 1290,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_166",
+      "text": "1号连环第2个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_166",
+      "text": "1号连环第2个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_166",
+      "text": "1号连环第2个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60300,
+    "completetask": [
+      50000040
+    ],
+    "deliver_npc": 60308,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100310,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100300,
+    "id_after": 0,
+    "group": 1290,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_167",
+      "text": "1号连环第3个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_167",
+      "text": "1号连环第3个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_167",
+      "text": "1号连环第3个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60310,
+    "completetask": [
+      50000041
+    ],
+    "deliver_npc": 60318,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100320,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 0,
+    "id_after": 100330,
+    "group": 1300,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_168",
+      "text": "2号连环第1个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_168",
+      "text": "2号连环第1个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_168",
+      "text": "2号连环第1个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60320,
+    "completetask": [
+      50000042
+    ],
+    "deliver_npc": 60328,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100330,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100320,
+    "id_after": 100340,
+    "group": 1300,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_169",
+      "text": "2号连环第2个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_169",
+      "text": "2号连环第2个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_169",
+      "text": "2号连环第2个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60330,
+    "completetask": [
+      50000043
+    ],
+    "deliver_npc": 60338,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100340,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100330,
+    "id_after": 0,
+    "group": 1300,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_170",
+      "text": "2号连环第3个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_170",
+      "text": "2号连环第3个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_170",
+      "text": "2号连环第3个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60340,
+    "completetask": [
+      50000044
+    ],
+    "deliver_npc": 60348,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100350,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 0,
+    "id_after": 100360,
+    "group": 1310,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_171",
+      "text": "3号连环第1个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_171",
+      "text": "3号连环第1个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_171",
+      "text": "3号连环第1个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60350,
+    "completetask": [
+      50000045
+    ],
+    "deliver_npc": 60358,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100360,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100350,
+    "id_after": 100370,
+    "group": 1310,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_172",
+      "text": "3号连环第2个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_172",
+      "text": "3号连环第2个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_172",
+      "text": "3号连环第2个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60360,
+    "completetask": [
+      50000046
+    ],
+    "deliver_npc": 60368,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100370,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100360,
+    "id_after": 0,
+    "group": 1310,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_173",
+      "text": "3号连环第3个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_173",
+      "text": "3号连环第3个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_173",
+      "text": "3号连环第3个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60370,
+    "completetask": [
+      50000047
+    ],
+    "deliver_npc": 60378,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100380,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 0,
+    "id_after": 100390,
+    "group": 1320,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_174",
+      "text": "4号连环第1个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_174",
+      "text": "4号连环第1个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_174",
+      "text": "4号连环第1个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60380,
+    "completetask": [
+      50000048
+    ],
+    "deliver_npc": 60388,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100390,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100380,
+    "id_after": 100400,
+    "group": 1320,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_175",
+      "text": "4号连环第2个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_175",
+      "text": "4号连环第2个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_175",
+      "text": "4号连环第2个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60390,
+    "completetask": [
+      50000049
+    ],
+    "deliver_npc": 60398,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100400,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100390,
+    "id_after": 0,
+    "group": 1320,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_176",
+      "text": "4号连环第3个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_176",
+      "text": "4号连环第3个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_176",
+      "text": "4号连环第3个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60400,
+    "completetask": [
+      50000050
+    ],
+    "deliver_npc": 60408,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100410,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 0,
+    "id_after": 100420,
+    "group": 1330,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_177",
+      "text": "5号连环第1个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_177",
+      "text": "5号连环第1个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_177",
+      "text": "5号连环第1个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60410,
+    "completetask": [
+      50000051
+    ],
+    "deliver_npc": 60418,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100420,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100410,
+    "id_after": 100430,
+    "group": 1330,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_178",
+      "text": "5号连环第2个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_178",
+      "text": "5号连环第2个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_178",
+      "text": "5号连环第2个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60420,
+    "completetask": [
+      50000052
+    ],
+    "deliver_npc": 60428,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 100430,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 100420,
+    "id_after": 0,
+    "group": 1330,
+    "exgroup": 110,
+    "des": 1,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_179",
+      "text": "5号连环第3个"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_179",
+      "text": "5号连环第3个"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_179",
+      "text": "5号连环第3个"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 60430,
+    "completetask": [
+      50000053
+    ],
+    "deliver_npc": 60438,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 5000
+      },
+      {
+        "a": "attr",
+        "t": "ps",
+        "n": 10
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ],
+    "module": []
   }
 ]
\ No newline at end of file
diff --git a/comm/const.go b/comm/const.go
index 71319bb59..7bd557741 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -99,6 +99,7 @@ const (
 	ModuleKFTask        core.M_Modules = "kftask"        //开服任务
 	ModuleHeroTask      core.M_Modules = "herotask"      //守护者任务
 	ModuleShopCenter    core.M_Modules = "shopcenter"    //购物中心
+	ModuleAddrecharge   core.M_Modules = "addrecharge"   //累充系统
 )
 
 // 数据表名定义处
@@ -476,6 +477,7 @@ const (
 	Talent3       = "talent3"       //阵营3天赋点
 	Talent4       = "talent4"       //阵营4天赋点
 	Merchantmoney = "merchantmoney" //商队虚拟币
+	Integral      = "integral"      //充值积分
 )
 const (
 	Gold    int32 = 1 //金币
diff --git a/comm/imodule.go b/comm/imodule.go
index 813a696d2..697ba98cf 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -621,4 +621,10 @@ type (
 		IActivityNotice
 		IPayDelivery
 	}
+	//累充接口
+	IAddrecharge interface {
+		IActivityNotice
+		//积分充值
+		RechargeIntegral(session IUserSession, integral int32)
+	}
 )
diff --git a/modules/addrecharge/api_Info.go b/modules/addrecharge/api_Info.go
index 658741784..ed18c9d48 100644
--- a/modules/addrecharge/api_Info.go
+++ b/modules/addrecharge/api_Info.go
@@ -6,25 +6,22 @@ import (
 )
 
 // 参数校验
-func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.KFTaskInfoReq) (errdata *pb.ErrorData) {
+func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.AddRechargeInfoReq) (errdata *pb.ErrorData) {
 
 	return
 }
 
 // /获取自己的排行榜信息
-func (this *apiComp) Info(session comm.IUserSession, req *pb.KFTaskInfoReq) (errdata *pb.ErrorData) {
+func (this *apiComp) Info(session comm.IUserSession, req *pb.AddRechargeInfoReq) (errdata *pb.ErrorData) {
 	var (
-		dtask    *pb.DBKFTask
-		tasks    map[int32]struct{}
-		condiIds []int32
-		progress []*pb.ConIProgress
-		err      error
+		info *pb.DBAddRecharge
+		err  error
 	)
 	if errdata = this.InfoCheck(session, req); errdata != nil {
 		return
 	}
 
-	if dtask, err = this.module.modelRecharge.getUserDTasks(session.GetUserId()); err != nil {
+	if info, err = this.module.modelRecharge.getUserDTasks(session.GetUserId()); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.ToString(),
@@ -32,16 +29,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.KFTaskInfoReq) (err
 		}
 		return
 	}
-	tasks = this.module.configure.gettasks()
-	condiIds = make([]int32, 0, len(tasks))
-	for k, _ := range tasks {
-		condiIds = append(condiIds, k)
-	}
 
-	if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
-		return
-	}
-
-	session.SendMsg(string(this.module.GetType()), "info", &pb.KFTaskInfoResp{Conlds: progress, Tasks: dtask.Tasks})
+	session.SendMsg(string(this.module.GetType()), "info", &pb.AddRechargeInfoResp{Record: info.Record})
 	return
 }
diff --git a/modules/addrecharge/api_receive.go b/modules/addrecharge/api_receive.go
index 234f0582e..c2e032065 100644
--- a/modules/addrecharge/api_receive.go
+++ b/modules/addrecharge/api_receive.go
@@ -4,32 +4,28 @@ import (
 	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
-	"go_dreamfactory/utils"
 )
 
 // 参数校验
-func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.KFTaskReceiveReq) (errdata *pb.ErrorData) {
+func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.AddRechargeReceiveReq) (errdata *pb.ErrorData) {
 
 	return
 }
 
 // /获取自己的排行榜信息
-func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq) (errdata *pb.ErrorData) {
+func (this *apiComp) Receive(session comm.IUserSession, req *pb.AddRechargeReceiveReq) (errdata *pb.ErrorData) {
 	var (
-		dtask    *pb.DBKFTask
-		conf     *cfg.GameVenturegiftsTaskData
-		user     *pb.DBUser
-		progress []*pb.ConIProgress
-		award    []*pb.UserAssets
-		err      error
+		info  *pb.DBAddRecharge
+		conf  *cfg.GameAccumulateData
+		award []*pb.UserAssets
+		err   error
 	)
 	if errdata = this.ReceiveCheck(session, req); errdata != nil {
 		return
 	}
 
-	if conf, err = this.module.configure.getGameVenturegiftsTask(req.Id); err != nil {
+	if conf, err = this.module.configure.getGameAccumulate(req.Id); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.ToString(),
@@ -37,7 +33,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq
 		}
 		return
 	}
-	if dtask, err = this.module.modelRecharge.getUserDTasks(session.GetUserId()); err != nil {
+	if info, err = this.module.modelRecharge.getUserDTasks(session.GetUserId()); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.ToString(),
@@ -46,7 +42,15 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq
 		return
 	}
 
-	if dtask.Tasks[req.Id] == 1 {
+	if info.Integral < conf.Integral {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ReqParameterError,
+			Title:   pb.ErrorCode_ReqParameterError.ToString(),
+			Message: "Integral no achieve",
+		}
+	}
+
+	if info.Record[req.Id] {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_ReqParameterError,
 			Title:   pb.ErrorCode_ReqParameterError.ToString(),
@@ -54,54 +58,22 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq
 		}
 		return
 	}
-	if user = this.module.ModuleUser.GetUser(session.GetUserId()); user == nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_DBError.ToString(),
-			Message: "no found user!",
-		}
-		return
-	}
-	days := utils.DiffDays(user.Ctime, configure.Now().Unix())
-	if days < int(conf.Openday) {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_DBError.ToString(),
-			Message: "no open",
-		}
-		return
-	}
 
-	if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Venturetask); err != nil {
-		return
-	}
-
-	for _, v := range progress {
-		if v.State == pb.BuriedItemFinishState_buried_unfinish {
-			errdata = &pb.ErrorData{
-				Code:    pb.ErrorCode_ReqParameterError,
-				Title:   pb.ErrorCode_ReqParameterError.ToString(),
-				Message: "task no finish",
-			}
-			return
-		}
-	}
-
-	if errdata = this.module.DispenseRes(session, conf.Venturereward, true); errdata != nil {
+	if errdata = this.module.DispenseRes(session, conf.Reward, true); errdata != nil {
 		return
 	}
 	award = make([]*pb.UserAssets, 0)
-	for _, v := range conf.Venturereward {
+	for _, v := range conf.Reward {
 		award = append(award, &pb.UserAssets{
 			A: v.A,
 			T: v.T,
 			N: v.N,
 		})
 	}
-	dtask.Tasks[req.Id] = 1
+	info.Record[req.Id] = true
 	this.module.modelRecharge.Change(session.GetUserId(), map[string]interface{}{
-		"tasks": dtask.Tasks,
+		"record": info.Record,
 	})
-	session.SendMsg(string(this.module.GetType()), "receive", &pb.KFTaskReceiveResp{Id: req.Id, Award: award})
+	session.SendMsg(string(this.module.GetType()), "receive", &pb.AddRechargeReceiveResp{Id: req.Id, Award: award})
 	return
 }
diff --git a/modules/addrecharge/configure.go b/modules/addrecharge/configure.go
index 8b8393171..8603894ce 100644
--- a/modules/addrecharge/configure.go
+++ b/modules/addrecharge/configure.go
@@ -4,79 +4,35 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/modules"
-	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
-	"sync"
 )
 
 const (
-	game_venturegiftstask = "game_venturegiftstask.json"
+	game_accumulate = "game_accumulate.json"
 )
 
 type configureComp struct {
 	modules.MCompConfigure
-	module     *AddRecharge
-	lock       sync.RWMutex
-	tasks      map[int32]struct{}
-	groupTasks map[int32][]*cfg.GameVenturegiftsTaskData //key 条件ID
+	module *AddRecharge
 }
 
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
 	err = this.MCompConfigure.Init(service, module, comp, options)
 	this.module = module.(*AddRecharge)
-	configure.RegisterConfigure(game_venturegiftstask, cfg.NewGameVenturegiftsTask, this.updateconfigure)
+	this.LoadConfigure(game_accumulate, cfg.NewGameAccumulate)
 	return
 }
 
-func (this *configureComp) gettasks() map[int32]struct{} {
-	this.lock.RLock()
-	defer this.lock.RUnlock()
-	return this.tasks
-}
-
-// 更新任务配置表
-func (this *configureComp) updateconfigure() {
-	var (
-		v    interface{}
-		conf *cfg.GameVenturegiftsTask
-		ok   bool
-		err  error
-	)
-	if v, err = this.GetConfigure(game_venturegiftstask); err != nil {
-		return
-	}
-	if conf, ok = v.(*cfg.GameVenturegiftsTask); !ok {
-		this.module.Error("日常任务配置异常!")
-		return
-	}
-	tasks := make(map[int32]struct{})
-	groupTasksConf := make(map[int32][]*cfg.GameVenturegiftsTaskData)
-
-	for _, v := range conf.GetDataList() {
-
-		if _, ok := groupTasksConf[v.Openday]; !ok {
-			groupTasksConf[v.Openday] = make([]*cfg.GameVenturegiftsTaskData, 0)
-		}
-		groupTasksConf[v.Openday] = append(groupTasksConf[v.Openday], v)
-		tasks[v.Venturetask] = struct{}{}
-	}
-
-	this.lock.Lock()
-	this.groupTasks = groupTasksConf
-	this.tasks = tasks
-	this.lock.Unlock()
-}
-
-func (this *configureComp) getGameVenturegiftsTask(id int32) (conf *cfg.GameVenturegiftsTaskData, err error) {
+func (this *configureComp) getGameAccumulate(id int32) (conf *cfg.GameAccumulateData, err error) {
 	var (
 		v  interface{}
 		ok bool
 	)
-	if v, err = this.GetConfigure(game_venturegiftstask); err != nil {
+	if v, err = this.GetConfigure(game_accumulate); err != nil {
 		return
 	}
-	if conf, ok = v.(*cfg.GameVenturegiftsTask).GetDataMap()[id]; !ok {
-		err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_venturegiftstask, id)
+	if conf, ok = v.(*cfg.GameAccumulate).GetDataMap()[id]; !ok {
+		err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_accumulate, id)
 		this.module.Errorln(err)
 		return
 	}
diff --git a/modules/addrecharge/modelRecharge.go b/modules/addrecharge/modelRecharge.go
index b764f6f9d..eaa849ba1 100644
--- a/modules/addrecharge/modelRecharge.go
+++ b/modules/addrecharge/modelRecharge.go
@@ -6,6 +6,7 @@ import (
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
+	"sync"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -15,6 +16,7 @@ import (
 type ModelRecharge struct {
 	modules.MCompModel
 	module *AddRecharge
+	lock   sync.RWMutex
 	open   bool
 }
 
@@ -29,19 +31,25 @@ func (this *ModelRecharge) Init(service core.IService, module core.IModule, comp
 }
 
 // 获取用户全部的埋点数据
-func (this *ModelRecharge) getUserDTasks(uid string) (results *pb.DBKFTask, err error) {
-	results = &pb.DBKFTask{}
+func (this *ModelRecharge) getUserDTasks(uid string) (results *pb.DBAddRecharge, err error) {
+	results = &pb.DBAddRecharge{}
 	if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil {
 		this.module.Errorln(err)
 		return
 	}
 	if err == mgo.MongodbNil {
-		results = &pb.DBKFTask{
-			Id:    primitive.NewObjectID().Hex(),
-			Uid:   uid,
-			Tasks: make(map[int32]int32),
+		results = &pb.DBAddRecharge{
+			Id:     primitive.NewObjectID().Hex(),
+			Uid:    uid,
+			Record: make(map[int32]bool),
 		}
 		err = this.Add(uid, results)
 	}
 	return
 }
+
+func (this *ModelRecharge) getopen() bool {
+	this.lock.RLock()
+	defer this.lock.RUnlock()
+	return this.open
+}
diff --git a/modules/addrecharge/module.go b/modules/addrecharge/module.go
index 9a6e06144..3af97f99c 100644
--- a/modules/addrecharge/module.go
+++ b/modules/addrecharge/module.go
@@ -23,7 +23,7 @@ func NewModule() core.IModule {
 }
 
 func (this *AddRecharge) GetType() core.M_Modules {
-	return comm.ModuleKFTask
+	return comm.ModuleAddrecharge
 }
 
 func (this *AddRecharge) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
@@ -60,6 +60,22 @@ func (this *AddRecharge) ActivityCloseNotice(hdlist *pb.DBHuodong) {
 }
 
 // 充值金额
-func (this *AddRecharge) Recharge(session comm.IUserSession, amount int32) {
-
+func (this *AddRecharge) RechargeIntegral(session comm.IUserSession, integral int32) {
+	var (
+		open bool
+		info *pb.DBAddRecharge
+		err  error
+	)
+	open = this.modelRecharge.getopen()
+	if !open {
+		return
+	}
+	if info, err = this.modelRecharge.getUserDTasks(session.GetUserId()); err != nil {
+		this.Errorln(err)
+		return
+	}
+	info.Integral += integral
+	this.modelRecharge.Change(session.GetUserId(), map[string]interface{}{
+		"integral": info.Integral,
+	})
 }
diff --git a/modules/pay/module.go b/modules/pay/module.go
index 44fb7db5d..a7a91ce5e 100644
--- a/modules/pay/module.go
+++ b/modules/pay/module.go
@@ -35,6 +35,7 @@ type Pay struct {
 	privilege     comm.IPayDelivery  //月卡
 	warorder      comm.IWarorder     //战令
 	shopcenter    comm.IPayDelivery  //购物中心
+	addrecharge   comm.IAddrecharge  //累充系统
 	configure     *configureComp
 }
 
@@ -64,6 +65,10 @@ func (this *Pay) Start() (err error) {
 		return
 	}
 	this.shopcenter = module.(comm.IPayDelivery)
+	if module, err = this.service.GetModule(comm.ModuleAddrecharge); err != nil {
+		return
+	}
+	this.addrecharge = module.(comm.IAddrecharge)
 	this.service.RegisterFunctionName(string(comm.Rpc_ModulePayDelivery), this.Rpc_ModulePayDelivery)
 	return
 }
@@ -106,6 +111,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery
 	} else {
 		res = conf.DiamondNumDouble
 	}
+	res = append(res, &cfg.Gameatn{A: comm.AttrType, T: comm.Integral, N: conf.Integral})
 	info.Record[args.Productid]++
 	defer func() {
 		this.PutUserSession(session)
@@ -167,6 +173,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery
 		}
 		break
 	}
+	this.addrecharge.RechargeIntegral(session, conf.Integral) //记录累充积分
 	for _, v := range res {
 		items = append(items, &pb.UserAssets{A: v.A, T: v.T, N: v.N})
 	}
@@ -182,6 +189,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery
 			return
 		}
 	}
+
 	go this.ModuleHero.RechargeMoney(args.Uid, args.Price)
 	return
 }
diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go
index 222ae7c11..f3eb21f15 100644
--- a/modules/shop/api_buy.go
+++ b/modules/shop/api_buy.go
@@ -214,6 +214,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata
 			case comm.Merchantmoney:
 				tasks = append(tasks, comm.GetBuriedParam(comm.Rtype67, v.N, 15))
 				break
+			case comm.Integral:
+				// tasks = append(tasks, comm.GetBuriedParam(comm.Rtype67, v.N, 15))
+				break
 			}
 			// this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T))
 		}
diff --git a/modules/user/module.go b/modules/user/module.go
index 55f5b9f53..df2c35438 100644
--- a/modules/user/module.go
+++ b/modules/user/module.go
@@ -369,6 +369,8 @@ func (this *User) QueryAttributeValue(uid string, attr string) (value int64) {
 		return int64(user.Talent4)
 	case comm.Merchantmoney:
 		return int64(user.Merchantmoney)
+	case comm.Integral:
+		return int64(user.Integral)
 	}
 	return
 }
@@ -426,6 +428,7 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
 		Talent3:       user.Talent3,
 		Talent4:       user.Talent4,
 		Merchantmoney: user.Merchantmoney,
+		Integral:      user.Integral,
 	}
 
 	switch attr {
@@ -610,6 +613,18 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
 			}
 		}
 		change.Merchantmoney += add
+	case comm.Integral:
+		if add < 0 {
+			if user.Integral+int64(add) < 0 {
+				errdata = &pb.ErrorData{
+					Code:  pb.ErrorCode_UserMerchantNoEnough,
+					Title: pb.ErrorCode_UserMerchantNoEnough.ToString(),
+				}
+
+				return
+			}
+		}
+		change.Integral += int64(add)
 	default:
 		err = errors.New(fmt.Sprintf("%s no supported", attr))
 		return
@@ -629,6 +644,7 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
 		comm.Talent3:       change.Talent3,
 		comm.Talent4:       change.Talent4,
 		comm.Merchantmoney: change.Merchantmoney,
+		comm.Integral:      change.Integral,
 	}
 
 	//user ex
diff --git a/pb/addrecharge_db.pb.go b/pb/addrecharge_db.pb.go
index 7bae7a457..9dec16595 100644
--- a/pb/addrecharge_db.pb.go
+++ b/pb/addrecharge_db.pb.go
@@ -29,7 +29,8 @@ type DBAddRecharge struct {
 	Id         string         `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`
 	Uid        string         `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
 	Activityid string         `protobuf:"bytes,3,opt,name=activityid,proto3" json:"activityid"`
-	Record     map[int32]bool `protobuf:"bytes,4,rep,name=record,proto3" json:"record" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	Integral   int32          `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"`
+	Record     map[int32]bool `protobuf:"bytes,5,rep,name=record,proto3" json:"record" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 }
 
 func (x *DBAddRecharge) Reset() {
@@ -85,6 +86,13 @@ func (x *DBAddRecharge) GetActivityid() string {
 	return ""
 }
 
+func (x *DBAddRecharge) GetIntegral() int32 {
+	if x != nil {
+		return x.Integral
+	}
+	return 0
+}
+
 func (x *DBAddRecharge) GetRecord() map[int32]bool {
 	if x != nil {
 		return x.Record
@@ -97,20 +105,22 @@ var File_addrecharge_addrecharge_db_proto protoreflect.FileDescriptor
 var file_addrecharge_addrecharge_db_proto_rawDesc = []byte{
 	0x0a, 0x20, 0x61, 0x64, 0x64, 0x72, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x2f, 0x61, 0x64,
 	0x64, 0x72, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0xc0, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x41, 0x64, 0x64, 0x52, 0x65, 0x63, 0x68,
+	0x74, 0x6f, 0x22, 0xdc, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x41, 0x64, 0x64, 0x52, 0x65, 0x63, 0x68,
 	0x61, 0x72, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
 	0x74, 0x79, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69,
-	0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x12, 0x32, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x41, 0x64, 0x64, 0x52, 0x65,
-	0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x61, 0x6c, 0x12, 0x32, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x41, 0x64, 0x64, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72,
+	0x67, 0x65, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06,
+	0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go
index 000e738bf..3ce949a44 100644
--- a/pb/user_db.pb.go
+++ b/pb/user_db.pb.go
@@ -155,6 +155,7 @@ type DBUser struct {
 	CaravanLv        int32    `protobuf:"varint,41,opt,name=caravanLv,proto3" json:"caravanLv"`                                       //@go_tags(`bson:"caravanlv"`)商队等级
 	Deposit          int64    `protobuf:"varint,42,opt,name=deposit,proto3" json:"deposit" bson:"deposit"`                            //储蓄
 	Profit           int64    `protobuf:"varint,43,opt,name=profit,proto3" json:"profit" bson:"profit"`                               //商队盈利
+	Integral         int64    `protobuf:"varint,44,opt,name=integral,proto3" json:"integral" bson:"integral"`                         //充值积分
 }
 
 func (x *DBUser) Reset() {
@@ -490,6 +491,13 @@ func (x *DBUser) GetProfit() int64 {
 	return 0
 }
 
+func (x *DBUser) GetIntegral() int64 {
+	if x != nil {
+		return x.Integral
+	}
+	return 0
+}
+
 type DBUserSetting struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -815,7 +823,7 @@ var file_user_user_db_proto_rawDesc = []byte{
 	0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e,
 	0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x1c,
 	0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xa6, 0x08, 0x0a,
+	0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xc2, 0x08, 0x0a,
 	0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69,
@@ -882,46 +890,47 @@ var file_user_user_db_proto_rawDesc = []byte{
 	0x6e, 0x4c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x18, 0x2a,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x12, 0x16, 0x0a,
 	0x06, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x18, 0x2b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x70,
-	0x72, 0x6f, 0x66, 0x69, 0x74, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72,
-	0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61,
-	0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68,
-	0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12,
-	0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77,
-	0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12,
-	0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
-	0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a,
-	0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75,
-	0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e,
-	0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75,
-	0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78,
-	0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
-	0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69,
-	0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22,
-	0xb8, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
-	0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
-	0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e,
-	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67,
-	0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03,
-	0x64, 0x61, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16,
-	0x0a, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06,
-	0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x0c, 0x44, 0x42,
-	0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x61,
-	0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x61, 0x6d,
-	0x65, 0x43, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x72, 0x6f, 0x66, 0x69, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x18, 0x2c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74,
+	0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a,
+	0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67,
+	0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x67,
+	0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d,
+	0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69,
+	0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61,
+	0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12,
+	0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
+	0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18,
+	0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a,
+	0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
+	0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73,
+	0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e,
+	0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22, 0xb8, 0x01, 0x0a, 0x06,
+	0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x69, 0x67, 0x6e,
+	0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e,
+	0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e,
+	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75,
+	0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75,
+	0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x75, 0x7a, 0x7a,
+	0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x0c, 0x44, 0x42, 0x52, 0x61, 0x6e, 0x64,
+	0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x63,
+	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6e, 0x12,
+	0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go
index 024a6ceb8..18edacbb5 100644
--- a/pb/user_msg.pb.go
+++ b/pb/user_msg.pb.go
@@ -623,6 +623,7 @@ type UserResChangedPush struct {
 	Talent3       int32 `protobuf:"varint,13,opt,name=talent3,proto3" json:"talent3" bson:"talent3"`                   //阵营3天赋点
 	Talent4       int32 `protobuf:"varint,14,opt,name=talent4,proto3" json:"talent4" bson:"talent4"`                   //阵营4天赋点
 	Merchantmoney int32 `protobuf:"varint,15,opt,name=merchantmoney,proto3" json:"merchantmoney" bson:"merchantmoney"` //商队虚拟币
+	Integral      int64 `protobuf:"varint,16,opt,name=integral,proto3" json:"integral" bson:"integral"`                //充值积分
 }
 
 func (x *UserResChangedPush) Reset() {
@@ -762,6 +763,13 @@ func (x *UserResChangedPush) GetMerchantmoney() int32 {
 	return 0
 }
 
+func (x *UserResChangedPush) GetIntegral() int64 {
+	if x != nil {
+		return x.Integral
+	}
+	return 0
+}
+
 // 玩家在其它终端登录的通知
 type UserOtherTermLoginPush struct {
 	state         protoimpl.MessageState
@@ -3362,7 +3370,7 @@ var file_user_user_msg_proto_rawDesc = []byte{
 	0x67, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75,
 	0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73,
-	0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x96, 0x03, 0x0a,
+	0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0xb2, 0x03, 0x0a,
 	0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50,
 	0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02,
@@ -3388,184 +3396,186 @@ var file_user_user_msg_proto_rawDesc = []byte{
 	0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x34, 0x12,
 	0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79,
 	0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74,
-	0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x22, 0x2a, 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68,
-	0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12,
-	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
-	0x64, 0x22, 0x23, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x50, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67,
-	0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65,
-	0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55,
-	0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69,
-	0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55,
-	0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
-	0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74,
-	0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a,
-	0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69,
-	0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72,
-	0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55,
-	0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63,
-	0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64,
-	0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73,
-	0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
-	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
-	0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61,
-	0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x70, 0x0a, 0x12, 0x55, 0x73, 0x65,
-	0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
-	0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x63,
-	0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f,
-	0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x31, 0x0a, 0x13, 0x55,
-	0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52,
-	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x44,
-	0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74,
-	0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74,
-	0x61, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74,
-	0x61, 0x72, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69,
-	0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x3b,
-	0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x55,
-	0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52,
-	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x44,
-	0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75,
-	0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75,
-	0x72, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75,
-	0x72, 0x65, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54,
-	0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72,
-	0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a,
-	0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07,
-	0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x22, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4c,
-	0x76, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03,
-	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10,
-	0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70,
-	0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76,
-	0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67,
-	0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x45,
-	0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f,
-	0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73,
-	0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22,
-	0x28, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65,
-	0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71,
-	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73,
-	0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70,
-	0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64,
-	0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
-	0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c,
-	0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d,
-	0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52,
-	0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b,
-	0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52,
-	0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74,
-	0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68,
-	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55,
-	0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65,
+	0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x22, 0x2a, 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65,
+	0x72, 0x6d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x23, 0x0a,
+	0x11, 0x55, 0x73, 0x65, 0x72, 0x50, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75,
+	0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
+	0x70, 0x73, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74,
+	0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47,
+	0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a,
+	0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
+	0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07,
+	0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12,
+	0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
+	0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65,
+	0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65,
 	0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77,
-	0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53,
-	0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68,
-	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55,
-	0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a,
-	0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43,
-	0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22,
-	0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65,
-	0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73,
-	0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61,
-	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69,
-	0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2b, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x22, 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65,
-	0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65,
-	0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x2b,
-	0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72,
-	0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x27, 0x0a, 0x11, 0x55,
-	0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 0x52, 0x65, 0x71,
-	0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x74, 0x69, 0x70, 0x73, 0x22, 0x31, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e,
-	0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67,
-	0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53,
-	0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e,
-	0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
-	0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x48, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72,
-	0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61,
-	0x74, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
-	0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73,
-	0x53, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75,
-	0x63, 0x63, 0x22, 0x63, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68,
-	0x44, 0x65, 0x66, 0x50, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72,
-	0x53, 0x6b, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53,
-	0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x22, 0x7c, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x53,
-	0x77, 0x69, 0x74, 0x63, 0x68, 0x44, 0x65, 0x66, 0x50, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b,
-	0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69,
-	0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x63, 0x75, 0x72, 0x42, 0x67, 0x22, 0x8e, 0x01, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x6b,
-	0x69, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b,
-	0x69, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73,
-	0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75,
-	0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63,
-	0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42,
-	0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x16,
-	0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x61,
-	0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x22, 0x40, 0x0a, 0x12, 0x55,
-	0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x10, 0x0a,
-	0x0e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22,
-	0x30, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74,
-	0x6e, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x64, 0x65, 0x70, 0x6f,
-	0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65,
-	0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03,
-	0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72,
-	0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x42, 0x06, 0x5a, 0x04, 0x2e,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69,
+	0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56,
+	0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63,
+	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22,
+	0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52,
+	0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
+	0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11,
+	0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65,
+	0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x70, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64,
+	0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a,
+	0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f,
+	0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64,
+	0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d,
+	0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a,
+	0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73,
+	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64,
+	0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67,
+	0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73,
+	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+	0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d,
+	0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a,
+	0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73,
+	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64,
+	0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61,
+	0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54,
+	0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72,
+	0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f,
+	0x69, 0x64, 0x73, 0x22, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, 0x61,
+	0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78,
+	0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02,
+	0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12,
+	0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75,
+	0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70,
+	0x4c, 0x76, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79,
+	0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x28, 0x0a, 0x12, 0x55,
+	0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74,
+	0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03,
+	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0,
+	0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63,
+	0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52,
+	0x02, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63,
+	0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61,
+	0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f,
+	0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74,
+	0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52,
+	0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31,
+	0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52,
+	0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
+	0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72,
+	0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53,
+	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
+	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+	0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d,
+	0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74,
+	0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72,
+	0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65,
+	0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65,
+	0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55,
+	0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07,
+	0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x16,
+	0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44,
+	0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65,
+	0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+	0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65,
+	0x71, 0x22, 0x2b, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2a,
+	0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72,
+	0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x2b, 0x0a, 0x13, 0x55, 0x73,
+	0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x43,
+	0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04,
+	0x74, 0x69, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73,
+	0x22, 0x31, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69,
+	0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64,
+	0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04,
+	0x61, 0x74, 0x6e, 0x6f, 0x22, 0x48, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c,
+	0x52, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74,
+	0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x63,
+	0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x44, 0x65, 0x66, 0x50,
+	0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12,
+	0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a,
+	0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75,
+	0x72, 0x42, 0x67, 0x22, 0x7c, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x53, 0x77, 0x69, 0x74, 0x63,
+	0x68, 0x44, 0x65, 0x66, 0x50, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
+	0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
+	0x75, 0x63, 0x63, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a,
+	0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63,
+	0x75, 0x72, 0x42, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42,
+	0x67, 0x22, 0x8e, 0x01, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x6c, 0x69,
+	0x73, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07,
+	0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63,
+	0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76,
+	0x61, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74,
+	0x61, 0x72, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d,
+	0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x22, 0x40, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52,
+	0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65,
+	0x72, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a, 0x0f, 0x55,
+	0x73, 0x65, 0x72, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d,
+	0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
+	0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x22, 0x13, 0x0a,
+	0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52,
+	0x65, 0x71, 0x22, 0x33, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x64, 0x65, 0x70,
+	0x6f, 0x73, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65,
+	0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/sys/configure/structs/Game.Accumulate.go b/sys/configure/structs/Game.Accumulate.go
new file mode 100644
index 000000000..759cd25de
--- /dev/null
+++ b/sys/configure/structs/Game.Accumulate.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameAccumulate struct {
+    _dataMap map[int32]*GameAccumulateData
+    _dataList []*GameAccumulateData
+}
+
+func NewGameAccumulate(_buf []map[string]interface{}) (*GameAccumulate, error) {
+	_dataList := make([]*GameAccumulateData, 0, len(_buf))
+	dataMap := make(map[int32]*GameAccumulateData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameAccumulateData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Integral] = _v
+		}
+	}
+	return &GameAccumulate{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameAccumulate) GetDataMap() map[int32]*GameAccumulateData {
+    return table._dataMap
+}
+
+func (table *GameAccumulate) GetDataList() []*GameAccumulateData {
+    return table._dataList
+}
+
+func (table *GameAccumulate) Get(key int32) *GameAccumulateData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.AccumulateData.go b/sys/configure/structs/Game.AccumulateData.go
new file mode 100644
index 000000000..4455c12c3
--- /dev/null
+++ b/sys/configure/structs/Game.AccumulateData.go
@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameAccumulateData struct {
+    Integral int32
+    Reward []*Gameatn
+}
+
+const TypeId_GameAccumulateData = 242378152
+
+func (*GameAccumulateData) GetTypeId() int32 {
+    return 242378152
+}
+
+func (_v *GameAccumulateData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["integral"].(float64); !_ok_ { err = errors.New("integral error"); return }; _v.Integral = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
+
+                _v.Reward = make([]*Gameatn, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ *Gameatn
+                    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+                    _v.Reward = append(_v.Reward, _list_v_)
+                }
+            }
+
+    return
+}
+
+func DeserializeGameAccumulateData(_buf map[string]interface{}) (*GameAccumulateData, error) {
+    v := &GameAccumulateData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go
index a5ade2ebe..b7944e41f 100644
--- a/sys/configure/structs/Game.BuffType.go
+++ b/sys/configure/structs/Game.BuffType.go
@@ -95,4 +95,5 @@ const (
     GameBuffType_BE_CRIT_ADD_THIS_TIME_DMG = 83
     GameBuffType_EFFMUSTHIT = 84
     GameBuffType_PROPERTY_LOW_ADD_DMG = 85
+    GameBuffType_REPLACE_BUFF = 86
 )
diff --git a/sys/configure/structs/Game.CaravanThingData.go b/sys/configure/structs/Game.CaravanThingData.go
index 4f6a6ed13..a43cca6fd 100644
--- a/sys/configure/structs/Game.CaravanThingData.go
+++ b/sys/configure/structs/Game.CaravanThingData.go
@@ -14,6 +14,7 @@ type GameCaravanThingData struct {
     Itemid string
     Goodsprice int32
     Changeperiod []int32
+    Changetime int32
     PriceChangeWeight []int32
     PriceChangeWeightOne []int32
     PriceChangeWeightTwo []int32
@@ -48,6 +49,7 @@ func (_v *GameCaravanThingData)Deserialize(_buf map[string]interface{}) (err err
                 }
             }
 
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["changetime"].(float64); !_ok_ { err = errors.New("changetime error"); return }; _v.Changetime = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool
diff --git a/sys/configure/structs/Game.FightEventType.go b/sys/configure/structs/Game.FightEventType.go
index 182404e5b..b016b1e6d 100644
--- a/sys/configure/structs/Game.FightEventType.go
+++ b/sys/configure/structs/Game.FightEventType.go
@@ -38,4 +38,7 @@ const (
     GameFightEventType_OnWaitInputSkill = 26
     GameFightEventType_OnBuffOverlayNumChange = 27
     GameFightEventType_OnCleanSkillExecute = 28
+    GameFightEventType_OnStealBuffEnd = 29
+    GameFightEventType_OnRebirthEnd = 30
+    GameFightEventType_OnShiftBuffEnd = 31
 )
diff --git a/sys/configure/structs/Game.GuidanceData.go b/sys/configure/structs/Game.GuidanceData.go
index bb198b667..9e3ec5f6c 100644
--- a/sys/configure/structs/Game.GuidanceData.go
+++ b/sys/configure/structs/Game.GuidanceData.go
@@ -16,6 +16,7 @@ type GameGuidanceData struct {
     Jumpid int32
     Index int32
     Intr string
+    Opencondid string
 }
 
 const TypeId_GameGuidanceData = 593350558
@@ -30,6 +31,7 @@ func (_v *GameGuidanceData)Deserialize(_buf map[string]interface{}) (err error)
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpid"].(float64); !_ok_ { err = errors.New("jumpid error"); return }; _v.Jumpid = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; if _v.Opencondid, _ok_ = _buf["opencondid"].(string); !_ok_ { err = errors.New("opencondid error"); return } }
     return
 }
 
diff --git a/sys/configure/structs/Game.RechargeData.go b/sys/configure/structs/Game.RechargeData.go
index 5c399ca96..5655fda4d 100644
--- a/sys/configure/structs/Game.RechargeData.go
+++ b/sys/configure/structs/Game.RechargeData.go
@@ -22,6 +22,7 @@ type GameRechargeData struct {
     Text string
     Show string
     Image string
+    Integral int32
 }
 
 const TypeId_GameRechargeData = -1686494355
@@ -68,6 +69,7 @@ func (_v *GameRechargeData)Deserialize(_buf map[string]interface{}) (err error)
     { var _ok_ bool; if _v.Text, _ok_ = _buf["text"].(string); !_ok_ { err = errors.New("text error"); return } }
     { var _ok_ bool; if _v.Show, _ok_ = _buf["show"].(string); !_ok_ { err = errors.New("show error"); return } }
     { var _ok_ bool; if _v.Image, _ok_ = _buf["image"].(string); !_ok_ { err = errors.New("image error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["integral"].(float64); !_ok_ { err = errors.New("integral error"); return }; _v.Integral = int32(_tempNum_) }
     return
 }
 
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index e010249d2..10a4a9d4e 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -226,6 +226,7 @@ type Tables struct {
     ShopCenterControl *GameShopCenterControl
     ShopCenterSubmeter *GameShopCenterSubmeter
     ShopCenterFund *GameShopCenterFund
+    Accumulate *GameAccumulate
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1523,5 +1524,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.ShopCenterFund, err = NewGameShopCenterFund(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_accumulate") ; err != nil {
+        return nil, err
+    }
+    if tables.Accumulate, err = NewGameAccumulate(buf) ; err != nil {
+        return nil, err
+    }
     return tables, nil
 }
diff --git a/sys/configure/structs/game.taskRoundData.go b/sys/configure/structs/game.taskRoundData.go
index 98a3c6118..116018e14 100644
--- a/sys/configure/structs/game.taskRoundData.go
+++ b/sys/configure/structs/game.taskRoundData.go
@@ -14,6 +14,7 @@ type GameTaskRoundData struct {
     Key int32
     IdList int32
     IdTag int32
+    Open string
     TaskDisplay string
     TypeId int32
     Active int32
@@ -33,6 +34,7 @@ func (_v *GameTaskRoundData)Deserialize(_buf map[string]interface{}) (err error)
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_list"].(float64); !_ok_ { err = errors.New("id_list error"); return }; _v.IdList = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_tag"].(float64); !_ok_ { err = errors.New("id_tag error"); return }; _v.IdTag = int32(_tempNum_) }
+    { var _ok_ bool; if _v.Open, _ok_ = _buf["open"].(string); !_ok_ { err = errors.New("open error"); return } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskDisplay error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type_id"].(float64); !_ok_ { err = errors.New("type_id error"); return }; _v.TypeId = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["active"].(float64); !_ok_ { err = errors.New("active error"); return }; _v.Active = int32(_tempNum_) }