同步配置表

bin/json/game_annulartask_library.json

@@ -1,10 +1,19 @@
 [
+  {
+    "id": 1,
+    "assembleid": 60000010,
+    "lvstart": 10,
+    "lvend": 999,
+    "itemid": 1130,
+    "itemwt": 1000,
+    "min": 0
+  },
   {
     "id": 2,
     "assembleid": 60000010,
     "lvstart": 1,
-    "lvend": 999,
+    "lvend": 9,
-    "itemid": 1130,
+    "itemid": 1150,
     "itemwt": 1000,
     "min": 0
   },
@@ -18,7 +27,7 @@
     "min": 0
   },
   {
-    "id": 6,
+    "id": 4,
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
@@ -27,7 +36,7 @@
     "min": 0
   },
   {
-    "id": 7,
+    "id": 5,
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
@@ -36,7 +45,7 @@
     "min": 0
   },
   {
-    "id": 9,
+    "id": 6,
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
@@ -45,7 +54,7 @@
     "min": 0
   },
   {
-    "id": 12,
+    "id": 7,
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
@@ -54,7 +63,7 @@
     "min": 0
   },
   {
-    "id": 15,
+    "id": 8,
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
@@ -63,7 +72,7 @@
     "min": 0
   },
   {
-    "id": 16,
+    "id": 9,
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
@@ -72,7 +81,7 @@
     "min": 0
   },
   {
-    "id": 18,
+    "id": 10,
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
@@ -81,7 +90,7 @@
     "min": 0
   },
   {
-    "id": 21,
+    "id": 11,
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
@@ -90,7 +99,7 @@
     "min": 0
   },
   {
-    "id": 23,
+    "id": 12,
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
@@ -99,7 +108,7 @@
     "min": 0
   },
   {
-    "id": 24,
+    "id": 13,
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
@@ -108,7 +117,7 @@
     "min": 0
   },
   {
-    "id": 27,
+    "id": 14,
     "assembleid": 60000050,
     "lvstart": 1,
     "lvend": 999,
@@ -117,7 +126,7 @@
     "min": 0
   },
   {
-    "id": 30,
+    "id": 15,
     "assembleid": 60000050,
     "lvstart": 1,
     "lvend": 999,

bin/json/game_askall.json

@@ -46,69 +46,5 @@
       }
     ],
     "restime": 1
-  },
-  {
-    "key": 4,
-    "ExaminationGroup": 1004,
-    "examinationnum": 3,
-    "start": 12610,
-    "continue": 12610,
-    "time": 0,
-    "reward": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
-      }
-    ],
-    "restime": 1
-  },
-  {
-    "key": 5,
-    "ExaminationGroup": 1005,
-    "examinationnum": 3,
-    "start": 12610,
-    "continue": 12610,
-    "time": 0,
-    "reward": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
-      }
-    ],
-    "restime": 1
-  },
-  {
-    "key": 6,
-    "ExaminationGroup": 1006,
-    "examinationnum": 3,
-    "start": 12610,
-    "continue": 12610,
-    "time": 0,
-    "reward": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
-      }
-    ],
-    "restime": 1
-  },
-  {
-    "key": 7,
-    "ExaminationGroup": 1007,
-    "examinationnum": 3,
-    "start": 12610,
-    "continue": 12610,
-    "time": 0,
-    "reward": [
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 50
-      }
-    ],
-    "restime": 2
   }
 ]

bin/json/game_buriedcondi.json

@@ -24981,7 +24981,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_879",
-      "text": "完成一次考试1"
+      "text": "完成一次考试"
     },
     "type": 204,
     "valid": 0,
@@ -25003,7 +25003,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_880",
-      "text": "完成一次考试2"
+      "text": "完成一次考试"
     },
     "type": 204,
     "valid": 0,
@@ -25025,7 +25025,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_881",
-      "text": "完成一次考试3"
+      "text": "完成一次考试"
     },
     "type": 204,
     "valid": 0,
@@ -25047,7 +25047,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_882",
-      "text": "完成一次考试4"
+      "text": "完成一次考试"
     },
     "type": 204,
     "valid": 0,
@@ -25069,7 +25069,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_883",
-      "text": "完成一次考试5"
+      "text": "完成一次考试"
     },
     "type": 204,
     "valid": 0,
@@ -25091,7 +25091,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_884",
-      "text": "完成一次考试6"
+      "text": "完成一次考试"
     },
     "type": 204,
     "valid": 0,
@@ -25113,7 +25113,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_885",
-      "text": "完成一次考试7"
+      "text": "完成一次考试"
     },
     "type": 204,
     "valid": 0,
@@ -25255,7 +25255,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_891",
-      "text": "寻找所有宝箱1"
+      "text": "寻找所有宝箱"
     },
     "type": 205,
     "valid": 0,
@@ -25277,7 +25277,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_892",
-      "text": "寻找所有宝箱2"
+      "text": "寻找所有宝箱"
     },
     "type": 205,
     "valid": 0,
@@ -25299,7 +25299,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_893",
-      "text": "寻找所有宝箱3"
+      "text": "寻找所有宝箱"
     },
     "type": 205,
     "valid": 0,
@@ -25321,7 +25321,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_894",
-      "text": "寻找所有宝箱4"
+      "text": "寻找所有宝箱"
     },
     "type": 205,
     "valid": 0,
@@ -25343,7 +25343,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_895",
-      "text": "寻找所有宝箱5"
+      "text": "寻找所有宝箱"
     },
     "type": 205,
     "valid": 0,
@@ -26219,9 +26219,9 @@
       "n": 1
     },
     "NPC": -103,
-    "value": 24002,
+    "value": 3,
     "filter": [
-      18
+      24002
     ],
     "filter2": []
   },
