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

边缘障碍物逻辑优化

Browse Source
This commit is contained in:
xiekaidong 2023-08-11 15:17:28 +08:00
parent 213e82f2c1
commit 866094a76f
29 changed files with 5737 additions and 1061 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lua/app/config/avatar.lua
View File

@ -111,6 +111,26 @@ local avatar = {
["iconId"]="26", ["iconId"]="26",
["hero"]=54002 ["hero"]=54002
}, },
[14003]={
["iconId"]="31",
["hero"]=14003
},
[24003]={
["iconId"]="27",
["hero"]=24003
},
[34003]={
["iconId"]="28",
["hero"]=34003
},
[44003]={
["iconId"]="29",
["hero"]=44003
},
[54003]={
["iconId"]="30",
["hero"]=54003
},
[1400201]={ [1400201]={
["iconId"]="skin_3", ["iconId"]="skin_3",
["item"]=1400201 ["item"]=1400201
@ -129,6 +149,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

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

@ -7379,7 +7379,7 @@ local chapter = {
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
41710, 41710,
53745 52198
} }
}, },
[36]={ [36]={
@ -7597,8 +7597,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
37410, 41904,
63294 53805
} }
}, },
[37]={ [37]={
@ -7816,8 +7816,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
38984, 43347,
66067 55615
} }
}, },
[38]={ [38]={
@ -8035,8 +8035,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
41000, 44750,
69592 57395
} }
}, },
[39]={ [39]={
@ -8254,8 +8254,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
42574, 46208,
72471 59200
} }
}, },
[40]={ [40]={
@ -8472,8 +8472,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
46207, 49049,
78535 62756
} }
} }
} }

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

File diff suppressed because it is too large Load Diff

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

@ -1601,9 +1601,696 @@ local chapter_daily_challenge = {
13 13
} }
} }
},
[8]={
["scene"]="bg_27",
["block_icon"]="battle_hinder_27",
["chess_board"]="chessboard_1",
["chapter_board_daily_challenge"]={
29,
30,
31,
32
},
["monster"]={
14102,
14202,
14302,
14402,
14502,
14602,
14702,
14802,
14902,
15002,
15102,
15202,
15302,
15402,
15502,
15602,
15702,
15802,
15902,
16002
},
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=80,
["num_for_nothing"]="Xgg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=7,
["id_for_nothing"]="UQ==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["begin_buff_id"]={
{
1,
8
},
{
1,
9
},
{
1,
10
},
{
1,
11
},
{
1,
12
},
{
1,
13
},
{
2,
8
},
{
2,
9
},
{
2,
10
},
{
2,
11
},
{
2,
12
},
{
2,
13
},
{
3,
8
},
{
3,
9
},
{
3,
10
},
{
3,
11
},
{
3,
12
},
{
3,
13
},
{
4,
8
},
{
4,
9
},
{
4,
10
},
{
4,
11
},
{
4,
12
},
{
4,
13
},
{
5,
8
},
{
5,
9
},
{
5,
10
},
{
5,
11
},
{
5,
12
},
{
5,
13
},
{
6,
8
},
{
6,
9
},
{
6,
10
},
{
6,
12
},
{
6,
13
},
{
7,
8
},
{
7,
9
},
{
7,
10
},
{
7,
12
},
{
7,
13
}
}
},
[9]={
["scene"]="bg_30",
["block_icon"]="battle_hinder_29",
["chess_board"]="chessboard_3",
["chapter_board_daily_challenge"]={
33,
34,
35,
36
},
["monster"]={
16102,
16202,
16302,
16402,
16502,
16602,
16702,
16802,
16902,
17002,
17102,
17202,
17302,
17402,
17502,
17602,
17702,
17802,
17902,
18002
},
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=80,
["num_for_nothing"]="Xgg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=7,
["id_for_nothing"]="UQ==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["begin_buff_id"]={
{
1,
8
},
{
1,
9
},
{
1,
10
},
{
1,
11
},
{
1,
12
},
{
1,
13
},
{
2,
8
},
{
2,
9
},
{
2,
10
},
{
2,
11
},
{
2,
12
},
{
2,
13
},
{
3,
8
},
{
3,
9
},
{
3,
10
},
{
3,
11
},
{
3,
12
},
{
3,
13
},
{
4,
8
},
{
4,
9
},
{
4,
10
},
{
4,
11
},
{
4,
12
},
{
4,
13
},
{
5,
8
},
{
5,
9
},
{
5,
10
},
{
5,
11
},
{
5,
12
},
{
5,
13
},
{
6,
8
},
{
6,
9
},
{
6,
10
},
{
6,
12
},
{
6,
13
},
{
7,
8
},
{
7,
9
},
{
7,
10
},
{
7,
12
},
{
7,
13
}
}
},
[10]={
["scene"]="bg_35",
["block_icon"]="battle_hinder_35",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
37,
38,
39,
40
},
["monster"]={
18102,
18202,
18302,
18402,
18502,
18602,
18702,
18802,
18902,
19002,
19102,
19202,
19302,
19402,
19502,
19602,
19702,
19802,
19902,
20002
},
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=80,
["num_for_nothing"]="Xgg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=7,
["id_for_nothing"]="UQ==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["begin_buff_id"]={
{
1,
8
},
{
1,
9
},
{
1,
10
},
{
1,
11
},
{
1,
12
},
{
1,
13
},
{
2,
8
},
{
2,
9
},
{
2,
10
},
{
2,
11
},
{
2,
12
},
{
2,
13
},
{
3,
8
},
{
3,
9
},
{
3,
10
},
{
3,
11
},
{
3,
12
},
{
3,
13
},
{
4,
8
},
{
4,
9
},
{
4,
10
},
{
4,
11
},
{
4,
12
},
{
4,
13
},
{
5,
8
},
{
5,
9
},
{
5,
10
},
{
5,
11
},
{
5,
12
},
{
5,
13
},
{
6,
8
},
{
6,
9
},
{
6,
10
},
{
6,
12
},
{
6,
13
},
{
7,
8
},
{
7,
9
},
{
7,
10
},
{
7,
12
},
{
7,
13
}
}
} }
} }
local config = { local config = {
data=chapter_daily_challenge,count=7 data=chapter_daily_challenge,count=10
} }
return config return config

297
lua/app/config/fx.lua
View File

