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

抽卡跳过

Browse Source
This commit is contained in:
CloudJ 2023-06-05 10:24:01 +08:00
parent 6e65ce411f
commit 98a9658bca
14 changed files with 313 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -759,8 +759,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -962,8 +962,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -978,10 +978,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1075,10 +1075,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=3,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="VQ=="
} }
}, },
{ {
@ -1181,8 +1181,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1197,10 +1197,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1294,10 +1294,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=3,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="VQ=="
} }
}, },
{ {
@ -1400,8 +1400,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1416,10 +1416,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -1513,10 +1513,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=3,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="VQ=="
} }
}, },
{ {
@ -1617,8 +1617,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
}, },
@ -1635,8 +1635,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -1732,10 +1732,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=3,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="VQ=="
} }
}, },
{ {
@ -1836,8 +1836,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
}, },
@ -1854,8 +1854,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -1951,10 +1951,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -2055,10 +2055,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2075,8 +2075,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2170,10 +2170,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -2274,10 +2274,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2294,8 +2294,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2389,10 +2389,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -2493,10 +2493,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2513,8 +2513,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2608,10 +2608,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -2712,10 +2712,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2732,8 +2732,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2827,10 +2827,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -2931,10 +2931,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -2951,8 +2951,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3046,10 +3046,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -3150,10 +3150,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3170,8 +3170,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3265,10 +3265,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -3369,10 +3369,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3389,8 +3389,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3484,10 +3484,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -3588,10 +3588,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3608,8 +3608,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3703,10 +3703,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -3807,10 +3807,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3827,8 +3827,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -3922,10 +3922,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=5,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Uw=="
} }
}, },
{ {
@ -4026,10 +4026,10 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=3,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="VQ=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4046,8 +4046,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=5,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Uw=="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4143,8 +4143,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -4245,8 +4245,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -4265,8 +4265,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4362,8 +4362,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -4464,8 +4464,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -4484,8 +4484,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4581,8 +4581,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -4683,8 +4683,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -4703,8 +4703,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -4800,8 +4800,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -4902,8 +4902,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -4922,8 +4922,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5019,8 +5019,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -5121,8 +5121,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -5141,8 +5141,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5238,8 +5238,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -5340,8 +5340,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -5360,8 +5360,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5457,8 +5457,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -5559,8 +5559,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -5579,8 +5579,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5676,8 +5676,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -5778,8 +5778,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -5798,8 +5798,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -5895,8 +5895,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -5997,8 +5997,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -6017,8 +6017,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
@ -6113,8 +6113,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
} }
}, },
{ {
@ -6215,8 +6215,8 @@ local chapter = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=5,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Uw==",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -6235,8 +6235,8 @@ local chapter = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,

1
lua/app/config/localization/localization_global_const.lua
View File

@ -205,6 +205,7 @@ local LocalizationGlobalConst =
ALREADY_BINDED_DESC = "ALREADY_BINDED_DESC", ALREADY_BINDED_DESC = "ALREADY_BINDED_DESC",
BIND_ACCOUNT_FAILED = "BIND_ACCOUNT_FAILED", BIND_ACCOUNT_FAILED = "BIND_ACCOUNT_FAILED",
CHANGE_ACCOUNT_FAILED = "CHANGE_ACCOUNT_FAILED", CHANGE_ACCOUNT_FAILED = "CHANGE_ACCOUNT_FAILED",
SUMMON_SKIP = "SUMMON_SKIP",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

1
lua/app/config/strings/cn/global.lua
View File

@ -205,6 +205,7 @@ local localization_global =
["ALREADY_BINDED_DESC"] = "绑定失败，该账号已有其他绑定信息", ["ALREADY_BINDED_DESC"] = "绑定失败，该账号已有其他绑定信息",
["BIND_ACCOUNT_FAILED"] = "账号绑定失败，请重试", ["BIND_ACCOUNT_FAILED"] = "账号绑定失败，请重试",
["CHANGE_ACCOUNT_FAILED"] = "账号切换失败，请重试", ["CHANGE_ACCOUNT_FAILED"] = "账号切换失败，请重试",
["SUMMON_SKIP"] = "跳过",
} }
return localization_global return localization_global

5
lua/app/config/strings/cn/tutorial.lua
View File

