diff --git a/bin/json/game_horoscope.json b/bin/json/game_horoscope.json
index cea0edf74..965d6d70b 100644
--- a/bin/json/game_horoscope.json
+++ b/bin/json/game_horoscope.json
@@ -2561,7 +2561,7 @@
     "type": 1,
     "node_id": 2001,
     "front": [
-      0
+      100705
     ],
     "node_type": 1,
     "pre_node": 1001,
@@ -7224,8 +7224,8 @@
       200110
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_188",
@@ -7261,8 +7261,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_189",
@@ -7298,8 +7298,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_190",
@@ -7335,8 +7335,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_191",
@@ -7372,8 +7372,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_192",
@@ -7409,8 +7409,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_193",
@@ -7450,8 +7450,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_194",
@@ -7491,8 +7491,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_195",
@@ -7532,8 +7532,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_196",
@@ -7573,8 +7573,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_197",
@@ -7614,8 +7614,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_198",
@@ -7649,8 +7649,8 @@
       201105
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_199",
@@ -7686,8 +7686,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_200",
@@ -7723,8 +7723,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_201",
@@ -7760,8 +7760,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_202",
@@ -7797,8 +7797,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_203",
@@ -7834,8 +7834,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_204",
@@ -7875,8 +7875,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_205",
@@ -7916,8 +7916,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_206",
@@ -7957,8 +7957,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_207",
@@ -7998,8 +7998,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_208",
@@ -8039,8 +8039,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2011,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_209",
@@ -8074,8 +8074,8 @@
       201205
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_210",
@@ -8111,8 +8111,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_211",
@@ -8148,8 +8148,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_212",
@@ -8185,8 +8185,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_213",
@@ -8222,8 +8222,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_214",
@@ -8259,8 +8259,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_215",
@@ -8300,8 +8300,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_216",
@@ -8341,8 +8341,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_217",
@@ -8382,8 +8382,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_218",
@@ -8423,8 +8423,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_219",
@@ -8464,8 +8464,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2010,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_220",
@@ -8499,8 +8499,8 @@
       200110
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_221",
@@ -8536,8 +8536,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_222",
@@ -8573,8 +8573,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_223",
@@ -8610,8 +8610,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_224",
@@ -8647,8 +8647,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_225",
@@ -8684,8 +8684,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_226",
@@ -8725,8 +8725,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_227",
@@ -8766,8 +8766,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_228",
@@ -8807,8 +8807,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_229",
@@ -8848,8 +8848,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_230",
@@ -8889,8 +8889,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2013,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_231",
@@ -8924,8 +8924,8 @@
       201405
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_232",
@@ -8961,8 +8961,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_233",
@@ -8998,8 +8998,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_234",
@@ -9035,8 +9035,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_235",
@@ -9072,8 +9072,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_236",
@@ -9109,8 +9109,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_237",
@@ -9150,8 +9150,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_238",
@@ -9191,8 +9191,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_239",
@@ -9232,8 +9232,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_240",
@@ -9273,8 +9273,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_241",
@@ -9314,8 +9314,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_242",
@@ -9349,8 +9349,8 @@
       201505
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_243",
@@ -9386,8 +9386,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_244",
@@ -9423,8 +9423,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_245",
@@ -9460,8 +9460,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_246",
@@ -9497,8 +9497,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_247",
@@ -9534,8 +9534,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_248",
@@ -9575,8 +9575,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_249",
@@ -9616,8 +9616,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_250",
@@ -9657,8 +9657,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_251",
@@ -9698,8 +9698,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_252",
@@ -9739,8 +9739,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2015,
+    "node_direction": 360,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_253",
@@ -9771,11 +9771,11 @@
     "type": 2,
     "node_id": 3001,
     "front": [
-      0
+      201605
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_254",
@@ -9811,8 +9811,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_255",
@@ -9848,8 +9848,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_256",
@@ -9885,8 +9885,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_257",
@@ -9922,8 +9922,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_258",
@@ -9959,8 +9959,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_259",
@@ -10000,8 +10000,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_260",
@@ -10041,8 +10041,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_261",
@@ -10082,8 +10082,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_262",
@@ -10123,8 +10123,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_263",
@@ -10164,8 +10164,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_264",
@@ -10205,8 +10205,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_265",
@@ -10246,8 +10246,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_266",
@@ -10287,8 +10287,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_267",
@@ -10328,8 +10328,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_268",
@@ -10369,8 +10369,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_269",
@@ -10410,8 +10410,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_270",
@@ -10451,8 +10451,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_271",
@@ -10492,8 +10492,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_272",
@@ -10533,8 +10533,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_273",
@@ -10574,8 +10574,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_274",
@@ -10609,8 +10609,8 @@
       300110
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_275",
@@ -10646,8 +10646,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_276",
@@ -10683,8 +10683,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_277",
@@ -10720,8 +10720,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_278",
@@ -10757,8 +10757,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_279",
@@ -10794,8 +10794,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_280",
@@ -10835,8 +10835,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_281",
@@ -10876,8 +10876,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_282",
@@ -10917,8 +10917,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_283",
@@ -10958,8 +10958,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_284",
@@ -10999,8 +10999,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 2014,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_285",
@@ -11034,8 +11034,8 @@
       300205
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3002,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_286",
@@ -11071,8 +11071,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3002,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_287",
@@ -11108,8 +11108,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3002,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_288",
@@ -11145,8 +11145,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3002,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_289",
@@ -11182,8 +11182,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3002,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_290",
@@ -11219,8 +11219,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3002,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_291",
@@ -11256,8 +11256,8 @@
       300303
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_292",
@@ -11293,8 +11293,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_293",
@@ -11330,8 +11330,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_294",
@@ -11367,8 +11367,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_295",
@@ -11404,8 +11404,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_296",
@@ -11441,8 +11441,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_297",
@@ -11482,8 +11482,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_298",
@@ -11523,8 +11523,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_299",
@@ -11564,8 +11564,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_300",
@@ -11605,8 +11605,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_301",
@@ -11646,8 +11646,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3003,
+    "node_direction": 90,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_302",
@@ -11681,8 +11681,8 @@
       300110
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_303",
@@ -11718,8 +11718,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_304",
@@ -11755,8 +11755,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_305",
@@ -11792,8 +11792,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_306",
@@ -11829,8 +11829,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_307",
@@ -11866,8 +11866,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_308",
@@ -11907,8 +11907,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_309",
@@ -11948,8 +11948,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_310",
@@ -11989,8 +11989,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_311",
@@ -12030,8 +12030,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_312",
@@ -12071,8 +12071,8 @@
       0
     ],
     "node_type": 1,
