diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 6a741fc73..38d808108 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -554,7 +554,7 @@ }, { "id": 129, - "PlayType": 2, + "PlayType": 16, "HeroCount": 5, "readyScene": "scenesfight_role_interface_06", "battleScenes": [ @@ -573,7 +573,7 @@ }, { "id": 130, - "PlayType": 2, + "PlayType": 15, "HeroCount": 5, "readyScene": "scenesfight_role_interface_06", "battleScenes": [ @@ -594,7 +594,7 @@ }, { "id": 131, - "PlayType": 2, + "PlayType": 15, "HeroCount": 5, "readyScene": "scenesfight_role_interface_06", "battleScenes": [ @@ -615,7 +615,7 @@ }, { "id": 132, - "PlayType": 2, + "PlayType": 15, "HeroCount": 5, "readyScene": "scenesfight_role_interface_06", "battleScenes": [ diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 9b9b0c23d..a749ad331 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -24467,8 +24467,10 @@ "n": 1 }, "NPC": 0, - "value": 1000, - "filter": [], + "value": 10, + "filter": [ + 1 + ], "filter2": [] }, { diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 3f411b9ba..f391a4fdd 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1153,5 +1153,17 @@ "id": 202, "insert": 2, "filter": [] + }, + { + "id": 203, + "insert": 1, + "filter": [ + "eq" + ] + }, + { + "id": 204, + "insert": 1, + "filter": [] } ] \ No newline at end of file diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index 8e6113b2a..55d0a3926 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -60,7 +60,7 @@ "id": 40, "name": { "key": "worldtask_world_all_name_4", - "text": "章节4:交易所风波" + "text": "章节4:交易所风波(上)" }, "task_icon": "", "task_txt": { @@ -79,7 +79,7 @@ "id": 50, "name": { "key": "worldtask_world_all_name_5", - "text": "章节5:" + "text": "章节5:交易所风波(下)" }, "task_icon": "", "task_txt": { diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 6bf9c6288..94f62a07d 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -5647,8 +5647,10 @@ "key": "worldtask_world_task_npctxt_137", "text": "打怪任务" }, - "npc": 113, - "completetask": [], + "npc": 10010, + "completetask": [ + 12070010 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, @@ -5685,7 +5687,7 @@ "key": "worldtask_world_task_npctxt_138", "text": "问答任务" }, - "npc": 106, + "npc": 10018, "completetask": [], "deliver_npc": 0, "taskend_removeitem": [], @@ -5723,7 +5725,7 @@ "key": "worldtask_world_task_npctxt_139", "text": "复合调查" }, - "npc": 113, + "npc": 100101, "completetask": [], "deliver_npc": 0, "taskend_removeitem": [], @@ -5761,9 +5763,11 @@ "key": "worldtask_world_task_npctxt_140", "text": "委托烹饪" }, - "npc": 112, - "completetask": [], - "deliver_npc": 0, + "npc": 10020, + "completetask": [ + 12070020 + ], + "deliver_npc": 10028, "taskend_removeitem": [], "auto_accept": 0, "lock_add": 0, @@ -5799,8 +5803,10 @@ "key": "worldtask_world_task_npctxt_141", "text": "A连环交接1" }, - "npc": 0, - "completetask": [], + "npc": 10030, + "completetask": [ + 12070030 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, @@ -5837,8 +5843,10 @@ "key": "worldtask_world_task_npctxt_142", "text": "A连环交接2" }, - "npc": 0, - "completetask": [], + "npc": 10040, + "completetask": [ + 12070040 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, @@ -5875,9 +5883,11 @@ "key": "worldtask_world_task_npctxt_143", "text": "打怪任务" }, - "npc": 0, - "completetask": [], - "deliver_npc": 0, + "npc": 10050, + "completetask": [ + 12070050 + ], + "deliver_npc": 10058, "taskend_removeitem": [], "auto_accept": 0, "lock_add": 0, @@ -5913,8 +5923,10 @@ "key": "worldtask_world_task_npctxt_144", "text": "问答任务" }, - "npc": 0, - "completetask": [], + "npc": 10040, + "completetask": [ + 12070040 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, @@ -5951,9 +5963,11 @@ "key": "worldtask_world_task_npctxt_145", "text": "复合调查" }, - "npc": 0, - "completetask": [], - "deliver_npc": 0, + "npc": 10050, + "completetask": [ + 12070050 + ], + "deliver_npc": 10058, "taskend_removeitem": [], "auto_accept": 0, "lock_add": 0, @@ -5989,9 +6003,11 @@ "key": "worldtask_world_task_npctxt_146", "text": "委托烹饪" }, - "npc": 0, - "completetask": [], - "deliver_npc": 0, + "npc": 10050, + "completetask": [ + 12070050 + ], + "deliver_npc": 10058, "taskend_removeitem": [], "auto_accept": 0, "lock_add": 0, @@ -6027,9 +6043,11 @@ "key": "worldtask_world_task_npctxt_147", "text": "打怪任务" }, - "npc": 0, - "completetask": [], - "deliver_npc": 0, + "npc": 10060, + "completetask": [ + 12070060 + ], + "deliver_npc": 10068, "taskend_removeitem": [], "auto_accept": 0, "lock_add": 0, @@ -6065,8 +6083,10 @@ "key": "worldtask_world_task_npctxt_148", "text": "B连环交接1" }, - "npc": 0, - "completetask": [], + "npc": 10070, + "completetask": [ + 12070070 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, @@ -6103,8 +6123,10 @@ "key": "worldtask_world_task_npctxt_149", "text": "B连环交接2" }, - "npc": 0, - "completetask": [], + "npc": 10070, + "completetask": [ + 12070070 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, diff --git a/comm/const.go b/comm/const.go index 14da5cdea..efe091bf4 100644 --- a/comm/const.go +++ b/comm/const.go @@ -766,6 +766,8 @@ const ( Rtype200 TaskType = 200 //在狩猎内战斗X次 Rtype201 TaskType = 201 //在维京体系的副本内消耗X体力 Rtype202 TaskType = 202 //在狩猎体系的副本内消耗X体力 + Rtype203 TaskType = 203 //完成指定试卷组 + Rtype204 TaskType = 204 //完成任意一场考试 ) const ( diff --git a/modules/dailytask/configure.go b/modules/dailytask/configure.go index b1be74b38..5bbd1ecda 100644 --- a/modules/dailytask/configure.go +++ b/modules/dailytask/configure.go @@ -44,7 +44,7 @@ func (this *configureComp) updateconfigure() { if v, err = this.GetConfigure(game_annulartask_library); err != nil { return } - if conf, ok = v.(*cfg.GameAnnulartask_Library); ok { + if conf, ok = v.(*cfg.GameAnnulartask_Library); !ok { this.module.Error("日常任务配置异常!") return }