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

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

Browse Source
This commit is contained in:
chenxi 2023-06-02 17:07:12 +08:00
commit 8fccdca0c8
25 changed files with 6639 additions and 4160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2122,8 +2122,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
26466, 26598,
35657 37373
} }
}, },
[12]={ [12]={
@ -2341,8 +2341,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
27220, 27209,
38682 38742
} }
}, },
[13]={ [13]={
@ -2560,8 +2560,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
28479, 28468,
41052 41162
} }
}, },
[14]={ [14]={
@ -2779,8 +2779,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30899, 30905,
45133 45320
} }
}, },
[15]={ [15]={
@ -2998,8 +2998,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
31774, 31768,
46992 47102
} }
}, },
[16]={ [16]={
@ -3217,8 +3217,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
33633, 33627,
50331 50479
} }
}, },
[17]={ [17]={
@ -3436,8 +3436,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
35024, 35013,
53042 53180
} }
}, },
[18]={ [18]={
@ -3655,8 +3655,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
37136, 37131,
56738 56903
} }
}, },
[19]={ [19]={
@ -3874,8 +3874,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
38143, 38132,
59004 59114
} }
}, },
[20]={ [20]={
@ -4093,8 +4093,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
40535, 40519,
63234 63399
} }
}, },
[21]={ [21]={
@ -4312,8 +4312,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
42114, 42108,
66275 66435
} }
}, },
[22]={ [22]={
@ -4531,8 +4531,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
44759, 44754,
70994 71143
} }
}, },
[23]={ [23]={
@ -4751,7 +4751,7 @@ local chapter = {
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
46690, 46690,
74635 74795
} }
}, },
[24]={ [24]={
@ -4969,8 +4969,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
47564, 47553,
76615 76813
} }
}, },
[25]={ [25]={
@ -5188,8 +5188,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
51332, 51321,
83375 83529
} }
}, },
[26]={ [26]={
@ -5407,8 +5407,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
52333, 52327,
85564 85723
} }
}, },
[27]={ [27]={
@ -5626,8 +5626,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
56568, 56557,
93055 93198
} }
}, },
[28]={ [28]={
@ -5845,8 +5845,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
61303, 61292,
101426 101679
} }
}, },
[29]={ [29]={
@ -6064,8 +6064,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
56931, 66589,
94804 110952
} }
}, },
[30]={ [30]={
@ -6282,8 +6282,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
62926, 72573,
105386 121589
} }
} }
} }

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

