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-01 17:42:28 +08:00
commit b031da285f
18 changed files with 3998 additions and 3286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lua/app/bf/common/functions.lua
View File

@ -362,6 +362,29 @@ function table.shuffle(t)
return tab return tab
end end
function table.clear(t)
if not t then
return
end
if type(t) ~= "table" then
return
end
for key, v in pairs(t) do
t[key] = nil
end
end
function table.clearOrCreate(t)
if not t then
return {}
end
if type(t) ~= "table" then
return {}
end
table.clear(t)
return t
end
---查找一个满足条件的元素 ---查找一个满足条件的元素
function table.find(t, predict) function table.find(t, predict)
for k, v in pairs(t) do for k, v in pairs(t) do

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

@ -257,7 +257,7 @@ local buff = {
["decr"]=1, ["decr"]=1,
["formula"]=3, ["formula"]=3,
["fx_get"]={ ["fx_get"]={
300025 300027
} }
}, },
[33]={ [33]={

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

@ -5,7 +5,7 @@ local buff_daily_challenge = {
{ {
["type"]="exp_time_add", ["type"]="exp_time_add",
["num"]=1000, ["num"]=1000,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
@ -17,7 +17,7 @@ local buff_daily_challenge = {
{ {
["type"]="dmg_addition_all_add", ["type"]="dmg_addition_all_add",
["num"]=500, ["num"]=500,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
@ -29,7 +29,7 @@ local buff_daily_challenge = {
{ {
["type"]="dec_dmg_all_add", ["type"]="dec_dmg_all_add",
["num"]=1000, ["num"]=1000,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
@ -40,14 +40,14 @@ local buff_daily_challenge = {
["effect"]={ ["effect"]={
{ {
["type"]="crit_add", ["type"]="crit_add",
["num"]=2000, ["num"]=1000,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999 ["round"]=999
}, },
{ {
["type"]="crit_time_add", ["type"]="crit_time_add",
["num"]=3000, ["num"]=1500,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
@ -59,7 +59,7 @@ local buff_daily_challenge = {
{ {
["type"]="skill_hurt_add", ["type"]="skill_hurt_add",
["num"]=1500, ["num"]=1500,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
@ -69,13 +69,13 @@ local buff_daily_challenge = {
["buff_type"]=1, ["buff_type"]=1,
["effect"]={ ["effect"]={
{ {
["type"]="wavehealp", ["type"]="add_skill",
["num"]=100, ["num"]=8,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
} }
}, },
["obj"]=1 ["obj"]=8
}, },
[7]={ [7]={
["buff_type"]=1, ["buff_type"]=1,
@ -83,37 +83,25 @@ local buff_daily_challenge = {
{ {
["type"]="cured_add", ["type"]="cured_add",
["num"]=500, ["num"]=500,
["ratio"]=500, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
["obj"]=1 ["obj"]=1
}, },
[8]={ [8]={
["buff_type"]=1,
["effect"]={
{
["type"]="wavehealp",
["num"]=100,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=1
},
[9]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
["type"]="atkp_add", ["type"]="atkp_add",
["num"]=500, ["num"]=500,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
["obj"]=2 ["obj"]=2
}, },
[10]={ [9]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
@ -125,7 +113,7 @@ local buff_daily_challenge = {
}, },
["obj"]=2 ["obj"]=2
}, },
[11]={ [10]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
@ -137,37 +125,37 @@ local buff_daily_challenge = {
}, },
["obj"]=2 ["obj"]=2
}, },
[12]={ [11]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
["type"]="cured_dec", ["type"]="cured_dec",
["num"]=1000, ["num"]=1000,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999
}
},
["obj"]=1
},
[12]={
["buff_type"]=2,
["effect"]={
{
["type"]="block",
["num"]=500,
["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
["obj"]=2 ["obj"]=2
}, },
[13]={ [13]={
["buff_type"]=2,
["effect"]={
{
["type"]="block",
["num"]=500,
["ratio"]=1000,
["round"]=999
}
},
["obj"]=2
},
[14]={
["buff_type"]=2, ["buff_type"]=2,
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_all_add", ["type"]="dec_dmg_all_add",
["num"]=500, ["num"]=500,
["ratio"]=1000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
@ -175,6 +163,6 @@ local buff_daily_challenge = {
} }
} }
local config = { local config = {
data=buff_daily_challenge,count=14 data=buff_daily_challenge,count=13
} }
return config return config

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

@ -123,12 +123,12 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=28 ["weight"]=100
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 11000,
30000 11000
} }
}, },
[2]={ [2]={
@ -274,12 +274,12 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=28 ["weight"]=100
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 11000,
30000 11000
} }
}, },
[3]={ [3]={
@ -420,12 +420,12 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=28 ["weight"]=100
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 11000,
30000 11000
} }
}, },
[4]={ [4]={
@ -617,12 +617,12 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=28 ["weight"]=100
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 11000,
30000 11000
} }
}, },
[5]={ [5]={
@ -814,18 +814,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=28 ["weight"]=90
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=2 ["weight"]=10
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 12672,
30000 15334
} }
}, },
[6]={ [6]={
@ -1017,18 +1017,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=25 ["weight"]=85
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=5 ["weight"]=15
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 13453,
30000 16814
} }
}, },
[7]={ [7]={
@ -1236,18 +1236,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=25 ["weight"]=85
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=5 ["weight"]=15
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 15389,
30000 19894
} }
}, },
[8]={ [8]={
@ -1455,18 +1455,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=25 ["weight"]=85
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=5 ["weight"]=15
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 17688,
30000 23408
} }
}, },
[9]={ [9]={
@ -1674,18 +1674,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=25 ["weight"]=85
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=5 ["weight"]=15
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 19289,
30000 26153
} }
}, },
[10]={ [10]={
@ -1893,18 +1893,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=25 ["weight"]=85
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=5 ["weight"]=15
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 22561,
30000 31119
} }
}, },
[11]={ [11]={
@ -2112,18 +2112,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=23 ["weight"]=80
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=7 ["weight"]=20
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 26466,
30000 35657
} }
}, },
[12]={ [12]={
@ -2331,18 +2331,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=23 ["weight"]=80
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=7 ["weight"]=20
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 27220,
30000 38682
} }
}, },
[13]={ [13]={
@ -2550,18 +2550,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=23 ["weight"]=80
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=7 ["weight"]=20
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 28479,
30000 41052
} }
}, },
[14]={ [14]={
@ -2769,18 +2769,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=23 ["weight"]=80
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=7 ["weight"]=20
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 30899,
30000 45133
} }
}, },
[15]={ [15]={
@ -2988,18 +2988,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=23 ["weight"]=80
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=7 ["weight"]=20
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 31774,
30000 46992
} }
}, },
[16]={ [16]={
@ -3207,18 +3207,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=75
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=25
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 33633,
30000 50331
} }
}, },
[17]={ [17]={
@ -3426,18 +3426,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=75
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=25
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 35024,
30000 53042
} }
}, },
[18]={ [18]={
@ -3645,18 +3645,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=75
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=25
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 37136,
30000 56738
} }
}, },
[19]={ [19]={
@ -3864,18 +3864,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=75
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=25
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 38143,
30000 59004
} }
}, },
[20]={ [20]={
@ -4083,18 +4083,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=20 ["weight"]=75
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=10 ["weight"]=25
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 40535,
30000 63234
} }
}, },
[21]={ [21]={
@ -4302,18 +4302,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=18 ["weight"]=70
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=12 ["weight"]=30
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 42114,
30000 66275
} }
}, },
[22]={ [22]={
@ -4521,18 +4521,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=18 ["weight"]=70
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=12 ["weight"]=30
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 44759,
30000 70994
} }
}, },
[23]={ [23]={
@ -4740,18 +4740,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=18 ["weight"]=70
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=12 ["weight"]=30
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 46690,
30000 74635
} }
}, },
[24]={ [24]={
@ -4959,18 +4959,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=18 ["weight"]=70
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=12 ["weight"]=30
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 47564,
30000 76615
} }
}, },
[25]={ [25]={
@ -5178,18 +5178,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=18 ["weight"]=70
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=12 ["weight"]=30
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 51332,
30000 83375
} }
}, },
[26]={ [26]={
@ -5397,18 +5397,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=65
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=35
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 52333,
30000 85564
} }
}, },
[27]={ [27]={
@ -5616,18 +5616,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=65
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=35
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 56568,
30000 93055
} }
}, },
[28]={ [28]={
@ -5835,18 +5835,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=65
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=35
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 61303,
30000 101426
} }
}, },
[29]={ [29]={
@ -6054,18 +6054,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=65
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=35
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 56931,
30000 94804
} }
}, },
[30]={ [30]={
@ -6272,18 +6272,18 @@ local chapter = {
["type"]=1, ["type"]=1,
["id"]=4, ["id"]=4,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=65
}, },
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=15 ["weight"]=35
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30000, 62926,
30000 105386
} }
} }
} }

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

