上传新版本

json/game_buzkashimount.json

@@ -13,7 +13,7 @@
     "Color": 5,
     "Img": "tx_by_54101",
     "access": [
-      166
+      10041
     ],
     "model": "",
     "controller": "",
@@ -45,7 +45,7 @@
     "Color": 5,
     "Img": "tx_by_54101",
     "access": [
-      166
+      10041
     ],
     "model": "",
     "controller": "",
@@ -77,7 +77,7 @@
     "Color": 5,
     "Img": "tx_by_54101",
     "access": [
-      166
+      10041
     ],
     "model": "54101_3",
     "controller": "Person/mount/10000M_54101.controller",
@@ -109,7 +109,7 @@
     "Color": 3,
     "Img": "tx_by_54102",
     "access": [
-      166
+      10041
     ],
     "model": "",
     "controller": "",
@@ -141,7 +141,7 @@
     "Color": 3,
     "Img": "tx_by_54102",
     "access": [
-      166
+      10041
     ],
     "model": "",
     "controller": "",
@@ -173,7 +173,7 @@
     "Color": 3,
     "Img": "tx_by_54102",
     "access": [
-      166
+      10041
     ],
     "model": "54102_3",
     "controller": "Person/mount/10000M_54101.controller",
@@ -205,7 +205,7 @@
     "Color": 3,
     "Img": "tx_by_54103",
     "access": [
-      166
+      10041
     ],
     "model": "54103_1",
     "controller": "Person/mount/10000M_54101.controller",
@@ -237,7 +237,7 @@
     "Color": 3,
     "Img": "tx_by_54103",
     "access": [
-      166
+      10041
     ],
     "model": "54103_2",
     "controller": "Person/mount/10000M_54101.controller",
@@ -269,7 +269,7 @@
     "Color": 3,
     "Img": "tx_by_54103",
     "access": [
-      166
+      10041
     ],
     "model": "54103_3",
     "controller": "Person/mount/10000M_54101.controller",

json/game_combatlevel.json

@@ -267,7 +267,7 @@
   },
   {
     "id": 10008,
-    "scene": "leveldemo_fcamer_1_8",
+    "scene": "leveldemo_fcamer_dragoncave",
     "levelname": "Save the holy tree",
     "maintask": [
       11187001

json/game_dragonplay.json

@@ -1,125 +1,107 @@
 [
   {
     "key": 1,
-    "id": "20030001",
+    "id": "20030003",
-    "grow": 1,
     "type": 1,
-    "exp": 100,
+    "interact": 1,
-    "time": 3,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 2,
+    "id": "20030003",
+    "type": 1,
+    "interact": 2,
+    "exp": 300,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 3,
+    "id": "20030003",
+    "type": 2,
+    "interact": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 4,
+    "id": "20030003",
+    "type": 2,
+    "interact": 2,
+    "exp": 200,
+    "time": 1,
     "cd": 0,
     "deplete": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "gold",
+        "t": "24012001",
         "n": 1
       }
     ],
     "bubble": 14005,
     "group": 0
   },
-  {
-    "key": 2,
-    "id": "20030001",
-    "grow": 2,
-    "type": 1,
-    "exp": 100,
-    "time": 3,
-    "cd": 0,
-    "deplete": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 4
-      }
-    ],
-    "bubble": 14005,
-    "group": 0
-  },
-  {
-    "key": 3,
-    "id": "20030001",
-    "grow": 2,
-    "type": 2,
-    "exp": 100,
-    "time": 3,
-    "cd": 0,
-    "deplete": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 5
-      }
-    ],
-    "bubble": 14005,
-    "group": 0
-  },
-  {
-    "key": 4,
-    "id": "20030001",
-    "grow": 2,
-    "type": 3,
-    "exp": 100,
-    "time": 3,
-    "cd": 0,
-    "deplete": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 6
-      }
-    ],
-    "bubble": 14005,
-    "group": 0
-  },
   {
     "key": 5,
-    "id": "20030001",
+    "id": "20030003",
-    "grow": 2,
+    "type": 2,
-    "type": 4,
+    "interact": 3,
-    "exp": 100,
+    "exp": 200,
-    "time": 3,
+    "time": 1,
     "cd": 0,
-    "deplete": [
+    "deplete": [],
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 7
-      }
-    ],
     "bubble": 14005,
     "group": 0
   },
   {
     "key": 6,
-    "id": "20030001",
+    "id": "20030003",
-    "grow": 3,
+    "type": 2,
-    "type": 1,
+    "interact": 4,
     "exp": 100,
-    "time": 3,
+    "time": 1,
     "cd": 0,
-    "deplete": [
+    "deplete": [],
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8
-      }
-    ],
     "bubble": 14005,
     "group": 0
   },
   {
     "key": 7,
-    "id": "20030001",
+    "id": "20030003",
-    "grow": 3,
+    "type": 3,
-    "type": 2,
+    "interact": 1,
-    "exp": 100,
+    "exp": 200,
-    "time": 3,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 8,
+    "id": "20030003",
+    "type": 3,
+    "interact": 2,
+    "exp": 300,
+    "time": 1,
     "cd": 0,
     "deplete": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "gold",
+        "t": "24012002",
-        "n": 9
+        "n": 1
       }
     ],
     "bubble": 14005,
