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

Merge remote-tracking branch 'origin/dev' into fang/daily_challenge

Browse Source 
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/de/buff.lua
#	lua/app/config/strings/en/buff.lua
#	lua/app/config/strings/fr/buff.lua
#	lua/app/config/strings/id/buff.lua
#	lua/app/config/strings/ja/buff.lua
#	lua/app/config/strings/ko/buff.lua
#	lua/app/config/strings/pt/buff.lua
#	lua/app/config/strings/ru/buff.lua
#	lua/app/config/strings/th/buff.lua
#	lua/app/config/strings/vi/buff.lua
#	lua/app/config/strings/zh/buff.lua
This commit is contained in:
Fang 2023-05-30 10:35:05 +08:00
commit 9b3a00e809
31 changed files with 3801 additions and 3212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

2294
lua/app/config/chapter_board_daily_challenge.lua
View File

File diff suppressed because it is too large Load Diff

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

@ -1,34 +1,34 @@
local chapter_daily_challenge = {
[1]={
["scene"]="bg_1",
["chess_board"]="chessboard_2",
["chess_board"]="chessboard_1",
["chapter_board_daily_challenge"]={
1,
2,
3,
4
7,
8,
9,
10
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
3101,
3201,
3301,
3401,
3501,
3601,
3701,
3801,
3901,
4001,
4101,
4201,
4301,
4401,
4501,
4601,
4701,
4801,
4901,
5001
},
["wave_reward"]={
{
@ -243,32 +243,32 @@ local chapter_daily_challenge = {
["scene"]="bg_2",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
5,
6,
7,
8
23,
24,
25,
26
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
11101,
11201,
11301,
11401,
11501,
11601,
11701,
11801,
11901,
12001,
12101,
12201,
12301,
12401,
12501,
12601,
12701,
12801,
12901,
13001
},
["wave_reward"]={
{
@ -483,32 +483,32 @@ local chapter_daily_challenge = {
["scene"]="bg_3",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
9,
10,
1,
2
39,
40,
41,
42
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
19101,
19201,
19301,
19401,
19501,
19601,
19701,
19801,
19901,
20001,
20101,
20201,
20301,
20401,
20501,
20601,
20701,
20801,
20901,
21001
},
["wave_reward"]={
{
@ -723,32 +723,32 @@ local chapter_daily_challenge = {
["scene"]="bg_4",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
3,
4,
5,
6
55,
56,
57,
58
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
27101,
27201,
27301,
27401,
27501,
27601,
27701,
27801,
27901,
28001,
28101,
28201,
28301,
28401,
28501,
28601,
28701,
28801,
28901,
29001
},
["wave_reward"]={
{
@ -963,32 +963,32 @@ local chapter_daily_challenge = {
["scene"]="bg_5",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
7,
8,
9,
10
71,
72,
73,
74
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
35101,
35201,
35301,
35401,
35501,
35601,
35701,
35801,
35901,
36001,
36101,
36201,
36301,
36401,
36501,
36601,
36701,
36801,
36901,
37001
},
["wave_reward"]={
{
@ -1203,32 +1203,32 @@ local chapter_daily_challenge = {
["scene"]="bg_6",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
1,
2,
3,
4
87,
88,
89,
90
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
43101,
43201,
43301,
43401,
43501,
43601,
43701,
43801,
43901,
44001,
44101,
44201,
44301,
44401,
44501,
44601,
44701,
44801,
44901,
45001
},
["wave_reward"]={
{
@ -1443,32 +1443,32 @@ local chapter_daily_challenge = {
["scene"]="bg_7",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
5,
6,
7,
8
103,
104,
105,
106
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
51101,
51201,
51301,
51401,
51501,
51601,
51701,
51801,
51901,
52001,
52101,
52201,
52301,
52401,
52501,
52601,
52701,
52801,
52901,
53001
},
["wave_reward"]={
{
@ -1683,32 +1683,32 @@ local chapter_daily_challenge = {
["scene"]="bg_1",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
9,
10,
1,
2
39,
40,
41,
42
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
19101,
19201,
19301,
19401,
19501,
19601,
19701,
19801,
19901,
20001,
20101,
20201,
20301,
20401,
20501,
20601,
20701,
20801,
20901,
21001
},
["wave_reward"]={
{
@ -1923,32 +1923,32 @@ local chapter_daily_challenge = {
["scene"]="bg_2",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
3,
4,
5,
6
55,
56,
57,
58
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
27101,
27201,
27301,
27401,
27501,
27601,
27701,
27801,
27901,
28001,
28101,
28201,
28301,
28401,
28501,
28601,
28701,
28801,
28901,
29001
},
["wave_reward"]={
{
@ -2163,32 +2163,32 @@ local chapter_daily_challenge = {
["scene"]="bg_3",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
7,
8,
9,
10
71,
72,
73,
74
},
["monster"]={
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002,
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002
35101,
35201,
35301,
35401,
35501,
35601,
35701,
35801,
35901,
36001,
36101,
36201,
36301,
36401,
36501,
36601,
36701,
36801,
36901,
37001
},
["wave_reward"]={
{

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

@ -17,7 +17,7 @@ local func_open = {
["icon"]="main_act_level_gift"
},
["idle_drop"]={
["stage"]=3,
["stage"]=2,
["icon"]="main_idle_drop"
},
["act_sevenday"]={
@ -26,6 +26,7 @@ local func_open = {
},
["mall"]={
["stage"]=2,
["pop_ups"]=1,
["icon"]="main_mall"
},
["mall_daily"]={
@ -43,15 +44,19 @@ local func_open = {
["icon"]="main_store_box_3"
},
["daily_challenge"]={
["stage"]=2,
["stage"]=8,
["icon"]="main_daily_challenge"
},
["act_gift_show_open"]={
["stage"]=3,
["pop_ups"]=1
},
["first_charge"]={
["stage"]=2,
["pop_ups"]=1
}
}
local config = {
data=func_open,count=12
data=func_open,count=13
}
return config

87
lua/app/config/grid_type.lua
View File

@ -3,12 +3,12 @@ local grid_type = {
["can_fall"]=1
},
[1]={
["icon"]="battle_hinder_4",
["icon"]="battle_hinder_1",
["cant_link"]=1,
["element_invalid"]=1
},
[2]={
["icon"]="stone_2",
["icon"]="battle_obstacle_stone_2",
["next_type"]=0,
["break_condition"]={
1,
@ -20,7 +20,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[3]={
["icon"]="stone_1",
["icon"]="battle_obstacle_stone_1",
["next_type"]=2,
["break_condition"]={
1,
@ -32,7 +32,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[4]={
["icon"]="vine",
["icon"]="battle_obstacle_vine",
["next_type"]=0,
["break_condition"]={
2,
@ -42,7 +42,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b03"
},
[5]={
["icon"]="ice",
["icon"]="battle_obstacle_ice",
["next_type"]=0,
["break_condition"]={
1,
@ -54,12 +54,12 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b02"
},
[6]={
["icon"]="lock",
["icon"]="battle_obstacle_lock",
["can_fall"]=1,
["cant_link"]=1
},
[7]={
["icon"]="stone_3",
["icon"]="battle_obstacle_stone_3",
["next_type"]=3,
["break_condition"]={
1,
@ -71,7 +71,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[8]={
["icon"]="rocket_up",
["icon"]="battle_obstacle_rocket_up",
["next_type"]=0,
["break_condition"]={
1,
@ -87,7 +87,7 @@ local grid_type = {
["effect_trigger"]=2
},
[9]={
["icon"]="rocket_down",
["icon"]="battle_obstacle_rocket_down",
["next_type"]=0,
["break_condition"]={
1,
@ -103,7 +103,7 @@ local grid_type = {
["effect_trigger"]=2
},
[10]={
["icon"]="rocket_left",
["icon"]="battle_obstacle_rocket_left",
["next_type"]=0,
["break_condition"]={
1,
@ -119,7 +119,7 @@ local grid_type = {
["effect_trigger"]=2
},
[11]={
["icon"]="rocket_right",
["icon"]="battle_obstacle_rocket_right",
["next_type"]=0,
["break_condition"]={
1,
@ -135,7 +135,7 @@ local grid_type = {
["effect_trigger"]=2
},
[12]={
["icon"]="leaf",
["icon"]="battle_obstacle_leaf",
["next_type"]=0,
["break_condition"]={
1,
@ -147,7 +147,7 @@ local grid_type = {
["cant_link"]=1
},
[13]={
["icon"]="jelly",
["icon"]="battle_obstacle_jelly",
["next_type"]=0,
["break_condition"]={
1,
@ -162,7 +162,7 @@ local grid_type = {
["effect_trigger"]=1
},
[14]={
["icon"]="jelly",
["icon"]="battle_obstacle_lamp",
["next_type"]=0,
["break_condition"]={
1,
@ -176,7 +176,7 @@ local grid_type = {
["effect_trigger"]=2
},
[15]={
["icon"]="jelly",
["icon"]="battle_obstacle_chest_3",
["next_type"]=0,
["break_condition"]={
1,
@ -191,7 +191,7 @@ local grid_type = {
["effect_trigger"]=2
},
[16]={
["icon"]="jelly",
["icon"]="battle_obstacle_chest_2",
["next_type"]=15,
["break_condition"]={
1,
@ -203,7 +203,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[17]={
["icon"]="jelly",
["icon"]="battle_obstacle_chest_1",
["next_type"]=16,
["break_condition"]={
1,
@ -215,7 +215,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[18]={
["icon"]="stone_2",
["icon"]="battle_obstacle_stump_1",
["next_type"]=0,
["break_condition"]={
1,
@ -227,7 +227,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[19]={
["icon"]="stone_1",
["icon"]="battle_obstacle_stump_2",
["next_type"]=18,
["break_condition"]={
1,
@ -239,7 +239,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[20]={
["icon"]="stone_3",
["icon"]="battle_obstacle_stump_3",
["next_type"]=19,
["break_condition"]={
1,
@ -251,7 +251,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[21]={
["icon"]="leaf",
["icon"]="battle_obstacle_blister",
["next_type"]=0,
["break_condition"]={
1,
@ -260,10 +260,13 @@ local grid_type = {
["break_count"]=1,
["break_stay_element"]=1,
["can_fall"]=1,
["cant_link"]=1
["cant_link"]=1,
["element_invalid"]=1,
["effect"]=2,
["effect_trigger"]=1
},
[22]={
["icon"]="jelly",
["icon"]="battle_obstacle_silt",
["next_type"]=0,
["break_condition"]={
1,
@ -278,7 +281,7 @@ local grid_type = {
["effect_trigger"]=1
},
[23]={
["icon"]="jelly",
["icon"]="battle_obstacle_poisonous mist",
["next_type"]=0,
["break_condition"]={
1,
@ -293,7 +296,7 @@ local grid_type = {
["effect_trigger"]=1
},
[24]={
["icon"]="stone_2",
["icon"]="battle_obstacle_altar_1",
["next_type"]=0,
["break_condition"]={
1,
@ -305,7 +308,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[25]={
["icon"]="stone_1",
["icon"]="battle_obstacle_altar_2",
["next_type"]=24,
["break_condition"]={
1,
@ -317,7 +320,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[26]={
["icon"]="stone_3",
["icon"]="battle_obstacle_altar_3",
["next_type"]=25,
["break_condition"]={
1,
@ -329,7 +332,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[27]={
["icon"]="vine",
["icon"]="battle_obstacle_circle",
["next_type"]=0,
["break_condition"]={
2,
@ -339,7 +342,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b03"
},
[28]={
["icon"]="stone_2",
["icon"]="battle_obstacle_stalactite_1",
["next_type"]=0,
["break_condition"]={
1,
@ -351,7 +354,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[29]={
["icon"]="stone_1",
["icon"]="battle_obstacle_stalactite_2",
["next_type"]=28,
["break_condition"]={
1,
@ -363,7 +366,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[30]={
["icon"]="stone_3",
["icon"]="battle_obstacle_stalactite_3",
["next_type"]=29,
["break_condition"]={
1,
@ -375,7 +378,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[31]={
["icon"]="stone_2",
["icon"]="battle_obstacle_Iron_1",
["next_type"]=0,
["break_condition"]={
1,
@ -387,7 +390,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[32]={
["icon"]="stone_1",
["icon"]="battle_obstacle_Iron_2",
["next_type"]=31,
["break_condition"]={
1,
@ -399,7 +402,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[33]={
["icon"]="stone_3",
["icon"]="battle_obstacle_Iron_3",
["next_type"]=32,
["break_condition"]={
1,
@ -411,7 +414,7 @@ local grid_type = {
["break_sfx"]="sfx_piece_za_b01"
},
[34]={
["icon"]="jelly",
["icon"]="battle_obstacle_lava",
["next_type"]=0,
["break_condition"]={
1,
@ -424,9 +427,21 @@ local grid_type = {
["element_invalid"]=1,
["effect"]=2,
["effect_trigger"]=1
},
[35]={
["icon"]="battle_obstacle_tussock",
["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["break_stay_element"]=1,
["can_fall"]=1,
["cant_link"]=1
}
}
local config = {
data=grid_type,count=35
data=grid_type,count=36
}
return config

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

@ -182,6 +182,8 @@ local LocalizationGlobalConst =
SHOP_DESC_34 = "SHOP_DESC_34",
SHOP_DESC_35 = "SHOP_DESC_35",
SHOP_DESC_36 = "SHOP_DESC_36",
FUNC_OPEN_LEVEL = "FUNC_OPEN_LEVEL",
FUNC_OPEN_STAGE = "FUNC_OPEN_STAGE",
}
return LocalizationGlobalConst

41
lua/app/config/monster_chapter.lua
View File

@ -451,6 +451,9 @@ local monster_chapter = {
30032,
30033
},
["skill"]={
10018
},
["monster_exp"]=18000
},
[3601]={
@ -644,7 +647,7 @@ local monster_chapter = {
30087
},
["skill"]={
10018
10065
},
["monster_exp"]=22000
},
@ -1030,6 +1033,9 @@ local monster_chapter = {
30068,
30069
},
["skill"]={
10063
},
["monster_exp"]=12000
},
[8101]={
@ -1218,6 +1224,9 @@ local monster_chapter = {
30077,
30078
},
["skill"]={
10064
},
["monster_exp"]=18000
},
[9601]={
@ -1340,6 +1349,9 @@ local monster_chapter = {
30068,
30069
},
["skill"]={
10063
},
["monster_exp"]=24000
},
[10601]={
@ -1402,7 +1414,7 @@ local monster_chapter = {
30075
},
["skill"]={
10023
10062
},
["monster_exp"]=22000
},
@ -1986,7 +1998,10 @@ local monster_chapter = {
30021
},
["skill"]={
10015
10060
},
["passive_skill"]={
10061
},
["monster_exp"]=18000
},
@ -2568,7 +2583,10 @@ local monster_chapter = {
30021
},
["skill"]={
10015
10060
},
["passive_skill"]={
10061
},
["monster_exp"]=12000
},
@ -3949,7 +3967,10 @@ local monster_chapter = {
30021
},
["skill"]={
10015
10060
},
["passive_skill"]={
10061
},
["monster_exp"]=24000
},
@ -4408,7 +4429,10 @@ local monster_chapter = {
30021
},
["skill"]={
10015
10060
},
["passive_skill"]={
10061
},
["monster_exp"]=12000
},
@ -7048,6 +7072,9 @@ local monster_chapter = {
30032,
30033
},
["skill"]={
10018
},
["monster_exp"]=12000
},
[54101]={
@ -7398,7 +7425,7 @@ local monster_chapter = {
30087
},
["skill"]={
10018
10065
},
["monster_exp"]=24000
},

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

@ -264,7 +264,7 @@ local skill = {
["trigger"]=7,
["effect"]={
{
["type"]="dmg_addition_blue_add",
["type"]="dmg_addition_red_add",
["num"]=5000,
["ratio"]=10000,
["round"]=1
@ -1491,7 +1491,7 @@ local skill = {
{
{
["type"]="state",
["attr"]="lethargy",
["attr"]="vulnerable",
["op"]=">",
["v"]=0,
["side"]=2
@ -1550,7 +1550,7 @@ local skill = {
{
{
["type"]="state",
["attr"]="lethargy",
["attr"]="vulnerable",
["op"]=">",
["v"]=0,
["side"]=2
@ -4805,7 +4805,7 @@ local skill = {
["effect"]={
{
["type"]="hurt",
["num"]=15000,
["num"]=30000,
["ratio"]=10000,
["round"]=0
},
@ -4817,12 +4817,8 @@ local skill = {
}
},
["obj"]=2,
["effect_block"]={
1,
2
},
["skill_position"]=1,
["cd"]=2,
["cd"]=3,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
@ -4988,12 +4984,29 @@ local skill = {
["effect"]={
{
["type"]="hurt",
["num"]=30000,
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=20000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["effect_block"]={
1,
2,
3
},
["skill_position"]=1,
["cd"]=2,
["cd_start"]=0,
@ -5362,12 +5375,29 @@ local skill = {
["effect"]={
{
["type"]="hurt",
["num"]=30000,
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["effect_block"]={
1,
2,
3
},
["skill_position"]=2,
["cd"]=2,
["cd_start"]=0,
@ -5613,12 +5643,36 @@ local skill = {
["effect"]={
{
["type"]="hurt",
["num"]=50000,
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=20000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["effect_block"]={
1,
2,
3,
4
},
["cd"]=3,
["cd_start"]=0,
["shake_time"]=200,
@ -5714,12 +5768,29 @@ local skill = {
["effect"]={
{
["type"]="hurt",
["num"]=20000,
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=15000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["effect_block"]={
1,
2,
3
},
["cd"]=2,
["cd_start"]=0,
["shake_time"]=200,
@ -5734,18 +5805,29 @@ local skill = {
["effect"]={
{
["type"]="hurt",
["num"]=20000,
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="lock",
["num"]=0,
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=1
["round"]=0
},
{
["type"]="hurt",
["num"]=15000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["effect_block"]={
1,
2,
3
},
["cd"]=2,
["cd_start"]=1,
["shake_time"]=200,
@ -5807,12 +5889,36 @@ local skill = {
["effect"]={
{
["type"]="hurt",
["num"]=25000,
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["effect_block"]={
1,
2,
3,
4
},
["cd"]=3,
["cd_start"]=2,
["shake_time"]=200,
@ -5886,12 +5992,49 @@ local skill = {
["effect"]={
{
["type"]="hurt",
["num"]=30000,
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["effect_block"]={
1,
2,
4,
5,
6
},
["cd"]=3,
["cd_start"]=2,
["shake_time"]=200,
@ -5906,7 +6049,19 @@ local skill = {
["effect"]={
{
["type"]="hurt",
["num"]=30000,
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt",
["num"]=20000,
["ratio"]=10000,
["round"]=0
},
@ -5918,6 +6073,11 @@ local skill = {
}
},
["obj"]=2,
["effect_block"]={
1,
2,
4
},
["cd"]=3,
["cd_start"]=0,
["shake_time"]=200,
@ -5956,6 +6116,184 @@ local skill = {
["sound_hit"]=4200120,
["name_act"]="skill02"
},
[10060]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="heal",
["num"]=60000,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=1,
["skill_position"]=2,
["cd"]=2,
["cd_start"]=0,
["sound_hit"]=3300120,
["name_act"]="skill01",
["fx_self"]=200011
},
[10061]={
["effect_type"]=2,
["trigger"]=5,
["effect"]={
{
["type"]="vulnerable",
["num"]=2500,
["ratio"]=2500,
["round"]=1
}
},
["obj"]=2,
["cd"]=0,
["cd_start"]=0
},
[10062]={
["skill_type"]=3,
["skill_type_parameter"]={
5,
2
},
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=30000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="normal_attack_dec",
["num"]=1,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=2,
["skill_position"]=1,
["cd"]=2,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
["name_act"]="skill01",
["fx_self"]=200039,
["bullet_time"]={
333,
3000,
666
}
},
[10063]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=30000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="normal_attack_dec",
["num"]=1,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=2,
["skill_position"]=1,
["cd"]=3,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
["name_act"]="skill01",
["fx_self"]=200039,
["bullet_time"]={
333,
3000,
666
}
},
[10064]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=30000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="normal_attack_dec",
["num"]=1,
["ratio"]=10000,
["round"]=2
},
{
["type"]="weaken",
["num"]=2500,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=2,
["skill_position"]=1,
["cd"]=3,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
["name_act"]="skill01",
["fx_self"]=200039,
["bullet_time"]={
333,
3000,
666
}
},
[10065]={
["skill_type"]=3,
["skill_type_parameter"]={
2,
2
},
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=30000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="burn",
["num"]=5000,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=2,
["skill_position"]=1,
["cd"]=3,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
["name_act"]="skill01",
["fx_self"]=200039,
["bullet_time"]={
333,
3000,
666
}
},
[20001]={
["effect_type"]=1,
["trigger"]=1,
@ -11458,6 +11796,6 @@ local skill = {
}
}
local config = {
data=skill,count=550
data=skill,count=556
}
return config

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

@ -1762,7 +1762,7 @@ local skill_rogue = {
["effect"]={
{
["type"]="add_skill",
["num"]=10,
["num"]=3200121,
["ratio"]=10000,
["round"]=1
}
@ -1779,7 +1779,7 @@ local skill_rogue = {
["effect"]={
{
["type"]="add_skill",
["num"]=2200121,
["num"]=3200122,
["ratio"]=10000,
["round"]=1
}
@ -1824,14 +1824,6 @@ local skill_rogue = {
["range"]=1
}
},
["effect"]={
{
["type"]="add_skill",
["num"]=9,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=5,
["icon"]="48"
},
@ -3163,7 +3155,8 @@ local skill_rogue = {
["weight"]=100000,
["qlt"]=4,
["type"]=6,
["skill_position"]=5
["skill_position"]=5,
["icon"]="190"
},
[5400101]={
["limit_times"]=1,
@ -3175,7 +3168,7 @@ local skill_rogue = {
10000
},
["skill_position"]=5,
["icon"]="190"
["icon"]="164"
},
[5400102]={
["limit_times"]=1,
@ -3192,7 +3185,7 @@ local skill_rogue = {
}
},
["obj"]=7,
["icon"]="164"
["icon"]="165"
},
[5400103]={
["limit_times"]=1,
@ -3209,7 +3202,7 @@ local skill_rogue = {
}
},
["obj"]=7,
["icon"]="165"
["icon"]="166"
},
[5400104]={
["limit_times"]=1,
@ -3226,7 +3219,7 @@ local skill_rogue = {
}
},
["obj"]=7,
["icon"]="166"
["icon"]="167"
},
[5400105]={
["limit_times"]=1,
@ -3237,41 +3230,41 @@ local skill_rogue = {
5400123
},
["skill_position"]=5,
["icon"]="167"
["icon"]="168"
},
[5400106]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=12,
["type"]=9,
["skill_position"]=5,
["effect"]={
{
["type"]="add_skill",
["num"]=5400124,
["ratio"]=10000,
["round"]=1
["round"]=0
}
},
["obj"]=7,
["icon"]="168"
["icon"]="169"
},
[5400107]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=12,
["type"]=9,
["skill_position"]=5,
["effect"]={
{
["type"]="add_skill",
["num"]=5400125,
["ratio"]=10000,
["round"]=1
["round"]=0
}
},
["obj"]=7,
["icon"]="169"
["icon"]="170"
}
}
local config = {

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

@ -182,6 +182,8 @@ local localization_global =
["SHOP_DESC_34"] = "首充豪礼",
["SHOP_DESC_35"] = "充值购买任意商品,即可获得如下奖励,仅此一次！",
["SHOP_DESC_36"] = "商店",
["FUNC_OPEN_LEVEL"] = "玩家等级{0}开启",
["FUNC_OPEN_STAGE"] = "通关章节{0}开启",
}
return localization_global

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

@ -261,7 +261,7 @@ local skill_rogue = {
["desc"]="旋风骨技能伤害提升。"
},
[2300103]={
["desc"]="旋风骨对昏睡敌人有50%概率附加眩晕效果，1回合。"
["desc"]="旋风骨对易伤敌人有50%概率附加眩晕效果，1回合。"
},
[2300104]={
["desc"]="旋风骨附加的流血效果，回合数+1。"

5
lua/app/config/strings/cn/tutorial.lua
View File

@ -10,9 +10,12 @@ local tutorial = {
},
["tutorial_txt_4"]={
["value"]="领取宝箱，获取第五位英雄"
},
["tutorial_txt_5"]={
["value"]="前往商城，获得更多英雄！"
}
}
local config = {
data=tutorial,count=4
data=tutorial,count=5
}
return config

5
lua/app/config/strings/de/tutorial.lua
View File

@ -10,9 +10,12 @@ local tutorial = {
},
["tutorial_txt_4"]={
},
["tutorial_txt_5"]={
}
}
local config = {
data=tutorial,count=4
data=tutorial,count=5
}
return config

5
lua/app/config/strings/en/tutorial.lua
View File

@ -10,9 +10,12 @@ local tutorial = {
},
["tutorial_txt_4"]={
["value"]="Claim chest to unlock the 5th hero"
},
["tutorial_txt_5"]={
}
}
local config = {
data=tutorial,count=4
data=tutorial,count=5
}
return config

5
lua/app/config/strings/fr/tutorial.lua
View File

@ -10,9 +10,12 @@ local tutorial = {
},
["tutorial_txt_4"]={
},
["tutorial_txt_5"]={
}
}
local config = {
data=tutorial,count=4
data=tutorial,count=5
}
return config

5
lua/app/config/strings/ja/tutorial.lua
View File

@ -10,9 +10,12 @@ local tutorial = {
},
["tutorial_txt_4"]={
},
["tutorial_txt_5"]={
}
}
local config = {
data=tutorial,count=4
data=tutorial,count=5
}
return config

5
lua/app/config/strings/ko/tutorial.lua
View File

@ -10,9 +10,12 @@ local tutorial = {
},
["tutorial_txt_4"]={
},
["tutorial_txt_5"]={
}
}
local config = {
data=tutorial,count=4
data=tutorial,count=5
}
return config

5
lua/app/config/strings/zh/tutorial.lua
View File

@ -10,9 +10,12 @@ local tutorial = {
},
["tutorial_txt_4"]={
["value"]="領取寶箱，獲取第五位英雄"
},
["tutorial_txt_5"]={
}
}
local config = {
data=tutorial,count=4
data=tutorial,count=5
}
return config

34
lua/app/config/tutorial.lua
View File

@ -344,7 +344,7 @@ local tutorial = {
[40040]={
["next_id"]=40050,
["type"]=2,
["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_2/prop_node/hero_cell_1",
["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_2/prop_node/hero_cell_3",
["arrow_direction"]=1,
["arrow_offset"]={
0,
@ -409,6 +409,7 @@ local tutorial = {
}
},
[40080]={
["next_id"]=40090,
["type"]=2,
["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn",
["arrow_direction"]=1,
@ -416,9 +417,38 @@ local tutorial = {
0,
-50
}
},
[40090]={
["next_id"]=40100,
["type"]=2,
["txt"]="tutorial_txt_5",
["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_1",
["arrow_direction"]=1,
["arrow_offset"]={
0,
0
},
["show_mask"]=1,
["square_size"]={
50,
50
},
["square_offset"]={
0,
0
}
},
[40100]={
["type"]=2,
["target_name"]="main_ui(Clone)/sub_ui_node/shop_comp/main/scrollrect/viewport/content/box_sell_cell/bg/box_1/buy_btn",
["arrow_direction"]=1,
["arrow_offset"]={
0,
-50
}
}
}
local config = {
data=tutorial,count=32
data=tutorial,count=34
}
return config

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

@ -1331,6 +1331,8 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx)
if validEffectIdx then
effectStartIdx = validEffectIdx[1] + 1
effectEndIdx = validEffectIdx[2]
else
effectEndIdx = #effectList
end
for i = effectStartIdx, effectEndIdx do
local effect = effectList[i]
@ -1372,12 +1374,15 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx)
end
function BattleUnitComp:judgeSkillEffectCondition(skill, index)
if not skill then
if not skill or skill:haveBuffCondition() then
return true
end
local buffConditions = skill:getBuffCondition(index)
local conditionRel = skill:getBuffConditionRel(index)
local buffConditionIndex, conditionRel = skill:getBuffConditionRel(index)
if not buffConditionIndex then
return true
end
local buffConditions = skill:getBuffCondition(buffConditionIndex)
return BATTLE_SKILL_CONDITION_HANDLE.judgeSkillEffectCondition(buffConditions, conditionRel, self.battleController)
end

22
lua/app/module/battle/controller/battle_controller.lua
View File

@ -2258,26 +2258,34 @@ function BattleController:resetGrids(posList)
return
end
local canRandomElmentList = {}
if not self.canRandomElmentList then
self.canRandomElmentList = {}
end
for i = #self.canRandomElmentList, 1, -1 do
table.remove(self.canRandomElmentList)
end
local elementCount = 0
for typeName, typeNum in pairs(BattleConst.ELEMENT_TYPE) do
if not lockElementMap[typeNum] and not self:getSealElementType()[typeNum] and self.battleData:getSkillEntityByElement(typeNum) then
table.insert(canRandomElmentList, typeNum)
table.insert(self.canRandomElmentList, typeNum)
elementCount = elementCount + 1
end
end
if not canRandomElmentList[1] then
if elementCount <= 0 then
return
end
local elementCount = #canRandomElmentList
local mainElement = canRandomElmentList[math.random(1, elementCount)]
local mainElement = self.canRandomElmentList[math.random(1, elementCount)]
for typeNum, _ in pairs(lockElementMap) do
table.insert(canRandomElmentList, typeNum)
table.insert(self.canRandomElmentList, typeNum)
elementCount = elementCount + 1
end
local resetPosInfo = self:_dealResetGridsDataFunc2(useMap, emptySnapList, mainElement, backupSkill, keepSnapList, posMap, canRandomElmentList, elementCount, lockElementMap)
local resetPosInfo = self:_dealResetGridsDataFunc2(useMap, emptySnapList, mainElement, backupSkill, keepSnapList, posMap, self.canRandomElmentList, elementCount, lockElementMap)
return resetPosInfo
end

2
lua/app/module/battle/skill/battle_board_skill_handle.lua
View File

@ -336,12 +336,14 @@ local function _takeAddSkillEnergy(atkUnitComp, skillEntity, battleController)
local boardSkills
local count = 0
for eType, entity in pairs(battleController.battleData:getSkillEntities()) do
if entity:getUnlocked() then
if not boardSkills then
boardSkills = {}
end
table.insert(boardSkills, eType)
count = count + 1
end
end
if count <= 0 then
return
end

6
lua/app/module/chapter/chapter_manager.lua
View File

@ -109,12 +109,14 @@ function ChapterManager:endFightFinish(result)
data.max_chapter = newMaxChapter
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
-- 标记可弹出新手礼包
if newMaxChapter == 2 then
if maxChapter == 1 then
DataManager.ShopData:markPopUpGiftForBeginnerGift()
end
-- 章节通关 标记可弹出章节礼包
DataManager.ShopData:markPopUpGiftForActChapterStore(newMaxChapter - 1)
DataManager.ShopData:markPopUpGiftForActChapterStore(maxChapter)
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_PASS_CHAPTER)
-- 章节通关 检查是否要弹出英雄解锁界面
DataManager.HeroData:checkIfCanShowHeroUnlock(maxChapter)
end
ModuleManager.TaskManager:addFightTaskProgress(reqData)

9
lua/app/module/hero/hero_manager.lua
View File

@ -4,6 +4,10 @@ function HeroManager:showHeroDetailUI(heroId)
UIManager:showUI("app/ui/hero/hero_detail_ui", {heroId = heroId})
end
function HeroManager:showHeroUnlockUI(heroIdList)
UIManager:showUI("app/ui/hero/hero_unlock_ui", {heroIdList = heroIdList})
end
function HeroManager:upgradeHero(heroId, heroEntity)
local heroEntity = heroEntity or DataManager.HeroData:getHeroById(heroId)
if not heroEntity then
@ -12,7 +16,6 @@ function HeroManager:upgradeHero(heroId, heroEntity)
local canLvUp, state = heroEntity:canLvUp(true)
if not canLvUp then
-- 如果是金币不足 尝试触发金币礼包
if state == GConst.HeroConst.CHECK_LV_UP_STATE.COIN_NOT_ENOUGH then
ModuleManager.ShopManager:tryTriggerCoinGift()
@ -44,6 +47,10 @@ function HeroManager:getHeroName(id, needColor)
return name
end
function HeroManager:getHeroDesc(id)
return I18N:getConfig("hero")[id].desc
end
function HeroManager:getHeroIcon(heroId)
local cfg = ConfigManager:getConfig("hero")[heroId]
return cfg and tostring(cfg.icon)

63
lua/app/ui/hero/hero_unlock_ui.lua Normal file
View File

@ -0,0 +1,63 @@
local HeroUnlockUI = class("HeroUnlockUI", BaseUI)
function HeroUnlockUI:getPrefabPath()
return "assets/prefabs/ui/hero/hero_unlock_ui.prefab"
end
function HeroUnlockUI:ctor(params)
self.heroIdList = params and params.heroIdList
end
function HeroUnlockUI:onLoadRootComplete()
self.uiMap = self.root:genAllChildren()
self.uiMap["hero_unlock_ui.bg"]:addClickListener(function()
self:closeUI()
end)
self:initTitleAndDesc()
self:initHeroes()
end
function HeroUnlockUI:initTitleAndDesc()
self.uiMap["player_level_up_ui.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_UNLOCK))
self.uiMap["player_level_up_ui.reward_title"]:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_UNLOCK_DESC))
self.uiMap["player_level_up_ui.continue"]:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_TO_CONTINUE))
end
function HeroUnlockUI:initHeroes()
if self.heroIdList then
local count = #self.heroIdList
if count > 3 then
count = 3
end
if count > 0 then
for i = 1, count do
local heroEntity = DataManager.HeroData:getHeroById(self.heroIdList[i])
self.uiMap["hero_unlock_ui.bg_" .. i]:setVisible(true)
local rewardCell = self.uiMap["hero_unlock_ui.bg_" .. i .. ".reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
rewardCell:refreshItemById(heroEntity:getFragmentId(), 0)
self.uiMap["hero_unlock_ui.bg_" .. i .. ".name_tx"]:setText(heroEntity:getName())
self.uiMap["hero_unlock_ui.bg_" .. i .. ".desc_tx"]:setText(heroEntity:getDesc())
end
for i = count + 1, 3 do
self.uiMap["hero_unlock_ui.bg_" .. i]:setVisible(false)
end
if count == 1 then
self.uiMap["hero_unlock_ui.bg_1"]:setAnchoredPositionY(100)
else
self.uiMap["hero_unlock_ui.bg_1"]:setAnchoredPositionY(180)
end
else
self:hideAllHeroes()
end
else
self:hideAllHeroes()
end
end
function HeroUnlockUI:hideAllHeroes()
self.uiMap["hero_unlock_ui.bg_1"]:setVisible(false)
self.uiMap["hero_unlock_ui.bg_2"]:setVisible(false)
self.uiMap["hero_unlock_ui.bg_3"]:setVisible(false)
end
return HeroUnlockUI

10
lua/app/ui/hero/hero_unlock_ui.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 51bd98d3fbf493b44b3cbf37ead6a3ad
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

10
lua/app/ui/main_city/main_city_ui.lua
View File

@ -809,12 +809,22 @@ function MainCityUI:checkSideBarOpenStatus()
end
end
-- 弹窗优先级： 升级>功能弹窗>英雄解锁弹窗>礼包弹窗>引导
function MainCityUI:checkMainPop()
-- 检查是否升级
if DataManager.PlayerData:getIfCanLevelUp() then
ModuleManager.PlayerManager:levelUp()
return
end
-- 是否是否有英雄解锁弹窗
if DataManager.HeroData:getIfCanShowHeroUnlock() then
local list = DataManager.HeroData:getHeroChapterUnlockList()
DataManager.HeroData:markShowHeroUnlock()
if list and #list > 0 then
ModuleManager.HeroManager:showHeroUnlockUI(list)
return
end
end
-- 引导
if self:checkTutorial() then

14
lua/app/userdata/battle/skill/battle_skill_entity.lua
View File

@ -30,6 +30,7 @@ function BattleSkillEntity:init()
self.available = false
end
self:clearRecordData()
self.buffConditionRel = nil
end
function BattleSkillEntity:initSkillEffect()
@ -210,12 +211,17 @@ function BattleSkillEntity:getBuffConditionRel(index)
if not self.skillInfo.condition_rel then
return
end
for _, info in ipairs(self.skillInfo.condition_rel) do
if info[1] == index then
return info[2]
if not self.buffConditionRel then
self.buffConditionRel = {}
for i, info in ipairs(self.skillInfo.condition_rel) do
self.buffConditionRel[info[1]] = {i, info[2]}
end
end
return self.skillInfo.condition_rel[index]
return self.buffConditionRel[index]
end
function BattleSkillEntity:haveBuffCondition()
return self.skillInfo.condition_rel ~= nil
end
function BattleSkillEntity:getTargetType()

34
lua/app/userdata/hero/hero_data.lua
View File

@ -7,6 +7,8 @@ function HeroData:ctor()
self.data.isDirty = false
self.matchActiveHeroMap = {}
self.maxHeroLvOnInit = 0
self.showHeroUnlockChapter = 0
self.heroChapterUnlockMap = {}
end
function HeroData:clear()
@ -15,6 +17,9 @@ end
function HeroData:init(data)
self.heroes = {}
for k, v in pairs(self.heroChapterUnlockMap) do
self.heroChapterUnlockMap[k] = false
end
if data then
for id, heroInfo in pairs(data) do
self:addHero(heroInfo.id, heroInfo.level)
@ -34,8 +39,12 @@ function HeroData:init(data)
end
self.matchActiveHeroMap[matchType][entity:getCfgId()] = true
end
if info.unlock_chapter and info.is_show == 1 then
self.heroChapterUnlockMap[info.unlock_chapter] = true
end
end
self.showHeroUnlockChapter = 0
end
function HeroData:addHero(cfgId, lv)
if self.heroes[cfgId] then
@ -132,4 +141,29 @@ function HeroData:getMaxHeroLvOnInit()
return self.maxHeroLvOnInit
end
function HeroData:getIfCanShowHeroUnlock()
return self.showHeroUnlockChapter > 0
end
function HeroData:markShowHeroUnlock()
self.showHeroUnlockChapter = 0
end
function HeroData:checkIfCanShowHeroUnlock(chapterId)
if not self.heroChapterUnlockMap[chapterId] then
return
end
self.showHeroUnlockChapter = chapterId
end
function HeroData:getHeroChapterUnlockList()
local list = {}
for id, entity in pairs(self.heroes) do
if not entity:isActived() and entity:getUnlcokChapter() == self.showHeroUnlockChapter then
table.insert(list, id)
end
end
return list
end
return HeroData

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

@ -225,6 +225,11 @@ function HeroEntity:getName()
return ModuleManager.HeroManager:getHeroName(self:getCfgId())
end
function HeroEntity:getDesc()
return ModuleManager.HeroManager:getHeroDesc(self:getCfgId())
end
function HeroEntity:getActiveRogueCount()
local lvInfo = ConfigManager:getConfig("hero_level")[self.data.lv]
if not lvInfo then

4
lua/app/userdata/shop/shop_data.lua
View File

@ -759,11 +759,11 @@ end
-- 底部栏是否有红点
function ShopData:getRp()
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL) then
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, true) then
return false
end
local isHotOpen = ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL_DAILY)
local isHotOpen = ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL_DAILY, true)
-- 主要商品 每日特惠广告道具
local hotAdGoods = self:getMallDailyGoods() and self:getMallDailyGoods()[1]
local hotAdGoodsBuyCount = hotAdGoods and hotAdGoods.bought or 0