配置同步

bin/json/game_buriedcondi.json

@@ -21250,7 +21250,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_723",
-      "text": "击退恐惧灵蜘蛛"
+      "text": "击退恐惧灵"
     },
     "type": 70,
     "valid": 0,
@@ -21667,7 +21667,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_738",
-      "text": "通关冒险之旅第一章"
+      "text": "找到解毒剂"
     },
     "type": 61,
     "valid": 1,

bin/json/game_dragonplay.json

@@ -1,102 +1,6 @@
 [
   {
     "key": 1,
-    "id": "20030003",
-    "type": 1,
-    "interact": 1,
-    "exp": 200,
-    "time": 1,
-    "cd": 0,
-    "deplete": [],
-    "bubble": 2003000311,
-    "group": 0
-  },
-  {
-    "key": 3,
-    "id": "20030003",
-    "type": 2,
-    "interact": 1,
-    "exp": 200,
-    "time": 1,
-    "cd": 0,
-    "deplete": [],
-    "bubble": 2003000321,
-    "group": 0
-  },
-  {
-    "key": 4,
-    "id": "20030003",
-    "type": 2,
-    "interact": 2,
-    "exp": 200,
-    "time": 1,
-    "cd": 0,
-    "deplete": [
-      {
-        "a": "item",
-        "t": "24012001",
-        "n": 1
-      }
-    ],
-    "bubble": 2003000322,
-    "group": 0
-  },
-  {
-    "key": 5,
-    "id": "20030003",
-    "type": 2,
-    "interact": 3,
-    "exp": 200,
-    "time": 1,
-    "cd": 0,
-    "deplete": [],
-    "bubble": 2003000323,
-    "group": 0
-  },
-  {
-    "key": 6,
-    "id": "20030003",
-    "type": 2,
-    "interact": 4,
-    "exp": 100,
-    "time": 1,
-    "cd": 0,
-    "deplete": [],
-    "bubble": 2003000324,
-    "group": 0
-  },
-  {
-    "key": 7,
-    "id": "20030003",
-    "type": 3,
-    "interact": 1,
-    "exp": 200,
-    "time": 1,
-    "cd": 0,
-    "deplete": [],
-    "bubble": 2003000331,
-    "group": 0
-  },
-  {
-    "key": 8,
-    "id": "20030003",
-    "type": 3,
-    "interact": 2,
-    "exp": 300,
-    "time": 1,
-    "cd": 0,
-    "deplete": [
-      {
-        "a": "item",
-        "t": "24012002",
-        "n": 1
-      }
-    ],
-    "bubble": 2003000332,
-    "group": 0
-  },
-  {
-    "key": 9,
     "id": "20030001",
     "type": 1,
     "interact": 1,
@@ -108,7 +12,7 @@
     "group": 0
   },
   {
-    "key": 11,
+    "key": 2,
     "id": "20030001",
     "type": 2,
     "interact": 1,
@@ -120,41 +24,23 @@
     "group": 0
   },
   {
-    "key": 12,
+    "key": 3,
     "id": "20030001",
     "type": 2,
     "interact": 2,
     "exp": 200,
     "time": 1,
     "cd": 0,
-    "deplete": [
+    "deplete": [],
-      {
-        "a": "item",
-        "t": "24012001",
-        "n": 1
-      }
-    ],
     "bubble": 2003000122,
     "group": 0
   },
   {
-    "key": 13,
+    "key": 4,
-    "id": "20030001",
-    "type": 2,
-    "interact": 3,
-    "exp": 200,
-    "time": 1,
-    "cd": 0,
-    "deplete": [],
-    "bubble": 2003000123,
-    "group": 0
-  },
-  {
-    "key": 14,
     "id": "20030001",
     "type": 2,
     "interact": 4,
-    "exp": 100,
+    "exp": 200,
     "time": 1,
     "cd": 0,
     "deplete": [],
@@ -162,7 +48,7 @@
     "group": 0
   },
   {
-    "key": 15,
+    "key": 5,
     "id": "20030001",
     "type": 3,
     "interact": 1,
@@ -174,25 +60,31 @@
     "group": 0
   },
   {
-    "key": 16,
+    "key": 6,
     "id": "20030001",
     "type": 3,
     "interact": 2,
-    "exp": 300,
+    "exp": 200,
     "time": 1,
     "cd": 0,
-    "deplete": [
+    "deplete": [],
-      {
-        "a": "item",
-        "t": "24012002",
-        "n": 1
-      }
-    ],
     "bubble": 2003000132,
     "group": 0
   },
   {
-    "key": 17,
+    "key": 7,
+    "id": "20030001",
+    "type": 3,
+    "interact": 4,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 2003000134,
+    "group": 0
+  },
+  {
+    "key": 8,
     "id": "20030002",
     "type": 1,
     "interact": 1,
@@ -204,7 +96,7 @@
     "group": 0
   },
   {
-    "key": 18,
+    "key": 9,
     "id": "20030002",
     "type": 2,
     "interact": 1,
@@ -216,7 +108,7 @@
     "group": 0
   },
   {
-    "key": 19,
+    "key": 10,
     "id": "20030002",
     "type": 3,
     "interact": 1,
@@ -228,21 +120,111 @@
     "group": 0
   },
   {
-    "key": 20,
+    "key": 11,
     "id": "20030002",
     "type": 3,
     "interact": 2,
-    "exp": 300,
+    "exp": 200,
     "time": 1,
     "cd": 0,
-    "deplete": [
+    "deplete": [],
-      {
-        "a": "item",
-        "t": "24012002",
-        "n": 1
-      }
-    ],
     "bubble": 2003000232,
     "group": 0
+  },
+  {
+    "key": 12,
+    "id": "20030002",
+    "type": 3,
+    "interact": 4,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 2003000234,
+    "group": 0
+  },
+  {
+    "key": 13,
+    "id": "20030003",
+    "type": 1,
+    "interact": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 2003000311,
+    "group": 0
+  },
+  {
+    "key": 14,
+    "id": "20030003",
+    "type": 2,
+    "interact": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 2003000321,
+    "group": 0
+  },
+  {
+    "key": 15,
+    "id": "20030003",
+    "type": 2,
+    "interact": 2,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 2003000322,
+    "group": 0
+  },
+  {
+    "key": 16,
+    "id": "20030003",
+    "type": 2,
+    "interact": 4,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 2003000324,
+    "group": 0
+  },
+  {
+    "key": 17,
+    "id": "20030003",
+    "type": 3,
+    "interact": 1,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 2003000331,
+    "group": 0
+  },
+  {
+    "key": 18,
+    "id": "20030003",
+    "type": 3,
+    "interact": 2,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 2003000332,
+    "group": 0
+  },
+  {
+    "key": 19,
+    "id": "20030003",
+    "type": 3,
+    "interact": 4,
+    "exp": 200,
+    "time": 1,
+    "cd": 0,
+    "deplete": [],
+    "bubble": 2003000334,
+    "group": 0
   }
 ]