-    "pre_node": 0,
-    "node_direction": 0,
+    "pre_node": 3004,
+    "node_direction": 270,
     "node_long": 200,
     "name": {
       "key": "horoscope_horoscope_name_313",
diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json
index 84ae95167..d242bbf23 100644
--- a/bin/json/game_mail.json
+++ b/bin/json/game_mail.json
@@ -244,7 +244,7 @@
     },
     "recipient": {
       "key": "mail_mail_recipient_12",
-      "text": "亲爱的的玩家你在跑商中荣获第{0}名：这是您的排名奖励请查收"
+      "text": "亲爱的{0}："
     },
     "content": {
       "key": "mail_mail_content_12",
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 772b64b09..656af5739 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -11393,13 +11393,15 @@
     "Argu": [
       1,
       4,
-      900
+      900,
+      2,
+      1,
+      55
     ],
-    "FollowSK": [
-      245003112,
-      245003113
+    "FollowSK": [],
+    "SucFollowSK": [
+      245003112
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -11410,31 +11412,6 @@
   {
     "Id": 245003112,
     "EmitPR": 1000,
-    "From": 4,
-    "Where": [],
-    "Order": "",
-    "Limit": 1,
-    "ExecuteCnt": 1,
-    "Type": 21,
-    "Argu": [
-      1,
-      1,
-      55
-    ],
-    "FollowSK": [
-      245003113
-    ],
-    "SucFollowSK": [],
-    "FailFollowSK": [],
-    "MustHit": false,
-    "DpsRevisiType": 0,
-    "DpsCondition": "",
-    "RevisiCondition": "",
-    "RevisiParams": []
-  },
-  {
-    "Id": 245003113,
-    "EmitPR": 1000,
     "From": 3,
     "Where": [],
     "Order": "",
@@ -11599,8 +11576,8 @@
     "ExecuteCnt": 1,
     "Type": 5,
     "Argu": [
-      1,
-      1,
+      2,
+      2,
       350
     ],
     "FollowSK": [],
@@ -17142,6 +17119,7 @@
     "Type": 32,
     "Argu": [
       3,
+      -1,
       -1
     ],
     "FollowSK": [],
@@ -17263,8 +17241,7 @@
     "Type": 2,
     "Argu": [
       444004211,
-      1000,
-      1,
+      -1,
       -1
     ],
     "FollowSK": [],
@@ -18285,6 +18262,7 @@
     "Type": 32,
     "Argu": [
       3,
+      1,
       1
     ],
     "FollowSK": [],
@@ -18451,6 +18429,7 @@
     "Type": 32,
     "Argu": [
       3,
+      2,
       2
     ],
     "FollowSK": [],
@@ -21629,7 +21608,9 @@
     "ExecuteCnt": 1,
     "Type": 40,
     "Argu": [
-      10
+      2,
+      2,
+      50
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -21771,7 +21752,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      455006314,
+      455006312,
       1,
       0
     ],
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index f7ed3f6cc..a82b5eb66 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -12936,8 +12936,7 @@
     "ChildSkill": {
       "Id": [
         255007211,
-        255007213,
-        225007214
+        255007213
       ]
     },
     "Desc": {
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index b267cf9ff..f92f3d491 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -5159,7 +5159,7 @@
   },
   {
     "key": 30350,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30360,
@@ -5203,7 +5203,7 @@
   },
   {
     "key": 30360,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30350,
     "id_after": 30370,
@@ -5247,7 +5247,7 @@
   },
   {
     "key": 30370,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30360,
     "id_after": 0,
@@ -5291,7 +5291,7 @@
   },
   {
     "key": 30380,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30390,
@@ -5335,7 +5335,7 @@
   },
   {
     "key": 30390,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30380,
     "id_after": 30400,
@@ -5379,7 +5379,7 @@
   },
   {
     "key": 30400,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30390,
     "id_after": 0,
@@ -5423,7 +5423,7 @@
   },
   {
     "key": 30410,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30420,
@@ -5467,7 +5467,7 @@
   },
   {
     "key": 30420,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30410,
     "id_after": 30430,
@@ -5511,7 +5511,7 @@
   },
   {
     "key": 30430,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30420,
     "id_after": 0,
@@ -5555,7 +5555,7 @@
   },
   {
     "key": 30440,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30450,
@@ -5599,7 +5599,7 @@
   },
   {
     "key": 30450,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30440,
     "id_after": 30460,
@@ -5643,7 +5643,7 @@
   },
   {
     "key": 30460,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30450,
     "id_after": 0,
@@ -5687,7 +5687,7 @@
   },
   {
     "key": 30470,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30480,
@@ -5731,7 +5731,7 @@
   },
   {
     "key": 30480,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30470,
     "id_after": 30490,
@@ -5775,7 +5775,7 @@
   },
   {
     "key": 30490,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30480,
     "id_after": 0,
@@ -5819,7 +5819,7 @@
   },
   {
     "key": 30500,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30510,
@@ -5863,7 +5863,7 @@
   },
   {
     "key": 30510,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30500,
     "id_after": 0,
@@ -5907,7 +5907,7 @@
   },
   {
     "key": 30520,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30530,
@@ -5951,7 +5951,7 @@
   },
   {
     "key": 30530,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30520,
     "id_after": 0,
@@ -5995,7 +5995,7 @@
   },
   {
     "key": 30540,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30550,
@@ -6039,7 +6039,7 @@
   },
   {
     "key": 30550,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30540,
     "id_after": 30560,
@@ -6083,7 +6083,7 @@
   },
   {
     "key": 30560,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30550,
     "id_after": 30570,
@@ -6127,7 +6127,7 @@
   },
   {
     "key": 30570,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30560,
     "id_after": 30580,
@@ -6171,7 +6171,7 @@
   },
   {
     "key": 30580,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30570,
     "id_after": 30590,
@@ -6215,7 +6215,7 @@
   },
   {
     "key": 30590,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30580,
     "id_after": 0,
@@ -6259,7 +6259,7 @@
   },
   {
     "key": 30600,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30610,
@@ -6303,7 +6303,7 @@
   },
   {
     "key": 30610,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30600,
     "id_after": 30620,
@@ -6347,7 +6347,7 @@
   },
   {
     "key": 30620,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30610,
     "id_after": 30630,
@@ -6391,7 +6391,7 @@
   },
   {
     "key": 30630,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30620,
     "id_after": 0,
@@ -6435,7 +6435,7 @@
   },
   {
     "key": 30640,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30650,
@@ -6479,7 +6479,7 @@
   },
   {
     "key": 30650,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30640,
     "id_after": 30660,
@@ -6523,7 +6523,7 @@
   },
   {
     "key": 30660,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30650,
     "id_after": 30670,
@@ -6567,7 +6567,7 @@
   },
   {
     "key": 30670,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30660,
     "id_after": 0,
@@ -6611,7 +6611,7 @@
   },
   {
     "key": 30680,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30690,
@@ -6655,7 +6655,7 @@
   },
   {
     "key": 30690,
-    "lock": 999,
+    "lock": 1,
     "lockend": 0,
     "ontxe": 30680,
     "id_after": 0,
@@ -6699,7 +6699,7 @@
   },
   {
     "key": 30700,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30710,
@@ -6743,7 +6743,7 @@
   },
   {
     "key": 30710,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30700,
     "id_after": 30720,
@@ -6787,7 +6787,7 @@
   },
   {
     "key": 30720,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30710,
     "id_after": 0,
@@ -6831,7 +6831,7 @@
   },
   {
     "key": 30730,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30740,
@@ -6875,7 +6875,7 @@
   },
   {
     "key": 30740,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30730,
     "id_after": 30750,
@@ -6919,7 +6919,7 @@
   },
   {
     "key": 30750,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30740,
     "id_after": 0,
@@ -6963,7 +6963,7 @@
   },
   {
     "key": 30760,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30770,
@@ -7007,7 +7007,7 @@
   },
   {
     "key": 30770,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30760,
     "id_after": 0,
@@ -7051,11 +7051,11 @@
   },
   {
     "key": 30780,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30790,
-    "group": 630,
+    "group": 621,
     "des": 3,
     "icon": "",
     "task_Tname": {
@@ -7095,10 +7095,10 @@
   },
   {
     "key": 30790,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30780,
-    "id_after": 30800,
+    "id_after": 99999,
     "group": 630,
     "des": 3,
     "icon": "",
@@ -7139,7 +7139,7 @@
   },
   {
     "key": 30800,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30790,
     "id_after": 0,
@@ -7183,7 +7183,7 @@
   },
   {
     "key": 30810,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30820,
@@ -7227,7 +7227,7 @@
   },
   {
     "key": 30820,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30810,
     "id_after": 30830,
@@ -7271,7 +7271,7 @@
   },
   {
     "key": 30830,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30820,
     "id_after": 30840,
@@ -7315,7 +7315,7 @@
   },
   {
     "key": 30840,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30830,
     "id_after": 30850,
@@ -7359,7 +7359,7 @@
   },
   {
     "key": 30850,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30840,
     "id_after": 30860,
@@ -7403,7 +7403,7 @@
   },
   {
     "key": 30860,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30850,
     "id_after": 30870,
@@ -7447,7 +7447,7 @@
   },
   {
     "key": 30870,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30860,
     "id_after": 30880,
@@ -7491,7 +7491,7 @@
   },
   {
     "key": 30880,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30870,
     "id_after": 30890,
@@ -7535,7 +7535,7 @@
   },
   {
     "key": 30890,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30880,
     "id_after": 0,
@@ -7579,7 +7579,7 @@
   },
   {
     "key": 30900,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30910,
@@ -7623,7 +7623,7 @@
   },
   {
     "key": 30910,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30900,
     "id_after": 30920,
@@ -7667,7 +7667,7 @@
   },
   {
     "key": 30920,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30910,
     "id_after": 30930,
@@ -7711,7 +7711,7 @@
   },
   {
     "key": 30930,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30920,
     "id_after": 0,
@@ -7755,7 +7755,7 @@
   },
   {
     "key": 30940,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 20010,
     "id_after": 30950,
@@ -7799,7 +7799,7 @@
   },
   {
     "key": 30950,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30940,
     "id_after": 30960,
@@ -7843,7 +7843,7 @@
   },
   {
     "key": 30960,
-    "lock": 1,
+    "lock": 999,
     "lockend": 0,
     "ontxe": 30950,
     "id_after": 0,
diff --git a/modules/rtask/module.go b/modules/rtask/module.go
index 76ebd829b..bbd605f0e 100644
--- a/modules/rtask/module.go
+++ b/modules/rtask/module.go
@@ -233,7 +233,7 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
 			handle := &rtaskCondHandle{
 				condId: v.Id,
 				verify: this.modelRtask.verifyRtype111,
-				update: this.modelRtaskRecord.addUpdate,
+				update: this.modelRtaskRecord.overrideUpdate,
 			}
 			handles = append(handles, handle)
 			this.registerVerifyHandle(v.Id, handle)
@@ -241,7 +241,7 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
 			handle := &rtaskCondHandle{
 				condId: v.Id,
 				verify: this.modelRtask.verifyRtype123,
-				update: this.modelRtaskRecord.addUpdate,
+				update: this.modelRtaskRecord.overrideUpdate,
 			}
 			handles = append(handles, handle)
 			this.registerVerifyHandle(v.Id, handle)
@@ -396,7 +396,7 @@ func (this *ModuleRtask) processTasks(session comm.IUserSession, taskParams ...*
 		return
 	}
 	if sociaty, ok := sociatyModule.(comm.ISociaty); ok {
-		if err2 := sociaty.TaskcondNotify(uid, condIds); err2 != nil {
+		if err2 := sociaty.TaskcondNotify(uid, condIdsForNotify); err2 != nil {
 
 		}
 	}
@@ -436,7 +436,7 @@ func (this *ModuleRtask) CheckCondis(uid string, condiIds ...int32) (cids []int3
 				errors.Errorf("conf not found condiID: %v", condId)
 				return
 			}
-			if r.Data[0] > conf.Data1 {
+			if r.Data[0] >= conf.Data1 {
 				cids = append(cids, condId)
 			}
 		}
diff --git a/modules/rtask/verifyHandle.go b/modules/rtask/verifyHandle.go
index 9a6f34291..b41969ad3 100644
--- a/modules/rtask/verifyHandle.go
+++ b/modules/rtask/verifyHandle.go
@@ -476,7 +476,6 @@ func (this *ModelRtask) verifyRtype111(uid string, cfg *cfg.GameRdtaskCondiData,
 		for _, hero := range ml.GetHeroList(uid) {
 			if ok, err = soGreatEqual(hero.Lv, cfg.Data2); ok {
 				count++
-				return
 			}
 		}
 	}