diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 50c5d96cb..c8dd02b04 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -20814,7 +20814,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_733",
-      "text": "冒险之旅【1-1】"
+      "text": "通关冒险之旅第一章"
     },
     "type": 61,
     "valid": 1,
@@ -20826,7 +20826,7 @@
     "NPC": 10104,
     "value": 1,
     "filter": [
-      1100101
+      1100108
     ],
     "filter2": [
       "关卡ID",
@@ -21074,7 +21074,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_742",
-      "text": "完成10连守护者招募"
+      "text": "完成10连守护者召唤"
     },
     "type": 14,
     "valid": 0,
@@ -21188,7 +21188,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_746",
-      "text": "解锁第2根木人桩"
+      "text": "木桩再次训练"
     },
     "type": 152,
     "valid": 0,
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index 2c98a0aba..70b9d4c1c 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -1260,7 +1260,7 @@
   },
   {
     "id": 219,
-    "insert": 1,
+    "insert": 2,
     "filter": []
   },
   {
@@ -1270,7 +1270,7 @@
   },
   {
     "id": 221,
-    "insert": 1,
+    "insert": 2,
     "filter": [
       "eq"
     ]
@@ -1279,7 +1279,9 @@
     "id": 222,
     "insert": 1,
     "filter": [
-      "eq"
+      "eq",
+      "eq",
+      "gte"
     ]
   },
   {
@@ -1308,6 +1310,8 @@
     "id": 226,
     "insert": 1,
     "filter": [
+      "eq",
+      "eq",
       "eq"
     ]
   },
diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json
index 4c6bbe7ef..76313aba8 100644
--- a/bin/json/game_mainchapter.json
+++ b/bin/json/game_mainchapter.json
@@ -18,7 +18,7 @@
     },
     "desc": {
       "key": "mainchapter_main_chapter_desc_1",
-      "text": "故事发生在很久以前的古代中国，而且要从一只喜欢滚来滚去、滚来滚去的大熊猫身上说起。话说熊猫阿宝是一家面条店的学徒，虽然笨手笨脚，也勉强算是谋到了一份职业。"
+      "text": "原始人聚集地惊现能量强大的月光原石，主角和守护者们前往收集，却遭到当地“土著居民”们的轮番驱赶……"
     },
     "starreward": 11001,
     "exploreward": 11001
@@ -31,7 +31,7 @@
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_2",
-      "text": "功夫熊猫的世界"
+      "text": "和平谷"
     },
     "chapter_type": 1,
     "map": "scenes_chapter_02",
@@ -42,7 +42,7 @@
     },
     "desc": {
       "key": "mainchapter_main_chapter_desc_2",
-      "text": "别看阿宝所在的“和平谷”一派欣欣向荣的安详景象，其实是一个卧虎藏龙的风水宝地，先不说五大功夫高手皆坐镇于此，更有一大师级别的宗师在这里隐居。"
+      "text": "复仇者强势归来，带着怨恨与不甘，大龙的回归之路，既是守护者的试炼，亦是神龙大侠的考验。"
     },
     "starreward": 11002,
     "exploreward": 11002
@@ -55,7 +55,7 @@
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_3",
-      "text": "疯狂原始人的世界"
+      "text": "盗窃之城"
     },
     "chapter_type": 1,
     "map": "scenes_chapter_01",
@@ -66,7 +66,7 @@
     },
     "desc": {
       "key": "mainchapter_main_chapter_desc_3",
-      "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
+      "text": "善良之花滋养罪恶，铁窗下的小小豚鼠正伺机而动，捕食他的猎物。"
     },
     "starreward": 11003,
     "exploreward": 11003
@@ -79,7 +79,7 @@
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_4",
-      "text": "功夫熊猫的世界"
+      "text": "杜洛克王国"
     },
     "chapter_type": 1,
     "map": "scenes_chapter_01",
@@ -90,7 +90,7 @@
     },
     "desc": {
       "key": "mainchapter_main_chapter_desc_4",
-      "text": "自负的毒蛇大师虽然给人的感觉稍显轻浮，但对这件事的态度就有如她善变的性格，不太明朗；螳螂大师算是几位高手中最聪明的一个，对阿宝的现状很是无奈，总是暗中帮忙。"
+      "text": "“欢迎来到杜洛克，我们有些规矩要同你讲，别兴风作浪、服从管理，我们就会是好朋友……杜洛克是，杜洛克是，杜洛克是个完美的好地方！”"
     },
     "starreward": 11004,
     "exploreward": 11004
@@ -103,7 +103,7 @@
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_5",
-      "text": "疯狂原始人的世界"
+      "text": "黑市之地"
     },
     "chapter_type": 1,
     "map": "scenes_chapter_01",