@@ -128,18 +110,144 @@
   {
     "key": 9,
     "id": "20030001",
-    "grow": 3,
+    "type": 1,
-    "type": 5,
+    "interact": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 10,
+    "id": "20030001",
+    "type": 1,
+    "interact": 2,
+    "exp": 300,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 11,
+    "id": "20030001",
+    "type": 2,
+    "interact": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 12,
+    "id": "20030001",
+    "type": 2,
+    "interact": 2,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 13,
+    "id": "20030001",
+    "type": 2,
+    "interact": 3,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 14,
+    "id": "20030001",
+    "type": 2,
+    "interact": 4,
     "exp": 100,
-    "time": 3,
+    "time": 1,
-    "cd": 7200,
+    "cd": 0,
-    "deplete": [
+    "deplete": [],
-      {
+    "bubble": 14005,
-        "a": "attr",
+    "group": 0
-        "t": "gold",
+  },
-        "n": 11
+  {
-      }
+    "key": 15,
-    ],
+    "id": "20030001",
+    "type": 3,
+    "interact": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 16,
+    "id": "20030001",
+    "type": 3,
+    "interact": 2,
+    "exp": 300,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 17,
+    "id": "20030002",
+    "type": 1,
+    "interact": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 18,
+    "id": "20030002",
+    "type": 2,
+    "interact": 2,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 19,
+    "id": "20030002",
+    "type": 3,
+    "interact": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 20,
+    "id": "20030002",
+    "type": 3,
+    "interact": 2,
+    "exp": 300,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
     "bubble": 14005,
     "group": 0
   }

json/game_gameid.json

@@ -0,0 +1,70 @@
+[
+  {
+    "id": 10001,
+    "type": 1
+  },
+  {
+    "id": 10002,
+    "type": 1
+  },
+  {
+    "id": 10003,
+    "type": 1
+  },
+  {
+    "id": 10004,
+    "type": 1
+  },
+  {
+    "id": 10005,
+    "type": 1
+  },
+  {
+    "id": 10006,
+    "type": 1
+  },
+  {
+    "id": 10007,
+    "type": 1
+  },
+  {
+    "id": 10008,
+    "type": 1
+  },
+  {
+    "id": 10009,
+    "type": 1
+  },
+  {
+    "id": 10010,
+    "type": 1
+  },
+  {
+    "id": 20001,
+    "type": 2
+  },
+  {
+    "id": 20002,
+    "type": 2
+  },
+  {
+    "id": 20003,
+    "type": 2
+  },
+  {
+    "id": 20004,
+    "type": 2
+  },
+  {
+    "id": 20005,
+    "type": 2
+  },
+  {
+    "id": 20006,
+    "type": 2
+  },
+  {
+    "id": 20007,
+    "type": 2
+  }
+]

json/game_gameklotski.json

