From 48ad5eeb80351b461679db2ce2018f3dd7c85b9d Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 7 Aug 2023 14:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E8=BD=AC=E7=9B=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 374 ++++++++++++++++ bin/json/game_buriedtype.json | 5 + bin/json/game_drawcardreward.json | 116 +++-- bin/json/game_drawreplace.json | 42 +- bin/json/game_drawreward.json | 116 +++-- bin/json/game_fategiftfate.json | 104 +++-- bin/json/game_fategiftreward.json | 10 + bin/json/game_global.json | 4 +- bin/json/game_item.json | 580 +++++++++++++++++++++++-- bin/json/game_shopcentercontrol.json | 44 ++ bin/json/game_skillafteratk.json | 54 +-- bin/json/game_skillbuff.json | 2 +- bin/json/game_smithycustomer.json | 6 +- bin/json/game_venturegiftstask.json | 72 +-- modules/activity/api_turntable.go | 21 +- modules/activity/comp_configure.go | 4 + sys/configure/structs/Game.BuffType.go | 1 + 17 files changed, 1272 insertions(+), 283 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 6f75a26f2..5b5368c96 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -25932,5 +25932,379 @@ 12870 ], "filter2": [] + }, + { + "id": 60000001, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_922", + "text": "[成长返还任务]将食人鱼提升至20级" + }, + "type": 4, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 20, + "filter": [ + 13002 + ], + "filter2": [] + }, + { + "id": 60000002, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_923", + "text": "[成长返还任务]将食人鱼提升至30级" + }, + "type": 4, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 30, + "filter": [ + 13002 + ], + "filter2": [] + }, + { + "id": 60000003, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_924", + "text": "[成长返还任务]将食人鱼提升至4星" + }, + "type": 6, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -104, + "value": 4, + "filter": [ + 13002 + ], + "filter2": [] + }, + { + "id": 60000004, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_925", + "text": "[挑战任务]传承者达到10级" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 0, + "value": 10, + "filter": [], + "filter2": [] + }, + { + "id": 60000005, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_926", + "text": "[挑战任务]传承者达到20级" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": 0, + "value": 20, + "filter": [], + "filter2": [] + }, + { + "id": 60000006, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_927", + "text": "[挑战任务]拥有一个30级守护者" + }, + "type": 111, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 1, + "filter": [ + 30 + ], + "filter2": [] + }, + { + "id": 60000007, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_928", + "text": "[挑战任务]进行一次十连抽" + }, + "type": 141, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -107, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 60000008, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_929", + "text": "[挑战任务]消费1000钻石" + }, + "type": 104, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -165, + "value": 1000, + "filter": [], + "filter2": [] + }, + { + "id": 60000009, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_930", + "text": "[挑战任务]狩猎挑战5次" + }, + "type": 200, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -10023, + "value": 5, + "filter": [], + "filter2": [] + }, + { + "id": 70000001, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_931", + "text": "拥有2个60级守护者" + }, + "type": 111, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 2, + "filter": [ + 60 + ], + "filter2": [] + }, + { + "id": 70000002, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_932", + "text": "将牙仙回响等级提升至满级" + }, + "type": 125, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 24002, + "filter": [ + 18 + ], + "filter2": [] + }, + { + "id": 70000003, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_933", + "text": "将睡神回响等级提升到满级" + }, + "type": 125, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 24003, + "filter": [ + 18 + ], + "filter2": [] + }, + { + "id": 70000004, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_934", + "text": "将圣诞老人回响等级提升到满级" + }, + "type": 125, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 34003, + "filter": [ + 18 + ], + "filter2": [] + }, + { + "id": 70000005, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_935", + "text": "将亚丝翠回响等级提升到满级" + }, + "type": 125, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 14003, + "filter": [ + 18 + ], + "filter2": [] + }, + { + "id": 70000006, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_936", + "text": "将悍娇虎回响等级提升到满级" + }, + "type": 125, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 44006, + "filter": [ + 18 + ], + "filter2": [] + }, + { + "id": 70000007, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_937", + "text": "将鹤大师提回响等级提升到满级" + }, + "type": 125, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "NPC": -103, + "value": 14005, + "filter": [ + 18 + ], + "filter2": [] } ] \ No newline at end of file diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 992a4a81d..271a4e27e 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1182,5 +1182,10 @@ "filter": [ "eq" ] + }, + { + "id": 208, + "insert": 2, + "filter": [] } ] \ No newline at end of file diff --git a/bin/json/game_drawcardreward.json b/bin/json/game_drawcardreward.json index a3c5b8d3d..abd5325cd 100644 --- a/bin/json/game_drawcardreward.json +++ b/bin/json/game_drawcardreward.json @@ -1,68 +1,8 @@ [ { - "num": 20, + "num": 50, "text": { - "key": "drawcard_drawcard_reward_text20", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 1 - } - }, - { - "num": 40, - "text": { - "key": "drawcard_drawcard_reward_text40", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 1 - } - }, - { - "num": 60, - "text": { - "key": "drawcard_drawcard_reward_text60", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 1 - } - }, - { - "num": 80, - "text": { - "key": "drawcard_drawcard_reward_text80", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 1 - } - }, - { - "num": 100, - "text": { - "key": "drawcard_drawcard_reward_text100", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 10 - } - }, - { - "num": 120, - "text": { - "key": "drawcard_drawcard_reward_text120", + "key": "drawcard_drawcard_reward_text50", "text": "{0}抽" }, "reward": { @@ -72,9 +12,9 @@ } }, { - "num": 150, + "num": 100, "text": { - "key": "drawcard_drawcard_reward_text150", + "key": "drawcard_drawcard_reward_text100", "text": "{0}抽" }, "reward": { @@ -94,5 +34,53 @@ "t": "10000001", "n": 10 } + }, + { + "num": 300, + "text": { + "key": "drawcard_drawcard_reward_text300", + "text": "{0}抽" + }, + "reward": { + "a": "item", + "t": "17050001", + "n": 1 + } + }, + { + "num": 400, + "text": { + "key": "drawcard_drawcard_reward_text400", + "text": "{0}抽" + }, + "reward": { + "a": "item", + "t": "10000006", + "n": 1 + } + }, + { + "num": 600, + "text": { + "key": "drawcard_drawcard_reward_text600", + "text": "{0}抽" + }, + "reward": { + "a": "item", + "t": "10000024", + "n": 10 + } + }, + { + "num": 800, + "text": { + "key": "drawcard_drawcard_reward_text800", + "text": "{0}抽" + }, + "reward": { + "a": "item", + "t": "10000101", + "n": 100 + } } ] \ No newline at end of file diff --git a/bin/json/game_drawreplace.json b/bin/json/game_drawreplace.json index 3e24e18e7..9f971df54 100644 --- a/bin/json/game_drawreplace.json +++ b/bin/json/game_drawreplace.json @@ -26,25 +26,49 @@ { "id": 4, "pool": 2, - "hero_initial": "35001", - "hero_replace": "35001", + "hero_initial": "15002", + "hero_replace": "15002", "replace_cd": 5184000, - "replace_num": 60 + "replace_num": 0 }, { "id": 5, "pool": 2, - "hero_initial": "35001", - "hero_replace": "43006", + "hero_initial": "15002", + "hero_replace": "15004", "replace_cd": 5184000, - "replace_num": 120 + "replace_num": 0 }, { "id": 6, "pool": 2, - "hero_initial": "35001", - "hero_replace": "43001", + "hero_initial": "15002", + "hero_replace": "25001", "replace_cd": 5184000, - "replace_num": 200 + "replace_num": 300 + }, + { + "id": 7, + "pool": 2, + "hero_initial": "15002", + "hero_replace": "25004", + "replace_cd": 5184000, + "replace_num": 300 + }, + { + "id": 8, + "pool": 2, + "hero_initial": "15002", + "hero_replace": "35004", + "replace_cd": 5184000, + "replace_num": 400 + }, + { + "id": 9, + "pool": 2, + "hero_initial": "15002", + "hero_replace": "35005", + "replace_cd": 5184000, + "replace_num": 600 } ] \ No newline at end of file diff --git a/bin/json/game_drawreward.json b/bin/json/game_drawreward.json index a3c5b8d3d..abd5325cd 100644 --- a/bin/json/game_drawreward.json +++ b/bin/json/game_drawreward.json @@ -1,68 +1,8 @@ [ { - "num": 20, + "num": 50, "text": { - "key": "drawcard_drawcard_reward_text20", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 1 - } - }, - { - "num": 40, - "text": { - "key": "drawcard_drawcard_reward_text40", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 1 - } - }, - { - "num": 60, - "text": { - "key": "drawcard_drawcard_reward_text60", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 1 - } - }, - { - "num": 80, - "text": { - "key": "drawcard_drawcard_reward_text80", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 1 - } - }, - { - "num": 100, - "text": { - "key": "drawcard_drawcard_reward_text100", - "text": "{0}抽" - }, - "reward": { - "a": "item", - "t": "10000001", - "n": 10 - } - }, - { - "num": 120, - "text": { - "key": "drawcard_drawcard_reward_text120", + "key": "drawcard_drawcard_reward_text50", "text": "{0}抽" }, "reward": { @@ -72,9 +12,9 @@ } }, { - "num": 150, + "num": 100, "text": { - "key": "drawcard_drawcard_reward_text150", + "key": "drawcard_drawcard_reward_text100", "text": "{0}抽" }, "reward": { @@ -94,5 +34,53 @@ "t": "10000001", "n": 10 } + }, + { + "num": 300, + "text": { + "key": "drawcard_drawcard_reward_text300", + "text": "{0}抽" + }, + "reward": { + "a": "item", + "t": "17050001", + "n": 1 + } + }, + { + "num": 400, + "text": { + "key": "drawcard_drawcard_reward_text400", + "text": "{0}抽" + }, + "reward": { + "a": "item", + "t": "10000006", + "n": 1 + } + }, + { + "num": 600, + "text": { + "key": "drawcard_drawcard_reward_text600", + "text": "{0}抽" + }, + "reward": { + "a": "item", + "t": "10000024", + "n": 10 + } + }, + { + "num": 800, + "text": { + "key": "drawcard_drawcard_reward_text800", + "text": "{0}抽" + }, + "reward": { + "a": "item", + "t": "10000101", + "n": 100 + } } ] \ No newline at end of file diff --git a/bin/json/game_fategiftfate.json b/bin/json/game_fategiftfate.json index cdec1fef9..362839532 100644 --- a/bin/json/game_fategiftfate.json +++ b/bin/json/game_fategiftfate.json @@ -3,7 +3,7 @@ "fatekey": 1, "heroid": 35006, "herostage": 1, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_1", "text": "测试1" @@ -13,7 +13,7 @@ "fatekey": 2, "heroid": 35006, "herostage": 1, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_2", "text": "测试2" @@ -23,7 +23,7 @@ "fatekey": 3, "heroid": 35006, "herostage": 1, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_3", "text": "测试3" @@ -33,7 +33,7 @@ "fatekey": 4, "heroid": 35006, "herostage": 1, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_4", "text": "测试4" @@ -43,7 +43,7 @@ "fatekey": 5, "heroid": 35006, "herostage": 2, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_5", "text": "测试5" @@ -53,7 +53,7 @@ "fatekey": 6, "heroid": 35006, "herostage": 2, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_6", "text": "测试6" @@ -63,7 +63,7 @@ "fatekey": 7, "heroid": 35006, "herostage": 2, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_7", "text": "测试7" @@ -73,7 +73,7 @@ "fatekey": 8, "heroid": 35006, "herostage": 2, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_8", "text": "测试8" @@ -83,7 +83,7 @@ "fatekey": 9, "heroid": 35006, "herostage": 3, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_9", "text": "测试9" @@ -93,7 +93,7 @@ "fatekey": 10, "heroid": 35006, "herostage": 3, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_10", "text": "测试10" @@ -103,7 +103,7 @@ "fatekey": 11, "heroid": 35006, "herostage": 3, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_11", "text": "测试11" @@ -113,7 +113,7 @@ "fatekey": 12, "heroid": 35006, "herostage": 3, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_12", "text": "测试12" @@ -123,7 +123,7 @@ "fatekey": 13, "heroid": 35006, "herostage": 4, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_13", "text": "测试13" @@ -133,7 +133,7 @@ "fatekey": 14, "heroid": 35006, "herostage": 4, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_14", "text": "测试14" @@ -143,7 +143,7 @@ "fatekey": 15, "heroid": 35006, "herostage": 4, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_15", "text": "测试15" @@ -153,7 +153,7 @@ "fatekey": 16, "heroid": 35006, "herostage": 4, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_16", "text": "测试16" @@ -163,7 +163,7 @@ "fatekey": 17, "heroid": 35006, "herostage": 5, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_17", "text": "测试17" @@ -173,7 +173,7 @@ "fatekey": 18, "heroid": 35006, "herostage": 5, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_18", "text": "测试18" @@ -183,7 +183,7 @@ "fatekey": 19, "heroid": 35006, "herostage": 5, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_19", "text": "测试19" @@ -193,7 +193,7 @@ "fatekey": 20, "heroid": 35006, "herostage": 5, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_20", "text": "测试20" @@ -203,7 +203,7 @@ "fatekey": 21, "heroid": 35006, "herostage": 6, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_21", "text": "测试21" @@ -213,7 +213,7 @@ "fatekey": 22, "heroid": 35006, "herostage": 6, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_22", "text": "测试22" @@ -223,7 +223,7 @@ "fatekey": 23, "heroid": 35006, "herostage": 6, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_23", "text": "测试23" @@ -233,7 +233,7 @@ "fatekey": 24, "heroid": 35006, "herostage": 6, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_24", "text": "测试24" @@ -243,7 +243,7 @@ "fatekey": 25, "heroid": 35006, "herostage": 7, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_25", "text": "测试25" @@ -253,7 +253,7 @@ "fatekey": 26, "heroid": 35006, "herostage": 7, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_26", "text": "测试26" @@ -263,7 +263,7 @@ "fatekey": 27, "heroid": 35006, "herostage": 7, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_27", "text": "测试27" @@ -273,7 +273,7 @@ "fatekey": 28, "heroid": 35006, "herostage": 7, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_28", "text": "测试28" @@ -283,7 +283,7 @@ "fatekey": 29, "heroid": 45001, "herostage": 1, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_29", "text": "测试29" @@ -293,7 +293,7 @@ "fatekey": 30, "heroid": 45001, "herostage": 1, - "stagetask": 15000001, + "stagetask": 70000001, "stagetasktext": { "key": "fategift_stagetask_test_30", "text": "测试30" @@ -303,7 +303,7 @@ "fatekey": 31, "heroid": 45001, "herostage": 1, - "stagetask": 15000001, + "stagetask": 70000006, "stagetasktext": { "key": "fategift_stagetask_test_31", "text": "测试31" @@ -313,10 +313,50 @@ "fatekey": 32, "heroid": 45001, "herostage": 1, - "stagetask": 15000001, + "stagetask": 70000007, "stagetasktext": { "key": "fategift_stagetask_test_32", "text": "测试32" } + }, + { + "fatekey": 33, + "heroid": 25004, + "herostage": 1, + "stagetask": 70000001, + "stagetasktext": { + "key": "fategift_stagetask_test_33", + "text": "测试33" + } + }, + { + "fatekey": 34, + "heroid": 25004, + "herostage": 1, + "stagetask": 70000001, + "stagetasktext": { + "key": "fategift_stagetask_test_34", + "text": "测试34" + } + }, + { + "fatekey": 35, + "heroid": 25004, + "herostage": 1, + "stagetask": 70000002, + "stagetasktext": { + "key": "fategift_stagetask_test_35", + "text": "测试35" + } + }, + { + "fatekey": 36, + "heroid": 25004, + "herostage": 1, + "stagetask": 70000003, + "stagetasktext": { + "key": "fategift_stagetask_test_36", + "text": "测试36" + } } ] \ No newline at end of file diff --git a/bin/json/game_fategiftreward.json b/bin/json/game_fategiftreward.json index de586ead3..894f4b8de 100644 --- a/bin/json/game_fategiftreward.json +++ b/bin/json/game_fategiftreward.json @@ -78,5 +78,15 @@ "t": "45001", "n": 1 } + }, + { + "rewardkey": 9, + "heroid": 25004, + "stageid": 1, + "stagereward": { + "a": "hero", + "t": "25004", + "n": 1 + } } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 9849e76fe..dd666bb6a 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -63,12 +63,12 @@ "reward_star5": { "a": "item", "t": "10000101", - "n": 10 + "n": 30 }, "exchange_hero": { "a": "item", "t": "10000101", - "n": 100 + "n": 150 }, "camp1_pool_cost": { "a": "item", diff --git a/bin/json/game_item.json b/bin/json/game_item.json index cdc8ae0b6..40a8a2308 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -15372,7 +15372,7 @@ "id": "21000002", "name": { "key": "item_item_name_349", - "text": "鸟蛋" + "text": "角鸟蛋" }, "usetype": 2, "color": 4, @@ -15413,7 +15413,7 @@ "id": "21000003", "name": { "key": "item_item_name_350", - "text": "海螺" + "text": "熊猫立牌" }, "usetype": 2, "color": 4, @@ -15454,7 +15454,7 @@ "id": "21000004", "name": { "key": "item_item_name_351", - "text": "颈枕" + "text": "金海豚奖杯" }, "usetype": 2, "color": 4, @@ -15495,7 +15495,7 @@ "id": "21000005", "name": { "key": "item_item_name_352", - "text": "贝壳项链" + "text": "沼泽牙膏" }, "usetype": 2, "color": 4, @@ -15536,7 +15536,7 @@ "id": "21000006", "name": { "key": "item_item_name_353", - "text": "阳春面" + "text": "碎骨龙碎片" }, "usetype": 2, "color": 4, @@ -15577,7 +15577,7 @@ "id": "21000007", "name": { "key": "item_item_name_354", - "text": "冲天椅" + "text": "马鞍" }, "usetype": 2, "color": 4, @@ -15618,7 +15618,7 @@ "id": "21000008", "name": { "key": "item_item_name_355", - "text": "熊猫立牌" + "text": "音乐琴弦" }, "usetype": 2, "color": 4, @@ -15659,7 +15659,7 @@ "id": "21000009", "name": { "key": "item_item_name_356", - "text": "灯笼" + "text": "配方奶" }, "usetype": 2, "color": 4, @@ -15700,7 +15700,7 @@ "id": "21000010", "name": { "key": "item_item_name_357", - "text": "美肚鲨的微笑" + "text": "马戏团演出服" }, "usetype": 2, "color": 4, @@ -15741,7 +15741,7 @@ "id": "21000011", "name": { "key": "item_item_name_358", - "text": "暗纹金杯" + "text": "超级芯片" }, "usetype": 2, "color": 4, @@ -15782,7 +15782,7 @@ "id": "21000012", "name": { "key": "item_item_name_359", - "text": "奶油蛋糕" + "text": "记忆之牙" }, "usetype": 2, "color": 4, @@ -15823,7 +15823,7 @@ "id": "21000013", "name": { "key": "item_item_name_360", - "text": "推推糖" + "text": "纪念版巨怪徽章" }, "usetype": 2, "color": 4, @@ -15864,7 +15864,7 @@ "id": "21000014", "name": { "key": "item_item_name_361", - "text": "魔法毯" + "text": "远古巨石" }, "usetype": 2, "color": 4, @@ -15905,7 +15905,7 @@ "id": "21000015", "name": { "key": "item_item_name_362", - "text": "幸福药水" + "text": "奶油蛋糕" }, "usetype": 2, "color": 4, @@ -15946,7 +15946,7 @@ "id": "21000016", "name": { "key": "item_item_name_363", - "text": "手鼓" + "text": "水果篮" }, "usetype": 2, "color": 4, @@ -15987,7 +15987,7 @@ "id": "21000017", "name": { "key": "item_item_name_364", - "text": "魔镜" + "text": "玻璃杯" }, "usetype": 2, "color": 4, @@ -16028,7 +16028,7 @@ "id": "21000018", "name": { "key": "item_item_name_365", - "text": "龙宝典" + "text": "棒棒糖" }, "usetype": 2, "color": 4, @@ -16069,7 +16069,7 @@ "id": "21000019", "name": { "key": "item_item_name_366", - "text": "手工龙牙" + "text": "岩洞晶石" }, "usetype": 2, "color": 4, @@ -16110,7 +16110,7 @@ "id": "21000020", "name": { "key": "item_item_name_367", - "text": "葛林魔弩箭" + "text": "童话书" }, "usetype": 2, "color": 4, @@ -16151,7 +16151,7 @@ "id": "21000021", "name": { "key": "item_item_name_368", - "text": "龙鞍" + "text": "木桶" }, "usetype": 2, "color": 4, @@ -16189,9 +16189,501 @@ ] }, { - "id": "10000036", + "id": "21000022", "name": { "key": "item_item_name_369", + "text": "盾牌" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_mirror", + "intr": { + "key": "item_item_intr_378", + "text": "这是一面能窥探到人内心深处欲望的镜子。" + }, + "describe": { + "key": "item_item_describe_378", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1001 + } + ] + }, + { + "id": "21000023", + "name": { + "key": "item_item_name_370", + "text": "竹吊床" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_treasureclassic", + "intr": { + "key": "item_item_intr_379", + "text": "这本书里记载了各种龙的信息，爱龙人士的首选。" + }, + "describe": { + "key": "item_item_describe_379", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1002 + } + ] + }, + { + "id": "21000024", + "name": { + "key": "item_item_name_371", + "text": "溜冰鞋" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_dragonteeth", + "intr": { + "key": "item_item_intr_380", + "text": "维京人纯手工打造的龙牙，坚硬无比。" + }, + "describe": { + "key": "item_item_describe_380", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1003 + } + ] + }, + { + "id": "21000025", + "name": { + "key": "item_item_name_372", + "text": "冰淇淋" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_bolt", + "intr": { + "key": "item_item_intr_381", + "text": "猎龙人研发的弩箭，是龙的天敌。" + }, + "describe": { + "key": "item_item_describe_381", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1004 + } + ] + }, + { + "id": "21000026", + "name": { + "key": "item_item_name_373", + "text": "弓箭" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_dragonsaddle", + "intr": { + "key": "item_item_intr_382", + "text": "龙骑士驯龙时安置在龙身上的护具。" + }, + "describe": { + "key": "item_item_describe_382", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1005 + } + ] + }, + { + "id": "21000027", + "name": { + "key": "item_item_name_374", + "text": "钢琴" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_mirror", + "intr": { + "key": "item_item_intr_383", + "text": "这是一面能窥探到人内心深处欲望的镜子。" + }, + "describe": { + "key": "item_item_describe_383", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1006 + } + ] + }, + { + "id": "21000028", + "name": { + "key": "item_item_name_375", + "text": "捕兽夹" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_treasureclassic", + "intr": { + "key": "item_item_intr_384", + "text": "这本书里记载了各种龙的信息，爱龙人士的首选。" + }, + "describe": { + "key": "item_item_describe_384", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1007 + } + ] + }, + { + "id": "21000029", + "name": { + "key": "item_item_name_376", + "text": "报纸" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_dragonteeth", + "intr": { + "key": "item_item_intr_385", + "text": "维京人纯手工打造的龙牙，坚硬无比。" + }, + "describe": { + "key": "item_item_describe_385", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1008 + } + ] + }, + { + "id": "21000030", + "name": { + "key": "item_item_name_377", + "text": "古典鼓" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_bolt", + "intr": { + "key": "item_item_intr_386", + "text": "猎龙人研发的弩箭，是龙的天敌。" + }, + "describe": { + "key": "item_item_describe_386", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1009 + } + ] + }, + { + "id": "21000031", + "name": { + "key": "item_item_name_378", + "text": "象牙" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_dragonsaddle", + "intr": { + "key": "item_item_intr_387", + "text": "龙骑士驯龙时安置在龙身上的护具。" + }, + "describe": { + "key": "item_item_describe_387", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1010 + } + ] + }, + { + "id": "21000032", + "name": { + "key": "item_item_name_379", + "text": "岩铁矿" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_bolt", + "intr": { + "key": "item_item_intr_388", + "text": "猎龙人研发的弩箭，是龙的天敌。" + }, + "describe": { + "key": "item_item_describe_388", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1011 + } + ] + }, + { + "id": "21000033", + "name": { + "key": "item_item_name_380", + "text": "气球" + }, + "usetype": 2, + "color": 4, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 11001, + "upper_limit": 999, + "img": "item_dragonsaddle", + "intr": { + "key": "item_item_intr_389", + "text": "龙骑士驯龙时安置在龙身上的护具。" + }, + "describe": { + "key": "item_item_describe_389", + "text": "此处是包装描述" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1012 + } + ] + }, + { + "id": "10000036", + "name": { + "key": "item_item_name_381", "text": "宝螺贝" }, "usetype": 1, @@ -16214,11 +16706,11 @@ "upper_limit": 999, "img": "item_10000035", "intr": { - "key": "item_item_intr_378", + "key": "item_item_intr_390", "text": "原始社会最常见的货币，在搁浅的沙滩上很容易找到它。光滑小巧的个头方便携带，又受人们喜爱。" }, "describe": { - "key": "item_item_describe_378", + "key": "item_item_describe_390", "text": "此处是包装描述" }, "sale": [ @@ -16232,7 +16724,7 @@ { "id": "10000037", "name": { - "key": "item_item_name_370", + "key": "item_item_name_382", "text": "智慧水晶" }, "usetype": 1, @@ -16255,11 +16747,11 @@ "upper_limit": 999, "img": "item_10000035", "intr": { - "key": "item_item_intr_379", + "key": "item_item_intr_391", "text": "迷宫中的美丽水晶，波澜浮光的棕红，是石洞天然形成的瑰宝。它拥有特殊的能量，将它握在手中，能使感官大幅度增强。（注意要和巨怪商队中的画的不一样）" }, "describe": { - "key": "item_item_describe_379", + "key": "item_item_describe_391", "text": "此处是包装描述" }, "sale": [ @@ -16273,7 +16765,7 @@ { "id": "10000038", "name": { - "key": "item_item_name_371", + "key": "item_item_name_383", "text": "石阵周常积分" }, "usetype": 1, @@ -16296,11 +16788,11 @@ "upper_limit": 999, "img": "item_10000035", "intr": { - "key": "item_item_intr_380", + "key": "item_item_intr_392", "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。" }, "describe": { - "key": "item_item_describe_380", + "key": "item_item_describe_392", "text": "此处是包装描述" }, "sale": [ @@ -16314,7 +16806,7 @@ { "id": "22100001", "name": { - "key": "item_item_name_372", + "key": "item_item_name_384", "text": "智慧水晶" }, "usetype": 2, @@ -16337,11 +16829,11 @@ "upper_limit": 999, "img": "wp_icon_jjcq", "intr": { - "key": "item_item_intr_381", + "key": "item_item_intr_393", "text": "可以用于联合演练中抽奖。" }, "describe": { - "key": "item_item_describe_381", + "key": "item_item_describe_393", "text": "此处是包装描述" }, "sale": [ @@ -16355,7 +16847,7 @@ { "id": "23000001", "name": { - "key": "item_item_name_373", + "key": "item_item_name_385", "text": "开服活动抽奖卷" }, "usetype": 2, @@ -16378,11 +16870,11 @@ "upper_limit": 9999, "img": "wp_icon_jjcq", "intr": { - "key": "item_item_intr_382", + "key": "item_item_intr_394", "text": "可以用于开服活动中抽奖。" }, "describe": { - "key": "item_item_describe_382", + "key": "item_item_describe_394", "text": "此处是包装描述" }, "sale": [ @@ -16396,7 +16888,7 @@ { "id": "10000039", "name": { - "key": "item_item_name_374", + "key": "item_item_name_386", "text": "石阵秘境宝箱钥匙" }, "usetype": 1, @@ -16419,11 +16911,11 @@ "upper_limit": 999, "img": "item_10000035", "intr": { - "key": "item_item_intr_380", + "key": "item_item_intr_395", "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。" }, "describe": { - "key": "item_item_describe_380", + "key": "item_item_describe_395", "text": "此处是包装描述" }, "sale": [ @@ -16437,7 +16929,7 @@ { "id": "17110001", "name": { - "key": "item_item_name_374", + "key": "item_item_name_387", "text": "3种族招募卡自选箱" }, "usetype": 4, @@ -16460,11 +16952,11 @@ "upper_limit": 999, "img": "", "intr": { - "key": "item_item_intr_383", + "key": "item_item_intr_396", "text": "可以从中自由选择3种阵营招募卷的宝箱" }, "describe": { - "key": "item_item_describe_383", + "key": "item_item_describe_396", "text": "" }, "sale": [ @@ -16478,7 +16970,7 @@ { "id": "17040001", "name": { - "key": "item_item_name_375", + "key": "item_item_name_388", "text": "4星无极套装宝箱" }, "usetype": 5, @@ -16503,11 +16995,11 @@ "upper_limit": 99, "img": "item_17030001", "intr": { - "key": "item_item_intr_384", + "key": "item_item_intr_397", "text": "开启后，可以获得一套4星装备。" }, "describe": { - "key": "item_item_describe_384", + "key": "item_item_describe_397", "text": "此处是包装描述" }, "sale": [ diff --git a/bin/json/game_shopcentercontrol.json b/bin/json/game_shopcentercontrol.json index 1bea57b6d..ed734f7d5 100644 --- a/bin/json/game_shopcentercontrol.json +++ b/bin/json/game_shopcentercontrol.json @@ -236,5 +236,49 @@ "times": 0, "duration": 0, "loop": 0 + }, + { + "id": 10011, + "text": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3010% bonus!", + "text": "限时礼包1" + }, + "type": 7, + "index": 1, + "slogan": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3008% bonus!", + "text": "超值返利1688%" + }, + "point": "passcheck_10", + "props": [], + "restriction": 1, + "lv": 1, + "on": 0, + "time": 0, + "times": 0, + "duration": 0, + "loop": 0 + }, + { + "id": 10012, + "text": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3011% bonus!", + "text": "限时礼包2" + }, + "type": 7, + "index": 2, + "slogan": { + "key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3009% bonus!", + "text": "超值返利1688%" + }, + "point": "passcheck_11", + "props": [], + "restriction": 1, + "lv": 1, + "on": 0, + "time": 0, + "times": 0, + "duration": 0, + "loop": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 2d98e55dc..3aa7d0b4c 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -28929,6 +28929,31 @@ "Where": [], "Order": "", "Limit": 10, + "ExecuteCnt": 1, + "Type": 8, + "Argu": [ + 3, + 2, + 500 + ], + "FollowSK": [], + "SucFollowSK": [ + 255006213 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 255006213, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, "ExecuteCnt": 5, "Type": 1, "Argu": [ @@ -28937,9 +28962,7 @@ 300 ], "FollowSK": [], - "SucFollowSK": [ - 255006213 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 105, @@ -28950,29 +28973,6 @@ 50 ] }, - { - "Id": 255006213, - "EmitPR": 1000, - "From": 2, - "Where": [], - "Order": "", - "Limit": 10, - "ExecuteCnt": 1, - "Type": 8, - "Argu": [ - 3, - 2, - 500 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, { "Id": 255006311, "EmitPR": 1000, @@ -29369,7 +29369,7 @@ "Argu": [ 390001415, 1000, - 5, + 10, -1 ], "FollowSK": [], diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 20776b235..dc281e719 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -3042,7 +3042,7 @@ }, "BuffType": 74, "EffectArgu": [ - 50 + 99 ], "BufParNum": 1, "RelyCheckArgu": [], diff --git a/bin/json/game_smithycustomer.json b/bin/json/game_smithycustomer.json index 87296a7c7..bad7311b8 100644 --- a/bin/json/game_smithycustomer.json +++ b/bin/json/game_smithycustomer.json @@ -14,7 +14,7 @@ "n": 0 } ], - "weight": 2000 + "weight": 50 }, { "customer_id": 2, @@ -31,7 +31,7 @@ "n": 0 } ], - "weight": 2000 + "weight": 50 }, { "customer_id": 3, @@ -65,6 +65,6 @@ "n": 1 } ], - "weight": 6000 + "weight": 0 } ] \ No newline at end of file diff --git a/bin/json/game_venturegiftstask.json b/bin/json/game_venturegiftstask.json index a75870d37..668ceddd4 100644 --- a/bin/json/game_venturegiftstask.json +++ b/bin/json/game_venturegiftstask.json @@ -2,7 +2,7 @@ { "taskkey": 1, "openday": 1, - "venturetask": 110060, + "venturetask": 60000001, "tasktext": { "key": "venturegift_task_test_1", "text": "测试文本1" @@ -18,7 +18,7 @@ { "taskkey": 2, "openday": 1, - "venturetask": 110060, + "venturetask": 60000004, "tasktext": { "key": "venturegift_task_test_2", "text": "测试文本2" @@ -34,7 +34,7 @@ { "taskkey": 3, "openday": 1, - "venturetask": 110060, + "venturetask": 60000006, "tasktext": { "key": "venturegift_task_test_3", "text": "测试文本3" @@ -50,7 +50,7 @@ { "taskkey": 4, "openday": 1, - "venturetask": 110060, + "venturetask": 60000007, "tasktext": { "key": "venturegift_task_test_4", "text": "测试文本4" @@ -66,7 +66,7 @@ { "taskkey": 5, "openday": 1, - "venturetask": 110060, + "venturetask": 60000008, "tasktext": { "key": "venturegift_task_test_5", "text": "测试文本5" @@ -82,7 +82,7 @@ { "taskkey": 6, "openday": 1, - "venturetask": 110060, + "venturetask": 60000009, "tasktext": { "key": "venturegift_task_test_6", "text": "测试文本6" @@ -98,7 +98,7 @@ { "taskkey": 7, "openday": 2, - "venturetask": 110060, + "venturetask": 60000002, "tasktext": { "key": "venturegift_task_test_7", "text": "测试文本7" @@ -114,7 +114,7 @@ { "taskkey": 8, "openday": 2, - "venturetask": 110060, + "venturetask": 60000003, "tasktext": { "key": "venturegift_task_test_8", "text": "测试文本8" @@ -130,7 +130,7 @@ { "taskkey": 9, "openday": 2, - "venturetask": 110060, + "venturetask": 60000006, "tasktext": { "key": "venturegift_task_test_9", "text": "测试文本9" @@ -146,7 +146,7 @@ { "taskkey": 10, "openday": 2, - "venturetask": 110060, + "venturetask": 60000007, "tasktext": { "key": "venturegift_task_test_10", "text": "测试文本10" @@ -162,7 +162,7 @@ { "taskkey": 11, "openday": 2, - "venturetask": 110060, + "venturetask": 60000008, "tasktext": { "key": "venturegift_task_test_11", "text": "测试文本11" @@ -178,7 +178,7 @@ { "taskkey": 12, "openday": 3, - "venturetask": 110060, + "venturetask": 60000001, "tasktext": { "key": "venturegift_task_test_12", "text": "测试文本12" @@ -194,7 +194,7 @@ { "taskkey": 13, "openday": 3, - "venturetask": 110060, + "venturetask": 60000004, "tasktext": { "key": "venturegift_task_test_13", "text": "测试文本13" @@ -210,7 +210,7 @@ { "taskkey": 14, "openday": 3, - "venturetask": 110060, + "venturetask": 60000006, "tasktext": { "key": "venturegift_task_test_14", "text": "测试文本14" @@ -226,7 +226,7 @@ { "taskkey": 15, "openday": 3, - "venturetask": 110060, + "venturetask": 60000007, "tasktext": { "key": "venturegift_task_test_15", "text": "测试文本15" @@ -242,7 +242,7 @@ { "taskkey": 16, "openday": 3, - "venturetask": 110060, + "venturetask": 60000008, "tasktext": { "key": "venturegift_task_test_16", "text": "测试文本16" @@ -258,7 +258,7 @@ { "taskkey": 17, "openday": 4, - "venturetask": 110060, + "venturetask": 60000001, "tasktext": { "key": "venturegift_task_test_17", "text": "测试文本17" @@ -274,7 +274,7 @@ { "taskkey": 18, "openday": 4, - "venturetask": 110060, + "venturetask": 60000004, "tasktext": { "key": "venturegift_task_test_18", "text": "测试文本18" @@ -290,7 +290,7 @@ { "taskkey": 19, "openday": 4, - "venturetask": 110060, + "venturetask": 60000006, "tasktext": { "key": "venturegift_task_test_19", "text": "测试文本19" @@ -306,7 +306,7 @@ { "taskkey": 20, "openday": 4, - "venturetask": 110060, + "venturetask": 60000007, "tasktext": { "key": "venturegift_task_test_20", "text": "测试文本20" @@ -322,7 +322,7 @@ { "taskkey": 21, "openday": 4, - "venturetask": 110060, + "venturetask": 60000008, "tasktext": { "key": "venturegift_task_test_21", "text": "测试文本21" @@ -338,7 +338,7 @@ { "taskkey": 22, "openday": 5, - "venturetask": 110060, + "venturetask": 60000001, "tasktext": { "key": "venturegift_task_test_22", "text": "测试文本22" @@ -354,7 +354,7 @@ { "taskkey": 23, "openday": 5, - "venturetask": 110060, + "venturetask": 60000004, "tasktext": { "key": "venturegift_task_test_23", "text": "测试文本23" @@ -370,7 +370,7 @@ { "taskkey": 24, "openday": 5, - "venturetask": 110060, + "venturetask": 60000006, "tasktext": { "key": "venturegift_task_test_24", "text": "测试文本24" @@ -386,7 +386,7 @@ { "taskkey": 25, "openday": 5, - "venturetask": 110060, + "venturetask": 60000007, "tasktext": { "key": "venturegift_task_test_25", "text": "测试文本25" @@ -402,7 +402,7 @@ { "taskkey": 26, "openday": 5, - "venturetask": 110060, + "venturetask": 60000008, "tasktext": { "key": "venturegift_task_test_26", "text": "测试文本26" @@ -418,7 +418,7 @@ { "taskkey": 27, "openday": 6, - "venturetask": 110060, + "venturetask": 60000001, "tasktext": { "key": "venturegift_task_test_27", "text": "测试文本27" @@ -434,7 +434,7 @@ { "taskkey": 28, "openday": 6, - "venturetask": 110060, + "venturetask": 60000004, "tasktext": { "key": "venturegift_task_test_28", "text": "测试文本28" @@ -450,7 +450,7 @@ { "taskkey": 29, "openday": 6, - "venturetask": 110060, + "venturetask": 60000006, "tasktext": { "key": "venturegift_task_test_29", "text": "测试文本29" @@ -466,7 +466,7 @@ { "taskkey": 30, "openday": 6, - "venturetask": 110060, + "venturetask": 60000007, "tasktext": { "key": "venturegift_task_test_30", "text": "测试文本30" @@ -482,7 +482,7 @@ { "taskkey": 31, "openday": 6, - "venturetask": 110060, + "venturetask": 60000008, "tasktext": { "key": "venturegift_task_test_31", "text": "测试文本31" @@ -498,7 +498,7 @@ { "taskkey": 32, "openday": 7, - "venturetask": 110060, + "venturetask": 60000001, "tasktext": { "key": "venturegift_task_test_32", "text": "测试文本32" @@ -514,7 +514,7 @@ { "taskkey": 33, "openday": 7, - "venturetask": 110060, + "venturetask": 60000004, "tasktext": { "key": "venturegift_task_test_33", "text": "测试文本33" @@ -530,7 +530,7 @@ { "taskkey": 34, "openday": 7, - "venturetask": 110060, + "venturetask": 60000006, "tasktext": { "key": "venturegift_task_test_34", "text": "测试文本34" @@ -546,7 +546,7 @@ { "taskkey": 35, "openday": 7, - "venturetask": 110060, + "venturetask": 60000007, "tasktext": { "key": "venturegift_task_test_35", "text": "测试文本35" @@ -562,7 +562,7 @@ { "taskkey": 36, "openday": 7, - "venturetask": 110060, + "venturetask": 60000008, "tasktext": { "key": "venturegift_task_test_36", "text": "测试文本36" diff --git a/modules/activity/api_turntable.go b/modules/activity/api_turntable.go index 53079305b..ff99ca13e 100644 --- a/modules/activity/api_turntable.go +++ b/modules/activity/api_turntable.go @@ -5,6 +5,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -27,6 +28,7 @@ func (this *apiComp) TurntableReward(session comm.IUserSession, req *pb.Activity activity *pb.DBHuodong // 活动数据 err error atno []*pb.UserAtno + reward []int32 ) key := fmt.Sprintf("%s:%s", session.GetUserId(), req.Oid) data, err := this.module.modelhdData.getHddataByOid(session.GetUserId(), key) @@ -55,10 +57,27 @@ func (this *apiComp) TurntableReward(session comm.IUserSession, req *pb.Activity } return } - // 发奖 + if data.Val >= this.module.configure.GetMaxTurntableCount() { // 领取校验 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityRepatReward, + Title: pb.ErrorCode_ActivityRepatReward.ToString(), + } + return + } + for k := range data.Gotarr { + reward = append(reward, k) + } + // 发奖 + if item, err := this.module.Turntable(data.Val, reward); err != nil { + this.module.DispenseRes(session, []*cfg.Gameatn{item}, true) + // 修改进度 + data.Gotarr[data.Val] = 1 + data.Val += 1 + } update := make(map[string]interface{}) update["gotarr"] = data.Gotarr + update["val"] = data.Val this.module.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update) session.SendMsg(string(this.module.GetType()), "turntablereward", &pb.ActivityTurntableRewardResp{ Data: data, diff --git a/modules/activity/comp_configure.go b/modules/activity/comp_configure.go index 1122a340d..f56506dbc 100644 --- a/modules/activity/comp_configure.go +++ b/modules/activity/comp_configure.go @@ -124,3 +124,7 @@ func (this *configureComp) GetHDCelebrationData() (days []int32) { } return } + +func (this *configureComp) GetMaxTurntableCount() (count int32) { + return int32(len(this.pool1) + len(this.pool2)) +} diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go index 627559b59..57e3045d2 100644 --- a/sys/configure/structs/Game.BuffType.go +++ b/sys/configure/structs/Game.BuffType.go @@ -82,4 +82,5 @@ const ( GameBuffType_SPEED_SET_MIN_ROLE = 89 GameBuffType_HAS_BUFF_ADD_DMG = 90 GameBuffType_BUFF_DOT_ADD_DMG = 91 + GameBuffType_MODIFY_BUFF_ADD_PROB = 92 )