@ -3673,7 +3673,7 @@ local chapter_board = {
3 3
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3681,7 +3681,7 @@ local chapter_board = {
4 4
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3689,7 +3689,7 @@ local chapter_board = {
3 3
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3697,7 +3697,7 @@ local chapter_board = {
3 3
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3705,7 +3705,7 @@ local chapter_board = {
4 4
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3713,7 +3713,7 @@ local chapter_board = {
4 4
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3721,35 +3721,35 @@ local chapter_board = {
4 4
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3871,7 +3871,7 @@ local chapter_board = {
3 3
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3879,7 +3879,7 @@ local chapter_board = {
4 4
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3887,7 +3887,7 @@ local chapter_board = {
3 3
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3895,7 +3895,7 @@ local chapter_board = {
3 3
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3903,7 +3903,7 @@ local chapter_board = {
4 4
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3911,7 +3911,7 @@ local chapter_board = {
4 4
}, },
{ {
3, 2,
0 0
}, },
{ {
@ -3919,35 +3919,35 @@ local chapter_board = {
4 4
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {
3, 2,
0 0
}, },
{ {

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

File diff suppressed because it is too large Load Diff

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

@ -111,7 +111,7 @@ local const = {
["value"]=600 ["value"]=600
}, },
["idle_item_drop_time"]={ ["idle_item_drop_time"]={
["value"]=600 ["value"]=1800
}, },
["idle_drop_fast_times_1"]={ ["idle_drop_fast_times_1"]={
["value"]=2 ["value"]=2

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

File diff suppressed because it is too large Load Diff

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

@ -972,6 +972,9 @@ local monster_chapter = {
30065, 30065,
30066 30066
}, },
["skill"]={
10023
},
["monster_exp"]=18000 ["monster_exp"]=18000
}, },
[7601]={ [7601]={
@ -1097,6 +1100,9 @@ local monster_chapter = {
30065, 30065,
30066 30066
}, },
["skill"]={
10023
},
["monster_exp"]=24000 ["monster_exp"]=24000
}, },
[8601]={ [8601]={
@ -1163,6 +1169,9 @@ local monster_chapter = {
10067, 10067,
10068 10068
}, },
["passive_skill"]={
10013
},
["monster_exp"]=22000 ["monster_exp"]=22000
}, },
[9101]={ [9101]={
@ -1288,6 +1297,9 @@ local monster_chapter = {
30065, 30065,
30066 30066
}, },
["skill"]={
10023
},
["monster_exp"]=12000 ["monster_exp"]=12000
}, },
[10101]={ [10101]={

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -1914,18 +1914,11 @@ local skill_rogue = {
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["type"]=2, ["type"]=1,
["skill_position"]=3, ["parameter"]={
["boardrange"]={ 3300125
{
["type"]=1,
["range"]=2
},
{
["type"]=2,
["range"]=2
}
}, },
["skill_position"]=3,
["icon"]="82" ["icon"]="82"
}, },
[3300104]={ [3300104]={
@ -2974,18 +2967,11 @@ local skill_rogue = {
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["type"]=2, ["type"]=1,
["skill_position"]=5, ["parameter"]={
["boardrange"]={ 5300225
{
["type"]=3,
["range"]=2
},
{
["type"]=4,
["range"]=2
}
}, },
["skill_position"]=5,
["icon"]="129" ["icon"]="129"
}, },
[5300202]={ [5300202]={

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

File diff suppressed because it is too large Load Diff

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

@ -36,7 +36,7 @@ function BattleControllerDailyChallenge:getBuffs()
buffEntity:setTargetSide(cfg[buffId].obj) buffEntity:setTargetSide(cfg[buffId].obj)
buffEntity:setIsCantRemove(true) buffEntity:setIsCantRemove(true)
table.insert(self.initBuffs, buffEntity) table.insert(self.initBuffs, {buffEntity = buffEntity, effect = effect[1]})
end end
end end
end end

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

@ -30,7 +30,7 @@ local function _crossSpread(entity, gridEntities, battleController, onlyCheck)
for _, posId in ipairs(tempList) do for _, posId in ipairs(tempList) do
local gridEntity = gridEntities[posId] local gridEntity = gridEntities[posId]
if gridEntity:isEmptyIdle() then if gridEntity:isEmptyIdle() then
battleController.battleData:setGridType(posId, BattleConst.GRID_TYPE.JELLY) battleController.battleData:setGridType(posId, entity:getGridType() or BattleConst.GRID_TYPE.JELLY)
succ = true succ = true
break break
end end

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

@ -349,6 +349,11 @@ function BattleUI:showBuffTips(buffList, autoClose)
index = index + 1 index = index + 1
end end
end end
if index <= 1 then -- 没有找到buff
self.battleBuffTipsRoot:setLocalScale(0, 0, 0)
return
end
for i = index, #self.battleBuffTipsBuffList do for i = index, #self.battleBuffTipsBuffList do
self.battleBuffTipsBuffList[i]:setLocalScale(0, 0, 0) self.battleBuffTipsBuffList[i]:setLocalScale(0, 0, 0)
end end
@ -1762,7 +1767,7 @@ function BattleUI:playSkillLineSfx(posId, boradRangeList, randomPosList)
end end
end end
if randomPosList then if randomPosList and randomPosList[1] then
local count = math.min(#randomPosList, 5) -- 特效最多5个 local count = math.min(#randomPosList, 5) -- 特效最多5个
self.skillLightSfxs.point:setAnchoredPosition(pos.x, pos.y) self.skillLightSfxs.point:setAnchoredPosition(pos.x, pos.y)
self.skillLightSfxs.point:setActive(true) self.skillLightSfxs.point:setActive(true)

5
lua/app/ui/player/player_level_up_ui.lua
View File

@ -27,6 +27,11 @@ function PlayerLevelUpUI:_display()
self:closeUI() self:closeUI()
end) end)
local spineTitle = uiMap["player_level_up_ui.spine_title"]
spineTitle:playAnimComplete("idle1", false, false, function()
spineTitle:playAnim("idle2", true, false)
end)
local toLevel = DataManager.PlayerData:getLv() local toLevel = DataManager.PlayerData:getLv()
uiMap["player_level_up_ui.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.PLAYER_LEVEL_UP_DESC, toLevel)) uiMap["player_level_up_ui.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.PLAYER_LEVEL_UP_DESC, toLevel))
uiMap["player_level_up_ui.reward_title"]:setText(I18N:getGlobalText(I18N.GlobalConst.LEVEL_UP_REWARD)) uiMap["player_level_up_ui.reward_title"]:setText(I18N:getGlobalText(I18N.GlobalConst.LEVEL_UP_REWARD))

1
lua/app/userdata/daily_challenge/daily_challenge_data.lua
View File

@ -12,6 +12,7 @@ end
function DailyChallengeData:init(data) function DailyChallengeData:init(data)
if EDITOR_MODE then if EDITOR_MODE then
Logger.logHighlight("每日挑战 更新数据...") Logger.logHighlight("每日挑战 更新数据...")
Logger.printTable(data)
end end
data = data or GConst.EMPTY_TABLE data = data or GConst.EMPTY_TABLE
self.maxWave = data.max_wave or 0 self.maxWave = data.max_wave or 0