@@ -26243,9 +26243,9 @@
       "n": 1
     },
     "NPC": -103,
-    "value": 24003,
+    "value": 3,
     "filter": [
-      18
+      24003
     ],
     "filter2": []
   },
@@ -26267,9 +26267,9 @@
       "n": 1
     },
     "NPC": -103,
-    "value": 34003,
+    "value": 3,
     "filter": [
-      18
+      34003
     ],
     "filter2": []
   },
@@ -26291,9 +26291,9 @@
       "n": 1
     },
     "NPC": -103,
-    "value": 14003,
+    "value": 3,
     "filter": [
-      18
+      14003
     ],
     "filter2": []
   },
@@ -26315,9 +26315,9 @@
       "n": 1
     },
     "NPC": -103,
-    "value": 44006,
+    "value": 3,
     "filter": [
-      18
+      44006
     ],
     "filter2": []
   },
@@ -26339,9 +26339,9 @@
       "n": 1
     },
     "NPC": -103,
-    "value": 14005,
+    "value": 3,
     "filter": [
-      18
+      14005
     ],
     "filter2": []
   },

bin/json/game_celebration.json

@@ -12,7 +12,7 @@
     "days": 2,
     "tipstxt": {
       "key": "celebration_celebration_tipstxt_1",
-      "text": "每日前{0}次挑战猎魂任意boss，可以获得双倍奖励"
+      "text": "每日前[color=#AAFF00]{0}[/color]次挑战猎魂任意boss，可以获得双倍奖励"
     }
   },
   {
@@ -28,7 +28,7 @@
     "days": 2,
     "tipstxt": {
       "key": "celebration_celebration_tipstxt_2",
-      "text": "每日前{0}次挑战梦境回廊，可以获得双倍奖励"
+      "text": "每日前[color=#AAFF00]{0}[/color]次挑战梦境回廊，可以获得双倍奖励"
     }
   },
   {
@@ -48,7 +48,7 @@
     "days": 2,
     "tipstxt": {
       "key": "celebration_celebration_tipstxt_3",
-      "text": "每日前{0}次挑战维京远征，可以获得双倍奖励，每名boss每日分别只能挑战{1}次"
+      "text": "每日前[color=#AAFF00]{0}[/color]次挑战维京远征，可以获得双倍奖励，每名boss每日分别只能挑战[color=#AAFF00]{0}[/color]次"
     }
   }
 ]

bin/json/game_fightglobalevent.json

@@ -639,7 +639,7 @@
       "text": ""
     },
     "When": 21,
-    "FromCheck": "",
+    "FromCheck": "Side=2",
     "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
@@ -702,7 +702,7 @@
       "text": ""
     },
     "When": 21,
-    "FromCheck": "",
+    "FromCheck": "Side=2",
     "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",

bin/json/game_guidance.json

