From 589f438106559509e29286c690e78e22b91d2812 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Mon, 26 Dec 2022 14:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_rdtaskcondi.json                | 802 +-----------------
 bin/json/game_worldtask.json                  |  24 +-
 modules/rtask/model_record.go                 |  54 --
 modules/user/api_login.go                     |   2 -
 sys/configure/structs/Game.RdtaskCondiData.go |  17 -
 5 files changed, 37 insertions(+), 862 deletions(-)

diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index ef310f845..3dfbdfc0f 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -1,75 +1,61 @@
 [
   {
     "id": 101,
-    "datatype": 2,
     "type": 1,
-    "inited": [],
-    "data1": 25001,
-    "data2": 0,
+    "data1": 1,
+    "data2": 25001,
     "data3": 0,
     "data4": 0,
     "data5": 0
   },
   {
     "id": 102,
-    "datatype": 2,
     "type": 2,
-    "inited": [],
-    "data1": 3,
-    "data2": 0,
+    "data1": 1,
+    "data2": 3,
     "data3": 0,
     "data4": 0,
     "data5": 0
   },
   {
     "id": 103,
-    "datatype": 2,
     "type": 3,
-    "inited": [],
-    "data1": 2,
-    "data2": 0,
-    "data3": 0,
-    "data4": 0,
-    "data5": 0
-  },
-  {
-    "id": 104,
-    "datatype": 2,
-    "type": 4,
-    "inited": [],
-    "data1": 14007,
-    "data2": 10,
-    "data3": 0,
-    "data4": 0,
-    "data5": 0
-  },
-  {
-    "id": 105,
-    "datatype": 2,
-    "type": 5,
-    "inited": [],
-    "data1": 25001,
+    "data1": 1,
     "data2": 2,
     "data3": 0,
     "data4": 0,
     "data5": 0
   },
+  {
+    "id": 104,
+    "type": 4,
+    "data1": 10,
+    "data2": 14007,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
+  {
+    "id": 105,
+    "type": 5,
+    "data1": 2,
+    "data2": 25001,
+    "data3": 0,
+    "data4": 0,
+    "data5": 0
+  },
   {
     "id": 106,
-    "datatype": 2,
     "type": 6,
-    "inited": [],
-    "data1": 25004,
-    "data2": 5,
+    "data1": 5,
+    "data2": 25004,
     "data3": 0,
     "data4": 0,
     "data5": 0
   },
   {
     "id": 107,
-    "datatype": 2,
     "type": 7,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -78,9 +64,7 @@
   },
   {
     "id": 108,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -89,9 +73,7 @@
   },
   {
     "id": 109,
-    "datatype": 2,
     "type": 9,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -100,9 +82,7 @@
   },
   {
     "id": 110,
-    "datatype": 2,
     "type": 10,
-    "inited": [],
     "data1": 2,
     "data2": 0,
     "data3": 0,
@@ -111,9 +91,7 @@
   },
   {
     "id": 111,
-    "datatype": 2,
     "type": 11,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -122,9 +100,7 @@
   },
   {
     "id": 112,
-    "datatype": 2,
     "type": 12,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -133,9 +109,7 @@
   },
   {
     "id": 113,
-    "datatype": 2,
     "type": 13,
-    "inited": [],
     "data1": 2,
     "data2": 0,
     "data3": 0,
@@ -144,15 +118,7 @@
   },
   {
     "id": 114,
-    "datatype": 2,
     "type": 14,
-    "inited": [
-      1,
-      -1,
-      -1,
-      -1,
-      -1
-    ],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -161,15 +127,7 @@
   },
   {
     "id": 115,
-    "datatype": 2,
     "type": 15,
-    "inited": [
-      1,
-      -1,
-      -1,
-      -1,
-      -1
-    ],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -178,15 +136,7 @@
   },
   {
     "id": 116,
-    "datatype": 2,
     "type": 16,
-    "inited": [
-      1,
-      0,
-      -1,
-      -1,
-      -1
-    ],
     "data1": 5,
     "data2": 3,
     "data3": 0,
@@ -195,15 +145,7 @@
   },
   {
     "id": 117,
-    "datatype": 2,
     "type": 17,
-    "inited": [
-      1,
-      0,
-      -1,
-      -1,
-      -1
-    ],
     "data1": 1,
     "data2": 3,
     "data3": 0,
@@ -212,15 +154,7 @@
   },
   {
     "id": 118,
-    "datatype": 2,
     "type": 18,
-    "inited": [
-      1,
-      -1,
-      -1,
-      -1,
-      -1
-    ],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -229,15 +163,7 @@
   },
   {
     "id": 119,
-    "datatype": 2,
     "type": 19,
-    "inited": [
-      1,
-      -1,
-      -1,
-      -1,
-      -1
-    ],
     "data1": 2,
     "data2": 0,
     "data3": 0,
@@ -246,9 +172,7 @@
   },
   {
     "id": 120,
-    "datatype": 2,
     "type": 20,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -257,15 +181,7 @@
   },
   {
     "id": 121,
-    "datatype": 2,
     "type": 21,
-    "inited": [
-      1,
-      -1,
-      -1,
-      -1,
-      -1
-    ],
     "data1": 2,
     "data2": 0,
     "data3": 0,
@@ -274,15 +190,7 @@
   },
   {
     "id": 122,
-    "datatype": 2,
     "type": 22,
-    "inited": [
-      1,
-      -1,
-      -1,
-      -1,
-      -1
-    ],
     "data1": 25001,
     "data2": 0,
     "data3": 0,
@@ -291,15 +199,7 @@
   },
   {
     "id": 123,
-    "datatype": 2,
     "type": 23,
-    "inited": [
-      1,
-      0,
-      0,
-      -1,
-      -1
-    ],
     "data1": 3,
     "data2": 5,
     "data3": 20,
@@ -308,9 +208,7 @@
   },
   {
     "id": 124,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 4,
     "data2": 0,
     "data3": 0,
@@ -319,9 +217,7 @@
   },
   {
     "id": 125,
-    "datatype": 2,
     "type": 25,
-    "inited": [],
     "data1": 3,
     "data2": 25001,
     "data3": 6,
@@ -330,9 +226,7 @@
   },
   {
     "id": 126,
-    "datatype": 2,
     "type": 26,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -341,9 +235,7 @@
   },
   {
     "id": 127,
-    "datatype": 2,
     "type": 27,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -352,9 +244,7 @@
   },
   {
     "id": 128,
-    "datatype": 2,
     "type": 28,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -363,9 +253,7 @@
   },
   {
     "id": 129,
-    "datatype": 2,
     "type": 29,
-    "inited": [],
     "data1": 2,
     "data2": 22,
     "data3": 25004,
@@ -374,9 +262,7 @@
   },
   {
     "id": 130,
-    "datatype": 2,
     "type": 30,
-    "inited": [],
     "data1": 5,
     "data2": 3,
     "data3": 0,
@@ -385,9 +271,7 @@
   },
   {
     "id": 131,
-    "datatype": 2,
     "type": 31,
-    "inited": [],
     "data1": 4,
     "data2": 3,
     "data3": 0,
@@ -396,9 +280,7 @@
   },
   {
     "id": 132,
-    "datatype": 2,
     "type": 32,
-    "inited": [],
     "data1": 3,
     "data2": 3,
     "data3": 20,
@@ -407,9 +289,7 @@
   },
   {
     "id": 133,
-    "datatype": 2,
     "type": 33,
-    "inited": [],
     "data1": 3,
     "data2": 3,
     "data3": 23,
@@ -418,9 +298,7 @@
   },
   {
     "id": 134,
-    "datatype": 2,
     "type": 34,
-    "inited": [],
     "data1": 5,
     "data2": 2,
     "data3": 0,
@@ -429,9 +307,7 @@
   },
   {
     "id": 135,
-    "datatype": 2,
     "type": 35,
-    "inited": [],
     "data1": 2,
     "data2": 25001,
     "data3": 0,
@@ -440,9 +316,7 @@
   },
   {
     "id": 136,
-    "datatype": 2,
     "type": 36,
-    "inited": [],
     "data1": 1,
     "data2": 3,
     "data3": 3,
@@ -451,9 +325,7 @@
   },
   {
     "id": 137,
-    "datatype": 2,
     "type": 37,
-    "inited": [],
     "data1": 1,
     "data2": 3,
     "data3": 0,
@@ -462,9 +334,7 @@
   },
   {
     "id": 138,
-    "datatype": 2,
     "type": 38,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -473,9 +343,7 @@
   },
   {
     "id": 139,
-    "datatype": 2,
     "type": 39,
-    "inited": [],
     "data1": 2,
     "data2": 0,
     "data3": 0,
@@ -484,9 +352,7 @@
   },
   {
     "id": 140,
-    "datatype": 2,
     "type": 40,
-    "inited": [],
     "data1": 2,
     "data2": 2,
     "data3": 0,
@@ -495,9 +361,7 @@
   },
   {
     "id": 141,
-    "datatype": 2,
     "type": 41,
-    "inited": [],
     "data1": 2,
     "data2": 2,
     "data3": 1,
@@ -506,9 +370,7 @@
   },
   {
     "id": 142,
-    "datatype": 2,
     "type": 42,
-    "inited": [],
     "data1": 2,
     "data2": 2,
     "data3": 2,
@@ -517,9 +379,7 @@
   },
   {
     "id": 143,
-    "datatype": 2,
     "type": 43,
-    "inited": [],
     "data1": 2,
     "data2": 2,
     "data3": 0,
@@ -528,9 +388,7 @@
   },
   {
     "id": 144,
-    "datatype": 2,
     "type": 44,
-    "inited": [],
     "data1": 3,
     "data2": 0,
     "data3": 0,
@@ -539,9 +397,7 @@
   },
   {
     "id": 145,
-    "datatype": 2,
     "type": 45,
-    "inited": [],
     "data1": 2,
     "data2": 1,
     "data3": 1,
@@ -550,9 +406,7 @@
   },
   {
     "id": 146,
-    "datatype": 2,
     "type": 46,
-    "inited": [],
     "data1": 1,
     "data2": 4,
     "data3": 1,
@@ -561,9 +415,7 @@
   },
   {
     "id": 147,
-    "datatype": 2,
     "type": 47,
-    "inited": [],
     "data1": 2,
     "data2": 0,
     "data3": 0,
@@ -572,9 +424,7 @@
   },
   {
     "id": 148,
-    "datatype": 2,
     "type": 48,
-    "inited": [],
     "data1": 1,
     "data2": 1,
     "data3": 2,
@@ -583,9 +433,7 @@
   },
   {
     "id": 149,
-    "datatype": 2,
     "type": 49,
-    "inited": [],
     "data1": 1,
     "data2": 1,
     "data3": 2,
@@ -594,9 +442,7 @@
   },
   {
     "id": 150,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 1,
     "data2": 1,
     "data3": 0,
@@ -605,9 +451,7 @@
   },
   {
     "id": 151,
-    "datatype": 2,
     "type": 51,
-    "inited": [],
     "data1": 1,
     "data2": 1,
     "data3": 0,
@@ -616,9 +460,7 @@
   },
   {
     "id": 152,
-    "datatype": 2,
     "type": 52,
-    "inited": [],
     "data1": 1,
     "data2": 14007,
     "data3": 0,
@@ -627,9 +469,7 @@
   },
   {
     "id": 153,
-    "datatype": 2,
     "type": 53,
-    "inited": [],
     "data1": 2,
     "data2": 0,
     "data3": 0,
@@ -638,9 +478,7 @@
   },
   {
     "id": 154,
-    "datatype": 2,
     "type": 54,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -649,9 +487,7 @@
   },
   {
     "id": 155,
-    "datatype": 2,
     "type": 55,
-    "inited": [],
     "data1": 2,
     "data2": 3,
     "data3": 0,
@@ -660,9 +496,7 @@
   },
   {
     "id": 156,
-    "datatype": 2,
     "type": 56,
-    "inited": [],
     "data1": 1,
     "data2": 1,
     "data3": 2,
@@ -671,9 +505,7 @@
   },
   {
     "id": 157,
-    "datatype": 2,
     "type": 57,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -682,9 +514,7 @@
   },
   {
     "id": 158,
-    "datatype": 2,
     "type": 58,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -693,9 +523,7 @@
   },
   {
     "id": 159,
-    "datatype": 2,
     "type": 59,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -704,9 +532,7 @@
   },
   {
     "id": 160,
-    "datatype": 2,
     "type": 60,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -715,9 +541,7 @@
   },
   {
     "id": 161,
-    "datatype": 2,
     "type": 61,
-    "inited": [],
     "data1": 109,
     "data2": 0,
     "data3": 0,
@@ -726,9 +550,7 @@
   },
   {
     "id": 162,
-    "datatype": 2,
     "type": 62,
-    "inited": [],
     "data1": 2,
     "data2": 0,
     "data3": 0,
@@ -737,9 +559,7 @@
   },
   {
     "id": 163,
-    "datatype": 2,
     "type": 63,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -748,9 +568,7 @@
   },
   {
     "id": 164,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 2,
     "data2": 0,
     "data3": 0,
@@ -759,9 +577,7 @@
   },
   {
     "id": 165,
-    "datatype": 2,
     "type": 65,
-    "inited": [],
     "data1": 2,
     "data2": 10001,
     "data3": 0,
@@ -770,9 +586,7 @@
   },
   {
     "id": 166,
-    "datatype": 2,
     "type": 66,
-    "inited": [],
     "data1": 2,
     "data2": 1,
     "data3": 0,
@@ -781,9 +595,7 @@
   },
   {
     "id": 167,
-    "datatype": 2,
     "type": 67,
-    "inited": [],
     "data1": 1000,
     "data2": 1,
     "data3": 0,
@@ -792,9 +604,7 @@
   },
   {
     "id": 168,
-    "datatype": 2,
     "type": 68,
-    "inited": [],
     "data1": 1000,
     "data2": 1,
     "data3": 0,
@@ -803,9 +613,7 @@
   },
   {
     "id": 169,
-    "datatype": 2,
     "type": 69,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -814,9 +622,7 @@
   },
   {
     "id": 170,
-    "datatype": 2,
     "type": 1,
-    "inited": [],
     "data1": 44006,
     "data2": 0,
     "data3": 0,
@@ -825,9 +631,7 @@
   },
   {
     "id": 171,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 101,
     "data3": 0,
@@ -836,9 +640,7 @@
   },
   {
     "id": 172,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -847,9 +649,7 @@
   },
   {
     "id": 173,
-    "datatype": 2,
     "type": 72,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -858,9 +658,7 @@
   },
   {
     "id": 174,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 101,
     "data3": 0,
@@ -869,9 +667,7 @@
   },
   {
     "id": 175,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 102,
     "data3": 0,
@@ -880,9 +676,7 @@
   },
   {
     "id": 176,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 103,
     "data3": 0,
@@ -891,9 +685,7 @@
   },
   {
     "id": 177,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 104,
     "data3": 0,
@@ -902,9 +694,7 @@
   },
   {
     "id": 178,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 105,
     "data3": 0,
@@ -913,9 +703,7 @@
   },
   {
     "id": 179,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 106,
     "data3": 0,
@@ -924,9 +712,7 @@
   },
   {
     "id": 180,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 107,
     "data3": 0,
@@ -935,9 +721,7 @@
   },
   {
     "id": 181,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 108,
     "data3": 0,
@@ -946,9 +730,7 @@
   },
   {
     "id": 182,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 109,
     "data3": 0,
@@ -957,9 +739,7 @@
   },
   {
     "id": 183,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10001,
     "data3": 0,
@@ -968,9 +748,7 @@
   },
   {
     "id": 184,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10002,
     "data3": 0,
@@ -979,9 +757,7 @@
   },
   {
     "id": 185,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10003,
     "data3": 0,
@@ -990,9 +766,7 @@
   },
   {
     "id": 186,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10004,
     "data3": 0,
@@ -1001,9 +775,7 @@
   },
   {
     "id": 187,
-    "datatype": 2,
     "type": 109,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1012,9 +784,7 @@
   },
   {
     "id": 188,
-    "datatype": 2,
     "type": 104,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -1023,9 +793,7 @@
   },
   {
     "id": 189,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 110,
     "data3": 0,
@@ -1034,9 +802,7 @@
   },
   {
     "id": 190,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 111,
     "data3": 1,
@@ -1045,9 +811,7 @@
   },
   {
     "id": 191,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 112,
     "data3": 2,
@@ -1056,9 +820,7 @@
   },
   {
     "id": 192,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 113,
     "data3": 3,
@@ -1067,9 +829,7 @@
   },
   {
     "id": 193,
-    "datatype": 2,
     "type": 70,
-    "inited": [],
     "data1": 1,
     "data2": 114,
     "data3": 4,
@@ -1078,9 +838,7 @@
   },
   {
     "id": 195,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10005,
     "data3": 0,
@@ -1089,9 +847,7 @@
   },
   {
     "id": 196,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10006,
     "data3": 0,
@@ -1100,9 +856,7 @@
   },
   {
     "id": 197,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10007,
     "data3": 0,
@@ -1111,9 +865,7 @@
   },
   {
     "id": 198,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10008,
     "data3": 0,
@@ -1122,9 +874,7 @@
   },
   {
     "id": 199,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10009,
     "data3": 0,
@@ -1133,9 +883,7 @@
   },
   {
     "id": 200,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10010,
     "data3": 0,
@@ -1144,9 +892,7 @@
   },
   {
     "id": 201,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10007,
     "data3": 0,
@@ -1155,9 +901,7 @@
   },
   {
     "id": 202,
-    "datatype": 2,
     "type": 140,
-    "inited": [],
     "data1": 1,
     "data2": 10007,
     "data3": 0,
@@ -1166,9 +910,7 @@
   },
   {
     "id": 10001,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1177,9 +919,7 @@
   },
   {
     "id": 10002,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -1188,9 +928,7 @@
   },
   {
     "id": 10003,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -1199,9 +937,7 @@
   },
   {
     "id": 10004,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -1210,9 +946,7 @@
   },
   {
     "id": 10005,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -1221,9 +955,7 @@
   },
   {
     "id": 10006,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -1232,9 +964,7 @@
   },
   {
     "id": 10007,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 200,
     "data2": 0,
     "data3": 0,
@@ -1243,9 +973,7 @@
   },
   {
     "id": 10008,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -1254,9 +982,7 @@
   },
   {
     "id": 10009,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -1265,9 +991,7 @@
   },
   {
     "id": 10010,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -1276,9 +1000,7 @@
   },
   {
     "id": 10101,
-    "datatype": 2,
     "type": 7,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1287,9 +1009,7 @@
   },
   {
     "id": 10201,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1298,9 +1018,7 @@
   },
   {
     "id": 10202,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -1309,9 +1027,7 @@
   },
   {
     "id": 10203,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -1320,9 +1036,7 @@
   },
   {
     "id": 10204,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -1331,9 +1045,7 @@
   },
   {
     "id": 10205,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -1342,9 +1054,7 @@
   },
   {
     "id": 10206,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -1353,9 +1063,7 @@
   },
   {
     "id": 10207,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 200,
     "data2": 0,
     "data3": 0,
@@ -1364,9 +1072,7 @@
   },
   {
     "id": 10208,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -1375,9 +1081,7 @@
   },
   {
     "id": 10209,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -1386,9 +1090,7 @@
   },
   {
     "id": 10210,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -1397,9 +1099,7 @@
   },
   {
     "id": 10301,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 1,
     "data2": 5,
     "data3": 0,
@@ -1408,9 +1108,7 @@
   },
   {
     "id": 10302,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 5,
     "data2": 5,
     "data3": 0,
@@ -1419,9 +1117,7 @@
   },
   {
     "id": 10303,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 10,
     "data2": 5,
     "data3": 0,
@@ -1430,9 +1126,7 @@
   },
   {
     "id": 10304,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 20,
     "data2": 5,
     "data3": 0,
@@ -1441,9 +1135,7 @@
   },
   {
     "id": 10305,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 50,
     "data2": 5,
     "data3": 0,
@@ -1452,9 +1144,7 @@
   },
   {
     "id": 10306,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 100,
     "data2": 5,
     "data3": 0,
@@ -1463,9 +1153,7 @@
   },
   {
     "id": 10307,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 200,
     "data2": 5,
     "data3": 0,
@@ -1474,9 +1162,7 @@
   },
   {
     "id": 10308,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 300,
     "data2": 5,
     "data3": 0,
@@ -1485,9 +1171,7 @@
   },
   {
     "id": 10309,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 500,
     "data2": 5,
     "data3": 0,
@@ -1496,9 +1180,7 @@
   },
   {
     "id": 10310,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 1000,
     "data2": 5,
     "data3": 0,
@@ -1507,9 +1189,7 @@
   },
   {
     "id": 10401,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 1,
     "data2": 6,
     "data3": 0,
@@ -1518,9 +1198,7 @@
   },
   {
     "id": 10402,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 5,
     "data2": 6,
     "data3": 0,
@@ -1529,9 +1207,7 @@
   },
   {
     "id": 10403,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 10,
     "data2": 6,
     "data3": 0,
@@ -1540,9 +1216,7 @@
   },
   {
     "id": 10404,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 20,
     "data2": 6,
     "data3": 0,
@@ -1551,9 +1225,7 @@
   },
   {
     "id": 10405,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 50,
     "data2": 6,
     "data3": 0,
@@ -1562,9 +1234,7 @@
   },
   {
     "id": 10406,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 100,
     "data2": 6,
     "data3": 0,
@@ -1573,9 +1243,7 @@
   },
   {
     "id": 10407,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 200,
     "data2": 6,
     "data3": 0,
@@ -1584,9 +1252,7 @@
   },
   {
     "id": 10408,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 300,
     "data2": 6,
     "data3": 0,
@@ -1595,9 +1261,7 @@
   },
   {
     "id": 10409,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 500,
     "data2": 6,
     "data3": 0,
@@ -1606,9 +1270,7 @@
   },
   {
     "id": 10410,
-    "datatype": 2,
     "type": 50,
-    "inited": [],
     "data1": 1000,
     "data2": 6,
     "data3": 0,
@@ -1617,9 +1279,7 @@
   },
   {
     "id": 10501,
-    "datatype": 2,
     "type": 58,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1628,9 +1288,7 @@
   },
   {
     "id": 10502,
-    "datatype": 2,
     "type": 58,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -1639,9 +1297,7 @@
   },
   {
     "id": 10503,
-    "datatype": 2,
     "type": 58,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -1650,9 +1306,7 @@
   },
   {
     "id": 10504,
-    "datatype": 2,
     "type": 58,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -1661,9 +1315,7 @@
   },
   {
     "id": 10505,
-    "datatype": 2,
     "type": 58,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -1672,9 +1324,7 @@
   },
   {
     "id": 10506,
-    "datatype": 2,
     "type": 58,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -1683,9 +1333,7 @@
   },
   {
     "id": 10507,
-    "datatype": 2,
     "type": 58,
-    "inited": [],
     "data1": 70,
     "data2": 0,
     "data3": 0,
@@ -1694,9 +1342,7 @@
   },
   {
     "id": 10508,
-    "datatype": 2,
     "type": 58,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -1705,9 +1351,7 @@
   },
   {
     "id": 10601,
-    "datatype": 2,
     "type": 62,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1716,9 +1360,7 @@
   },
   {
     "id": 10602,
-    "datatype": 2,
     "type": 62,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -1727,9 +1369,7 @@
   },
   {
     "id": 10603,
-    "datatype": 2,
     "type": 62,
-    "inited": [],
     "data1": 99,
     "data2": 0,
     "data3": 0,
@@ -1738,9 +1378,7 @@
   },
   {
     "id": 10701,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1749,9 +1387,7 @@
   },
   {
     "id": 10702,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -1760,9 +1396,7 @@
   },
   {
     "id": 10703,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -1771,9 +1405,7 @@
   },
   {
     "id": 10704,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -1782,9 +1414,7 @@
   },
   {
     "id": 10705,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -1793,9 +1423,7 @@
   },
   {
     "id": 10706,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -1804,9 +1432,7 @@
   },
   {
     "id": 10707,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 200,
     "data2": 0,
     "data3": 0,
@@ -1815,9 +1441,7 @@
   },
   {
     "id": 10708,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -1826,9 +1450,7 @@
   },
   {
     "id": 10709,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -1837,9 +1459,7 @@
   },
   {
     "id": 10710,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -1848,9 +1468,7 @@
   },
   {
     "id": 10801,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1859,9 +1477,7 @@
   },
   {
     "id": 10802,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -1870,9 +1486,7 @@
   },
   {
     "id": 10803,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -1881,9 +1495,7 @@
   },
   {
     "id": 10804,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -1892,9 +1504,7 @@
   },
   {
     "id": 10805,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -1903,9 +1513,7 @@
   },
   {
     "id": 10806,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -1914,9 +1522,7 @@
   },
   {
     "id": 10807,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 200,
     "data2": 0,
     "data3": 0,
@@ -1925,9 +1531,7 @@
   },
   {
     "id": 10808,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -1936,9 +1540,7 @@
   },
   {
     "id": 10809,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -1947,9 +1549,7 @@
   },
   {
     "id": 10810,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -1958,9 +1558,7 @@
   },
   {
     "id": 2008001,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1969,9 +1567,7 @@
   },
   {
     "id": 2012001,
-    "datatype": 2,
     "type": 12,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1980,9 +1576,7 @@
   },
   {
     "id": 2018001,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -1991,9 +1585,7 @@
   },
   {
     "id": 2024001,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -2002,9 +1594,7 @@
   },
   {
     "id": 2047001,
-    "datatype": 2,
     "type": 47,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -2013,9 +1603,7 @@
   },
   {
     "id": 2062001,
-    "datatype": 2,
     "type": 62,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -2024,9 +1612,7 @@
   },
   {
     "id": 2064001,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -2035,9 +1621,7 @@
   },
   {
     "id": 2130001,
-    "datatype": 2,
     "type": 130,
-    "inited": [],
     "data1": 3,
     "data2": 0,
     "data3": 0,
@@ -2046,9 +1630,7 @@
   },
   {
     "id": 3008001,
-    "datatype": 2,
     "type": 8,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -2057,9 +1639,7 @@
   },
   {
     "id": 3012001,
-    "datatype": 2,
     "type": 12,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -2068,9 +1648,7 @@
   },
   {
     "id": 3018001,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -2079,9 +1657,7 @@
   },
   {
     "id": 3024001,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -2090,9 +1666,7 @@
   },
   {
     "id": 3047001,
-    "datatype": 2,
     "type": 47,
-    "inited": [],
     "data1": 7,
     "data2": 0,
     "data3": 0,
@@ -2101,9 +1675,7 @@
   },
   {
     "id": 3061001,
-    "datatype": 2,
     "type": 62,
-    "inited": [],
     "data1": 7,
     "data2": 0,
     "data3": 0,
@@ -2112,9 +1684,7 @@
   },
   {
     "id": 3064001,
-    "datatype": 2,
     "type": 64,
-    "inited": [],
     "data1": 7,
     "data2": 0,
     "data3": 0,
@@ -2123,9 +1693,7 @@
   },
   {
     "id": 3088001,
-    "datatype": 2,
     "type": 88,
-    "inited": [],
     "data1": 3,
     "data2": 0,
     "data3": 0,
@@ -2134,9 +1702,7 @@
   },
   {
     "id": 3105001,
-    "datatype": 2,
     "type": 105,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -2145,9 +1711,7 @@
   },
   {
     "id": 3104001,
-    "datatype": 2,
     "type": 104,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -2156,9 +1720,7 @@
   },
   {
     "id": 3130001,
-    "datatype": 2,
     "type": 130,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -2167,9 +1729,7 @@
   },
   {
     "id": 4008001,
-    "datatype": 1,
     "type": 8,
-    "inited": [],
     "data1": 3,
     "data2": 0,
     "data3": 0,
@@ -2178,9 +1738,7 @@
   },
   {
     "id": 4008002,
-    "datatype": 1,
     "type": 8,
-    "inited": [],
     "data1": 7,
     "data2": 0,
     "data3": 0,
@@ -2189,9 +1747,7 @@
   },
   {
     "id": 4008003,
-    "datatype": 1,
     "type": 8,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -2200,9 +1756,7 @@
   },
   {
     "id": 4008004,
-    "datatype": 1,
     "type": 8,
-    "inited": [],
     "data1": 90,
     "data2": 0,
     "data3": 0,
@@ -2211,9 +1765,7 @@
   },
   {
     "id": 4008005,
-    "datatype": 1,
     "type": 8,
-    "inited": [],
     "data1": 180,
     "data2": 0,
     "data3": 0,
@@ -2222,9 +1774,7 @@
   },
   {
     "id": 4008006,
-    "datatype": 1,
     "type": 8,
-    "inited": [],
     "data1": 365,
     "data2": 0,
     "data3": 0,
@@ -2233,9 +1783,7 @@
   },
   {
     "id": 4008007,
-    "datatype": 1,
     "type": 9,
-    "inited": [],
     "data1": 3,
     "data2": 0,
     "data3": 0,
@@ -2244,9 +1792,7 @@
   },
   {
     "id": 4008008,
-    "datatype": 1,
     "type": 9,
-    "inited": [],
     "data1": 7,
     "data2": 0,
     "data3": 0,
@@ -2255,9 +1801,7 @@
   },
   {
     "id": 4008009,
-    "datatype": 1,
     "type": 9,
-    "inited": [],
     "data1": 14,
     "data2": 0,
     "data3": 0,
@@ -2266,9 +1810,7 @@
   },
   {
     "id": 4008010,
-    "datatype": 1,
     "type": 9,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -2277,9 +1819,7 @@
   },
   {
     "id": 4010001,
-    "datatype": 1,
     "type": 10,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -2288,9 +1828,7 @@
   },
   {
     "id": 4010002,
-    "datatype": 1,
     "type": 10,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -2299,9 +1837,7 @@
   },
   {
     "id": 4010003,
-    "datatype": 1,
     "type": 10,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -2310,9 +1846,7 @@
   },
   {
     "id": 4010004,
-    "datatype": 1,
     "type": 10,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -2321,9 +1855,7 @@
   },
   {
     "id": 4010005,
-    "datatype": 1,
     "type": 10,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -2332,9 +1864,7 @@
   },
   {
     "id": 4010006,
-    "datatype": 1,
     "type": 10,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -2343,9 +1873,7 @@
   },
   {
     "id": 4011001,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -2354,9 +1882,7 @@
   },
   {
     "id": 4011002,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -2365,9 +1891,7 @@
   },
   {
     "id": 4011003,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -2376,9 +1900,7 @@
   },
   {
     "id": 4011004,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -2387,9 +1909,7 @@
   },
   {
     "id": 4011005,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -2398,9 +1918,7 @@
   },
   {
     "id": 4011006,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -2409,9 +1927,7 @@
   },
   {
     "id": 4011007,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -2420,9 +1936,7 @@
   },
   {
     "id": 4011008,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -2431,9 +1945,7 @@
   },
   {
     "id": 4011009,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 3000,
     "data2": 0,
     "data3": 0,
@@ -2442,9 +1954,7 @@
   },
   {
     "id": 4011010,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 5000,
     "data2": 0,
     "data3": 0,
@@ -2453,9 +1963,7 @@
   },
   {
     "id": 4011011,
-    "datatype": 1,
     "type": 11,
-    "inited": [],
     "data1": 10000,
     "data2": 0,
     "data3": 0,
@@ -2464,9 +1972,7 @@
   },
   {
     "id": 4012001,
-    "datatype": 1,
     "type": 12,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -2475,9 +1981,7 @@
   },
   {
     "id": 4012002,
-    "datatype": 1,
     "type": 12,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -2486,9 +1990,7 @@
   },
   {
     "id": 4012003,
-    "datatype": 1,
     "type": 12,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -2497,9 +1999,7 @@
   },
   {
     "id": 4012004,
-    "datatype": 1,
     "type": 12,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -2508,9 +2008,7 @@
   },
   {
     "id": 4012005,
-    "datatype": 1,
     "type": 12,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -2519,9 +2017,7 @@
   },
   {
     "id": 4012006,
-    "datatype": 1,
     "type": 12,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -2530,9 +2026,7 @@
   },
   {
     "id": 4012007,
-    "datatype": 1,
     "type": 12,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -2541,9 +2035,7 @@
   },
   {
     "id": 4012008,
-    "datatype": 1,
     "type": 12,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -2552,9 +2044,7 @@
   },
   {
     "id": 4012009,
-    "datatype": 1,
     "type": 12,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -2563,9 +2053,7 @@
   },
   {
     "id": 4016001,
-    "datatype": 1,
     "type": 16,
-    "inited": [],
     "data1": 1,
     "data2": 5,
     "data3": 0,
@@ -2574,9 +2062,7 @@
   },
   {
     "id": 4016002,
-    "datatype": 1,
     "type": 16,
-    "inited": [],
     "data1": 2,
     "data2": 5,
     "data3": 0,
@@ -2585,9 +2071,7 @@
   },
   {
     "id": 4016003,
-    "datatype": 1,
     "type": 16,
-    "inited": [],
     "data1": 3,
     "data2": 5,
     "data3": 0,
@@ -2596,9 +2080,7 @@
   },
   {
     "id": 4016004,
-    "datatype": 1,
     "type": 16,
-    "inited": [],
     "data1": 5,
     "data2": 5,
     "data3": 0,
@@ -2607,9 +2089,7 @@
   },
   {
     "id": 4016005,
-    "datatype": 1,
     "type": 16,
-    "inited": [],
     "data1": 10,
     "data2": 5,
     "data3": 0,
@@ -2618,9 +2098,7 @@
   },
   {
     "id": 4016006,
-    "datatype": 1,
     "type": 16,
-    "inited": [],
     "data1": 15,
     "data2": 5,
     "data3": 0,
@@ -2629,9 +2107,7 @@
   },
   {
     "id": 4016007,
-    "datatype": 1,
     "type": 16,
-    "inited": [],
     "data1": 20,
     "data2": 5,
     "data3": 0,
@@ -2640,9 +2116,7 @@
   },
   {
     "id": 4016008,
-    "datatype": 1,
     "type": 16,
-    "inited": [],
     "data1": 30,
     "data2": 5,
     "data3": 0,
@@ -2651,9 +2125,7 @@
   },
   {
     "id": 4016009,
-    "datatype": 1,
     "type": 16,
-    "inited": [],
     "data1": 50,
     "data2": 5,
     "data3": 0,
@@ -2662,9 +2134,7 @@
   },
   {
     "id": 4018001,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -2673,9 +2143,7 @@
   },
   {
     "id": 4018002,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -2684,9 +2152,7 @@
   },
   {
     "id": 4018003,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -2695,9 +2161,7 @@
   },
   {
     "id": 4018004,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -2706,9 +2170,7 @@
   },
   {
     "id": 4018005,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -2717,9 +2179,7 @@
   },
   {
     "id": 4018006,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 200,
     "data2": 0,
     "data3": 0,
@@ -2728,9 +2188,7 @@
   },
   {
     "id": 4018007,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -2739,9 +2197,7 @@
   },
   {
     "id": 4018008,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -2750,9 +2206,7 @@
   },
   {
     "id": 4018009,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -2761,9 +2215,7 @@
   },
   {
     "id": 4018010,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 2000,
     "data2": 0,
     "data3": 0,
@@ -2772,9 +2224,7 @@
   },
   {
     "id": 4018011,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 5000,
     "data2": 0,
     "data3": 0,
@@ -2783,9 +2233,7 @@
   },
   {
     "id": 4018012,
-    "datatype": 1,
     "type": 18,
-    "inited": [],
     "data1": 10000,
     "data2": 0,
     "data3": 0,
@@ -2794,9 +2242,7 @@
   },
   {
     "id": 4020001,
-    "datatype": 1,
     "type": 20,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -2805,9 +2251,7 @@
   },
   {
     "id": 4020002,
-    "datatype": 1,
     "type": 20,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -2816,9 +2260,7 @@
   },
   {
     "id": 4020003,
-    "datatype": 1,
     "type": 20,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -2827,9 +2269,7 @@
   },
   {
     "id": 4020004,
-    "datatype": 1,
     "type": 20,
-    "inited": [],
     "data1": 40,
     "data2": 0,
     "data3": 0,
@@ -2838,9 +2278,7 @@
   },
   {
     "id": 4020005,
-    "datatype": 1,
     "type": 20,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -2849,9 +2287,7 @@
   },
   {
     "id": 4020006,
-    "datatype": 1,
     "type": 20,
-    "inited": [],
     "data1": 60,
     "data2": 0,
     "data3": 0,
@@ -2860,9 +2296,7 @@
   },
   {
     "id": 4043001,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 1,
     "data2": 15,
     "data3": 0,
@@ -2871,9 +2305,7 @@
   },
   {
     "id": 4043002,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 2,
     "data2": 15,
     "data3": 0,
@@ -2882,9 +2314,7 @@
   },
   {
     "id": 4043003,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 4,
     "data2": 15,
     "data3": 0,
@@ -2893,9 +2323,7 @@
   },
   {
     "id": 4043004,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 6,
     "data2": 15,
     "data3": 0,
@@ -2904,9 +2332,7 @@
   },
   {
     "id": 4043005,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 12,
     "data2": 15,
     "data3": 0,
@@ -2915,9 +2341,7 @@
   },
   {
     "id": 4043006,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 18,
     "data2": 15,
     "data3": 0,
@@ -2926,9 +2350,7 @@
   },
   {
     "id": 4043007,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 24,
     "data2": 15,
     "data3": 0,
@@ -2937,9 +2359,7 @@
   },
   {
     "id": 4043008,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 30,
     "data2": 15,
     "data3": 0,
@@ -2948,9 +2368,7 @@
   },
   {
     "id": 4043009,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 60,
     "data2": 15,
     "data3": 0,
@@ -2959,9 +2377,7 @@
   },
   {
     "id": 4043010,
-    "datatype": 1,
     "type": 43,
-    "inited": [],
     "data1": 120,
     "data2": 15,
     "data3": 0,
@@ -2970,9 +2386,7 @@
   },
   {
     "id": 4047001,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -2981,9 +2395,7 @@
   },
   {
     "id": 4047002,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -2992,9 +2404,7 @@
   },
   {
     "id": 4047003,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -3003,9 +2413,7 @@
   },
   {
     "id": 4047004,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -3014,9 +2422,7 @@
   },
   {
     "id": 4047005,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -3025,9 +2431,7 @@
   },
   {
     "id": 4047006,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 200,
     "data2": 0,
     "data3": 0,
@@ -3036,9 +2440,7 @@
   },
   {
     "id": 4047007,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -3047,9 +2449,7 @@
   },
   {
     "id": 4047008,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -3058,9 +2458,7 @@
   },
   {
     "id": 4047009,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -3069,9 +2467,7 @@
   },
   {
     "id": 4047010,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 2000,
     "data2": 0,
     "data3": 0,
@@ -3080,9 +2476,7 @@
   },
   {
     "id": 4047011,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 3000,
     "data2": 0,
     "data3": 0,
@@ -3091,9 +2485,7 @@
   },
   {
     "id": 4047012,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 5000,
     "data2": 0,
     "data3": 0,
@@ -3102,9 +2494,7 @@
   },
   {
     "id": 4047013,
-    "datatype": 1,
     "type": 47,
-    "inited": [],
     "data1": 10000,
     "data2": 0,
     "data3": 0,
@@ -3113,9 +2503,7 @@
   },
   {
     "id": 4064001,
-    "datatype": 1,
     "type": 64,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -3124,9 +2512,7 @@
   },
   {
     "id": 4064002,
-    "datatype": 1,
     "type": 64,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -3135,9 +2521,7 @@
   },
   {
     "id": 4064003,
-    "datatype": 1,
     "type": 64,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -3146,9 +2530,7 @@
   },
   {
     "id": 4064004,
-    "datatype": 1,
     "type": 64,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -3157,9 +2539,7 @@
   },
   {
     "id": 4064005,
-    "datatype": 1,
     "type": 64,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -3168,9 +2548,7 @@
   },
   {
     "id": 4064006,
-    "datatype": 1,
     "type": 64,
-    "inited": [],
     "data1": 200,
     "data2": 0,
     "data3": 0,
@@ -3179,9 +2557,7 @@
   },
   {
     "id": 4064007,
-    "datatype": 1,
     "type": 64,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -3190,9 +2566,7 @@
   },
   {
     "id": 4068001,
-    "datatype": 1,
     "type": 68,
-    "inited": [],
     "data1": 50000,
     "data2": 0,
     "data3": 0,
@@ -3201,9 +2575,7 @@
   },
   {
     "id": 4068002,
-    "datatype": 1,
     "type": 68,
-    "inited": [],
     "data1": 500000,
     "data2": 0,
     "data3": 0,
@@ -3212,9 +2584,7 @@
   },
   {
     "id": 4068003,
-    "datatype": 1,
     "type": 68,
-    "inited": [],
     "data1": 5000000,
     "data2": 0,
     "data3": 0,
@@ -3223,9 +2593,7 @@
   },
   {
     "id": 4068004,
-    "datatype": 1,
     "type": 68,
-    "inited": [],
     "data1": 50000000,
     "data2": 0,
     "data3": 0,
@@ -3234,9 +2602,7 @@
   },
   {
     "id": 4084001,
-    "datatype": 1,
     "type": 84,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -3245,9 +2611,7 @@
   },
   {
     "id": 4084002,
-    "datatype": 1,
     "type": 84,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -3256,9 +2620,7 @@
   },
   {
     "id": 4084003,
-    "datatype": 1,
     "type": 84,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -3267,9 +2629,7 @@
   },
   {
     "id": 4084004,
-    "datatype": 1,
     "type": 84,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -3278,9 +2638,7 @@
   },
   {
     "id": 4085001,
-    "datatype": 1,
     "type": 85,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -3289,9 +2647,7 @@
   },
   {
     "id": 4085002,
-    "datatype": 1,
     "type": 85,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -3300,9 +2656,7 @@
   },
   {
     "id": 4085003,
-    "datatype": 1,
     "type": 85,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -3311,9 +2665,7 @@
   },
   {
     "id": 4085004,
-    "datatype": 1,
     "type": 85,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -3322,9 +2674,7 @@
   },
   {
     "id": 4085005,
-    "datatype": 1,
     "type": 85,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -3333,9 +2683,7 @@
   },
   {
     "id": 4096001,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -3344,9 +2692,7 @@
   },
   {
     "id": 4096002,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -3355,9 +2701,7 @@
   },
   {
     "id": 4096003,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -3366,9 +2710,7 @@
   },
   {
     "id": 4096004,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -3377,9 +2719,7 @@
   },
   {
     "id": 4096005,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 200,
     "data2": 0,
     "data3": 0,
@@ -3388,9 +2728,7 @@
   },
   {
     "id": 4096006,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -3399,9 +2737,7 @@
   },
   {
     "id": 4096007,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -3410,9 +2746,7 @@
   },
   {
     "id": 4096008,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -3421,9 +2755,7 @@
   },
   {
     "id": 4096009,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 2000,
     "data2": 0,
     "data3": 0,
@@ -3432,9 +2764,7 @@
   },
   {
     "id": 4096010,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 3000,
     "data2": 0,
     "data3": 0,
@@ -3443,9 +2773,7 @@
   },
   {
     "id": 4096011,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 5000,
     "data2": 0,
     "data3": 0,
@@ -3454,9 +2782,7 @@
   },
   {
     "id": 4096012,
-    "datatype": 1,
     "type": 96,
-    "inited": [],
     "data1": 10000,
     "data2": 0,
     "data3": 0,
@@ -3465,9 +2791,7 @@
   },
   {
     "id": 4104001,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -3476,9 +2800,7 @@
   },
   {
     "id": 4104002,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -3487,9 +2809,7 @@
   },
   {
     "id": 4104003,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 3000,
     "data2": 0,
     "data3": 0,
@@ -3498,9 +2818,7 @@
   },
   {
     "id": 4104004,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 5000,
     "data2": 0,
     "data3": 0,
@@ -3509,9 +2827,7 @@
   },
   {
     "id": 4104005,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 10000,
     "data2": 0,
     "data3": 0,
@@ -3520,9 +2836,7 @@
   },
   {
     "id": 4104006,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 20000,
     "data2": 0,
     "data3": 0,
@@ -3531,9 +2845,7 @@
   },
   {
     "id": 4104007,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 30000,
     "data2": 0,
     "data3": 0,
@@ -3542,9 +2854,7 @@
   },
   {
     "id": 4104008,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 50000,
     "data2": 0,
     "data3": 0,
@@ -3553,9 +2863,7 @@
   },
   {
     "id": 4104009,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 100000,
     "data2": 0,
     "data3": 0,
@@ -3564,9 +2872,7 @@
   },
   {
     "id": 4104010,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 200000,
     "data2": 0,
     "data3": 0,
@@ -3575,9 +2881,7 @@
   },
   {
     "id": 4104011,
-    "datatype": 1,
     "type": 104,
-    "inited": [],
     "data1": 500000,
     "data2": 0,
     "data3": 0,
@@ -3586,9 +2890,7 @@
   },
   {
     "id": 4128001,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 1100,
     "data2": 0,
     "data3": 0,
@@ -3597,9 +2899,7 @@
   },
   {
     "id": 4128002,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 1200,
     "data2": 0,
     "data3": 0,
@@ -3608,9 +2908,7 @@
   },
   {
     "id": 4128003,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 1300,
     "data2": 0,
     "data3": 0,
@@ -3619,9 +2917,7 @@
   },
   {
     "id": 4128004,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 1400,
     "data2": 0,
     "data3": 0,
@@ -3630,9 +2926,7 @@
   },
   {
     "id": 4128005,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 1500,
     "data2": 0,
     "data3": 0,
@@ -3641,9 +2935,7 @@
   },
   {
     "id": 4128006,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 1600,
     "data2": 0,
     "data3": 0,
@@ -3652,9 +2944,7 @@
   },
   {
     "id": 4128007,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 1700,
     "data2": 0,
     "data3": 0,
@@ -3663,9 +2953,7 @@
   },
   {
     "id": 4128008,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 1800,
     "data2": 0,
     "data3": 0,
@@ -3674,9 +2962,7 @@
   },
   {
     "id": 4128009,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 1900,
     "data2": 0,
     "data3": 0,
@@ -3685,9 +2971,7 @@
   },
   {
     "id": 4128010,
-    "datatype": 1,
     "type": 128,
-    "inited": [],
     "data1": 2000,
     "data2": 0,
     "data3": 0,
@@ -3696,9 +2980,7 @@
   },
   {
     "id": 4131001,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 5,
     "data2": 0,
     "data3": 0,
@@ -3707,9 +2989,7 @@
   },
   {
     "id": 4131002,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 10,
     "data2": 0,
     "data3": 0,
@@ -3718,9 +2998,7 @@
   },
   {
     "id": 4131003,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 20,
     "data2": 0,
     "data3": 0,
@@ -3729,9 +3007,7 @@
   },
   {
     "id": 4131004,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 30,
     "data2": 0,
     "data3": 0,
@@ -3740,9 +3016,7 @@
   },
   {
     "id": 4131005,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 50,
     "data2": 0,
     "data3": 0,
@@ -3751,9 +3025,7 @@
   },
   {
     "id": 4131006,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -3762,9 +3034,7 @@
   },
   {
     "id": 4131007,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 200,
     "data2": 0,
     "data3": 0,
@@ -3773,9 +3043,7 @@
   },
   {
     "id": 4131008,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 300,
     "data2": 0,
     "data3": 0,
@@ -3784,9 +3052,7 @@
   },
   {
     "id": 4131009,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 500,
     "data2": 0,
     "data3": 0,
@@ -3795,9 +3061,7 @@
   },
   {
     "id": 4131010,
-    "datatype": 1,
     "type": 131,
-    "inited": [],
     "data1": 1000,
     "data2": 0,
     "data3": 0,
@@ -3806,9 +3070,7 @@
   },
   {
     "id": 5011001,
-    "datatype": 2,
     "type": 11,
-    "inited": [],
     "data1": 3,
     "data2": 0,
     "data3": 0,
@@ -3817,9 +3079,7 @@
   },
   {
     "id": 5012001,
-    "datatype": 2,
     "type": 12,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -3828,9 +3088,7 @@
   },
   {
     "id": 5018001,
-    "datatype": 2,
     "type": 18,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -3839,9 +3097,7 @@
   },
   {
     "id": 5024001,
-    "datatype": 2,
     "type": 24,
-    "inited": [],
     "data1": 1,
     "data2": 0,
     "data3": 0,
@@ -3850,9 +3106,7 @@
   },
   {
     "id": 5047001,
-    "datatype": 2,
     "type": 47,
-    "inited": [],
     "data1": 6,
     "data2": 0,
     "data3": 0,
@@ -3861,9 +3115,7 @@
   },
   {
     "id": 5063001,
-    "datatype": 2,
     "type": 63,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
@@ -3872,9 +3124,7 @@
   },
   {
     "id": 5068001,
-    "datatype": 2,
     "type": 68,
-    "inited": [],
     "data1": 200000,
     "data2": 0,
     "data3": 0,
@@ -3883,9 +3133,7 @@
   },
   {
     "id": 5104001,
-    "datatype": 2,
     "type": 104,
-    "inited": [],
     "data1": 100,
     "data2": 0,
     "data3": 0,
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index d70e6ca15..e9810a656 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -42,7 +42,7 @@
     "icon": "",
     "npc": [
       "scenes_ boundary_01",
-      "邦尼兔组件名",
+      "邦尼兔组件名入场",
       "150"
     ],
     "getafter_event": [
@@ -50,7 +50,7 @@
       1002
     ],
     "completetask": 0,
-    "auto_accept": 0,
+    "auto_accept": 1,
     "overtips": 1,
     "reword": []
   },
@@ -1721,7 +1721,7 @@
     "ontxe": 0,
     "id_after": 20002,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "scenes_ boundary_01",
@@ -1754,7 +1754,7 @@
     "ontxe": 10166,
     "id_after": 20003,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "scenes_ boundary_01",
@@ -1782,7 +1782,7 @@
     "ontxe": 10167,
     "id_after": 20004,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "dreamwork_restaurant_01",
@@ -1810,7 +1810,7 @@
     "ontxe": 10168,
     "id_after": 20005,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "dreamwork_restaurant_01",
@@ -1838,7 +1838,7 @@
     "ontxe": 10169,
     "id_after": 20006,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "dreamwork_restaurant_01",
@@ -1871,7 +1871,7 @@
     "ontxe": 10170,
     "id_after": 20007,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "scenes_ boundary_01",
@@ -1899,7 +1899,7 @@
     "ontxe": 10171,
     "id_after": 20008,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "scenes_ boundary_01",
@@ -1927,7 +1927,7 @@
     "ontxe": 10172,
     "id_after": 20009,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "scenes_ boundary_01",
@@ -1955,7 +1955,7 @@
     "ontxe": 10173,
     "id_after": 20010,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "scenes_ boundary_01",
@@ -1983,7 +1983,7 @@
     "ontxe": 10174,
     "id_after": 0,
     "group": 10001,
-    "des": 2,
+    "des": 3,
     "icon": "",
     "npc": [
       "scenes_ boundary_01",
diff --git a/modules/rtask/model_record.go b/modules/rtask/model_record.go
index 646d57b81..a758a0056 100644
--- a/modules/rtask/model_record.go
+++ b/modules/rtask/model_record.go
@@ -6,10 +6,8 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
-	"go_dreamfactory/sys/configure"
 
 	"github.com/pkg/errors"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 )
 
@@ -48,55 +46,3 @@ func (this *ModelRtaskRecord) getRecord(uid string) *pb.DBRtaskRecord {
 	}
 	return record
 }
-
-// 初始化任务条件数据
-// 玩家登录时调用
-// Deprecated
-func (this *ModelRtaskRecord) initCondiData(uid string) error {
-	dr := this.getRecord(uid)
-	// 判断是否有记录
-	if dr.Vals == nil || len(dr.Vals) == 0 {
-		// 获取rdtask_condi配置表数据
-		grc, err := this.moduleRtask.configure.getRtaskCondiCfg()
-		if err != nil {
-			return err
-		}
-		if grc == nil {
-			return errors.New("配置空[rdtaskcondi] err")
-		}
-
-		record := &pb.DBRtaskRecord{Uid: uid}
-		record.Id = primitive.NewObjectID().Hex()
-		record.Vals = make(map[int32]*pb.RtaskData)
-		//遍历所有配置数据
-		for _, v := range grc.GetDataList() {
-			// 不符合参数配置长度则不初始化
-			if len(v.Inited) != 5 {
-				continue
-			}
-
-			vals := []int32{}
-			// 遍历初始化参数字段
-			for _, p := range v.Inited {
-				if p == 1 { // 1表示需要初始0
-					vals = append(vals, 0)
-				} else if p == 0 { // 0表示需要初始实际值
-					vals = append(vals, p)
-				} else if p == -1 { //-1 表示不初始任何值
-					break
-				}
-			}
-
-			record.Vals[v.Id] = &pb.RtaskData{
-				Data:      toMap(vals...),
-				Rtype:     v.Type,
-				Timestamp: configure.Now().Unix(),
-			}
-		}
-
-		if err := this.Add(uid, record); err != nil {
-			return err
-		}
-	}
-	return nil
-}
\ No newline at end of file
diff --git a/modules/user/api_login.go b/modules/user/api_login.go
index 79a146c6d..67a935301 100644
--- a/modules/user/api_login.go
+++ b/modules/user/api_login.go
@@ -146,8 +146,6 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
 		}
 	}
 
