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

bin/json/game_buriedcondi.json

@@ -17683,15 +17683,15 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_756",
-      "text": "维京远征冰霜泰坦难度1"
+      "text": "维京远征火焰泰坦难度1"
     },
     "type": 73,
     "valid": 0,
     "NPC": 10314,
     "value": 1,
     "filter": [
-      2,
-      1
+      1,
+      2
     ],
     "filter2": [
       "boss类型",
@@ -17923,15 +17923,15 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_766",
-      "text": "维京远征boss3难度1"
+      "text": "维京远征火焰泰坦难度3"
     },
     "type": 73,
     "valid": 0,
     "NPC": 10404,
     "value": 1,
     "filter": [
-      3,
-      1
+      1,
+      3
     ],
     "filter2": [
       "boss类型",

bin/json/game_worldtask.json

@@ -1924,15 +1924,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_50",
-      "text": "冒险3-4通关"
+      "text": "冒险5-4通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_50",
-      "text": "冒险3-4通关"
+      "text": "冒险5-4通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_50",
-      "text": "冒险3-4通关"
+      "text": "冒险5-4通关"
     },
     "npc": 10480,
     "completetask": [
@@ -1996,15 +1996,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_52",
-      "text": "冒险3-8通关"
+      "text": "冒险5-8通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_52",
-      "text": "冒险3-8通关"
+      "text": "冒险5-8通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_52",
-      "text": "冒险3-8通关"
+      "text": "冒险5-8通关"
     },
     "npc": 10500,
     "completetask": [
@@ -2474,15 +2474,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_65",
-      "text": "冒险4-8通关"
+      "text": "冒险6-8通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_65",
-      "text": "冒险4-8通关"
+      "text": "冒险6-8通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_65",
-      "text": "冒险4-8通关"
+      "text": "冒险6-8通关"
     },
     "npc": 10630,
     "completetask": [
@@ -2664,15 +2664,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_70",
-      "text": "冒险5-8通关"
+      "text": "冒险7-8通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_70",
-      "text": "冒险5-8通关"
+      "text": "冒险7-8通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_70",
-      "text": "冒险5-8通关"
+      "text": "冒险7-8通关"
     },
     "npc": 10680,
     "completetask": [
@@ -2993,15 +2993,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_79",
-      "text": "冒险6-6通关"
+      "text": "冒险8-8通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_79",
-      "text": "冒险6-6通关"
+      "text": "冒险8-8通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_79",
-      "text": "冒险6-6通关"
+      "text": "冒险8-8通关"
     },
     "npc": 10770,
     "completetask": [
@@ -3178,15 +3178,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_84",
-      "text": "冒险7-6通关"
+      "text": "冒险9-8通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_84",
-      "text": "冒险7-6通关"
+      "text": "冒险9-8通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_84",
-      "text": "冒险7-6通关"
+      "text": "冒险9-8通关"
     },
     "npc": 10820,
     "completetask": [
@@ -3296,15 +3296,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_87",
-      "text": "冒险8-6通关"
+      "text": "冒险10-8通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_87",
-      "text": "冒险8-6通关"
+      "text": "冒险10-8通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_87",
-      "text": "冒险8-6通关"
+      "text": "冒险10-8通关"
     },
     "npc": 10850,
     "completetask": [
@@ -3409,15 +3409,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_90",
-      "text": "冒险9-6通关"
+      "text": "冒险11-8通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_90",
-      "text": "冒险9-6通关"
+      "text": "冒险11-8通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_90",
-      "text": "冒险9-6通关"
+      "text": "冒险11-8通关"
     },
     "npc": 10880,
     "completetask": [
@@ -3486,15 +3486,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_92",
-      "text": "冒险10-6通关"
+      "text": "冒险12-3通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_92",
-      "text": "冒险10-6通关"
+      "text": "冒险12-3通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_92",
-      "text": "冒险10-6通关"
+      "text": "冒险12-3通关"
     },
     "npc": 10900,
     "completetask": [
@@ -3594,15 +3594,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_95",
-      "text": "冒险11-6通关"
+      "text": "冒险12-6通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_95",
-      "text": "冒险11-6通关"
+      "text": "冒险12-6通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_95",
-      "text": "冒险11-6通关"
+      "text": "冒险12-6通关"
     },
     "npc": 10930,
     "completetask": [
@@ -3666,15 +3666,15 @@
     "icon": "",
     "task_name": {
       "key": "worldtask_world_task_task_name_97",
-      "text": "冒险12-6通关"
+      "text": "冒险12-8通关"
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_97",
-      "text": "冒险12-6通关"
+      "text": "冒险12-8通关"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_97",
-      "text": "冒险12-6通关"
+      "text": "冒险12-8通关"
     },
     "npc": 10950,
     "completetask": [