@@ -122,7 +122,7 @@
   },
   {
     "id": 12,
-    "exp": "狩猎",
+    "exp": "猎魂",
     "jumpid": 168,
     "index": 9,
     "intr": {
@@ -133,7 +133,7 @@
   },
   {
     "id": 13,
-    "exp": "经验副本",
+    "exp": "梦境回廊",
     "jumpid": 10013,
     "index": 8,
     "intr": {

bin/json/game_mainstage.json

@@ -8933,7 +8933,7 @@
     "Episodetype": 1,
     "openlevel": 1,
     "EditorStage": 0,
-    "venturemodel": "",
+    "venturemodel": "Person/yacht/yacht.prefab",
     "bubbletalk": {
       "key": "",
       "text": ""
@@ -9044,7 +9044,7 @@
     "Episodetype": 1,
     "openlevel": 1,
     "EditorStage": 0,
-    "venturemodel": "",
+    "venturemodel": "Person/badcar/badcar.prefab",
     "bubbletalk": {
       "key": "",
       "text": ""

bin/json/game_rdtasknpc.json

@@ -5723,7 +5723,7 @@
     "datas": [
       "WuGuanScene",
       "武馆的老虎",
-      "901"
+      "137"
     ],
     "event": [
       2,
@@ -6634,7 +6634,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-烹饪",
+      "功能入口-狩猎",
       "901"
     ],
     "event": [
@@ -6664,7 +6664,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-烹饪",
+      "功能入口-狩猎",
       "901"
     ],
     "event": [
@@ -6679,7 +6679,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-烹饪",
+      "跑环-烹饪-亚丝翠",
       "901"
     ],
     "event": [
@@ -6709,7 +6709,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-烹饪",
+      "跑环-烹饪-亚丝翠",
       "901"
     ],
     "event": [
@@ -6724,7 +6724,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-烹饪",
+      "跑环-烹饪-姜饼人",
       "901"
     ],
     "event": [
@@ -6754,7 +6754,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-烹饪",
+      "跑环-烹饪-姜饼人",
       "901"
     ],
     "event": [
@@ -6814,7 +6814,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-烹饪",
+      "跑环-烹饪-匹诺曹",
       "901"
     ],
     "event": [
@@ -6844,7 +6844,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-烹饪",
+      "跑环-烹饪-匹诺曹",
       "901"
     ],
     "event": [
@@ -7350,7 +7350,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-商人",
+      "功能入口-魔药",
       "901"
     ],
     "event": [
@@ -7380,9 +7380,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "SmithyScene",
-      "功能入口-商人",
+      "打造",
-      "901"
+      "139"
     ],
     "event": [
       2,
@@ -7412,7 +7412,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-商人",
+      "功能入口-烹饪",
       "901"
     ],
     "event": [
@@ -7442,9 +7442,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-商人",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -7473,9 +7473,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "WuGuanScene",
-      "功能入口-商人",
+      "阿宝",
-      "901"
+      "137"
     ],
     "event": [
       2,
@@ -7505,7 +7505,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-维京远征",
+      "功能入口-烹饪",
       "901"
     ],
     "event": [
@@ -7520,7 +7520,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-招募",
+      "氛围npc-警卫1号",
       "901"
     ],
     "event": [
@@ -7542,9 +7542,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "WuGuanScene",
-      "功能入口-竞技场",
+      "阿宝",
-      "901"
+      "137"
     ],
     "event": [
       2,
@@ -7574,7 +7574,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-浇水拼图",
+      "氛围npc-金猴",
       "901"
     ],
     "event": [
@@ -7589,7 +7589,7 @@
     "Levelid": 0,
     "datas": [
       "WuGuanScene",
-      "阿宝",
+      "总教习",
       "137"
     ],
     "event": [
@@ -7612,7 +7612,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-维京远征",
+      "功能入口-魔药",
       "901"
     ],
     "event": [
@@ -7643,7 +7643,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-藏书馆",
+      "跑环-烹饪-姜饼人",
       "901"
     ],
     "event": [
@@ -7681,7 +7681,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-浇水拼图",
+      "跑环-连环-狐狸女",
       "901"
     ],
     "event": [
@@ -7695,9 +7695,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "WuGuanScene",
+      "GameMain",
-      "阿宝",
+      "功能入口-烹饪",
-      "137"
+      "901"
     ],
     "event": [
       2,
@@ -7709,11 +7709,7 @@
     "id": 60388,
     "heroid": 25001,
     "Levelid": 0,
-    "datas": [
+    "datas": [],
-      "WuGuanScene",
-      "总教习",
-      "137"
-    ],
     "event": [],
     "goto": 0
   },
@@ -7721,11 +7717,7 @@
     "id": 60390,
     "heroid": 25001,
     "Levelid": 0,
-    "datas": [
+    "datas": [],
-      "GameMain",
-      "功能入口-商人",
-      "901"
-    ],
     "event": [],
     "goto": 0
   },
@@ -7733,11 +7725,7 @@
     "id": 60391,
     "heroid": 25001,
     "Levelid": 0,
-    "datas": [
+    "datas": [],
-      "GameMain",
-      "功能入口-公告",
-      "901"
-    ],
     "event": [],
     "goto": 0
   },
@@ -7745,11 +7733,7 @@
     "id": 60398,
     "heroid": 25001,
     "Levelid": 0,
-    "datas": [
+    "datas": [],
-      "GameMain",
-      "功能入口-邮件",
-      "901"
-    ],
     "event": [],
     "goto": 0
   },
@@ -7759,7 +7743,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-藏书馆",
+      "功能入口-魔药",
       "901"
     ],
     "event": [
@@ -7772,11 +7756,7 @@
     "id": 60411,
     "heroid": 25001,
     "Levelid": 0,
-    "datas": [
+    "datas": [],
-      "GameMain",
-      "功能入口-魔药",
-      "901"
-    ],
     "event": [],
     "goto": 0
   },
@@ -7784,11 +7764,7 @@
     "id": 60418,
     "heroid": 25001,
     "Levelid": 0,
-    "datas": [
+    "datas": [],
-      "GameMain",
-      "功能入口-剧情副本(旧时光)",
-      "901"
-    ],
     "event": [],
     "goto": 0
   },
@@ -7813,7 +7789,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-招募",
+      "功能入口-魔药",
       "901"
     ],
     "event": [
@@ -7826,11 +7802,7 @@
     "id": 60428,
     "heroid": 25001,
     "Levelid": 0,
-    "datas": [
+    "datas": [],
-      "GameMain",
-      "功能入口-烹饪",
-      "901"
-    ],
     "event": [],
     "goto": 0
   }

bin/json/game_ruledesc.json

@@ -172,7 +172,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_16",
-      "text": "这里可以查看你拥有的所有装备，并且可以给守护者们装备上，一件穿戴会默认选择你最好的装备穿戴给当前守护者（已穿戴装备除外）。<br>点击装备可以打开装备强化界面，强化装备需要金币。每次强化到一定等级可以解锁装备副词条。<br>不同稀有度的装备等级上限不同，可解锁的副词条数量也不同。<br>强化装备有概率失败，装备强化等级越高，失败的概率也越高，失败到一定次数下次一定强化成功。"
+      "text": "这里可以查看你拥有的所有装备，并且可以给守护者们装备上，一键穿戴会默认选择你最好的装备穿戴给当前守护者（已穿戴装备除外）。<br>点击装备可以打开装备强化界面，强化装备需要金币。每次强化到一定等级可以解锁装备副词条。<br>不同稀有度的装备等级上限不同，可解锁的副词条数量也不同。<br>强化装备有概率失败，装备强化等级越高，失败的概率也越高，失败到一定次数下次一定强化成功。"
     }
   },
   {
@@ -502,7 +502,7 @@
     },
     "content": {
       "key": "ruledesc_ruledesc_content_46",
-      "text": "这里可以使用主角月光与水晶的力量，迅速提升守护者的等级。<br>水晶会挑选你等级最高的5位守护者为核心，在右侧上阵守护者将会把等级提升至五位最高的守护者中等级最低的那一位。<br>上阵守护者槽位由玩家等级解锁，每一个槽位只能上阵相应品质的守护者。<br>卸下守护者后槽位会进入不稳定状态，稳定槽位需要24小时或者200月光原石迅速稳定。"
+      "text": "这里可以使用传承者月光与水晶的力量，迅速提升守护者的等级。<br>水晶会挑选你等级最高的5位守护者为核心，在右侧上阵守护者将会把等级提升至五位最高的守护者中等级最低的那一位。<br>上阵守护者槽位由传承者等级解锁，每一个槽位只能上阵相应品质的守护者。<br>卸下守护者后槽位会进入不稳定状态，稳定槽位需要等待24小时或者200月光原石迅速稳定。"
     }
   }
 ]