@ -13,9 +13,12 @@ local tutorial = {
}, },
["tutorial_txt_5"]={ ["tutorial_txt_5"]={
["value"]="前往商城，获得更多英雄！" ["value"]="前往商城，获得更多英雄！"
},
["tutorial_txt_6"]={
["value"]="挑战任务，获得S级英雄！"
} }
} }
local config = { local config = {
data=tutorial,count=5 data=tutorial,count=6
} }
return config return config

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

@ -13,9 +13,12 @@ local tutorial = {
}, },
["tutorial_txt_5"]={ ["tutorial_txt_5"]={
},
["tutorial_txt_6"]={
} }
} }
local config = { local config = {
data=tutorial,count=5 data=tutorial,count=6
} }
return config return config

1
lua/app/config/strings/en/global.lua
View File

@ -132,6 +132,7 @@ local localization_global =
["GOLD_PIG_DESC"] = "Challenge stages and collect Diamonds for a great deal.", ["GOLD_PIG_DESC"] = "Challenge stages and collect Diamonds for a great deal.",
["SIDE_BAR_FULL"] = "MAX", ["SIDE_BAR_FULL"] = "MAX",
["DAILY_CHALLENGE"] = "Daily Challenge", ["DAILY_CHALLENGE"] = "Daily Challenge",
["SUMMON_SKIP"] = "skip",
} }
return localization_global return localization_global

5
lua/app/config/strings/en/tutorial.lua
View File

@ -13,9 +13,12 @@ local tutorial = {
}, },
["tutorial_txt_5"]={ ["tutorial_txt_5"]={
["value"]="Head to the shop for more heroes!" ["value"]="Head to the shop for more heroes!"
},
["tutorial_txt_6"]={
} }
} }
local config = { local config = {
data=tutorial,count=5 data=tutorial,count=6
} }
return config return config

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

@ -13,9 +13,12 @@ local tutorial = {
}, },
["tutorial_txt_5"]={ ["tutorial_txt_5"]={
},
["tutorial_txt_6"]={
} }
} }
local config = { local config = {
data=tutorial,count=5 data=tutorial,count=6
} }
return config return config

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

@ -13,9 +13,12 @@ local tutorial = {
}, },
["tutorial_txt_5"]={ ["tutorial_txt_5"]={
},
["tutorial_txt_6"]={
} }
} }
local config = { local config = {
data=tutorial,count=5 data=tutorial,count=6
} }
return config return config

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

@ -13,9 +13,12 @@ local tutorial = {
}, },
["tutorial_txt_5"]={ ["tutorial_txt_5"]={
},
["tutorial_txt_6"]={
} }
} }
local config = { local config = {
data=tutorial,count=5 data=tutorial,count=6
} }
return config return config

5
lua/app/config/strings/zh/tutorial.lua
View File

@ -13,9 +13,12 @@ local tutorial = {
}, },
["tutorial_txt_5"]={ ["tutorial_txt_5"]={
["value"]="前往商城，獲得更多英雄！" ["value"]="前往商城，獲得更多英雄！"
},
["tutorial_txt_6"]={
} }
} }
local config = { local config = {
data=tutorial,count=5 data=tutorial,count=6
} }
return config return config

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

@ -451,9 +451,34 @@ local tutorial = {
0, 0,
-50 -50
} }
},
[50000]={
["next_id"]=10,
["type"]=2,
["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/left_btn",
["arrow_direction"]=2,
["arrow_offset"]={
0,
0
}
},
[50010]={
["next_id"]=20,
["type"]=3,
["txt"]="tutorial_txt_6",
["txt_offset"]={
0,
180
},
["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/daily_challenge_comp/challenge/task/icon_task3",
["arrow_direction"]=4,
["arrow_offset"]={
0,
0
}
} }
} }
local config = { local config = {
data=tutorial,count=34 data=tutorial,count=36
} }
return config return config

6
lua/app/config/tutorial_start.lua
View File

