puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
CloudJ 2023-05-29 15:38:15 +08:00
commit 0faa73f5f2
28 changed files with 7019 additions and 6805 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lua/app/config/buff.lua
View File

@ -269,7 +269,7 @@ local buff = {
["buff_type"]=1, ["buff_type"]=1,
["stack"]=2, ["stack"]=2,
["decr"]=1, ["decr"]=1,
["icon"]="normal_attack_dec" ["icon"]="high"
}, },
[38]={ [38]={
["name"]="block", ["name"]="block",
@ -343,19 +343,19 @@ local buff = {
["stack"]=1, ["stack"]=1,
["decr"]=2, ["decr"]=2,
["formula"]=4, ["formula"]=4,
["icon"]="shield" ["icon"]="burn"
}, },
[49]={ [49]={
["name"]="vulnerable", ["name"]="vulnerable",
["buff_type"]=1, ["buff_type"]=1,
["decr"]=2, ["decr"]=2,
["icon"]="shield" ["icon"]="vulnerable"
}, },
[50]={ [50]={
["name"]="frozen", ["name"]="frozen",
["buff_type"]=7, ["buff_type"]=7,
["decr"]=2, ["decr"]=2,
["icon"]="shield", ["icon"]="frozen",
["control_priority"]=1 ["control_priority"]=1
}, },
[51]={ [51]={
@ -364,59 +364,59 @@ local buff = {
["stack"]=2, ["stack"]=2,
["decr"]=2, ["decr"]=2,
["formula"]=4, ["formula"]=4,
["icon"]="shield" ["icon"]="poison"
}, },
[52]={ [52]={
["name"]="imprison", ["name"]="imprison",
["buff_type"]=7, ["buff_type"]=7,
["decr"]=2, ["decr"]=2,
["icon"]="shield", ["icon"]="imprison",
["control_priority"]=4 ["control_priority"]=4
}, },
[53]={ [53]={
["name"]="corrupt", ["name"]="corrupt",
["buff_type"]=1, ["buff_type"]=1,
["decr"]=2, ["decr"]=2,
["icon"]="shield" ["icon"]="corrupt"
}, },
[54]={ [54]={
["name"]="bleed", ["name"]="bleed",
["buff_type"]=7, ["buff_type"]=7,
["decr"]=2, ["decr"]=2,
["formula"]=4, ["formula"]=4,
["icon"]="shield" ["icon"]="bleed"
}, },
[55]={ [55]={
["name"]="weaken", ["name"]="weaken",
["buff_type"]=1, ["buff_type"]=1,
["decr"]=2, ["decr"]=2,
["icon"]="shield" ["icon"]="weaken"
}, },
[56]={ [56]={
["name"]="lethargy", ["name"]="lethargy",
["buff_type"]=8, ["buff_type"]=8,
["stack"]=1, ["stack"]=1,
["decr"]=2, ["decr"]=2,
["icon"]="shield", ["icon"]="lethargy",
["control_priority"]=3 ["control_priority"]=3
}, },
[57]={ [57]={
["name"]="curse", ["name"]="curse",
["buff_type"]=1, ["buff_type"]=1,
["decr"]=2, ["decr"]=2,
["icon"]="shield" ["icon"]="curse"
}, },
[58]={ [58]={
["name"]="lock", ["name"]="lock",
["buff_type"]=7, ["buff_type"]=7,
["decr"]=2, ["decr"]=2,
["icon"]="shield" ["icon"]="lock"
}, },
[59]={ [59]={
["name"]="first_hand", ["name"]="first_hand",
["buff_type"]=1, ["buff_type"]=1,
["decr"]=1, ["decr"]=1,
["icon"]="shield" ["icon"]="first_hand"
}, },
[60]={ [60]={
["name"]="skill_hurt_add", ["name"]="skill_hurt_add",
@ -428,20 +428,20 @@ local buff = {
["name"]="undead", ["name"]="undead",
["buff_type"]=7, ["buff_type"]=7,
["decr"]=1, ["decr"]=1,
["icon"]="shield" ["icon"]="undead"
}, },
[62]={ [62]={
["name"]="counterattack", ["name"]="counterattack",
["buff_type"]=1, ["buff_type"]=1,
["stack"]=1, ["stack"]=1,
["decr"]=1, ["decr"]=1,
["icon"]="shield" ["icon"]="counterattack"
}, },
[63]={ [63]={
["name"]="thorns", ["name"]="thorns",
["buff_type"]=1, ["buff_type"]=1,
["decr"]=1, ["decr"]=1,
["icon"]="shield" ["icon"]="thorns"
}, },
[64]={ [64]={
["name"]="dmg_dec_red_add", ["name"]="dmg_dec_red_add",

102
lua/app/config/buff_daily_challenge.lua
View File

@ -69,10 +69,10 @@ local buff_daily_challenge = {
["buff_type"]=1, ["buff_type"]=1,
["effect"]={ ["effect"]={
{ {
["type"]="shield", ["type"]="wavehealp",
["num"]=10000, ["num"]=100,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999 ["round"]=0
} }
}, },
["obj"]=1 ["obj"]=1
@ -81,27 +81,15 @@ local buff_daily_challenge = {
["buff_type"]=1, ["buff_type"]=1,
["effect"]={ ["effect"]={
{ {
["type"]="wavehealp", ["type"]="cured_add",
["num"]=100, ["num"]=500,
["ratio"]=10000, ["ratio"]=500,
["round"]=0 ["round"]=999
} }
}, },
["obj"]=1 ["obj"]=1
}, },
[8]={ [8]={
["buff_type"]=1,
["effect"]={
{
["type"]="cured_add",
["num"]=500,
["ratio"]=500,
["round"]=999
}
},
["obj"]=1
},
[9]={
["buff_type"]=1, ["buff_type"]=1,
["effect"]={ ["effect"]={
{ {
@ -113,31 +101,7 @@ local buff_daily_challenge = {
}, },
["obj"]=1 ["obj"]=1
}, },
[10]={ [9]={
["buff_type"]=1,
["effect"]={
{
["type"]="cured_add",
["num"]=500,
["ratio"]=500,
["round"]=999
}
},
["obj"]=1
},
[11]={
["buff_type"]=2,
["effect"]={
{
["type"]="hpp_add",
["num"]=2000,
["ratio"]=1000,
["round"]=999
}
},
["obj"]=2
},
[12]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
@ -149,7 +113,7 @@ local buff_daily_challenge = {
}, },
["obj"]=2 ["obj"]=2
}, },
[13]={ [10]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
@ -161,7 +125,7 @@ local buff_daily_challenge = {
}, },
["obj"]=2 ["obj"]=2
}, },
[14]={ [11]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
@ -173,7 +137,7 @@ local buff_daily_challenge = {
}, },
["obj"]=2 ["obj"]=2
}, },
[15]={ [12]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
@ -185,7 +149,7 @@ local buff_daily_challenge = {
}, },
["obj"]=2 ["obj"]=2
}, },
[16]={ [13]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
@ -197,43 +161,7 @@ local buff_daily_challenge = {
}, },
["obj"]=2 ["obj"]=2
}, },
[17]={ [14]={
["buff_type"]=2,
["effect"]={
{
["type"]="dec_dmg_all_add",
["num"]=500,
["ratio"]=1000,
["round"]=999
}
},
["obj"]=2
},
[18]={
["buff_type"]=2,
["effect"]={
{
["type"]="cured_dec",
["num"]=1000,
["ratio"]=1000,
["round"]=999
}
},
["obj"]=2
},
[19]={
["buff_type"]=2,
["effect"]={
{
["type"]="block",
["num"]=500,
["ratio"]=1000,
["round"]=999
}
},
["obj"]=2
},
[20]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
@ -247,6 +175,6 @@ local buff_daily_challenge = {
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

16
lua/app/config/chapter.lua
View File

@ -456,7 +456,7 @@ local chapter = {
}, },
["mystery_box"]={ ["mystery_box"]={
1, 1,
3 4
}, },
["mystery_box_reward"]={ ["mystery_box_reward"]={
{ {
@ -856,7 +856,7 @@ local chapter = {
}, },
["mystery_box"]={ ["mystery_box"]={
1, 1,
4 3
}, },
["mystery_box_reward"]={ ["mystery_box_reward"]={
{ {
@ -1059,7 +1059,7 @@ local chapter = {
}, },
["mystery_box"]={ ["mystery_box"]={
2, 2,
3 4
}, },
["mystery_box_reward"]={ ["mystery_box_reward"]={
{ {
@ -1277,8 +1277,8 @@ local chapter = {
13001 13001
}, },
["mystery_box"]={ ["mystery_box"]={
1, 2,
4 3
}, },
["mystery_box_reward"]={ ["mystery_box_reward"]={
{ {
@ -1496,7 +1496,7 @@ local chapter = {
15001 15001
}, },
["mystery_box"]={ ["mystery_box"]={
3, 2,
4 4
}, },
["mystery_box_reward"]={ ["mystery_box_reward"]={
@ -1715,8 +1715,8 @@ local chapter = {
17001 17001
}, },
["mystery_box"]={ ["mystery_box"]={
2, 1,
3 4
}, },
["mystery_box_reward"]={ ["mystery_box_reward"]={
{ {

8252
lua/app/config/chapter_board.lua
View File

File diff suppressed because it is too large Load Diff

4460
lua/app/config/chapter_daily_challenge.lua
View File

File diff suppressed because it is too large Load Diff

7
lua/app/config/func_open.lua
View File

@ -5,6 +5,7 @@ local func_open = {
}, },
["bounty_open"]={ ["bounty_open"]={
["stage"]=3, ["stage"]=3,
["pop_ups"]=1,
["icon"]="main_bounty" ["icon"]="main_bounty"
}, },
["task"]={ ["task"]={
@ -16,7 +17,7 @@ local func_open = {
["icon"]="main_act_level_gift" ["icon"]="main_act_level_gift"
}, },
["idle_drop"]={ ["idle_drop"]={
["stage"]=2, ["stage"]=3,
["icon"]="main_idle_drop" ["icon"]="main_idle_drop"
}, },
["act_sevenday"]={ ["act_sevenday"]={
@ -24,7 +25,7 @@ local func_open = {
["icon"]="main_act_sevenday" ["icon"]="main_act_sevenday"
}, },
["mall"]={ ["mall"]={
["stage"]=1, ["stage"]=2,
["icon"]="main_mall" ["icon"]="main_mall"
}, },
["mall_daily"]={ ["mall_daily"]={
@ -33,10 +34,12 @@ local func_open = {
}, },
["store_box_open"]={ ["store_box_open"]={
["stage"]=2, ["stage"]=2,
["pop_ups"]=1,
["icon"]="main_store_box" ["icon"]="main_store_box"
}, },
["store_box_3_open"]={ ["store_box_3_open"]={
["stage"]=5, ["stage"]=5,
["pop_ups"]=1,
["icon"]="main_store_box_3" ["icon"]="main_store_box_3"
}, },
["daily_challenge"]={ ["daily_challenge"]={

37
lua/app/config/hero.lua
View File

@ -113,7 +113,7 @@ local hero = {
["model_id"]="p0014", ["model_id"]="p0014",
["icon"]="6", ["icon"]="6",
["item_id"]=13001, ["item_id"]=13001,
["unlock_chapter"]=3, ["unlock_chapter"]=12,
["is_show"]=1 ["is_show"]=1
}, },
[13002]={ [13002]={
@ -172,7 +172,7 @@ local hero = {
["model_id"]="p0009", ["model_id"]="p0009",
["icon"]="11", ["icon"]="11",
["item_id"]=13002, ["item_id"]=13002,
["unlock_chapter"]=3, ["unlock_chapter"]=20,
["is_show"]=1 ["is_show"]=1
}, },
[14001]={ [14001]={
@ -231,7 +231,6 @@ local hero = {
["model_id"]="p0011", ["model_id"]="p0011",
["icon"]="16", ["icon"]="16",
["item_id"]=14001, ["item_id"]=14001,
["unlock_chapter"]=3,
["is_show"]=1 ["is_show"]=1
}, },
[22001]={ [22001]={
@ -348,7 +347,7 @@ local hero = {
["model_id"]="p0010", ["model_id"]="p0010",
["icon"]="12", ["icon"]="12",
["item_id"]=23001, ["item_id"]=23001,
["unlock_chapter"]=3, ["unlock_chapter"]=16,
["is_show"]=1 ["is_show"]=1
}, },
[23002]={ [23002]={
@ -407,7 +406,7 @@ local hero = {
["model_id"]="p0012", ["model_id"]="p0012",
["icon"]="7", ["icon"]="7",
["item_id"]=23002, ["item_id"]=23002,
["unlock_chapter"]=3, ["unlock_chapter"]=9,
["is_show"]=1 ["is_show"]=1
}, },
[24001]={ [24001]={
@ -466,7 +465,7 @@ local hero = {
["model_id"]="p0007", ["model_id"]="p0007",
["icon"]="17", ["icon"]="17",
["item_id"]=24001, ["item_id"]=24001,
["unlock_chapter"]=3, ["unlock_chapter"]=21,
["is_show"]=1 ["is_show"]=1
}, },
[32001]={ [32001]={
@ -583,7 +582,7 @@ local hero = {
["model_id"]="p0006", ["model_id"]="p0006",
["icon"]="8", ["icon"]="8",
["item_id"]=33001, ["item_id"]=33001,
["unlock_chapter"]=3, ["unlock_chapter"]=4,
["is_show"]=1 ["is_show"]=1
}, },
[33002]={ [33002]={
@ -642,7 +641,7 @@ local hero = {
["model_id"]="p0020", ["model_id"]="p0020",
["icon"]="13", ["icon"]="13",
["item_id"]=33002, ["item_id"]=33002,
["unlock_chapter"]=3, ["unlock_chapter"]=18,
["is_show"]=1 ["is_show"]=1
}, },
[34001]={ [34001]={
@ -701,7 +700,7 @@ local hero = {
["model_id"]="p0016", ["model_id"]="p0016",
["icon"]="18", ["icon"]="18",
["item_id"]=34001, ["item_id"]=34001,
["unlock_chapter"]=3, ["unlock_chapter"]=2,
["is_show"]=1 ["is_show"]=1
}, },
[42001]={ [42001]={
@ -818,7 +817,7 @@ local hero = {
["model_id"]="p0022", ["model_id"]="p0022",
["icon"]="9", ["icon"]="9",
["item_id"]=43001, ["item_id"]=43001,
["unlock_chapter"]=3, ["unlock_chapter"]=6,
["is_show"]=1 ["is_show"]=1
}, },
[43002]={ [43002]={
@ -874,10 +873,10 @@ local hero = {
4920000, 4920000,
5490000 5490000
}, },
["model_id"]="p0003", ["model_id"]="p0021",
["icon"]="14", ["icon"]="14",
["item_id"]=43002, ["item_id"]=43002,
["unlock_chapter"]=3, ["unlock_chapter"]=14,
["is_show"]=1 ["is_show"]=1
}, },
[44001]={ [44001]={
@ -936,7 +935,7 @@ local hero = {
["model_id"]="p0008", ["model_id"]="p0008",
["icon"]="19", ["icon"]="19",
["item_id"]=44001, ["item_id"]=44001,
["unlock_chapter"]=3, ["unlock_chapter"]=10,
["is_show"]=1 ["is_show"]=1
}, },
[52001]={ [52001]={
@ -995,7 +994,8 @@ local hero = {
["model_id"]="p0004", ["model_id"]="p0004",
["icon"]="5", ["icon"]="5",
["item_id"]=52001, ["item_id"]=52001,
["unlock_chapter"]=1 ["unlock_chapter"]=2,
["is_show"]=1
}, },
[53001]={ [53001]={
["position"]=5, ["position"]=5,
@ -1053,7 +1053,7 @@ local hero = {
["model_id"]="p0015", ["model_id"]="p0015",
["icon"]="10", ["icon"]="10",
["item_id"]=53001, ["item_id"]=53001,
["unlock_chapter"]=3, ["unlock_chapter"]=22,
["is_show"]=1 ["is_show"]=1
}, },
[53002]={ [53002]={
@ -1109,10 +1109,10 @@ local hero = {
4920000, 4920000,
5490000 5490000
}, },
["model_id"]="p0004", ["model_id"]="p0019",
["icon"]="15", ["icon"]="15",
["item_id"]=53002, ["item_id"]=53002,
["unlock_chapter"]=3, ["unlock_chapter"]=8,
["is_show"]=1 ["is_show"]=1
}, },
[54001]={ [54001]={
@ -1168,10 +1168,9 @@ local hero = {
4920000, 4920000,
5490000 5490000
}, },
["model_id"]="p0004", ["model_id"]="p0023",
["icon"]="20", ["icon"]="20",
["item_id"]=54001, ["item_id"]=54001,
["unlock_chapter"]=3,
["is_show"]=1 ["is_show"]=1
} }
} }

30
lua/app/config/localization/localization_global_const.lua
View File

@ -145,6 +145,36 @@ local LocalizationGlobalConst =
SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2", SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2",
FUNC_UNLOCK = "FUNC_UNLOCK", FUNC_UNLOCK = "FUNC_UNLOCK",
MAIN_BTN_3 = "MAIN_BTN_3", MAIN_BTN_3 = "MAIN_BTN_3",
SHOP_DESC_1 = "SHOP_DESC_1",
SHOP_DESC_2 = "SHOP_DESC_2",
SHOP_DESC_3 = "SHOP_DESC_3",
SHOP_DESC_4 = "SHOP_DESC_4",
SHOP_DESC_5 = "SHOP_DESC_5",
SHOP_DESC_6 = "SHOP_DESC_6",
SHOP_DESC_7 = "SHOP_DESC_7",
SHOP_DESC_8 = "SHOP_DESC_8",
SHOP_DESC_9 = "SHOP_DESC_9",
SHOP_DESC_10 = "SHOP_DESC_10",
SHOP_DESC_11 = "SHOP_DESC_11",
SHOP_DESC_12 = "SHOP_DESC_12",
SHOP_DESC_13 = "SHOP_DESC_13",
SHOP_DESC_14 = "SHOP_DESC_14",
SHOP_DESC_15 = "SHOP_DESC_15",
SHOP_DESC_16 = "SHOP_DESC_16",
SHOP_DESC_17 = "SHOP_DESC_17",
SHOP_DESC_18 = "SHOP_DESC_18",
SHOP_DESC_19 = "SHOP_DESC_19",
SHOP_DESC_20 = "SHOP_DESC_20",
SHOP_DESC_21 = "SHOP_DESC_21",
SHOP_DESC_22 = "SHOP_DESC_22",
SHOP_DESC_23 = "SHOP_DESC_23",
SHOP_DESC_24 = "SHOP_DESC_24",
SHOP_DESC_25 = "SHOP_DESC_25",
SHOP_DESC_26 = "SHOP_DESC_26",
SHOP_DESC_27 = "SHOP_DESC_27",
SHOP_DESC_28 = "SHOP_DESC_28",
SHOP_DESC_29 = "SHOP_DESC_29",
HERO_DESC_11 = "HERO_DESC_11",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

208
lua/app/config/skill.lua
View File

@ -395,11 +395,6 @@ local skill = {
2, 2,
3 3
}, },
["block_time"]={
360,
1360,
2500
},
["skill_position"]=1, ["skill_position"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -488,11 +483,6 @@ local skill = {
2, 2,
3 3
}, },
["block_time"]={
360,
1360,
2500
},
["skill_position"]=1, ["skill_position"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -711,13 +701,6 @@ local skill = {
4, 4,
6 6
}, },
["block_time"]={
760,
1010,
1260,
1510,
1810
},
["skill_position"]=1, ["skill_position"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -823,13 +806,6 @@ local skill = {
4, 4,
6 6
}, },
["block_time"]={
760,
1010,
1260,
1510,
1810
},
["skill_position"]=1, ["skill_position"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -973,10 +949,6 @@ local skill = {
1, 1,
2 2
}, },
["block_time"]={
250,
1400
},
["skill_position"]=1, ["skill_position"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -1439,12 +1411,6 @@ local skill = {
3, 3,
4 4
}, },
["block_time"]={
760,
1010,
1260,
1510
},
["skill_position"]=2, ["skill_position"]=2,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -1515,12 +1481,6 @@ local skill = {
3, 3,
4 4
}, },
["block_time"]={
760,
1010,
1260,
1510
},
["skill_position"]=2, ["skill_position"]=2,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -1583,7 +1543,7 @@ local skill = {
[2300125]={ [2300125]={
["position"]=2, ["position"]=2,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=8, ["trigger"]=10,
["effect"]={ ["effect"]={
{ {
["type"]="atkp_yellow_add", ["type"]="atkp_yellow_add",
@ -1774,13 +1734,6 @@ local skill = {
4, 4,
5 5
}, },
["block_time"]={
760,
1010,
1260,
1510,
1760
},
["skill_position"]=1, ["skill_position"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -3777,7 +3730,10 @@ local skill = {
["link"]=1, ["link"]=1,
["position"]=5, ["position"]=5,
["method"]=1, ["method"]=1,
["skill_type"]=0, ["skill_type"]=1,
["boardrange"]={
},
["battle_icon"]="5", ["battle_icon"]="5",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
@ -3800,7 +3756,10 @@ local skill = {
["link"]=1, ["link"]=1,
["position"]=5, ["position"]=5,
["method"]=1, ["method"]=1,
["skill_type"]=0, ["skill_type"]=1,
["boardrange"]={
},
["battle_icon"]="5", ["battle_icon"]="5",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
@ -3823,7 +3782,10 @@ local skill = {
["link"]=1, ["link"]=1,
["position"]=5, ["position"]=5,
["method"]=1, ["method"]=1,
["skill_type"]=0, ["skill_type"]=1,
["boardrange"]={
},
["battle_icon"]="5", ["battle_icon"]="5",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
@ -3963,12 +3925,6 @@ local skill = {
3, 3,
4 4
}, },
["block_time"]={
760,
1010,
1260,
1760
},
["skill_position"]=2, ["skill_position"]=2,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
@ -4146,12 +4102,29 @@ local skill = {
["effect"]={ ["effect"]={
{ {
["type"]="hurt_purple", ["type"]="hurt_purple",
["num"]=50000, ["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=30000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
} }
}, },
["obj"]=2, ["obj"]=2,
["effect_block"]={
1,
2,
3
},
["skill_position"]=2, ["skill_position"]=2,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
@ -4341,12 +4314,29 @@ local skill = {
["effect"]={ ["effect"]={
{ {
["type"]="hurt_purple", ["type"]="hurt_purple",
["num"]=60000, ["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=15000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=35000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
} }
}, },
["obj"]=2, ["obj"]=2,
["effect_block"]={
1,
2,
3
},
["skill_position"]=2, ["skill_position"]=2,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
@ -4386,12 +4376,29 @@ local skill = {
["effect"]={ ["effect"]={
{ {
["type"]="hurt_purple", ["type"]="hurt_purple",
["num"]=60000, ["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=15000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=35000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
} }
}, },
["obj"]=2, ["obj"]=2,
["effect_block"]={
1,
2,
3
},
["skill_position"]=2, ["skill_position"]=2,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
@ -4405,7 +4412,7 @@ local skill = {
["effect"]={ ["effect"]={
{ {
["type"]="skill_hurt_add", ["type"]="skill_hurt_add",
["num"]=5000, ["num"]=1000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
@ -4925,9 +4932,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["skill_position"]=1, ["skill_position"]=1,
["cd"]=2, ["cd"]=2,
["cd_start"]=0, ["cd_start"]=0,
@ -4985,13 +4989,6 @@ local skill = {
4, 4,
5 5
}, },
["block_time"]={
760,
1010,
1260,
1510,
1760
},
["skill_position"]=1, ["skill_position"]=1,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
@ -5045,9 +5042,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["skill_position"]=2, ["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
@ -5158,11 +5152,6 @@ local skill = {
2, 2,
3 3
}, },
["block_time"]={
360,
1360,
2500
},
["skill_position"]=1, ["skill_position"]=1,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
@ -5247,9 +5236,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["skill_position"]=2, ["skill_position"]=2,
["cd"]=2, ["cd"]=2,
["cd_start"]=0, ["cd_start"]=0,
@ -5308,12 +5294,6 @@ local skill = {
3, 3,
4 4
}, },
["block_time"]={
760,
1010,
1260,
1510
},
["skill_position"]=2, ["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
@ -5350,9 +5330,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["skill_position"]=2, ["skill_position"]=2,
["cd"]=2, ["cd"]=2,
["cd_start"]=0, ["cd_start"]=0,
@ -5488,13 +5465,6 @@ local skill = {
4, 4,
6 6
}, },
["block_time"]={
760,
1010,
1260,
1510,
1810
},
["skill_position"]=1, ["skill_position"]=1,
["cd"]=2, ["cd"]=2,
["cd_start"]=0, ["cd_start"]=0,
@ -5564,12 +5534,6 @@ local skill = {
3, 3,
4 4
}, },
["block_time"]={
760,
1010,
1260,
1760
},
["skill_position"]=2, ["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
@ -5600,9 +5564,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=3, ["cd"]=3,
["cd_start"]=2, ["cd_start"]=2,
["name_act"]="skill01" ["name_act"]="skill01"
@ -5626,9 +5587,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -5657,9 +5615,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -5703,9 +5658,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -5745,9 +5697,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=2, ["cd"]=2,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -5777,9 +5726,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=2, ["cd"]=2,
["cd_start"]=1, ["cd_start"]=1,
["shake_time"]=200, ["shake_time"]=200,
@ -5809,9 +5755,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
2500
},
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["name_act"]="skill01" ["name_act"]="skill01"
@ -5856,9 +5799,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
2500
},
["cd"]=3, ["cd"]=3,
["cd_start"]=2, ["cd_start"]=2,
["shake_time"]=200, ["shake_time"]=200,
@ -5916,9 +5856,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -5947,9 +5884,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=3, ["cd"]=3,
["cd_start"]=2, ["cd_start"]=2,
["shake_time"]=200, ["shake_time"]=200,
@ -5979,9 +5913,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -6016,9 +5947,6 @@ local skill = {
["effect_block"]={ ["effect_block"]={
1 1
}, },
["block_time"]={
1000
},
["cd"]=3, ["cd"]=3,
["cd_start"]=2, ["cd_start"]=2,
["shake_time"]=200, ["shake_time"]=200,

335
lua/app/config/skill_rogue.lua
View File

File diff suppressed because it is too large Load Diff

36
lua/app/config/strings/cn/buff_daily_challenge.lua
View File

@ -15,52 +15,34 @@ local buff_daily_challenge = {
["desc"]="技能伤害+15%" ["desc"]="技能伤害+15%"
}, },
[6]={ [6]={
["desc"]="回合开始前生成一个10%最大生命值的护盾" ["desc"]="回合开始前生命值+1%"
}, },
[7]={ [7]={
["desc"]="回合开始前生命值+1%" ["desc"]="生命值恢复效果+5%"
}, },
[8]={ [8]={
["desc"]="生命值恢复效果+5%"
},
[9]={
["desc"]="回合开始前生命值+1%" ["desc"]="回合开始前生命值+1%"
}, },
[10]={ [9]={
["desc"]="生命值恢复效果+5%"
},
[11]={
["desc"]="敌方生命值+20%"
},
[12]={
["desc"]="敌方攻击力+5%" ["desc"]="敌方攻击力+5%"
}, },
[13]={ [10]={
["desc"]="敌方造成伤害+5%" ["desc"]="敌方造成伤害+5%"
}, },
[14]={ [11]={
["desc"]="敌方普攻次数+1" ["desc"]="敌方普攻次数+1"
}, },
[15]={ [12]={
["desc"]="治疗效果-10%" ["desc"]="治疗效果-10%"
}, },
[16]={ [13]={
["desc"]="敌方格挡概率+5%" ["desc"]="敌方格挡概率+5%"
}, },
[17]={ [14]={
["desc"]="受到所有伤害-5%"
},
[18]={
["desc"]="治疗效果-10%"
},
[19]={
["desc"]="敌方格挡概率+5%"
},
[20]={
["desc"]="受到所有伤害-5%" ["desc"]="受到所有伤害-5%"
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

30
lua/app/config/strings/cn/global.lua
View File

@ -145,6 +145,36 @@ local localization_global =
["SEVEN_DAY_DESC_2"] = "已完成任务数:<color=#8DFF81>{0}</color>/{1}", ["SEVEN_DAY_DESC_2"] = "已完成任务数:<color=#8DFF81>{0}</color>/{1}",
["FUNC_UNLOCK"] = "解锁新功能", ["FUNC_UNLOCK"] = "解锁新功能",
["MAIN_BTN_3"] = "商城", ["MAIN_BTN_3"] = "商城",
["SHOP_DESC_1"] = "普通宝箱",
["SHOP_DESC_2"] = "精致宝箱",
["SHOP_DESC_3"] = "珍贵宝箱",
["SHOP_DESC_4"] = "无额外奖励加成",
["SHOP_DESC_5"] = "开宝箱提升等级,增加宝箱奖励",
["SHOP_DESC_6"] = "宝箱等级提升!",
["SHOP_DESC_7"] = "立即打开",
["SHOP_DESC_8"] = "恭喜获得",
["SHOP_DESC_9"] = "首充礼包",
["SHOP_DESC_10"] = "章节礼包",
["SHOP_DESC_11"] = "新手礼包",
["SHOP_DESC_12"] = "助力礼包",
["SHOP_DESC_13"] = "成长礼包",
["SHOP_DESC_14"] = "金币礼包",
["SHOP_DESC_15"] = "前往商店",
["SHOP_DESC_16"] = "特惠商品",
["SHOP_DESC_17"] = "主要商品",
["SHOP_DESC_18"] = "限购{0}次",
["SHOP_DESC_19"] = "第{0}章礼包",
["SHOP_DESC_20"] = "已购买",
["SHOP_DESC_21"] = "剩余次数:{0}",
["SHOP_DESC_22"] = "刷新时间:{0}",
["SHOP_DESC_23"] = "{0}级助力礼包",
["SHOP_DESC_24"] = "必出<color=#5fff57>普通</color>英雄",
["SHOP_DESC_25"] = "必出<color=#8aedff>稀有</color>英雄",
["SHOP_DESC_26"] = "必出<color=#ff8af0>史诗</color>英雄",
["SHOP_DESC_27"] = "宝箱",
["SHOP_DESC_28"] = "每日特惠",
["SHOP_DESC_29"] = "\"每日特惠\"将每日刷新,通过观看广告可以额外刷新",
["HERO_DESC_11"] = "活动获得",
} }
return localization_global return localization_global

6
lua/app/config/strings/cn/skill.lua
View File

@ -30,7 +30,7 @@ local skill = {
["desc"]="急速治疗：使用后本次恢复生命。" ["desc"]="急速治疗：使用后本次恢复生命。"
}, },
[3300220]={ [3300220]={
["desc"]="森林狼：使用后本次伤害提升，并造成多次技能伤害。" ["desc"]="狼袭瞬杀：使用后本次伤害提升，并造成多次技能伤害。"
}, },
[3400120]={ [3400120]={
["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" ["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。"
@ -42,7 +42,7 @@ local skill = {
["desc"]="霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。" ["desc"]="霜冻冰晶：额外造成一次技能伤害，附加冰霜效果，1回合。"
}, },
[4300220]={ [4300220]={
["desc"]="鸦姐：额外造成一次技能伤害，附加腐败效果，1回合。" ["desc"]="腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。"
}, },
[4400120]={ [4400120]={
["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" ["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。"
@ -51,7 +51,7 @@ local skill = {
["desc"]="护盾术：为团队附加一个护盾，1回合。" ["desc"]="护盾术：为团队附加一个护盾，1回合。"
}, },
[5300120]={ [5300120]={
["desc"]="魔女琪琪：额外造成一次大量技能伤害。" ["desc"]="魔法扫帚：额外造成一次大量技能伤害。"
}, },
[5300220]={ [5300220]={
["desc"]="灵魂猎手：额外造成一次大量技能伤害。" ["desc"]="灵魂猎手：额外造成一次大量技能伤害。"

18
lua/app/config/strings/cn/skill_rogue.lua
View File

@ -468,28 +468,28 @@ local skill_rogue = {
["desc"]="霜冻冰晶附加的冰盾，可反伤400%。" ["desc"]="霜冻冰晶附加的冰盾，可反伤400%。"
}, },
[4300300]={ [4300300]={
["desc"]="解锁鸦姐技能：额外造成一次技能伤害，附加腐败效果，1回合。" ["desc"]="解锁腐败利刃：额外造成一次技能伤害，附加腐败效果，1回合。"
}, },
[4300301]={ [4300301]={
["desc"]="鸦姐技能附加的腐败效果，回合数+1." ["desc"]="腐败利刃附加的腐败效果，回合数+1."
}, },
[4300302]={ [4300302]={
["desc"]="鸦姐技能对易伤敌人附加冰霜效果，1回合。" ["desc"]="腐败利刃对易伤敌人附加冰霜效果，1回合。"
}, },
[4300303]={ [4300303]={
["desc"]="鸦姐技能使用时本次普攻伤害提升15%。" ["desc"]="腐败利刃使用时本次普攻伤害提升15%。"
}, },
[4300304]={ [4300304]={
["desc"]="鸦姐技能附加的冰霜效果，回合数+1。" ["desc"]="腐败利刃附加的冰霜效果，回合数+1。"
}, },
[4300305]={ [4300305]={
["desc"]="鸦姐技能附加虚弱效果，2回合。" ["desc"]="腐败利刃附加虚弱效果，2回合。"
}, },
[4300306]={ [4300306]={
["desc"]="鸦姐技能沿＋方向可额外消除4格。" ["desc"]="腐败利刃沿＋方向可额外消除4格。"
}, },
[4300307]={ [4300307]={
["desc"]="鸦姐技能附加的虚弱效果，回合数+2。" ["desc"]="腐败利刃附加的虚弱效果，回合数+2。"
}, },
[4400100]={ [4400100]={
["desc"]="解锁冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。" ["desc"]="解锁冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。"
@ -606,7 +606,7 @@ local skill_rogue = {
["desc"]="蝴蝶技能激活所需能量-2。" ["desc"]="蝴蝶技能激活所需能量-2。"
}, },
[5400106]={ [5400106]={
["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升50%。" ["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升10%。"
}, },
[5400107]={ [5400107]={
["desc"]="蝴蝶技能击杀敌人后将增加蝴蝶技能能量2点。" ["desc"]="蝴蝶技能击杀敌人后将增加蝴蝶技能能量2点。"

20
lua/app/config/strings/de/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/en/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/fr/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/id/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/ja/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/ko/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/pt/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/ru/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/th/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/vi/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

20
lua/app/config/strings/zh/buff_daily_challenge.lua
View File

@ -40,27 +40,9 @@ local buff_daily_challenge = {
}, },
[14]={ [14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=20 data=buff_daily_challenge,count=14
} }
return config return config

2
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -1601,6 +1601,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d
self:onAttackOver() self:onAttackOver()
end end
self.battleController:resetTimeSpeed()
self:changeState(UNIT_STATE.DEAD) self:changeState(UNIT_STATE.DEAD)
elseif damage < 0 then elseif damage < 0 then
self:playHurt() self:playHurt()

27
lua/app/ui/common/cell/hero_cell.lua
View File

@ -42,19 +42,30 @@ function HeroCell:refresh(heroEntity, isGray)
self.progress:setSprite(GConst.ATLAS_PATH.COMMON, "common_progress_2", nil, self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)) self.progress:setSprite(GConst.ATLAS_PATH.COMMON, "common_progress_2", nil, self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER))
end end
self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = fragmentCount / needFragmentCount self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = fragmentCount / needFragmentCount
self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()))
if heroEntity:isUnlock() then if heroEntity:isUnlock() then
if heroEntity:isActived() then
self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()))
self.lvTx:setVisible(true) self.lvTx:setVisible(true)
self.progressBg:setVisible(not heroEntity:isMaxLv())
self.unlockTx:setVisible(false)
if not heroEntity:isActived() then
self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11))
end
else else
self.lvTx:setVisible(false) self.lvTx:setVisible(false)
self.progressBg:setVisible(false) end
self.progressBg:setVisible(not heroEntity:isMaxLv())
self.unlockTx:setVisible(false)
else
self.lvTx:setVisible(false)
if canLvUp then
self.unlockTx:setVisible(false)
self.progressBg:setVisible(true)
else
self.unlockTx:setVisible(true) self.unlockTx:setVisible(true)
self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, heroEntity:getUnlcokChapter())) self.progressBg:setVisible(false)
local unlcokChapter = heroEntity:getUnlcokChapter()
if unlcokChapter then
self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, unlcokChapter))
else
self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11))
end
end
end end
end end

6
lua/app/userdata/hero/hero_entity.lua
View File

@ -107,7 +107,7 @@ function HeroEntity:getCfgAtk(lv)
end end
function HeroEntity:getUnlcokChapter() function HeroEntity:getUnlcokChapter()
return self.config.unlock_chapter or 0 return self.config.unlock_chapter
end end
function HeroEntity:updateAllAttr() function HeroEntity:updateAllAttr()
@ -165,10 +165,10 @@ function HeroEntity:isUnlock()
if self:isActived() then if self:isActived() then
return true return true
end end
if self:getUnlcokChapter() <= DataManager.ChapterData:getMaxChapterId() or self:canLvUp() then local unlockChapter = self:getUnlcokChapter()
if unlockChapter and unlockChapter <= DataManager.ChapterData:getMaxChapterId() then
return true return true
end end
return false return false
end end