bin/json/game_skillafteratk.json

@@ -6662,7 +6662,7 @@
     "From": 1,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
@@ -6682,7 +6682,7 @@
   {
     "Id": 215005212,
     "EmitPR": 1000,
-    "From": 9,
+    "From": 12,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -6774,7 +6774,7 @@
     "EmitPR": 1000,
     "From": 1,
     "Where": [
-      "SelfHasBuff=1"
+      "EnemyHasBuff=1"
     ],
     "Order": "",
     "Limit": 10,
@@ -10060,7 +10060,7 @@
   {
     "Id": 245003212,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 13,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -21030,7 +21030,7 @@
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
-      390001129,
+      390001122,
       1000,
       1,
       2
@@ -48857,7 +48857,7 @@
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
-      391000000,
+      390001011,
       1000,
       1,
       -1
@@ -48918,7 +48918,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 824004111,
+    "Id": 813002111,
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
@@ -48939,7 +48939,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 824004211,
+    "Id": 813002211,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -48948,7 +48948,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      482400421,
+      481300221,
       -1,
       -1
     ],
@@ -48962,7 +48962,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 824004212,
+    "Id": 813002212,
     "EmitPR": 1000,
     "From": 12,
     "Where": [],
@@ -48986,7 +48986,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 824004213,
+    "Id": 813002213,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -48995,7 +48995,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      482400422,
+      481300222,
       -1,
       -1
     ],
@@ -49009,7 +49009,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 824004214,
+    "Id": 813002214,
     "EmitPR": 1000,
     "From": 12,
     "Where": [],
@@ -49109,15 +49109,13 @@
     "Id": 844006214,
     "EmitPR": 1000,
     "From": 3,
-    "Where": [
+    "Where": [],
-      "EnemyNoBuff=3"
-    ],
     "Order": "",
     "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
-      390001411,
+      391000065,
       1000,
       1,
       1
@@ -49585,7 +49583,7 @@
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
-      391000008,
+      390001561,
       1000,
       1,
       -1
@@ -50052,15 +50050,13 @@
     "Id": 845001214,
     "EmitPR": 1000,
     "From": 3,
-    "Where": [
+    "Where": [],
-      "EnemyNoBuff=3"
-    ],
     "Order": "",
     "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
-      390001115,
+      391000065,
       1000,
       1,
       -1
@@ -50408,9 +50404,9 @@
     "Type": 3,
     "Argu": [
       391000008,
-      400,
+      1000,
       1,
-      1
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -50422,7 +50418,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 813002211,
+    "Id": 824004211,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -50431,7 +50427,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      451305111,
+      482400421,
       -1,
       -1
     ],
@@ -50445,7 +50441,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 813002212,
+    "Id": 824004212,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -50469,7 +50465,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 813002213,
+    "Id": 824004213,
     "EmitPR": 300,
     "From": 3,
     "Where": [],
@@ -50493,7 +50489,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 813002214,
+    "Id": 824004214,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -50502,7 +50498,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      451305111,
+      482400422,
       -1,
       -1
     ],
@@ -50516,7 +50512,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 813002215,
+    "Id": 824004215,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -50841,7 +50837,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 834002313,
+    "Id": 934002313,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -50865,7 +50861,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 834002314,
+    "Id": 934002314,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -51380,7 +51376,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 843001311,
+    "Id": 943001313,
     "EmitPR": 500,
     "From": 4,
     "Where": [],
@@ -51716,7 +51712,7 @@
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
-      483400722,
+      390001543,
       1000,
       1,
       2
@@ -51848,7 +51844,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 843006215,
+    "Id": 943006215,
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
@@ -52983,7 +52979,7 @@
       391000012,
       1000,
       1,
-      1
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -53559,7 +53555,7 @@
   },
   {
     "Id": 834005213,
-    "EmitPR": 1000,
+    "EmitPR": 180,
     "From": 3,
     "Where": [],
     "Order": "",
@@ -54221,7 +54217,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 924004111,
+    "Id": 913002111,
     "EmitPR": 1000,
     "From": 4,
     "Where": [],
@@ -54245,7 +54241,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 924004311,
+    "Id": 913002311,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -54269,7 +54265,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 924004312,
+    "Id": 913002312,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -54986,7 +54982,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      481300321,
+      491300311,
       -1,
       -1
     ],
@@ -55587,7 +55583,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 913002311,
+    "Id": 924004311,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -55611,7 +55607,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 913002312,
+    "Id": 924004312,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -55635,7 +55631,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 913002313,
+    "Id": 924004313,
     "EmitPR": 1000,
     "From": 3,
     "Where": [],
@@ -55974,7 +55970,7 @@
       391000007,
       1000,
       1,
-      1
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -56152,7 +56148,7 @@
     "RevisiParams": []
   },
   {
-    "Id": 943001313,
+    "Id": 843001313,
     "EmitPR": 300,
     "From": 4,
     "Where": [],
@@ -56732,7 +56728,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      414005211,
+      491400531,
       -1,
       -1
     ],
@@ -56779,7 +56775,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      414005211,
+      491400532,
       -1,
       -1
     ],
@@ -57858,7 +57854,7 @@
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
-      390001007,
+      391000008,
       1000,
       1,
       1

bin/json/game_skillpassive.json

@@ -530,7 +530,7 @@
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
-    "MaxEmitTimesInRound": 1,
+    "MaxEmitTimesInRound": 99,
     "Callback": [
       215005212
     ]