@@ -0,0 +1,528 @@
+[
+  {
+    "id": 10001,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 4,
+        "v": 4
+      },
+      {
+        "k": 14,
+        "v": 1
+      },
+      {
+        "k": 20,
+        "v": 2
+      },
+      {
+        "k": 23,
+        "v": 4
+      }
+    ],
+    "finish": 26
+  },
+  {
+    "id": 10002,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 3,
+        "v": 1
+      },
+      {
+        "k": 10,
+        "v": 1
+      },
+      {
+        "k": 12,
+        "v": 1
+      },
+      {
+        "k": 3,
+        "v": 2
+      },
+      {
+        "k": 15,
+        "v": 3
+      },
+      {
+        "k": 17,
+        "v": 3
+      },
+      {
+        "k": 18,
+        "v": 1
+      },
+      {
+        "k": 24,
+        "v": 2
+      },
+      {
+        "k": 27,
+        "v": 3
+      },
+      {
+        "k": 29,
+        "v": 3
+      }
+    ],
+    "finish": 26
+  },
+  {
+    "id": 10003,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 3,
+        "v": 1
+      },
+      {
+        "k": 10,
+        "v": 1
+      },
+      {
+        "k": 12,
+        "v": 1
+      },
+      {
+        "k": 3,
+        "v": 2
+      },
+      {
+        "k": 15,
+        "v": 3
+      },
+      {
+        "k": 17,
+        "v": 3
+      },
+      {
+        "k": 18,
+        "v": 1
+      },
+      {
+        "k": 24,
+        "v": 2
+      },
+      {
+        "k": 27,
+        "v": 3
+      },
+      {
+        "k": 29,
+        "v": 3
+      }
+    ],
+    "finish": 26
+  },
+  {
+    "id": 10004,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 3,
+        "v": 1
+      },
+      {
+        "k": 10,
+        "v": 1
+      },
+      {
+        "k": 12,
+        "v": 1
+      },
+      {
+        "k": 3,
+        "v": 2
+      },
+      {
+        "k": 15,
+        "v": 3
+      },
+      {
+        "k": 17,
+        "v": 3
+      },
+      {
+        "k": 18,
+        "v": 1
+      },
+      {
+        "k": 24,
+        "v": 2
+      },
+      {
+        "k": 27,
+        "v": 3
+      },
+      {
+        "k": 29,
+        "v": 3
+      }
+    ],
+    "finish": 26
+  },
+  {
+    "id": 10005,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 3,
+        "v": 1
+      },
+      {
+        "k": 10,
+        "v": 1
+      },
+      {
+        "k": 12,
+        "v": 1
+      },
+      {
+        "k": 3,
+        "v": 2
+      },
+      {
+        "k": 15,
+        "v": 3
+      },
+      {
+        "k": 17,
+        "v": 3
+      },
+      {
+        "k": 18,
+        "v": 1
+      },
+      {
+        "k": 24,
+        "v": 2
+      },
+      {
+        "k": 27,
+        "v": 3
+      },
+      {
+        "k": 29,
+        "v": 3
+      }
+    ],
+    "finish": 26
+  },
+  {
+    "id": 10006,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 3,
+        "v": 1
+      },
+      {
+        "k": 10,
+        "v": 1
+      },
+      {
+        "k": 12,
+        "v": 1
+      },
+      {
+        "k": 3,
+        "v": 2
+      },
+      {
+        "k": 15,
+        "v": 3
+      },
+      {
+        "k": 17,
+        "v": 3
+      },
+      {
+        "k": 18,
+        "v": 1
+      },
+      {
+        "k": 24,
+        "v": 2
+      },
+      {
+        "k": 27,
+        "v": 3
+      },
+      {
+        "k": 29,
+        "v": 3
+      }
+    ],
+    "finish": 26
+  },
+  {
+    "id": 10007,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 3,
+        "v": 1
+      },
+      {
+        "k": 10,
+        "v": 1
+      },
+      {
+        "k": 12,
+        "v": 1
+      },
+      {
+        "k": 3,
+        "v": 2
+      },
+      {
+        "k": 15,
+        "v": 3
+      },
+      {
+        "k": 17,
+        "v": 3
+      },
+      {
+        "k": 18,
+        "v": 1
+      },
+      {
+        "k": 24,
+        "v": 2
+      },
+      {
+        "k": 27,
+        "v": 3
+      },
+      {
+        "k": 29,
+        "v": 3
+      }
+    ],
+    "finish": 26
+  },
+  {
+    "id": 10008,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 3,
+        "v": 1
+      },
+      {
+        "k": 10,
+        "v": 1
+      },
+      {
+        "k": 12,
+        "v": 1
+      },
+      {
+        "k": 3,
+        "v": 2
+      },
+      {
+        "k": 15,
+        "v": 3
+      },
+      {
+        "k": 17,
+        "v": 3
+      },
+      {
+        "k": 18,
+        "v": 1
+      },
+      {
+        "k": 24,
+        "v": 2
+      },
+      {
+        "k": 27,
+        "v": 3
+      },
+      {
+        "k": 29,
+        "v": 3
+      }
+    ],
+    "finish": 26
+  },
+  {
+    "id": 10009,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 3,
+        "v": 1
+      },
+      {
+        "k": 10,
+        "v": 1
+      },
+      {
+        "k": 12,
+        "v": 1
+      },
+      {
+        "k": 3,
+        "v": 2
+      },
+      {
+        "k": 15,
+        "v": 3
+      },
+      {
+        "k": 17,
+        "v": 3
+      },
+      {
+        "k": 18,
+        "v": 1
+      },
+      {
+        "k": 24,
+        "v": 2
+      },
+      {
+        "k": 27,
+        "v": 3
+      },
+      {
+        "k": 29,
+        "v": 3
+      }
+    ],
+    "finish": 26
+  },
+  {
+    "id": 10010,
+    "chequer": {
+      "k": 6,
+      "v": 6
+    },
+    "start": 2,
+    "blockstype": [
+      {
+        "k": 2,
+        "v": 3
+      },
+      {
+        "k": 3,
+        "v": 1
+      },
+      {
+        "k": 10,
+        "v": 1
+      },
+      {
+        "k": 12,
+        "v": 1
+      },
+      {
+        "k": 3,
+        "v": 2
+      },
+      {
+        "k": 15,
+        "v": 3
+      },
+      {
+        "k": 17,
+        "v": 3
+      },
+      {
+        "k": 18,
+        "v": 1
+      },
+      {
+        "k": 24,
+        "v": 2
+      },
+      {
+        "k": 27,
+        "v": 3
+      },
+      {
+        "k": 29,
+        "v": 3
+      }
+    ],
+    "finish": 26
+  }
+]

json/game_gm.json

@@ -418,5 +418,25 @@
     },
     "data": "21",
     "prefix": "bingo:mts,20030003,{0}"
+  },
+  {
+    "id": 45,
+    "type": 1,
+    "text": {
+      "key": "GM_GM_text_45",
+      "text": "解锁所有的条件"
+    },
+    "data": " ",
+    "prefix": "bingo:opencond"
+  },
+  {
+    "id": 46,
+    "type": 4,
+    "text": {
+      "key": "GM_GM_text_46",
+      "text": "武馆"
+    },
+    "data": "137",
+    "prefix": ""
   }
 ]

json/game_initial.json

@@ -35,7 +35,7 @@
       {
         "a": "mts",
         "t": "20030001",
-        "n": 21
+        "n": 3
       }
     ]
   },
