diff --git a/lua/app/config/chapter_board.lua b/lua/app/config/chapter_board.lua index 471d1e5f..239daf75 100644 --- a/lua/app/config/chapter_board.lua +++ b/lua/app/config/chapter_board.lua @@ -1,34 +1,6 @@ local chapter_board = { [1]={ ["board"]={ - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 - }, - { - 0, - 2 - }, - { - 0, - 2 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, { 1, 0 @@ -43,36 +15,36 @@ local chapter_board = { }, { 0, - 3 - }, - { - 0, - 3 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 1, - 0 - }, - { - 0, - 3 + 2 }, { 0, 2 }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 0, + 3 + }, + { + 0, + 4 + }, { 0, 4 @@ -121,6 +93,34 @@ local chapter_board = { 1, 0 }, + { + 0, + 3 + }, + { + 0, + 2 + }, + { + 0, + 4 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, + { + 1, + 0 + }, { 1, 0 @@ -210,6 +210,7 @@ local chapter_board = { 2, 2, 2, + 2, 2 } }, diff --git a/lua/app/config/monster_chapter.lua b/lua/app/config/monster_chapter.lua index 3a5c5524..98b0212d 100644 --- a/lua/app/config/monster_chapter.lua +++ b/lua/app/config/monster_chapter.lua @@ -414,9 +414,9 @@ local monster_chapter = { ["atk"]=290000, ["atk_times"]=3, ["hurt_skill"]={ - 10004, - 10005, - 10006 + 10015, + 10016, + 10017 }, ["monster_exp"]=17000 }, @@ -629,7 +629,9 @@ local monster_chapter = { ["atk"]=550000, ["atk_times"]=4, ["hurt_skill"]={ - 1000001 + 10063, + 10064, + 10065 }, ["skill"]={ 10068, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 8979678f..0160c3ce 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -724,7 +724,7 @@ local skill_rogue = { ["qlt"]=3, ["type"]=1, ["parameter"]={ - 2200121 + 220012 }, ["skill_position"]=2, ["icon"]="34" @@ -755,13 +755,13 @@ local skill_rogue = { ["effect"]={ { ["type"]="skill_fire_times", - ["num"]=2200120, + ["num"]=220011, ["ratio"]=10000, ["round"]=1 }, { ["type"]="skill_fire_times", - ["num"]=2200121, + ["num"]=220012, ["ratio"]=10000, ["round"]=1 } @@ -980,7 +980,7 @@ local skill_rogue = { ["qlt"]=3, ["type"]=1, ["parameter"]={ - 2300121 + 230012 }, ["skill_position"]=2, ["icon"]="49" @@ -1008,7 +1008,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=1, ["parameter"]={ - 2300122 + 230013 }, ["skill_position"]=2, ["icon"]="51" @@ -1027,7 +1027,7 @@ local skill_rogue = { ["qlt"]=3, ["type"]=1, ["parameter"]={ - 4300121 + 430012 }, ["skill_position"]=4, ["icon"]="52" diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index af73b73f..02d01e13 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -2,10 +2,11 @@ local tutorial = { [10000]={ ["next_id"]=10010, ["type"]=6, + ["finish"]=4, ["target_element"]={ - 53, - 44, - 45 + 13, + 24, + 25 }, ["arrow_offset"]={ 0, @@ -25,21 +26,28 @@ local tutorial = { }, [10030]={ ["next_id"]=10040, - ["type"]=5, - ["finish"]=2, - ["finish_parameter"]=1 + ["type"]=2, + ["target_name"]="battle_skill_select_ui(Clone)/skill_node/skill_select_cell_1", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 500, + 250 + } }, [10040]={ ["next_id"]=10050, ["type"]=6, + ["finish"]=4, ["target_element"]={ - 33, - 23, 13, - 14, - 15, + 24, 25, - 35 + 34, + 44 }, ["arrow_offset"]={ 0, @@ -52,13 +60,30 @@ local tutorial = { ["finish"]=3 }, [10060]={ + ["next_id"]=10070, ["type"]=6, + ["finish"]=4, ["target_element"]={ - 23, 13, 14, 15, - 25 + 24, + 34 + }, + ["arrow_offset"]={ + 0, + 0 + } + }, + [10070]={ + ["type"]=6, + ["finish"]=4, + ["target_element"]={ + 13, + 14, + 15, + 24, + 34 }, ["arrow_offset"]={ 0, @@ -181,9 +206,170 @@ local tutorial = { 0, 0 } + }, + [30000]={ + ["next_id"]=30010, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_1", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=2, + ["circle_r"]=100, + ["circle_offset"]={ + 0, + 0 + } + }, + [30010]={ + ["next_id"]=30020, + ["type"]=4, + ["finish"]=1, + ["finish_parameter"]=2 + }, + [30020]={ + ["next_id"]=30030, + ["type"]=5, + ["finish"]=2, + ["finish_parameter"]=2 + }, + [30030]={ + ["next_id"]=30040, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/hero_bg/hero_cell_2", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 100, + 300 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [30040]={ + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/bg/up_btn", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 200, + 100 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [40000]={ + ["next_id"]=40010, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_2", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=2, + ["circle_r"]=100, + ["circle_offset"]={ + 0, + 0 + } + }, + [40010]={ + ["next_id"]=40020, + ["type"]=4, + ["finish"]=1, + ["finish_parameter"]=2 + }, + [40020]={ + ["next_id"]=40030, + ["type"]=5, + ["finish"]=2, + ["finish_parameter"]=2 + }, + [40030]={ + ["next_id"]=40040, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_5", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 100, + 300 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [40040]={ + ["next_id"]=40050, + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/bg/up_btn", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 200, + 100 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [40050]={ + ["next_id"]=40060, + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/bg/back_btn", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1 + }, + [40060]={ + ["next_id"]=40070, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_5", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 100, + 300 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [40070]={ + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn", + ["arrow_offset"]={ + 0, + 0 + } } } local config = { -data=tutorial,count=16 +data=tutorial,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/tutorial_start.lua b/lua/app/config/tutorial_start.lua index 2dc26d2c..23cb7c9f 100644 --- a/lua/app/config/tutorial_start.lua +++ b/lua/app/config/tutorial_start.lua @@ -8,10 +8,12 @@ local tutorial_start = { ["uires_path"]="Assets/prefabs/ui/main_city/main_ui.prefab" }, [3]={ - ["start_id"]=30000 + ["start_id"]=30000, + ["uires_path"]="Assets/prefabs/ui/main_city/main_ui.prefab" }, [4]={ - ["start_id"]=40000 + ["start_id"]=40000, + ["uires_path"]="Assets/prefabs/ui/main_city/main_ui.prefab" } } local config = {