-	// 初始化随机任务数据
-	// this.module.ModuleRtask.InitCondiData(user.Uid)
 	// 日常登录任务
 	this.module.ModuleRtask.SendToRtask(session, comm.Rtype8, 1)
 
diff --git a/sys/configure/structs/Game.RdtaskCondiData.go b/sys/configure/structs/Game.RdtaskCondiData.go
index c9e2d2af7..6f32eeb5c 100644
--- a/sys/configure/structs/Game.RdtaskCondiData.go
+++ b/sys/configure/structs/Game.RdtaskCondiData.go
@@ -12,9 +12,7 @@ import "errors"
 
 type GameRdtaskCondiData struct {
     Id int32
-    Datatype int32
     Type int32
-    Inited []int32
     Data1 int32
     Data2 int32
     Data3 int32
@@ -30,22 +28,7 @@ func (*GameRdtaskCondiData) GetTypeId() int32 {
 
 func (_v *GameRdtaskCondiData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["datatype"].(float64); !_ok_ { err = errors.New("datatype error"); return }; _v.Datatype = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["inited"].([]interface{}); !_ok_ { err = errors.New("inited error"); return }
-
-                _v.Inited = make([]int32, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ int32
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
-                    _v.Inited = append(_v.Inited, _list_v_)
-                }
-            }
-
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data1"].(float64); !_ok_ { err = errors.New("data1 error"); return }; _v.Data1 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data2"].(float64); !_ok_ { err = errors.New("data2 error"); return }; _v.Data2 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data3"].(float64); !_ok_ { err = errors.New("data3 error"); return }; _v.Data3 = int32(_tempNum_) }