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

显示fix

Browse Source
This commit is contained in:
Fang 2023-07-25 18:11:05 +08:00
parent 27affc743b
commit b2d2b65e73
5 changed files with 4227 additions and 3731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

480
lua/app/config/chapter_dungeon_armor.lua
View File

@ -63,6 +63,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -160,6 +168,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -257,6 +273,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -354,6 +378,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -451,6 +483,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -608,6 +648,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -765,6 +813,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -882,6 +938,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -999,6 +1063,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1116,6 +1188,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1233,6 +1313,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1438,6 +1526,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=300, ["num"]=300,
["num_for_nothing"]="VQhc" ["num_for_nothing"]="VQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1643,6 +1739,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1780,6 +1884,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1917,6 +2029,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -2054,6 +2174,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -2191,6 +2319,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -2444,6 +2580,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -2697,6 +2841,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -2828,6 +2980,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -2959,6 +3119,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -3090,6 +3258,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -3221,6 +3397,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -3450,6 +3634,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=350, ["num"]=350,
["num_for_nothing"]="VQ1c" ["num_for_nothing"]="VQ1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -3679,6 +3871,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -3816,6 +4016,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -3953,6 +4161,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -4090,6 +4306,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -4227,6 +4451,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -4480,6 +4712,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -4733,6 +4973,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -4864,6 +5112,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -4995,6 +5251,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -5126,6 +5390,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -5257,6 +5529,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -5486,6 +5766,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=400, ["num"]=400,
["num_for_nothing"]="Ughc" ["num_for_nothing"]="Ughc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -5715,6 +6003,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -5852,6 +6148,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -5989,6 +6293,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -6126,6 +6438,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -6263,6 +6583,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -6516,6 +6844,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -6769,6 +7105,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -6900,6 +7244,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -7031,6 +7383,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -7162,6 +7522,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -7293,6 +7661,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -7522,6 +7898,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=450, ["num"]=450,
["num_for_nothing"]="Ug1c" ["num_for_nothing"]="Ug1c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -7751,6 +8135,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -7888,6 +8280,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -8025,6 +8425,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -8162,6 +8570,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -8299,6 +8715,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -8552,6 +8976,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -8805,6 +9237,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -8936,6 +9376,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -9067,6 +9515,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -9198,6 +9654,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -9329,6 +9793,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -9558,6 +10030,14 @@ local chapter_dungeon_armor = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={

7440
lua/app/config/equip_level.lua
View File

File diff suppressed because it is too large Load Diff

3
lua/app/ui/collection/cell/collection_reward_cell.lua
View File

@ -50,7 +50,8 @@ function CollectionRewardCell:refresh(collectionType, id)
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_6)) self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_6))
end end
for idx, reward in pairs(self.rewards) do for idx, reward in pairs(self.rewards) do
if idx <= #rewardList.reward then if rewardList.reward[idx] then
reward:setVisible(true)
reward:refreshByConfig(rewardList.reward[idx]) reward:refreshByConfig(rewardList.reward[idx])
else else
reward:setVisible(false) reward:setVisible(false)

3
lua/app/ui/collection/collection_reward_ui.lua
View File

@ -44,12 +44,11 @@ function CollectionRewardUI:onRefresh()
return "app/ui/collection/cell/collection_reward_cell" return "app/ui/collection/cell/collection_reward_cell"
end) end)
self.scrollrectComp:addRefreshCallback(function(index, cell) self.scrollrectComp:addRefreshCallback(function(index, cell)
cell:refresh(self.collectType, #datas - index + 1) cell:refresh(self.collectType, index)
end) end)
self.scrollrectComp:clearCells() self.scrollrectComp:clearCells()
self.scrollrectComp:refillCells(#datas) self.scrollrectComp:refillCells(#datas)
local selectIdx = DataManager.CollectionData:getCurTargetId(self.collectType) local selectIdx = DataManager.CollectionData:getCurTargetId(self.collectType)
selectIdx = #datas - selectIdx + 1
if selectIdx - 2 >= 0 then if selectIdx - 2 >= 0 then
selectIdx = selectIdx - 2 selectIdx = selectIdx - 2
end end

32
lua/app/ui/hero/weapon_info_comp.lua
View File

@ -60,26 +60,42 @@ function WeaponInfoComp:refresh()
local txNum = map["tx_num"] local txNum = map["tx_num"]
obj:setVisible(true) obj:setVisible(true)
if not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK) and diffAtk > 0 then if not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK) then
table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK) table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK)
imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5") imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5")
txTitle:setText("<color=#FCB501>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3).."</color>") txTitle:setText("<color=#FCB501>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3).."</color>")
txNum:setText(self.weaponEntity:getAttack() // DEFAULT_FACTOR .. "<color=#A2FF29>+" .. diffAtk .. "</color>") local numStr = self.weaponEntity:getAttack() // DEFAULT_FACTOR
elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT) and diffNormalHurt > 0 then if diffAtk > 0 then
numStr = numStr .. "<color=#A2FF29>+" .. diffAtk .. "</color>"
end
txNum:setText(numStr)
elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT) then
table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT) table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT)
imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20") imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20")
txTitle:setText("<color=#4CCFFA>"..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT).."</color>") txTitle:setText("<color=#4CCFFA>"..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT).."</color>")
txNum:setText(self.weaponEntity:getNormalHurt() // DEFAULT_FACTOR .. "<color=#A2FF29>+" .. diffNormalHurt .. "</color>") local numStr = self.weaponEntity:getNormalHurt() // DEFAULT_FACTOR
elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT) and diffSkillHurt > 0 then if diffNormalHurt > 0 then
numStr = numStr .. "<color=#A2FF29>+" .. diffNormalHurt .. "</color>"
end
txNum:setText(numStr)
elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT) then
table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT) table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT)
imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21") imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21")
txTitle:setText("<color=#EC80FF>"..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT).."</color>") txTitle:setText("<color=#EC80FF>"..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT).."</color>")
txNum:setText(self.weaponEntity:getSkillHurt() // DEFAULT_FACTOR .. "<color=#A2FF29>+" .. diffSkillHurt .. "</color>") local numStr = self.weaponEntity:getSkillHurt() // DEFAULT_FACTOR
elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.HP) and diffHp > 0 then if diffSkillHurt > 0 then
numStr = numStr .. "<color=#A2FF29>+" .. diffSkillHurt .. "</color>"
end
txNum:setText(numStr)
elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.HP) then
table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.HP) table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.HP)
imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_4") imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_4")
txTitle:setText("<color=#FB6895>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_2).."</color>") txTitle:setText("<color=#FB6895>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_2).."</color>")
txNum:setText(self.weaponEntity:getHp() // DEFAULT_FACTOR .. "<color=#A2FF29>+" .. diffHp .. "</color>") local numStr = self.weaponEntity:getHp() // DEFAULT_FACTOR
if diffHp > 0 then
numStr = numStr .. "<color=#A2FF29>+" .. diffHp .. "</color>"
end
txNum:setText(numStr)
else else
obj:setVisible(false) obj:setVisible(false)
end end