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

补充奖励显示逻辑

Browse Source
This commit is contained in:
Fang 2023-06-12 18:47:01 +08:00
parent 59289536d1
commit decabd89ee
13 changed files with 2557 additions and 1183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
lua/app/config/chapter_dungeon_gold.lua
View File

@ -24,7 +24,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[2]={ [2]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -51,7 +52,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[3]={ [3]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -78,7 +80,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[4]={ [4]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -105,7 +108,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[5]={ [5]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -132,7 +136,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[6]={ [6]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -159,7 +164,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[7]={ [7]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -186,7 +192,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[8]={ [8]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -213,7 +220,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[9]={ [9]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -240,7 +248,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[10]={ [10]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -267,7 +276,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[11]={ [11]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -294,7 +304,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[12]={ [12]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -321,7 +332,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[13]={ [13]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -348,7 +360,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[14]={ [14]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -375,7 +388,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[15]={ [15]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -402,7 +416,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[16]={ [16]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -429,7 +444,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[17]={ [17]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -456,7 +472,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[18]={ [18]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -483,7 +500,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[19]={ [19]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -510,7 +528,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[20]={ [20]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -537,7 +556,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[21]={ [21]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -564,7 +584,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[22]={ [22]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -591,7 +612,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[23]={ [23]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -618,7 +640,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[24]={ [24]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -645,7 +668,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[25]={ [25]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -672,7 +696,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[26]={ [26]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -699,7 +724,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[27]={ [27]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -726,7 +752,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[28]={ [28]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -753,7 +780,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[29]={ [29]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -780,7 +808,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
}, },
[30]={ [30]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -807,7 +836,8 @@ local chapter_dungeon_gold = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
} },
["wave_limit"]=15
} }
} }
local config = { local config = {

570
lua/app/config/chapter_dungeon_shards.lua
View File

@ -17,21 +17,12 @@ local chapter_dungeon_shards = {
404, 404,
504 504
}, },
["buff_id"]={ ["effect"]={
{ {
7 ["type"]="dec_dmg_red_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
7 ["round"]=999
},
{
7
},
{
7
},
{
7
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -115,21 +106,12 @@ local chapter_dungeon_shards = {
904, 904,
1004 1004
}, },
["buff_id"]={ ["effect"]={
{ {
8 ["type"]="dec_dmg_yellow_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
8 ["round"]=999
},
{
8
},
{
8
},
{
8
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -213,21 +195,12 @@ local chapter_dungeon_shards = {
1404, 1404,
1504 1504
}, },
["buff_id"]={ ["effect"]={
{ {
9 ["type"]="dec_dmg_green_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
9 ["round"]=999
},
{
9
},
{
9
},
{
9
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -311,21 +284,12 @@ local chapter_dungeon_shards = {
1904, 1904,
2004 2004
}, },
["buff_id"]={ ["effect"]={
{ {
10 ["type"]="dec_dmg_blue_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
10 ["round"]=999
},
{
10
},
{
10
},
{
10
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -409,21 +373,12 @@ local chapter_dungeon_shards = {
2404, 2404,
2504 2504
}, },
["buff_id"]={ ["effect"]={
{ {
11 ["type"]="dec_dmg_purple_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
11 ["round"]=999
},
{
11
},
{
11
},
{
11
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -507,21 +462,12 @@ local chapter_dungeon_shards = {
2904, 2904,
3004 3004
}, },
["buff_id"]={ ["effect"]={
{ {
7 ["type"]="dec_dmg_red_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
7 ["round"]=999
},
{
7
},
{
7
},
{
7
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -605,21 +551,12 @@ local chapter_dungeon_shards = {
3404, 3404,
3504 3504
}, },
["buff_id"]={ ["effect"]={
{ {
8 ["type"]="dec_dmg_yellow_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
8 ["round"]=999
},
{
8
},
{
8
},
{
8
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -703,21 +640,12 @@ local chapter_dungeon_shards = {
3904, 3904,
4004 4004
}, },
["buff_id"]={ ["effect"]={
{ {
9 ["type"]="dec_dmg_green_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
9 ["round"]=999
},
{
9
},
{
9
},
{
9
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -801,21 +729,12 @@ local chapter_dungeon_shards = {
4404, 4404,
4504 4504
}, },
["buff_id"]={ ["effect"]={
{ {
10 ["type"]="dec_dmg_blue_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
10 ["round"]=999
},
{
10
},
{
10
},
{
10
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -899,21 +818,12 @@ local chapter_dungeon_shards = {
4904, 4904,
5004 5004
}, },
["buff_id"]={ ["effect"]={
{ {
11 ["type"]="dec_dmg_purple_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
11 ["round"]=999
},
{
11
},
{
11
},
{
11
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -997,21 +907,12 @@ local chapter_dungeon_shards = {
5404, 5404,
5504 5504
}, },
["buff_id"]={ ["effect"]={
{ {
7 ["type"]="dec_dmg_red_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
7 ["round"]=999
},
{
7
},
{
7
},
{
7
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1095,21 +996,12 @@ local chapter_dungeon_shards = {
5904, 5904,
6004 6004
}, },
["buff_id"]={ ["effect"]={
{ {
8 ["type"]="dec_dmg_yellow_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
8 ["round"]=999
},
{
8
},
{
8
},
{
8
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1193,21 +1085,12 @@ local chapter_dungeon_shards = {
6404, 6404,
6504 6504
}, },
["buff_id"]={ ["effect"]={
{ {
9 ["type"]="dec_dmg_green_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
9 ["round"]=999
},
{
9
},
{
9
},
{
9
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1291,21 +1174,12 @@ local chapter_dungeon_shards = {
6904, 6904,
7004 7004
}, },
["buff_id"]={ ["effect"]={
{ {
10 ["type"]="dec_dmg_blue_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
10 ["round"]=999
},
{
10
},
{
10
},
{
10
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1389,21 +1263,12 @@ local chapter_dungeon_shards = {
7404, 7404,
7504 7504
}, },
["buff_id"]={ ["effect"]={
{ {
11 ["type"]="dec_dmg_purple_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
11 ["round"]=999
},
{
11
},
{
11
},
{
11
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1487,21 +1352,12 @@ local chapter_dungeon_shards = {
7904, 7904,
8004 8004
}, },
["buff_id"]={ ["effect"]={
{ {
7 ["type"]="dec_dmg_red_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
7 ["round"]=999
},
{
7
},
{
7
},
{
7
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1585,21 +1441,12 @@ local chapter_dungeon_shards = {
8404, 8404,
8504 8504
}, },
["buff_id"]={ ["effect"]={
{ {
8 ["type"]="dec_dmg_yellow_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
8 ["round"]=999
},
{
8
},
{
8
},
{
8
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1683,21 +1530,12 @@ local chapter_dungeon_shards = {
8904, 8904,
9004 9004
}, },
["buff_id"]={ ["effect"]={
{ {
9 ["type"]="dec_dmg_green_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
9 ["round"]=999
},
{
9
},
{
9
},
{
9
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1781,21 +1619,12 @@ local chapter_dungeon_shards = {
9404, 9404,
9504 9504
}, },
["buff_id"]={ ["effect"]={
{ {
10 ["type"]="dec_dmg_blue_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
10 ["round"]=999
},
{
10
},
{
10
},
{
10
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1879,21 +1708,12 @@ local chapter_dungeon_shards = {
9904, 9904,
10004 10004
}, },
["buff_id"]={ ["effect"]={
{ {
11 ["type"]="dec_dmg_purple_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
11 ["round"]=999
},
{
11
},
{
11
},
{
11
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -1977,21 +1797,12 @@ local chapter_dungeon_shards = {
10404, 10404,
10504 10504
}, },
["buff_id"]={ ["effect"]={
{ {
7 ["type"]="dec_dmg_red_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
7 ["round"]=999
},
{
7
},
{
7
},
{
7
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -2075,21 +1886,12 @@ local chapter_dungeon_shards = {
10904, 10904,
11004 11004
}, },
["buff_id"]={ ["effect"]={
{ {
8 ["type"]="dec_dmg_yellow_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
8 ["round"]=999
},
{
8
},
{
8
},
{
8
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -2173,21 +1975,12 @@ local chapter_dungeon_shards = {
11404, 11404,
11504 11504
}, },
["buff_id"]={ ["effect"]={
{ {
9 ["type"]="dec_dmg_green_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
9 ["round"]=999
},
{
9
},
{
9
},
{
9
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -2271,21 +2064,12 @@ local chapter_dungeon_shards = {
11904, 11904,
12004 12004
}, },
["buff_id"]={ ["effect"]={
{ {
10 ["type"]="dec_dmg_blue_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
10 ["round"]=999
},
{
10
},
{
10
},
{
10
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -2369,21 +2153,12 @@ local chapter_dungeon_shards = {
12404, 12404,
12504 12504
}, },
["buff_id"]={ ["effect"]={
{ {
11 ["type"]="dec_dmg_purple_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
11 ["round"]=999
},
{
11
},
{
11
},
{
11
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -2467,21 +2242,12 @@ local chapter_dungeon_shards = {
12904, 12904,
13004 13004
}, },
["buff_id"]={ ["effect"]={
{ {
7 ["type"]="dec_dmg_red_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
7 ["round"]=999
},
{
7
},
{
7
},
{
7
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -2565,21 +2331,12 @@ local chapter_dungeon_shards = {
13404, 13404,
13504 13504
}, },
["buff_id"]={ ["effect"]={
{ {
8 ["type"]="dec_dmg_yellow_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
8 ["round"]=999
},
{
8
},
{
8
},
{
8
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -2663,21 +2420,12 @@ local chapter_dungeon_shards = {
13904, 13904,
14004 14004
}, },
["buff_id"]={ ["effect"]={
{ {
9 ["type"]="dec_dmg_green_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
9 ["round"]=999
},
{
9
},
{
9
},
{
9
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -2761,21 +2509,12 @@ local chapter_dungeon_shards = {
14404, 14404,
14504 14504
}, },
["buff_id"]={ ["effect"]={
{ {
10 ["type"]="dec_dmg_blue_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
10 ["round"]=999
},
{
10
},
{
10
},
{
10
} }
}, },
["wave_reward"]={ ["wave_reward"]={
@ -2859,21 +2598,12 @@ local chapter_dungeon_shards = {
14904, 14904,
15004 15004
}, },
["buff_id"]={ ["effect"]={
{ {
11 ["type"]="dec_dmg_purple_add",
}, ["num"]=5000,
{ ["ratio"]=10000,
11 ["round"]=999
},
{
11
},
{
11
},
{
11
} }
}, },
["wave_reward"]={ ["wave_reward"]={

420
lua/app/config/monster_dungeon_gold.lua
View File

@ -4,210 +4,570 @@ local monster_dungeon_gold = {
["hp"]=90000000, ["hp"]=90000000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[205]={ [205]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=90200000, ["hp"]=90200000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[305]={ [305]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=90400000, ["hp"]=90400000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[405]={ [405]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=90600000, ["hp"]=90600000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[505]={ [505]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=90800000, ["hp"]=90800000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[605]={ [605]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91000000, ["hp"]=91000000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[705]={ [705]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91200000, ["hp"]=91200000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[805]={ [805]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91400000, ["hp"]=91400000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[905]={ [905]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91600000, ["hp"]=91600000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1005]={ [1005]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91800000, ["hp"]=91800000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1105]={ [1105]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92000000, ["hp"]=92000000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1205]={ [1205]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92200000, ["hp"]=92200000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1305]={ [1305]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92400000, ["hp"]=92400000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1405]={ [1405]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92600000, ["hp"]=92600000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1505]={ [1505]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92800000, ["hp"]=92800000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1605]={ [1605]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93000000, ["hp"]=93000000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1705]={ [1705]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93200000, ["hp"]=93200000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1805]={ [1805]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93400000, ["hp"]=93400000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[1905]={ [1905]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93600000, ["hp"]=93600000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2005]={ [2005]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93800000, ["hp"]=93800000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2105]={ [2105]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94000000, ["hp"]=94000000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2205]={ [2205]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94200000, ["hp"]=94200000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2305]={ [2305]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94400000, ["hp"]=94400000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2405]={ [2405]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94600000, ["hp"]=94600000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2505]={ [2505]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94800000, ["hp"]=94800000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2605]={ [2605]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95000000, ["hp"]=95000000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2705]={ [2705]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95200000, ["hp"]=95200000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2805]={ [2805]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95400000, ["hp"]=95400000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[2905]={ [2905]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95600000, ["hp"]=95600000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
}, },
[3005]={ [3005]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95800000, ["hp"]=95800000,
["atk"]=0, ["atk"]=0,
["atk_times"]=0, ["atk_times"]=0,
["monster_exp"]=440000 ["monster_exp"]=440000,
["monster_hp"]={
10000,
7000,
4000,
2000
},
["monster_hp_skin"]={
"1",
"2",
"3",
"4"
}
} }
} }
local config = { local config = {

450
lua/app/config/monster_dungeon_shards.lua
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -1885,7 +1885,7 @@ local skill_rogue = {
[2400202]={ [2400202]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=4,
["type"]=12, ["type"]=12,
["skill_position"]=2, ["skill_position"]=2,
["effect"]={ ["effect"]={
@ -1900,7 +1900,6 @@ local skill_rogue = {
["icon"]="144" ["icon"]="144"
}, },
[2400203]={ [2400203]={
["unlock"]=2400201,
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
@ -2489,7 +2488,12 @@ local skill_rogue = {
[3400201]={ [3400201]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3,
["type"]=1, ["type"]=1,
["parameter"]={
3400221
},
["skill_position"]=3,
["icon"]="150" ["icon"]="150"
}, },
[3400202]={ [3400202]={
@ -2512,19 +2516,41 @@ local skill_rogue = {
[3400203]={ [3400203]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4,
["type"]=8, ["type"]=8,
["parameter"]={
2,
1
},
["skill_position"]=3,
["icon"]="152" ["icon"]="152"
}, },
[3400204]={ [3400204]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4,
["type"]=7, ["type"]=7,
["parameter"]={
2,
2500
},
["skill_position"]=3,
["icon"]="153" ["icon"]="153"
}, },
[3400205]={ [3400205]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["type"]=12, ["qlt"]=4,
["type"]=9,
["skill_position"]=3,
["effect"]={
{
["type"]="add_skill",
["num"]=3400222,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=5, ["obj"]=5,
["icon"]="154" ["icon"]="154"
}, },
@ -2532,6 +2558,7 @@ local skill_rogue = {
["unlock"]=3400201, ["unlock"]=3400201,
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3,
["type"]=2, ["type"]=2,
["skill_position"]=3, ["skill_position"]=3,
["boardrange"]={ ["boardrange"]={
@ -2551,7 +2578,17 @@ local skill_rogue = {
["cover_unlock"]=3400205, ["cover_unlock"]=3400205,
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["type"]=12, ["qlt"]=3,
["type"]=9,
["skill_position"]=3,
["effect"]={
{
["type"]="add_skill",
["num"]=3400223,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=5, ["obj"]=5,
["icon"]="156" ["icon"]="156"
}, },
@ -3034,6 +3071,140 @@ local skill_rogue = {
["obj"]=6, ["obj"]=6,
["icon"]="163" ["icon"]="163"
}, },
[4400200]={
["limit_times"]=1,
["weight"]=100000,
["qlt"]=4,
["type"]=6,
["skill_position"]=4,
["icon"]="189"
},
[4400201]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=2,
["skill_position"]=4,
["boardrange"]={
{
["type"]=5,
["range"]=1
},
{
["type"]=6,
["range"]=1
},
{
["type"]=7,
["range"]=1
},
{
["type"]=8,
["range"]=1
}
},
["icon"]="157"
},
[4400202]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=12,
["skill_position"]=4,
["effect"]={
{
["type"]="add_skill",
["num"]=4400221,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=6,
["icon"]="158"
},
[4400203]={
["unlock"]=4400201,
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=2,
["skill_position"]=4,
["boardrange"]={
{
["type"]=5,
["range"]=1
},
{
["type"]=6,
["range"]=1
},
{
["type"]=7,
["range"]=1
},
{
["type"]=8,
["range"]=1
}
},
["icon"]="159"
},
[4400204]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=16,
["parameter"]={
2,
5000
},
["skill_position"]=4,
["icon"]="160"
},
[4400205]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=9,
["effect"]={
{
["type"]="add_skill",
["num"]=4400222,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=6,
["icon"]="161"
},
[4400206]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=9,
["skill_position"]=4,
["effect"]={
{
["type"]="atkp_blue_add",
["num"]=1500,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=6,
["icon"]="162"
},
[4400207]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=1,
["parameter"]={
4400223
},
["skill_position"]=4,
["icon"]="163"
},
[5200100]={ [5200100]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=100000, ["weight"]=100000,
@ -3515,9 +3686,122 @@ local skill_rogue = {
}, },
["obj"]=7, ["obj"]=7,
["icon"]="170" ["icon"]="170"
},
[5400200]={
["limit_times"]=1,
["weight"]=100000,
["qlt"]=4,
["type"]=6,
["skill_position"]=5,
["icon"]="190"
},
[5400201]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=8,
["parameter"]={
1,
1
},
["skill_position"]=5,
["icon"]="164"
},
[5400202]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=9,
["skill_position"]=5,
["effect"]={
{
["type"]="add_skill",
["num"]=5400221,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=7,
["icon"]="165"
},
[5400203]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=1,
["parameter"]={
5400222
},
["skill_position"]=5,
["icon"]="166"
},
[5400204]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=8,
["parameter"]={
1,
1
},
["skill_position"]=5,
["icon"]="167"
},
[5400205]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=9,
["skill_position"]=5,
["effect"]={
{
["type"]="add_skill",
["num"]=5400223,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=7,
["icon"]="168"
},
[5400206]={
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=9,
["skill_position"]=5,
["effect"]={
{
["type"]="atkp_purple_add",
["num"]=1500,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=7,
["icon"]="169"
},
[5400207]={
["unlock"]=5400202,
["cover_unlock"]=5400202,
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=9,
["skill_position"]=5,
["effect"]={
{
["type"]="add_skill",
["num"]=5400224,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=7,
["icon"]="170"
} }
} }
local config = { local config = {
data=skill_rogue,count=228 data=skill_rogue,count=244
} }
return config return config

8
lua/app/module/dungeon/dungeon_manager.lua
View File

@ -38,7 +38,7 @@ end
function DungeonManager:reqChallengeGold(id) function DungeonManager:reqChallengeGold(id)
local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD
-- 判断次数 -- 判断次数
if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
return return
end end
@ -92,7 +92,7 @@ end
function DungeonManager:reqSweepGold(id) function DungeonManager:reqSweepGold(id)
local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD
-- 判断次数 -- 判断次数
if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
return return
end end
@ -125,7 +125,7 @@ end
function DungeonManager:reqChallengeShards(id) function DungeonManager:reqChallengeShards(id)
local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD
-- 判断次数 -- 判断次数
if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
return return
end end
@ -178,7 +178,7 @@ end
function DungeonManager:reqSweepShards(id) function DungeonManager:reqSweepShards(id)
local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_SHARDS local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_SHARDS
-- 判断次数 -- 判断次数
if not DataManager.DungeonData:getRemainTimes(moduleKey) > 0 then if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
return return
end end

4
lua/app/ui/dungeon/dungeon_board_cell.lua
View File

@ -39,7 +39,6 @@ function DungeonBoardCell:refreshInfo()
self.txOpen:setText(DataManager.DungeonData:getOpenTimeDesc(self.moduleKey)) self.txOpen:setText(DataManager.DungeonData:getOpenTimeDesc(self.moduleKey))
self.icon:setSprite(DataManager.DungeonData:getIcon(self.moduleKey)) self.icon:setSprite(DataManager.DungeonData:getIcon(self.moduleKey))
-- self.baseObject:setTexture("assets/arts/textures/background/fund/fund_bg_1.png") -- self.baseObject:setTexture("assets/arts/textures/background/fund/fund_bg_1.png")
-- self.iconBuff:setSprite(GConst.ATLAS_PATH.ICON_BUFF, "")
if DataManager.DungeonData:isActive(self.moduleKey) then if DataManager.DungeonData:isActive(self.moduleKey) then
self.btnStart:setVisible(true) self.btnStart:setVisible(true)
@ -81,7 +80,6 @@ function DungeonBoardCell:refreshRewards()
self.scrollRect:addRefreshCallback(function(index, cell) self.scrollRect:addRefreshCallback(function(index, cell)
cell:refreshItemById(rewards[index], 0) cell:refreshItemById(rewards[index], 0)
end) end)
self.scrollRect:setTotalCount(#rewards)
else else
rewards = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey) rewards = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey)
-- 展示icon图片 -- 展示icon图片
@ -91,8 +89,8 @@ function DungeonBoardCell:refreshRewards()
cell:setVisibleFragment(false) cell:setVisibleFragment(false)
cell:setTouchEnable(false) cell:setTouchEnable(false)
end) end)
self.scrollRect:setTotalCount(#rewards)
end end
self.scrollRect:setTotalCount(#rewards)
end end
function DungeonBoardCell:refreshCountdown(txCountdown) function DungeonBoardCell:refreshCountdown(txCountdown)

46
lua/app/ui/dungeon/dungeon_difficulty_ui.lua
View File

@ -39,9 +39,14 @@ function DungeonDifficultyUI:onLoadRootComplete()
self.arrowRight = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.arrow_right"] self.arrowRight = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.arrow_right"]
self.txDesc = self.uiMap["dungeon_difficulty_ui.bg.tx_desc"] self.txDesc = self.uiMap["dungeon_difficulty_ui.bg.tx_desc"]
self.txTitle = self.uiMap["dungeon_difficulty_ui.bg.title.title_text"] self.txTitle = self.uiMap["dungeon_difficulty_ui.bg.title.title_text"]
self.buffObj = self.uiMap["dungeon_difficulty_ui.bg.boss_buff"]
self.txbuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.tx_buff"]
self.iconBuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.icon_buff"]
self.rewardFirst = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
self.rewardPass = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
self.txFrist = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.tx_first"]
self.txTitle:setText(DataManager.DungeonData:getTitle(self.module)) self.txTitle:setText(DataManager.DungeonData:getTitle(self.module))
self.txDesc:setText(DataManager.DungeonData:getRule(self.module))
self.txDifficulty:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_STAGE)) self.txDifficulty:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_STAGE))
self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC))
self.txSweep:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH)) self.txSweep:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH))
@ -49,16 +54,7 @@ function DungeonDifficultyUI:onLoadRootComplete()
self.txStartCost:setText("-"..GFunc.getRewardNum(cost)) self.txStartCost:setText("-"..GFunc.getRewardNum(cost))
self.txSweepCost:setText("-"..GFunc.getRewardNum(cost)) self.txSweepCost:setText("-"..GFunc.getRewardNum(cost))
self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, DataManager.DungeonData:getRemainTimes(self.module))) self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, DataManager.DungeonData:getRemainTimes(self.module)))
-- todo 奖励 self.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS))
self.scrollRect = self.uiMap[""]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
self.scrollRect:addInitCallback(function()
return GConst.TYPEOF_LUA_CLASS.REWARD_CELL
end)
self.scrollRect:addRefreshCallback(function(index, cell)
cell:refreshByConfig()
end)
self.scrollRect:clearCells()
self.scrollRect:setTotalCount(0)
self:refreshDifficulty() self:refreshDifficulty()
@ -96,6 +92,34 @@ function DungeonDifficultyUI:refreshDifficulty()
self.arrowRight:setActive(not self:isCanChallengeMaxId()) self.arrowRight:setActive(not self:isCanChallengeMaxId())
self.btnSweep:setActive(self:isCanSweepId()) self.btnSweep:setActive(self:isCanSweepId())
self.txLevel:setText(tostring(self.curId)) self.txLevel:setText(tostring(self.curId))
-- buff or desc
local buff = DataManager.DungeonData:getBossBuff(self.module, self.curId)
local desc = DataManager.DungeonData:getRule(self.module)
if buff then
self.txDesc:setActive(false)
self.buffObj:setActive(true)
self.txbuff:setText("")
self.iconBuff:setSprite("","")
elseif desc then
self.txDesc:setActive(true)
self.buffObj:setActive(false)
self.txDesc:setText(desc)
else
self.txDesc:setActive(false)
self.buffObj:setActive(false)
end
-- 奖励
local rewardFirst = DataManager.DungeonData:getFirstReward(self.module, self.curId)
local rewardPass = DataManager.DungeonData:getPassReward(self.module, self.curId)
if not self:isCanSweepId() and rewardFirst then
self.rewardFirst:setVisible(true)
self.rewardFirst:refreshByConfig(rewardFirst)
else
self.rewardFirst:setVisible(false)
end
self.rewardPass:refreshByConfig(rewardPass)
end end
-- 是否是可扫荡关卡 -- 是否是可扫荡关卡

5
lua/app/userdata/dungeon/dungeon_data.lua
View File

@ -303,6 +303,11 @@ function DungeonData:getRule(moduleKey)
return self.dataDungeons[moduleKey]:getRuleString() return self.dataDungeons[moduleKey]:getRuleString()
end end
-- 获取副本当前关卡buff
function DungeonData:getBossBuff(moduleKey, id)
return self.dataDungeons[moduleKey]:getBossBuff(id)
end
-- 获取副本开启时间描述 -- 获取副本开启时间描述
function DungeonData:getOpenTimeDesc(moduleKey) function DungeonData:getOpenTimeDesc(moduleKey)
return self.dataDungeons[moduleKey]:getOpenWeekString() return self.dataDungeons[moduleKey]:getOpenWeekString()

4
lua/app/userdata/dungeon/dungeon_data_base_comp.lua
View File

@ -31,8 +31,8 @@ function DungeonDataBaseComp:getRuleString()
return nil return nil
end end
-- 获取副本boss抗性描述(碎片副本) -- 获取副本boss抗性(碎片副本)
function DungeonDataBaseComp:getBossBuffString() function DungeonDataBaseComp:getBossBuff(id)
return nil return nil
end end

2
lua/app/userdata/dungeon/dungeon_gold_data_comp.lua
View File

@ -26,7 +26,7 @@ function DungeonGoldDataComp:getModuleKey()
end end
function DungeonGoldDataComp:getOpenWeekCycle() function DungeonGoldDataComp:getOpenWeekCycle()
return {2,4,6,7} return {1,2,3,4,5,6,7}
end end
function DungeonGoldDataComp:getConfigName() function DungeonGoldDataComp:getConfigName()

11
lua/app/userdata/dungeon/dungeon_shards_data_comp.lua
View File

@ -26,7 +26,7 @@ function DungeonShardsDataComp:getModuleKey()
end end
function DungeonShardsDataComp:getOpenWeekCycle() function DungeonShardsDataComp:getOpenWeekCycle()
return {1,3,5,7} return {1,2,3,4,5,6,7}
end end
function DungeonShardsDataComp:getConfigName() function DungeonShardsDataComp:getConfigName()
@ -37,14 +37,15 @@ function DungeonShardsDataComp:getTitleString()
return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_TITLE) return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_TITLE)
end end
function DungeonShardsDataComp:getBossBuffString()
return I18N:getText("buff", buffId, "desc")
end
function DungeonShardsDataComp:getOpenWeekString() function DungeonShardsDataComp:getOpenWeekString()
return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_OPEN) return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_OPEN)
end end
function DungeonShardsDataComp:getBossBuff(id)
Logger.printTable(self:getConfig()[id])
return self:getConfig()[id].effect
end
function DungeonShardsDataComp:getIcon() function DungeonShardsDataComp:getIcon()
return GConst.ATLAS_PATH.COMMON,"common_dec_3" return GConst.ATLAS_PATH.COMMON,"common_dec_3"
end end