@ -636,6 +636,10 @@ local fx = {
["res"]="sfx_m10064_b01", ["res"]="sfx_m10064_b01",
["bind"]="root" ["bind"]="root"
}, },
[100116]={
["res"]="sfx_m10068_b01",
["bind"]="root"
},
[200000]={ [200000]={
["res"]="sfx_m20001_b01", ["res"]="sfx_m20001_b01",
["bind"]="root" ["bind"]="root"
@ -1300,6 +1304,90 @@ local fx = {
["res"]="sfx_m20043_b05", ["res"]="sfx_m20043_b05",
["bind"]="root" ["bind"]="root"
}, },
[200166]={
["res"]="sfx_m20044_b01",
["bind"]="root"
},
[200167]={
["res"]="sfx_m20044_b02",
["bind"]="root"
},
[200168]={
["res"]="sfx_m20044_b03",
["bind"]="root"
},
[200169]={
["res"]="sfx_m20044_b04",
["bind"]="root"
},
[200170]={
["res"]="sfx_m20044_b05",
["bind"]="root"
},
[200171]={
["res"]="sfx_m20045_b01",
["bind"]="root"
},
[200172]={
["res"]="sfx_m20045_b02",
["bind"]="root"
},
[200173]={
["res"]="sfx_m20045_b04",
["bind"]="root"
},
[200174]={
["res"]="sfx_m20046_b01",
["bind"]="root"
},
[200175]={
["res"]="sfx_m20046_b02",
["bind"]="root"
},
[200176]={
["res"]="sfx_m20046_b03",
["bind"]="root"
},
[200177]={
["res"]="sfx_m20046_b04",
["bind"]="root"
},
[200178]={
["res"]="sfx_m20047_b01",
["bind"]="root"
},
[200179]={
["res"]="sfx_m20047_b02",
["bind"]="root"
},
[200180]={
["res"]="sfx_m20047_b03",
["bind"]="root"
},
[200181]={
["res"]="sfx_m20047_b05",
["bind"]="root"
},
[200182]={
["res"]="sfx_m20048_b01",
["bind"]="root"
},
[200183]={
["res"]="sfx_m20048_b02",
["bind"]="root"
},
[200184]={
["res"]="sfx_m20048_b03",
["bind"]="root"
},
[200185]={
["res"]="sfx_m20048_b04",
["bind"]="root"
},
[200186]={
["res"]="sfx_m20048_b05",
["bind"]="root"
},
[300000]={ [300000]={
["res"]="sfx_p0001_b01", ["res"]="sfx_p0001_b01",
["bind"]="root" ["bind"]="root"
@ -1768,6 +1856,98 @@ local fx = {
["res"]="sfx_p0026_b05", ["res"]="sfx_p0026_b05",
["bind"]="root" ["bind"]="root"
}, },
[300117]={
["res"]="sfx_p0027_b01",
["bind"]="root"
},
[300118]={
["res"]="sfx_p0027_b02",
["bind"]="root"
},
[300119]={
["res"]="sfx_p0027_b03",
["bind"]="root"
},
[300120]={
["res"]="sfx_p0027_b04",
["bind"]="root"
},
[300121]={
["res"]="sfx_p0027_b05",
["bind"]="root"
},
[300122]={
["res"]="sfx_p0028_b01",
["bind"]="root"
},
[300123]={
["res"]="sfx_p0028_b02",
["bind"]="root"
},
[300124]={
["res"]="sfx_p0028_b03",
["bind"]="root"
},
[300125]={
["res"]="sfx_p0028_b04",
["bind"]="root"
},
[300126]={
["res"]="sfx_p0028_b05",
["bind"]="root"
},
[300127]={
["res"]="sfx_p0029_b01",
["bind"]="root"
},
[300128]={
["res"]="sfx_p0029_b02",
["bind"]="root"
},
[300129]={
["res"]="sfx_p0029_b03",
["bind"]="root"
},
[300130]={
["res"]="sfx_p0029_b04",
["bind"]="root"
},
[300131]={
["res"]="sfx_p0029_b05",
["bind"]="root"
},
[300132]={
["res"]="sfx_p0030_b01",
["bind"]="root"
},
[300133]={
["res"]="sfx_p0030_b02",
["bind"]="root"
},
[300134]={
["res"]="sfx_p0030_b05",
["bind"]="root"
},
[300135]={
["res"]="sfx_p0031_b01",
["bind"]="root"
},
[300136]={
["res"]="sfx_p0031_b02",
["bind"]="root"
},
[300137]={
["res"]="sfx_p0031_b03",
["bind"]="root"
},
[300138]={
["res"]="sfx_p0031_b04",
["bind"]="root"
},
[300139]={
["res"]="sfx_p0031_b05",
["bind"]="root"
},
[400000]={ [400000]={
["res"]="sfx_p0012_b01", ["res"]="sfx_p0012_b01",
["bind"]="root", ["bind"]="root",
@ -2352,9 +2532,124 @@ local fx = {
["res"]="sfx_p0026_b05", ["res"]="sfx_p0026_b05",
["bind"]="root", ["bind"]="root",
["flip"]=1 ["flip"]=1
},
[400117]={
["res"]="sfx_p0027_b01",
["bind"]="root",
["flip"]=1
},
[400118]={
["res"]="sfx_p0027_b02",
["bind"]="root",
["flip"]=1
},
[400119]={
["res"]="sfx_p0027_b03",
["bind"]="root",
["flip"]=1
},
[400120]={
["res"]="sfx_p0027_b04",
["bind"]="root",
["flip"]=1
},
[400121]={
["res"]="sfx_p0027_b05",
["bind"]="root",
["flip"]=1
},
[400122]={
["res"]="sfx_p0028_b01",
["bind"]="root",
["flip"]=1
},
[400123]={
["res"]="sfx_p0028_b02",
["bind"]="root",
["flip"]=1
},
[400124]={
["res"]="sfx_p0028_b03",
["bind"]="root",
["flip"]=1
},
[400125]={
["res"]="sfx_p0028_b04",
["bind"]="root",
["flip"]=1
},
[400126]={
["res"]="sfx_p0028_b05",
["bind"]="root",
["flip"]=1
},
[400127]={
["res"]="sfx_p0029_b01",
["bind"]="root",
["flip"]=1
},
[400128]={
["res"]="sfx_p0029_b02",
["bind"]="root",
["flip"]=1
},
[400129]={
["res"]="sfx_p0029_b03",
["bind"]="root",
["flip"]=1
},
[400130]={
["res"]="sfx_p0029_b04",
["bind"]="root",
["flip"]=1
},
[400131]={
["res"]="sfx_p0029_b05",
["bind"]="root",
["flip"]=1
},
[400132]={
["res"]="sfx_p0030_b01",
["bind"]="root",
["flip"]=1
},
[400133]={
["res"]="sfx_p0030_b02",
["bind"]="root",
["flip"]=1
},
[400134]={
["res"]="sfx_p0030_b05",
["bind"]="root",
["flip"]=1
},
[400135]={
["res"]="sfx_p0031_b01",
["bind"]="root",
["flip"]=1
},
[400136]={
["res"]="sfx_p0031_b02",
["bind"]="root",
["flip"]=1
},
[400137]={
["res"]="sfx_p0031_b03",
["bind"]="root",
["flip"]=1
},
[400138]={
["res"]="sfx_p0031_b04",
["bind"]="root",
["flip"]=1
},
[400139]={
["res"]="sfx_p0031_b05",
["bind"]="root",
["flip"]=1
} }
} }
local config = { local config = {
data=fx,count=556 data=fx,count=624
} }
return config return config

6
lua/app/config/grid_edge_type.lua
View File

@ -1,15 +1,15 @@
local grid_edge_type = { local grid_edge_type = {
[1]={ [1]={
["icon"]="battle_obstacle_stick_3", ["icon"]="battle_obstacle_coral_1",
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_za_b01"
}, },
[2]={ [2]={
["icon"]="battle_obstacle_stick_2", ["icon"]="battle_obstacle_coral_2",
["next_type"]=1, ["next_type"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_za_b01"
}, },
[3]={ [3]={
["icon"]="battle_obstacle_stick_1", ["icon"]="battle_obstacle_coral_3",
["next_type"]=2, ["next_type"]=2,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_za_b01"
} }

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

@ -445,6 +445,7 @@ local LocalizationGlobalConst =
ACT_DESC_9 = "ACT_DESC_9", ACT_DESC_9 = "ACT_DESC_9",
ACT_DESC_10 = "ACT_DESC_10", ACT_DESC_10 = "ACT_DESC_10",
ACT_DESC_11 = "ACT_DESC_11", ACT_DESC_11 = "ACT_DESC_11",
ACT_DESC_12 = "ACT_DESC_12",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

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

File diff suppressed because it is too large Load Diff

831
lua/app/config/monster_daily_challenge.lua
View File

@ -1869,9 +1869,838 @@ local monster_daily_challenge = {
10013 10013
}, },
["monster_exp"]=22000 ["monster_exp"]=22000
},
[14102]={
["monster_base"]=10058,
["hp"]=21820000,
["atk"]=610000,
["atk_times"]=3,
["hurt_skill"]={
20169,
20170,
20171
},
["monster_exp"]=11000
},
[14202]={
["monster_base"]=10051,
["hp"]=30000000,
["atk"]=660000,
["atk_times"]=3,
["hurt_skill"]={
20148,
20149,
20150
},
["monster_exp"]=11000
},
[14302]={
["monster_base"]=10055,
["hp"]=32730000,
["atk"]=710000,
["atk_times"]=3,
["hurt_skill"]={
20160,
20161,
20162
},
["monster_exp"]=17000
},
[14402]={
["monster_base"]=10057,
["hp"]=40910000,
["atk"]=760000,
["atk_times"]=3,
["hurt_skill"]={
20166,
20167,
20168
},
["monster_exp"]=19000
},
[14502]={
["monster_base"]=20031,
["is_boss"]=1,
["hp"]=62730000,
["atk"]=910000,
["atk_times"]=4,
["hurt_skill"]={
30091,
30092,
30093
},
["skill"]={
10058,
10059
},
["passive_skill"]={
10008,
10011,
10013
},
["monster_exp"]=18000
},
[14602]={
["monster_base"]=10051,
["hp"]=40910000,
["atk"]=760000,
["atk_times"]=3,
["hurt_skill"]={
20148,
20149,
20150
},
["monster_exp"]=9000
},
[14702]={
["monster_base"]=10027,
["hp"]=46360000,
["atk"]=810000,
["atk_times"]=3,
["hurt_skill"]={
20076,
20077,
20078
},
["monster_exp"]=10000
},
[14802]={
["monster_base"]=10052,
["hp"]=54550000,
["atk"]=810000,
["atk_times"]=3,
["hurt_skill"]={
20151,
20152,
20153
},
["monster_exp"]=11000
},
[14902]={
["monster_base"]=10061,
["hp"]=60000000,
["atk"]=850000,
["atk_times"]=3,
["hurt_skill"]={
20178,
20179,
20180
},
["monster_exp"]=12000
},
[15002]={
["monster_base"]=20034,
["is_boss"]=1,
["hp"]=114550000,
["atk"]=980000,
["atk_times"]=4,
["hurt_skill"]={
30097,
30098,
30099
},
["skill"]={
10074,
10075
},
["passive_skill"]={
10013,
10012
},
["monster_exp"]=12000
},
[15102]={
["monster_base"]=10030,
["hp"]=62730000,
["atk"]=850000,
["atk_times"]=3,
["hurt_skill"]={
20085,
20086,
20087
},
["monster_exp"]=16000
},
[15202]={
["monster_base"]=10029,
["hp"]=76360000,
["atk"]=910000,
["atk_times"]=3,
["hurt_skill"]={
20082,
20083,
20084
},
["monster_exp"]=18000
},
[15302]={
["monster_base"]=10033,
["hp"]=84550000,
["atk"]=950000,
["atk_times"]=3,
["hurt_skill"]={
20094,
20095,
20096
},
["monster_exp"]=21000
},
[15402]={
["monster_base"]=10054,
["hp"]=95450000,
["atk"]=1000000,
["atk_times"]=3,
["hurt_skill"]={
20157,
20158,
20159
},
["monster_exp"]=22000
},
[15502]={
["monster_base"]=20010,
["is_boss"]=1,
["hp"]=141820000,
["atk"]=1070000,
["atk_times"]=4,
["hurt_skill"]={
30028,
30029,
30030
},
["skill"]={
10041,
10066
},
["passive_skill"]={
10008,
10009,
10013
},
["monster_exp"]=24000
},
[15602]={
["monster_base"]=10027,
["hp"]=109090000,
["atk"]=1060000,
["atk_times"]=3,
["hurt_skill"]={
20076,
20077,
20078
},
["monster_exp"]=15000
},
[15702]={
["monster_base"]=10047,
["hp"]=120000000,
["atk"]=1100000,
["atk_times"]=3,
["hurt_skill"]={
20136,
20137,
20138
},
["monster_exp"]=16000
},
[15802]={
["monster_base"]=10057,
["hp"]=136360000,
["atk"]=1150000,
["atk_times"]=3,
["hurt_skill"]={
20166,
20167,
20168
},
["monster_exp"]=17000
},
[15902]={
["monster_base"]=10060,
["hp"]=147270000,
["atk"]=1190000,
["atk_times"]=3,
["hurt_skill"]={
20175,
20176,
20177
},
["monster_exp"]=17000
},
[16002]={
["monster_base"]=20035,
["is_boss"]=2,
["hp"]=245450000,
["atk"]=1640000,
["atk_times"]=4,
["hurt_skill"]={
30100,
30101,
30102,
30113
},
["skill"]={
10076
},
["passive_skill"]={
10011,
10009
},
["monster_exp"]=22000
},
[16102]={
["monster_base"]=10063,
["hp"]=21820000,
["atk"]=610000,
["atk_times"]=3,
["hurt_skill"]={
20184,
20185,
20186
},
["monster_exp"]=11000
},
[16202]={
["monster_base"]=10062,
["hp"]=30000000,
["atk"]=660000,
["atk_times"]=3,
["hurt_skill"]={
20181,
20182,
20183
},
["monster_exp"]=11000
},
[16302]={
["monster_base"]=10022,
["hp"]=32730000,
["atk"]=710000,
["atk_times"]=3,
["hurt_skill"]={
20061,
20062,
20063
},
["monster_exp"]=17000
},
[16402]={
["monster_base"]=10065,
["hp"]=40910000,
["atk"]=760000,
["atk_times"]=3,
["hurt_skill"]={
20187,
20188,
20189
},
["monster_exp"]=19000
},
[16502]={
["monster_base"]=20037,
["is_boss"]=1,
["hp"]=62730000,
["atk"]=910000,
["atk_times"]=4,
["hurt_skill"]={
30106,
30107,
30108
},
["skill"]={
10079
},
["passive_skill"]={
10013,
10009,
10084
},
["monster_exp"]=18000
},
[16602]={
["monster_base"]=10026,
["hp"]=40910000,
["atk"]=760000,
["atk_times"]=3,
["hurt_skill"]={
20073,
20074,
20075
},
["monster_exp"]=9000
},
[16702]={
["monster_base"]=10063,
["hp"]=46360000,
["atk"]=810000,
["atk_times"]=3,
["hurt_skill"]={
20184,
20185,
20186
},
["monster_exp"]=10000
},
[16802]={
["monster_base"]=10062,
["hp"]=54550000,
["atk"]=810000,
["atk_times"]=3,
["hurt_skill"]={
20181,
20182,
20183
},
["monster_exp"]=11000
},
[16902]={
["monster_base"]=10065,
["hp"]=60000000,
["atk"]=850000,
["atk_times"]=3,
["hurt_skill"]={
20187,
20188,
20189
},
["monster_exp"]=12000
},
[17002]={
["monster_base"]=20036,
["is_boss"]=1,
["hp"]=114550000,
["atk"]=980000,
["atk_times"]=4,
["hurt_skill"]={
30103,
30104,
30105
},
["skill"]={
10077,
10078
},
["passive_skill"]={
10011
},
["monster_exp"]=12000
},
[17102]={
["monster_base"]=10063,
["hp"]=62730000,
["atk"]=850000,
["atk_times"]=3,
["hurt_skill"]={
20184,
20185,
20186
},
["monster_exp"]=16000
},
[17202]={
["monster_base"]=10064,
["hp"]=76360000,
["atk"]=910000,
["atk_times"]=3,
["hurt_skill"]={
20190,
20191,
20192
},
["monster_exp"]=18000
},
[17302]={
["monster_base"]=10062,
["hp"]=84550000,
["atk"]=950000,
["atk_times"]=3,
["hurt_skill"]={
20181,
20182,
20183
},
["monster_exp"]=21000
},
[17402]={
["monster_base"]=10026,
["hp"]=95450000,
["atk"]=1000000,
["atk_times"]=3,
["hurt_skill"]={
20073,
20074,
20075
},
["monster_exp"]=22000
},
[17502]={
["monster_base"]=20021,
["is_boss"]=1,
["hp"]=141820000,
["atk"]=1070000,
["atk_times"]=4,
["hurt_skill"]={
30061,
30062,
30063
},
["skill"]={
10034
},
["passive_skill"]={
10011,
10008
},
["monster_exp"]=24000
},
[17602]={
["monster_base"]=10062,
["hp"]=109090000,
["atk"]=1060000,
["atk_times"]=3,
["hurt_skill"]={
20181,
20182,
20183
},
["monster_exp"]=15000
},
[17702]={
["monster_base"]=10063,
["hp"]=120000000,
["atk"]=1100000,
["atk_times"]=3,
["hurt_skill"]={
20184,
20185,
20186
},
["monster_exp"]=16000
},
[17802]={
["monster_base"]=10026,
["hp"]=136360000,
["atk"]=1150000,
["atk_times"]=3,
["hurt_skill"]={
20073,
20074,
20075
},
["monster_exp"]=17000
},
[17902]={
["monster_base"]=10065,
["hp"]=147270000,
["atk"]=1190000,
["atk_times"]=3,
["hurt_skill"]={
20187,
20188,
20189
},
["monster_exp"]=17000
},
[18002]={
["monster_base"]=20038,
["is_boss"]=2,
["hp"]=245450000,
["atk"]=1640000,
["atk_times"]=4,
["hurt_skill"]={
30109,
30110,
30111,
30112
},
["skill"]={
10080,
10081
},
["passive_skill"]={
10083,
10009,
10011
},
["monster_exp"]=22000
},
[18102]={
["monster_base"]=10062,
["hp"]=21820000,
["atk"]=610000,
["atk_times"]=3,
["hurt_skill"]={
20181,
20182,
20183
},
["monster_exp"]=11000
},
[18202]={
["monster_base"]=10069,
["hp"]=30000000,
["atk"]=660000,
["atk_times"]=3,
["hurt_skill"]={
20196,
20197,
20198
},
["monster_exp"]=11000
},
[18302]={
["monster_base"]=10072,
["hp"]=32730000,
["atk"]=710000,
["atk_times"]=3,
["hurt_skill"]={
20205,
20206,
20207
},
["monster_exp"]=17000
},
[18402]={
["monster_base"]=10070,
["hp"]=40910000,
["atk"]=760000,
["atk_times"]=3,
["hurt_skill"]={
20199,
20200,
20201
},
["monster_exp"]=19000
},
[18502]={
["monster_base"]=20045,
["is_boss"]=1,
["hp"]=62730000,
["atk"]=910000,
["atk_times"]=4,
["hurt_skill"]={
30150,
30151,
30152
},
["skill"]={
10133,
10134
},
["passive_skill"]={
10012
},
["monster_exp"]=18000
},
[18602]={
["monster_base"]=10063,
["hp"]=40910000,
["atk"]=760000,
["atk_times"]=3,
["hurt_skill"]={
20184,
20185,
20186
},
["monster_exp"]=9000
},
[18702]={
["monster_base"]=10077,
["hp"]=46360000,
["atk"]=810000,
["atk_times"]=3,
["hurt_skill"]={
20220,
20221,
20222
},
["monster_exp"]=10000
},
[18802]={
["monster_base"]=10068,
["hp"]=54550000,
["atk"]=810000,
["atk_times"]=3,
["hurt_skill"]={
20193,
20194,
20195
},
["monster_exp"]=11000
},
[18902]={
["monster_base"]=10069,
["hp"]=60000000,
["atk"]=850000,
["atk_times"]=3,
["hurt_skill"]={
20196,
20197,
20198
},
["monster_exp"]=12000
},
[19002]={
["monster_base"]=20044,
["is_boss"]=1,
["hp"]=114550000,
["atk"]=980000,
["atk_times"]=4,
["hurt_skill"]={
30147,
30148,
30149
},
["skill"]={
10130,
10131
},
["passive_skill"]={
10132,
10013,
10011
},
["monster_exp"]=12000
},
[19102]={
["monster_base"]=10072,
["hp"]=62730000,
["atk"]=850000,
["atk_times"]=3,
["hurt_skill"]={
20205,
20206,
20207
},
["monster_exp"]=16000
},
[19202]={
["monster_base"]=10069,
["hp"]=76360000,
["atk"]=910000,
["atk_times"]=3,
["hurt_skill"]={
20196,
20197,
20198
},
["monster_exp"]=18000
},
[19302]={
["monster_base"]=10072,
["hp"]=84550000,
["atk"]=950000,
["atk_times"]=3,
["hurt_skill"]={
20205,
20206,
20207
},
["monster_exp"]=21000
},
[19402]={
["monster_base"]=10063,
["hp"]=95450000,
["atk"]=1000000,
["atk_times"]=3,
["hurt_skill"]={
20184,
20185,
20186
},
["monster_exp"]=22000
},
[19502]={
["monster_base"]=20046,
["is_boss"]=1,
["hp"]=141820000,
["atk"]=1070000,
["atk_times"]=4,
["hurt_skill"]={
30153,
30154,
30155
},
["skill"]={
10135,
10136
},
["passive_skill"]={
10012
},
["monster_exp"]=24000
},
[19602]={
["monster_base"]=10077,
["hp"]=109090000,
["atk"]=1060000,
["atk_times"]=3,
["hurt_skill"]={
20220,
20221,
20222
},
["monster_exp"]=15000
},
[19702]={
["monster_base"]=10074,
["hp"]=120000000,
["atk"]=1100000,
["atk_times"]=3,
["hurt_skill"]={
20211,
20212,
20213
},
["monster_exp"]=16000
},
[19802]={
["monster_base"]=10064,
["hp"]=136360000,
["atk"]=1150000,
["atk_times"]=3,
["hurt_skill"]={
20190,
20191,
20192
},
["monster_exp"]=17000
},
[19902]={
["monster_base"]=10062,
["hp"]=147270000,
["atk"]=1190000,
["atk_times"]=3,
["hurt_skill"]={
20181,
20182,
20183
},
["monster_exp"]=17000
},
[20002]={
["monster_base"]=20047,
["is_boss"]=2,
["hp"]=245450000,
["atk"]=1640000,
["atk_times"]=4,
["hurt_skill"]={
30156,
30157,
30158
},
["skill"]={
10137,
10138
},
["passive_skill"]={
10013,
10010
},
["monster_exp"]=22000
} }
} }
local config = { local config = {
data=monster_daily_challenge,count=140 data=monster_daily_challenge,count=200
} }
return config return config

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