bin/json/game_gameid.json

@@ -44,27 +44,27 @@
     "type": 2
   },
   {
-    "id": 20002,
+    "id": 30001,
-    "type": 2
+    "type": 3
   },
   {
-    "id": 20003,
+    "id": 30002,
-    "type": 2
+    "type": 3
   },
   {
-    "id": 20004,
+    "id": 30003,
-    "type": 2
+    "type": 3
   },
   {
-    "id": 20005,
+    "id": 30004,
-    "type": 2
+    "type": 3
   },
   {
-    "id": 20006,
+    "id": 30005,
-    "type": 2
+    "type": 3
   },
   {
-    "id": 20007,
+    "id": 30006,
-    "type": 2
+    "type": 3
   }
 ]

bin/json/game_global.json

@@ -851,7 +851,7 @@
       "n": 200
     },
     "dragon_interaction": 15,
-    "dialogueclickcd": 0.5,
+    "dialogueclickcd": 1,
     "doragon_item": "24012003",
     "sign_account": 28
   }

bin/json/game_hero.json

@@ -15756,5 +15756,83 @@
       "key": "hero_main_herointr_201",
       "text": "传说中的守护者“史图依克”,拥有不俗的战斗能力"
     }
+  },
+  {
+    "hid": "53007",
+    "name": {
+      "key": "hero_main_name_53007",
+      "text": "巨型蜘蛛"
+    },
+    "star": 3,
+    "color": 2,
+    "race": 1,
+    "job": 1,
+    "type": 2,
+    "ip": 1,
+    "sd": 1,
+    "handbook": -1,
+    "prefab": "51050",
+    "rotation": "0|0|0",
+    "revolve": 0,
+    "icon": "51050",
+    "vocal": "51050",
+    "tujing": [
+      107
+    ],
+    "detailwindow": "effect_xunlong_daiji",
+    "intr": {
+      "key": "",
+      "text": ""
+    },
+    "events": "hero_51050",
+    "cite": "",
+    "effectstay": [],
+    "hpspace": {
+      "x": 0,
+      "y": -0.69,
+      "z": 0
+    },
+    "capskillrule": 101,
+    "skill": 0,
+    "skill1": 153007111,
+    "skill2": 153007211,
+    "skill3": 0,
+    "txt": {
+      "key": "atlas_53007",
+      "text": ""
+    },
+    "enteranivalue": 0,
+    "camerainterval": 0,
+    "equiprcom": [
+      1,
+      2,
+      10
+    ],
+    "angle": 0,
+    "deviation": 0,
+    "show": 2,
+    "herofrag": [
+      {
+        "a": "item",
+        "t": "12025001",
+        "n": 6
+      }
+    ],
+    "herofragnum": 6,
+    "heroskillup": [
+      "10000004"
+    ],
+    "expitem": [
+      {
+        "a": "item",
+        "t": "10000011",
+        "n": 1
+      }
+    ],
+    "expitemnum": 7,
+    "herointr": {
+      "key": "hero_main_herointr_202",
+      "text": "传说中的守护者“巨型蜘蛛”,拥有不俗的战斗能力"
+    }
   }
 ]

bin/json/game_item.json

@@ -20014,5 +20014,143 @@
       }
     ],
     "gm": 1
+  },
+  {
+    "id": "24012010",
+    "name": {
+      "key": "item_item_name_411",
+      "text": "龙之花"
+    },
+    "usetype": 1,
+    "color": 2,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_24012010",
+    "intr": {
+      "key": "item_item_intr_413",
+      "text": ""
+    },
+    "describe": {
+      "key": "item_item_describe_413",
+      "text": ""
+    },
+    "dialogue": {
+      "key": "item_item_dialogue_411",
+      "text": ""
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "gm": 0
+  },
+  {
+    "id": "24012011",
+    "name": {
+      "key": "item_item_name_412",
+      "text": "与龙之花结合的鱼"
+    },
+    "usetype": 1,
+    "color": 2,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_24012011",
+    "intr": {
+      "key": "item_item_intr_414",
+      "text": ""
+    },
+    "describe": {
+      "key": "item_item_describe_414",
+      "text": ""
+    },
+    "dialogue": {
+      "key": "item_item_dialogue_412",
+      "text": ""
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "gm": 0
+  },
+  {
+    "id": "24012012",
+    "name": {
+      "key": "item_item_name_413",
+      "text": "龙遗香"
+    },
+    "usetype": 1,
+    "color": 2,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_24012012",
+    "intr": {
+      "key": "item_item_intr_415",
+      "text": ""
+    },
+    "describe": {
+      "key": "item_item_describe_415",
+      "text": ""
+    },
+    "dialogue": {
+      "key": "item_item_dialogue_413",
+      "text": ""
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "gm": 0
   }
 ]

bin/json/game_loading.json

@@ -178,5 +178,15 @@
       "key": "loading_Sheet1_prompt_18",
       "text": "俱乐部是大家一起快乐玩耍的好地方。"
     }
+  },
+  {
+    "id": 1019,
+    "scene": "GameMain",
+    "image": "ld_mh_bg01",
+    "icon": "loading_icon_gfxm",
+    "prompt": {
+      "key": "loading_Sheet1_prompt_19",
+      "text": "波比的花园需要记得每周浇灌哦。"
+    }
   }
 ]