@@ -594,7 +594,7 @@
     ]
   },
   {
-    "Id": 414007211,
+    "Id": 0,
     "When": 14,
     "FromCheck": "Target=2",
     "TargetCheck": "Target=3",

bin/json/game_topuiconfig.json

@@ -2604,5 +2604,27 @@
     "id": "roledisplay",
     "subId": "",
     "currencyField": []
+  },
+  {
+    "id": "mainlineshop",
+    "subId": "",
+    "currencyField": [
+      {
+        "a": "item",
+        "t": "24010001",
+        "n": 0
+      }
+    ]
+  },
+  {
+    "id": "mainlineinfo",
+    "subId": "",
+    "currencyField": [
+      {
+        "a": "item",
+        "t": "24010001",
+        "n": 0
+      }
+    ]
   }
 ]

bin/json/game_trendchose.json

@@ -9,8 +9,8 @@
       "功能入口-维京远征"
     ],
     "chosetxt": {
-      "key": "chosetxt_01",
+      "key": "trendchose_trendchose_all_chosetxt_01",
-      "text": "考试选项1"
+      "text": "开始考核"
     },
     "chosetype": 1,
     "chosenum": 1,
@@ -32,11 +32,11 @@
       "功能入口-维京远征"
     ],
     "chosetxt": {
-      "key": "chosetxt_02",
+      "key": "trendchose_trendchose_all_chosetxt_02",
-      "text": "考试选项2"
+      "text": "开始考核"
     },
     "chosetype": 1,
-    "chosenum": 2,
+    "chosenum": 1,
     "startstory": 10000400,
     "constory": 0,
     "get": [],
@@ -55,11 +55,11 @@
       "功能入口-维京远征"
     ],
     "chosetxt": {
-      "key": "chosetxt_03",
+      "key": "trendchose_trendchose_all_chosetxt_03",
-      "text": "考试选项3"
+      "text": "开始考核"
     },
     "chosetype": 1,
-    "chosenum": 3,
+    "chosenum": 1,
     "startstory": 10000400,
     "constory": 0,
     "get": [],
@@ -78,11 +78,11 @@
       "功能入口-维京远征"
     ],
     "chosetxt": {
-      "key": "chosetxt_04",
+      "key": "trendchose_trendchose_all_chosetxt_04",
-      "text": "考试选项4"
+      "text": "开始考核"
     },
     "chosetype": 1,
-    "chosenum": 4,
+    "chosenum": 1,
     "startstory": 10000400,
     "constory": 0,
     "get": [],
@@ -101,11 +101,11 @@
       "功能入口-维京远征"
     ],
     "chosetxt": {
-      "key": "chosetxt_05",
+      "key": "trendchose_trendchose_all_chosetxt_05",
-      "text": "考试选项5"
+      "text": "开始考核"
     },
     "chosetype": 1,
-    "chosenum": 5,
+    "chosenum": 1,
     "startstory": 10000400,
     "constory": 0,
     "get": [],
@@ -124,8 +124,8 @@
       "功能入口-维京远征"
     ],
     "chosetxt": {
-      "key": "chosetxt_06",
+      "key": "trendchose_trendchose_all_chosetxt_06",
-      "text": "考试选项6"
+      "text": "开始考核"
     },
     "chosetype": 1,
     "chosenum": 1,
@@ -147,11 +147,11 @@
       "功能入口-维京远征"
     ],
     "chosetxt": {
-      "key": "chosetxt_07",
+      "key": "trendchose_trendchose_all_chosetxt_07",
-      "text": "考试选项7"
+      "text": "开始考核"
     },
     "chosetype": 1,
-    "chosenum": 2,
+    "chosenum": 1,
     "startstory": 10000400,
     "constory": 0,
     "get": [],
@@ -170,8 +170,8 @@
       "功能入口-烹饪"
     ],
     "chosetxt": {
-      "key": "chosetxt_08",
+      "key": "trendchose_trendchose_all_chosetxt_08",
-      "text": "买乳猪1"
+      "text": "尝试买一个乳猪"
     },
     "chosetype": 2,
     "chosenum": 0,
@@ -195,8 +195,8 @@
       "功能入口-烹饪"
     ],
     "chosetxt": {
-      "key": "chosetxt_09",
+      "key": "trendchose_trendchose_all_chosetxt_09",
-      "text": "买乳猪2"
+      "text": "尝试买一个乳猪"
     },
     "chosetype": 2,
     "chosenum": 0,
@@ -220,8 +220,8 @@
       "功能入口-烹饪"
     ],
     "chosetxt": {
-      "key": "chosetxt_10",
+      "key": "trendchose_trendchose_all_chosetxt_10",
-      "text": "买乳猪3"
+      "text": "尝试买一个乳猪"
     },
     "chosetype": 2,
     "chosenum": 0,
@@ -245,15 +245,15 @@
       "功能入口-烹饪"
     ],
     "chosetxt": {
-      "key": "chosetxt_11",
+      "key": "trendchose_trendchose_all_chosetxt_11",
-      "text": "买乳猪4"
+      "text": "尝试买一个乳猪"
     },
     "chosetype": 2,
     "chosenum": 0,
     "startstory": 10000351,
     "constory": 10000352,
     "get": [
-      1004
+      1001
     ],
     "aginstory": 0,
     "lose": [],
@@ -270,15 +270,15 @@
       "功能入口-烹饪"
     ],
     "chosetxt": {
-      "key": "chosetxt_12",
+      "key": "trendchose_trendchose_all_chosetxt_12",
-      "text": "买乳猪5"
+      "text": "尝试买一个乳猪"
     },
     "chosetype": 2,
     "chosenum": 0,
     "startstory": 10000371,
     "constory": 10000372,
     "get": [
-      1005
+      1002
     ],
     "aginstory": 0,
     "lose": [],

bin/json/game_vikingbossskill.json