@@ -65,7 +65,7 @@
       {
         "a": "mts",
         "t": "20030002",
-        "n": 21
+        "n": 3
       }
     ]
   },

json/game_item.json

@@ -19809,7 +19809,7 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 0,
-    "img": "",
+    "img": "item_24012001",
     "intr": {
       "key": "item_item_intr_408",
       "text": ""
@@ -19855,7 +19855,7 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 0,
-    "img": "",
+    "img": "item_24012002",
     "intr": {
       "key": "item_item_intr_409",
       "text": ""

json/game_itemlink.json

@@ -516,7 +516,7 @@
       "text": "获取体力"
     },
     "desc": {
-      "key": "itemlink_itemlink_desc_30",
+      "key": "itemlink_itemlink_desc_31",
       "text": "打开购买使用体力"
     },
     "jumpid": 10040,
@@ -525,5 +525,22 @@
       "text": "打开"
     },
     "icon": "icon_zm"
+  },
+  {
+    "id": 10041,
+    "title": {
+      "key": "itemlink_itemlink_title_32",
+      "text": "活动获取"
+    },
+    "desc": {
+      "key": "itemlink_itemlink_desc_32",
+      "text": "运营活动中获取"
+    },
+    "jumpid": 0,
+    "btnTitle": {
+      "key": "itemlink_itemlink_button_1",
+      "text": "立即前往"
+    },
+    "icon": "icon_zm"
   }
 ]

json/game_opencond.json

@@ -1650,7 +1650,7 @@
     "main": [
       {
         "key": 1,
-        "param": 30
+        "param": 70
       }
     ],
     "wkqbx": 0,
@@ -1876,7 +1876,12 @@
       "key": "opencond_opencond_name_83",
       "text": "无极塔"
     },
-    "main": [],
+    "main": [
+      {
+        "key": 1,
+        "param": 1
+      }
+    ],
     "wkqbx": 0,
     "kqbx": 0,
     "img": "",

json/game_rdtasknpc.json

@@ -319,13 +319,13 @@
     "heroid": 44004,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "20020_熊猫_船甲板",
+      "主线入口_原石",
       "905"
     ],
     "event": [
       2,
-      10040
+      10020
     ],
     "goto": 0
   },
@@ -355,7 +355,7 @@
     ],
     "event": [
       2,
-      10060
+      10040
     ],
     "goto": 0
   },
@@ -380,10 +380,12 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
+      "20020_熊猫_船甲板",
       "901"
     ],
     "event": [
-      0
+      2,
+      10050
     ],
     "goto": 0
   },
@@ -393,27 +395,57 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "20020_小怪_船甲板",
+      "20020_熊猫_船甲板",
       "901"
     ],
     "event": [
       2,
-      10042
+      10060
     ],
     "goto": 0
   },
   {
     "id": 10024,
-    "heroid": 51004,
+    "heroid": 25001,
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "20020_小怪_船甲板",
+      "恐惧碎片调查点1",
       "901"
     ],
     "event": [
       2,
-      10050
+      10070
+    ],
+    "goto": 0
+  },
+  {
+    "id": 10025,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "恐惧碎片调查点2",
+      "901"
+    ],
+    "event": [
+      2,
+      10080
+    ],
+    "goto": 0
+  },
+  {
+    "id": 10026,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "恐惧碎片调查点3",
+      "901"
+    ],
+    "event": [
+      2,
+      10090
     ],
     "goto": 0
   },
@@ -443,7 +475,7 @@
     ],
     "event": [
       2,
-      10090
+      10100
     ],
     "goto": 0
   },
@@ -486,7 +518,7 @@
     ],
     "event": [
       2,
-      10120
+      10130
     ],
     "goto": 0
   },
@@ -496,18 +528,18 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "20040_坠落希卡普",
+      "20020_邦尼兔_常驻",
       "901"
     ],
     "event": [
-      2,
+      1,
-      10140
+      103
     ],
     "goto": 0
   },
   {
     "id": 10048,
-    "heroid": 0,
+    "heroid": 25001,
     "Levelid": 0,
     "datas": [
       "GameMain",
@@ -518,6 +550,96 @@
     ],
     "goto": 0
   },
+  {
+    "id": 100411,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "20020_熊猫_船甲板",
+      "901"
+    ],
+    "event": [
+      2,
+      10150
+    ],
+    "goto": 0
+  },
+  {
+    "id": 100414,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-招募",
+      "901"
+    ],
+    "event": [
+      2,
+      10160
+    ],
+    "goto": 0
+  },
+  {
+    "id": 100418,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "20020_熊猫_船甲板",
+      "901"
+    ],
+    "event": [
+      2,
+      10162
+    ],
+    "goto": 0
+  },
+  {
+    "id": 100421,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "20020_熊猫_船甲板",
+      "901"
+    ],
+    "event": [
+      2,
+      10170
+    ],
+    "goto": 0
+  },
+  {
+    "id": 100424,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "恐惧灵聚集体",
+      "901"
+    ],
+    "event": [
+      1,
+      103
+    ],
+    "goto": 0
+  },
+  {
+    "id": 100428,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "20020_熊猫_船甲板",
+      "901"
+    ],
+    "event": [
+      2,
+      10180
+    ],
+    "goto": 0
+  },
   {
     "id": 10050,
     "heroid": 24004,
@@ -529,7 +651,7 @@
     ],
     "event": [
       2,
-      10150
+      10200
     ],
     "goto": 0
   },