bin/json/game_mainchapter.json

@@ -41,7 +41,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_14003"
   },
   {
@@ -86,7 +86,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -131,7 +131,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -176,7 +176,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -221,7 +221,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -266,7 +266,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -311,7 +311,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -356,7 +356,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -401,7 +401,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -446,7 +446,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -491,7 +491,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   },
   {
@@ -536,7 +536,7 @@
     "models": [
       25001
     ],
-    "bosspng": "mainboss1",
+    "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_44005"
   }
 ]

bin/json/game_mainstage.json

@@ -37,7 +37,7 @@
     "destroy": 1,
     "progress": 0,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200010,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -109,7 +109,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200030,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -221,7 +221,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200050,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -295,7 +295,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200060,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -506,7 +506,7 @@
     ],
     "BattleReadyID": 204,
     "FormatList": [
-      101011
+      101021
     ],
     "helphero": [],
     "banhero": [],
@@ -741,8 +741,8 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200070,
-    "afterstoryid": 0,
+    "afterstoryid": 200080,
     "maingroupName": {
       "key": "",
       "text": ""
@@ -792,7 +792,7 @@
     ],
     "BattleReadyID": 204,
     "FormatList": [
-      101011
+      101031
     ],
     "helphero": [],
     "banhero": [],
@@ -853,8 +853,8 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200090,
-    "afterstoryid": 0,
+    "afterstoryid": 200120,
     "maingroupName": {
       "key": "",
       "text": ""
@@ -905,8 +905,10 @@
       "key": "",
       "text": ""
     },
-    "venturetype": 0,
+    "venturetype": 1,
-    "ventureavatar": [],
+    "ventureavatar": [
+      "Person/24004/24004_q.prefab"
+    ],
     "scene_effect": [
       "miwu"
     ],
@@ -947,9 +949,21 @@
     "hero_exp": 0,
     "ps_consume": [],
     "ps_mg": [],
-    "firstaward": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      }
+    ],
     "lotteryward": 0,
-    "commonaward": [],
+    "commonaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      }
+    ],
     "BattleReadyID": 0,
     "FormatList": [],
     "helphero": [],
@@ -982,8 +996,6 @@
       "Person/24004/24004_q.prefab"
     ],
     "scene_effect": [
-      "Effect/Skill/Common/effect_screen_smoke.prefab",
-      "huo",
       "miwu"
     ],
     "scene_effectfilter": "",
@@ -1001,7 +1013,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200150,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -1077,7 +1089,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200170,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "mainchapter_main_stage_maingroupName_1",
@@ -1128,7 +1140,7 @@
     ],
     "BattleReadyID": 204,
     "FormatList": [
-      101011
+      101041
     ],
     "helphero": [],
     "banhero": [],
@@ -1191,7 +1203,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200190,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "mainchapter_main_stage_maingroupName_1",
@@ -1242,7 +1254,7 @@
     ],
     "BattleReadyID": 204,
     "FormatList": [
-      101011
+      101051
     ],
     "helphero": [],
     "banhero": [],
@@ -1356,7 +1368,7 @@
     ],
     "BattleReadyID": 204,
     "FormatList": [
-      101011
+      101061
     ],
     "helphero": [],
     "banhero": [],
@@ -1395,10 +1407,8 @@
       "key": "",
       "text": ""
     },
