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

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

Browse Source
This commit is contained in:
xiekaidong 2023-06-06 11:56:03 +08:00
commit 184b03d5ad
5 changed files with 200 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,8 +325,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=15, ["num"]=25,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="VA0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -351,8 +351,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=15, ["num"]=30,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="VQg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -503,8 +503,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=30,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VQg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -529,8 +529,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=45,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="Ug0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -700,8 +700,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=30,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VQg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -726,8 +726,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=45,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="Ug0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -903,8 +903,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=30,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VQg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -929,8 +929,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=45,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="Ug0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1106,8 +1106,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=30,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VQg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1140,8 +1140,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=45,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="Ug0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1325,8 +1325,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=30,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VQg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1359,8 +1359,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=45,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="Ug0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1544,8 +1544,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=30,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VQg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1578,8 +1578,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=25, ["num"]=45,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="Ug0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1763,8 +1763,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1797,8 +1797,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1982,8 +1982,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2008,16 +2008,16 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2201,8 +2201,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2227,16 +2227,16 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2420,8 +2420,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2446,16 +2446,16 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2639,8 +2639,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2665,16 +2665,16 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2858,8 +2858,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2876,24 +2876,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3077,8 +3077,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3095,24 +3095,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3296,8 +3296,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3314,24 +3314,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3515,8 +3515,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3533,24 +3533,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3734,8 +3734,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3752,24 +3752,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3953,8 +3953,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=35,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3971,24 +3971,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=30, ["num"]=60,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="UAg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4172,8 +4172,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4190,24 +4190,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4391,8 +4391,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4409,24 +4409,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4610,8 +4610,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4628,24 +4628,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4829,8 +4829,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4847,24 +4847,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5048,8 +5048,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5066,24 +5066,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5267,8 +5267,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5285,24 +5285,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5486,8 +5486,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5504,24 +5504,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5705,8 +5705,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5723,24 +5723,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5924,8 +5924,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5942,24 +5942,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,
@ -6142,8 +6142,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -6160,24 +6160,24 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=2, ["num"]=3,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=1, ["num"]=2,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VA=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=35, ["num"]=75,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="UQ0="
}, },
{ {
["type"]=1, ["type"]=1,

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

@ -45,8 +45,8 @@ local chapter_daily_challenge = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=7, ["id"]=7,
["id_for_nothing"]="UQ==", ["id_for_nothing"]="UQ==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -266,8 +266,8 @@ local chapter_daily_challenge = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=7, ["id"]=7,
["id_for_nothing"]="UQ==", ["id_for_nothing"]="UQ==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -487,8 +487,8 @@ local chapter_daily_challenge = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=7, ["id"]=7,
["id_for_nothing"]="UQ==", ["id_for_nothing"]="UQ==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -708,8 +708,8 @@ local chapter_daily_challenge = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=7, ["id"]=7,
["id_for_nothing"]="UQ==", ["id_for_nothing"]="UQ==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -929,8 +929,8 @@ local chapter_daily_challenge = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=7, ["id"]=7,
["id_for_nothing"]="UQ==", ["id_for_nothing"]="UQ==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1150,8 +1150,8 @@ local chapter_daily_challenge = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=7, ["id"]=7,
["id_for_nothing"]="UQ==", ["id_for_nothing"]="UQ==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1371,8 +1371,8 @@ local chapter_daily_challenge = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=7, ["id"]=7,
["id_for_nothing"]="UQ==", ["id_for_nothing"]="UQ==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,

2
lua/app/ui/hero/cell/hero_list_cell.lua
View File

@ -55,6 +55,7 @@ function HeroListCell:refresh(index, heroList, stageFormation, allHeroCount, act
self.heroCells[i]:refresh(heroEntity, not heroEntity:isActived()) self.heroCells[i]:refresh(heroEntity, not heroEntity:isActived())
self.heroCells[i]:showCheck(stageFormation[matchType] == heroId) self.heroCells[i]:showCheck(stageFormation[matchType] == heroId)
self.heroCells[i]:addClickListener(function() self.heroCells[i]:addClickListener(function()
AudioManager:playEffect(AudioManager.CLICK_ID[GConst.CLICK_SOUND.NORMAL])
if func then if func then
func(self.heroCells[i], heroId) func(self.heroCells[i], heroId)
end end
@ -68,6 +69,7 @@ function HeroListCell:refresh(index, heroList, stageFormation, allHeroCount, act
self.heroCells[i]:setVisible(true) self.heroCells[i]:setVisible(true)
self.heroCells[i]:refresh(heroEntity, true) self.heroCells[i]:refresh(heroEntity, true)
self.heroCells[i]:addClickListener(function() self.heroCells[i]:addClickListener(function()
AudioManager:playEffect(AudioManager.CLICK_ID[GConst.CLICK_SOUND.NORMAL])
if func then if func then
func(self.heroCells[i], heroId) func(self.heroCells[i], heroId)
end end

10
lua/app/ui/shop/box_level_ui.lua
View File

@ -30,7 +30,6 @@ function BoxLevelUI:onLoadRootComplete()
self.rightArrow = self.uiMap["box_level_ui.bg.lv_node.right_arrow"] self.rightArrow = self.uiMap["box_level_ui.bg.lv_node.right_arrow"]
self.box1Node = self.uiMap["box_level_ui.bg.box_1"] self.box1Node = self.uiMap["box_level_ui.bg.box_1"]
self.box1AddBg = self.uiMap["box_level_ui.bg.box_1.bg_img"]
self.box1Add1Node = self.uiMap["box_level_ui.bg.box_1.add_node_1"] self.box1Add1Node = self.uiMap["box_level_ui.bg.box_1.add_node_1"]
self.box1Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_1.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box1Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_1.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
self.box1Add1Text = self.uiMap["box_level_ui.bg.box_1.add_node_1.text"] self.box1Add1Text = self.uiMap["box_level_ui.bg.box_1.add_node_1.text"]
@ -41,7 +40,6 @@ function BoxLevelUI:onLoadRootComplete()
self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
self.box2Node = self.uiMap["box_level_ui.bg.box_2"] self.box2Node = self.uiMap["box_level_ui.bg.box_2"]
self.box2AddBg = self.uiMap["box_level_ui.bg.box_2.bg_img"]
self.box2Add1Node = self.uiMap["box_level_ui.bg.box_2.add_node_1"] self.box2Add1Node = self.uiMap["box_level_ui.bg.box_2.add_node_1"]
self.box2Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_2.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box2Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_2.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
self.box2Add1Text = self.uiMap["box_level_ui.bg.box_2.add_node_1.text"] self.box2Add1Text = self.uiMap["box_level_ui.bg.box_2.add_node_1.text"]
@ -106,12 +104,10 @@ function BoxLevelUI:refresh()
end end
if self.level == 1 then if self.level == 1 then
self.box1AddBg:setVisible(false)
self.box1Add1Node:setVisible(false) self.box1Add1Node:setVisible(false)
self.box1Add2Node:setVisible(false) self.box1Add2Node:setVisible(false)
self.box1Desc:setVisible(true) self.box1Desc:setVisible(true)
self.box2AddBg:setVisible(false)
self.box2Add1Node:setVisible(false) self.box2Add1Node:setVisible(false)
self.box2Add2Node:setVisible(false) self.box2Add2Node:setVisible(false)
self.box2Desc:setVisible(true) self.box2Desc:setVisible(true)
@ -120,12 +116,10 @@ function BoxLevelUI:refresh()
self.box3Add2Node:setVisible(false) self.box3Add2Node:setVisible(false)
self.box3Desc:setVisible(true) self.box3Desc:setVisible(true)
else else
self.box1AddBg:setVisible(false)
self.box1Add1Node:setVisible(false) self.box1Add1Node:setVisible(false)
self.box1Add2Node:setVisible(false) self.box1Add2Node:setVisible(false)
self.box1Desc:setVisible(false) self.box1Desc:setVisible(false)
self.box2AddBg:setVisible(false)
self.box2Add1Node:setVisible(false) self.box2Add1Node:setVisible(false)
self.box2Add2Node:setVisible(false) self.box2Add2Node:setVisible(false)
self.box2Desc:setVisible(false) self.box2Desc:setVisible(false)
@ -140,7 +134,6 @@ function BoxLevelUI:refresh()
local count = #reward1 local count = #reward1
if count == 1 then if count == 1 then
self.box1AddBg:setVisible(true)
self.box1Add1Node:setVisible(true) self.box1Add1Node:setVisible(true)
self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0) self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0)
self.box1Add1ItemCell:setNum("") self.box1Add1ItemCell:setNum("")
@ -149,7 +142,6 @@ function BoxLevelUI:refresh()
end) end)
self.box1Add1Text:setText("+" .. tostring(reward1[1].num)) self.box1Add1Text:setText("+" .. tostring(reward1[1].num))
else else
self.box1AddBg:setVisible(true)
self.box1Add1Node:setVisible(true) self.box1Add1Node:setVisible(true)
self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0) self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0)
self.box1Add1ItemCell:setNum("") self.box1Add1ItemCell:setNum("")
@ -169,7 +161,6 @@ function BoxLevelUI:refresh()
local count = #reward2 local count = #reward2
if count == 1 then if count == 1 then
self.box2AddBg:setVisible(true)
self.box2Add1Node:setVisible(true) self.box2Add1Node:setVisible(true)
self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0) self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0)
self.box2Add1ItemCell:setNum("") self.box2Add1ItemCell:setNum("")
@ -178,7 +169,6 @@ function BoxLevelUI:refresh()
end) end)
self.box2Add1Text:setText("+" .. tostring(reward2[1].num)) self.box2Add1Text:setText("+" .. tostring(reward2[1].num))
else else
self.box2AddBg:setVisible(true)
self.box2Add1Node:setVisible(true) self.box2Add1Node:setVisible(true)
self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0) self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0)
self.box2Add1ItemCell:setNum("") self.box2Add1ItemCell:setNum("")