@ -14,9 +14,13 @@ local tutorial_start = {
[4]={ [4]={
["start_id"]=40000, ["start_id"]=40000,
["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab" ["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
},
[5]={
["start_id"]=50000,
["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
} }
} }
local config = { local config = {
data=tutorial_start,count=4 data=tutorial_start,count=5
} }
return config return config

49
lua/app/ui/shop/box_reward_ui.lua
View File

@ -18,6 +18,7 @@ local REWARD_CELL_WIDTH = 160
local REWARD_CELL_HEIGHT = 250 local REWARD_CELL_HEIGHT = 250
local BASE_CONTENT_HEIGHT = 600 local BASE_CONTENT_HEIGHT = 600
local JUMP_TIME_SCALE = 1000
local POSITION_X_DATA = { local POSITION_X_DATA = {
[1] = {0}, [1] = {0},
@ -49,6 +50,10 @@ function BoxRewardUI:ctor(params)
for id, count in pairs(fragmentMap) do for id, count in pairs(fragmentMap) do
table.insert(self.fragmentRewards, {id = id, count = count}) table.insert(self.fragmentRewards, {id = id, count = count})
end end
for i = 1, 10 do
table.insert(self.fragmentRewards, {id = 12001, count = 100})
end
end end
function BoxRewardUI:isFullScreen() function BoxRewardUI:isFullScreen()
@ -77,13 +82,13 @@ function BoxRewardUI:onLoadRootComplete()
end end
self.closeTx = self.uiMap["box_reward_ui.close_tx"] self.closeTx = self.uiMap["box_reward_ui.close_tx"]
self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC))
self:refreshCloseText() self:refreshCloseText()
self.mask = self.uiMap["box_reward_ui.mask"] self.mask = self.uiMap["box_reward_ui.mask"]
self.mask:addClickListener(function() self.mask:addClickListener(function()
-- 动画期间不可关闭 -- 动画期间不可关闭
if self.isPlayAni then if self.isPlayAni then
self:jump()
return return
end end
self:closeUI() self:closeUI()
@ -174,6 +179,9 @@ function BoxRewardUI:onLoadRootComplete()
self.maxIdx = math.ceil(rewardCount / CELL_NUM) self.maxIdx = math.ceil(rewardCount / CELL_NUM)
end end
-- 播放表现 -- 播放表现
if not self.cellSeqs then
self.cellSeqs = {}
end
for idx = 1, rewardCount do for idx = 1, rewardCount do
local cell = self.rewardCells[idx] local cell = self.rewardCells[idx]
self:playCellAction(cell, idx) self:playCellAction(cell, idx)
@ -197,6 +205,7 @@ function BoxRewardUI:playCellAction(cell, idx)
canvasGroup.alpha = 0 canvasGroup.alpha = 0
local seq = cell.baseObject:createBindTweenSequence() local seq = cell.baseObject:createBindTweenSequence()
table.insert(self.cellSeqs, seq)
local tween = canvasGroup:DOFade(1, FADE_TIME) local tween = canvasGroup:DOFade(1, FADE_TIME)
seq:AppendInterval(delayTime) seq:AppendInterval(delayTime)
tween:SetEase(CS.DG.Tweening.Ease.InOutSine) tween:SetEase(CS.DG.Tweening.Ease.InOutSine)
@ -218,6 +227,9 @@ end
function BoxRewardUI:turnToNext(idx) function BoxRewardUI:turnToNext(idx)
if self:isClosed() then if self:isClosed() then
return return
end
if not self.isPlayAni then
return
end end
if not self.showAction or idx ~= self.turnIdx * CELL_NUM then if not self.showAction or idx ~= self.turnIdx * CELL_NUM then
return return
@ -259,8 +271,41 @@ function BoxRewardUI:getCellDelayTime(idx)
return self.cellDelayTime[idx] return self.cellDelayTime[idx]
end end
function BoxRewardUI:jump()
self.isPlayAni = false
if self.cellSeqs then
for _, cellSeq in ipairs(self.cellSeqs) do
cellSeq.timeScale = JUMP_TIME_SCALE
end
self.cellSeqs = nil
end
if self.contentSeq then
self.contentSeq.timeScale = JUMP_TIME_SCALE
end
-- 强制刷新一次表现
local rewardCount = #self.fragmentRewards
for idx = 1, rewardCount do
local cell = self.rewardCells[idx]
local canvasGroup = cell.baseObject:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP)
if not canvasGroup then
canvasGroup = cell.baseObject:addComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP)
end
canvasGroup.alpha = 1
end
self.scrollRectContent:setAnchoredPositionY(self.maxScrollContentHeight - BASE_CONTENT_HEIGHT)
self.turnIdx = self.maxIdx
self.showAction = false
self:refreshCloseText()
end
function BoxRewardUI:refreshCloseText() function BoxRewardUI:refreshCloseText()
self.closeTx:setVisible(not self.isPlayAni) if self.isPlayAni then
self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_SKIP))
else
self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC))
end
end end
return BoxRewardUI return BoxRewardUI