@@ -114,7 +114,7 @@
     },
     "desc": {
       "key": "mainchapter_main_chapter_desc_5",
-      "text": "最后要将阿宝调教成“功夫高手”的一代宗师“师父”华丽丽地出场了，然而有着一身好功夫并不意味着就是完美的，“师父”因为过去犯下的一个错误，一直纠结着没办法释然。"
+      "text": "暗夜追寻光的身影，迷雾森林到处是彼此交织的轮舞，是谁在追寻守护者的脚步，誓不罢休！"
     },
     "starreward": 11005,
     "exploreward": 11005
@@ -127,7 +127,7 @@
     },
     "worldname": {
       "key": "mainchapter_main_chapter_worldname_6",
-      "text": "功夫熊猫的世界"
+      "text": "维京海域"
     },
     "chapter_type": 1,
     "map": "scenes_chapter_01",
@@ -138,7 +138,7 @@
     },
     "desc": {
       "key": "mainchapter_main_chapter_desc_6",
-      "text": "至于那个让人人都如临大敌的太郎，则是一只非常自恋的雪豹，他等待复仇的这一天，已经整整等了20年了，可是他做梦也没想到，自己等来的竟然是一只大熊猫。"
+      "text": "亚丝翠告诉主角团，致命纳得喜欢闪亮亮的东西，自从它得到一块会发光的月光原石后，便远离人群，用其筑巢求偶。为了拿回月光原石，主角团不得不投其所好，趁机夺宝……"
     },
     "starreward": 11006,
     "exploreward": 11006
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 234c624bf..11e48f8c7 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -8847,7 +8847,7 @@
     "progress": 1,
     "stroyshow": 0,
     "frontstoryid": 20225,
-    "afterstoryid": 0,
+    "afterstoryid": 20226,
     "maingroupName": {
       "key": "",
       "text": ""
@@ -8957,7 +8957,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 20226,
+    "frontstoryid": 20127,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 84d4d84f1..951a7e5ae 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -95,7 +95,7 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 20011,
-    "id_after": 20020,
+    "id_after": 20030,
     "group": 10,
     "exgroup": 210,
     "des": 2,
@@ -115,53 +115,12 @@
     "get_item": [],
     "trigger": 0,
     "npc": 100101,
-    "completetask": [],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8200
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 20020,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20012,
-    "id_after": 20030,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_4",
-      "text": "突如其来的袭击"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_4",
-      "text": "刚踏出飞船就遇到了潜入船舱甲板的恐惧灵小怪，尝试击败他们！"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_4",
-      "text": "击退恐惧灵小怪"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10020,
     "completetask": [
       12070020
     ],
     "deliver_npc": 10028,
     "taskend_removeitem": [],
-    "auto_accept": 1,
+    "auto_accept": 0,
     "tasktips": 0,
     "lock_add": 0,
     "reword": [
@@ -178,7 +137,7 @@
     "opencond": "",
     "lock": 1,
     "lockend": 999,
-    "ontxe": 20020,
+    "ontxe": 20012,
     "id_after": 20040,
     "group": 10,
     "exgroup": 210,
@@ -493,7 +452,7 @@
     "lock": 1,
     "lockend": 999,
     "ontxe": 20090,
-    "id_after": 20110,
+    "id_after": 20180,
     "group": 10,
     "exgroup": 210,
     "des": 2,
@@ -555,343 +514,12 @@
     ],
     "module": []
   },
