update

bin/json/game_buzkashimount.json

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

bin/json/game_dragonplay.json

@@ -4,8 +4,8 @@
     "id": "20030001",
     "grow": 1,
     "type": 1,
-    "exp": 100,
+    "exp": 200,
-    "time": 3,
+    "time": 1,
     "cd": 0,
     "deplete": [
       {
@@ -20,10 +20,334 @@
   {
     "key": 2,
     "id": "20030001",
+    "grow": 1,
+    "type": 2,
+    "exp": 300,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 3,
+    "id": "20030001",
     "grow": 2,
     "type": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 4,
+    "id": "20030001",
+    "grow": 2,
+    "type": 2,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 5,
+    "id": "20030001",
+    "grow": 2,
+    "type": 3,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 6,
+    "id": "20030001",
+    "grow": 2,
+    "type": 4,
     "exp": 100,
-    "time": 3,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 7,
+    "id": "20030001",
+    "grow": 3,
+    "type": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 8,
+    "id": "20030001",
+    "grow": 3,
+    "type": 2,
+    "exp": 300,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 9,
+    "id": "20030002",
+    "grow": 1,
+    "type": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 10,
+    "id": "20030002",
+    "grow": 1,
+    "type": 2,
+    "exp": 300,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 11,
+    "id": "20030002",
+    "grow": 2,
+    "type": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 12,
+    "id": "20030002",
+    "grow": 2,
+    "type": 2,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 13,
+    "id": "20030002",
+    "grow": 2,
+    "type": 3,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 14,
+    "id": "20030002",
+    "grow": 2,
+    "type": 4,
+    "exp": 100,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 15,
+    "id": "20030002",
+    "grow": 3,
+    "type": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 16,
+    "id": "20030002",
+    "grow": 3,
+    "type": 2,
+    "exp": 300,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 17,
+    "id": "20030003",
+    "grow": 1,
+    "type": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 18,
+    "id": "20030003",
+    "grow": 2,
+    "type": 2,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 2
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 19,
+    "id": "20030003",
+    "grow": 3,
+    "type": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 3
+      }
+    ],
+    "bubble": 14005,
+    "group": 0
+  },
+  {
+    "key": 20,
+    "id": "20030003",
+    "grow": 3,
+    "type": 2,
+    "exp": 300,
+    "time": 1,
     "cd": 0,
     "deplete": [
       {
@@ -34,113 +358,5 @@
     ],
     "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",
-    "grow": 2,
-    "type": 4,
-    "exp": 100,
-    "time": 3,
-    "cd": 0,
-    "deplete": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 7
-      }
-    ],
-    "bubble": 14005,
-    "group": 0
-  },
-  {
-    "key": 6,
-    "id": "20030001",
-    "grow": 3,
-    "type": 1,
-    "exp": 100,
-    "time": 3,
-    "cd": 0,
-    "deplete": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8
-      }
-    ],
-    "bubble": 14005,
-    "group": 0
-  },
-  {
-    "key": 7,
-    "id": "20030001",
-    "grow": 3,
-    "type": 2,
-    "exp": 100,
-    "time": 3,
-    "cd": 0,
-    "deplete": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 9
-      }
-    ],
-    "bubble": 14005,
-    "group": 0
-  },
-  {
-    "key": 9,
-    "id": "20030001",
-    "grow": 3,
-    "type": 5,
-    "exp": 100,
-    "time": 3,
-    "cd": 7200,
-    "deplete": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 11
-      }
-    ],
-    "bubble": 14005,
-    "group": 0
   }
 ]

bin/json/game_gm.json

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

bin/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
   },
@@ -383,7 +383,8 @@
       "901"
     ],
     "event": [
-      0
+      2,
+      10050
     ],
     "goto": 0
   },
@@ -393,27 +394,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 +474,7 @@
     ],
     "event": [
       2,
-      10090
+      10100
     ],
     "goto": 0
   },
@@ -457,8 +488,8 @@
       "901"
     ],
     "event": [
-      1,
+      2,
-      102
+      10120
     ],
     "goto": 0
   },
@@ -486,7 +517,7 @@
     ],
     "event": [
       2,
-      10120
+      10130
     ],
     "goto": 0
   },
@@ -496,7 +527,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "20040_坠落希卡普",
+      "20020_邦尼兔_常驻",
       "901"
     ],
     "event": [
@@ -507,7 +538,7 @@
   },
   {
     "id": 10048,
-    "heroid": 0,
+    "heroid": 25001,
     "Levelid": 0,
     "datas": [
       "GameMain",
@@ -518,6 +549,92 @@
     ],
     "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",
+      "901"
+    ],
+    "event": [],
+    "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": [
+      2,
+      10180
+    ],
+    "goto": 0
+  },
+  {
+    "id": 100428,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "20020_邦尼兔_常驻",
+      "901"
+    ],
+    "event": [
+      2,
+      10190
+    ],
+    "goto": 0
+  },
   {
     "id": 10050,
     "heroid": 24004,
@@ -529,7 +646,7 @@
     ],
     "event": [
       2,
-      10150
+      10200
     ],
     "goto": 0
   },