-    "venturetype": 1,
+    "venturetype": 0,
-    "ventureavatar": [
+    "ventureavatar": [],
-      "Person/24004/24004_q.prefab"
-    ],
     "scene_effect": [
       "Effect/Skill/Common/effect_screen_smoke.prefab",
       "huo",
@@ -1420,7 +1430,7 @@
     "progress": 1,
     "stroyshow": 0,
     "frontstoryid": 0,
-    "afterstoryid": 0,
+    "afterstoryid": 200200,
     "maingroupName": {
       "key": "mainchapter_main_stage_maingroupName_2",
       "text": "与埃雷特交战！"
@@ -1470,7 +1480,7 @@
     ],
     "BattleReadyID": 204,
     "FormatList": [
-      101011
+      101071
     ],
     "helphero": [],
     "banhero": [],
@@ -1504,13 +1514,15 @@
     "venturemodelspeed": 0,
     "venturemodelscale": 0,
     "move_type": 0,
-    "venturemodel": "Person/53001/53001_q.prefab",
+    "venturemodel": "",
     "bubbletalk": {
       "key": "",
       "text": ""
     },
-    "venturetype": 0,
+    "venturetype": 1,
-    "ventureavatar": [],
+    "ventureavatar": [
+      "Person/24004/24004_q.prefab"
+    ],
     "scene_effect": [
       "Effect/Skill/Common/effect_screen_smoke.prefab",
       "huo",
@@ -1531,7 +1543,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200210,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -1578,7 +1590,7 @@
     "venturemodelspeed": 0,
     "venturemodelscale": 0,
     "move_type": 0,
-    "venturemodel": "",
+    "venturemodel": "Person/53001/53001_q_evil.prefab",
     "bubbletalk": {
       "key": "",
       "text": ""
@@ -1603,7 +1615,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200230,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -1675,7 +1687,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200250,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -1719,7 +1731,7 @@
     "previoustage": 0,
     "Episodetype": 3,
     "stage_param": 0,
-    "venturemodelspeed": 0,
+    "venturemodelspeed": 9,
     "venturemodelscale": 2,
     "move_type": 1,
     "venturemodel": "Person/mount/54021_q.prefab",
@@ -1794,7 +1806,7 @@
     "previoustage": 0,
     "Episodetype": 5,
     "stage_param": 10001,
-    "venturemodelspeed": 0,
+    "venturemodelspeed": 9,
     "venturemodelscale": 2,
     "move_type": 1,
     "venturemodel": "Person/mount/54021_q.prefab",
@@ -1823,7 +1835,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200260,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -1875,11 +1887,78 @@
       "key": "",
       "text": ""
     },
-    "venturetype": 2,
+    "venturetype": 0,
-    "ventureavatar": [
+    "ventureavatar": [],
-      "player",
+    "scene_effect": [],
-      "Person/24004/24004_q.prefab"
+    "scene_effectfilter": "",
+    "is_near": 0,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 0,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "hide": 0,
+    "destroy": 1,
+    "progress": 1,
+    "stroyshow": 0,
+    "frontstoryid": 200270,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "mainlineName": {
+      "key": "mainchapter_main_stage_mainlineName_1",
+      "text": "1-1"
+    },
+    "title": {
+      "key": "mainchapter_main_stage_title_1",
+      "text": "原始人洞穴"
+    },
+    "desc": {
+      "key": "mainchapter_main_stage_desc_1",
+      "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。"
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1100122,
+    "chapterid": 11001,
+    "group_id": 100120,
+    "previous_group_id": [
+      100119
     ],
+    "previoustage": 0,
+    "Episodetype": 1,
+    "stage_param": 0,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
     "scene_effect": [],
     "scene_effectfilter": "",
     "is_near": 0,
@@ -1897,7 +1976,7 @@
     "progress": 1,
     "stroyshow": 0,
     "frontstoryid": 0,
-    "afterstoryid": 0,
+    "afterstoryid": 200280,
     "maingroupName": {
       "key": "",
       "text": ""
@@ -1947,7 +2026,7 @@
     ],
     "BattleReadyID": 204,
     "FormatList": [
-      101011
+      101081
     ],
     "helphero": [],
     "banhero": [],
@@ -1968,79 +2047,6 @@
     ],
     "challengeward": 0
   },
-  {
-    "id": 1100122,
-    "chapterid": 11001,
-    "group_id": 100120,
-    "previous_group_id": [
-      100119
-    ],
-    "previoustage": 0,
-    "Episodetype": 1,
-    "stage_param": 0,
-    "venturemodelspeed": 0,
-    "venturemodelscale": 0,
-    "move_type": 0,
-    "venturemodel": "",
-    "bubbletalk": {
-      "key": "",
-      "text": ""
-    },
-    "venturetype": 2,
-    "ventureavatar": [
-      "player",
-      "Person/24004/24004_q.prefab"
-    ],
-    "scene_effect": [],
-    "scene_effectfilter": "",
-    "is_near": 0,
-    "openlevel": 1,
-    "EditorStage": 0,
-    "herocolor": 0,
-    "heroimg": "zxgq_qp_icon_gth",
-    "bubbletext": {
-      "key": "",
-      "text": ""
-    },
-    "animation": [],
-    "hide": 0,
-    "destroy": 1,
-    "progress": 1,
-    "stroyshow": 0,
-    "frontstoryid": 0,
-    "afterstoryid": 0,
-    "maingroupName": {
-      "key": "",
-      "text": ""
-    },
-    "mainlineName": {
-      "key": "mainchapter_main_stage_mainlineName_1",
-      "text": "1-1"
-    },
-    "title": {
-      "key": "mainchapter_main_stage_title_1",
-      "text": "原始人洞穴"
-    },
-    "desc": {
-      "key": "mainchapter_main_stage_desc_1",
-      "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。"
-    },
-    "exp": 0,
-    "hero_exp": 0,
-    "ps_consume": [],
-    "ps_mg": [],
-    "firstaward": [],
-    "lotteryward": 0,
-    "commonaward": [],
-    "BattleReadyID": 0,
-    "FormatList": [],
-    "helphero": [],
-    "banhero": [],
-    "star": [],
-    "star_type": [],
-    "star_value": [],
-    "challengeward": 0
-  },
   {
     "id": 1100123,
     "chapterid": 11001,
@@ -2051,7 +2057,7 @@
     "previoustage": 0,
     "Episodetype": 3,
     "stage_param": 0,
-    "venturemodelspeed": 0,
+    "venturemodelspeed": 9,
     "venturemodelscale": 2,
     "move_type": 1,
     "venturemodel": "Person/mount/54021_q.prefab",
@@ -2059,8 +2065,11 @@
       "key": "",
       "text": ""
     },
-    "venturetype": 0,
+    "venturetype": 2,
-    "ventureavatar": [],
+    "ventureavatar": [
+      "player",
+      "Person/24004/24004_q.prefab"
+    ],
     "scene_effect": [],
     "scene_effectfilter": "",
     "is_near": 0,
@@ -2150,8 +2159,8 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200310,
-    "afterstoryid": 0,
+    "afterstoryid": 200320,
     "maingroupName": {
       "key": "",
       "text": ""
@@ -2201,7 +2210,7 @@
     ],
     "BattleReadyID": 204,
     "FormatList": [
-      101011
+      102011
     ],
     "helphero": [],
     "banhero": [],
@@ -2258,7 +2267,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200330,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -2309,7 +2318,7 @@
     ],
     "BattleReadyID": 204,
     "FormatList": [
-      101011
+      102021
     ],
     "helphero": [],
     "banhero": [],
@@ -2366,8 +2375,8 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200340,
-    "afterstoryid": 0,
+    "afterstoryid": 200360,
     "maingroupName": {
       "key": "",
       "text": ""
@@ -2436,7 +2445,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200370,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -2487,7 +2496,7 @@
     ],
     "BattleReadyID": 10500003,
     "FormatList": [
-      302013
+      102041
     ],
     "helphero": [],
     "banhero": [],
@@ -2518,7 +2527,7 @@
     "previoustage": 0,
     "Episodetype": 3,
     "stage_param": 0,
-    "venturemodelspeed": 0,
+    "venturemodelspeed": 9,
     "venturemodelscale": 2,
     "move_type": 1,
     "venturemodel": "Person/mount/54021_q.prefab",
@@ -2617,7 +2626,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200390,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
@@ -2687,7 +2696,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 0,
+    "frontstoryid": 200400,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",

bin/json/game_model.json

@@ -7033,5 +7033,40 @@
       "y": 1,
       "z": 1
     }