@@ -537,15 +659,8 @@
     "id": 10054,
     "heroid": 24004,
     "Levelid": 0,
-    "datas": [
+    "datas": [],
-      "GameMain",
+    "event": [],
-      "20050_恐惧灵",
-      "901"
-    ],
-    "event": [
-      2,
-      10120
-    ],
     "goto": 0
   },
   {
@@ -559,7 +674,7 @@
     ],
     "event": [
       2,
-      10160
+      10201
     ],
     "goto": 0
   },
@@ -574,7 +689,7 @@
     ],
     "event": [
       2,
-      10180
+      10131
     ],
     "goto": 0
   },
@@ -589,7 +704,7 @@
     ],
     "event": [
       2,
-      10190
+      10132
     ],
     "goto": 0
   },
@@ -604,7 +719,7 @@
     ],
     "event": [
       2,
-      10200
+      10140
     ],
     "goto": 0
   },
@@ -778,7 +893,7 @@
     ],
     "event": [
       2,
-      10210
+      10202
     ],
     "goto": 0
   },

json/game_skillafteratk.json

@@ -894,7 +894,7 @@
     "Argu": [
       1,
       4,
-      1500
+      1800
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -943,7 +943,7 @@
     "Argu": [
       1,
       4,
-      1500
+      1800
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -992,7 +992,7 @@
     "Argu": [
       1,
       4,
-      1500
+      2100
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -1162,7 +1162,8 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [
-      235002312
+      235002312,
+      235002313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -1182,14 +1183,11 @@
     "Type": 8,
     "Argu": [
       3,
-      0,
       1,
       800
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      235002313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -1237,7 +1235,8 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [
-      235002322
+      235002322,
+      235002313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -1261,9 +1260,7 @@
       800
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      235002313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -1287,7 +1284,8 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [
-      235002332
+      235002332,
+      235002313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -1311,9 +1309,7 @@
       900
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      235002313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -1337,7 +1333,8 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [
-      235002342
+      235002342,
+      235002313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -1361,9 +1358,7 @@
       900
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      235002313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -1387,7 +1382,8 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [
-      235002352
+      235002352,
+      235002313
     ],
     "FailFollowSK": [],
     "MustHit": false,
@@ -1411,9 +1407,7 @@
       1000
     ],
     "FollowSK": [],
-    "SucFollowSK": [
+    "SucFollowSK": [],
-      235002313
-    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -18668,7 +18662,7 @@
     "Type": 3,
     "Argu": [
       390001007,
-      1000,
+      800,
       1,
       2
     ],
@@ -18692,7 +18686,7 @@
     "Type": 3,
     "Argu": [
       390001401,
-      1000,
+      800,
       1,
       2
     ],
@@ -19665,6 +19659,7 @@
     "Type": 33,
     "Argu": [
       3,
+      -1,
       -1
     ],
     "FollowSK": [],
@@ -19862,7 +19857,7 @@
     "Type": 3,
     "Argu": [
       390001006,
-      750,
+      500,
       1,
       2
     ],
@@ -20287,7 +20282,7 @@
       390001105,
       1000,
       1,
-      2
+      1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -23434,7 +23429,7 @@
   {
     "Id": 243003222,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -23459,7 +23454,7 @@
   {
     "Id": 243003232,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -23484,7 +23479,7 @@
   {
     "Id": 243003242,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -23509,7 +23504,7 @@
   {
     "Id": 243003252,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -23584,7 +23579,7 @@
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
-    "Order": "",
+    "Order": "PropertyUp=3",
     "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 5,
@@ -23595,7 +23590,9 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [],
-    "FailFollowSK": [],
+    "FailFollowSK": [
+      243003312
+    ],
     "MustHit": false,
     "DpsRevisiType": 0,
     "DpsCondition": "",
@@ -23607,7 +23604,7 @@
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
-    "Order": "",
+    "Order": "PropertyUp=3",
     "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 5,
@@ -23618,7 +23615,9 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [],
-    "FailFollowSK": [],
+    "FailFollowSK": [
+      243003312
+    ],
     "MustHit": false,
     "DpsRevisiType": 0,
     "DpsCondition": "",
@@ -23630,7 +23629,7 @@
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
-    "Order": "",
+    "Order": "PropertyUp=3",
     "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 5,
@@ -23641,7 +23640,9 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [],
-    "FailFollowSK": [],
+    "FailFollowSK": [
+      243003312
+    ],
     "MustHit": false,
     "DpsRevisiType": 0,
     "DpsCondition": "",
@@ -23653,7 +23654,7 @@
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
-    "Order": "",
+    "Order": "PropertyUp=3",
     "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 5,
@@ -23664,7 +23665,9 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [],
-    "FailFollowSK": [],
+    "FailFollowSK": [
+      243003312
+    ],
     "MustHit": false,
     "DpsRevisiType": 0,
     "DpsCondition": "",
@@ -25620,7 +25623,7 @@
     "From": 3,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
@@ -29525,7 +29528,7 @@
     "From": 2,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
@@ -29549,13 +29552,13 @@
     "From": 3,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
       414002212,
-      1,
+      -1,
-      1
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -29572,13 +29575,36 @@
     "From": 1,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
       414002213,
+      -1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 214002214,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 5,
+    "Argu": [
       1,
-      1
+      2,
+      100
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -29603,8 +29629,8 @@
       4,
       500,
       1,
-      11,
+      18,
-      18
+      150
     ],
     "FollowSK": [
       214002312
@@ -29657,8 +29683,8 @@
       4,
       600,
       1,
-      11,
+      18,
-      18
+      150
     ],
     "FollowSK": [
       214002312
@@ -29687,8 +29713,8 @@
       4,
       700,
       1,
-      11,
+      18,
-      18
+      150
     ],
     "FollowSK": [
       214002312
@@ -29717,8 +29743,8 @@
       4,
       800,
       1,
-      11,
+      18,
-      18
+      150
     ],
     "FollowSK": [
       214002312
@@ -29747,8 +29773,8 @@
       4,
       900,
       1,
-      11,
+      18,
-      18
+      150
     ],
     "FollowSK": [
       214002312
@@ -32550,12 +32576,12 @@
     "ExecuteCnt": 1,
     "Type": 23,
     "Argu": [
-      2,
-      4,
-      1800,
       1,
+      4,
+      8000,
       2,
-      80
+      2,
+      600
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -32688,10 +32714,10 @@
       4,
       1500
     ],
-    "FollowSK": [
+    "FollowSK": [],
+    "SucFollowSK": [
       215003312
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -32709,12 +32735,12 @@
     "ExecuteCnt": 1,
     "Type": 23,
     "Argu": [
-      2,
+      1,
       4,
-      1800,
+      8000,
-      1,
+      2,
-      1,
+      2,
-      80
+      600
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -32740,7 +32766,9 @@
       1500
     ],
     "FollowSK": [],
-    "SucFollowSK": [],
+    "SucFollowSK": [
+      215003314
+    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -32754,20 +32782,18 @@
     "From": 2,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 23,
     "Argu": [
-      2,
-      4,
-      1800,
       1,
+      4,
+      8000,
       2,
-      80
+      2,
-    ],
+      600
-    "FollowSK": [
-      215003314
     ],
+    "FollowSK": [],
     "SucFollowSK": [
       215003315
     ],
@@ -32784,7 +32810,7 @@
     "From": 2,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 14,
     "Argu": [
@@ -32813,9 +32839,7 @@
       4,
       1550
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      215003312
-    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
@@ -32838,9 +32862,7 @@
       4,
       1600
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      215003312
-    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
@@ -32863,9 +32885,7 @@
       4,
       1650
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      215003312
-    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
@@ -32888,9 +32908,7 @@
       4,
       1700
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      215003312
-    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
@@ -32899,6 +32917,106 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
+  {
+    "Id": 215003323,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1550
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      215003315
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 215003333,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1600
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      215003315
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 215003343,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1650
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      215003315
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 215003353,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      1700
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [
+      215003315
+    ],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
   {
     "Id": 243004011,
     "EmitPR": 1000,
@@ -34052,7 +34170,7 @@
   {
     "Id": 244001214,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 12,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -34319,9 +34437,9 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 0,
+    "DpsRevisiType": 100,
     "DpsCondition": "",
-    "RevisiCondition": "EnemyNoBuff=0",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
       500
     ]
@@ -34346,9 +34464,9 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 0,
+    "DpsRevisiType": 100,
     "DpsCondition": "",
-    "RevisiCondition": "EnemyNoBuff=0",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
       500
     ]
@@ -34373,9 +34491,9 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 0,
+    "DpsRevisiType": 100,
     "DpsCondition": "",
-    "RevisiCondition": "EnemyNoBuff=0",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
       500
     ]
@@ -34400,9 +34518,9 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 0,
+    "DpsRevisiType": 100,
     "DpsCondition": "",
-    "RevisiCondition": "EnemyNoBuff=0",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
       500
     ]
@@ -34427,9 +34545,9 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 0,
+    "DpsRevisiType": 100,
     "DpsCondition": "",
-    "RevisiCondition": "EnemyNoBuff=0",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
       500
     ]
@@ -34495,10 +34613,10 @@
       1,
       1000
     ],
-    "FollowSK": [
+    "FollowSK": [],
+    "SucFollowSK": [
       235004213
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -34532,7 +34650,7 @@
   {
     "Id": 235004311,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -34549,17 +34667,17 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 102,
+    "DpsRevisiType": 101,
     "DpsCondition": "",
-    "RevisiCondition": "",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
-      100
+      1000
     ]
   },
   {
     "Id": 235004321,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -34576,17 +34694,17 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 102,
+    "DpsRevisiType": 101,
     "DpsCondition": "",
-    "RevisiCondition": "",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
-      100
+      1000
     ]
   },
   {
     "Id": 235004331,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -34603,17 +34721,17 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 102,
+    "DpsRevisiType": 101,
     "DpsCondition": "",
-    "RevisiCondition": "",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
-      100
+      1000
     ]
   },
   {
     "Id": 235004341,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -34630,17 +34748,17 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 102,
+    "DpsRevisiType": 101,
     "DpsCondition": "",
-    "RevisiCondition": "",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
-      100
+      1000
     ]
   },
   {
     "Id": 235004351,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -34657,11 +34775,11 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 102,
+    "DpsRevisiType": 101,
     "DpsCondition": "",
-    "RevisiCondition": "",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
-      100
+      1000
     ]
   },
   {
@@ -34682,11 +34800,11 @@
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
-    "DpsRevisiType": 102,
+    "DpsRevisiType": 101,
     "DpsCondition": "",
-    "RevisiCondition": "",
+    "RevisiCondition": "EnemyNoBuff=3",
     "RevisiParams": [
-      100
+      1000
     ]
   },
   {
@@ -35575,7 +35693,7 @@
       "EnemyHasBuff=390001401"
     ],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
@@ -54632,7 +54750,11 @@
     "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 33,
-    "Argu": [],
+    "Argu": [
+      3,
+      1,
+      1
+    ],
     "FollowSK": [],
     "SucFollowSK": [],
     "FailFollowSK": [],

json/game_skillbuff.json

@@ -3764,7 +3764,7 @@
     },
     "Desc": {
       "key": "skill_skill_buff_Desc_390001431",
-      "text": "下一次攻击暴击率提升100%。"
+      "text": "下一次攻击暴击率提升100%，并提高一定暴击伤害。"
     },
     "BuffType": 67,
     "EffectArgu": [

json/game_skillpassive.json

@@ -1256,7 +1256,7 @@
   {
     "Id": 433003211,
     "When": 16,
-    "FromCheck": "Target=1",
+    "FromCheck": "Target=4",
     "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
@@ -1762,7 +1762,7 @@
     "Id": 424001111,
     "When": 15,
     "FromCheck": "Target=3",
-    "TargetCheck": "Target=2",
+    "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "SkillID=224001111",
     "BuffCheck": "",
@@ -2280,8 +2280,12 @@
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
-    "MaxEmitTimesInRound": 1,
+    "MaxEmitTimesInRound": 99,
-    "Callback": []
+    "Callback": [
+      1,
+      1000,
+      214002214
+    ]
   },
   {
     "Id": 414002212,
@@ -2295,19 +2299,20 @@
     "AddCon": [],
     "PasPr": 150,
     "PasCorrection": 0,
-    "Type": "CallSkillPas",
+    "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
-    "MaxEmitTimesInRound": 1,
+    "MaxEmitTimesInRound": 99,
     "Callback": [
-      114002311
+      1,
+      1000
     ]
   },
   {
     "Id": 414002213,
     "When": 12,
     "FromCheck": "Target=2,HasBuff=390001426",
-    "TargetCheck": "Target=1",
+    "TargetCheck": "Target=4",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -2315,7 +2320,7 @@
     "AddCon": [],
     "PasPr": 600,
     "PasCorrection": 0,
-    "Type": "CallSkillPas",
+    "Type": "BeatBack",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 1,
@@ -2673,7 +2678,7 @@
     "Id": 435004211,
     "When": 2,
     "FromCheck": "Target=3",
-    "TargetCheck": "3",
+    "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",

json/game_topuiconfig.json

@@ -932,7 +932,18 @@
   {
     "id": "PersonalInformation",
     "subId": "",
-    "currencyField": []
+    "currencyField": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 1
+      }
+    ]
   },
   {
     "id": "PlayerNameTip",

json/game_worldtask.json

@@ -28,12 +28,18 @@
     "completetask": [
       12070010
     ],
-    "deliver_npc": 0,
+    "deliver_npc": 10018,
     "taskend_removeitem": [],
     "auto_accept": 1,
-    "tasktips": 0,
+    "tasktips": 1,
     "lock_add": 0,
-    "reword": [],
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 8200
+      }
+    ],
     "module": []
   },
   {
@@ -42,7 +48,7 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 20010,
-    "id_after": 20030,
+    "id_after": 20020,
     "group": 10,
     "exgroup": 210,
     "des": 2,
@@ -67,14 +73,59 @@
     ],
     "deliver_npc": 0,
     "taskend_removeitem": [],
-    "auto_accept": 1,
+    "auto_accept": 0,
     "tasktips": 0,
     "lock_add": 0,
     "reword": [
       {
         "a": "attr",
         "t": "gold",
-        "n": 16400
+        "n": 8200
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 20020,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 20012,
+    "id_after": 20030,
+    "group": 10,
+    "exgroup": 210,
+    "des": 2,
+    "icon": "25002",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_4",
+      "text": "采集调查"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_4",
+      "text": "在击退恐惧灵后，我们还需要额外的调查是否有残留的恐惧碎片，在它们化为恐惧灵前清除它们。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_4",
+      "text": "采集调查"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 10020,
+    "completetask": [
+      12070021,
+      12070022,
+      12070023
+    ],
+    "deliver_npc": 0,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 8200
       }
     ],
     "module": []
@@ -84,22 +135,22 @@
     "opencond": "",
     "lock": 1,
     "lockend": 999,
-    "ontxe": 20012,
+    "ontxe": 20020,
-    "id_after": 20040,
+    "id_after": 20032,
     "group": 10,
     "exgroup": 210,
     "des": 2,
-    "icon": "25001",
+    "icon": "25003",
     "task_name": {
-      "key": "worldtask_world_task_task_name_4",
+      "key": "worldtask_world_task_task_name_5",
       "text": "你就是邦尼兔？"
     },
     "task_details": {
-      "key": "worldtask_world_task_task_details_4",
+      "key": "worldtask_world_task_task_details_5",
       "text": "幸运的找到了邦尼兔，但他非常不信任你，那么就向他展示一下自己的实力，获取信任吧。"
     },
     "npctxt": {
-      "key": "worldtask_world_task_npctxt_4",
+      "key": "worldtask_world_task_npctxt_5",
       "text": "和邦尼兔聊聊"
     },
     "get_item": [],
@@ -113,7 +164,13 @@
     "auto_accept": 0,
     "tasktips": 0,
     "lock_add": 0,
-    "reword": [],
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 8200
+      }
+    ],
     "module": []
   },
   {
@@ -122,22 +179,22 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 20030,
-    "id_after": 20050,
+    "id_after": 20032,
     "group": 10,
     "exgroup": 210,
     "des": 2,
-    "icon": "25001",
+    "icon": "25004",
     "task_name": {
-      "key": "worldtask_world_task_task_name_5",
+      "key": "worldtask_world_task_task_name_6",
-      "text": "获取邦尼兔的信任"
+      "text": "再战邦尼兔"
     },
     "task_details": {
-      "key": "worldtask_world_task_task_details_5",
+      "key": "worldtask_world_task_task_details_6",
-      "text": "圣桃树的预言让邦尼兔非常焦虑，他担心反派势力随时会卷土重来，为了能和他们并肩作战，你必须获得邦尼兔的信任。"
+      "text": "邦尼兔依旧不服气，获取只有通过他的方式，才能让对方认可我们。"
     },
     "npctxt": {
-      "key": "worldtask_world_task_npctxt_5",
+      "key": "worldtask_world_task_npctxt_6",
-      "text": "和邦尼兔再次接触"
+      "text": "再次挑战邦尼兔"
     },
     "get_item": [],
     "trigger": 0,
@@ -154,12 +211,93 @@
       {
         "a": "attr",
         "t": "gold",
-        "n": 16400
+        "n": 8200
-      },
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 20041,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 20031,
+    "id_after": 20033,
+    "group": 10,
+    "exgroup": 210,
+    "des": 2,
+    "icon": "25005",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_7",
+      "text": "新的伙伴"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_7",
+      "text": "我们需要认识更多的伙伴，这会很有帮助。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_7",
+      "text": "新的伙伴"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 100411,
+    "completetask": [
+      12070041
+    ],
+    "deliver_npc": 0,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
       {
-        "a": "hero",
+        "a": "attr",
-        "t": "24004",
+        "t": "gold",
-        "n": 1
+        "n": 8200
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 20042,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 20032,
+    "id_after": 20040,
+    "group": 10,
+    "exgroup": 210,
+    "des": 2,
+    "icon": "25006",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_8",
+      "text": "黑龙与骑手"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_8",
+      "text": "名为无牙仔的黑龙带着一名骑手从天而降，同时还有更多的恐惧灵紧随而来，看上去像是在追赶黑龙。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_8",
+      "text": "击退恐惧灵"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 100421,
+    "completetask": [
+      12070042
+    ],
+    "deliver_npc": 100428,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 8200
       }
     ],
     "module": []
@@ -170,21 +308,21 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 20040,
-    "id_after": 20060,
+    "id_after": 20100,
     "group": 10,
     "exgroup": 210,
     "des": 2,
-    "icon": "25001",
+    "icon": "25008",
     "task_name": {
-      "key": "worldtask_world_task_task_name_6",
+      "key": "worldtask_world_task_task_name_10",
       "text": "菲奥娜的办法"
     },
     "task_details": {
-      "key": "worldtask_world_task_task_details_6",
+      "key": "worldtask_world_task_task_details_10",
       "text": "正当阿宝和邦尼兔斗嘴时，圣桃树旁出现一团黑气，随后恐惧灵小怪再次出现。"
     },
     "npctxt": {
-      "key": "worldtask_world_task_npctxt_6",
+      "key": "worldtask_world_task_npctxt_10",
       "text": "寻找菲奥娜"
     },
     "get_item": [],
@@ -212,55 +350,12 @@
     ],
     "module": []
   },
-  {
-    "key": 20060,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20050,
-    "id_after": 20100,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_7",
-      "text": "接下来的计划"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_7",
-      "text": "圣桃树是神圣的的通灵之所，通过它可以召唤梦工场世界所有的守护者来共同对抗反派。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_7",
-      "text": "和阿宝对话"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10060,
-    "completetask": [
-      12070060
-    ],
-    "deliver_npc": 10068,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8200
-      }
-    ],
-    "module": []
-  },
   {
     "key": 20100,
     "opencond": "",
     "lock": 1,
     "lockend": 999,
-    "ontxe": 20060,
+    "ontxe": 20050,
     "id_after": 20230,
     "group": 10,
     "exgroup": 210,
@@ -284,7 +379,7 @@
     "completetask": [
       12070120
     ],
-    "deliver_npc": 0,
+    "deliver_npc": 10108,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 0,