From eeb0af126290ea2878c61a02d2e81a3169d4d7c3 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 21 Apr 2023 16:10:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=98=E6=96=97=E5=BC=95=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/data_manager.lua | 2 + lua/app/common/event_manager.lua | 3 + lua/app/config/chapter.lua | 23 +- lua/app/config/chapter_board.lua | 142 +++++---- lua/app/config/item.lua | 44 +-- .../localization_global_const.lua | 1 - lua/app/config/monster_base.lua | 24 +- lua/app/config/skill_rogue.lua | 16 +- lua/app/config/strings/cn/chapter.lua | 20 +- lua/app/config/strings/cn/global.lua | 3 - lua/app/config/strings/cn/skill_rogue.lua | 26 +- lua/app/config/strings/de/skill_rogue.lua | 26 +- lua/app/config/strings/en/skill_rogue.lua | 26 +- lua/app/config/strings/fr/skill_rogue.lua | 26 +- lua/app/config/strings/id/skill_rogue.lua | 26 +- lua/app/config/strings/ja/skill_rogue.lua | 26 +- lua/app/config/strings/ko/skill_rogue.lua | 26 +- lua/app/config/strings/pt/skill_rogue.lua | 26 +- lua/app/config/strings/ru/skill_rogue.lua | 26 +- lua/app/config/strings/th/skill_rogue.lua | 26 +- lua/app/config/strings/vi/skill_rogue.lua | 26 +- lua/app/config/strings/zh/skill_rogue.lua | 26 +- lua/app/config/struct.lua | 8 +- lua/app/config/tutorial.lua | 3 + lua/app/global/global_func.lua | 3 - lua/app/module/battle/battle_manager.lua | 2 +- .../battle/controller/battle_controller.lua | 250 ++++++++++------ lua/app/module/maincity/maincity_manager.lua | 12 +- lua/app/module/tips/tips_manager.lua | 2 +- lua/app/module/tutorial/tutorial_action.lua | 7 + lua/app/module/tutorial/tutorial_const.lua | 31 +- .../tutorial/tutorial_finish_listener.lua | 38 ++- lua/app/module/tutorial/tutorial_manager.lua | 43 +-- .../module/tutorial/tutorial_task_manager.lua | 29 -- lua/app/server/data/server_tutorial_data.lua | 18 ++ .../data/server_tutorial_data.lua.meta} | 2 +- .../manager/server_tutorial_manager.lua | 24 ++ .../manager/server_tutorial_manager.lua.meta} | 2 +- lua/app/server/server_data_const.lua | 1 + lua/app/server/server_data_manager.lua | 2 + lua/app/server/server_game_data.lua | 1 + lua/app/ui/battle/battle_ui.lua | 51 ++++ lua/app/ui/ui_manager.lua | 7 +- lua/app/userdata/chapter/chapter_data.lua | 3 +- lua/app/userdata/tutorial/tutorial_data.lua | 75 +---- .../userdata/tutorial/tutorial_task_data.lua | 280 ------------------ 46 files changed, 475 insertions(+), 1009 deletions(-) delete mode 100644 lua/app/module/tutorial/tutorial_task_manager.lua create mode 100644 lua/app/server/data/server_tutorial_data.lua rename lua/app/{module/tutorial/tutorial_task_manager.lua.meta => server/data/server_tutorial_data.lua.meta} (86%) create mode 100644 lua/app/server/manager/server_tutorial_manager.lua rename lua/app/{userdata/tutorial/tutorial_task_data.lua.meta => server/manager/server_tutorial_manager.lua.meta} (86%) delete mode 100644 lua/app/userdata/tutorial/tutorial_task_data.lua diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 098034ca..968fabcc 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -11,6 +11,7 @@ function DataManager:init() self:initManager("BagData", "app/userdata/bag/bag_data") self:initManager("BattleData", "app/userdata/battle/battle_data") self:initManager("FormationData", "app/userdata/formation/formation_data") + self:initManager("TutorialData", "app/userdata/tutorial/tutorial_data") end function DataManager:initManager(name, path) @@ -87,6 +88,7 @@ function DataManager:initWithServerData(data) self.HeroData:init(data.HeroData) self.BagData:init(data.BagData) self.FormationData:init(data.FormationData) + self.TutorialData:init(data.TutorialData) self:scheduleGlobal() self:checkDataBind() diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index b47951f6..920719a3 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -19,6 +19,9 @@ EventManager.CUSTOM_EVENT = { TUTORIAL_TASK_REWARD = "TUTORIAL_TASK_REWARD", ATK_TRAIN_TUTORIAL_OVER = "ATK_TRAIN_TUTORIAL_OVER", TUTORIAL_TASK_STOP = "TUTORIAL_TASK_STOP", + ELIMINATION_OVER = "ELIMINATION_OVER", + SHOW_ELIMINATION_TUTORAIL = "SHOW_ELIMINATION_TUTORAIL", + BOARD_FILL_OVER = "BOARD_FILL_OVER", -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" } diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 421513ab..5817f146 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -10,13 +10,6 @@ local chapter = { 1, 5 }, - ["involved_skill"]={ - { - 200200, - 29, - 20 - } - }, ["not_involved_skill"]={ 4, 5, @@ -65,8 +58,8 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=12001, - ["id_for_nothing"]="VwpcA2Q=", + ["id"]=4, + ["id_for_nothing"]="Ug==", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -148,8 +141,8 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=22001, - ["id_for_nothing"]="VApcA2Q=", + ["id"]=4, + ["id_for_nothing"]="Ug==", ["num"]=5, ["num_for_nothing"]="Uw==" } @@ -265,10 +258,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=52001, - ["id_for_nothing"]="UwpcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 48f8f1c3..ac6dfe34 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -9,66 +9,6 @@ local chapter_board = { 1, 0 }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, { 0, 2 @@ -78,8 +18,8 @@ local chapter_board = { 4 }, { - 1, - 0 + 0, + 2 }, { 1, @@ -105,6 +45,14 @@ local chapter_board = { 0, 3 }, + { + 0, + 2 + }, + { + 0, + 4 + }, { 1, 0 @@ -113,6 +61,58 @@ local chapter_board = { 1, 0 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 4 + }, + { + 0, + 4 + }, + { + 0, + 2 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, { 1, 0 @@ -122,16 +122,16 @@ local chapter_board = { 0 }, { - 1, - 0 + 0, + 2 }, { - 1, - 0 + 0, + 3 }, { - 1, - 0 + 0, + 3 }, { 1, @@ -199,18 +199,16 @@ local chapter_board = { } }, ["control_element"]={ - 2, - 3, - 3, 2, 2, 2, + 4, 2, 4, 2, 2, 2, - 3 + 2 } }, [2]={ diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 529b8867..35200181 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -20,33 +20,23 @@ local item = { ["icon"]="4", ["hero_drop"]={ { - ["type"]=1, - ["id"]=12001, - ["num"]=1, + ["id"]=5001, ["weight"]=100 }, { - ["type"]=1, - ["id"]=22001, - ["num"]=1, + ["id"]=5002, ["weight"]=100 }, { - ["type"]=1, - ["id"]=32001, - ["num"]=1, + ["id"]=5003, ["weight"]=100 }, { - ["type"]=1, - ["id"]=42001, - ["num"]=1, + ["id"]=5004, ["weight"]=100 }, { - ["type"]=1, - ["id"]=52001, - ["num"]=1, + ["id"]=5005, ["weight"]=100 } } @@ -57,21 +47,15 @@ local item = { ["icon"]="5", ["hero_drop"]={ { - ["type"]=1, - ["id"]=23001, - ["num"]=1, + ["id"]=5006, ["weight"]=100 }, { - ["type"]=1, - ["id"]=33001, - ["num"]=1, + ["id"]=5007, ["weight"]=100 }, { - ["type"]=1, - ["id"]=43001, - ["num"]=1, + ["id"]=5008, ["weight"]=100 } } @@ -82,21 +66,15 @@ local item = { ["icon"]="6", ["hero_drop"]={ { - ["type"]=1, - ["id"]=23001, - ["num"]=1, + ["id"]=5006, ["weight"]=100 }, { - ["type"]=1, - ["id"]=33001, - ["num"]=1, + ["id"]=5007, ["weight"]=100 }, { - ["type"]=1, - ["id"]=43001, - ["num"]=1, + ["id"]=5008, ["weight"]=100 } } diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index b15b5b56..a9ed8382 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -40,7 +40,6 @@ local LocalizationGlobalConst = HERO_DESC_9 = "HERO_DESC_9", HERO_DESC_10 = "HERO_DESC_10", BATTLE_DESC_8 = "BATTLE_DESC_8", - HERO_DESC_11 = "HERO_DESC_11", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index 19efabfc..84e4b840 100644 --- a/lua/app/config/monster_base.lua +++ b/lua/app/config/monster_base.lua @@ -73,51 +73,51 @@ local monster_base = { }, [20001]={ ["hurt_num"]=1, - ["model_id"]="m20001" + ["model_id"]="m10010" }, [20002]={ ["hurt_num"]=1, - ["model_id"]="m20002" + ["model_id"]="m10010" }, [20003]={ ["hurt_num"]=3, - ["model_id"]="m20003" + ["model_id"]="m10010" }, [20004]={ ["hurt_num"]=3, - ["model_id"]="m20004" + ["model_id"]="m10010" }, [20005]={ ["hurt_num"]=3, - ["model_id"]="m20005" + ["model_id"]="m10010" }, [20006]={ ["hurt_num"]=3, - ["model_id"]="m20006" + ["model_id"]="m10010" }, [20007]={ ["hurt_num"]=3, - ["model_id"]="m20007" + ["model_id"]="m10010" }, [20008]={ ["hurt_num"]=3, - ["model_id"]="m20008" + ["model_id"]="m10010" }, [20009]={ ["hurt_num"]=3, - ["model_id"]="m20009" + ["model_id"]="m10010" }, [20010]={ ["hurt_num"]=3, - ["model_id"]="m20010" + ["model_id"]="m10010" }, [20011]={ ["hurt_num"]=3, - ["model_id"]="m20011" + ["model_id"]="m10010" }, [20012]={ ["hurt_num"]=3, - ["model_id"]="m20012" + ["model_id"]="m10010" } } local config = { diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 0160c3ce..16543726 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -652,7 +652,7 @@ local skill_rogue = { }, [200100]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=4000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -712,7 +712,7 @@ local skill_rogue = { }, [200200]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=4000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -771,7 +771,7 @@ local skill_rogue = { }, [200300]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=4000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, @@ -818,7 +818,7 @@ local skill_rogue = { }, [200400]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=4000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -858,7 +858,7 @@ local skill_rogue = { }, [200500]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=4000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1, @@ -918,7 +918,7 @@ local skill_rogue = { }, [200600]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=4000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -968,7 +968,7 @@ local skill_rogue = { }, [200700]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=4000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1015,7 +1015,7 @@ local skill_rogue = { }, [200800]={ ["limit_times"]=1, - ["weight"]=30000, + ["weight"]=4000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, diff --git a/lua/app/config/strings/cn/chapter.lua b/lua/app/config/strings/cn/chapter.lua index 03e39e04..5c84409c 100644 --- a/lua/app/config/strings/cn/chapter.lua +++ b/lua/app/config/strings/cn/chapter.lua @@ -1,33 +1,33 @@ local chapter = { [1]={ - ["name"]="1.废弃小镇" + ["name"]="第1关" }, [2]={ - ["name"]="2.小镇幽径" + ["name"]="第2关" }, [3]={ - ["name"]="3.小镇矿山" + ["name"]="第3关" }, [4]={ - ["name"]="4.幽深丛林" + ["name"]="第4关" }, [5]={ - ["name"]="5.碎石溪岸（西）" + ["name"]="第5关" }, [6]={ - ["name"]="6.碎石溪岸（东）" + ["name"]="第6关" }, [7]={ - ["name"]="7.城堡外围" + ["name"]="第7关" }, [8]={ - ["name"]="8.城堡大门" + ["name"]="第8关" }, [9]={ - ["name"]="9.城堡内部" + ["name"]="第9关" }, [10]={ - ["name"]="10.城堡深处" + ["name"]="第10关" } } local config = { diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index df5ebe88..36d16819 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -38,11 +38,8 @@ local localization_global = ["REWARD_PREVIEW_DESC"] = "奖励预览", ["HERO_DESC_8"] = "使用", ["HERO_DESC_9"] = "信息", - ["HERO_DESC_10"] = "通关章节{0}解锁", ["BATTLE_DESC_8"] = "还有可上阵英雄", - - ["HERO_DESC_11"] = "已解锁", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 7d9c92e0..c6c34daf 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -131,9 +131,6 @@ local skill_rogue = { [44]={ ["desc"]="将场上随机5个非紫色元素变为紫色" }, - [200100]={ - ["desc"]="长枪突刺：将上下2格元素进行消除" - }, [200101]={ ["desc"]="长枪突刺可上下多消1格" }, @@ -143,9 +140,6 @@ local skill_rogue = { [200103]={ ["desc"]="连接长枪突刺每次攻击有10%概率眩晕对手1回合。" }, - [200200]={ - ["desc"]="拔刀斩：卡拉可造成大量伤害" - }, [200201]={ ["desc"]="拔刀斩被连接时其上下左右4个元素变为金色元素" }, @@ -155,9 +149,6 @@ local skill_rogue = { [200203]={ ["desc"]="拔刀斩终结技可放2次" }, - [200300]={ - ["desc"]="元素链接：随机额外消除2个元素" - }, [200301]={ ["desc"]="元素链接可与任何颜色链接" }, @@ -167,9 +158,6 @@ local skill_rogue = { [200303]={ ["desc"]="元素链接随机消除元素增加2个" }, - [200400]={ - ["desc"]="魔法罩：艾伦可生成一个魔法罩持续1回合" - }, [200401]={ ["desc"]="魔法罩可与任何颜色链接" }, @@ -179,9 +167,6 @@ local skill_rogue = { [200403]={ ["desc"]="生成的魔法罩如果没有破可以额外持续1回合" }, - [200500]={ - ["desc"]="舞步消散：将左右2格元素进行消除" - }, [200501]={ ["desc"]="舞步消散左右可多消1格" }, @@ -191,9 +176,6 @@ local skill_rogue = { [200503]={ ["desc"]="每有1个元素连接舞步消散则本回合格挡增加2%" }, - [200600]={ - ["desc"]="快速治愈：莉莉丝可恢复20%生命值" - }, [200601]={ ["desc"]="快速治愈可与任何元素连接" }, @@ -203,9 +185,6 @@ local skill_rogue = { [200603]={ ["desc"]="连接快速治愈的每一击都将恢复2%生命值" }, - [200700]={ - ["desc"]="巨剑连斩：每一次攻击的伤害将增加50%" - }, [200701]={ ["desc"]="疾风骤雨被连接时其上下左右4个元素变为金色元素" }, @@ -215,9 +194,6 @@ local skill_rogue = { [200703]={ ["desc"]="疾风骤雨被连接时周围8格元素变为金色元素" }, - [200800]={ - ["desc"]="霜冻剑舞：白发凯瑟琳可额外造成1次伤害并给敌人1回合冰霜效果（普攻次数-1）" - }, [200801]={ ["desc"]="霜冻剑舞被使用时可消除掉其上下左右4个元素" }, @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skill_rogue.lua b/lua/app/config/strings/de/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/de/skill_rogue.lua +++ b/lua/app/config/strings/de/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skill_rogue.lua b/lua/app/config/strings/fr/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/fr/skill_rogue.lua +++ b/lua/app/config/strings/fr/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skill_rogue.lua b/lua/app/config/strings/ru/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/ru/skill_rogue.lua +++ b/lua/app/config/strings/ru/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 1edf592a..1981a410 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -130,9 +130,6 @@ local skill_rogue = { }, [44]={ - }, - [200100]={ - }, [200101]={ @@ -142,9 +139,6 @@ local skill_rogue = { }, [200103]={ - }, - [200200]={ - }, [200201]={ @@ -154,9 +148,6 @@ local skill_rogue = { }, [200203]={ - }, - [200300]={ - }, [200301]={ @@ -166,9 +157,6 @@ local skill_rogue = { }, [200303]={ - }, - [200400]={ - }, [200401]={ @@ -178,9 +166,6 @@ local skill_rogue = { }, [200403]={ - }, - [200500]={ - }, [200501]={ @@ -190,9 +175,6 @@ local skill_rogue = { }, [200503]={ - }, - [200600]={ - }, [200601]={ @@ -202,9 +184,6 @@ local skill_rogue = { }, [200603]={ - }, - [200700]={ - }, [200701]={ @@ -214,9 +193,6 @@ local skill_rogue = { }, [200703]={ - }, - [200800]={ - }, [200801]={ @@ -229,6 +205,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=76 +data=skill_rogue,count=68 } return config \ No newline at end of file diff --git a/lua/app/config/struct.lua b/lua/app/config/struct.lua index 524ca5be..a263a383 100644 --- a/lua/app/config/struct.lua +++ b/lua/app/config/struct.lua @@ -4,11 +4,9 @@ local struct = { ["parameter2"]="id:int", ["parameter3"]="num:int" }, - ["drop"]={ - ["parameter1"]="type:int", - ["parameter2"]="id:int", - ["parameter3"]="num:int", - ["parameter4"]="weight:int" + ["hero_drop"]={ + ["parameter1"]="id:int", + ["parameter2"]="weight:int" }, ["boardrange"]={ ["parameter1"]="type:int", diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index af73b73f..e275a824 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -2,6 +2,7 @@ local tutorial = { [10000]={ ["next_id"]=10010, ["type"]=6, + ["finish"]=4, ["target_element"]={ 53, 44, @@ -32,6 +33,7 @@ local tutorial = { [10040]={ ["next_id"]=10050, ["type"]=6, + ["finish"]=4, ["target_element"]={ 33, 23, @@ -53,6 +55,7 @@ local tutorial = { }, [10060]={ ["type"]=6, + ["finish"]=4, ["target_element"]={ 23, 13, diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 522300bd..6a4c1c6b 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -654,7 +654,6 @@ function GFunc.addRewards(rewards, itemGetType) local newRewards = {} GFunc.mergeRewards2(rewards, newRewards) - local runeList = {} -- 根据类型type来添加奖励 for k, v in ipairs(newRewards) do if v.type == GConst.REWARD_TYPE.ITEM then @@ -663,8 +662,6 @@ function GFunc.addRewards(rewards, itemGetType) DataManager.BagData.EquipData:addEquipCountById(v.equip.id, v.equip.count, itemGetType) end end - - ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_RUNE_GOT, {runeList = runeList}) end function GFunc.addCosts(costs, itemGetType) diff --git a/lua/app/module/battle/battle_manager.lua b/lua/app/module/battle/battle_manager.lua index 96e893cf..4836122a 100644 --- a/lua/app/module/battle/battle_manager.lua +++ b/lua/app/module/battle/battle_manager.lua @@ -15,7 +15,7 @@ function BattleManager:showPauseUI() end function BattleManager:showSelectSkillUI(skillList) - UIManager:showUI("app/ui/battle/battle_skill_select_ui", {skillList = skillList}) + UIManager:showUI(UIManager.UI_PATH.ROGUE_SKILL_UI, {skillList = skillList}) end function BattleManager:showBattleResultUI(rewards, combatReport) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 98dd1e50..22da86d1 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -510,110 +510,65 @@ function BattleController:onTouchEvent(eventType, posId) end if eventType == ELIMINATION_TOUCH_EVENT.DOWN then - if #self.battleData:getGridSequence() > 0 then - self.battleData:clearGridSequence() - end - self.battleData:insertGridSequence(posId, self:snapshotBoard()) - local skillEntity = self.battleData:getSkillEntityBySkillId(entity:getSkillId()) - local maskElementType = entity:getElementType(skillEntity) - self.battleUI:showBoardMask(maskElementType) - self:findSkillInfluenceGrids() - self:onLinkChange() + self:onLinkStart(entity, posId) elseif eventType == ELIMINATION_TOUCH_EVENT.ENTER then - local sequence = self.battleData:getGridSequence() - local info = sequence[#sequence] - local lastPosId = info and info.posId - if not lastPosId then - return - end - local outLineMap = BattleConst.GRID_OUT_LINE_POS_ID[lastPosId] - if not outLineMap or not outLineMap[posId] then - return - end - - if self.battleData:alreadyInsertSequence(posId) then - local info = sequence[#sequence - 1] - local beforePosId = info and info.posId - if not beforePosId then - return - end - if beforePosId == posId then -- 进入的是倒数第二个，则移除倒数第一个 - local snapshot = self.battleData:removeGridSequence(lastPosId) - if snapshot then -- 如果有快照，则恢复一次 - for posId, info in pairs(snapshot) do - local entity = self.battleData:getGridEntity(posId) - if entity then - entity:setInfoBySnapshop(info) - end - end - end - - local lastEntity = self.battleData:getGridEntity(beforePosId) - local lastSkillEntity = self.battleData:getSkillEntityBySkillId(lastEntity:getSkillId()) - local maskElementType = lastEntity:getElementType(lastSkillEntity) - self.battleUI:showBoardMask(maskElementType) - - self:findSkillInfluenceGrids() - self:onLinkChange() - return - end - end - - local skillId = entity:getSkillId() - local skillEntity = self.battleData:getSkillEntityBySkillId(skillId) - local elementType = entity:getElementType(skillEntity) - - local lastEntity = self.battleData:getGridEntity(lastPosId) - local lastSkillId = lastEntity:getSkillId() - local lastSkillEntity = self.battleData:getSkillEntityBySkillId(lastSkillId) - local lastElementType = lastEntity:getElementType(lastSkillEntity) - - if skillEntity and self.battleData:getSequenceHadSkill() then - return - end - - if not elementType or not lastElementType then - else - if lastElementType ~= elementType then - return - end - end - - local maskElementType = elementType or lastElementType - self.battleUI:showBoardMask(maskElementType) - - self.battleData:insertGridSequence(posId, self:snapshotBoard()) - if lastEntity:getNeedChangePos() and not entity:getNeedChangePos() then -- 需要移动到队列末尾 - local lastSkillId = lastEntity:getSkillId() - local skillId = entity:getSkillId() - self:setGridSkillId(lastPosId, skillId) - self:setGridSkillId(posId, lastSkillId) - end - - local newElementType = elementType or lastElementType - if newElementType then - entity:setElementType(newElementType) - lastEntity:setElementType(newElementType) - end - - entity:addLinkSkillCount() - - self:findSkillInfluenceGrids() - self:onLinkChange() + self:onLinkEnter(entity, posId) elseif eventType == ELIMINATION_TOUCH_EVENT.EXIT then else -- 取消和抬起 - self.battleUI:showBoardMask(nil) - local sequence = self.battleData:getGridSequence() - local count = #sequence - if count < self:getMinEliminationCount() then - if count <= 0 then - self.battleData:clearGridSequence() - self:onLinkChange() + self:onLinkCancelOrUp(entity, posId) + end +end + +function BattleController:onLinkStart(entity, posId) + if DataManager.TutorialData:getIsInTutorial() then + local elementList = DataManager.TutorialData:getTargetElement() + if elementList then + local find = false + for _, curPosId in ipairs(elementList) do + if curPosId == posId then + find = true + break + end + end + if not find then return end + end + end - local snapshot = self.battleData:getFirstSequenceSnapshot() + self.battleUI:showTutorialFinger() + if #self.battleData:getGridSequence() > 0 then + self.battleData:clearGridSequence() + end + self.battleData:insertGridSequence(posId, self:snapshotBoard()) + local skillEntity = self.battleData:getSkillEntityBySkillId(entity:getSkillId()) + local maskElementType = entity:getElementType(skillEntity) + self.battleUI:showBoardMask(maskElementType) + self:findSkillInfluenceGrids() + self:onLinkChange() +end + +function BattleController:onLinkEnter(entity, posId) + local sequence = self.battleData:getGridSequence() + local info = sequence[#sequence] + local lastPosId = info and info.posId + if not lastPosId then + return + end + local outLineMap = BattleConst.GRID_OUT_LINE_POS_ID[lastPosId] + if not outLineMap or not outLineMap[posId] then + return + end + + if self.battleData:alreadyInsertSequence(posId) then + local info = sequence[#sequence - 1] + local beforePosId = info and info.posId + if not beforePosId then + return + end + if beforePosId == posId then -- 进入的是倒数第二个，则移除倒数第一个 + local snapshot = self.battleData:removeGridSequence(lastPosId) if snapshot then -- 如果有快照，则恢复一次 for posId, info in pairs(snapshot) do local entity = self.battleData:getGridEntity(posId) @@ -623,15 +578,112 @@ function BattleController:onTouchEvent(eventType, posId) end end - self.battleData:clearGridSequence() + local lastEntity = self.battleData:getGridEntity(beforePosId) + local lastSkillEntity = self.battleData:getSkillEntityBySkillId(lastEntity:getSkillId()) + local maskElementType = lastEntity:getElementType(lastSkillEntity) + self.battleUI:showBoardMask(maskElementType) + + self:findSkillInfluenceGrids() self:onLinkChange() return end + end + local skillId = entity:getSkillId() + local skillEntity = self.battleData:getSkillEntityBySkillId(skillId) + local elementType = entity:getElementType(skillEntity) + + local lastEntity = self.battleData:getGridEntity(lastPosId) + local lastSkillId = lastEntity:getSkillId() + local lastSkillEntity = self.battleData:getSkillEntityBySkillId(lastSkillId) + local lastElementType = lastEntity:getElementType(lastSkillEntity) + + if skillEntity and self.battleData:getSequenceHadSkill() then + return + end + + if not elementType or not lastElementType then + else + if lastElementType ~= elementType then + return + end + end + + local maskElementType = elementType or lastElementType + self.battleUI:showBoardMask(maskElementType) + + self.battleData:insertGridSequence(posId, self:snapshotBoard()) + if lastEntity:getNeedChangePos() and not entity:getNeedChangePos() then -- 需要移动到队列末尾 + local lastSkillId = lastEntity:getSkillId() + local skillId = entity:getSkillId() + self:setGridSkillId(lastPosId, skillId) + self:setGridSkillId(posId, lastSkillId) + end + + local newElementType = elementType or lastElementType + if newElementType then + entity:setElementType(newElementType) + lastEntity:setElementType(newElementType) + end + + entity:addLinkSkillCount() + + self:findSkillInfluenceGrids() + self:onLinkChange() +end + +function BattleController:onLinkCancelOrUp(entity, posId) + local tutorialElementList + if DataManager.TutorialData:getIsInTutorial() then + tutorialElementList = DataManager.TutorialData:getTargetElement() + end + + self.battleUI:showBoardMask(nil) + local sequence = self.battleData:getGridSequence() + local count = #sequence + if count < self:getMinEliminationCount() then + self:clearGridSequence() + + if tutorialElementList then + self.battleUI:showTutorialFinger(tutorialElementList) + end + return + end + + if tutorialElementList then + local posIdmap = {} + for _, info in ipairs(sequence) do + posIdmap[info.posId] = true + end + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.ELIMINATION_OVER, posIdmap) + else self:onLinkOver() end end +function BattleController:clearGridSequence() + local sequence = self.battleData:getGridSequence() + local count = #sequence + if count <= 0 then + self.battleData:clearGridSequence() + self:onLinkChange() + return + end + + local snapshot = self.battleData:getFirstSequenceSnapshot() + if snapshot then -- 如果有快照，则恢复一次 + for posId, info in pairs(snapshot) do + local entity = self.battleData:getGridEntity(posId) + if entity then + entity:setInfoBySnapshop(info) + end + end + end + + self.battleData:clearGridSequence() + self:onLinkChange() +end + function BattleController:onLinkOver() self.battleUI:hideAllSfxLine() local sequence = self.battleData:getGridSequence() @@ -805,6 +857,8 @@ function BattleController:fillBoard() end function BattleController:onFillBoardOver() + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.BOARD_FILL_OVER) + self:generateSkill(function() self.battleUI:refreshSkill() local defTeam = self.battleData:getDefTeam() diff --git a/lua/app/module/maincity/maincity_manager.lua b/lua/app/module/maincity/maincity_manager.lua index ac242e81..4cb3c5a1 100644 --- a/lua/app/module/maincity/maincity_manager.lua +++ b/lua/app/module/maincity/maincity_manager.lua @@ -6,10 +6,14 @@ end -- 从登录界面第一次进入主城 function MaincityManager:firstEnterMainCity() - self:showMainCityUI(true) - -- ModuleManager.BattleManager:playBattle(ModuleManager.BattleManager.BATTLE_TYPE.STAGE) - -- SDKManager:doUncompletePay() - -- BIReport:postFightBegin(ModuleManager.BattleManager.BATTLE_TYPE.STAGE, DataManager.ChapterData:getCurChapterId(), DataManager.ChapterData:getHistoryChapterId()) + if not DataManager.TutorialData:getIsFuncTutorialFinished(GConst.TutorialConst.START_TUTORIAL) then + DataManager.ChapterData:setChapterId(DataManager.ChapterData.MIN_CHAPTER_ID) + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.STAGE) + else + self:showMainCityUI(true) + -- SDKManager:doUncompletePay() + -- BIReport:postFightBegin(ModuleManager.BattleManager.BATTLE_TYPE.STAGE, DataManager.ChapterData:getCurChapterId(), DataManager.ChapterData:getHistoryChapterId()) + end end return MaincityManager \ No newline at end of file diff --git a/lua/app/module/tips/tips_manager.lua b/lua/app/module/tips/tips_manager.lua index 30847614..f18fbc2e 100644 --- a/lua/app/module/tips/tips_manager.lua +++ b/lua/app/module/tips/tips_manager.lua @@ -33,7 +33,7 @@ function TipsManager:showRewardTips(id, type, tarPrefabObj, alignType, params) end function TipsManager:showRewardsBox(params) - UIManager:showUI("app/ui/tips/reward_box", params) + UIManager:showUI(UIManager.UI_PATH.REWARD_BOX, params) end function TipsManager:showItemTips(id, tarPrefabObj, alignType) diff --git a/lua/app/module/tutorial/tutorial_action.lua b/lua/app/module/tutorial/tutorial_action.lua index 947cb9eb..0482e96a 100644 --- a/lua/app/module/tutorial/tutorial_action.lua +++ b/lua/app/module/tutorial/tutorial_action.lua @@ -63,12 +63,19 @@ local function _tutorialEmptyCancelBlock(tutorialId) ModuleManager.TutorialManager:checkAndNextTutorial(tutorialId) end +local function _tutorialToElimination(tutorialId) + ModuleManager.TutorialManager:setBlockTouchEnabled(false) + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.SHOW_ELIMINATION_TUTORAIL, DataManager.TutorialData:getTargetElement()) + ModuleManager.TutorialManager:checkAndNextTutorial(tutorialId) +end + TutorialAction._doTutorial = { [TutorialConst.TUTORIAL_TYPE.CLICK] = _tutorialClick, [TutorialConst.TUTORIAL_TYPE.CLICK_BTN] = _tutorialClickBtn, [TutorialConst.TUTORIAL_TYPE.TALK] = _tutorialTalk, [TutorialConst.TUTORIAL_TYPE.DO_NOTHING] = _tutorialEmpty, [TutorialConst.TUTORIAL_TYPE.EMPTY_CANCEL_BLOCK] = _tutorialEmptyCancelBlock, + [TutorialConst.TUTORIAL_TYPE.TO_ELIMINATION] = _tutorialToElimination, } -- 此步引导结束的时候 diff --git a/lua/app/module/tutorial/tutorial_const.lua b/lua/app/module/tutorial/tutorial_const.lua index d4eb4213..ba5d0d13 100644 --- a/lua/app/module/tutorial/tutorial_const.lua +++ b/lua/app/module/tutorial/tutorial_const.lua @@ -3,39 +3,38 @@ local TutorialConst = {} TutorialConst.FINGER_MOVE_SPEED = 200 TutorialConst.DEFAULT_RADIUS = 100 +TutorialConst.START_TUTORIAL = 1 +TutorialConst.PASS_ONE_CHAPTER = 2 +TutorialConst.TWO_CHAPTER_BOX_CAN_GOT = 3 +TutorialConst.PASS_THREE_CHAPTER = 4 + TutorialConst.TUTORIAL_TYPE = { CLICK = 1, -- 点击任意区域 CLICK_BTN = 2, -- 点击指定按钮 TALK = 3, -- 文本对话 DO_NOTHING = 4, -- 什么也不做，等待条件完成 EMPTY_CANCEL_BLOCK = 5, -- 什么也不做, 解除屏蔽，等待条件完成 + TO_ELIMINATION = 6, -- 引导消除元素 } TutorialConst.FINISH_TYPE = { ON_UI_SHOW = 1, -- 当XX界面显示 ON_UI_CLOSE = 2, -- 当XX界面关闭 - ON_TASK_COMPLETE = 3, -- 当主线任务完成 - ON_ATK_LEVEL = 4, -- 当攻击力升至x级时 - ON_TO_ARENA = 5, -- 界面移动到竞技场位置 + ON_BOARD_CAN_ELIMINATION = 3, -- 当棋盘可以消除 + ON_ELIMINATION_OVER = 4,-- 等待棋盘消除完成 } TutorialConst.UI_TYPE = { - WEAPON_SUMMON_UI = 1, - PROTECTIVE_SUMMON_UI = 2, - LEGACY_SUMMON_UI = 3, - HERO_ALL_UP_UI = 4, + ROGUE_SKILL_UI = 1, + REWARD_BOX = 2, + -- PROTECTIVE_SUMMON_UI = 2, + -- LEGACY_SUMMON_UI = 3, + -- HERO_ALL_UP_UI = 4, } TutorialConst.UI_PATH = { - [TutorialConst.UI_TYPE.WEAPON_SUMMON_UI] = UIManager.UI_PATH.WEAPON_SUMMON_UI, - [TutorialConst.UI_TYPE.PROTECTIVE_SUMMON_UI] = UIManager.UI_PATH.PROTECTIVE_SUMMON_UI, - [TutorialConst.UI_TYPE.LEGACY_SUMMON_UI] = UIManager.UI_PATH.LEGACY_SUMMON_UI, - [TutorialConst.UI_TYPE.HERO_ALL_UP_UI] = UIManager.UI_PATH.HERO_ALL_UP_UI, -} - - -TutorialConst.FUNC_TUTORIAL_ID = { - BATTLE_AUTO = 4, -- 引导自动战斗 + [TutorialConst.UI_TYPE.ROGUE_SKILL_UI] = UIManager.UI_PATH.ROGUE_SKILL_UI, + [TutorialConst.UI_TYPE.REWARD_BOX] = UIManager.UI_PATH.REWARD_BOX, } return TutorialConst \ No newline at end of file diff --git a/lua/app/module/tutorial/tutorial_finish_listener.lua b/lua/app/module/tutorial/tutorial_finish_listener.lua index 7d0f810a..780b89c3 100644 --- a/lua/app/module/tutorial/tutorial_finish_listener.lua +++ b/lua/app/module/tutorial/tutorial_finish_listener.lua @@ -66,22 +66,36 @@ local function _listenerOnUIClose(tutorialId) return false end -local function _listenerOnTaskCompete(tutorialId) +local function _listenerOnCanElimination(tutorialId) + ModuleManager.TutorialManager:addEventListener(EventManager.CUSTOM_EVENT.BOARD_FILL_OVER, function(index) + ModuleManager.TutorialManager:finishAndNextTutorial(tutorialId) + end) return false end -local function _listenerOnAtkLevel(tutorialId) - local params = DataManager.TutorialData:getFinishTypeParams() - if params == nil then -- 打开界面的完成条件必须要有参数 +local function _listenerOnEliminationOver(tutorialId) + local elementPosList = DataManager.TutorialData:getTargetElement() + if not elementPosList then return false end - if DataManager.ChapterData:getTrainAtkLv() >= params then - return true - end - ModuleManager.TutorialManager:addEventListener(EventManager.CUSTOM_EVENT.ATK_TRAIN_LEVEL_UP, function(index) - if DataManager.ChapterData:getTrainAtkLv() >= params then - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.ATK_TRAIN_TUTORIAL_OVER) + ModuleManager.TutorialManager:addEventListener(EventManager.CUSTOM_EVENT.ELIMINATION_OVER, function(posIdmap) + local over = true + for _, posId in ipairs(elementPosList) do + if not posIdmap[posId] then + over = false + end + end + + if over then + if ModuleManager.BattleManager.battleController then + ModuleManager.BattleManager.battleController:onLinkOver() + end ModuleManager.TutorialManager:finishAndNextTutorial(tutorialId) + else + if ModuleManager.BattleManager.battleController then + ModuleManager.BattleManager.battleController:clearGridSequence() + EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.SHOW_ELIMINATION_TUTORAIL, elementPosList) + end end end) return false @@ -90,8 +104,8 @@ end TutorialFinishListener._addListener = { [TutorialConst.FINISH_TYPE.ON_UI_SHOW] = _listenerOnUIShow, [TutorialConst.FINISH_TYPE.ON_UI_CLOSE] = _listenerOnUIClose, - [TutorialConst.FINISH_TYPE.ON_TASK_COMPLETE] = _listenerOnTaskCompete, - [TutorialConst.FINISH_TYPE.ON_ATK_LEVEL] = _listenerOnAtkLevel, + [TutorialConst.FINISH_TYPE.ON_BOARD_CAN_ELIMINATION] = _listenerOnCanElimination, + [TutorialConst.FINISH_TYPE.ON_ELIMINATION_OVER] = _listenerOnEliminationOver, } return TutorialFinishListener \ No newline at end of file diff --git a/lua/app/module/tutorial/tutorial_manager.lua b/lua/app/module/tutorial/tutorial_manager.lua index 50a3962f..52a0afd6 100644 --- a/lua/app/module/tutorial/tutorial_manager.lua +++ b/lua/app/module/tutorial/tutorial_manager.lua @@ -2,8 +2,6 @@ local TutorialConst = require "app/module/tutorial/tutorial_const" local TutorialManager = class("TutorialManager", BaseModule) -TutorialManager.FUNC_TUTORIAL_ID = TutorialConst.FUNC_TUTORIAL_ID - function TutorialManager:checkAndPlayForceTutorial() if DataManager.TutorialData:getIsInTutorial() then return @@ -22,14 +20,18 @@ function TutorialManager:sendTutorialId(id, callback) local args = { id = id } - self:sendMessage(ProtoMsgType.FromMsgEnum.MarkGuideReq, args, {}, self.sendTutorialIdFinish) + self.sendTutorialIdCallback = callback + + ServerDataManager:dataOperate(GConst.ServerDataConst.DATA_OP_BEHAVIOR.MARK_GUIDE, args, function(result) + self:sendTutorialIdFinish(result) + end) end function TutorialManager:sendTutorialIdFinish(result) if result.status == 0 then if result.id then - BIReport:postTutorialStep(result.id) + -- BIReport:postTutorialStep(result.id) -- DataManager.TutorialData:markFuncTutorialFinish(result.id) end @@ -73,15 +75,10 @@ end function TutorialManager:startTutorial() local tutorialId = DataManager.TutorialData:getTutorialId() -- 上报引导每一步 - BIReport:postTutorialStep(tutorialId) + -- BIReport:postTutorialStep(tutorialId) Logger.log("开始引导:%s", tutorialId) DataManager.TutorialData:markFuncTutorialFinish(tutorialId) - if DataManager.TutorialData:getTutorialStopFight() then - ModuleManager.BattleManager:pauseFightByTutorial() - else - ModuleManager.BattleManager:resumeFightByTutorial() - end -- 如果这一步引导已经完成了就进入下一步，没有完成则如果有监听就添加监听 local over = self.tutorialFinishListener:checkAndAddListener(tutorialId) @@ -99,8 +96,6 @@ function TutorialManager:stopTutorial() if DataManager.TutorialData then Logger.log("停止引导:%s", DataManager.TutorialData:getTutorialId()) end - ModuleManager.BattleManager:resumeFightByTutorial() - if self.tutorialFinishListener then self.tutorialFinishListener:clear() end @@ -134,28 +129,12 @@ function TutorialManager:finishAndNextTutorial(tutorialId) -- 此步引导完成时需要处理的东西 self.tutorialAction:doStepOver(tutorialId) - local haveNext, newStopId = DataManager.TutorialData:nextTutorial() + local haveNext = DataManager.TutorialData:nextTutorial() if haveNext then local delay = DataManager.TutorialData:getDelayStartTime() - if newStopId then -- 中断步骤变了要跟服务器同步 - self:sendTutorialId(DataManager.TutorialData:getTutorialId(), function(success) - if success then - if delay > 0 then - self:performWithDelayGlobal(function() - self:startTutorial() - end, delay) - else - self:startTutorial() - end - else - self:stopTutorial() - end - end) - else - self:performWithDelayGlobal(function() - self:startTutorial() - end, delay) - end + self:performWithDelayGlobal(function() + self:startTutorial() + end, delay) else self:performWithDelayGlobal(function() self:stopTutorial() diff --git a/lua/app/module/tutorial/tutorial_task_manager.lua b/lua/app/module/tutorial/tutorial_task_manager.lua deleted file mode 100644 index c925ee94..00000000 --- a/lua/app/module/tutorial/tutorial_task_manager.lua +++ /dev/null @@ -1,29 +0,0 @@ -local TutorialTaskManager = class("TutorialTaskManager", BaseModule) - -function TutorialTaskManager:claimTask() - if DataManager.TutorialTaskData:getTaskCollect() then - return - end - ModuleManager.TaskManager:dealTaskType(DataManager.TutorialTaskData:getTaskType(), function() - self:sendMessage(ProtoMsgType.FromMsgEnum.TaskTutorRewardReq, {}, {}, self.claimTaskFinish, BIReport.ITEM_GET_TYPE.TUTORIAL_TASK) - end) -end - -function TutorialTaskManager:claimTaskFinish(result) - if result.status == 0 then - local taskId = DataManager.TutorialTaskData:getCurTutorialId() - DataManager.TutorialTaskData:init(result.task) - - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.TUTORIAL_TASK_REWARD, result.rewards) - local tutorialId = DataManager.TutorialTaskData:getTaskTutorialId() - if not tutorialId then - tutorialId = DataManager.TutorialData:getTaskOpenTutorial(taskId) - end - - if tutorialId then - ModuleManager.TutorialManager:checkFuncTutorial(tutorialId) - end - end -end - -return TutorialTaskManager \ No newline at end of file diff --git a/lua/app/server/data/server_tutorial_data.lua b/lua/app/server/data/server_tutorial_data.lua new file mode 100644 index 00000000..34497b40 --- /dev/null +++ b/lua/app/server/data/server_tutorial_data.lua @@ -0,0 +1,18 @@ +local ServerTutorialData = class("ServerTutorialData", ServerBaseData) + +function ServerTutorialData:init(data) + if data then + self.data.markedGuide = data.markedGuide or {} + else + self.data.markedGuide = {} + end +end + +function ServerTutorialData:markGuide(id) + if not id then + return + end + self.data.markedGuide[id] = true +end + +return ServerTutorialData \ No newline at end of file diff --git a/lua/app/module/tutorial/tutorial_task_manager.lua.meta b/lua/app/server/data/server_tutorial_data.lua.meta similarity index 86% rename from lua/app/module/tutorial/tutorial_task_manager.lua.meta rename to lua/app/server/data/server_tutorial_data.lua.meta index a94aa478..d934922e 100644 --- a/lua/app/module/tutorial/tutorial_task_manager.lua.meta +++ b/lua/app/server/data/server_tutorial_data.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1fa9da99f3507cd4688b77793381a636 +guid: 8482be101c0b05347b61cef1d8925dac ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/server/manager/server_tutorial_manager.lua b/lua/app/server/manager/server_tutorial_manager.lua new file mode 100644 index 00000000..8e6c1150 --- /dev/null +++ b/lua/app/server/manager/server_tutorial_manager.lua @@ -0,0 +1,24 @@ +local ServerChapterManager = {} + +function ServerChapterManager:markGuide(params, callback) + local result = { + status = 1 + } + if params == nil or not params.id then + if callback then + callback(result) + end + return + end + + local ServerGameData = ServerDataManager:getServerGameData() + ServerGameData.TutorialData:markGuide(params.id) + result.id = params.id + result.status = 0 + + if callback then + callback(result) + end +end + +return ServerChapterManager \ No newline at end of file diff --git a/lua/app/userdata/tutorial/tutorial_task_data.lua.meta b/lua/app/server/manager/server_tutorial_manager.lua.meta similarity index 86% rename from lua/app/userdata/tutorial/tutorial_task_data.lua.meta rename to lua/app/server/manager/server_tutorial_manager.lua.meta index e459731b..b9e2a302 100644 --- a/lua/app/userdata/tutorial/tutorial_task_data.lua.meta +++ b/lua/app/server/manager/server_tutorial_manager.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0dd4f32fe399df647a2e9d5375711196 +guid: 635bfc3932a24014192fd87a7c164c14 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/server/server_data_const.lua b/lua/app/server/server_data_const.lua index dd558c26..ee4307eb 100644 --- a/lua/app/server/server_data_const.lua +++ b/lua/app/server/server_data_const.lua @@ -12,6 +12,7 @@ ServerDataConst.DATA_OP_BEHAVIOR = { UPGRADE_HERO = "UPGRADE_HERO", END_FIGHT = "END_FIGHT", OPEN_CHAPTER_BOX = "OPEN_CHAPTER_BOX", + MARK_GUIDE = "MARK_GUIDE", } return ServerDataConst \ No newline at end of file diff --git a/lua/app/server/server_data_manager.lua b/lua/app/server/server_data_manager.lua index 44c0f585..96374172 100644 --- a/lua/app/server/server_data_manager.lua +++ b/lua/app/server/server_data_manager.lua @@ -6,6 +6,7 @@ function ServerDataManager:init() self.ServerFormationManager = require("app/server/manager/server_formation_manager") self.ServerHeroManager = require("app/server/manager/server_hero_manager") self.ServerChapterManager = require("app/server/manager/server_chapter_manager") + self.ServerTutorialManager = require("app/server/manager/server_tutorial_manager") end function ServerDataManager:saveData() @@ -67,6 +68,7 @@ ServerDataManager.OP_FUNC = { [GConst.ServerDataConst.DATA_OP_BEHAVIOR.UPGRADE_HERO] = function (...) ServerDataManager.ServerHeroManager:onUpgradeHero(...) end, [GConst.ServerDataConst.DATA_OP_BEHAVIOR.END_FIGHT] = function(...) ServerDataManager.ServerChapterManager:endFight(...) end, [GConst.ServerDataConst.DATA_OP_BEHAVIOR.OPEN_CHAPTER_BOX] = function(...) ServerDataManager.ServerChapterManager:openBox(...) end, + [GConst.ServerDataConst.DATA_OP_BEHAVIOR.MARK_GUIDE] = function(...) ServerDataManager.ServerTutorialManager:markGuide(...) end, } function ServerDataManager:dealGM(params, callback) diff --git a/lua/app/server/server_game_data.lua b/lua/app/server/server_game_data.lua index cdb628f1..ebc08e84 100644 --- a/lua/app/server/server_game_data.lua +++ b/lua/app/server/server_game_data.lua @@ -18,6 +18,7 @@ function ServerGameData:init() self:initServerData("HeroData", "app/server/data/server_hero_data") self:initServerData("ChapterData", "app/server/data/server_chapter_data") self:initServerData("FormationData", "app/server/data/server_formation_data") + self:initServerData("TutorialData", "app/server/data/server_tutorial_data") end function ServerGameData:initData() diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 254f8fbd..d248a428 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -43,6 +43,7 @@ function BattleUI:_display() self:initNumberNode() self:initHpNode() self:hideGenerateSkillGridCells() + self:initTutorialNode() end function BattleUI:_addListeners() @@ -50,6 +51,10 @@ function BattleUI:_addListeners() uiMap["battle_ui.close_btn"]:addClickListener(function() ModuleManager.BattleManager:showPauseUI() end) + + self:addEventListener(EventManager.CUSTOM_EVENT.SHOW_ELIMINATION_TUTORAIL, function(posIdList) + self:showTutorialFinger(posIdList) + end) end function BattleUI:_bind() @@ -574,6 +579,9 @@ function BattleUI:onInitGridCellOver() entity:setCell(cell) end end + + ---- 检查引导 + ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.START_TUTORIAL) end function BattleUI:switchBoard(downCallback, callback, isFirst) @@ -1064,6 +1072,49 @@ function BattleUI:hideAllSfxGridBreak() end end +function BattleUI:initTutorialNode() + local uiMap = self.root:genAllChildren() + self.tutorialNode = uiMap["battle_ui.tutorial_node"] + self.tutorialFinger = uiMap["battle_ui.tutorial_node.board_node.finger"] + self:showTutorialFinger() +end + +function BattleUI:showTutorialFinger(posIdList) + if self.showTutorialFingerSeq then + self.showTutorialFingerSeq:Kill() + self.showTutorialFingerSeq = nil + end + + if not self.tutorialFinger then + return + end + + local show = false + if posIdList and posIdList[1] then + show = true + end + self.tutorialNode:setVisible(show) + if not show then + return + end + + self.showTutorialFingerSeq = self.root:createBindTweenSequence() + local path = {} + local count = 0 + for index, posId in ipairs(posIdList) do + local curPos = ModuleManager.BattleManager:getPosInfo(posId) + if index == 1 then + self.tutorialFinger:setAnchoredPosition(curPos.x, curPos.y) + else + table.insert(path, curPos) + count = count + 1 + end + end + + self.showTutorialFingerSeq:Append(self.tutorialFinger:getTransform():DOLocalPath(path, count)) + self.showTutorialFingerSeq:SetLoops(-1) +end + function BattleUI:clear() if self.alreadyClear then return diff --git a/lua/app/ui/ui_manager.lua b/lua/app/ui/ui_manager.lua index 9060dc70..8c2947a0 100644 --- a/lua/app/ui/ui_manager.lua +++ b/lua/app/ui/ui_manager.lua @@ -20,12 +20,9 @@ UIManager.MESSAGE_BOX_TAG = { UIManager.UI_PATH = { GM_TOO_UI = "app/ui/gm/gm_tool_ui", MAINCITY_UI = "app/ui/main_city/main_city_ui", - WEAPON_SUMMON_UI = "app/ui/summon_pop/summon_rewards_ui", - PROTECTIVE_SUMMON_UI = "app/ui/summon_pop/summon_rewards_ui", - LEGACY_SUMMON_UI = "app/ui/summon_pop/summon_rewards_ui", - HERO_ALL_UP_UI = "app/ui/hero/hero_all_up_ui", - BATTLE_BLACK_UI = "app/ui/battle/battle_black_ui", BATTLE_UI = "app/ui/battle/battle_ui", + ROGUE_SKILL_UI = "app/ui/battle/battle_skill_select_ui", + REWARD_BOX = "app/ui/tips/reward_box", } -- 动画类型 diff --git a/lua/app/userdata/chapter/chapter_data.lua b/lua/app/userdata/chapter/chapter_data.lua index c775e364..70b5d444 100644 --- a/lua/app/userdata/chapter/chapter_data.lua +++ b/lua/app/userdata/chapter/chapter_data.lua @@ -1,6 +1,7 @@ local ChapterData = class("ChapterData", BaseData) -local MIN_CHAPTER_ID = 1 +ChapterData.MIN_CHAPTER_ID = 1 +local MIN_CHAPTER_ID = ChapterData.MIN_CHAPTER_ID function ChapterData:ctor() self.data.chapterId = MIN_CHAPTER_ID diff --git a/lua/app/userdata/tutorial/tutorial_data.lua b/lua/app/userdata/tutorial/tutorial_data.lua index d0292b58..c84db343 100644 --- a/lua/app/userdata/tutorial/tutorial_data.lua +++ b/lua/app/userdata/tutorial/tutorial_data.lua @@ -8,29 +8,22 @@ local TutorialData = class("TutorialData", BaseData) function TutorialData:ctor() self.inTutorial = false self.data.tutorialId = 0 -- 强制引导步骤 - self.data.stopId = 0 -- 中断步骤 self.isFuncTutorial = false end function TutorialData:clear() self.inTutorial = false self.data.tutorialId = 0 - self.data.stopId = 0 self.isFuncTutorial = false end function TutorialData:init(data) data = data or {} self.inTutorial = false - -- 强制引导步骤 - self.data.tutorialId = data.id or 0 - if self.data.tutorialId > 0 then - self.tutorialInfo = TUTORIAL_CFG[self.data.tutorialId] - end -- 功能开启引导列表 self.funcTutorialMap = {} - if data.func then - for k,v in pairs(data.func) do + if data.markedGuide then + for k,v in pairs(data.markedGuide) do self.funcTutorialMap[k] = v end end @@ -53,25 +46,16 @@ function TutorialData:getIsInFirstStep() return self.data.tutorialId == 10010 end --- 是否有下一步，中断步骤是否改变 +-- 是否有下一步 function TutorialData:nextTutorial() local id = self.tutorialInfo.next_id local tutorialInfo = TUTORIAL_CFG[id] if tutorialInfo == nil then - return false, false + return false end self.data.tutorialId = id self.tutorialInfo = tutorialInfo - local stopId = self.tutorialInfo and self.tutorialInfo.stop_id or 0 - if stopId ~= self.data.stopId then -- 中断步骤发生了改变 - self.data.stopId = stopId - return true, true - end - return true, false -end - -function TutorialData:getStopId() - return self.data.stopId + return true end function TutorialData:stopTutorial() @@ -168,6 +152,10 @@ function TutorialData:getTypeParameter() return self.tutorialInfo.type_parameter end +function TutorialData:getTargetElement() + return self.tutorialInfo.target_element +end + function TutorialData:getIsHaveTutorialText() if self.tutorialInfo.txt and self.tutorialInfo.txt ~= "" then return true @@ -215,7 +203,6 @@ function TutorialData:getIsHaveFuncTutorial(tutorialId, tutorialInfo) self.tutorialInfo = tutorialInfo self.data.tutorialId = tutorialId - self.data.stopId = 0 self.isFuncTutorial = true return true end @@ -261,48 +248,4 @@ function TutorialData:getTutorialId2UIPath(id) return self.tutorialId2UIPath[id] end -function TutorialData:getFuncTutorialId(uiPath) - self:getTutorialIdList() - local list = self.funcTutorialUImap[uiPath] - if list then - for _, id in ipairs(list) do - local info = TUTORIAL_STARTCFG[id] - local tId = info.start_id - if tId then - if not self:getIsFuncTutorialFinished(tId) then - return id - end - end - end - end -end - -function TutorialData:getTaskOpenTutorial(taskId) - if not self.taskOpenTutorialMap then - self.taskOpenTutorialMap = {} - local cfg = ConfigManager:getConfig("func_open") - for id, info in pairs(cfg) do - if info.task and info.tutorial_id then - self.taskOpenTutorialMap[info.task] = info.tutorial_id - end - end - end - - return self.taskOpenTutorialMap[taskId] -end - -function TutorialData:getStageOpenTutorial(stageId) - if not self.stageOpenTutorialMap then - self.stageOpenTutorialMap = {} - local cfg = ConfigManager:getConfig("func_open") - for id, info in pairs(cfg) do - if info.stage and info.tutorial_id then - self.stageOpenTutorialMap[info.stage] = info.tutorial_id - end - end - end - - return self.stageOpenTutorialMap[stageId] -end - return TutorialData \ No newline at end of file diff --git a/lua/app/userdata/tutorial/tutorial_task_data.lua b/lua/app/userdata/tutorial/tutorial_task_data.lua deleted file mode 100644 index b70dbf22..00000000 --- a/lua/app/userdata/tutorial/tutorial_task_data.lua +++ /dev/null @@ -1,280 +0,0 @@ -local TutorialTaskData = class("TutorialTaskData", BaseData) - -local TUTORIAL_TASK_CFG = ConfigManager:getConfig("tutorialtask") - -function TutorialTaskData:ctor() - self:clear() -end - -function TutorialTaskData:clear() - self.data.isDirty = false - self.finished = false - self.progress = 0 - self.curTaskId = 1 - - ModuleManager.TaskManager:unRegisterAllModuleTask("TutorialTaskData") -end - -function TutorialTaskData:init(data, isInit) - data = data or {} - self.finished = data.finished or false - self.progress = data.progress or 0 - self.curTaskId = data.id or 1 - - if isInit then - self:initTaskListener() - end - self:setDirty() -end - -function TutorialTaskData:setDirty() - self.data.isDirty = not self.data.isDirty -end - -function TutorialTaskData:getCurTutorialId() - return self.curTaskId -end - -function TutorialTaskData:getTaskCollect(id) - if id then - return id < self.curTaskId - end - return self.finished -end - -function TutorialTaskData:getTaskDesc(taskId, noProgress) - taskId = taskId or self.curTaskId - if TUTORIAL_TASK_CFG[taskId] then - local progress = self:getTaskCount(taskId) - if noProgress then - progress = nil - end - return ModuleManager.TaskManager:getTaskTutorialDesc(TUTORIAL_TASK_CFG[taskId].type, progress, self:getTaskTotalCount(taskId)) - end - return GConst.EMPTY_STRING -end - -function TutorialTaskData:getTaskCount() - return self.progress -end - -function TutorialTaskData:getTaskTotalCount(taskId) - taskId = taskId or self.curTaskId - if TUTORIAL_TASK_CFG[taskId] then - return TUTORIAL_TASK_CFG[taskId].parameter - end - return 1 -end - -function TutorialTaskData:getTaskReward(taskId) - taskId = taskId or self.curTaskId - if TUTORIAL_TASK_CFG[taskId] then - return TUTORIAL_TASK_CFG[taskId].reward - end - return -end - -function TutorialTaskData:getTaskTutorialId(taskId) - taskId = taskId or self.curTaskId - if TUTORIAL_TASK_CFG[taskId] then - return TUTORIAL_TASK_CFG[taskId].tutorial_id - end - return -end - -function TutorialTaskData:getTaskType(taskId) - taskId = taskId or self.curTaskId - if TUTORIAL_TASK_CFG[taskId] then - return TUTORIAL_TASK_CFG[taskId].type - end - return 1 -end - -function TutorialTaskData:getTaskNext(taskId) - taskId = taskId or self.curTaskId - if TUTORIAL_TASK_CFG[taskId] then - return TUTORIAL_TASK_CFG[taskId].next - end - return -end - -function TutorialTaskData:canClaimTask() - if not TUTORIAL_TASK_CFG[self.curTaskId] or self:getTaskCollect() then - return false - end - return self:getTaskCount() >= self:getTaskTotalCount() -end - -function TutorialTaskData:getMaxShowFingerTask() - if not self.maxShowFingerTaskId then - self.maxShowFingerTaskId = GFunc.getConstIntValue("tutorialtask_tutorialmax") - end - return self.maxShowFingerTaskId -end - ----- 如果需要显示指引，则返回类型，nil为不指引 -function TutorialTaskData:showFinger(taskId) - if DataManager.TutorialData:getIsInTutorial() then -- 强引导 - return false - end - - taskId = taskId or self.curTaskId - if taskId > self:getMaxShowFingerTask() then - return false - end - if not TUTORIAL_TASK_CFG[taskId] then - return - end - if self:canClaimTask() then - return false - end - local taskType = TUTORIAL_TASK_CFG[taskId].type - if taskType == GConst.TaskConst.TASK_TYPE.X_TRAIN_ATK or - taskType == GConst.TaskConst.TASK_TYPE.X_TRAIN_HP then - return taskType - end - return -end - -function TutorialTaskData:showMaskFinger(taskId) - if DataManager.TutorialData:getIsInTutorial() then -- 强引导 - return false - end - - taskId = taskId or self.curTaskId - if not TUTORIAL_TASK_CFG[taskId] or not TUTORIAL_TASK_CFG[taskId].must_tutorial then - return false - end - - return self:canClaimTask() -end - -function TutorialTaskData:getIsThisTypeTask(taskType) - local cfg = TUTORIAL_TASK_CFG[self.curTaskId] - if cfg and cfg.type == taskType then - return true - end -end - -function TutorialTaskData:addTaskProgress(count) - if not count then - return - end - self.progress = self.progress + count - self:setDirty() - - if self:showMaskFinger() and not DataManager.TutorialData:getIsInTutorial() then - EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = 0}) - end -end - -function TutorialTaskData:setTaskProgress(count) - if not count then - return - end - if self.progress > count then - return - end - self.progress = count - self:setDirty() -end - -function TutorialTaskData:initTaskListener() - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_KILL_MONSTER, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_KILL_MONSTER) then - self:addTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.PASS_CHAPTER, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.PASS_CHAPTER) then - self:setTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_WEAPON_SUMMON, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_WEAPON_SUMMON) then - self:addTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_PROTECTIVE_SUMMON, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_PROTECTIVE_SUMMON) then - self:addTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_LEGACY_SUMMON, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_LEGACY_SUMMON) then - self:addTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.COMPLETED_JEWELRY_BATTLE, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.COMPLETED_JEWELRY_BATTLE) then - self:setTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.COMPLETED_GOLD_BATTLE, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.COMPLETED_GOLD_BATTLE) then - self:setTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.COMPLETED_MITHRIL_BATTLE, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.COMPLETED_MITHRIL_BATTLE) then - self:setTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.ARENA_TIER_ON, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.ARENA_TIER_ON) then - self:addTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_MINE_DISTANCE, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_MINE_DISTANCE) then - self:setTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_TRAIN_ATK, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_TRAIN_ATK) then - self:setTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_TRAIN_HP, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_TRAIN_HP) then - self:setTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_WATCH_AD, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_WATCH_AD) then - self:addTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_HOE_USE, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_HOE_USE) then - self:addTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_RESEARCH_USE, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_RESEARCH_USE) then - self:addTaskProgress(count) - end - end) - - ModuleManager.TaskManager:registerTask("TutorialTaskData", GConst.TaskConst.TASK_TYPE.X_MINE_GRID, function(count) - if self:getIsThisTypeTask(GConst.TaskConst.TASK_TYPE.X_MINE_GRID) then - self:addTaskProgress(count) - end - end) -end - -return TutorialTaskData \ No newline at end of file From 867bf7213476b6cbb210ae5546295327b4dcebab Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 21 Apr 2023 16:26:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=95=E5=AF=BC=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/battle_exp.lua | 118 ++--- lua/app/config/chapter.lua | 23 +- lua/app/config/chapter_board.lua | 275 ++++++------ lua/app/config/fx.lua | 362 +++++++++++++++ lua/app/config/fx.lua.meta | 10 + lua/app/config/item.lua | 44 +- lua/app/config/monster_base.lua | 24 +- lua/app/config/monster_chapter.lua | 438 +++++++++---------- lua/app/config/skill.lua | 12 +- lua/app/config/skill_rogue.lua | 16 +- lua/app/config/strings/cn/chapter.lua | 20 +- lua/app/config/strings/cn/item.lua | 16 +- lua/app/config/strings/cn/skill_rogue.lua | 26 +- lua/app/config/strings/de/skill_rogue.lua | 26 +- lua/app/config/strings/en/skill_rogue.lua | 26 +- lua/app/config/strings/fr/skill_rogue.lua | 26 +- lua/app/config/strings/id/skill_rogue.lua | 26 +- lua/app/config/strings/ja/skill_rogue.lua | 26 +- lua/app/config/strings/ko/skill_rogue.lua | 26 +- lua/app/config/strings/pt/skill_rogue.lua | 26 +- lua/app/config/strings/ru/skill_rogue.lua | 26 +- lua/app/config/strings/th/skill_rogue.lua | 26 +- lua/app/config/strings/vi/skill_rogue.lua | 26 +- lua/app/config/strings/zh/skill_rogue.lua | 26 +- lua/app/config/struct.lua | 8 +- lua/app/module/maincity/maincity_manager.lua | 2 +- lua/app/server/data/server_tutorial_data.lua | 1 + lua/app/userdata/tutorial/tutorial_data.lua | 5 +- 28 files changed, 1188 insertions(+), 498 deletions(-) create mode 100644 lua/app/config/fx.lua create mode 100644 lua/app/config/fx.lua.meta diff --git a/lua/app/config/battle_exp.lua b/lua/app/config/battle_exp.lua index 8f172d14..aa700348 100644 --- a/lua/app/config/battle_exp.lua +++ b/lua/app/config/battle_exp.lua @@ -3,181 +3,181 @@ local battle_exp = { ["exp"]=10000 }, [2]={ - ["exp"]=20000 + ["exp"]=10000 }, [3]={ - ["exp"]=30000 + ["exp"]=10000 }, [4]={ - ["exp"]=40000 + ["exp"]=10000 }, [5]={ - ["exp"]=50000 + ["exp"]=10000 }, [6]={ - ["exp"]=60000 + ["exp"]=10000 }, [7]={ - ["exp"]=70000 + ["exp"]=10000 }, [8]={ - ["exp"]=80000 + ["exp"]=10000 }, [9]={ - ["exp"]=90000 + ["exp"]=10000 }, [10]={ - ["exp"]=100000 + ["exp"]=10000 }, [11]={ - ["exp"]=110000 + ["exp"]=10000 }, [12]={ - ["exp"]=120000 + ["exp"]=10000 }, [13]={ - ["exp"]=130000 + ["exp"]=10000 }, [14]={ - ["exp"]=140000 + ["exp"]=10000 }, [15]={ - ["exp"]=150000 + ["exp"]=10000 }, [16]={ - ["exp"]=160000 + ["exp"]=10000 }, [17]={ - ["exp"]=170000 + ["exp"]=10000 }, [18]={ - ["exp"]=180000 + ["exp"]=10000 }, [19]={ - ["exp"]=190000 + ["exp"]=10000 }, [20]={ - ["exp"]=200000 + ["exp"]=10000 }, [21]={ - ["exp"]=210000 + ["exp"]=10000 }, [22]={ - ["exp"]=220000 + ["exp"]=10000 }, [23]={ - ["exp"]=230000 + ["exp"]=10000 }, [24]={ - ["exp"]=240000 + ["exp"]=10000 }, [25]={ - ["exp"]=250000 + ["exp"]=10000 }, [26]={ - ["exp"]=260000 + ["exp"]=10000 }, [27]={ - ["exp"]=270000 + ["exp"]=10000 }, [28]={ - ["exp"]=280000 + ["exp"]=10000 }, [29]={ - ["exp"]=290000 + ["exp"]=10000 }, [30]={ - ["exp"]=300000 + ["exp"]=10000 }, [31]={ - ["exp"]=310000 + ["exp"]=10000 }, [32]={ - ["exp"]=320000 + ["exp"]=10000 }, [33]={ - ["exp"]=330000 + ["exp"]=10000 }, [34]={ - ["exp"]=340000 + ["exp"]=10000 }, [35]={ - ["exp"]=350000 + ["exp"]=10000 }, [36]={ - ["exp"]=360000 + ["exp"]=10000 }, [37]={ - ["exp"]=370000 + ["exp"]=10000 }, [38]={ - ["exp"]=380000 + ["exp"]=10000 }, [39]={ - ["exp"]=390000 + ["exp"]=10000 }, [40]={ - ["exp"]=400000 + ["exp"]=10000 }, [41]={ - ["exp"]=410000 + ["exp"]=10000 }, [42]={ - ["exp"]=420000 + ["exp"]=10000 }, [43]={ - ["exp"]=430000 + ["exp"]=10000 }, [44]={ - ["exp"]=440000 + ["exp"]=10000 }, [45]={ - ["exp"]=450000 + ["exp"]=10000 }, [46]={ - ["exp"]=460000 + ["exp"]=10000 }, [47]={ - ["exp"]=470000 + ["exp"]=10000 }, [48]={ - ["exp"]=480000 + ["exp"]=10000 }, [49]={ - ["exp"]=490000 + ["exp"]=10000 }, [50]={ - ["exp"]=500000 + ["exp"]=10000 }, [51]={ - ["exp"]=510000 + ["exp"]=10000 }, [52]={ - ["exp"]=520000 + ["exp"]=10000 }, [53]={ - ["exp"]=530000 + ["exp"]=10000 }, [54]={ - ["exp"]=540000 + ["exp"]=10000 }, [55]={ - ["exp"]=550000 + ["exp"]=10000 }, [56]={ - ["exp"]=560000 + ["exp"]=10000 }, [57]={ - ["exp"]=570000 + ["exp"]=10000 }, [58]={ - ["exp"]=580000 + ["exp"]=10000 }, [59]={ - ["exp"]=590000 + ["exp"]=10000 }, [60]={ - ["exp"]=600000 + ["exp"]=10000 } } local config = { diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 5817f146..421513ab 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -10,6 +10,13 @@ local chapter = { 1, 5 }, + ["involved_skill"]={ + { + 200200, + 29, + 20 + } + }, ["not_involved_skill"]={ 4, 5, @@ -58,8 +65,8 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", + ["id"]=12001, + ["id_for_nothing"]="VwpcA2Q=", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -141,8 +148,8 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", + ["id"]=22001, + ["id_for_nothing"]="VApcA2Q=", ["num"]=5, ["num_for_nothing"]="Uw==" } @@ -258,10 +265,10 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=52001, + ["id_for_nothing"]="UwpcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index ac6dfe34..471d1e5f 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -9,18 +9,78 @@ local chapter_board = { 1, 0 }, + { + 0, + 3 + }, { 0, 2 }, + { + 0, + 2 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 0, 4 }, + { + 0, + 3 + }, + { + 0, + 3 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, { 0, 2 }, + { + 0, + 4 + }, + { + 1, + 0 + }, { 1, 0 @@ -45,14 +105,6 @@ local chapter_board = { 0, 3 }, - { - 0, - 2 - }, - { - 0, - 4 - }, { 1, 0 @@ -61,26 +113,6 @@ local chapter_board = { 1, 0 }, - { - 0, - 3 - }, - { - 0, - 3 - }, - { - 0, - 4 - }, - { - 0, - 3 - }, - { - 0, - 3 - }, { 1, 0 @@ -89,30 +121,6 @@ local chapter_board = { 1, 0 }, - { - 0, - 4 - }, - { - 0, - 4 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 0, - 4 - }, - { - 1, - 0 - }, { 1, 0 @@ -122,16 +130,8 @@ local chapter_board = { 0 }, { - 0, - 2 - }, - { - 0, - 3 - }, - { - 0, - 3 + 1, + 0 }, { 1, @@ -199,12 +199,14 @@ local chapter_board = { } }, ["control_element"]={ + 2, + 3, + 3, + 2, 2, 2, 2, - 4, 2, - 4, 2, 2, 2, @@ -218,36 +220,12 @@ local chapter_board = { 0 }, { - 1, - 0 - }, - { - 1, - 0 + 0, + 1 }, { 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 + 3 }, { 0, @@ -275,7 +253,7 @@ local chapter_board = { }, { 0, - 3 + 1 }, { 0, @@ -285,14 +263,6 @@ local chapter_board = { 0, 1 }, - { - 0, - 1 - }, - { - 0, - 3 - }, { 1, 0 @@ -302,12 +272,8 @@ local chapter_board = { 0 }, { - 0, - 2 - }, - { - 0, - 3 + 1, + 0 }, { 0, @@ -317,22 +283,6 @@ local chapter_board = { 0, 3 }, - { - 0, - 4 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 1 - }, { 0, 1 @@ -345,10 +295,6 @@ local chapter_board = { 0, 4 }, - { - 0, - 2 - }, { 1, 0 @@ -363,7 +309,7 @@ local chapter_board = { }, { 0, - 4 + 3 }, { 0, @@ -371,11 +317,7 @@ local chapter_board = { }, { 0, - 2 - }, - { - 1, - 0 + 3 }, { 1, @@ -395,7 +337,67 @@ local chapter_board = { }, { 0, - 4 + 1 + }, + { + 1, + 0 + }, + { + 0, + 1 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 }, { 1, @@ -409,13 +411,6 @@ local chapter_board = { 1, 0 } - }, - ["control_element"]={ - 4, - 3, - 4, - 1, - 4 } }, [3]={ diff --git a/lua/app/config/fx.lua b/lua/app/config/fx.lua new file mode 100644 index 00000000..40e09bb4 --- /dev/null +++ b/lua/app/config/fx.lua @@ -0,0 +1,362 @@ +local fx = { + [100000]={ + ["res"]="sfx_m10001_b01_01", + ["bind"]="root" + }, + [100001]={ + ["res"]="sfx_m10001_b01_02", + ["bind"]="root" + }, + [100002]={ + ["res"]="sfx_m10001_b01_03", + ["bind"]="root" + }, + [100003]={ + ["res"]="sfx_m10006_b01", + ["bind"]="root" + }, + [100004]={ + ["res"]="sfx_m10006_b02", + ["bind"]="root" + }, + [100005]={ + ["res"]="sfx_m10006_b03", + ["bind"]="root" + }, + [100006]={ + ["res"]="sfx_m10010_b01", + ["bind"]="root" + }, + [100007]={ + ["res"]="sfx_m10010_b02", + ["bind"]="root" + }, + [100008]={ + ["res"]="sfx_m10010_b03", + ["bind"]="root" + }, + [100009]={ + ["res"]="sfx_m10011_b01", + ["bind"]="root" + }, + [100010]={ + ["res"]="sfx_m10011_b03", + ["bind"]="root" + }, + [100011]={ + ["res"]="sfx_m10012_b01", + ["bind"]="root" + }, + [100012]={ + ["res"]="sfx_m10012_b02", + ["bind"]="root" + }, + [100013]={ + ["res"]="sfx_m10016_b01", + ["bind"]="root" + }, + [100014]={ + ["res"]="sfx_m10016_b02", + ["bind"]="root" + }, + [100015]={ + ["res"]="sfx_m10016_b03", + ["bind"]="root" + }, + [200000]={ + ["res"]="sfx_m20001_b01", + ["bind"]="root" + }, + [200001]={ + ["res"]="sfx_m20001_b02", + ["bind"]="root" + }, + [200002]={ + ["res"]="sfx_m20001_b03", + ["bind"]="root" + }, + [200003]={ + ["res"]="sfx_m20002_b01", + ["bind"]="root" + }, + [200004]={ + ["res"]="sfx_m20002_b02", + ["bind"]="root" + }, + [200005]={ + ["res"]="sfx_m20002_b03", + ["bind"]="root" + }, + [200006]={ + ["res"]="sfx_m20003_b01", + ["bind"]="root" + }, + [200007]={ + ["res"]="sfx_m20003_b02", + ["bind"]="root" + }, + [200008]={ + ["res"]="sfx_m20003_b03", + ["bind"]="root" + }, + [200009]={ + ["res"]="sfx_m20003_b04", + ["bind"]="root" + }, + [200010]={ + ["res"]="sfx_m20004_b01", + ["bind"]="root" + }, + [200011]={ + ["res"]="sfx_m20004_b02", + ["bind"]="root" + }, + [200012]={ + ["res"]="sfx_m20005_b01", + ["bind"]="root" + }, + [200013]={ + ["res"]="sfx_m20005_b02", + ["bind"]="root" + }, + [200014]={ + ["res"]="sfx_m20005_b03", + ["bind"]="root" + }, + [200015]={ + ["res"]="sfx_m20005_b04", + ["bind"]="root" + }, + [200016]={ + ["res"]="sfx_m20006_b01", + ["bind"]="root" + }, + [200017]={ + ["res"]="sfx_m20006_b02", + ["bind"]="root" + }, + [200018]={ + ["res"]="sfx_m20006_b03", + ["bind"]="root" + }, + [200019]={ + ["res"]="sfx_m20006_b04", + ["bind"]="root" + }, + [200020]={ + ["res"]="sfx_m20007_b01", + ["bind"]="root" + }, + [200021]={ + ["res"]="sfx_m20007_b02", + ["bind"]="root" + }, + [200022]={ + ["res"]="sfx_m20007_b03", + ["bind"]="root" + }, + [200023]={ + ["res"]="sfx_m20007_b04", + ["bind"]="root" + }, + [200024]={ + ["res"]="sfx_m20008_b01", + ["bind"]="root" + }, + [200025]={ + ["res"]="sfx_m20008_b02", + ["bind"]="root" + }, + [200026]={ + ["res"]="sfx_m20008_b03", + ["bind"]="root" + }, + [200027]={ + ["res"]="sfx_m20008_b04", + ["bind"]="root" + }, + [200028]={ + ["res"]="sfx_m20009_b01", + ["bind"]="root" + }, + [200029]={ + ["res"]="sfx_m20009_b02", + ["bind"]="root" + }, + [200030]={ + ["res"]="sfx_m20009_b03", + ["bind"]="root" + }, + [200031]={ + ["res"]="sfx_m20010_b01", + ["bind"]="root" + }, + [200032]={ + ["res"]="sfx_m20010_b03", + ["bind"]="root" + }, + [200033]={ + ["res"]="sfx_m20011_b01", + ["bind"]="root" + }, + [200034]={ + ["res"]="sfx_m20011_b02", + ["bind"]="root" + }, + [200035]={ + ["res"]="sfx_m20011_b03", + ["bind"]="root" + }, + [200036]={ + ["res"]="sfx_m20012_b01", + ["bind"]="root" + }, + [200037]={ + ["res"]="sfx_m20012_b02", + ["bind"]="root" + }, + [200038]={ + ["res"]="sfx_m20012_b03", + ["bind"]="root" + }, + [200039]={ + ["res"]="sfx_m20012_b04", + ["bind"]="root" + }, + [300000]={ + ["res"]="sfx_p0001_b01", + ["bind"]="root" + }, + [300001]={ + ["res"]="sfx_p0001_b02", + ["bind"]="root" + }, + [300002]={ + ["res"]="sfx_p0001_b03", + ["bind"]="root" + }, + [300003]={ + ["res"]="sfx_p0001_b04", + ["bind"]="root" + }, + [300004]={ + ["res"]="sfx_p0002_b01", + ["bind"]="root" + }, + [300005]={ + ["res"]="sfx_p0002_b02", + ["bind"]="root" + }, + [300006]={ + ["res"]="sfx_p0002_b03", + ["bind"]="root" + }, + [300007]={ + ["res"]="sfx_p0002_b04", + ["bind"]="root" + }, + [300008]={ + ["res"]="sfx_p0002_b05", + ["bind"]="root" + }, + [300009]={ + ["res"]="sfx_p0003_b01", + ["bind"]="root" + }, + [300010]={ + ["res"]="sfx_p0003_b02", + ["bind"]="root" + }, + [300011]={ + ["res"]="sfx_p0003_b03", + ["bind"]="root" + }, + [300012]={ + ["res"]="sfx_p0003_b04", + ["bind"]="root" + }, + [300013]={ + ["res"]="sfx_p0004_b01", + ["bind"]="root" + }, + [300014]={ + ["res"]="sfx_p0004_b03", + ["bind"]="root" + }, + [300015]={ + ["res"]="sfx_p0004_b04", + ["bind"]="root" + }, + [300016]={ + ["res"]="sfx_p0004_b05", + ["bind"]="root" + }, + [300017]={ + ["res"]="sfx_p0005_b01", + ["bind"]="root" + }, + [300018]={ + ["res"]="sfx_p0005_b02", + ["bind"]="root" + }, + [300019]={ + ["res"]="sfx_p0005_b03", + ["bind"]="root" + }, + [300020]={ + ["res"]="sfx_p0005_b04", + ["bind"]="root" + }, + [300021]={ + ["res"]="sfx_p0006_b01", + ["bind"]="root" + }, + [300022]={ + ["res"]="sfx_p0006_b02", + ["bind"]="root" + }, + [300023]={ + ["res"]="sfx_p0006_b03", + ["bind"]="root" + }, + [300024]={ + ["res"]="sfx_p0006_b04", + ["bind"]="root" + }, + [300025]={ + ["res"]="sfx_p0006_b05", + ["bind"]="root" + }, + [300026]={ + ["res"]="sfx_p0007_b01", + ["bind"]="root" + }, + [300027]={ + ["res"]="sfx_p0007_b02", + ["bind"]="root" + }, + [300028]={ + ["res"]="sfx_p0007_b03", + ["bind"]="root" + }, + [300029]={ + ["res"]="sfx_p0007_b04", + ["bind"]="root" + }, + [300030]={ + ["res"]="sfx_p0008_b01", + ["bind"]="root" + }, + [300031]={ + ["res"]="sfx_p0008_b05", + ["bind"]="root" + }, + [300032]={ + ["res"]="sfx_p0008_b06", + ["bind"]="root" + } +} +local config = { +data=fx,count=89 +} +return config \ No newline at end of file diff --git a/lua/app/config/fx.lua.meta b/lua/app/config/fx.lua.meta new file mode 100644 index 00000000..75d7cf8e --- /dev/null +++ b/lua/app/config/fx.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3d15f668fda6e404dbee3fe8789124e6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 35200181..529b8867 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -20,23 +20,33 @@ local item = { ["icon"]="4", ["hero_drop"]={ { - ["id"]=5001, + ["type"]=1, + ["id"]=12001, + ["num"]=1, ["weight"]=100 }, { - ["id"]=5002, + ["type"]=1, + ["id"]=22001, + ["num"]=1, ["weight"]=100 }, { - ["id"]=5003, + ["type"]=1, + ["id"]=32001, + ["num"]=1, ["weight"]=100 }, { - ["id"]=5004, + ["type"]=1, + ["id"]=42001, + ["num"]=1, ["weight"]=100 }, { - ["id"]=5005, + ["type"]=1, + ["id"]=52001, + ["num"]=1, ["weight"]=100 } } @@ -47,15 +57,21 @@ local item = { ["icon"]="5", ["hero_drop"]={ { - ["id"]=5006, + ["type"]=1, + ["id"]=23001, + ["num"]=1, ["weight"]=100 }, { - ["id"]=5007, + ["type"]=1, + ["id"]=33001, + ["num"]=1, ["weight"]=100 }, { - ["id"]=5008, + ["type"]=1, + ["id"]=43001, + ["num"]=1, ["weight"]=100 } } @@ -66,15 +82,21 @@ local item = { ["icon"]="6", ["hero_drop"]={ { - ["id"]=5006, + ["type"]=1, + ["id"]=23001, + ["num"]=1, ["weight"]=100 }, { - ["id"]=5007, + ["type"]=1, + ["id"]=33001, + ["num"]=1, ["weight"]=100 }, { - ["id"]=5008, + ["type"]=1, + ["id"]=43001, + ["num"]=1, ["weight"]=100 } } diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index 84e4b840..19efabfc 100644 --- a/lua/app/config/monster_base.lua +++ b/lua/app/config/monster_base.lua @@ -73,51 +73,51 @@ local monster_base = { }, [20001]={ ["hurt_num"]=1, - ["model_id"]="m10010" + ["model_id"]="m20001" }, [20002]={ ["hurt_num"]=1, - ["model_id"]="m10010" + ["model_id"]="m20002" }, [20003]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20003" }, [20004]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20004" }, [20005]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20005" }, [20006]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20006" }, [20007]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20007" }, [20008]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20008" }, [20009]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20009" }, [20010]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20010" }, [20011]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20011" }, [20012]={ ["hurt_num"]=3, - ["model_id"]="m10010" + ["model_id"]="m20012" } } local config = { diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index c1bb72fe..902e6db1 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -135,7 +135,7 @@ local monster_chapter = { ["monster_base"]=10009, ["hp"]=4000000, ["atk"]=250000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, @@ -143,7 +143,7 @@ local monster_chapter = { ["monster_base"]=10007, ["hp"]=6000000, ["atk"]=250000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000000, ["monster_exp"]=11000 }, @@ -151,7 +151,7 @@ local monster_chapter = { ["monster_base"]=10008, ["hp"]=8000000, ["atk"]=250000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, @@ -159,7 +159,7 @@ local monster_chapter = { ["monster_base"]=10010, ["hp"]=10000000, ["atk"]=280000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=19000 }, @@ -168,7 +168,7 @@ local monster_chapter = { ["is_boss"]=1, ["hp"]=20000000, ["atk"]=340000, - ["atk_times"]=3, + ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ 1000003 @@ -179,7 +179,7 @@ local monster_chapter = { ["monster_base"]=10011, ["hp"]=15000000, ["atk"]=300000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=9000 }, @@ -187,7 +187,7 @@ local monster_chapter = { ["monster_base"]=10010, ["hp"]=17000000, ["atk"]=310000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=10000 }, @@ -195,7 +195,7 @@ local monster_chapter = { ["monster_base"]=10007, ["hp"]=19000000, ["atk"]=320000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000000, ["monster_exp"]=11000 }, @@ -203,7 +203,7 @@ local monster_chapter = { ["monster_base"]=10011, ["hp"]=21000000, ["atk"]=330000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=12000 }, @@ -212,7 +212,7 @@ local monster_chapter = { ["is_boss"]=1, ["hp"]=36000000, ["atk"]=380000, - ["atk_times"]=3, + ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ 1000004, @@ -224,7 +224,7 @@ local monster_chapter = { ["monster_base"]=10010, ["hp"]=21000000, ["atk"]=340000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, @@ -232,7 +232,7 @@ local monster_chapter = { ["monster_base"]=10009, ["hp"]=23000000, ["atk"]=350000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=18000 }, @@ -240,7 +240,7 @@ local monster_chapter = { ["monster_base"]=10011, ["hp"]=26000000, ["atk"]=360000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=21000 }, @@ -248,7 +248,7 @@ local monster_chapter = { ["monster_base"]=10003, ["hp"]=29000000, ["atk"]=370000, - ["atk_times"]=2, + ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=22000 }, @@ -257,7 +257,7 @@ local monster_chapter = { ["is_boss"]=2, ["hp"]=45000000, ["atk"]=430000, - ["atk_times"]=3, + ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ 1000006, @@ -302,7 +302,7 @@ local monster_chapter = { ["is_boss"]=1, ["hp"]=21000000, ["atk"]=370000, - ["atk_times"]=3, + ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ 1000008, @@ -347,7 +347,7 @@ local monster_chapter = { ["is_boss"]=1, ["hp"]=28000000, ["atk"]=400000, - ["atk_times"]=3, + ["atk_times"]=4, ["hurt_skill"]=1000000, ["skill"]={ 1000011, @@ -392,7 +392,7 @@ local monster_chapter = { ["is_boss"]=1, ["hp"]=43000000, ["atk"]=640000, - ["atk_times"]=3, + ["atk_times"]=4, ["hurt_skill"]=1000000, ["skill"]={ 1000011, @@ -437,7 +437,7 @@ local monster_chapter = { ["is_boss"]=2, ["hp"]=73000000, ["atk"]=550000, - ["atk_times"]=3, + ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ 1000010, @@ -627,32 +627,32 @@ local monster_chapter = { }, [7101]={ ["monster_base"]=10011, - ["hp"]=6400000, - ["atk"]=350000, + ["hp"]=6700000, + ["atk"]=380000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [7201]={ ["monster_base"]=10010, - ["hp"]=8000000, - ["atk"]=370000, + ["hp"]=8400000, + ["atk"]=400000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [7301]={ ["monster_base"]=10007, - ["hp"]=9600000, - ["atk"]=390000, + ["hp"]=10000000, + ["atk"]=420000, ["atk_times"]=3, ["hurt_skill"]=1000000, ["monster_exp"]=17000 }, [7401]={ ["monster_base"]=10004, - ["hp"]=11000000, - ["atk"]=410000, + ["hp"]=11500000, + ["atk"]=450000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=19000 @@ -660,8 +660,8 @@ local monster_chapter = { [7501]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=24000000, - ["atk"]=470000, + ["hp"]=25000000, + ["atk"]=500000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -673,32 +673,32 @@ local monster_chapter = { }, [7601]={ ["monster_base"]=10006, - ["hp"]=14000000, - ["atk"]=430000, + ["hp"]=15700000, + ["atk"]=500000, ["atk_times"]=3, ["hurt_skill"]=1000000, ["monster_exp"]=9000 }, [7701]={ ["monster_base"]=10010, - ["hp"]=17000000, - ["atk"]=490000, + ["hp"]=19100000, + ["atk"]=570000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=10000 }, [7801]={ ["monster_base"]=10011, - ["hp"]=19000000, - ["atk"]=450000, + ["hp"]=21300000, + ["atk"]=520000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [7901]={ ["monster_base"]=10004, - ["hp"]=22000000, - ["atk"]=510000, + ["hp"]=24700000, + ["atk"]=590000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=12000 @@ -706,8 +706,8 @@ local monster_chapter = { [8001]={ ["monster_base"]=20006, ["is_boss"]=1, - ["hp"]=38000000, - ["atk"]=570000, + ["hp"]=39700000, + ["atk"]=610000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -718,32 +718,32 @@ local monster_chapter = { }, [8101]={ ["monster_base"]=10006, - ["hp"]=30000000, - ["atk"]=530000, + ["hp"]=31300000, + ["atk"]=570000, ["atk_times"]=3, ["hurt_skill"]=1000000, ["monster_exp"]=16000 }, [8201]={ ["monster_base"]=10010, - ["hp"]=33000000, - ["atk"]=550000, + ["hp"]=34500000, + ["atk"]=590000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=18000 }, [8301]={ ["monster_base"]=10011, - ["hp"]=36000000, - ["atk"]=570000, + ["hp"]=37600000, + ["atk"]=610000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=21000 }, [8401]={ ["monster_base"]=10002, - ["hp"]=39000000, - ["atk"]=590000, + ["hp"]=40700000, + ["atk"]=630000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=22000 @@ -751,8 +751,8 @@ local monster_chapter = { [8501]={ ["monster_base"]=20007, ["is_boss"]=1, - ["hp"]=71000000, - ["atk"]=590000, + ["hp"]=74100000, + ["atk"]=630000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -763,32 +763,32 @@ local monster_chapter = { }, [8601]={ ["monster_base"]=10004, - ["hp"]=47000000, - ["atk"]=610000, + ["hp"]=52500000, + ["atk"]=700000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=15000 }, [8701]={ ["monster_base"]=10002, - ["hp"]=50000000, - ["atk"]=630000, + ["hp"]=55800000, + ["atk"]=720000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, [8801]={ ["monster_base"]=10011, - ["hp"]=55000000, - ["atk"]=650000, + ["hp"]=61400000, + ["atk"]=740000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, [8901]={ ["monster_base"]=10013, - ["hp"]=60000000, - ["atk"]=670000, + ["hp"]=67000000, + ["atk"]=770000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 @@ -796,8 +796,8 @@ local monster_chapter = { [9001]={ ["monster_base"]=20008, ["is_boss"]=2, - ["hp"]=95000000, - ["atk"]=920000, + ["hp"]=107800000, + ["atk"]=1060000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -810,32 +810,32 @@ local monster_chapter = { }, [9101]={ ["monster_base"]=10017, - ["hp"]=6400000, - ["atk"]=350000, + ["hp"]=8000000, + ["atk"]=480000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [9201]={ ["monster_base"]=10004, - ["hp"]=8000000, - ["atk"]=370000, + ["hp"]=10100000, + ["atk"]=500000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [9301]={ ["monster_base"]=10002, - ["hp"]=9600000, - ["atk"]=390000, + ["hp"]=12000000, + ["atk"]=530000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, [9401]={ ["monster_base"]=10014, - ["hp"]=11000000, - ["atk"]=410000, + ["hp"]=13800000, + ["atk"]=550000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=19000 @@ -843,8 +843,8 @@ local monster_chapter = { [9501]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=24000000, - ["atk"]=470000, + ["hp"]=29900000, + ["atk"]=620000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -856,32 +856,32 @@ local monster_chapter = { }, [9601]={ ["monster_base"]=10017, - ["hp"]=14000000, - ["atk"]=430000, + ["hp"]=17400000, + ["atk"]=580000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=9000 }, [9701]={ ["monster_base"]=10014, - ["hp"]=17000000, - ["atk"]=490000, + ["hp"]=21200000, + ["atk"]=650000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=10000 }, [9801]={ ["monster_base"]=10004, - ["hp"]=19000000, - ["atk"]=450000, + ["hp"]=23600000, + ["atk"]=600000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [9901]={ ["monster_base"]=10002, - ["hp"]=22000000, - ["atk"]=510000, + ["hp"]=27400000, + ["atk"]=670000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=12000 @@ -889,8 +889,8 @@ local monster_chapter = { [10001]={ ["monster_base"]=20010, ["is_boss"]=1, - ["hp"]=38000000, - ["atk"]=570000, + ["hp"]=43200000, + ["atk"]=680000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -901,32 +901,32 @@ local monster_chapter = { }, [10101]={ ["monster_base"]=10002, - ["hp"]=30000000, - ["atk"]=530000, + ["hp"]=34100000, + ["atk"]=640000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, [10201]={ ["monster_base"]=10010, - ["hp"]=33000000, - ["atk"]=550000, + ["hp"]=37600000, + ["atk"]=670000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=18000 }, [10301]={ ["monster_base"]=10003, - ["hp"]=36000000, - ["atk"]=570000, + ["hp"]=40900000, + ["atk"]=690000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=21000 }, [10401]={ ["monster_base"]=10008, - ["hp"]=39000000, - ["atk"]=590000, + ["hp"]=44300000, + ["atk"]=710000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=22000 @@ -934,8 +934,8 @@ local monster_chapter = { [10501]={ ["monster_base"]=20011, ["is_boss"]=1, - ["hp"]=71000000, - ["atk"]=590000, + ["hp"]=80600000, + ["atk"]=700000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -946,32 +946,32 @@ local monster_chapter = { }, [10601]={ ["monster_base"]=10007, - ["hp"]=47000000, - ["atk"]=610000, + ["hp"]=54600000, + ["atk"]=750000, ["atk_times"]=3, ["hurt_skill"]=1000000, ["monster_exp"]=15000 }, [10701]={ ["monster_base"]=10011, - ["hp"]=50000000, - ["atk"]=630000, + ["hp"]=58000000, + ["atk"]=770000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, [10801]={ ["monster_base"]=10012, - ["hp"]=55000000, - ["atk"]=650000, + ["hp"]=63800000, + ["atk"]=790000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, [10901]={ ["monster_base"]=10016, - ["hp"]=60000000, - ["atk"]=670000, + ["hp"]=69600000, + ["atk"]=820000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 @@ -979,8 +979,8 @@ local monster_chapter = { [11001]={ ["monster_base"]=20005, ["is_boss"]=2, - ["hp"]=95000000, - ["atk"]=920000, + ["hp"]=117700000, + ["atk"]=1170000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -992,32 +992,32 @@ local monster_chapter = { }, [11101]={ ["monster_base"]=10010, - ["hp"]=6400000, - ["atk"]=350000, + ["hp"]=9100000, + ["atk"]=560000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [11201]={ ["monster_base"]=10003, - ["hp"]=8000000, - ["atk"]=370000, + ["hp"]=11500000, + ["atk"]=590000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [11301]={ ["monster_base"]=10009, - ["hp"]=9600000, - ["atk"]=390000, + ["hp"]=13700000, + ["atk"]=620000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, [11401]={ ["monster_base"]=10011, - ["hp"]=11000000, - ["atk"]=410000, + ["hp"]=15700000, + ["atk"]=650000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=19000 @@ -1025,8 +1025,8 @@ local monster_chapter = { [11501]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=24000000, - ["atk"]=470000, + ["hp"]=34000000, + ["atk"]=710000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -1039,32 +1039,32 @@ local monster_chapter = { }, [11601]={ ["monster_base"]=10007, - ["hp"]=14000000, - ["atk"]=430000, + ["hp"]=19800000, + ["atk"]=670000, ["atk_times"]=3, ["hurt_skill"]=1000000, ["monster_exp"]=9000 }, [11701]={ ["monster_base"]=10011, - ["hp"]=17000000, - ["atk"]=490000, + ["hp"]=24100000, + ["atk"]=760000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=10000 }, [11801]={ ["monster_base"]=10012, - ["hp"]=19000000, - ["atk"]=450000, + ["hp"]=26800000, + ["atk"]=700000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [11901]={ ["monster_base"]=10016, - ["hp"]=22000000, - ["atk"]=510000, + ["hp"]=31100000, + ["atk"]=780000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=12000 @@ -1072,8 +1072,8 @@ local monster_chapter = { [12001]={ ["monster_base"]=20001, ["is_boss"]=1, - ["hp"]=38000000, - ["atk"]=570000, + ["hp"]=49100000, + ["atk"]=780000, ["atk_times"]=4, ["hurt_skill"]=1000000, ["skill"]={ @@ -1084,32 +1084,32 @@ local monster_chapter = { }, [12101]={ ["monster_base"]=10017, - ["hp"]=30000000, - ["atk"]=530000, + ["hp"]=38700000, + ["atk"]=750000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, [12201]={ ["monster_base"]=10014, - ["hp"]=33000000, - ["atk"]=550000, + ["hp"]=42700000, + ["atk"]=780000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=18000 }, [12301]={ ["monster_base"]=10004, - ["hp"]=36000000, - ["atk"]=570000, + ["hp"]=46400000, + ["atk"]=800000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=21000 }, [12401]={ ["monster_base"]=10002, - ["hp"]=39000000, - ["atk"]=590000, + ["hp"]=50300000, + ["atk"]=830000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=22000 @@ -1117,8 +1117,8 @@ local monster_chapter = { [12501]={ ["monster_base"]=20004, ["is_boss"]=1, - ["hp"]=71000000, - ["atk"]=590000, + ["hp"]=94900000, + ["atk"]=840000, ["atk_times"]=4, ["hurt_skill"]=1000000, ["skill"]={ @@ -1128,32 +1128,32 @@ local monster_chapter = { }, [12601]={ ["monster_base"]=10010, - ["hp"]=47000000, - ["atk"]=610000, + ["hp"]=63000000, + ["atk"]=890000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=15000 }, [12701]={ ["monster_base"]=10003, - ["hp"]=50000000, - ["atk"]=630000, + ["hp"]=66900000, + ["atk"]=910000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, [12801]={ ["monster_base"]=10009, - ["hp"]=55000000, - ["atk"]=650000, + ["hp"]=73600000, + ["atk"]=930000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, [12901]={ ["monster_base"]=10011, - ["hp"]=60000000, - ["atk"]=670000, + ["hp"]=80300000, + ["atk"]=960000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 @@ -1161,8 +1161,8 @@ local monster_chapter = { [13001]={ ["monster_base"]=20005, ["is_boss"]=2, - ["hp"]=95000000, - ["atk"]=920000, + ["hp"]=127000000, + ["atk"]=1280000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -1174,32 +1174,32 @@ local monster_chapter = { }, [13101]={ ["monster_base"]=10015, - ["hp"]=6400000, - ["atk"]=350000, + ["hp"]=9500000, + ["atk"]=610000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [13201]={ ["monster_base"]=10017, - ["hp"]=8000000, - ["atk"]=370000, + ["hp"]=12000000, + ["atk"]=630000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [13301]={ ["monster_base"]=10014, - ["hp"]=9600000, - ["atk"]=390000, + ["hp"]=14300000, + ["atk"]=660000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, [13401]={ ["monster_base"]=10018, - ["hp"]=11000000, - ["atk"]=410000, + ["hp"]=16300000, + ["atk"]=690000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=19000 @@ -1207,8 +1207,8 @@ local monster_chapter = { [13501]={ ["monster_base"]=20001, ["is_boss"]=1, - ["hp"]=24000000, - ["atk"]=470000, + ["hp"]=37000000, + ["atk"]=790000, ["atk_times"]=4, ["hurt_skill"]=1000000, ["skill"]={ @@ -1219,32 +1219,32 @@ local monster_chapter = { }, [13601]={ ["monster_base"]=10012, - ["hp"]=14000000, - ["atk"]=430000, + ["hp"]=21500000, + ["atk"]=760000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=9000 }, [13701]={ ["monster_base"]=10017, - ["hp"]=17000000, - ["atk"]=490000, + ["hp"]=26200000, + ["atk"]=850000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=10000 }, [13801]={ ["monster_base"]=10014, - ["hp"]=19000000, - ["atk"]=450000, + ["hp"]=29100000, + ["atk"]=780000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [13901]={ ["monster_base"]=10016, - ["hp"]=22000000, - ["atk"]=510000, + ["hp"]=33800000, + ["atk"]=880000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=12000 @@ -1252,8 +1252,8 @@ local monster_chapter = { [14001]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=38000000, - ["atk"]=570000, + ["hp"]=53300000, + ["atk"]=870000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -1265,32 +1265,32 @@ local monster_chapter = { }, [14101]={ ["monster_base"]=10010, - ["hp"]=30000000, - ["atk"]=530000, + ["hp"]=42100000, + ["atk"]=840000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, [14201]={ ["monster_base"]=10003, - ["hp"]=33000000, - ["atk"]=550000, + ["hp"]=46400000, + ["atk"]=870000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=18000 }, [14301]={ ["monster_base"]=10009, - ["hp"]=36000000, - ["atk"]=570000, + ["hp"]=50400000, + ["atk"]=900000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=21000 }, [14401]={ ["monster_base"]=10011, - ["hp"]=39000000, - ["atk"]=590000, + ["hp"]=54600000, + ["atk"]=920000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=22000 @@ -1298,8 +1298,8 @@ local monster_chapter = { [14501]={ ["monster_base"]=20004, ["is_boss"]=1, - ["hp"]=71000000, - ["atk"]=590000, + ["hp"]=99300000, + ["atk"]=900000, ["atk_times"]=4, ["hurt_skill"]=1000000, ["skill"]={ @@ -1309,32 +1309,32 @@ local monster_chapter = { }, [14601]={ ["monster_base"]=10015, - ["hp"]=47000000, - ["atk"]=610000, + ["hp"]=65900000, + ["atk"]=950000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=15000 }, [14701]={ ["monster_base"]=10017, - ["hp"]=50000000, - ["atk"]=630000, + ["hp"]=70000000, + ["atk"]=970000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, [14801]={ ["monster_base"]=10014, - ["hp"]=55000000, - ["atk"]=650000, + ["hp"]=77000000, + ["atk"]=1000000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, [14901]={ ["monster_base"]=10018, - ["hp"]=60000000, - ["atk"]=670000, + ["hp"]=84000000, + ["atk"]=1030000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 @@ -1342,8 +1342,8 @@ local monster_chapter = { [15001]={ ["monster_base"]=20003, ["is_boss"]=2, - ["hp"]=95000000, - ["atk"]=920000, + ["hp"]=138100000, + ["atk"]=1400000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -1354,32 +1354,32 @@ local monster_chapter = { }, [15101]={ ["monster_base"]=10012, - ["hp"]=6400000, - ["atk"]=350000, + ["hp"]=10900000, + ["atk"]=720000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [15201]={ ["monster_base"]=10017, - ["hp"]=8000000, - ["atk"]=370000, + ["hp"]=13700000, + ["atk"]=750000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [15301]={ ["monster_base"]=10014, - ["hp"]=9600000, - ["atk"]=390000, + ["hp"]=16400000, + ["atk"]=780000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, [15401]={ ["monster_base"]=10016, - ["hp"]=11000000, - ["atk"]=410000, + ["hp"]=18700000, + ["atk"]=820000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=19000 @@ -1387,8 +1387,8 @@ local monster_chapter = { [15501]={ ["monster_base"]=20005, ["is_boss"]=1, - ["hp"]=24000000, - ["atk"]=470000, + ["hp"]=40400000, + ["atk"]=880000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -1400,32 +1400,32 @@ local monster_chapter = { }, [15601]={ ["monster_base"]=10007, - ["hp"]=14000000, - ["atk"]=430000, + ["hp"]=23500000, + ["atk"]=850000, ["atk_times"]=3, ["hurt_skill"]=1000000, ["monster_exp"]=9000 }, [15701]={ ["monster_base"]=10011, - ["hp"]=17000000, - ["atk"]=490000, + ["hp"]=28700000, + ["atk"]=950000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=10000 }, [15801]={ ["monster_base"]=10012, - ["hp"]=19000000, - ["atk"]=450000, + ["hp"]=31800000, + ["atk"]=880000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=11000 }, [15901]={ ["monster_base"]=10016, - ["hp"]=22000000, - ["atk"]=510000, + ["hp"]=36900000, + ["atk"]=980000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=12000 @@ -1433,8 +1433,8 @@ local monster_chapter = { [16001]={ ["monster_base"]=20007, ["is_boss"]=1, - ["hp"]=38000000, - ["atk"]=570000, + ["hp"]=60100000, + ["atk"]=990000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -1445,32 +1445,32 @@ local monster_chapter = { }, [16101]={ ["monster_base"]=10015, - ["hp"]=30000000, - ["atk"]=530000, + ["hp"]=47500000, + ["atk"]=970000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, [16201]={ ["monster_base"]=10017, - ["hp"]=33000000, - ["atk"]=550000, + ["hp"]=52300000, + ["atk"]=1000000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=18000 }, [16301]={ ["monster_base"]=10014, - ["hp"]=36000000, - ["atk"]=570000, + ["hp"]=56800000, + ["atk"]=1030000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=21000 }, [16401]={ ["monster_base"]=10018, - ["hp"]=39000000, - ["atk"]=590000, + ["hp"]=61600000, + ["atk"]=1060000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=22000 @@ -1478,8 +1478,8 @@ local monster_chapter = { [16501]={ ["monster_base"]=20008, ["is_boss"]=1, - ["hp"]=71000000, - ["atk"]=590000, + ["hp"]=118000000, + ["atk"]=1080000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ @@ -1492,32 +1492,32 @@ local monster_chapter = { }, [16601]={ ["monster_base"]=10004, - ["hp"]=47000000, - ["atk"]=610000, + ["hp"]=80900000, + ["atk"]=1190000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=15000 }, [16701]={ ["monster_base"]=10002, - ["hp"]=50000000, - ["atk"]=630000, + ["hp"]=85900000, + ["atk"]=1210000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=16000 }, [16801]={ ["monster_base"]=10011, - ["hp"]=55000000, - ["atk"]=650000, + ["hp"]=94500000, + ["atk"]=1250000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 }, [16901]={ ["monster_base"]=10013, - ["hp"]=60000000, - ["atk"]=670000, + ["hp"]=103100000, + ["atk"]=1290000, ["atk_times"]=3, ["hurt_skill"]=1000001, ["monster_exp"]=17000 @@ -1525,8 +1525,8 @@ local monster_chapter = { [17001]={ ["monster_base"]=20003, ["is_boss"]=2, - ["hp"]=95000000, - ["atk"]=920000, + ["hp"]=177600000, + ["atk"]=1820000, ["atk_times"]=4, ["hurt_skill"]=1000001, ["skill"]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index ce44ec0a..292a13f8 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -292,7 +292,7 @@ local skill = { ["effect"]={ { ["type"]="hurt_yellow", - ["num"]=20000, + ["num"]=30000, ["ratio"]=10000, ["round"]=0 } @@ -336,7 +336,7 @@ local skill = { ["effect"]={ { ["type"]="hurt_yellow", - ["num"]=20000, + ["num"]=30000, ["ratio"]=10000, ["round"]=0 } @@ -481,7 +481,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=2000, + ["num"]=8000, ["ratio"]=10000, ["round"]=1 } @@ -771,7 +771,7 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=40000, ["ratio"]=10000, ["round"]=0 } @@ -903,7 +903,7 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=25000, ["ratio"]=10000, ["round"]=0 } @@ -1118,7 +1118,7 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=25000, ["ratio"]=10000, ["round"]=0 } diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 16543726..0160c3ce 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -652,7 +652,7 @@ local skill_rogue = { }, [200100]={ ["limit_times"]=1, - ["weight"]=4000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -712,7 +712,7 @@ local skill_rogue = { }, [200200]={ ["limit_times"]=1, - ["weight"]=4000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -771,7 +771,7 @@ local skill_rogue = { }, [200300]={ ["limit_times"]=1, - ["weight"]=4000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, @@ -818,7 +818,7 @@ local skill_rogue = { }, [200400]={ ["limit_times"]=1, - ["weight"]=4000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=5, @@ -858,7 +858,7 @@ local skill_rogue = { }, [200500]={ ["limit_times"]=1, - ["weight"]=4000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=1, @@ -918,7 +918,7 @@ local skill_rogue = { }, [200600]={ ["limit_times"]=1, - ["weight"]=4000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=3, @@ -968,7 +968,7 @@ local skill_rogue = { }, [200700]={ ["limit_times"]=1, - ["weight"]=4000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=2, @@ -1015,7 +1015,7 @@ local skill_rogue = { }, [200800]={ ["limit_times"]=1, - ["weight"]=4000, + ["weight"]=30000, ["qlt"]=4, ["type"]=6, ["skill_position"]=4, diff --git a/lua/app/config/strings/cn/chapter.lua b/lua/app/config/strings/cn/chapter.lua index 5c84409c..03e39e04 100644 --- a/lua/app/config/strings/cn/chapter.lua +++ b/lua/app/config/strings/cn/chapter.lua @@ -1,33 +1,33 @@ local chapter = { [1]={ - ["name"]="第1关" + ["name"]="1.废弃小镇" }, [2]={ - ["name"]="第2关" + ["name"]="2.小镇幽径" }, [3]={ - ["name"]="第3关" + ["name"]="3.小镇矿山" }, [4]={ - ["name"]="第4关" + ["name"]="4.幽深丛林" }, [5]={ - ["name"]="第5关" + ["name"]="5.碎石溪岸（西）" }, [6]={ - ["name"]="第6关" + ["name"]="6.碎石溪岸（东）" }, [7]={ - ["name"]="第7关" + ["name"]="7.城堡外围" }, [8]={ - ["name"]="第8关" + ["name"]="8.城堡大门" }, [9]={ - ["name"]="第9关" + ["name"]="9.城堡内部" }, [10]={ - ["name"]="第10关" + ["name"]="10.城堡深处" } } local config = { diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 5e9137c6..50914de2 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -24,35 +24,35 @@ local item = { ["desc"]="可以获得史诗英雄。" }, [12001]={ - ["name"]="洛克西", + ["name"]="洛克西英雄碎片", ["desc"]="凑齐可解锁或升级。" }, [22001]={ - ["name"]="卡拉", + ["name"]="卡拉英雄碎片", ["desc"]="凑齐可解锁或升级。" }, [23001]={ - ["name"]="巨剑罗伯特", + ["name"]="巨剑罗伯特英雄碎片", ["desc"]="凑齐可解锁或升级。" }, [32001]={ - ["name"]="阿斯克", + ["name"]="阿斯克英雄碎片", ["desc"]="凑齐可解锁或升级。" }, [33001]={ - ["name"]="艾芙琳", + ["name"]="艾芙琳英雄碎片", ["desc"]="凑齐可解锁或升级。" }, [42001]={ - ["name"]="莉莉丝", + ["name"]="莉莉丝英雄碎片", ["desc"]="凑齐可解锁或升级。" }, [43001]={ - ["name"]="白发凯瑟琳", + ["name"]="白发凯瑟琳英雄碎片", ["desc"]="凑齐可解锁或升级。" }, [52001]={ - ["name"]="艾伦", + ["name"]="艾伦英雄碎片", ["desc"]="凑齐可解锁或升级。" } } diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index c6c34daf..7d9c92e0 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -131,6 +131,9 @@ local skill_rogue = { [44]={ ["desc"]="将场上随机5个非紫色元素变为紫色" }, + [200100]={ + ["desc"]="长枪突刺：将上下2格元素进行消除" + }, [200101]={ ["desc"]="长枪突刺可上下多消1格" }, @@ -140,6 +143,9 @@ local skill_rogue = { [200103]={ ["desc"]="连接长枪突刺每次攻击有10%概率眩晕对手1回合。" }, + [200200]={ + ["desc"]="拔刀斩：卡拉可造成大量伤害" + }, [200201]={ ["desc"]="拔刀斩被连接时其上下左右4个元素变为金色元素" }, @@ -149,6 +155,9 @@ local skill_rogue = { [200203]={ ["desc"]="拔刀斩终结技可放2次" }, + [200300]={ + ["desc"]="元素链接：随机额外消除2个元素" + }, [200301]={ ["desc"]="元素链接可与任何颜色链接" }, @@ -158,6 +167,9 @@ local skill_rogue = { [200303]={ ["desc"]="元素链接随机消除元素增加2个" }, + [200400]={ + ["desc"]="魔法罩：艾伦可生成一个魔法罩持续1回合" + }, [200401]={ ["desc"]="魔法罩可与任何颜色链接" }, @@ -167,6 +179,9 @@ local skill_rogue = { [200403]={ ["desc"]="生成的魔法罩如果没有破可以额外持续1回合" }, + [200500]={ + ["desc"]="舞步消散：将左右2格元素进行消除" + }, [200501]={ ["desc"]="舞步消散左右可多消1格" }, @@ -176,6 +191,9 @@ local skill_rogue = { [200503]={ ["desc"]="每有1个元素连接舞步消散则本回合格挡增加2%" }, + [200600]={ + ["desc"]="快速治愈：莉莉丝可恢复20%生命值" + }, [200601]={ ["desc"]="快速治愈可与任何元素连接" }, @@ -185,6 +203,9 @@ local skill_rogue = { [200603]={ ["desc"]="连接快速治愈的每一击都将恢复2%生命值" }, + [200700]={ + ["desc"]="巨剑连斩：每一次攻击的伤害将增加50%" + }, [200701]={ ["desc"]="疾风骤雨被连接时其上下左右4个元素变为金色元素" }, @@ -194,6 +215,9 @@ local skill_rogue = { [200703]={ ["desc"]="疾风骤雨被连接时周围8格元素变为金色元素" }, + [200800]={ + ["desc"]="霜冻剑舞：白发凯瑟琳可额外造成1次伤害并给敌人1回合冰霜效果（普攻次数-1）" + }, [200801]={ ["desc"]="霜冻剑舞被使用时可消除掉其上下左右4个元素" }, @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skill_rogue.lua b/lua/app/config/strings/de/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/de/skill_rogue.lua +++ b/lua/app/config/strings/de/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skill_rogue.lua b/lua/app/config/strings/fr/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/fr/skill_rogue.lua +++ b/lua/app/config/strings/fr/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skill_rogue.lua b/lua/app/config/strings/ru/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/ru/skill_rogue.lua +++ b/lua/app/config/strings/ru/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 1981a410..1edf592a 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -130,6 +130,9 @@ local skill_rogue = { }, [44]={ + }, + [200100]={ + }, [200101]={ @@ -139,6 +142,9 @@ local skill_rogue = { }, [200103]={ + }, + [200200]={ + }, [200201]={ @@ -148,6 +154,9 @@ local skill_rogue = { }, [200203]={ + }, + [200300]={ + }, [200301]={ @@ -157,6 +166,9 @@ local skill_rogue = { }, [200303]={ + }, + [200400]={ + }, [200401]={ @@ -166,6 +178,9 @@ local skill_rogue = { }, [200403]={ + }, + [200500]={ + }, [200501]={ @@ -175,6 +190,9 @@ local skill_rogue = { }, [200503]={ + }, + [200600]={ + }, [200601]={ @@ -184,6 +202,9 @@ local skill_rogue = { }, [200603]={ + }, + [200700]={ + }, [200701]={ @@ -193,6 +214,9 @@ local skill_rogue = { }, [200703]={ + }, + [200800]={ + }, [200801]={ @@ -205,6 +229,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/struct.lua b/lua/app/config/struct.lua index a263a383..524ca5be 100644 --- a/lua/app/config/struct.lua +++ b/lua/app/config/struct.lua @@ -4,9 +4,11 @@ local struct = { ["parameter2"]="id:int", ["parameter3"]="num:int" }, - ["hero_drop"]={ - ["parameter1"]="id:int", - ["parameter2"]="weight:int" + ["drop"]={ + ["parameter1"]="type:int", + ["parameter2"]="id:int", + ["parameter3"]="num:int", + ["parameter4"]="weight:int" }, ["boardrange"]={ ["parameter1"]="type:int", diff --git a/lua/app/module/maincity/maincity_manager.lua b/lua/app/module/maincity/maincity_manager.lua index 4cb3c5a1..2131c180 100644 --- a/lua/app/module/maincity/maincity_manager.lua +++ b/lua/app/module/maincity/maincity_manager.lua @@ -6,7 +6,7 @@ end -- 从登录界面第一次进入主城 function MaincityManager:firstEnterMainCity() - if not DataManager.TutorialData:getIsFuncTutorialFinished(GConst.TutorialConst.START_TUTORIAL) then + if ModuleManager.TutorialManager:checkFuncTutorial(GConst.TutorialConst.START_TUTORIAL, true) then DataManager.ChapterData:setChapterId(DataManager.ChapterData.MIN_CHAPTER_ID) ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.STAGE) else diff --git a/lua/app/server/data/server_tutorial_data.lua b/lua/app/server/data/server_tutorial_data.lua index 34497b40..0a240513 100644 --- a/lua/app/server/data/server_tutorial_data.lua +++ b/lua/app/server/data/server_tutorial_data.lua @@ -9,6 +9,7 @@ function ServerTutorialData:init(data) end function ServerTutorialData:markGuide(id) + id = tostring(id) if not id then return end diff --git a/lua/app/userdata/tutorial/tutorial_data.lua b/lua/app/userdata/tutorial/tutorial_data.lua index c84db343..86f6f049 100644 --- a/lua/app/userdata/tutorial/tutorial_data.lua +++ b/lua/app/userdata/tutorial/tutorial_data.lua @@ -24,7 +24,10 @@ function TutorialData:init(data) self.funcTutorialMap = {} if data.markedGuide then for k,v in pairs(data.markedGuide) do - self.funcTutorialMap[k] = v + local id = tonumber(k) + if id then + self.funcTutorialMap[id] = v + end end end end