Merge branch 'bs_2.0.6.28' of http://git.legu.cc/liwei_3d/go_dreamfactory into bs_2.0.6.28

bin/json/game_buriedcondi.json

@@ -17812,7 +17812,7 @@
     "NPC": -102,
     "value": 1,
     "filter": [
-      10
+      9
     ],
     "filter2": [
       "套装效果",

bin/json/game_item.json

@@ -809,7 +809,7 @@
   {
     "id": "11013001",
     "name": {
-      "key": "item_item_name_14",
+      "key": "item_item_name_348",
       "text": "闪闪碎片"
     },
     "usetype": 2,
@@ -840,7 +840,7 @@
   {
     "id": "11013002",
     "name": {
-      "key": "item_item_name_15",
+      "key": "item_item_name_349",
       "text": "食人鱼先生碎片"
     },
     "usetype": 2,
@@ -871,7 +871,7 @@
   {
     "id": "11013003",
     "name": {
-      "key": "item_item_name_16",
+      "key": "item_item_name_350",
       "text": "啊啊碎片"
     },
     "usetype": 2,
@@ -902,7 +902,7 @@
   {
     "id": "11013004",
     "name": {
-      "key": "item_item_name_17",
+      "key": "item_item_name_351",
       "text": "法夸德勋爵碎片"
     },
     "usetype": 2,
@@ -933,7 +933,7 @@
   {
     "id": "11013005",
     "name": {
-      "key": "item_item_name_18",
+      "key": "item_item_name_352",
       "text": "大大碎片"
     },
     "usetype": 2,
@@ -964,7 +964,7 @@
   {
     "id": "11014001",
     "name": {
-      "key": "item_item_name_19",
+      "key": "item_item_name_353",
       "text": "史图依克碎片"
     },
     "usetype": 2,
@@ -995,7 +995,7 @@
   {
     "id": "11014002",
     "name": {
-      "key": "item_item_name_20",
+      "key": "item_item_name_354",
       "text": "大龙碎片"
     },
     "usetype": 2,
@@ -1026,7 +1026,7 @@
   {
     "id": "11014003",
     "name": {
-      "key": "item_item_name_21",
+      "key": "item_item_name_355",
       "text": "亚丝翠碎片"
     },
     "usetype": 2,

bin/json/game_rdtasknpc.json

@@ -1248,6 +1248,7 @@
     "heroid": 25001,
     "datas": [
       "WuGuanScene",
+      "木桩2",
       "137"
     ],
     "event": [
@@ -5244,5 +5245,209 @@
       13010
     ],
     "goto": 0
+  },
+  {
+    "id": 50010,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500010_阿宝",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010010
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50011,
+    "heroid": 25001,
+    "datas": [
+      "GameMain",
+      "901"
+    ],
+    "event": [
+      0
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50018,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500010_阿宝",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010020
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50020,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500020_阿宝",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010030
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50021,
+    "heroid": 25001,
+    "datas": [
+      "GameMain",
+      "901"
+    ],
+    "event": [
+      0
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50028,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500020_阿宝",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010040
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50030,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500030_阿宝",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010050
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50031,
+    "heroid": 25001,
+    "datas": [
+      "GameMain",
+      "901"
+    ],
+    "event": [
+      0
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50038,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500030_阿宝",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010060
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50040,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500040_亚丝翠",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010070
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50041,
+    "heroid": 25001,
+    "datas": [
+      "GameMain",
+      "功能入口-维京远征",
+      "901"
+    ],
+    "event": [
+      10,
+      167
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50048,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500040_亚丝翠",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010080
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50050,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500050_亚丝翠",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010090
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50051,
+    "heroid": 25001,
+    "datas": [
+      "GameMain",
+      "功能入口-维京远征",
+      "901"
+    ],
+    "event": [
+      10,
+      167
+    ],
+    "goto": 0
+  },
+  {
+    "id": 50058,
+    "heroid": 25001,
+    "datas": [
+      "CaravanScene",
+      "500050_亚丝翠",
+      "11001"
+    ],
+    "event": [
+      2,
+      50010100
+    ],
+    "goto": 0
   }
 ]

bin/json/game_smithytask.json

@@ -41,27 +41,6 @@
       }
     ]
   },
-  {
-    "key": 10003,
-    "id_list": 3,
-    "task_display": {
-      "key": "newsmithy_task_task_display_3",
-      "text": "连续登录3天"
-    },
-    "type_id": 109,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 12
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 10
-      }
-    ]
-  },
   {
     "key": 10004,
     "id_list": 4,