8
lua/app/ui/shop/box_level_up_ui.lua
View File

@ -23,7 +23,6 @@ function BoxLevelUpUI:onLoadRootComplete()
self.lvTx = self.uiMap["box_level_up_ui.lv_up.text"] self.lvTx = self.uiMap["box_level_up_ui.lv_up.text"]
self.box1Node = self.uiMap["box_level_up_ui.box_1"] self.box1Node = self.uiMap["box_level_up_ui.box_1"]
self.box1AddBg = self.uiMap["box_level_up_ui.box_1.bg_img"]
self.box1Add1Node = self.uiMap["box_level_up_ui.box_1.add_node_1"] self.box1Add1Node = self.uiMap["box_level_up_ui.box_1.add_node_1"]
self.box1Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_1.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box1Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_1.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
self.box1Add1Text = self.uiMap["box_level_up_ui.box_1.add_node_1.text"] self.box1Add1Text = self.uiMap["box_level_up_ui.box_1.add_node_1.text"]
@ -34,7 +33,6 @@ function BoxLevelUpUI:onLoadRootComplete()
self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成
self.box2Node = self.uiMap["box_level_up_ui.box_2"] self.box2Node = self.uiMap["box_level_up_ui.box_2"]
self.box2AddBg = self.uiMap["box_level_up_ui.box_2.bg_img"]
self.box2Add1Node = self.uiMap["box_level_up_ui.box_2.add_node_1"] self.box2Add1Node = self.uiMap["box_level_up_ui.box_2.add_node_1"]
self.box2Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_2.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box2Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_2.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL)
self.box2Add1Text = self.uiMap["box_level_up_ui.box_2.add_node_1.text"] self.box2Add1Text = self.uiMap["box_level_up_ui.box_2.add_node_1.text"]
@ -64,12 +62,10 @@ function BoxLevelUpUI:refresh()
self.lvTx:setText("Lv." .. tostring(self.level)) self.lvTx:setText("Lv." .. tostring(self.level))
self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_TO_CONTINUE)) -- 点击继续 self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_TO_CONTINUE)) -- 点击继续
self.box1AddBg:setVisible(false)
self.box1Add1Node:setVisible(false) self.box1Add1Node:setVisible(false)
self.box1Add2Node:setVisible(false) self.box1Add2Node:setVisible(false)
self.box1Desc:setVisible(false) self.box1Desc:setVisible(false)
self.box2AddBg:setVisible(false)
self.box2Add1Node:setVisible(false) self.box2Add1Node:setVisible(false)
self.box2Add2Node:setVisible(false) self.box2Add2Node:setVisible(false)
self.box2Desc:setVisible(false) self.box2Desc:setVisible(false)
@ -84,7 +80,6 @@ function BoxLevelUpUI:refresh()
local count = #reward1 local count = #reward1
if count == 1 then if count == 1 then
self.box1AddBg:setVisible(true)
self.box1Add1Node:setVisible(true) self.box1Add1Node:setVisible(true)
self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0) self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0)
self.box1Add1ItemCell:setNum("") self.box1Add1ItemCell:setNum("")
@ -93,7 +88,6 @@ function BoxLevelUpUI:refresh()
end) end)
self.box1Add1Text:setText("+" .. tostring(reward1[1].num)) self.box1Add1Text:setText("+" .. tostring(reward1[1].num))
else else
self.box1AddBg:setVisible(true)
self.box1Add1Node:setVisible(true) self.box1Add1Node:setVisible(true)
self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0) self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0)
self.box1Add1ItemCell:setNum("") self.box1Add1ItemCell:setNum("")
@ -113,7 +107,6 @@ function BoxLevelUpUI:refresh()
local count = #reward2 local count = #reward2
if count == 1 then if count == 1 then
self.box2AddBg:setVisible(true)
self.box2Add1Node:setVisible(true) self.box2Add1Node:setVisible(true)
self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0) self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0)
self.box2Add1ItemCell:setNum("") self.box2Add1ItemCell:setNum("")
@ -122,7 +115,6 @@ function BoxLevelUpUI:refresh()
end) end)
self.box2Add1Text:setText("+" .. tostring(reward2[1].num)) self.box2Add1Text:setText("+" .. tostring(reward2[1].num))
else else
self.box2AddBg:setVisible(true)
self.box2Add1Node:setVisible(true) self.box2Add1Node:setVisible(true)
self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0) self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0)
self.box2Add1ItemCell:setNum("") self.box2Add1ItemCell:setNum("")