+  },
+  {
+    "id": "53007",
+    "preson": "51050",
+    "presonshow": "51050_exhibition",
+    "presonstory": "51050",
+    "presondraw": "",
+    "height": 1,
+    "weight": 1,
+    "ico": "tx_js_51050",
+    "fight": "tx_js_51050",
+    "img": "sbkp_js_51050",
+    "heroimg": "hbkp_js_51050",
+    "portrait": "zm_img_51050",
+    "bust": "bust_51050",
+    "postxyz": [
+      0,
+      0,
+      0
+    ],
+    "rotation": {
+      "x": 0,
+      "y": 180,
+      "z": 0
+    },
+    "boxPos": {
+      "x": 0,
+      "y": 0.5,
+      "z": 0
+    },
+    "boxSize": {
+      "x": 1,
+      "y": 1,
+      "z": 1
+    }
   }
 ]

bin/json/game_rdtasknpc.json

@@ -496,14 +496,16 @@
   },
   {
     "id": 10038,
-    "heroid": 0,
+    "heroid": 24004,
     "Levelid": 0,
     "datas": [
       "GameMain",
+      "熊猫_圣桃树_常驻",
       "901"
     ],
     "event": [
-      0
+      2,
+      10130
     ],
     "goto": 0
   },
@@ -556,12 +558,12 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "20020_熊猫_船甲板",
+      "熊猫_圣桃树_常驻",
       "901"
     ],
     "event": [
       2,
-      10150
+      10130
     ],
     "goto": 0
   },
@@ -576,7 +578,7 @@
     ],
     "event": [
       2,
-      10160
+      10140
     ],
     "goto": 0
   },
@@ -586,12 +588,12 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "20020_熊猫_船甲板",
+      "功能入口-招募",
       "901"
     ],
     "event": [
       2,
-      10162
+      10142
     ],
     "goto": 0
   },
@@ -601,12 +603,12 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-招募",
+      "邦尼兔_圣桃树_面对无牙仔",
       "901"
     ],
     "event": [
       2,
-      10170
+      10151
     ],
     "goto": 0
   },
@@ -631,7 +633,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "熊猫_圣桃树_面对无牙仔",
+      "20040_坠落希卡普",
       "901"
     ],
     "event": [
@@ -893,7 +895,7 @@
     ],
     "event": [
       2,
-      10202
+      10201
     ],
     "goto": 0
   },
@@ -914,7 +916,7 @@
   },
   {
     "id": 10108,
-    "heroid": 0,
+    "heroid": 44004,
     "Levelid": 0,
     "datas": [
       "CommandScene",
@@ -923,7 +925,7 @@
     ],
     "event": [
       2,
-      10230
+      10203
     ],
     "goto": 0
   },
@@ -932,39 +934,43 @@
     "heroid": 44004,
     "Levelid": 0,
     "datas": [
-      "CommandScene",
+      "GameMain",
-      "功能入口_主线",
+      "20110_熊猫",
       "905"
     ],
     "event": [
       2,
-      10244
+      10205
     ],
     "goto": 0
   },
   {
     "id": 10114,
-    "heroid": 0,
+    "heroid": 44004,
     "Levelid": 0,
     "datas": [
       "GameMain",
+      "漆黑",
       "901"
     ],
     "event": [
-      0
+      1,
+      107
     ],
     "goto": 0
   },
   {
     "id": 10118,
-    "heroid": 0,
+    "heroid": 44004,
     "Levelid": 0,
     "datas": [
       "GameMain",
+      "20110_熊猫",
       "901"
     ],
     "event": [
-      0
+      2,
+      10206
     ],
     "goto": 0
   },

bin/json/game_shopitem.json

@@ -24098,7 +24098,7 @@
     "need": [
       {
         "a": "attr",
-        "t": "guildcoin",
+        "t": "diamond",
         "n": 50
       }
     ],

bin/json/game_skillafteratk.json

@@ -57970,7 +57970,7 @@
     "ExecuteCnt": 1,
     "Type": 11,
     "Argu": [
-      2,
+      1,
       2,
       50
     ],
@@ -59948,7 +59948,7 @@
       390001115,
       1000,
       1,
-      1
+      3
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -61433,5 +61433,119 @@
     "DpsCondition": "",
     "RevisiCondition": "",
     "RevisiParams": []