@@ -537,15 +654,8 @@
     "id": 10054,
     "heroid": 24004,
     "Levelid": 0,
-    "datas": [
+    "datas": [],
-      "GameMain",
+    "event": [],
-      "20050_恐惧灵",
-      "901"
-    ],
-    "event": [
-      2,
-      10120
-    ],
     "goto": 0
   },
   {
@@ -559,7 +669,7 @@
     ],
     "event": [
       2,
-      10160
+      10210
     ],
     "goto": 0
   },
@@ -574,7 +684,7 @@
     ],
     "event": [
       2,
-      10180
+      10131
     ],
     "goto": 0
   },
@@ -589,7 +699,7 @@
     ],
     "event": [
       2,
-      10190
+      10132
     ],
     "goto": 0
   },
@@ -604,7 +714,7 @@
     ],
     "event": [
       2,
-      10200
+      10140
     ],
     "goto": 0
   },
@@ -778,7 +888,7 @@
     ],
     "event": [
       2,
-      10210
+      10230
     ],
     "goto": 0
   },

bin/json/game_skillafteratk.json

@@ -19665,6 +19665,7 @@
     "Type": 33,
     "Argu": [
       3,
+      -1,
       -1
     ],
     "FollowSK": [],
@@ -23434,7 +23435,7 @@
   {
     "Id": 243003222,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -23459,7 +23460,7 @@
   {
     "Id": 243003232,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -23484,7 +23485,7 @@
   {
     "Id": 243003242,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -23509,7 +23510,7 @@
   {
     "Id": 243003252,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -23584,7 +23585,7 @@
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
-    "Order": "",
+    "Order": "PropertyUp=3",
     "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 5,
@@ -23595,7 +23596,9 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [],
-    "FailFollowSK": [],
+    "FailFollowSK": [
+      243003312
+    ],
     "MustHit": false,
     "DpsRevisiType": 0,
     "DpsCondition": "",
@@ -23607,7 +23610,7 @@
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
-    "Order": "",
+    "Order": "PropertyUp=3",
     "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 5,
@@ -23618,7 +23621,9 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [],
-    "FailFollowSK": [],
+    "FailFollowSK": [
+      243003312
+    ],
     "MustHit": false,
     "DpsRevisiType": 0,
     "DpsCondition": "",
@@ -23630,7 +23635,7 @@
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
-    "Order": "",
+    "Order": "PropertyUp=3",
     "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 5,
@@ -23641,7 +23646,9 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [],
-    "FailFollowSK": [],
+    "FailFollowSK": [
+      243003312
+    ],
     "MustHit": false,
     "DpsRevisiType": 0,
     "DpsCondition": "",
@@ -23653,7 +23660,7 @@
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
-    "Order": "",
+    "Order": "PropertyUp=3",
     "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 5,
@@ -23664,7 +23671,9 @@
     ],
     "FollowSK": [],
     "SucFollowSK": [],
-    "FailFollowSK": [],
+    "FailFollowSK": [
+      243003312
+    ],
     "MustHit": false,
     "DpsRevisiType": 0,
     "DpsCondition": "",
@@ -32550,12 +32559,12 @@
     "ExecuteCnt": 1,
     "Type": 23,
     "Argu": [
-      2,
-      4,
-      1800,
       1,
+      4,
+      8000,
       2,
-      80
+      2,
+      600
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -32688,10 +32697,10 @@
       4,
       1500
     ],
-    "FollowSK": [
+    "FollowSK": [],
+    "SucFollowSK": [
       215003312
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -32709,12 +32718,12 @@
     "ExecuteCnt": 1,
     "Type": 23,
     "Argu": [
-      2,
+      1,
       4,
-      1800,
+      8000,
-      1,
+      2,
-      1,
+      2,
-      80
+      600
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -32740,7 +32749,9 @@
       1500
     ],
     "FollowSK": [],
-    "SucFollowSK": [],
+    "SucFollowSK": [
+      215003314
+    ],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -32754,20 +32765,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 +32793,7 @@
     "From": 2,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 14,
     "Argu": [
@@ -32813,9 +32822,7 @@
       4,
       1550
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      215003312
-    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
@@ -32838,9 +32845,7 @@
       4,
       1600
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      215003312
-    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
@@ -32863,9 +32868,7 @@
       4,
       1650
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      215003312
-    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
@@ -32888,9 +32891,7 @@
       4,
       1700
     ],
-    "FollowSK": [
+    "FollowSK": [],
-      215003312
-    ],
     "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
@@ -32899,6 +32900,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,
@@ -35575,7 +35676,7 @@
       "EnemyHasBuff=390001401"
     ],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
@@ -54632,7 +54733,11 @@
     "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 33,
-    "Argu": [],
+    "Argu": [
+      3,
+      1,
+      1
+    ],
     "FollowSK": [],
     "SucFollowSK": [],
     "FailFollowSK": [],

bin/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,
@@ -65,16 +71,61 @@
     "completetask": [
       12070020
     ],
-    "deliver_npc": 0,
+    "deliver_npc": 100108,
     "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,