diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 6be57c39..e46376fe 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -8250,7 +8250,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=5500202, + ["sound"]=5500201, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -8277,7 +8277,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=5500203, + ["sound"]=5500201, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -8304,7 +8304,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, - ["sound"]=5500204, + ["sound"]=5500201, ["name_act"]="attack04", ["name_hit"]={ "suffer02" @@ -10384,6 +10384,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20001001, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -10408,6 +10409,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20001002, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -10432,6 +10434,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20001003, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -10459,6 +10462,7 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, + ["sound"]=20001004, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -10503,6 +10507,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20002001, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -10527,6 +10532,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20002002, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -10551,6 +10557,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20002003, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -10578,6 +10585,7 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=6, + ["sound"]=20002004, ["name_act"]="skill01", ["name_hit"]={ "suffer03" @@ -10607,6 +10615,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20030001, ["name_act"]="attack01", ["name_hit"]={ "suffer01" @@ -10631,6 +10640,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20030002, ["name_act"]="attack02", ["name_hit"]={ "suffer02" @@ -10655,6 +10665,7 @@ local skill = { }, ["shake_time"]=100, ["shake_type"]=1, + ["sound"]=20030003, ["name_act"]="attack03", ["name_hit"]={ "suffer01" @@ -10704,6 +10715,7 @@ local skill = { ["cd_start"]=0, ["shake_time"]=200, ["shake_type"]=5, + ["sound"]=20030004, ["name_act"]="skill01", ["name_hit"]={ "suffer01", diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index a0d679c7..3e7d7969 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -26,7 +26,7 @@ local skill_rogue = { ["effect"]={ { ["type"]="random_universal", - ["num"]=2000, + ["num"]=1000, ["ratio"]=10000, ["round"]=9999999 } diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index e611b2a6..4ab0afa2 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -352,32 +352,32 @@ local skill_rogue = { ["rougedesc"]="过热小莫攻击提升15%" }, [1500111]={ - ["desc"]="火花姬周围变色元素+2", + ["desc"]="火花姬技能将周围2个元素变色", ["entry_1"]="战斗中直接生效！", ["entry_2"]="变色元素+2", ["entry_3"]="变色元素+2", - ["rougedesc"]="火花姬周围变色元素+2" + ["rougedesc"]="火花姬技能将周围2个元素变色" }, [1500112]={ - ["desc"]="火花姬周围变色元素+2", + ["desc"]="火花姬技能将周围2个元素变色", ["entry_1"]="战斗中直接生效！", ["entry_2"]="变色元素+2", ["entry_3"]="变色元素+2", - ["rougedesc"]="火花姬周围变色元素+2" + ["rougedesc"]="火花姬技能将周围2个元素变色" }, [1500113]={ - ["desc"]="火花姬周围变色元素+2", + ["desc"]="火花姬技能将周围2个元素变色", ["entry_1"]="战斗中直接生效！", ["entry_2"]="变色元素+2", ["entry_3"]="变色元素+2", - ["rougedesc"]="火花姬周围变色元素+4" + ["rougedesc"]="火花姬技能将周围4个元素变色" }, [1500114]={ - ["desc"]="火花姬周围变色元素+2", + ["desc"]="火花姬技能将周围2个元素变色", ["entry_1"]="战斗中直接生效！", ["entry_2"]="变色元素+2", ["entry_3"]="变色元素+2", - ["rougedesc"]="火花姬周围变色元素+6" + ["rougedesc"]="火花姬技能将周围6个元素变色" }, [1500121]={ ["desc"]="火花姬技能附加的自愈效果回合数+1", diff --git a/lua/app/config/strings/cn/tutorial.lua b/lua/app/config/strings/cn/tutorial.lua index 42b81a09..af548451 100644 --- a/lua/app/config/strings/cn/tutorial.lua +++ b/lua/app/config/strings/cn/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ ["value"]="每天都有1次免费召唤。" + }, + ["tutorial_txt_16"]={ + ["value"]="领取宝箱，解锁第5位英雄" + }, + ["tutorial_txt_17"]={ + ["value"]="队伍整齐了，回到主线继续吧！" } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/tutorial.lua b/lua/app/config/strings/de/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/de/tutorial.lua +++ b/lua/app/config/strings/de/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/tutorial.lua b/lua/app/config/strings/en/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/en/tutorial.lua +++ b/lua/app/config/strings/en/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/tutorial.lua b/lua/app/config/strings/es/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/es/tutorial.lua +++ b/lua/app/config/strings/es/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/tutorial.lua b/lua/app/config/strings/fr/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/fr/tutorial.lua +++ b/lua/app/config/strings/fr/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/tutorial.lua b/lua/app/config/strings/id/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/id/tutorial.lua +++ b/lua/app/config/strings/id/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/tutorial.lua b/lua/app/config/strings/ja/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/ja/tutorial.lua +++ b/lua/app/config/strings/ja/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/tutorial.lua b/lua/app/config/strings/ko/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/ko/tutorial.lua +++ b/lua/app/config/strings/ko/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/tutorial.lua b/lua/app/config/strings/pt/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/pt/tutorial.lua +++ b/lua/app/config/strings/pt/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/tutorial.lua b/lua/app/config/strings/ru/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/ru/tutorial.lua +++ b/lua/app/config/strings/ru/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/tutorial.lua b/lua/app/config/strings/th/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/th/tutorial.lua +++ b/lua/app/config/strings/th/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/tutorial.lua b/lua/app/config/strings/vi/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/vi/tutorial.lua +++ b/lua/app/config/strings/vi/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/tutorial.lua b/lua/app/config/strings/zh/tutorial.lua index e28ff582..418ff9de 100644 --- a/lua/app/config/strings/zh/tutorial.lua +++ b/lua/app/config/strings/zh/tutorial.lua @@ -43,9 +43,15 @@ local tutorial = { }, ["tutorial_txt_15"]={ + }, + ["tutorial_txt_16"]={ + + }, + ["tutorial_txt_17"]={ + } } local config = { -data=tutorial,count=15 +data=tutorial,count=17 } return config \ No newline at end of file diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index 7465b7a8..e1dd2d98 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -187,7 +187,7 @@ local tutorial = { ["txt"]="tutorial_txt_3", ["txt_offset"]={ 0, - 180 + 0 }, ["target_name"]="hero_detail_ui(Clone)/middle/hero_info/up/up_5_btn", ["arrow_direction"]=2, @@ -573,9 +573,123 @@ local tutorial = { 0, -50 } + }, + [70000]={ + ["next_id"]=70010, + ["type"]=3, + ["txt"]="tutorial_txt_16", + ["txt_offset"]={ + 0, + 180 + }, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/middle_bg/box_btn", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + -50 + }, + ["show_mask"]=2, + ["circle_r"]=100, + ["circle_offset"]={ + 0, + 0 + } + }, + [70010]={ + ["next_id"]=70020, + ["type"]=4, + ["finish"]=1, + ["finish_parameter"]=2 + }, + [70020]={ + ["next_id"]=70030, + ["type"]=5, + ["finish"]=2, + ["finish_parameter"]=2 + }, + [70030]={ + ["next_id"]=70040, + ["type"]=2, + ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", + ["arrow_direction"]=2, + ["arrow_offset"]={ + 0, + 50 + }, + ["show_mask"]=1, + ["square_size"]={ + 50, + 50 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [70040]={ + ["next_id"]=70050, + ["type"]=2, + ["heroid"]=53001, + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + -100 + }, + ["show_mask"]=1, + ["square_size"]={ + 25, + 50 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [70050]={ + ["next_id"]=70060, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/bottom_bg/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + 0 + } + }, + [70060]={ + ["next_id"]=70070, + ["type"]=3, + ["txt"]="tutorial_txt_17", + ["txt_offset"]={ + 0, + 40 + }, + ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_3", + ["arrow_direction"]=2, + ["arrow_offset"]={ + 0, + 40 + }, + ["show_mask"]=1, + ["square_size"]={ + 50, + 50 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [70070]={ + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/fight_btn", + ["arrow_direction"]=1, + ["arrow_offset"]={ + 0, + -40 + } } } local config = { -data=tutorial,count=40 +data=tutorial,count=48 } 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 50ad3da0..fd87bac8 100644 --- a/lua/app/config/tutorial_start.lua +++ b/lua/app/config/tutorial_start.lua @@ -22,9 +22,13 @@ local tutorial_start = { [6]={ ["start_id"]=60000, ["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab" + }, + [7]={ + ["start_id"]=70000, + ["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab" } } local config = { -data=tutorial_start,count=6 +data=tutorial_start,count=7 } return config \ No newline at end of file