@@ -111,11 +111,11 @@
       "key": "vikingexpedition_bossskill_introduce_6",
       "text": "梦境回廊，产出经验材料"
     },
-    "icon": "ytx_js_25001",
+    "icon": "hkz_tx_jyfb",
     "guardskill": [
       125001111,
       125001211
     ],
-    "bossIcon": "sl_rk_boss01"
+    "bossIcon": "xmwg_jyfb_boss1"
   }
 ]

bin/json/game_worldall.json

@@ -98,7 +98,20 @@
     "id": 301,
     "name": {
       "key": "worldtask_world_all_name_6",
-      "text": "守护：中轴城二三事"
+      "text": "功夫熊猫"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 302,
+    "name": {
+      "key": "worldtask_world_all_name_7",
+      "text": "驯龙高手"
     },
     "task_icon": "",
     "task_txt": {
@@ -110,7 +123,7 @@
   {
     "id": 1010,
     "name": {
-      "key": "worldtask_world_all_name_11",
+      "key": "worldtask_world_all_name_8",
       "text": "日常测试1"
     },
     "task_icon": "",
@@ -123,7 +136,7 @@
   {
     "id": 1020,
     "name": {
-      "key": "worldtask_world_all_name_12",
+      "key": "worldtask_world_all_name_9",
       "text": "日常测试2"
     },
     "task_icon": "",
@@ -136,7 +149,7 @@
   {
     "id": 1030,
     "name": {
-      "key": "worldtask_world_all_name_13",
+      "key": "worldtask_world_all_name_10",
       "text": "日常测试3"
     },
     "task_icon": "",
@@ -149,7 +162,7 @@
   {
     "id": 1040,
     "name": {
-      "key": "worldtask_world_all_name_14",
+      "key": "worldtask_world_all_name_11",
       "text": "日常测试4"
     },
     "task_icon": "",
@@ -162,7 +175,7 @@
   {
     "id": 1050,
     "name": {
-      "key": "worldtask_world_all_name_15",
+      "key": "worldtask_world_all_name_12",
       "text": "日常测试5"
     },
     "task_icon": "",
@@ -175,7 +188,7 @@
   {
     "id": 1060,
     "name": {
-      "key": "worldtask_world_all_name_16",
+      "key": "worldtask_world_all_name_13",
       "text": "日常测试6"
     },
     "task_icon": "",
@@ -188,7 +201,7 @@
   {
     "id": 1070,
     "name": {
-      "key": "worldtask_world_all_name_17",
+      "key": "worldtask_world_all_name_14",
       "text": "日常测试7"
     },
     "task_icon": "",
@@ -201,7 +214,7 @@
   {
     "id": 1080,
     "name": {
-      "key": "worldtask_world_all_name_18",
+      "key": "worldtask_world_all_name_15",
       "text": "日常测试8"
     },
     "task_icon": "",
@@ -214,7 +227,7 @@
   {
     "id": 1090,
     "name": {
-      "key": "worldtask_world_all_name_19",
+      "key": "worldtask_world_all_name_16",
       "text": "日常测试9"
     },
     "task_icon": "",
@@ -227,7 +240,7 @@
   {
     "id": 1100,
     "name": {
-      "key": "worldtask_world_all_name_20",
+      "key": "worldtask_world_all_name_17",
       "text": "日常测试10"
     },
     "task_icon": "",
@@ -240,7 +253,7 @@
   {
     "id": 1110,
     "name": {
-      "key": "worldtask_world_all_name_21",
+      "key": "worldtask_world_all_name_18",
       "text": "日常测试11"
     },
     "task_icon": "",
@@ -253,7 +266,7 @@
   {
     "id": 1120,
     "name": {
-      "key": "worldtask_world_all_name_22",
+      "key": "worldtask_world_all_name_19",
       "text": "日常测试12"
     },
     "task_icon": "",
@@ -266,7 +279,7 @@
   {
     "id": 1130,
     "name": {
-      "key": "worldtask_world_all_name_23",
+      "key": "worldtask_world_all_name_20",
       "text": "日常测试13"
     },
     "task_icon": "",
@@ -279,7 +292,7 @@
   {
     "id": 1140,
     "name": {
-      "key": "worldtask_world_all_name_24",
+      "key": "worldtask_world_all_name_21",
       "text": "日常测试14"
     },
     "task_icon": "",
@@ -292,7 +305,7 @@
   {
     "id": 1150,
     "name": {
-      "key": "worldtask_world_all_name_25",
+      "key": "worldtask_world_all_name_22",
       "text": "日常测试15"
     },
     "task_icon": "",
@@ -305,7 +318,7 @@
   {
     "id": 1160,
     "name": {
-      "key": "worldtask_world_all_name_26",
+      "key": "worldtask_world_all_name_23",
       "text": "日常测试16"
     },
     "task_icon": "",
@@ -318,7 +331,7 @@
   {
     "id": 1170,
     "name": {
-      "key": "worldtask_world_all_name_27",
+      "key": "worldtask_world_all_name_24",
       "text": "日常测试17"
     },
     "task_icon": "",
@@ -331,7 +344,7 @@
   {
     "id": 1180,
     "name": {
-      "key": "worldtask_world_all_name_28",
+      "key": "worldtask_world_all_name_25",
       "text": "日常测试18"
     },
     "task_icon": "",
@@ -344,7 +357,7 @@
   {
     "id": 1190,
     "name": {
-      "key": "worldtask_world_all_name_29",
+      "key": "worldtask_world_all_name_26",
       "text": "日常测试19"
     },
     "task_icon": "",
@@ -357,7 +370,7 @@
   {
     "id": 1200,
     "name": {
-      "key": "worldtask_world_all_name_30",
+      "key": "worldtask_world_all_name_27",
       "text": "日常测试20"
     },
     "task_icon": "",
@@ -370,7 +383,7 @@
   {
     "id": 1210,
     "name": {
-      "key": "worldtask_world_all_name_31",
+      "key": "worldtask_world_all_name_28",
       "text": "日常测试21"
     },
     "task_icon": "",
@@ -383,7 +396,7 @@
   {
     "id": 1220,
     "name": {
-      "key": "worldtask_world_all_name_32",
+      "key": "worldtask_world_all_name_29",
       "text": "日常测试22"
     },
     "task_icon": "",
@@ -396,7 +409,7 @@
   {
     "id": 1230,
     "name": {
-      "key": "worldtask_world_all_name_33",
+      "key": "worldtask_world_all_name_30",
       "text": "日常测试23"
     },
     "task_icon": "",
@@ -409,7 +422,7 @@
   {
     "id": 1240,
     "name": {
-      "key": "worldtask_world_all_name_34",
+      "key": "worldtask_world_all_name_31",
       "text": "日常测试24"
     },
     "task_icon": "",
@@ -422,7 +435,7 @@
   {
     "id": 1250,
     "name": {
-      "key": "worldtask_world_all_name_35",
+      "key": "worldtask_world_all_name_32",
       "text": "日常测试25"
     },
     "task_icon": "",
@@ -435,7 +448,7 @@
   {
     "id": 1260,
     "name": {
-      "key": "worldtask_world_all_name_36",
+      "key": "worldtask_world_all_name_33",
       "text": "日常测试26"
     },
     "task_icon": "",
@@ -448,7 +461,7 @@
   {
     "id": 1270,
     "name": {
-      "key": "worldtask_world_all_name_37",
+      "key": "worldtask_world_all_name_34",
       "text": "日常测试27"
     },
     "task_icon": "",
@@ -461,7 +474,7 @@
   {
     "id": 1280,
     "name": {
-      "key": "worldtask_world_all_name_38",
+      "key": "worldtask_world_all_name_35",
       "text": "日常测试28"
     },
     "task_icon": "",
@@ -474,7 +487,7 @@
   {
     "id": 1290,
     "name": {
-      "key": "worldtask_world_all_name_39",
+      "key": "worldtask_world_all_name_36",
       "text": "日常测试29"
     },
     "task_icon": "",
@@ -487,7 +500,7 @@
   {
     "id": 1300,
     "name": {
-      "key": "worldtask_world_all_name_40",
+      "key": "worldtask_world_all_name_37",
       "text": "日常测试30"
     },
     "task_icon": "",
@@ -500,7 +513,7 @@
   {
     "id": 1310,
     "name": {
-      "key": "worldtask_world_all_name_41",
+      "key": "worldtask_world_all_name_38",
       "text": "日常测试31"
     },
     "task_icon": "",
@@ -513,7 +526,7 @@
   {
     "id": 1320,
     "name": {
-      "key": "worldtask_world_all_name_42",
+      "key": "worldtask_world_all_name_39",
       "text": "日常测试32"
     },
     "task_icon": "",
@@ -526,7 +539,7 @@
   {
     "id": 1330,
     "name": {
-      "key": "worldtask_world_all_name_43",
+      "key": "worldtask_world_all_name_40",
       "text": "日常测试33"
     },
     "task_icon": "",

bin/json/game_worldtask.json

@@ -5377,258 +5377,6 @@
     "opencond": "",
     "lock": 1,
     "lockend": 999,
-    "ontxe": 20040,
-    "id_after": 300040,
-    "group": 301,
-    "exgroup": 310,
-    "des": 3,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_130",
-      "text": "驯龙小队的一天一"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_130",
-      "text": "希卡普约着他的伙伴们一起做龙鞍，快帮他们收集制作材料吧。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_130",
-      "text": "和希卡普聊聊"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 300030,
-    "completetask": [
-      14000003
-    ],
-    "deliver_npc": 300039,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 500
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 300040,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 300030,
-    "id_after": 300050,
-    "group": 301,
-    "exgroup": 310,
-    "des": 3,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_131",
-      "text": "驯龙小队的一天二"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_131",
-      "text": "原本好好制作龙鞍的鼻涕粗突然和亚丝翠吵了起来，得上前阻止他们。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_131",
-      "text": "阻止鼻涕粗"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 300040,
-    "completetask": [
-      14000004
-    ],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 500
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 300050,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 300040,
-    "id_after": 300060,
-    "group": 301,
-    "exgroup": 310,
-    "des": 3,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_132",
-      "text": "驯龙小队的一天三"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_132",
-      "text": "亚丝翠情绪激动，你不能让他们互相伤害。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_132",
-      "text": "阻止亚丝翠"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 300050,
-    "completetask": [
-      14000005
-    ],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 500
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 300060,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 300050,
-    "id_after": 300061,
-    "group": 301,
-    "exgroup": 310,
-    "des": 3,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_133",
-      "text": "驯龙小队的一天四"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_133",
-      "text": "希卡普看上去很生气。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_133",
-      "text": "和希卡普聊聊"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 300060,
-    "completetask": [],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 500
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 300061,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 300060,
-    "id_after": 300062,
-    "group": 301,
-    "exgroup": 310,
-    "des": 3,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_134",
-      "text": "驯龙小队的一天五"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_134",
-      "text": "和鼻涕粗沟通，让他知道问题出在哪。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_134",
-      "text": "找到鼻涕粗"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 300610,
-    "completetask": [],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 500
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 300062,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 300061,
-    "id_after": 0,
-    "group": 301,
-    "exgroup": 310,
-    "des": 3,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_135",
-      "text": "驯龙小队的一天终"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_135",
-      "text": "为了让驯龙小队重归于好，你准备去找鼻涕粗聊聊。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_135",
-      "text": "让他们和好如初"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 300620,
-    "completetask": [],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 500
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 300070,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
     "ontxe": 20060,
     "id_after": 0,
     "group": 301,
@@ -5665,14 +5413,266 @@
     ],
     "module": []
   },
+  {
+    "key": 300040,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 20040,
+    "id_after": 300050,
+    "group": 302,
+    "exgroup": 310,
+    "des": 3,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_130",
+      "text": "驯龙小队的一天一"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_130",
+      "text": "希卡普约着他的伙伴们一起做龙鞍，快帮他们收集制作材料吧。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_130",
+      "text": "和希卡普聊聊"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 300030,
+    "completetask": [
+      14000003
+    ],
+    "deliver_npc": 300039,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 500
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 300050,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 300040,
+    "id_after": 300060,
+    "group": 302,
+    "exgroup": 310,
+    "des": 3,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_131",
+      "text": "驯龙小队的一天二"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_131",
+      "text": "原本好好制作龙鞍的鼻涕粗突然和亚丝翠吵了起来，得上前阻止他们。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_131",
+      "text": "阻止鼻涕粗"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 300040,
+    "completetask": [
+      14000004
+    ],
+    "deliver_npc": 0,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 500
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 300060,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 300050,
+    "id_after": 300070,
+    "group": 302,
+    "exgroup": 310,
+    "des": 3,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_132",
+      "text": "驯龙小队的一天三"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_132",
+      "text": "亚丝翠情绪激动，你不能让他们互相伤害。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_132",
+      "text": "阻止亚丝翠"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 300050,
+    "completetask": [
+      14000005
+    ],
+    "deliver_npc": 0,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 500
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 300070,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 300060,
+    "id_after": 300080,
+    "group": 302,
+    "exgroup": 310,
+    "des": 3,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_133",
+      "text": "驯龙小队的一天四"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_133",
+      "text": "希卡普看上去很生气。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_133",
+      "text": "和希卡普聊聊"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 300060,
+    "completetask": [],
+    "deliver_npc": 0,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 500
+      }
+    ],
+    "module": []
+  },
   {
     "key": 300080,
     "opencond": "",
     "lock": 1,
     "lockend": 999,
+    "ontxe": 300070,
+    "id_after": 300090,
+    "group": 302,
+    "exgroup": 310,
+    "des": 3,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_134",
+      "text": "驯龙小队的一天五"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_134",
+      "text": "和鼻涕粗沟通，让他知道问题出在哪。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_134",
+      "text": "找到鼻涕粗"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 300610,
+    "completetask": [],
+    "deliver_npc": 0,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 500
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 300090,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
+    "ontxe": 300080,
+    "id_after": 0,
+    "group": 302,
+    "exgroup": 310,
+    "des": 3,
+    "icon": "25001",
+    "task_name": {
+      "key": "worldtask_world_task_task_name_135",
+      "text": "驯龙小队的一天终"
+    },
+    "task_details": {
+      "key": "worldtask_world_task_task_details_135",
+      "text": "为了让驯龙小队重归于好，你准备去找鼻涕粗聊聊。"
+    },
+    "npctxt": {
+      "key": "worldtask_world_task_npctxt_135",
+      "text": "让他们和好如初"
+    },
+    "get_item": [],
+    "trigger": 0,
+    "npc": 300620,
+    "completetask": [],
+    "deliver_npc": 0,
+    "taskend_removeitem": [],
+    "auto_accept": 0,
+    "tasktips": 0,
+    "lock_add": 0,
+    "reword": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 500
+      }
+    ],
+    "module": []
+  },
+  {
+    "key": 300100,
+    "opencond": "",
+    "lock": 1,
+    "lockend": 999,
     "ontxe": 20070,
     "id_after": 0,
-    "group": 301,
+    "group": 302,
     "exgroup": 310,
     "des": 3,
     "icon": "25001",
@@ -7216,10 +7216,8 @@
     "get_item": [],
     "trigger": 0,
     "npc": 60290,
-    "completetask": [
+    "completetask": [],
-      50000039
+    "deliver_npc": 0,
-    ],
-    "deliver_npc": 60298,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 1,
@@ -7272,7 +7270,7 @@
     "completetask": [
       50000040
     ],
-    "deliver_npc": 60308,
+    "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 1,
@@ -7322,10 +7320,8 @@
     "get_item": [],
     "trigger": 0,
     "npc": 60320,
-    "completetask": [
+    "completetask": [],
-      50000042
+    "deliver_npc": 0,
-    ],
-    "deliver_npc": 60328,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 1,
@@ -7378,7 +7374,7 @@
     "completetask": [
       50000043
     ],
-    "deliver_npc": 60338,
+    "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 1,
@@ -7428,10 +7424,8 @@
     "get_item": [],
     "trigger": 0,
     "npc": 60350,
-    "completetask": [
+    "completetask": [],
-      50000045
+    "deliver_npc": 0,
-    ],
-    "deliver_npc": 60358,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 1,
@@ -7484,7 +7478,7 @@
     "completetask": [
       50000046
     ],
-    "deliver_npc": 60368,
+    "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 1,
@@ -7537,7 +7531,7 @@
     "completetask": [
       50000048
     ],
-    "deliver_npc": 60388,
+    "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 1,
@@ -7587,10 +7581,8 @@
     "get_item": [],
     "trigger": 0,
     "npc": 60410,
-    "completetask": [
+    "completetask": [],
-      50000051
+    "deliver_npc": 0,
-    ],
-    "deliver_npc": 60418,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 1,
@@ -7643,7 +7635,7 @@
     "completetask": [
       50000052
     ],
-    "deliver_npc": 60428,
+    "deliver_npc": 0,
     "taskend_removeitem": [],
     "auto_accept": 0,
     "tasktips": 1,