+  },
+  {
+    "Id": 253007111,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      5000
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 253007211,
+    "EmitPR": 1000,
+    "From": 1,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      -1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 253007212,
+    "EmitPR": 1000,
+    "From": 1,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 32,
+    "Argu": [
+      1000
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 255007511,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      391000080,
+      1000,
+      1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 255007512,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      391000081,
+      1000,
+      1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
   }
 ]

bin/json/game_skillatk.json

@@ -21667,7 +21667,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_155007311_1",
-      "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的25%。"
+      "text": "冰霜泰坦拥有多层生命值，且免疫速度下降类效果，自身每次受到的伤害不会超过自身最大生命值的25%。"
     },
     "buffid": [],
     "map": ""
@@ -21697,7 +21697,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_155007312_1",
-      "text": "冰霜泰坦拥有多层生命值，且免疫行动值下降效果，自身每次受到的伤害不会超过自身最大生命值的35%。"
+      "text": "冰霜泰坦拥有多层生命值，且免疫速度下降类效果，自身每次受到的伤害不会超过自身最大生命值的25%。"
     },
     "buffid": [],
     "map": ""
@@ -39017,7 +39017,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_914005432_1",
-      "text": "3技能攻击没有增益效果的目标时附加1回合【无法获得增益】"
+      "text": "3技能攻击没有增益效果的目标时延长1回合【无法获得增益】"
     },
     "buffid": [],
     "map": ""
@@ -46904,5 +46904,127 @@
     },
     "buffid": [],
     "map": ""
+  },
+  {
+    "id": 153007111,
+    "level": 1,
+    "MaxLV": 1,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_153007111",
+      "text": ""
+    },
+    "ico": "jn_51050_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "Skill_1",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        253007111
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_153007111_1",
+      "text": "攻击敌方全体目标。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 153007211,
+    "level": 1,
+    "MaxLV": 1,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_153007211",
+      "text": ""
+    },
+    "ico": "jn_51050_2",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "",
+    "Type": 0,
+    "CD": 0,
+    "Where": [],
+    "Target": 1,
+    "ChildSkill": {
+      "Id": [
+        253007211
+      ]
+    },
+    "passSkill": [
+      253007211
+    ],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_153007211_1",
+      "text": "尽可能的复活死亡的队友。"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 155007511,
+    "level": 1,
+    "MaxLV": 1,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_155007511",
+      "text": ""
+    },
+    "ico": "",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "",
+    "Type": 5,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        255007511
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_155007511_1",
+      "text": "冰霜泰坦剧情对峙"
+    },
+    "buffid": [],
+    "map": ""
+  },
+  {
+    "id": 155007512,
+    "level": 1,
+    "MaxLV": 1,
+    "UnavailablePlayTypes": [],
+    "Name": {
+      "key": "skill_skill_atk_Name_155007512",
+      "text": ""
+    },
+    "ico": "",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "",
+    "Type": 5,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        255007512
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_155007512_1",
+      "text": "冰霜泰坦剧情血量降低"
+    },
+    "buffid": [],
+    "map": ""
   }
 ]

bin/json/game_skillbuff.json

@@ -2858,6 +2858,7 @@
     },
     "BuffType": 43,
     "EffectArgu": [
+      100,
       500
     ],
     "BufParNum": 1,
@@ -2992,8 +2993,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      21,
+      111,
-      -250
+      250
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -3026,6 +3027,7 @@
     },
     "BuffType": 33,
     "EffectArgu": [
+      0,
       500
     ],
     "BufParNum": 1,
@@ -3123,6 +3125,7 @@
     },
     "BuffType": 33,
     "EffectArgu": [
+      0,
       1000
     ],
     "BufParNum": 1,
@@ -3155,6 +3158,7 @@
     },
     "BuffType": 33,
     "EffectArgu": [
+      0,
       200
     ],
     "BufParNum": 1,
@@ -3249,6 +3253,7 @@
     },
     "BuffType": 33,
     "EffectArgu": [
+      0,
       1000
     ],
     "BufParNum": 1,
@@ -3508,6 +3513,7 @@
     },
     "BuffType": 33,
     "EffectArgu": [
+      0,
       100
     ],
     "BufParNum": 1,
@@ -3571,8 +3577,8 @@
     },
     "BuffType": 20,
     "EffectArgu": [
-      21,
+      111,
-      -300
+      300
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -4261,6 +4267,7 @@
     },
     "BuffType": 33,
     "EffectArgu": [
+      0,
       50
     ],
     "BufParNum": 1,
@@ -8394,7 +8401,7 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      3,
+      0,
       100
     ],
     "BufParNum": 1,
@@ -10517,7 +10524,7 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      3,
+      0,
       50
     ],
     "BufParNum": 1,
@@ -10925,7 +10932,7 @@
     },
     "BuffType": 33,
     "EffectArgu": [
-      3,
+      0,
       300,
       500
     ],
@@ -11046,5 +11053,71 @@
     "buffeffect": "",
     "buffpos": "",
     "forbidFloat": 0
+  },
+  {
+    "Id": 391000080,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000080",
+      "text": "[color=#37d8a9]殊死较量[/color] "
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000080",
+      "text": "生命最低降为1。"
+    },
+    "BuffType": 23,
+    "EffectArgu": [
+      1
+    ],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      3
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "根节点",
+    "forbidFloat": 0
+  },
+  {
+    "Id": 391000081,
+    "Name": {
+      "key": "skill_skill_buff_Name_391000081",
+      "text": "[color=#e5621b]最大生命值上限下降[/color] "
+    },
+    "Desc": {
+      "key": "skill_skill_buff_Desc_391000081",
+      "text": "最大生命值上限下降。"
+    },
+    "BuffType": 20,
+    "EffectArgu": [
+      111,
+      500
+    ],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": [
+      1,
+      6
+    ],
+    "AddEffect": false,
+    "RemoveType": false,
+    "Priority": 0,
+    "NotOverlay": 0,
+    "OverlayTimes": 1,
+    "SameID": true,
+    "golbalbufficon": "",
+    "buffIcon": "",
+    "buffeffect": "",
+    "buffpos": "",
+    "forbidFloat": 0
   }
 ]