@ -1465,8 +1465,8 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=300100, ["fx_self"]=300122,
["fx_self_mirror"]=400100 ["fx_self_mirror"]=400122
}, },
[1400311]={ [1400311]={
["position"]=1, ["position"]=1,
@ -1491,8 +1491,8 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=300101, ["fx_self"]=300123,
["fx_self_mirror"]=400101 ["fx_self_mirror"]=400123
}, },
[1400312]={ [1400312]={
["position"]=1, ["position"]=1,
@ -1517,8 +1517,8 @@ local skill = {
1000021 1000021
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=300102, ["fx_self"]=300124,
["fx_self_mirror"]=400102 ["fx_self_mirror"]=400124
}, },
[1400313]={ [1400313]={
["position"]=1, ["position"]=1,
@ -1543,8 +1543,8 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack04", ["name_act"]="attack04",
["fx_self"]=300103, ["fx_self"]=300125,
["fx_self_mirror"]=400103 ["fx_self_mirror"]=400125
}, },
[1400320]={ [1400320]={
["buff_id"]={ ["buff_id"]={
@ -1603,7 +1603,9 @@ local skill = {
}, },
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["name_act"]="skill01" ["name_act"]="skill01",
["fx_self"]=300126,
["fx_self_mirror"]=400126
}, },
[1400321]={ [1400321]={
["position"]=1, ["position"]=1,
@ -3107,8 +3109,8 @@ local skill = {
2300114 2300114
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=300095, ["fx_self"]=300135,
["fx_self_mirror"]=400095 ["fx_self_mirror"]=400135
}, },
[2400311]={ [2400311]={
["position"]=2, ["position"]=2,
@ -3133,8 +3135,8 @@ local skill = {
4200111 4200111
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=300096, ["fx_self"]=300136,
["fx_self_mirror"]=400096 ["fx_self_mirror"]=400136
}, },
[2400312]={ [2400312]={
["position"]=2, ["position"]=2,
@ -3159,8 +3161,8 @@ local skill = {
4200112 4200112
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=300097, ["fx_self"]=300137,
["fx_self_mirror"]=400097 ["fx_self_mirror"]=400137
}, },
[2400313]={ [2400313]={
["position"]=2, ["position"]=2,
@ -3185,8 +3187,8 @@ local skill = {
4200113 4200113
}, },
["name_act"]="attack04", ["name_act"]="attack04",
["fx_self"]=300098, ["fx_self"]=300138,
["fx_self_mirror"]=400098 ["fx_self_mirror"]=400138
}, },
[2400320]={ [2400320]={
["buff_id"]={ ["buff_id"]={
@ -3237,13 +3239,13 @@ local skill = {
["sound"]=24002200, ["sound"]=24002200,
["sound_delay"]=0.0, ["sound_delay"]=0.0,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_self"]=300099, ["fx_self"]=300139,
["bullet_time"]={ ["bullet_time"]={
633, 633,
3000, 3000,
400 400
}, },
["fx_self_mirror"]=400099 ["fx_self_mirror"]=400139
}, },
[2400321]={ [2400321]={
["position"]=2, ["position"]=2,
@ -4731,7 +4733,9 @@ local skill = {
["sound_hit"]={ ["sound_hit"]={
1000001 1000001
}, },
["name_act"]="attack01" ["name_act"]="attack01",
["fx_self"]=300117,
["fx_self_mirror"]=400117
}, },
[3400311]={ [3400311]={
["position"]=3, ["position"]=3,
@ -4755,7 +4759,9 @@ local skill = {
["sound_hit"]={ ["sound_hit"]={
1000002 1000002
}, },
["name_act"]="attack02" ["name_act"]="attack02",
["fx_self"]=300118,
["fx_self_mirror"]=400118
}, },
[3400312]={ [3400312]={
["position"]=3, ["position"]=3,
@ -4779,7 +4785,9 @@ local skill = {
["sound_hit"]={ ["sound_hit"]={
10049 10049
}, },
["name_act"]="attack03" ["name_act"]="attack03",
["fx_self"]=300119,
["fx_self_mirror"]=400119
}, },
[3400313]={ [3400313]={
["position"]=3, ["position"]=3,
@ -4803,7 +4811,9 @@ local skill = {
["sound_hit"]={ ["sound_hit"]={
10048 10048
}, },
["name_act"]="attack04" ["name_act"]="attack04",
["fx_self"]=300120,
["fx_self_mirror"]=400120
}, },
[3400320]={ [3400320]={
["energy"]=10, ["energy"]=10,
@ -4853,7 +4863,9 @@ local skill = {
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
["sound_delay"]=0.0, ["sound_delay"]=0.0,
["name_act"]="skill01" ["name_act"]="skill01",
["fx_self"]=300121,
["fx_self_mirror"]=400121
}, },
[3400321]={ [3400321]={
["position"]=3, ["position"]=3,
@ -6246,7 +6258,9 @@ local skill = {
["sound_hit"]={ ["sound_hit"]={
10005 10005
}, },
["name_act"]="attack01" ["name_act"]="attack01",
["fx_target"]=300132,
["fx_target_mirror"]=400132
}, },
[4400311]={ [4400311]={
["position"]=4, ["position"]=4,
@ -6270,7 +6284,9 @@ local skill = {
["sound_hit"]={ ["sound_hit"]={
10006 10006
}, },
["name_act"]="attack02" ["name_act"]="attack02",
["fx_target"]=300133,
["fx_target_mirror"]=400133
}, },
[4400312]={ [4400312]={
["position"]=4, ["position"]=4,
@ -6294,7 +6310,9 @@ local skill = {
["sound_hit"]={ ["sound_hit"]={
10023 10023
}, },
["name_act"]="attack03" ["name_act"]="attack03",
["fx_target"]=300133,
["fx_target_mirror"]=400133
}, },
[4400313]={ [4400313]={
["position"]=4, ["position"]=4,
@ -6318,7 +6336,9 @@ local skill = {
["sound_hit"]={ ["sound_hit"]={
10048 10048
}, },
["name_act"]="attack04" ["name_act"]="attack04",
["fx_target"]=300133,
["fx_target_mirror"]=400133
}, },
[4400320]={ [4400320]={
["buff_id"]={ ["buff_id"]={
@ -6377,7 +6397,9 @@ local skill = {
}, },
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["name_act"]="skill01" ["name_act"]="skill01",
["fx_target"]=300134,
["fx_target_mirror"]=400134
}, },
[4400321]={ [4400321]={
["buff_condition"]={ ["buff_condition"]={
@ -7505,7 +7527,7 @@ local skill = {
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=300112, ["fx_self"]=300112,
["fx_self_mirror"]=400112 ["fx_self_mirror"]=400127
}, },
[5400211]={ [5400211]={
["position"]=5, ["position"]=5,
@ -7531,7 +7553,7 @@ local skill = {
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=300113, ["fx_self"]=300113,
["fx_self_mirror"]=400113 ["fx_self_mirror"]=400128
}, },
[5400212]={ [5400212]={
["position"]=5, ["position"]=5,
@ -7557,7 +7579,7 @@ local skill = {
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=300114, ["fx_self"]=300114,
["fx_self_mirror"]=400114 ["fx_self_mirror"]=400129
}, },
[5400213]={ [5400213]={
["position"]=5, ["position"]=5,
@ -7583,7 +7605,7 @@ local skill = {
}, },
["name_act"]="attack04", ["name_act"]="attack04",
["fx_self"]=300115, ["fx_self"]=300115,
["fx_self_mirror"]=400115 ["fx_self_mirror"]=400130
}, },
[5400220]={ [5400220]={
["energy"]=10, ["energy"]=10,
@ -7655,7 +7677,7 @@ local skill = {
3000, 3000,
400 400
}, },
["fx_self_mirror"]=400116 ["fx_self_mirror"]=400131
}, },
[5400221]={ [5400221]={
["position"]=5, ["position"]=5,
@ -7784,7 +7806,7 @@ local skill = {
1000001 1000001
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=300112, ["fx_self"]=300127,
["fx_self_mirror"]=400112 ["fx_self_mirror"]=400112
}, },
[5400311]={ [5400311]={
@ -7810,7 +7832,7 @@ local skill = {
1000002 1000002
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=300113, ["fx_self"]=300128,
["fx_self_mirror"]=400113 ["fx_self_mirror"]=400113
}, },
[5400312]={ [5400312]={
@ -7836,7 +7858,7 @@ local skill = {
1000003 1000003
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=300114, ["fx_self"]=300129,
["fx_self_mirror"]=400114 ["fx_self_mirror"]=400114
}, },
[5400313]={ [5400313]={
@ -7862,7 +7884,7 @@ local skill = {
1000004 1000004
}, },
["name_act"]="attack04", ["name_act"]="attack04",
["fx_self"]=300115, ["fx_self"]=300130,
["fx_self_mirror"]=400115 ["fx_self_mirror"]=400115
}, },
[5400320]={ [5400320]={
@ -7904,7 +7926,7 @@ local skill = {
["sound"]=54002200, ["sound"]=54002200,
["sound_delay"]=0.0, ["sound_delay"]=0.0,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_self"]=300116, ["fx_self"]=300131,
["bullet_time"]={ ["bullet_time"]={
3166, 3166,
3000, 3000,
@ -12362,7 +12384,8 @@ local skill = {
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["name_act"]="skill01" ["name_act"]="skill01",
["fx_self"]=200169
}, },
[10131]={ [10131]={
["skill_type"]=5, ["skill_type"]=5,
@ -12409,7 +12432,8 @@ local skill = {
["cd_start"]=1, ["cd_start"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["name_act"]="skill02" ["name_act"]="skill02",
["fx_self"]=200170
}, },
[10132]={ [10132]={
["effect_type"]=2, ["effect_type"]=2,
@ -12457,7 +12481,8 @@ local skill = {
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["name_act"]="skill01" ["name_act"]="skill01",
["fx_self"]=200171
}, },
[10134]={ [10134]={
["effect_type"]=1, ["effect_type"]=1,
@ -12507,7 +12532,8 @@ local skill = {
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["name_act"]="skill01" ["name_act"]="skill01",
["fx_self"]=200177
}, },
[10136]={ [10136]={
["effect_type"]=1, ["effect_type"]=1,
@ -12619,7 +12645,8 @@ local skill = {
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["name_act"]="skill02" ["name_act"]="skill02",
["fx_self"]=200181
}, },
[10139]={ [10139]={
["skill_type"]=5, ["skill_type"]=5,
@ -12660,7 +12687,8 @@ local skill = {
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["name_act"]="skill01" ["name_act"]="skill01",
["fx_self"]=200185
}, },
[10140]={ [10140]={
["skill_type"]=3, ["skill_type"]=3,
@ -12693,7 +12721,8 @@ local skill = {
["cd_start"]=2, ["cd_start"]=2,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["name_act"]="skill02" ["name_act"]="skill02",
["fx_self"]=200186
}, },
[10141]={ [10141]={
["buff_condition"]={ ["buff_condition"]={
@ -17357,7 +17386,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20194]={ [20194]={
["effect_type"]=1, ["effect_type"]=1,
@ -17381,7 +17410,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20195]={ [20195]={
["effect_type"]=1, ["effect_type"]=1,
@ -17405,7 +17434,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20196]={ [20196]={
["effect_type"]=1, ["effect_type"]=1,
@ -17429,7 +17458,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20197]={ [20197]={
["effect_type"]=1, ["effect_type"]=1,
@ -17453,7 +17482,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20198]={ [20198]={
["effect_type"]=1, ["effect_type"]=1,
@ -17477,7 +17506,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20199]={ [20199]={
["effect_type"]=1, ["effect_type"]=1,
@ -17501,7 +17530,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20200]={ [20200]={
["effect_type"]=1, ["effect_type"]=1,
@ -17525,7 +17554,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20201]={ [20201]={
["effect_type"]=1, ["effect_type"]=1,
@ -17549,7 +17578,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20202]={ [20202]={
["effect_type"]=1, ["effect_type"]=1,
@ -17573,7 +17602,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20203]={ [20203]={
["effect_type"]=1, ["effect_type"]=1,
@ -17597,7 +17626,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20204]={ [20204]={
["effect_type"]=1, ["effect_type"]=1,
@ -17621,7 +17650,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20205]={ [20205]={
["effect_type"]=1, ["effect_type"]=1,
@ -17645,7 +17674,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20206]={ [20206]={
["effect_type"]=1, ["effect_type"]=1,
@ -17669,7 +17698,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20207]={ [20207]={
["effect_type"]=1, ["effect_type"]=1,
@ -17693,7 +17722,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20208]={ [20208]={
["effect_type"]=1, ["effect_type"]=1,
@ -17717,7 +17746,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20209]={ [20209]={
["effect_type"]=1, ["effect_type"]=1,
@ -17741,7 +17770,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20210]={ [20210]={
["effect_type"]=1, ["effect_type"]=1,
@ -17765,7 +17794,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20211]={ [20211]={
["effect_type"]=1, ["effect_type"]=1,
@ -17789,7 +17818,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20212]={ [20212]={
["effect_type"]=1, ["effect_type"]=1,
@ -17813,7 +17842,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20213]={ [20213]={
["effect_type"]=1, ["effect_type"]=1,
@ -17837,7 +17866,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20214]={ [20214]={
["effect_type"]=1, ["effect_type"]=1,
@ -17861,7 +17890,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20215]={ [20215]={
["effect_type"]=1, ["effect_type"]=1,
@ -17885,7 +17914,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20216]={ [20216]={
["effect_type"]=1, ["effect_type"]=1,
@ -17909,7 +17938,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20217]={ [20217]={
["effect_type"]=1, ["effect_type"]=1,
@ -17933,7 +17962,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20218]={ [20218]={
["effect_type"]=1, ["effect_type"]=1,
@ -17957,7 +17986,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20219]={ [20219]={
["effect_type"]=1, ["effect_type"]=1,
@ -17981,7 +18010,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20220]={ [20220]={
["effect_type"]=1, ["effect_type"]=1,
@ -18005,7 +18034,7 @@ local skill = {
1000024 1000024
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20221]={ [20221]={
["effect_type"]=1, ["effect_type"]=1,
@ -18029,7 +18058,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[20222]={ [20222]={
["effect_type"]=1, ["effect_type"]=1,
@ -18053,7 +18082,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=100115 ["fx_self"]=100116
}, },
[30001]={ [30001]={
["effect_type"]=1, ["effect_type"]=1,
@ -21903,7 +21932,7 @@ local skill = {
1000021 1000021
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=400040 ["fx_self"]=200166
}, },
[30148]={ [30148]={
["effect_type"]=1, ["effect_type"]=1,
@ -21927,7 +21956,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=400041 ["fx_self"]=200167
}, },
[30149]={ [30149]={
["effect_type"]=1, ["effect_type"]=1,
@ -21951,7 +21980,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=400042 ["fx_self"]=200168
}, },
[30150]={ [30150]={
["buff_condition"]={ ["buff_condition"]={
@ -21998,7 +22027,7 @@ local skill = {
1000021 1000021
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=400040 ["fx_self"]=200171
}, },
[30151]={ [30151]={
["buff_condition"]={ ["buff_condition"]={
@ -22045,7 +22074,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=400041 ["fx_self"]=200172
}, },
[30152]={ [30152]={
["buff_condition"]={ ["buff_condition"]={
@ -22092,7 +22121,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=400042 ["fx_self"]=200172
}, },
[30153]={ [30153]={
["effect_type"]=1, ["effect_type"]=1,
@ -22116,7 +22145,7 @@ local skill = {
1000021 1000021
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=400040 ["fx_self"]=200174
}, },
[30154]={ [30154]={
["effect_type"]=1, ["effect_type"]=1,
@ -22140,7 +22169,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=400041 ["fx_self"]=200175
}, },
[30155]={ [30155]={
["effect_type"]=1, ["effect_type"]=1,
@ -22164,7 +22193,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=400042 ["fx_self"]=200176
}, },
[30156]={ [30156]={
["effect_type"]=1, ["effect_type"]=1,
@ -22188,7 +22217,7 @@ local skill = {
1000021 1000021
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=400040 ["fx_self"]=200178
}, },
[30157]={ [30157]={
["effect_type"]=1, ["effect_type"]=1,
@ -22212,7 +22241,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=400041 ["fx_self"]=200179
}, },
[30158]={ [30158]={
["effect_type"]=1, ["effect_type"]=1,
@ -22236,7 +22265,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=400042 ["fx_self"]=200180
}, },
[30159]={ [30159]={
["effect_type"]=1, ["effect_type"]=1,
@ -22260,7 +22289,7 @@ local skill = {
1000021 1000021
}, },
["name_act"]="attack01", ["name_act"]="attack01",
["fx_self"]=400040 ["fx_self"]=200182
}, },
[30160]={ [30160]={
["effect_type"]=1, ["effect_type"]=1,
@ -22284,7 +22313,7 @@ local skill = {
1000022 1000022
}, },
["name_act"]="attack02", ["name_act"]="attack02",
["fx_self"]=400041 ["fx_self"]=200183
}, },
[30161]={ [30161]={
["effect_type"]=1, ["effect_type"]=1,
@ -22308,7 +22337,7 @@ local skill = {
1000023 1000023
}, },
["name_act"]="attack03", ["name_act"]="attack03",
["fx_self"]=400042 ["fx_self"]=200184
}, },
[40001]={ [40001]={
["effect_type"]=1, ["effect_type"]=1,

2
lua/app/config/skin.lua
View File

@ -122,7 +122,7 @@ local skin = {
["hero_id"]=34001 ["hero_id"]=34001
}, },
[3400101]={ [3400101]={
["model_id"]="p0016", ["model_id"]="p0033",
["qlt"]=4, ["qlt"]=4,
["bonus"]={ ["bonus"]={
{ {

17
lua/app/config/strings/cn/avatar.lua
View File

@ -80,6 +80,21 @@ local avatar = {
[25001]={ [25001]={
["desc"]="激活闪烁法师后获得。" ["desc"]="激活闪烁法师后获得。"
}, },
[14003]={
["desc"]="激活恶魔侍者后获得。"
},
[24003]={
["desc"]="激活阿飞后获得。"
},
[34003]={
["desc"]="激活忍者菲尔后获得。"
},
[44003]={
["desc"]="激活月之法师后获得。"
},
[54003]={
["desc"]="激活堕落骑士后获得。"
},
[1400201]={ [1400201]={
["desc"]="激活潘达沙滩王者皮肤获得。" ["desc"]="激活潘达沙滩王者皮肤获得。"
}, },
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

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

@ -445,6 +445,7 @@ local localization_global =
["ACT_DESC_9"] = "S", ["ACT_DESC_9"] = "S",
["ACT_DESC_10"] = "完成活动任务获得奖励积分，积分达到一定数量可提升奖励等级领取奖励。付费可解锁更多奖励哦！", ["ACT_DESC_10"] = "完成活动任务获得奖励积分，积分达到一定数量可提升奖励等级领取奖励。付费可解锁更多奖励哦！",
["ACT_DESC_11"] = "解锁后提升奖励等级，可额外获得以下奖励：", ["ACT_DESC_11"] = "解锁后提升奖励等级，可额外获得以下奖励：",
["ACT_DESC_12"] = "LV",
} }
return localization_global return localization_global

17
lua/app/config/strings/de/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/en/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
["desc"]="Obtained after activating Twinkling Mage." ["desc"]="Obtained after activating Twinkling Mage."
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/es/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
["desc"]="Se obtiene tras activar Mago Brillante." ["desc"]="Se obtiene tras activar Mago Brillante."
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/fr/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/id/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
["desc"]="Dapat setelah lolos Blink Mage" ["desc"]="Dapat setelah lolos Blink Mage"
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/ja/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
["desc"]="トゥインクリングメイジをアクティブ化後獲得できる。" ["desc"]="トゥインクリングメイジをアクティブ化後獲得できる。"
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/ko/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
["desc"]="반짝이는 마법사을(를) 활성화한 후, 획득할 수 있습니다." ["desc"]="반짝이는 마법사을(를) 활성화한 후, 획득할 수 있습니다."
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/pt/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
["desc"]="Ativar Mago do Brilho para obter." ["desc"]="Ativar Mago do Brilho para obter."
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/ru/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/th/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
["desc"]="หลังจากการเปิดใช้งานนักเวทแวบวับจะได้รับ" ["desc"]="หลังจากการเปิดใช้งานนักเวทแวบวับจะได้รับ"
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/vi/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
["desc"]="Kích hoạt Pháp Sư Blink nhận được." ["desc"]="Kích hoạt Pháp Sư Blink nhận được."
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

17
lua/app/config/strings/zh/avatar.lua
View File

@ -79,6 +79,21 @@ local avatar = {
}, },
[25001]={ [25001]={
["desc"]="啟動閃爍法師後獲得。" ["desc"]="啟動閃爍法師後獲得。"
},
[14003]={
},
[24003]={
},
[34003]={
},
[44003]={
},
[54003]={
}, },
[1400201]={ [1400201]={
@ -94,6 +109,6 @@ local avatar = {
} }
} }
local config = { local config = {
data=avatar,count=31 data=avatar,count=36
} }
return config return config

8
lua/app/config/strings/zh/skill_rogue.lua
View File

@ -330,7 +330,7 @@ local skill_rogue = {
["desc"]="巨劍轟擊沿X方向可額外消除<color=#3cff28>4</color>格。" ["desc"]="巨劍轟擊沿X方向可額外消除<color=#3cff28>4</color>格。"
}, },
[2400102]={ [2400102]={
["desc"]="<color=#fcff28>Combo</color>:巨劍轟擊對凍傷敵人傷害大幅增加，並有<color=#3cff28>50%</color>機率附帶暈眩效果，<color=#3cff28>2</color>回合。" ["desc"]="<color=#fcff28>Combo</color>:巨劍轟擊對凍結敵人傷害大幅增加，並有<color=#3cff28>50%</color>機率附帶暈眩效果，<color=#3cff28>2</color>回合。"
}, },
[2400103]={ [2400103]={
["desc"]="巨劍轟擊附帶暈眩效果的機率提高到<color=#3cff28>70%</color>。" ["desc"]="巨劍轟擊附帶暈眩效果的機率提高到<color=#3cff28>70%</color>。"
@ -507,13 +507,13 @@ local skill_rogue = {
["desc"]="元素連接隨機消除元素<color=#3cff28>+2</color>。" ["desc"]="元素連接隨機消除元素<color=#3cff28>+2</color>。"
}, },
[4200105]={ [4200105]={
["desc"]="<color=#fcff28>Combo</color>:元素連接對冰霜敵人有<color=#3cff28>20%</color>機率附帶凍傷效果，<color=#3cff28>1</color>回合。" ["desc"]="<color=#fcff28>Combo</color>:元素連接對冰霜敵人有<color=#3cff28>20%</color>機率附帶凍結效果，<color=#3cff28>1</color>回合。"
}, },
[4200106]={ [4200106]={
["desc"]="冰心攻擊提高<color=#3cff28>15%</color>。" ["desc"]="冰心攻擊提高<color=#3cff28>15%</color>。"
}, },
[4200107]={ [4200107]={
["desc"]="元素連接附帶凍傷效果機率提高到<color=#3cff28>40%</color>。" ["desc"]="元素連接附帶凍結效果機率提高到<color=#3cff28>40%</color>。"
}, },
[4300100]={ [4300100]={
["desc"]="解鎖霜凍冰晶：額外造成一次技能傷害，附帶冰霜效果，<color=#3cff28>1</color>回合。" ["desc"]="解鎖霜凍冰晶：額外造成一次技能傷害，附帶冰霜效果，<color=#3cff28>1</color>回合。"
@ -585,7 +585,7 @@ local skill_rogue = {
["desc"]="寒冰妖姬攻擊提高<color=#3cff28>15%</color>。" ["desc"]="寒冰妖姬攻擊提高<color=#3cff28>15%</color>。"
}, },
[4400107]={ [4400107]={
["desc"]="冰霜劍舞附帶凍傷效果機率提高到<color=#3cff28>70%</color>。" ["desc"]="冰霜劍舞附帶凍結效果機率提高到<color=#3cff28>70%</color>。"
}, },
[4400200]={ [4400200]={
["desc"]="解鎖法老詛咒：額外造成一次技能傷害，附帶<color=#3cff28>詛咒</color>效果，<color=#3cff28>1</color>回合。" ["desc"]="解鎖法老詛咒：額外造成一次技能傷害，附帶<color=#3cff28>詛咒</color>效果，<color=#3cff28>1</color>回合。"

61
lua/app/module/battle/controller/battle_base_controller.lua
View File

@ -2102,66 +2102,7 @@ function BattleBaseController:fillThisPos(posId, columnCount, gridMap, reverse)
end end
function BattleBaseController:judgeGridEdgeCanFall(posId, fallPosId, reverse) function BattleBaseController:judgeGridEdgeCanFall(posId, fallPosId, reverse)
local direction = ModuleManager.BattleManager:getPosDirection(posId, fallPosId) return BattleBoardTouchHelper:judgeGridEdgeCanLink(fallPosId, posId)
local reverseDirection = ModuleManager.BattleManager:getReverseDirection(direction)
local fallDownPosId
if reverseDirection then
if reverse then
--竖向
local gridEdgeEntity = self.battleData:getGridEdgeEntity(fallPosId, BattleConst.BOARD_RANGE_TYPE.UP)
if gridEdgeEntity and not gridEdgeEntity:getIsIdle() then
return
end
fallDownPosId = ModuleManager.BattleManager:getPosByDirection(fallPosId, BattleConst.BOARD_RANGE_TYPE.UP)
if fallDownPosId then
local gridEdgeEntity = self.battleData:getGridEdgeEntity(fallDownPosId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if gridEdgeEntity and not gridEdgeEntity:getIsIdle() then
return
end
end
else
--竖向
local gridEdgeEntity = self.battleData:getGridEdgeEntity(fallPosId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if gridEdgeEntity and not gridEdgeEntity:getIsIdle() then
return
end
fallDownPosId = ModuleManager.BattleManager:getPosByDirection(fallPosId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if fallDownPosId then
local gridEdgeEntity = self.battleData:getGridEdgeEntity(fallDownPosId, BattleConst.BOARD_RANGE_TYPE.UP)
if gridEdgeEntity and not gridEdgeEntity:getIsIdle() then
return
end
end
end
end
--横向
if fallDownPosId then
local direction = ModuleManager.BattleManager:getPosDirection(posId, fallDownPosId)
if direction == BattleConst.BOARD_RANGE_TYPE.LEFT then
local entity = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.LEFT)
if entity and not entity:getIsIdle() then
return
end
entity = self.battleData:getGridEdgeEntity(fallDownPosId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
if entity and not entity:getIsIdle() then
return
end
elseif direction == BattleConst.BOARD_RANGE_TYPE.RIGHT then
local entity = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
if entity and not entity:getIsIdle() then
return
end
entity = self.battleData:getGridEdgeEntity(fallDownPosId, BattleConst.BOARD_RANGE_TYPE.LEFT)
if entity and not entity:getIsIdle() then
return
end
end
end
return true
end end

223
lua/app/module/battle/helper/battle_board_touch_helper.lua
View File

@ -1,5 +1,6 @@
local BattleBoardTouchHelper = class("BattleBoardTouchHelper") local BattleBoardTouchHelper = class("BattleBoardTouchHelper")
local BattleConst = GConst.BattleConst local BattleConst = GConst.BattleConst
local BOARD_RANGE_TYPE = BattleConst.BOARD_RANGE_TYPE
local ELIMINATION_TOUCH_EVENT = GConst.ELIMINATION_TOUCH_EVENT local ELIMINATION_TOUCH_EVENT = GConst.ELIMINATION_TOUCH_EVENT
local CLEAR_SEQUENCE_TIME = 1 local CLEAR_SEQUENCE_TIME = 1
@ -258,56 +259,56 @@ function BattleBoardTouchHelper:judgeGridEdgeCanLink(lastPosId, posId)
end end
local direction = ModuleManager.BattleManager:getPosDirection(lastPosId, posId) local direction = ModuleManager.BattleManager:getPosDirection(lastPosId, posId)
if direction == BattleConst.BOARD_RANGE_TYPE.UP then if direction == BOARD_RANGE_TYPE.UP then
local entity = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.UP) local entity = self.battleData:getGridEdgeEntity(lastPosId, BOARD_RANGE_TYPE.UP)
if entity and not entity:getIsIdle() then if entity and not entity:getIsIdle() then
return return
end end
entity = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.DOWN) entity = self.battleData:getGridEdgeEntity(posId, BOARD_RANGE_TYPE.DOWN)
if entity and not entity:getIsIdle() then if entity and not entity:getIsIdle() then
return return
end end
elseif direction == BattleConst.BOARD_RANGE_TYPE.DOWN then elseif direction == BOARD_RANGE_TYPE.DOWN then
local entity = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.DOWN) local entity = self.battleData:getGridEdgeEntity(lastPosId, BOARD_RANGE_TYPE.DOWN)
if entity and not entity:getIsIdle() then if entity and not entity:getIsIdle() then
return return
end end
entity = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.UP) entity = self.battleData:getGridEdgeEntity(posId, BOARD_RANGE_TYPE.UP)
if entity and not entity:getIsIdle() then if entity and not entity:getIsIdle() then
return return
end end
elseif direction == BattleConst.BOARD_RANGE_TYPE.LEFT then elseif direction == BOARD_RANGE_TYPE.LEFT then
local entity = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.LEFT) local entity = self.battleData:getGridEdgeEntity(lastPosId, BOARD_RANGE_TYPE.LEFT)
if entity and not entity:getIsIdle() then if entity and not entity:getIsIdle() then
return return
end end
entity = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.RIGHT) entity = self.battleData:getGridEdgeEntity(posId, BOARD_RANGE_TYPE.RIGHT)
if entity and not entity:getIsIdle() then if entity and not entity:getIsIdle() then
return return
end end
elseif direction == BattleConst.BOARD_RANGE_TYPE.RIGHT then elseif direction == BOARD_RANGE_TYPE.RIGHT then
local entity = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.RIGHT) local entity = self.battleData:getGridEdgeEntity(lastPosId, BOARD_RANGE_TYPE.RIGHT)
if entity and not entity:getIsIdle() then if entity and not entity:getIsIdle() then
return return
end end
entity = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.LEFT) entity = self.battleData:getGridEdgeEntity(posId, BOARD_RANGE_TYPE.LEFT)
if entity and not entity:getIsIdle() then if entity and not entity:getIsIdle() then
return return
end end
elseif direction == BattleConst.BOARD_RANGE_TYPE.LEFT_UP then elseif direction == BOARD_RANGE_TYPE.LEFT_UP then
if not self:judgeGridEdgeCanLinkLU(lastPosId, posId) then if not self:judgeGridEdgeCanLinkOblique(BOARD_RANGE_TYPE.UP, BOARD_RANGE_TYPE.LEFT, lastPosId, posId) then
return return
end end
elseif direction == BattleConst.BOARD_RANGE_TYPE.RIGHT_UP then elseif direction == BOARD_RANGE_TYPE.RIGHT_UP then
if not self:judgeGridEdgeCanLinkRU(lastPosId, posId) then if not self:judgeGridEdgeCanLinkOblique(BOARD_RANGE_TYPE.UP, BOARD_RANGE_TYPE.RIGHT, lastPosId, posId) then
return return
end end
elseif direction == BattleConst.BOARD_RANGE_TYPE.LEFT_DOWN then elseif direction == BOARD_RANGE_TYPE.LEFT_DOWN then
if not self:judgeGridEdgeCanLinkLD(lastPosId, posId) then if not self:judgeGridEdgeCanLinkOblique(BOARD_RANGE_TYPE.DOWN, BOARD_RANGE_TYPE.LEFT, lastPosId, posId) then
return return
end end
elseif direction == BattleConst.BOARD_RANGE_TYPE.RIGHT_DOWN then elseif direction == BOARD_RANGE_TYPE.RIGHT_DOWN then
if not self:judgeGridEdgeCanLinkRD(lastPosId, posId) then if not self:judgeGridEdgeCanLinkOblique(BOARD_RANGE_TYPE.DOWN, BOARD_RANGE_TYPE.RIGHT, lastPosId, posId) then
return return
end end
end end
@ -315,24 +316,34 @@ function BattleBoardTouchHelper:judgeGridEdgeCanLink(lastPosId, posId)
return true return true
end end
function BattleBoardTouchHelper:judgeGridEdgeCanLinkLU(lastPosId, posId) function BattleBoardTouchHelper:judgeGridEdgeCanLinkOblique(verticalDirection, horizontalDirection, lastPosId, posId)
local entity1 = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.LEFT) local reverseVD = ModuleManager.BattleManager:getReverseDirection(verticalDirection)
local entity2 = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.UP) local reverseHD = ModuleManager.BattleManager:getReverseDirection(horizontalDirection)
local entity1 = self.battleData:getGridEdgeEntity(lastPosId, horizontalDirection)
local entity2 = self.battleData:getGridEdgeEntity(lastPosId, verticalDirection)
if entity1 and entity2 and not entity1:getIsIdle() and not entity2:getIsIdle() then if entity1 and entity2 and not entity1:getIsIdle() and not entity2:getIsIdle() then
return return
end end
local entity3 = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.RIGHT) local entity3 = self.battleData:getGridEdgeEntity(posId, reverseHD)
local entity4 = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.DOWN) local entity4 = self.battleData:getGridEdgeEntity(posId, reverseVD)
if entity3 and entity4 and not entity3:getIsIdle() and not entity4:getIsIdle() then if entity3 and entity4 and not entity3:getIsIdle() and not entity4:getIsIdle() then
return return
end end
if entity1 and entity3 and not entity1:getIsIdle() and not entity3:getIsIdle() then
return
end
if entity2 and entity4 and not entity2:getIsIdle() and not entity4:getIsIdle() then
return
end
local entity5, entity6 local entity5, entity6
local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, BattleConst.BOARD_RANGE_TYPE.UP) local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, verticalDirection)
if aroundId then if aroundId then
entity5 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.LEFT) entity5 = self.battleData:getGridEdgeEntity(aroundId, horizontalDirection)
entity6 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.DOWN) entity6 = self.battleData:getGridEdgeEntity(aroundId, reverseVD)
if entity5 and entity4 and not entity5:getIsIdle() and not entity4:getIsIdle() then if entity5 and entity4 and not entity5:getIsIdle() and not entity4:getIsIdle() then
return return
end end
@ -340,11 +351,19 @@ function BattleBoardTouchHelper:judgeGridEdgeCanLinkLU(lastPosId, posId)
if entity1 and entity6 and not entity1:getIsIdle() and not entity6:getIsIdle() then if entity1 and entity6 and not entity1:getIsIdle() and not entity6:getIsIdle() then
return return
end end
if entity5 and entity1 and not entity5:getIsIdle() and not entity1:getIsIdle() then
return
end
if entity6 and entity4 and not entity6:getIsIdle() and not entity4:getIsIdle() then
return
end
end end
local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, BattleConst.BOARD_RANGE_TYPE.LEFT) local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, horizontalDirection)
if aroundId then if aroundId then
local entity7 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.RIGHT) local entity7 = self.battleData:getGridEdgeEntity(aroundId, reverseHD)
local entity8 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.UP) local entity8 = self.battleData:getGridEdgeEntity(aroundId, verticalDirection)
if entity7 and entity2 and not entity7:getIsIdle() and not entity2:getIsIdle() then if entity7 and entity2 and not entity7:getIsIdle() and not entity2:getIsIdle() then
return return
end end
@ -360,154 +379,20 @@ function BattleBoardTouchHelper:judgeGridEdgeCanLinkLU(lastPosId, posId)
if entity8 and entity5 and not entity8:getIsIdle() and not entity5:getIsIdle() then if entity8 and entity5 and not entity8:getIsIdle() and not entity5:getIsIdle() then
return return
end end
end
return true if entity8 and entity2 and not entity8:getIsIdle() and not entity2:getIsIdle() then
end
function BattleBoardTouchHelper:judgeGridEdgeCanLinkRU(lastPosId, posId)
local entity1 = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
local entity2 = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.UP)
if entity1 and entity2 and not entity1:getIsIdle() and not entity2:getIsIdle() then
return
end
local entity3 = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.LEFT)
local entity4 = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if entity3 and entity4 and not entity3:getIsIdle() and not entity4:getIsIdle() then
return
end
local entity5, entity6
local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, BattleConst.BOARD_RANGE_TYPE.UP)
if aroundId then
entity5 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
entity6 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if entity5 and entity4 and not entity5:getIsIdle() and not entity4:getIsIdle() then
return return
end end
if entity1 and entity6 and not entity1:getIsIdle() and not entity6:getIsIdle() then if entity8 and entity6 and not entity8:getIsIdle() and not entity6:getIsIdle() then
return
end
end
local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
if aroundId then
local entity7 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.LEFT)
local entity8 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.UP)
if entity7 and entity2 and not entity7:getIsIdle() and not entity2:getIsIdle() then
return return
end end
if entity7 and entity6 and not entity7:getIsIdle() and not entity6:getIsIdle() then if entity7 and entity3 and not entity7:getIsIdle() and not entity3:getIsIdle() then
return return
end end
if entity8 and entity3 and not entity8:getIsIdle() and not entity3:getIsIdle() then if entity7 and entity5 and not entity7:getIsIdle() and not entity5:getIsIdle() then
return
end
if entity8 and entity5 and not entity8:getIsIdle() and not entity5:getIsIdle() then
return
end
end
return true
end
function BattleBoardTouchHelper:judgeGridEdgeCanLinkLD(lastPosId, posId)
local entity1 = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.LEFT)
local entity2 = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if entity1 and entity2 and not entity1:getIsIdle() and not entity2:getIsIdle() then
return
end
local entity3 = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
local entity4 = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.UP)
if entity3 and entity4 and not entity3:getIsIdle() and not entity4:getIsIdle() then
return
end
local entity5, entity6
local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if aroundId then
entity5 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.LEFT)
entity6 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.UP)
if entity5 and entity4 and not entity5:getIsIdle() and not entity4:getIsIdle() then
return
end
if entity1 and entity6 and not entity1:getIsIdle() and not entity6:getIsIdle() then
return
end
end
local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, BattleConst.BOARD_RANGE_TYPE.LEFT)
if aroundId then
local entity7 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
local entity8 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if entity7 and entity2 and not entity7:getIsIdle() and not entity2:getIsIdle() then
return
end
if entity7 and entity6 and not entity7:getIsIdle() and not entity6:getIsIdle() then
return
end
if entity8 and entity3 and not entity8:getIsIdle() and not entity3:getIsIdle() then
return
end
if entity8 and entity5 and not entity8:getIsIdle() and not entity5:getIsIdle() then
return
end
end
return true
end
function BattleBoardTouchHelper:judgeGridEdgeCanLinkRD(lastPosId, posId)
local entity1 = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
local entity2 = self.battleData:getGridEdgeEntity(lastPosId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if entity1 and entity2 and not entity1:getIsIdle() and not entity2:getIsIdle() then
return
end
local entity3 = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.LEFT)
local entity4 = self.battleData:getGridEdgeEntity(posId, BattleConst.BOARD_RANGE_TYPE.UP)
if entity3 and entity4 and not entity3:getIsIdle() and not entity4:getIsIdle() then
return
end
local entity5, entity6
local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if aroundId then
entity5 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
entity6 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.UP)
if entity5 and entity4 and not entity5:getIsIdle() and not entity4:getIsIdle() then
return
end
if entity1 and entity6 and not entity1:getIsIdle() and not entity6:getIsIdle() then
return
end
end
local aroundId = ModuleManager.BattleManager:getPosByDirection(lastPosId, BattleConst.BOARD_RANGE_TYPE.RIGHT)
if aroundId then
local entity7 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.LEFT)
local entity8 = self.battleData:getGridEdgeEntity(aroundId, BattleConst.BOARD_RANGE_TYPE.DOWN)
if entity7 and entity2 and not entity7:getIsIdle() and not entity2:getIsIdle() then
return
end
if entity7 and entity6 and not entity7:getIsIdle() and not entity6:getIsIdle() then
return
end
if entity8 and entity3 and not entity8:getIsIdle() and not entity3:getIsIdle() then
return
end
if entity8 and entity5 and not entity8:getIsIdle() and not entity5:getIsIdle() then
return return
end end
end end

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

@ -106,7 +106,6 @@ local function _crossMoveNotBreak(entity, gridEntities, battleController, onlyCh
return return
end end
local ePodId = entity:getPosId()
if battleController.lastRoundBreakedGridType[entity:getGridType()] then if battleController.lastRoundBreakedGridType[entity:getGridType()] then
return return
end end
@ -126,6 +125,7 @@ local function _crossMoveNotBreak(entity, gridEntities, battleController, onlyCh
local map = {} local map = {}
local succ = false local succ = false
for _, entity in ipairs(allSnake) do for _, entity in ipairs(allSnake) do
local ePodId = entity:getPosId()
local tempList = BattleConst.UP_DOWN_LEFT_RIGHT[entity:getPosId()] local tempList = BattleConst.UP_DOWN_LEFT_RIGHT[entity:getPosId()]
if tempList then if tempList then
tempList = table.shuffle(GFunc.getTable(tempList)) tempList = table.shuffle(GFunc.getTable(tempList))