@ -10801,12 +10801,8 @@ local chapter_board = {
0 0
}, },
{ {
0, 2,
3 0
},
{
0,
1
}, },
{ {
0, 0,
@ -10814,7 +10810,11 @@ local chapter_board = {
}, },
{ {
0, 0,
4 3
},
{
0,
3
}, },
{ {
1, 1,
@ -10825,47 +10825,19 @@ local chapter_board = {
0 0
}, },
{ {
13, 2,
2 0
}, },
{ {
13, 2,
3
},
{
0,
3
},
{
0,
3
},
{
0,
4
},
{
1,
0 0
}, },
{ {
0, 0,
2
},
{
0,
2
},
{
13,
3 3
}, },
{ {
13, 13,
4
},
{
0,
1 1
}, },
{ {
@ -10877,7 +10849,15 @@ local chapter_board = {
0 0
}, },
{ {
3, 13,
1
},
{
2,
0
},
{
2,
0 0
}, },
{ {
@ -10889,72 +10869,92 @@ local chapter_board = {
3 3
}, },
{ {
13, 0,
4 3
},
{
1,
0
}, },
{ {
13, 13,
5 2
},
{
2,
0
},
{
2,
0
}, },
{ {
0, 0,
3 1
},
{
0,
1
},
{
0,
1
}, },
{ {
14, 14,
0 0
}, },
{ {
3, 13,
3
},
{
2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
0, 2,
0
},
{
2,
0
},
{
2,
0
},
{
1,
0
},
{
13,
4 4
}, },
{ {
0, 2,
4
},
{
13,
5
},
{
13,
5
},
{
1,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
0, 2,
5 0
},
{
0,
5
},
{
13,
5
}, },
{ {
1, 1,
@ -10965,16 +10965,16 @@ local chapter_board = {
0 0
}, },
{ {
3, 13,
0 5
}, },
{ {
3, 13,
0 1
}, },
{ {
3, 13,
0 2
}, },
{ {
1, 1,
@ -10990,7 +10990,7 @@ local chapter_board = {
["board"]={ ["board"]={
{ {
0, 0,
1 3
}, },
{ {
0, 0,
@ -10998,19 +10998,19 @@ local chapter_board = {
}, },
{ {
0, 0,
5 1
}, },
{ {
0, 0,
5 1
}, },
{ {
0, 0,
3 3
}, },
{ {
0, 3,
3 0
}, },
{ {
1, 1,
@ -11022,70 +11022,22 @@ local chapter_board = {
}, },
{ {
0, 0,
5 3
}, },
{ {
0, 0,
5 4
}, },
{ {
0, 0,
1 1
}, },
{
2,
0
},
{ {
0, 0,
3 3
}, },
{ {
13, 3,
4
},
{
2,
0
},
{
2,
0
},
{
2,
0
},
{
0,
1
},
{
2,
0
},
{
0,
4
},
{
13,
4
},
{
2,
0
},
{
2,
0
},
{
2,
0
},
{
1,
0 0
}, },
{ {
@ -11097,41 +11049,53 @@ local chapter_board = {
2 2
}, },
{ {
13, 0,
2 5
},
{
3,
0
},
{
3,
0
},
{
3,
0
},
{
3,
0
},
{
3,
0
}, },
{ {
0, 0,
1 5
}, },
{ {
13, 0,
1 4
},
{
0,
3
},
{
3,
0
}, },
{ {
14, 14,
0 0
}, },
{
0,
2
},
{
0,
2
},
{
0,
2
},
{
1,
0
},
{
0,
3
},
{
3,
0
},
{ {
3, 3,
0 0
@ -11141,7 +11105,19 @@ local chapter_board = {
0 0
}, },
{ {
3, 2,
0
},
{
2,
0
},
{
2,
0
},
{
2,
0 0
}, },
{ {
@ -11156,29 +11132,53 @@ local chapter_board = {
1, 1,
0 0
}, },
{
13,
1
},
{
13,
2
},
{
13,
3
},
{
13,
4
},
{
13,
5
},
{ {
1, 1,
0 0
}, },
{ {
3, 1,
0 0
}, },
{ {
3, 13,
0 5
}, },
{ {
7, 13,
0 4
}, },
{ {
3, 13,
0 3
}, },
{ {
3, 13,
0 2
},
{
13,
1
}, },
{ {
1, 1,
@ -11188,7 +11188,7 @@ local chapter_board = {
["mystery_box_board"]={ ["mystery_box_board"]={
{ {
0, 0,
1 3
}, },
{ {
0, 0,
@ -11196,19 +11196,19 @@ local chapter_board = {
}, },
{ {
0, 0,
5 1
}, },
{ {
0, 0,
5 1
}, },
{ {
0, 0,
3 3
}, },
{ {
0, 3,
3 0
}, },
{ {
1, 1,
@ -11220,70 +11220,22 @@ local chapter_board = {
}, },
{ {
0, 0,
5 3
}, },
{ {
0, 0,
5 4
}, },
{ {
0, 0,
1 1
}, },
{
2,
0
},
{ {
0, 0,
3 3
}, },
{ {
13, 3,
4
},
{
2,
0
},
{
2,
0
},
{
2,
0
},
{
0,
1
},
{
2,
0
},
{
0,
4
},
{
13,
4
},
{
2,
0
},
{
2,
0
},
{
2,
0
},
{
1,
0 0
}, },
{ {
@ -11295,67 +11247,75 @@ local chapter_board = {
2 2
}, },
{ {
13, 0,
2 5
},
{
3,
0
},
{
3,
0
},
{
3,
0
},
{
3,
0
},
{
3,
0
}, },
{ {
0, 0,
1 5
}, },
{ {
13, 0,
1 4
},
{
0,
3
},
{
3,
0
}, },
{ {
14, 14,
0 0
}, },
{ {
3, 0,
0 2
}, },
{ {
3, 0,
0 2
}, },
{ {
3, 0,
0 2
},
{
3,
0
},
{
3,
0
}, },
{ {
1, 1,
0 0
}, },
{ {
1, 0,
3
},
{
3,
0
},
{
3,
0
},
{
3,
0
},
{
2,
0
},
{
2,
0
},
{
2,
0
},
{
2,
0 0
}, },
{ {
@ -11371,13 +11331,53 @@ local chapter_board = {
0 0
}, },
{ {
3, 13,
1
},
{
13,
2
},
{
13,
3
},
{
13,
4
},
{
13,
5
},
{
1,
0 0
}, },
{ {
3, 1,
0 0
}, },
{
13,
5
},
{
13,
4
},
{
13,
3
},
{
13,
2
},
{
13,
1
},
{ {
1, 1,
0 0

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

File diff suppressed because it is too large Load Diff

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

@ -1,12 +1,13 @@
local chapter_daily_challenge = { local chapter_daily_challenge = {
[1]={ [1]={
["scene"]="bg_1", ["scene"]="bg_11",
["chess_board"]="chessboard_1", ["block_icon"]="battle_hinder_7",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={ ["chapter_board_daily_challenge"]={
7, 1,
8, 2,
9, 3,
10 4
}, },
["monster"]={ ["monster"]={
102, 102,
@ -189,10 +190,6 @@ local chapter_daily_challenge = {
6, 6,
10 10
}, },
{
6,
11
},
{ {
6, 6,
12 12
@ -213,10 +210,6 @@ local chapter_daily_challenge = {
7, 7,
10 10
}, },
{
7,
11
},
{ {
7, 7,
12 12
@ -228,13 +221,14 @@ local chapter_daily_challenge = {
} }
}, },
[2]={ [2]={
["scene"]="bg_2", ["scene"]="bg_15",
["block_icon"]="battle_hinder_7",
["chess_board"]="chessboard_2", ["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={ ["chapter_board_daily_challenge"]={
1, 5,
2, 6,
3, 7,
4 8
}, },
["monster"]={ ["monster"]={
2102, 2102,
@ -417,10 +411,6 @@ local chapter_daily_challenge = {
6, 6,
10 10
}, },
{
6,
11
},
{ {
6, 6,
12 12
@ -441,10 +431,6 @@ local chapter_daily_challenge = {
7, 7,
10 10
}, },
{
7,
11
},
{ {
7, 7,
12 12
@ -456,13 +442,14 @@ local chapter_daily_challenge = {
} }
}, },
[3]={ [3]={
["scene"]="bg_3", ["scene"]="bg_16",
["block_icon"]="battle_hinder_7",
["chess_board"]="chessboard_2", ["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={ ["chapter_board_daily_challenge"]={
5, 9,
6, 10,
7, 11,
8 12
}, },
["monster"]={ ["monster"]={
4102, 4102,
@ -645,10 +632,6 @@ local chapter_daily_challenge = {
6, 6,
10 10
}, },
{
6,
11
},
{ {
6, 6,
12 12
@ -669,10 +652,6 @@ local chapter_daily_challenge = {
7, 7,
10 10
}, },
{
7,
11
},
{ {
7, 7,
12 12
@ -684,13 +663,14 @@ local chapter_daily_challenge = {
} }
}, },
[4]={ [4]={
["scene"]="bg_4", ["scene"]="bg_22",
["block_icon"]="battle_hinder_8",
["chess_board"]="chessboard_2", ["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={ ["chapter_board_daily_challenge"]={
9, 13,
10, 14,
1, 15,
2 16
}, },
["monster"]={ ["monster"]={
6102, 6102,
@ -873,10 +853,6 @@ local chapter_daily_challenge = {
6, 6,
10 10
}, },
{
6,
11
},
{ {
6, 6,
12 12
@ -897,10 +873,6 @@ local chapter_daily_challenge = {
7, 7,
10 10
}, },
{
7,
11
},
{ {
7, 7,
12 12
@ -912,13 +884,14 @@ local chapter_daily_challenge = {
} }
}, },
[5]={ [5]={
["scene"]="bg_5", ["scene"]="bg_24",
["block_icon"]="battle_hinder_9",
["chess_board"]="chessboard_2", ["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={ ["chapter_board_daily_challenge"]={
3, 17,
4, 18,
5, 19,
6 20
}, },
["monster"]={ ["monster"]={
8102, 8102,
@ -1101,10 +1074,6 @@ local chapter_daily_challenge = {
6, 6,
10 10
}, },
{
6,
11
},
{ {
6, 6,
12 12
@ -1125,10 +1094,6 @@ local chapter_daily_challenge = {
7, 7,
10 10
}, },
{
7,
11
},
{ {
7, 7,
12 12
@ -1140,13 +1105,14 @@ local chapter_daily_challenge = {
} }
}, },
[6]={ [6]={
["scene"]="bg_6", ["scene"]="bg_25",
["block_icon"]="battle_hinder_10",
["chess_board"]="chessboard_2", ["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={ ["chapter_board_daily_challenge"]={
7, 21,
8, 22,
9, 23,
10 24
}, },
["monster"]={ ["monster"]={
10102, 10102,
@ -1329,10 +1295,6 @@ local chapter_daily_challenge = {
6, 6,
10 10
}, },
{
6,
11
},
{ {
6, 6,
12 12
@ -1353,10 +1315,6 @@ local chapter_daily_challenge = {
7, 7,
10 10
}, },
{
7,
11
},
{ {
7, 7,
12 12
@ -1368,13 +1326,14 @@ local chapter_daily_challenge = {
} }
}, },
[7]={ [7]={
["scene"]="bg_7", ["scene"]="bg_25",
["block_icon"]="battle_hinder_11",
["chess_board"]="chessboard_2", ["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={ ["chapter_board_daily_challenge"]={
1, 25,
2, 26,
3, 27,
4 28
}, },
["monster"]={ ["monster"]={
12102, 12102,
@ -1557,10 +1516,6 @@ local chapter_daily_challenge = {
6, 6,
10 10
}, },
{
6,
11
},
{ {
6, 6,
12 12
@ -1581,694 +1536,6 @@ local chapter_daily_challenge = {
7, 7,
10 10
}, },
{
7,
11
},
{
7,
12
},
{
7,
13
}
}
},
[8]={
["scene"]="bg_1",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
5,
6,
7,
8
},
["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"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
}
},
["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,
11
},
{
6,
12
},
{
6,
13
},
{
7,
8
},
{
7,
9
},
{
7,
10
},
{
7,
11
},
{
7,
12
},
{
7,
13
}
}
},
[9]={
["scene"]="bg_2",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
9,
10,
1,
2
},
["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"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
}
},
["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,
11
},
{
6,
12
},
{
6,
13
},
{
7,
8
},
{
7,
9
},
{
7,
10
},
{
7,
11
},
{
7,
12
},
{
7,
13
}
}
},
[10]={
["scene"]="bg_3",
["chess_board"]="chessboard_2",
["chapter_board_daily_challenge"]={
3,
4,
5,
6
},
["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"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
}
},
["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,
11
},
{
6,
12
},
{
6,
13
},
{
7,
8
},
{
7,
9
},
{
7,
10
},
{
7,
11
},
{ {
7, 7,
12 12
@ -2281,6 +1548,6 @@ local chapter_daily_challenge = {
} }
} }
local config = { local config = {
data=chapter_daily_challenge,count=10 data=chapter_daily_challenge,count=7
} }
return config return config

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

@ -247,7 +247,8 @@ local fx = {
["bind"]="root" ["bind"]="root"
}, },
[200028]={ [200028]={
["res"]="sfx_m20009_b04" ["res"]="sfx_m20009_b04",
["bind"]="root"
}, },
[200029]={ [200029]={
["res"]="sfx_m20010_b01", ["res"]="sfx_m20010_b01",
@ -601,6 +602,22 @@ local fx = {
["res"]="sfx_m20032_b03", ["res"]="sfx_m20032_b03",
["bind"]="root" ["bind"]="root"
}, },
[200117]={
["res"]="sfx_m20011_b04",
["bind"]="root"
},
[200118]={
["res"]="sfx_m20032_b04",
["bind"]="root"
},
[200119]={
["res"]="sfx_m20032_b05",
["bind"]="root"
},
[200120]={
["res"]="sfx_m20010_b04",
["bind"]="root"
},
[300000]={ [300000]={
["res"]="sfx_p0001_b01", ["res"]="sfx_p0001_b01",
["bind"]="root" ["bind"]="root"
@ -658,7 +675,7 @@ local fx = {
["bind"]="root" ["bind"]="root"
}, },
[300014]={ [300014]={
["res"]="sfx_p0003_b04", ["res"]="sfx_p0003_b05",
["bind"]="root" ["bind"]="root"
}, },
[300015]={ [300015]={
@ -690,7 +707,7 @@ local fx = {
["bind"]="root" ["bind"]="root"
}, },
[300022]={ [300022]={
["res"]="sfx_p0005_b04", ["res"]="sfx_p0005_b05",
["bind"]="root" ["bind"]="root"
}, },
[300023]={ [300023]={
@ -1200,6 +1217,6 @@ local fx = {
} }
} }
local config = { local config = {
data=fx,count=288 data=fx,count=292
} }
return config return config

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

@ -56,7 +56,8 @@ local grid_type = {
[6]={ [6]={
["icon"]="battle_obstacle_lock", ["icon"]="battle_obstacle_lock",
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1 ["cant_link"]=1,
["break_sfx"]="sfx_piece_suolian_b01"
}, },
[7]={ [7]={
["icon"]="battle_obstacle_stone_3", ["icon"]="battle_obstacle_stone_3",
@ -68,7 +69,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_zhuqiantk_b01"
}, },
[8]={ [8]={
["icon"]="battle_obstacle_rocket_up", ["icon"]="battle_obstacle_rocket_up",
@ -81,6 +82,8 @@ local grid_type = {
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=1, ["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01",
["sfx_flow"]=1,
["effect_params"]={ ["effect_params"]={
1 1
}, },
@ -97,6 +100,8 @@ local grid_type = {
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=1, ["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01",
["sfx_flow"]=1,
["effect_params"]={ ["effect_params"]={
2 2
}, },
@ -113,6 +118,8 @@ local grid_type = {
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=1, ["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01",
["sfx_flow"]=1,
["effect_params"]={ ["effect_params"]={
3 3
}, },
@ -129,6 +136,8 @@ local grid_type = {
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=1, ["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01",
["sfx_flow"]=1,
["effect_params"]={ ["effect_params"]={
4 4
}, },
@ -144,7 +153,8 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["break_stay_element"]=1, ["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1 ["cant_link"]=1,
["break_sfx"]="sfx_piece_kucao_b01"
}, },
[13]={ [13]={
["icon"]="battle_obstacle_jelly", ["icon"]="battle_obstacle_jelly",
@ -158,7 +168,9 @@ local grid_type = {
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_guodong_b01",
["effect"]=2, ["effect"]=2,
["effect_sfx"]="sfx_piece_shuipao_b02",
["effect_trigger"]=1 ["effect_trigger"]=1
}, },
[14]={ [14]={
@ -171,9 +183,10 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["break_fly_to_character"]=1, ["break_fly_to_character"]=1,
["bftc_icon"]="battle_obstacle_lamp", ["bftc_icon"]="battle_obstacle_lamp",
["bftc_time"]=0.4,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01", ["break_sfx"]="sfx_piece_shendeng_b01",
["effect"]=3, ["effect"]=3,
["effect_trigger"]=2 ["effect_trigger"]=2
}, },
@ -184,12 +197,17 @@ local grid_type = {
1, 1,
3 3
}, },
["spine_name"]="ui_battle_chest_open",
["zoom"]=0.34,
["spine_idle"]="idle3",
["spine_change"]="idle2_1",
["break_count"]=1, ["break_count"]=1,
["break_fly_to_character"]=1, ["break_fly_to_character"]=1,
["bftc_icon"]="battle_obstacle_chest_4", ["bftc_icon"]="battle_obstacle_chest_4",
["bftc_time"]=0.3,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01", ["break_sfx"]="sfx_piece_baoxiang_b01",
["effect"]=4, ["effect"]=4,
["effect_trigger"]=2 ["effect_trigger"]=2
}, },
@ -200,10 +218,13 @@ local grid_type = {
1, 1,
3 3
}, },
["spine_name"]="ui_battle_chest_open",
["zoom"]=0.34,
["spine_idle"]="idle2",
["spine_change"]="idle1_1",
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1
["break_sfx"]="sfx_piece_za_b01"
}, },
[17]={ [17]={
["icon"]="battle_obstacle_chest_1", ["icon"]="battle_obstacle_chest_1",
@ -212,10 +233,13 @@ local grid_type = {
1, 1,
3 3
}, },
["spine_name"]="ui_battle_chest_open",
["zoom"]=0.34,
["spine_idle"]="idle1",
["spine_change"]="idle1",
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1
["break_sfx"]="sfx_piece_za_b01"
}, },
[18]={ [18]={
["icon"]="battle_obstacle_stump_1", ["icon"]="battle_obstacle_stump_1",
@ -227,7 +251,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_muzhuang_b01"
}, },
[19]={ [19]={
["icon"]="battle_obstacle_stump_2", ["icon"]="battle_obstacle_stump_2",
@ -239,7 +263,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_muzhuang_b01"
}, },
[20]={ [20]={
["icon"]="battle_obstacle_stump_3", ["icon"]="battle_obstacle_stump_3",
@ -251,7 +275,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_muzhuang_b01"
}, },
[21]={ [21]={
["icon"]="battle_obstacle_blister", ["icon"]="battle_obstacle_blister",
@ -265,7 +289,9 @@ local grid_type = {
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_shuipao_b01",
["effect"]=2, ["effect"]=2,
["effect_sfx"]="sfx_piece_shuipao_b02",
["effect_trigger"]=1 ["effect_trigger"]=1
}, },
[22]={ [22]={
@ -280,11 +306,13 @@ local grid_type = {
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_yuni_b01",
["effect"]=2, ["effect"]=2,
["effect_sfx"]="sfx_piece_shuipao_b02",
["effect_trigger"]=1 ["effect_trigger"]=1
}, },
[23]={ [23]={
["icon"]="battle_obstacle_poisonous mist", ["icon"]="battle_obstacle_poisonous_mist",
["next_type"]=0, ["next_type"]=0,
["break_condition"]={ ["break_condition"]={
1, 1,
@ -295,7 +323,9 @@ local grid_type = {
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_duwu_b01",
["effect"]=2, ["effect"]=2,
["effect_sfx"]="sfx_piece_shuipao_b02",
["effect_trigger"]=1 ["effect_trigger"]=1
}, },
[24]={ [24]={
@ -308,7 +338,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_jitang_b01"
}, },
[25]={ [25]={
["icon"]="battle_obstacle_altar_2", ["icon"]="battle_obstacle_altar_2",
@ -320,7 +350,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_jitang_b01"
}, },
[26]={ [26]={
["icon"]="battle_obstacle_altar_3", ["icon"]="battle_obstacle_altar_3",
@ -332,7 +362,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_jitang_b01"
}, },
[27]={ [27]={
["icon"]="battle_obstacle_circle", ["icon"]="battle_obstacle_circle",
@ -342,7 +372,7 @@ local grid_type = {
3 3
}, },
["break_count"]=1, ["break_count"]=1,
["break_sfx"]="sfx_piece_za_b03" ["break_sfx"]="sfx_piece_fazhen_b01"
}, },
[28]={ [28]={
["icon"]="battle_obstacle_stalactite_1", ["icon"]="battle_obstacle_stalactite_1",
@ -354,7 +384,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_zhongrushi_b01"
}, },
[29]={ [29]={
["icon"]="battle_obstacle_stalactite_2", ["icon"]="battle_obstacle_stalactite_2",
@ -366,7 +396,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_zhongrushi_b01"
}, },
[30]={ [30]={
["icon"]="battle_obstacle_stalactite_3", ["icon"]="battle_obstacle_stalactite_3",
@ -378,10 +408,10 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_zhongrushi_b01"
}, },
[31]={ [31]={
["icon"]="battle_obstacle_Iron_1", ["icon"]="battle_obstacle_lron_1",
["next_type"]=0, ["next_type"]=0,
["break_condition"]={ ["break_condition"]={
1, 1,
@ -390,10 +420,10 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_tiexie_b01"
}, },
[32]={ [32]={
["icon"]="battle_obstacle_Iron_2", ["icon"]="battle_obstacle_lron_2",
["next_type"]=31, ["next_type"]=31,
["break_condition"]={ ["break_condition"]={
1, 1,
@ -402,10 +432,10 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_tiexie_b01"
}, },
[33]={ [33]={
["icon"]="battle_obstacle_Iron_3", ["icon"]="battle_obstacle_lron_3",
["next_type"]=32, ["next_type"]=32,
["break_condition"]={ ["break_condition"]={
1, 1,
@ -414,7 +444,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_tiexie_b01"
}, },
[34]={ [34]={
["icon"]="battle_obstacle_lava", ["icon"]="battle_obstacle_lava",
@ -428,7 +458,9 @@ local grid_type = {
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_rongyan_b01",
["effect"]=2, ["effect"]=2,
["effect_sfx"]="sfx_piece_shuipao_b02",
["effect_trigger"]=1 ["effect_trigger"]=1
}, },
[35]={ [35]={
@ -441,7 +473,8 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["break_stay_element"]=1, ["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1 ["cant_link"]=1,
["break_sfx"]="sfx_piece_caocong_b01"
} }
} }
local config = { local config = {

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -929,7 +929,7 @@ local skill = {
["shake_type"]=5, ["shake_type"]=5,
["sound_hit"]=1200120, ["sound_hit"]=1200120,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_target"]=300049 ["fx_self"]=300049
}, },
[1400121]={ [1400121]={
["position"]=1, ["position"]=1,
@ -2382,7 +2382,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=3300111, ["sound_hit"]=3300111,
@ -2402,7 +2402,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=3300112, ["sound_hit"]=3300112,
@ -2422,7 +2422,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=3300113, ["sound_hit"]=3300113,
@ -2442,7 +2442,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=3300114, ["sound_hit"]=3300114,
@ -2499,7 +2499,7 @@ local skill = {
3, 3,
4 4
}, },
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
["sound_hit"]=2200120, ["sound_hit"]=2200120,
@ -2597,7 +2597,7 @@ local skill = {
3, 3,
5 5
}, },
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
["sound_hit"]=2200120, ["sound_hit"]=2200120,
@ -2682,7 +2682,7 @@ local skill = {
3, 3,
5 5
}, },
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
["sound_hit"]=2200120, ["sound_hit"]=2200120,
@ -2786,7 +2786,19 @@ local skill = {
["effect"]={ ["effect"]={
{ {
["type"]="hurt_green", ["type"]="hurt_green",
["num"]=43750, ["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_green",
["num"]=12000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_green",
["num"]=20750,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
} }
@ -2801,6 +2813,11 @@ local skill = {
} }
}, },
["eliminate_obj"]=1, ["eliminate_obj"]=1,
["effect_block"]={
1,
2,
3
},
["skill_position"]=2, ["skill_position"]=2,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -2891,7 +2908,19 @@ local skill = {
["effect"]={ ["effect"]={
{ {
["type"]="hurt_green", ["type"]="hurt_green",
["num"]=43750, ["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_green",
["num"]=12000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_green",
["num"]=20750,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
} }
@ -2906,6 +2935,11 @@ local skill = {
} }
}, },
["eliminate_obj"]=1, ["eliminate_obj"]=1,
["effect_block"]={
1,
2,
3
},
["skill_position"]=2, ["skill_position"]=2,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=5, ["shake_type"]=5,
@ -4912,6 +4946,7 @@ local skill = {
["shake_type"]=5, ["shake_type"]=5,
["sound_hit"]=10082, ["sound_hit"]=10082,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_self"]=200117,
["bullet_time"]={ ["bullet_time"]={
333, 333,
3000, 3000,
@ -5248,7 +5283,7 @@ local skill = {
["shake_type"]=5, ["shake_type"]=5,
["sound_hit"]=2200120, ["sound_hit"]=2200120,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_target"]=200009, ["fx_self"]=200009,
["bullet_time"]={ ["bullet_time"]={
1100, 1100,
3000, 3000,
@ -5430,7 +5465,7 @@ local skill = {
["shake_type"]=5, ["shake_type"]=5,
["sound_hit"]=2200120, ["sound_hit"]=2200120,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_target"]=400014, ["fx_self"]=400014,
["bullet_time"]={ ["bullet_time"]={
1100, 1100,
3000, 3000,
@ -5542,7 +5577,7 @@ local skill = {
["shake_type"]=5, ["shake_type"]=5,
["sound_hit"]=1200120, ["sound_hit"]=1200120,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_self"]=300020, ["fx_self"]=200028,
["fx_target"]=2, ["fx_target"]=2,
["fx_target_delay"]=900, ["fx_target_delay"]=900,
["bullet_time"]={ ["bullet_time"]={
@ -5592,7 +5627,7 @@ local skill = {
{ {
["type"]="burn", ["type"]="burn",
["num"]=5000, ["num"]=5000,
["ratio"]=5000, ["ratio"]=10000,
["round"]=2 ["round"]=2
} }
}, },
@ -5628,7 +5663,8 @@ local skill = {
["skill_position"]=2, ["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["name_act"]="skill01" ["name_act"]="skill01",
["fx_self"]=200120
}, },
[10042]={ [10042]={
["effect_type"]=1, ["effect_type"]=1,
@ -5679,7 +5715,7 @@ local skill = {
["shake_type"]=6, ["shake_type"]=6,
["sound_hit"]=4200120, ["sound_hit"]=4200120,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_target"]=400029 ["fx_self"]=400029
}, },
[10043]={ [10043]={
["effect_type"]=1, ["effect_type"]=1,
@ -5700,7 +5736,7 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=2, ["cd_start"]=1,
["name_act"]="skill01", ["name_act"]="skill01",
["fx_self"]=200084 ["fx_self"]=200084
}, },
@ -5769,7 +5805,8 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["cd"]=3, ["skill_position"]=2,
["cd"]=2,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
@ -5779,13 +5816,13 @@ local skill = {
}, },
[10046]={ [10046]={
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=2, ["trigger"]=5,
["effect"]={ ["effect"]={
{ {
["type"]="death_summon", ["type"]="death_summon",
["num"]=57001, ["num"]=45091,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=0
} }
}, },
["obj"]=1, ["obj"]=1,
@ -5795,7 +5832,7 @@ local skill = {
[10047]={ [10047]={
["skill_type"]=10, ["skill_type"]=10,
["skill_type_parameter"]={ ["skill_type_parameter"]={
0, 2,
2 2
}, },
["effect_type"]=1, ["effect_type"]=1,
@ -5809,6 +5846,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -5819,13 +5857,13 @@ local skill = {
}, },
[10048]={ [10048]={
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=2, ["trigger"]=5,
["effect"]={ ["effect"]={
{ {
["type"]="death_summon", ["type"]="death_summon",
["num"]=57001, ["num"]=47091,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=0
} }
}, },
["obj"]=1, ["obj"]=1,
@ -5862,7 +5900,8 @@ local skill = {
2, 2,
3 3
}, },
["cd"]=2, ["skill_position"]=2,
["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
@ -5892,15 +5931,22 @@ local skill = {
["num"]=15000, ["num"]=15000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
},
{
["type"]="lock",
["num"]=0,
["ratio"]=10000,
["round"]=2
} }
}, },
["obj"]=2, ["obj"]=2,
["effect_block"]={ ["effect_block"]={
1, 1,
2, 2,
3 4
}, },
["cd"]=2, ["skill_position"]=2,
["cd"]=3,
["cd_start"]=1, ["cd_start"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
@ -5926,6 +5972,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["name_act"]="skill01", ["name_act"]="skill01",
@ -5944,12 +5991,14 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["sound_hit"]=4200120, ["sound_hit"]=4200120,
["name_act"]="skill01" ["name_act"]="skill01",
["fx_self"]=200118
}, },
[10053]={ [10053]={
["skill_type"]=6, ["skill_type"]=6,
@ -5991,12 +6040,14 @@ local skill = {
3, 3,
4 4
}, },
["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=2, ["cd_start"]=1,
["shake_time"]=200, ["shake_time"]=200,
["shake_type"]=6, ["shake_type"]=6,
["sound_hit"]=4200120, ["sound_hit"]=4200120,
["name_act"]="skill02" ["name_act"]="skill02",
["fx_self"]=200119
}, },
[10054]={ [10054]={
["effect_type"]=1, ["effect_type"]=1,
@ -6011,7 +6062,7 @@ local skill = {
}, },
["obj"]=1, ["obj"]=1,
["cd"]=3, ["cd"]=3,
["cd_start"]=2 ["cd_start"]=1
}, },
[10055]={ [10055]={
["effect_type"]=2, ["effect_type"]=2,
@ -6038,12 +6089,37 @@ local skill = {
["effect"]={ ["effect"]={
{ {
["type"]="hurt", ["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"]=15000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
} }
}, },
["obj"]=2, ["obj"]=2,
["effect_block"]={
1,
2,
3,
4
},
["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -6106,6 +6182,7 @@ local skill = {
5, 5,
6 6
}, },
["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=2, ["cd_start"]=2,
["shake_time"]=200, ["shake_time"]=200,
@ -6149,6 +6226,7 @@ local skill = {
2, 2,
4 4
}, },
["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -6180,6 +6258,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=2, ["cd_start"]=2,
["shake_time"]=200, ["shake_time"]=200,
@ -6356,8 +6435,8 @@ local skill = {
["round"]=2 ["round"]=2
} }
}, },
["obj"]=2, ["obj"]=1,
["skill_position"]=1, ["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0 ["cd_start"]=0
}, },
@ -6411,6 +6490,7 @@ local skill = {
} }
}, },
["obj"]=1, ["obj"]=1,
["skill_position"]=2,
["cd"]=3, ["cd"]=3,
["cd_start"]=0 ["cd_start"]=0
}, },
@ -6462,7 +6542,7 @@ local skill = {
3, 3,
6 6
}, },
["skill_position"]=2, ["skill_position"]=1,
["cd"]=3, ["cd"]=3,
["cd_start"]=0, ["cd_start"]=0,
["shake_time"]=200, ["shake_time"]=200,
@ -6502,6 +6582,39 @@ local skill = {
666 666
} }
}, },
[10071]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=30000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="burn",
["num"]=5000,
["ratio"]=10000,
["round"]=2
},
{
["type"]="weaken",
["num"]=2500,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=2,
["skill_position"]=2,
["cd"]=3,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
["name_act"]="skill01",
["fx_self"]=200092
},
[20001]={ [20001]={
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
@ -10102,7 +10215,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200111, ["sound_hit"]=5200111,
@ -10121,7 +10234,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200112, ["sound_hit"]=5200112,
@ -10140,7 +10253,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200113, ["sound_hit"]=5200113,
@ -10159,7 +10272,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200111, ["sound_hit"]=5200111,
@ -10178,7 +10291,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200112, ["sound_hit"]=5200112,
@ -10197,7 +10310,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200113, ["sound_hit"]=5200113,
@ -10501,7 +10614,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200111, ["sound_hit"]=5200111,
@ -10520,7 +10633,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200112, ["sound_hit"]=5200112,
@ -10539,7 +10652,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200113, ["sound_hit"]=5200113,
@ -10672,7 +10785,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200111, ["sound_hit"]=5200111,
@ -10691,7 +10804,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200112, ["sound_hit"]=5200112,
@ -10710,7 +10823,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200113, ["sound_hit"]=5200113,
@ -10729,7 +10842,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200111, ["sound_hit"]=5200111,
@ -10748,7 +10861,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200112, ["sound_hit"]=5200112,
@ -10767,7 +10880,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200113, ["sound_hit"]=5200113,
@ -10786,7 +10899,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200111, ["sound_hit"]=5200111,
@ -10805,7 +10918,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200112, ["sound_hit"]=5200112,
@ -10824,7 +10937,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200113, ["sound_hit"]=5200113,
@ -11356,7 +11469,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200111, ["sound_hit"]=5200111,
@ -11375,7 +11488,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200112, ["sound_hit"]=5200112,
@ -11394,7 +11507,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=1, ["skill_position"]=2,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200113, ["sound_hit"]=5200113,
@ -11931,7 +12044,7 @@ local skill = {
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200111, ["sound_hit"]=5200111,
["name_act"]="attack01", ["name_act"]="attack01",
["fx_target"]=400025 ["fx_self"]=400025
}, },
[40026]={ [40026]={
["effect_type"]=1, ["effect_type"]=1,
@ -11950,7 +12063,7 @@ local skill = {
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200112, ["sound_hit"]=5200112,
["name_act"]="attack02", ["name_act"]="attack02",
["fx_target"]=400026 ["fx_self"]=400026
}, },
[40027]={ [40027]={
["effect_type"]=1, ["effect_type"]=1,
@ -11969,7 +12082,7 @@ local skill = {
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200113, ["sound_hit"]=5200113,
["name_act"]="attack03", ["name_act"]="attack03",
["fx_target"]=400027 ["fx_self"]=400027
}, },
[40028]={ [40028]={
["effect_type"]=1, ["effect_type"]=1,
@ -11988,7 +12101,7 @@ local skill = {
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200114, ["sound_hit"]=5200114,
["name_act"]="attack04", ["name_act"]="attack04",
["fx_target"]=400028 ["fx_self"]=400028
}, },
[40029]={ [40029]={
["effect_type"]=1, ["effect_type"]=1,
@ -12078,7 +12191,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200111, ["sound_hit"]=5200111,
@ -12097,7 +12210,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200112, ["sound_hit"]=5200112,
@ -12116,7 +12229,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200113, ["sound_hit"]=5200113,
@ -12135,7 +12248,7 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]=2, ["skill_position"]=1,
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
["sound_hit"]=5200114, ["sound_hit"]=5200114,
@ -12220,6 +12333,6 @@ local skill = {
} }
} }
local config = { local config = {
data=skill,count=576 data=skill,count=577
} }
return config return config

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

@ -21,28 +21,25 @@ local buff_daily_challenge = {
["desc"]="生命值恢复效果提升<color=#3cff28>5%</color>" ["desc"]="生命值恢复效果提升<color=#3cff28>5%</color>"
}, },
[8]={ [8]={
["desc"]="回合开始前生命值恢复<color=#3cff28>1%</color>"
},
[9]={
["desc"]="敌方攻击力+<color=#3cff28>5%</color>" ["desc"]="敌方攻击力+<color=#3cff28>5%</color>"
}, },
[10]={ [9]={
["desc"]="敌方造成伤害+<color=#3cff28>5%</color>" ["desc"]="敌方造成伤害+<color=#3cff28>5%</color>"
}, },
[11]={ [10]={
["desc"]="敌方普攻次数+<color=#3cff28>1</color>" ["desc"]="敌方普攻次数+<color=#3cff28>1</color>"
}, },
[12]={ [11]={
["desc"]="治疗效果-<color=#3cff28>10%</color>" ["desc"]="治疗效果-<color=#3cff28>10%</color>"
}, },
[13]={ [12]={
["desc"]="敌方格挡概率+<color=#3cff28>5%</color>" ["desc"]="敌方格挡概率+<color=#3cff28>5%</color>"
}, },
[14]={ [13]={
["desc"]="受到所有伤害-<color=#3cff28>5%</color>" ["desc"]="受到所有伤害-<color=#3cff28>5%</color>"
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -37,12 +37,9 @@ local buff_daily_challenge = {
}, },
[13]={ [13]={
},
[14]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -21,28 +21,25 @@ local buff_daily_challenge = {
["desc"]="HP recovery effect increases by <color=#3cff28>5%</color>" ["desc"]="HP recovery effect increases by <color=#3cff28>5%</color>"
}, },
[8]={ [8]={
["desc"]="HP recovers <color=#3cff28>1%</color> when turn begins"
},
[9]={
["desc"]="Enemy Attack +<color=#3cff28>5%</color>" ["desc"]="Enemy Attack +<color=#3cff28>5%</color>"
}, },
[10]={ [9]={
["desc"]="Enemy damage dealt +<color=#3cff28>5%</color>" ["desc"]="Enemy damage dealt +<color=#3cff28>5%</color>"
}, },
[11]={ [10]={
["desc"]="Enemy normal attacks +<color=#3cff28>1</color>" ["desc"]="Enemy normal attacks +<color=#3cff28>1</color>"
}, },
[12]={ [11]={
["desc"]="Healing effect -<color=#3cff28>10%</color>" ["desc"]="Healing effect -<color=#3cff28>10%</color>"
}, },
[13]={ [12]={
["desc"]="Enemy block rate +<color=#3cff28>5%</color>" ["desc"]="Enemy block rate +<color=#3cff28>5%</color>"
}, },
[14]={ [13]={
["desc"]="all damage taken -<color=#3cff28>5%</color>" ["desc"]="all damage taken -<color=#3cff28>5%</color>"
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -37,12 +37,9 @@ local buff_daily_challenge = {
}, },
[13]={ [13]={
},
[14]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -37,12 +37,9 @@ local buff_daily_challenge = {
}, },
[13]={ [13]={
},
[14]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -37,12 +37,9 @@ local buff_daily_challenge = {
}, },
[13]={ [13]={
},
[14]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -37,12 +37,9 @@ local buff_daily_challenge = {
}, },
[13]={ [13]={
},
[14]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -37,12 +37,9 @@ local buff_daily_challenge = {
}, },
[13]={ [13]={
},
[14]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -37,12 +37,9 @@ local buff_daily_challenge = {
}, },
[13]={ [13]={
},
[14]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -37,12 +37,9 @@ local buff_daily_challenge = {
}, },
[13]={ [13]={
},
[14]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -37,12 +37,9 @@ local buff_daily_challenge = {
}, },
[13]={ [13]={
},
[14]={
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -21,28 +21,25 @@ local buff_daily_challenge = {
["desc"]="生命值恢復效果提升<color=#3cff28>5%</color>" ["desc"]="生命值恢復效果提升<color=#3cff28>5%</color>"
}, },
[8]={ [8]={
["desc"]="回合開始前生命值恢復<color=#3cff28>1%</color>"
},
[9]={
["desc"]="敵方攻擊力+<color=#3cff28>5%</color>" ["desc"]="敵方攻擊力+<color=#3cff28>5%</color>"
}, },
[10]={ [9]={
["desc"]="敵方造成傷害+<color=#3cff28>5%</color>" ["desc"]="敵方造成傷害+<color=#3cff28>5%</color>"
}, },
[11]={ [10]={
["desc"]="敵方普攻次數+<color=#3cff28>1</color>" ["desc"]="敵方普攻次數+<color=#3cff28>1</color>"
}, },
[12]={ [11]={
["desc"]="治療效果-<color=#3cff28>10%</color>" ["desc"]="治療效果-<color=#3cff28>10%</color>"
}, },
[13]={ [12]={
["desc"]="敵方格擋概率+<color=#3cff28>5%</color>" ["desc"]="敵方格擋概率+<color=#3cff28>5%</color>"
}, },
[14]={ [13]={
["desc"]="受到所有傷害-<color=#3cff28>5%</color>" ["desc"]="受到所有傷害-<color=#3cff28>5%</color>"
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -118,7 +118,7 @@ local tutorial = {
["next_id"]=20040, ["next_id"]=20040,
["type"]=2, ["type"]=2,
["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2",
["arrow_direction"]=1, ["arrow_direction"]=2,
["arrow_offset"]={ ["arrow_offset"]={
0, 0,
0 0
@ -326,7 +326,7 @@ local tutorial = {
["next_id"]=40040, ["next_id"]=40040,
["type"]=2, ["type"]=2,
["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2",
["arrow_direction"]=1, ["arrow_direction"]=2,
["arrow_offset"]={ ["arrow_offset"]={
0, 0,
0 0
@ -428,7 +428,7 @@ local tutorial = {
180 180
}, },
["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_3", ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_3",
["arrow_direction"]=1, ["arrow_direction"]=2,
["arrow_offset"]={ ["arrow_offset"]={
0, 0,
0 0
@ -445,7 +445,7 @@ local tutorial = {
}, },
[40100]={ [40100]={
["type"]=2, ["type"]=2,
["target_name"]="main_ui(Clone)/sub_ui_node/shop_comp/main/scrollrect/viewport/content/box_sell_cell/bg/box_1/buy_btn", ["target_name"]="main_ui(Clone)/sub_ui_node/shop_comp/main/scrollrect/viewport/content/box_sell_cell/bg/box_1",
["arrow_direction"]=1, ["arrow_direction"]=1,
["arrow_offset"]={ ["arrow_offset"]={
0, 0,

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

@ -1120,6 +1120,7 @@ function BattleController:dealGridBreak(posId, condition, time, breakedMap, sequ
end end
end end
end end
aniUnit.bftcTime = entity:getBftcTime()
if entity:getBreakFlyToCharacter() then if entity:getBreakFlyToCharacter() then
aniUnit.breakFlyToCharacter = true aniUnit.breakFlyToCharacter = true
aniUnit.noAni = false aniUnit.noAni = false
@ -1174,6 +1175,7 @@ function BattleController:getEliminattionAniInfo(posId, timeIdx)
isIdle = false, isIdle = false,
callback = nil, callback = nil,
overCallback = nil, overCallback = nil,
bftcTime = 0
} }
end end

2
lua/app/ui/battle/battle_ui.lua
View File

@ -944,13 +944,13 @@ function BattleUI:eliminationAni(aniSequence, effectGridMap, callback)
self.eliminationAniSeq:InsertCallback(time, function() self.eliminationAniSeq:InsertCallback(time, function()
self:getSfxGridBreak(info.breakSfxName, breakIndex, function(obj) self:getSfxGridBreak(info.breakSfxName, breakIndex, function(obj)
local pos = ModuleManager.BattleManager:getPosInfo(info.posId) local pos = ModuleManager.BattleManager:getPosInfo(info.posId)
obj:setLocalScale(38, 38, 38)
obj:setLocalPosition(pos.x, pos.y, 0) obj:setLocalPosition(pos.x, pos.y, 0)
obj:play() obj:play()
end) end)
end) end)
end end
time = time + (info.bftcTime or 0)
if info.isIdle then if info.isIdle then
if entity:getSkillId() then if entity:getSkillId() then
entity:getCell():hideSkillSfx() entity:getCell():hideSkillSfx()

4
lua/app/userdata/battle/battle_grid_entity.lua
View File

@ -410,4 +410,8 @@ function BattleGridEntity:getSpineScale()
return self:getGridTypeConfig().zoom or 1 return self:getGridTypeConfig().zoom or 1
end end
function BattleGridEntity:getBftcTime()
return self:getGridTypeConfig().bftc_time or 0
end
return BattleGridEntity return BattleGridEntity