bin/json/game_skillpassive.json

@@ -8758,5 +8758,25 @@
     "Callback": [
       914003314
     ]
+  },
+  {
+    "Id": 453007211,
+    "When": 15,
+    "FromCheck": "",
+    "TargetCheck": "Target=1",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      253007212
+    ]
   }
 ]

bin/json/game_trainlv.json

@@ -9,7 +9,7 @@
     "reward": []
   },
   {
-    "key": 6,
+    "key": 2,
     "id": "20030001",
     "type": 2,
     "lv": 2,
@@ -17,62 +17,62 @@
     "etime": 51,
     "reward": []
   },
+  {
+    "key": 3,
+    "id": "20030001",
+    "type": 3,
+    "lv": 3,
+    "exp": 300,
+    "etime": 52,
+    "reward": []
+  },
+  {
+    "key": 4,
+    "id": "20030001",
+    "type": 3,
+    "lv": 4,
+    "exp": 400,
+    "etime": 53,
+    "reward": []
+  },
+  {
+    "key": 5,
+    "id": "20030001",
+    "type": 3,
+    "lv": 5,
+    "exp": 500,
+    "etime": 54,
+    "reward": []
+  },
+  {
+    "key": 6,
+    "id": "20030001",
+    "type": 3,
+    "lv": 6,
+    "exp": 600,
+    "etime": 55,
+    "reward": []
+  },
   {
     "key": 7,
     "id": "20030001",
     "type": 3,
-    "lv": 3,
+    "lv": 7,
-    "exp": 300,
+    "exp": 700,
-    "etime": 52,
+    "etime": 56,
     "reward": []
   },
   {
     "key": 8,
     "id": "20030001",
     "type": 3,
-    "lv": 4,
-    "exp": 400,
-    "etime": 53,
-    "reward": []
-  },
-  {
-    "key": 9,
-    "id": "20030001",
-    "type": 3,
-    "lv": 5,
-    "exp": 500,
-    "etime": 54,
-    "reward": []
-  },
-  {
-    "key": 10,
-    "id": "20030001",
-    "type": 3,
-    "lv": 6,
-    "exp": 600,
-    "etime": 55,
-    "reward": []
-  },
-  {
-    "key": 11,
-    "id": "20030001",
-    "type": 3,
-    "lv": 7,
-    "exp": 700,
-    "etime": 56,
-    "reward": []
-  },
-  {
-    "key": 12,
-    "id": "20030001",
-    "type": 3,
     "lv": 8,
     "exp": 0,
     "etime": 57,
     "reward": []
   },
   {
-    "key": 14,
+    "key": 9,
     "id": "20030002",
     "type": 1,
     "lv": 1,
@@ -81,7 +81,7 @@
     "reward": []
   },
   {
-    "key": 15,
+    "key": 10,
     "id": "20030002",
     "type": 2,
     "lv": 2,
@@ -89,62 +89,62 @@
     "etime": 51,
     "reward": []
   },
+  {
+    "key": 11,
+    "id": "20030002",
+    "type": 3,
+    "lv": 3,
+    "exp": 300,
+    "etime": 52,
+    "reward": []
+  },
+  {
+    "key": 12,
+    "id": "20030002",
+    "type": 3,
+    "lv": 4,
+    "exp": 400,
+    "etime": 53,
+    "reward": []
+  },
+  {
+    "key": 13,
+    "id": "20030002",
+    "type": 3,
+    "lv": 5,
+    "exp": 500,
+    "etime": 54,
+    "reward": []
+  },
+  {
+    "key": 14,
+    "id": "20030002",
+    "type": 3,
+    "lv": 6,
+    "exp": 600,
+    "etime": 55,
+    "reward": []
+  },
+  {
+    "key": 15,
+    "id": "20030002",
+    "type": 3,
+    "lv": 7,
+    "exp": 700,
+    "etime": 56,
+    "reward": []
+  },
   {
     "key": 16,
     "id": "20030002",
     "type": 3,
-    "lv": 3,
-    "exp": 300,
-    "etime": 52,
-    "reward": []
-  },
-  {
-    "key": 17,
-    "id": "20030002",
-    "type": 3,
-    "lv": 4,
-    "exp": 400,
-    "etime": 53,
-    "reward": []
-  },
-  {
-    "key": 18,
-    "id": "20030002",
-    "type": 3,
-    "lv": 5,
-    "exp": 500,
-    "etime": 54,
-    "reward": []
-  },
-  {
-    "key": 19,
-    "id": "20030002",
-    "type": 3,
-    "lv": 6,
-    "exp": 600,
-    "etime": 55,
-    "reward": []
-  },
-  {
-    "key": 20,
-    "id": "20030002",
-    "type": 3,
-    "lv": 7,
-    "exp": 700,
-    "etime": 56,
-    "reward": []
-  },
-  {
-    "key": 21,
-    "id": "20030002",
-    "type": 3,
     "lv": 8,
     "exp": 0,
     "etime": 57,
     "reward": []
   },
   {
-    "key": 22,
+    "key": 17,
     "id": "20030003",
     "type": 1,
     "lv": 1,
@@ -153,7 +153,7 @@
     "reward": []
   },
   {
-    "key": 23,
+    "key": 18,
     "id": "20030003",
     "type": 2,
     "lv": 2,
@@ -162,7 +162,7 @@
     "reward": []
   },
   {
-    "key": 24,
+    "key": 19,
     "id": "20030003",
     "type": 2,
     "lv": 3,
@@ -171,7 +171,7 @@
     "reward": []
   },
   {
-    "key": 25,
+    "key": 20,
     "id": "20030003",
     "type": 2,
     "lv": 4,
@@ -180,39 +180,48 @@
     "reward": []
   },
   {
-    "key": 26,
+    "key": 21,
     "id": "20030003",
-    "type": 2,
+    "type": 3,
     "lv": 5,
     "exp": 500,
     "etime": 54,
     "reward": []
   },
   {
-    "key": 27,
+    "key": 22,
     "id": "20030003",
-    "type": 2,
+    "type": 3,
     "lv": 6,
     "exp": 600,
     "etime": 55,
     "reward": []
   },
   {
-    "key": 28,
+    "key": 23,
     "id": "20030003",
-    "type": 2,
+    "type": 3,
     "lv": 7,
     "exp": 700,
     "etime": 56,
     "reward": []
   },
   {
-    "key": 29,
+    "key": 24,
     "id": "20030003",
     "type": 3,
     "lv": 8,
-    "exp": 0,
+    "exp": 800,
     "etime": 57,
     "reward": []
+  },
+  {
+    "key": 25,
+    "id": "20030003",
+    "type": 3,
+    "lv": 9,
+    "exp": 0,
+    "etime": 58,
+    "reward": []
   }
 ]