-  {
-    "key": 20110,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20100,
-    "id_after": 20120,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_13",
-      "text": "为守护者穿戴装备"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_13",
-      "text": "疯狂原始人世界环境恶劣，在骇客蛛指导，为你的守护者穿戴装备。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_13",
-      "text": "与骇客蛛对话"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10110,
-    "completetask": [
-      12070130
-    ],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8200
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 20120,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20110,
-    "id_after": 20130,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_14",
-      "text": "继续寻找月光原石"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_14",
-      "text": "再次回到了疯狂原始人！在小伊的指引下，深入巨型猩猩怪的巢穴。可是……"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_14",
-      "text": "继续冒险吧"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10120,
-    "completetask": [
-      12070140
-    ],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8200
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 20130,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20120,
-    "id_after": 20140,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_15",
-      "text": "前往戈伯铁匠铺"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_15",
-      "text": "巨型猩猩怪有月光原石的加持，很难战胜。和守护者食人鱼商议后，先回中轴城去戈伯铁匠铺打造点装备再战。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_15",
-      "text": "前往铁匠铺"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10130,
-    "completetask": [
-      12070150
-    ],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8200
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 20140,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20130,
-    "id_after": 20150,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_16",
-      "text": "委托戈伯锻造装备"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_16",
-      "text": "挑战火焰泰坦后，获取不少材料，再次返回铁匠铺，委托戈伯锻造装备。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_16",
-      "text": "戈伯有话要说"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10140,
-    "completetask": [
-      12070160
-    ],
-    "deliver_npc": 10148,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "equi",
-        "t": "10110",
-        "n": 1
-      },
-      {
-        "a": "equi",
-        "t": "10111",
-        "n": 1
-      },
-      {
-        "a": "equi",
-        "t": "10112",
-        "n": 1
-      },
-      {
-        "a": "equi",
-        "t": "10113",
-        "n": 1
-      },
-      {
-        "a": "equi",
-        "t": "10114",
-        "n": 1
-      },
-      {
-        "a": "equi",
-        "t": "10115",
-        "n": 1
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 20150,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20140,
-    "id_after": 20160,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_17",
-      "text": "艺术家戈伯的作品"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_17",
-      "text": "在戈伯的精心打造下，一套无极神功装备诞生，赶紧穿戴试试！"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_17",
-      "text": "和戈伯聊聊"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10150,
-    "completetask": [
-      12070170
-    ],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8200
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 20160,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20150,
-    "id_after": 20170,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_18",
-      "text": "装备强化"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_18",
-      "text": "装备后还需进一步调优强化，立刻着手处理。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_18",
-      "text": "继续拜访戈伯"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10160,
-    "completetask": [
-      12070180
-    ],
-    "deliver_npc": 10168,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8200
-      }
-    ],
-    "module": []
-  },
-  {
-    "key": 20170,
-    "opencond": "",
-    "lock": 1,
-    "lockend": 999,
-    "ontxe": 20160,
-    "id_after": 20180,
-    "group": 10,
-    "exgroup": 210,
-    "des": 2,
-    "icon": "25001",
-    "task_name": {
-      "key": "worldtask_world_task_task_name_19",
-      "text": "决战巨型猩猩怪"
-    },
-    "task_details": {
-      "key": "worldtask_world_task_task_details_19",
-      "text": "经过一系列装备穿戴和强化，终于做好准备挑战巨型猩猩怪。"
-    },
-    "npctxt": {
-      "key": "worldtask_world_task_npctxt_19",
-      "text": "与骇客蛛对话"
-    },
-    "get_item": [],
-    "trigger": 0,
-    "npc": 10170,
-    "completetask": [
-      12070190
-    ],
-    "deliver_npc": 0,
-    "taskend_removeitem": [],
-    "auto_accept": 0,
-    "tasktips": 0,
-    "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8200
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 100
-      }
-    ],
-    "module": []
-  },
   {
     "key": 20180,
     "opencond": "",
     "lock": 1,
     "lockend": 999,
-    "ontxe": 20170,
+    "ontxe": 20100,
     "id_after": 20190,
     "group": 10,
     "exgroup": 210,
diff --git a/modules/stonehenge/api_enterlevel.go b/modules/stonehenge/api_enterlevel.go
index b32da4548..1cf6c9746 100644
--- a/modules/stonehenge/api_enterlevel.go
+++ b/modules/stonehenge/api_enterlevel.go
@@ -170,7 +170,7 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt
 
 	var szTask []*pb.BuriedParam
 	for _, v := range szEvent { // 首次触发指定ID的事件
-		if c, e := this.module.configure.GetStoneEventDataById(v); e != nil {
+		if c, e := this.module.configure.GetStoneEventDataById(v); e == nil {
 			szTask = append(szTask, comm.GetBuriedParam(comm.Rtype223, c.EventType, 1))
 		}
 	}
diff --git a/modules/stonehenge/api_gotoroom.go b/modules/stonehenge/api_gotoroom.go
index 386f9ae96..d595a96d0 100644
--- a/modules/stonehenge/api_gotoroom.go
+++ b/modules/stonehenge/api_gotoroom.go
@@ -167,7 +167,7 @@ func (this *apiComp) GotoRoom(session comm.IUserSession, req *pb.StonehengeGotoR
 	// 埋点
 	var szTask []*pb.BuriedParam
 	for _, v := range szEvent { // 首次触发指定ID的事件
-		if c, e := this.module.configure.GetStoneEventDataById(v); e != nil {
+		if c, e := this.module.configure.GetStoneEventDataById(v); e == nil {
 			szTask = append(szTask, comm.GetBuriedParam(comm.Rtype223, c.EventType, 1))
 		}
 	}