bin/json/game_worldbattle.json

@@ -32,9 +32,9 @@
   {
     "id": 103,
     "FormatList": [
-      700012
+      700013
     ],
-    "BattleReadyID": 202,
+    "BattleReadyID": 126,
     "EventList": [],
     "playexp": {
       "a": "attr",
@@ -65,7 +65,9 @@
       700015
     ],
     "BattleReadyID": 203,
-    "EventList": [],
+    "EventList": [
+      203
+    ],
     "playexp": {
       "a": "attr",
       "t": "exp",

bin/json/game_worldtask.json

@@ -55,7 +55,7 @@
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_3",
-      "text": "和阿宝交流感受"
+      "text": "不详的来客"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_3",
@@ -63,7 +63,7 @@
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_3",
-      "text": "离开指挥部"
+      "text": "这里是?"
     },
     "get_item": [],
     "trigger": 0,
@@ -98,7 +98,7 @@
     "icon": "25002",
     "task_name": {
       "key": "worldtask_world_task_task_name_4",
-      "text": "采集调查"
+      "text": "遭遇战余波"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_4",
@@ -136,14 +136,14 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 20020,
-    "id_after": 20040,
+    "id_after": 20041,
     "group": 10,
     "exgroup": 210,
     "des": 2,
     "icon": "25003",
     "task_name": {
       "key": "worldtask_world_task_task_name_5",
-      "text": "你就是邦尼兔？"
+      "text": "邦尼兔的\"交流\"方式"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_5",
@@ -169,49 +169,11 @@
         "a": "attr",
         "t": "gold",
         "n": 8200
-      }
+      },
-    ],
-    "module": []
-  },
-  {
-    "key": 20040,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20030,
-    "id_after": 20041,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25004",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_6",
-      "text": "再战邦尼兔"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_6",
-      "text": "邦尼兔依旧不服气，获取只有通过他的方式，才能让对方认可我们。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_6",
-      "text": "再次挑战邦尼兔"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10040,
-    "completetask": [
-      12070040
-    ],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 1,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
       {
-        "a": "attr",
+        "a": "hero",
-        "t": "gold",
+        "t": "24004",
-        "n": 8200
+        "n": 1
       }
     ],
     "module": []
@@ -221,7 +183,7 @@
     "opencond": "",
     "lock": 1,
     "lockend": 999,
-    "ontxe": 20040,
+    "ontxe": 20030,
     "id_after": 20042,
     "group": 10,
     "exgroup": 210,
@@ -251,9 +213,9 @@
     "completetask": [
       12070041
     ],
-    "deliver_npc": 0,
+    "deliver_npc": 100418,
     "taskend_removeitem": [],
-    "auto_accept": 1,
+    "auto_accept": 0,
     "tasktips": 0,
     "lock_add": 0,
     "reword": [
@@ -362,22 +324,22 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 20050,
-    "id_after": 20230,
+    "id_after": 20110,
     "group": 10,
     "exgroup": 210,
     "des": 2,
     "icon": "25001",
     "task_name": {
       "key": "worldtask_world_task_task_name_11",
-      "text": "进一步询问"
+      "text": "前往博克岛"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_11",
-      "text": "在骇客蛛和阿宝的鼓励下，决定前往疯狂原始人世界调查月光原石的去向。"
+      "text": "在菲奥娜和阿宝的建议下，决定前往博克岛寻找解毒剂的原料。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_11",
-      "text": "开启冒险吧！"
+      "text": "回复菲奥娜"
     },
     "get_item": [],
     "trigger": 0,
@@ -424,6 +386,49 @@
     ],
     "module": []
   },
+  {
+    "key": 20110,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 20100,
+    "id_after": 20230,
+    "group": 10,
+    "exgroup": 210,
+    "des": 2,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_12",
+      "text": "更深沉的黑暗"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_12",
+      "text": "一个危险的存在降临于圣桃树下，我不知道对方究竟是谁，但邦尼兔的神态告诉我，来人的棘手程度或许并不亚于在博克岛上遇到的诸多强敌，甚至更加危险。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_12",
+      "text": "前往圣桃树"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 10110,
+    "completetask": [
+      12070230
+    ],
+    "deliver_npc": 10118,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 8200
+      }
+    ],
+    "module": []
+  },
   {
     "key": 20230,
     "opencond": "",