This commit is contained in:
puxuan 2025-10-13 19:52:25 +08:00
parent 13e2386a4a
commit 740023e53d
4 changed files with 383 additions and 117 deletions

View File

@ -87,7 +87,7 @@ local equip = {
["num"]=30, ["num"]=30,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQg="
}, },
["icon"]="211" ["icon"]="112"
}, },
[121]={ [121]={
["type"]=1, ["type"]=1,
@ -132,7 +132,7 @@ local equip = {
["num"]=40, ["num"]=40,
["num_for_nothing"]="Ugg=" ["num_for_nothing"]="Ugg="
}, },
["icon"]="311" ["icon"]="121"
}, },
[122]={ [122]={
["type"]=1, ["type"]=1,
@ -177,7 +177,7 @@ local equip = {
["num"]=50, ["num"]=50,
["num_for_nothing"]="Uwg=" ["num_for_nothing"]="Uwg="
}, },
["icon"]="411" ["icon"]="122"
}, },
[123]={ [123]={
["type"]=1, ["type"]=1,
@ -222,7 +222,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="511" ["icon"]="123"
}, },
[131]={ [131]={
["type"]=1, ["type"]=1,
@ -267,7 +267,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="611" ["icon"]="131"
}, },
[132]={ [132]={
["type"]=1, ["type"]=1,
@ -312,7 +312,7 @@ local equip = {
["num"]=70, ["num"]=70,
["num_for_nothing"]="UQg=" ["num_for_nothing"]="UQg="
}, },
["icon"]="711" ["icon"]="132"
}, },
[133]={ [133]={
["type"]=1, ["type"]=1,
@ -357,7 +357,7 @@ local equip = {
["num"]=80, ["num"]=80,
["num_for_nothing"]="Xgg=" ["num_for_nothing"]="Xgg="
}, },
["icon"]="811" ["icon"]="133"
}, },
[134]={ [134]={
["type"]=1, ["type"]=1,
@ -402,7 +402,7 @@ local equip = {
["num"]=90, ["num"]=90,
["num_for_nothing"]="Xwg=" ["num_for_nothing"]="Xwg="
}, },
["icon"]="911" ["icon"]="134"
}, },
[141]={ [141]={
["type"]=1, ["type"]=1,
@ -447,7 +447,7 @@ local equip = {
["num"]=100, ["num"]=100,
["num_for_nothing"]="Vwhc" ["num_for_nothing"]="Vwhc"
}, },
["icon"]="1011" ["icon"]="141"
}, },
[142]={ [142]={
["type"]=1, ["type"]=1,
@ -492,7 +492,7 @@ local equip = {
["num"]=110, ["num"]=110,
["num_for_nothing"]="Vwlc" ["num_for_nothing"]="Vwlc"
}, },
["icon"]="1111" ["icon"]="142"
}, },
[143]={ [143]={
["type"]=1, ["type"]=1,
@ -537,7 +537,7 @@ local equip = {
["num"]=130, ["num"]=130,
["num_for_nothing"]="Vwtc" ["num_for_nothing"]="Vwtc"
}, },
["icon"]="1211" ["icon"]="143"
}, },
[144]={ [144]={
["type"]=1, ["type"]=1,
@ -582,7 +582,7 @@ local equip = {
["num"]=140, ["num"]=140,
["num_for_nothing"]="Vwxc" ["num_for_nothing"]="Vwxc"
}, },
["icon"]="1311" ["icon"]="144"
}, },
[145]={ [145]={
["type"]=1, ["type"]=1,
@ -627,7 +627,7 @@ local equip = {
["num"]=150, ["num"]=150,
["num_for_nothing"]="Vw1c" ["num_for_nothing"]="Vw1c"
}, },
["icon"]="1411" ["icon"]="145"
}, },
[151]={ [151]={
["type"]=1, ["type"]=1,
@ -672,7 +672,7 @@ local equip = {
["num"]=160, ["num"]=160,
["num_for_nothing"]="Vw5c" ["num_for_nothing"]="Vw5c"
}, },
["icon"]="1511" ["icon"]="151"
}, },
[152]={ [152]={
["type"]=1, ["type"]=1,
@ -717,7 +717,7 @@ local equip = {
["num"]=180, ["num"]=180,
["num_for_nothing"]="VwBc" ["num_for_nothing"]="VwBc"
}, },
["icon"]="1611" ["icon"]="152"
}, },
[153]={ [153]={
["type"]=1, ["type"]=1,
@ -762,7 +762,7 @@ local equip = {
["num"]=200, ["num"]=200,
["num_for_nothing"]="VAhc" ["num_for_nothing"]="VAhc"
}, },
["icon"]="1711" ["icon"]="153"
}, },
[154]={ [154]={
["type"]=1, ["type"]=1,
@ -807,7 +807,7 @@ local equip = {
["num"]=220, ["num"]=220,
["num_for_nothing"]="VApc" ["num_for_nothing"]="VApc"
}, },
["icon"]="1811" ["icon"]="154"
}, },
[155]={ [155]={
["type"]=1, ["type"]=1,
@ -852,7 +852,7 @@ local equip = {
["num"]=240, ["num"]=240,
["num_for_nothing"]="VAxc" ["num_for_nothing"]="VAxc"
}, },
["icon"]="1911" ["icon"]="155"
}, },
[211]={ [211]={
["type"]=2, ["type"]=2,
@ -897,7 +897,7 @@ local equip = {
["num"]=25, ["num"]=25,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VA0="
}, },
["icon"]="112" ["icon"]="211"
}, },
[212]={ [212]={
["type"]=2, ["type"]=2,
@ -987,7 +987,7 @@ local equip = {
["num"]=40, ["num"]=40,
["num_for_nothing"]="Ugg=" ["num_for_nothing"]="Ugg="
}, },
["icon"]="312" ["icon"]="221"
}, },
[222]={ [222]={
["type"]=2, ["type"]=2,
@ -1032,7 +1032,7 @@ local equip = {
["num"]=50, ["num"]=50,
["num_for_nothing"]="Uwg=" ["num_for_nothing"]="Uwg="
}, },
["icon"]="412" ["icon"]="222"
}, },
[223]={ [223]={
["type"]=2, ["type"]=2,
@ -1077,7 +1077,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="512" ["icon"]="223"
}, },
[231]={ [231]={
["type"]=2, ["type"]=2,
@ -1122,7 +1122,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="612" ["icon"]="231"
}, },
[232]={ [232]={
["type"]=2, ["type"]=2,
@ -1167,7 +1167,7 @@ local equip = {
["num"]=70, ["num"]=70,
["num_for_nothing"]="UQg=" ["num_for_nothing"]="UQg="
}, },
["icon"]="712" ["icon"]="232"
}, },
[233]={ [233]={
["type"]=2, ["type"]=2,
@ -1212,7 +1212,7 @@ local equip = {
["num"]=80, ["num"]=80,
["num_for_nothing"]="Xgg=" ["num_for_nothing"]="Xgg="
}, },
["icon"]="812" ["icon"]="233"
}, },
[234]={ [234]={
["type"]=2, ["type"]=2,
@ -1257,7 +1257,7 @@ local equip = {
["num"]=90, ["num"]=90,
["num_for_nothing"]="Xwg=" ["num_for_nothing"]="Xwg="
}, },
["icon"]="912" ["icon"]="234"
}, },
[241]={ [241]={
["type"]=2, ["type"]=2,
@ -1302,7 +1302,7 @@ local equip = {
["num"]=100, ["num"]=100,
["num_for_nothing"]="Vwhc" ["num_for_nothing"]="Vwhc"
}, },
["icon"]="1012" ["icon"]="241"
}, },
[242]={ [242]={
["type"]=2, ["type"]=2,
@ -1347,7 +1347,7 @@ local equip = {
["num"]=110, ["num"]=110,
["num_for_nothing"]="Vwlc" ["num_for_nothing"]="Vwlc"
}, },
["icon"]="1112" ["icon"]="242"
}, },
[243]={ [243]={
["type"]=2, ["type"]=2,
@ -1392,7 +1392,7 @@ local equip = {
["num"]=130, ["num"]=130,
["num_for_nothing"]="Vwtc" ["num_for_nothing"]="Vwtc"
}, },
["icon"]="1212" ["icon"]="243"
}, },
[244]={ [244]={
["type"]=2, ["type"]=2,
@ -1437,7 +1437,7 @@ local equip = {
["num"]=140, ["num"]=140,
["num_for_nothing"]="Vwxc" ["num_for_nothing"]="Vwxc"
}, },
["icon"]="1312" ["icon"]="244"
}, },
[245]={ [245]={
["type"]=2, ["type"]=2,
@ -1482,7 +1482,7 @@ local equip = {
["num"]=150, ["num"]=150,
["num_for_nothing"]="Vw1c" ["num_for_nothing"]="Vw1c"
}, },
["icon"]="1412" ["icon"]="245"
}, },
[251]={ [251]={
["type"]=2, ["type"]=2,
@ -1527,7 +1527,7 @@ local equip = {
["num"]=160, ["num"]=160,
["num_for_nothing"]="Vw5c" ["num_for_nothing"]="Vw5c"
}, },
["icon"]="1512" ["icon"]="251"
}, },
[252]={ [252]={
["type"]=2, ["type"]=2,
@ -1572,7 +1572,7 @@ local equip = {
["num"]=180, ["num"]=180,
["num_for_nothing"]="VwBc" ["num_for_nothing"]="VwBc"
}, },
["icon"]="1612" ["icon"]="252"
}, },
[253]={ [253]={
["type"]=2, ["type"]=2,
@ -1617,7 +1617,7 @@ local equip = {
["num"]=200, ["num"]=200,
["num_for_nothing"]="VAhc" ["num_for_nothing"]="VAhc"
}, },
["icon"]="1712" ["icon"]="253"
}, },
[254]={ [254]={
["type"]=2, ["type"]=2,
@ -1662,7 +1662,7 @@ local equip = {
["num"]=220, ["num"]=220,
["num_for_nothing"]="VApc" ["num_for_nothing"]="VApc"
}, },
["icon"]="1812" ["icon"]="254"
}, },
[255]={ [255]={
["type"]=2, ["type"]=2,
@ -1707,7 +1707,7 @@ local equip = {
["num"]=240, ["num"]=240,
["num_for_nothing"]="VAxc" ["num_for_nothing"]="VAxc"
}, },
["icon"]="1912" ["icon"]="255"
}, },
[311]={ [311]={
["type"]=3, ["type"]=3,
@ -1752,7 +1752,7 @@ local equip = {
["num"]=25, ["num"]=25,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VA0="
}, },
["icon"]="113" ["icon"]="311"
}, },
[312]={ [312]={
["type"]=3, ["type"]=3,
@ -1797,7 +1797,7 @@ local equip = {
["num"]=30, ["num"]=30,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQg="
}, },
["icon"]="213" ["icon"]="312"
}, },
[321]={ [321]={
["type"]=3, ["type"]=3,
@ -1842,7 +1842,7 @@ local equip = {
["num"]=40, ["num"]=40,
["num_for_nothing"]="Ugg=" ["num_for_nothing"]="Ugg="
}, },
["icon"]="313" ["icon"]="321"
}, },
[322]={ [322]={
["type"]=3, ["type"]=3,
@ -1887,7 +1887,7 @@ local equip = {
["num"]=50, ["num"]=50,
["num_for_nothing"]="Uwg=" ["num_for_nothing"]="Uwg="
}, },
["icon"]="413" ["icon"]="322"
}, },
[323]={ [323]={
["type"]=3, ["type"]=3,
@ -1932,7 +1932,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="513" ["icon"]="323"
}, },
[331]={ [331]={
["type"]=3, ["type"]=3,
@ -1977,7 +1977,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="613" ["icon"]="331"
}, },
[332]={ [332]={
["type"]=3, ["type"]=3,
@ -2022,7 +2022,7 @@ local equip = {
["num"]=70, ["num"]=70,
["num_for_nothing"]="UQg=" ["num_for_nothing"]="UQg="
}, },
["icon"]="713" ["icon"]="332"
}, },
[333]={ [333]={
["type"]=3, ["type"]=3,
@ -2067,7 +2067,7 @@ local equip = {
["num"]=80, ["num"]=80,
["num_for_nothing"]="Xgg=" ["num_for_nothing"]="Xgg="
}, },
["icon"]="813" ["icon"]="333"
}, },
[334]={ [334]={
["type"]=3, ["type"]=3,
@ -2112,7 +2112,7 @@ local equip = {
["num"]=90, ["num"]=90,
["num_for_nothing"]="Xwg=" ["num_for_nothing"]="Xwg="
}, },
["icon"]="913" ["icon"]="334"
}, },
[341]={ [341]={
["type"]=3, ["type"]=3,
@ -2157,7 +2157,7 @@ local equip = {
["num"]=100, ["num"]=100,
["num_for_nothing"]="Vwhc" ["num_for_nothing"]="Vwhc"
}, },
["icon"]="1013" ["icon"]="341"
}, },
[342]={ [342]={
["type"]=3, ["type"]=3,
@ -2202,7 +2202,7 @@ local equip = {
["num"]=110, ["num"]=110,
["num_for_nothing"]="Vwlc" ["num_for_nothing"]="Vwlc"
}, },
["icon"]="1113" ["icon"]="342"
}, },
[343]={ [343]={
["type"]=3, ["type"]=3,
@ -2247,7 +2247,7 @@ local equip = {
["num"]=130, ["num"]=130,
["num_for_nothing"]="Vwtc" ["num_for_nothing"]="Vwtc"
}, },
["icon"]="1213" ["icon"]="343"
}, },
[344]={ [344]={
["type"]=3, ["type"]=3,
@ -2292,7 +2292,7 @@ local equip = {
["num"]=140, ["num"]=140,
["num_for_nothing"]="Vwxc" ["num_for_nothing"]="Vwxc"
}, },
["icon"]="1313" ["icon"]="344"
}, },
[345]={ [345]={
["type"]=3, ["type"]=3,
@ -2337,7 +2337,7 @@ local equip = {
["num"]=150, ["num"]=150,
["num_for_nothing"]="Vw1c" ["num_for_nothing"]="Vw1c"
}, },
["icon"]="1413" ["icon"]="345"
}, },
[351]={ [351]={
["type"]=3, ["type"]=3,
@ -2382,7 +2382,7 @@ local equip = {
["num"]=160, ["num"]=160,
["num_for_nothing"]="Vw5c" ["num_for_nothing"]="Vw5c"
}, },
["icon"]="1513" ["icon"]="351"
}, },
[352]={ [352]={
["type"]=3, ["type"]=3,
@ -2427,7 +2427,7 @@ local equip = {
["num"]=180, ["num"]=180,
["num_for_nothing"]="VwBc" ["num_for_nothing"]="VwBc"
}, },
["icon"]="1613" ["icon"]="352"
}, },
[353]={ [353]={
["type"]=3, ["type"]=3,
@ -2472,7 +2472,7 @@ local equip = {
["num"]=200, ["num"]=200,
["num_for_nothing"]="VAhc" ["num_for_nothing"]="VAhc"
}, },
["icon"]="1713" ["icon"]="353"
}, },
[354]={ [354]={
["type"]=3, ["type"]=3,
@ -2517,7 +2517,7 @@ local equip = {
["num"]=220, ["num"]=220,
["num_for_nothing"]="VApc" ["num_for_nothing"]="VApc"
}, },
["icon"]="1813" ["icon"]="354"
}, },
[355]={ [355]={
["type"]=3, ["type"]=3,
@ -2562,7 +2562,7 @@ local equip = {
["num"]=240, ["num"]=240,
["num_for_nothing"]="VAxc" ["num_for_nothing"]="VAxc"
}, },
["icon"]="1913" ["icon"]="355"
}, },
[411]={ [411]={
["type"]=4, ["type"]=4,
@ -2607,7 +2607,7 @@ local equip = {
["num"]=25, ["num"]=25,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VA0="
}, },
["icon"]="114" ["icon"]="411"
}, },
[412]={ [412]={
["type"]=4, ["type"]=4,
@ -2652,7 +2652,7 @@ local equip = {
["num"]=30, ["num"]=30,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQg="
}, },
["icon"]="214" ["icon"]="412"
}, },
[421]={ [421]={
["type"]=4, ["type"]=4,
@ -2697,7 +2697,7 @@ local equip = {
["num"]=40, ["num"]=40,
["num_for_nothing"]="Ugg=" ["num_for_nothing"]="Ugg="
}, },
["icon"]="314" ["icon"]="421"
}, },
[422]={ [422]={
["type"]=4, ["type"]=4,
@ -2742,7 +2742,7 @@ local equip = {
["num"]=50, ["num"]=50,
["num_for_nothing"]="Uwg=" ["num_for_nothing"]="Uwg="
}, },
["icon"]="414" ["icon"]="422"
}, },
[423]={ [423]={
["type"]=4, ["type"]=4,
@ -2787,7 +2787,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="514" ["icon"]="423"
}, },
[431]={ [431]={
["type"]=4, ["type"]=4,
@ -2832,7 +2832,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="614" ["icon"]="431"
}, },
[432]={ [432]={
["type"]=4, ["type"]=4,
@ -2877,7 +2877,7 @@ local equip = {
["num"]=70, ["num"]=70,
["num_for_nothing"]="UQg=" ["num_for_nothing"]="UQg="
}, },
["icon"]="714" ["icon"]="432"
}, },
[433]={ [433]={
["type"]=4, ["type"]=4,
@ -2922,7 +2922,7 @@ local equip = {
["num"]=80, ["num"]=80,
["num_for_nothing"]="Xgg=" ["num_for_nothing"]="Xgg="
}, },
["icon"]="814" ["icon"]="433"
}, },
[434]={ [434]={
["type"]=4, ["type"]=4,
@ -2967,7 +2967,7 @@ local equip = {
["num"]=90, ["num"]=90,
["num_for_nothing"]="Xwg=" ["num_for_nothing"]="Xwg="
}, },
["icon"]="914" ["icon"]="434"
}, },
[441]={ [441]={
["type"]=4, ["type"]=4,
@ -3012,7 +3012,7 @@ local equip = {
["num"]=100, ["num"]=100,
["num_for_nothing"]="Vwhc" ["num_for_nothing"]="Vwhc"
}, },
["icon"]="1014" ["icon"]="441"
}, },
[442]={ [442]={
["type"]=4, ["type"]=4,
@ -3057,7 +3057,7 @@ local equip = {
["num"]=110, ["num"]=110,
["num_for_nothing"]="Vwlc" ["num_for_nothing"]="Vwlc"
}, },
["icon"]="1114" ["icon"]="442"
}, },
[443]={ [443]={
["type"]=4, ["type"]=4,
@ -3102,7 +3102,7 @@ local equip = {
["num"]=130, ["num"]=130,
["num_for_nothing"]="Vwtc" ["num_for_nothing"]="Vwtc"
}, },
["icon"]="1214" ["icon"]="443"
}, },
[444]={ [444]={
["type"]=4, ["type"]=4,
@ -3147,7 +3147,7 @@ local equip = {
["num"]=140, ["num"]=140,
["num_for_nothing"]="Vwxc" ["num_for_nothing"]="Vwxc"
}, },
["icon"]="1314" ["icon"]="444"
}, },
[445]={ [445]={
["type"]=4, ["type"]=4,
@ -3192,7 +3192,7 @@ local equip = {
["num"]=150, ["num"]=150,
["num_for_nothing"]="Vw1c" ["num_for_nothing"]="Vw1c"
}, },
["icon"]="1414" ["icon"]="445"
}, },
[451]={ [451]={
["type"]=4, ["type"]=4,
@ -3237,7 +3237,7 @@ local equip = {
["num"]=160, ["num"]=160,
["num_for_nothing"]="Vw5c" ["num_for_nothing"]="Vw5c"
}, },
["icon"]="1514" ["icon"]="451"
}, },
[452]={ [452]={
["type"]=4, ["type"]=4,
@ -3282,7 +3282,7 @@ local equip = {
["num"]=180, ["num"]=180,
["num_for_nothing"]="VwBc" ["num_for_nothing"]="VwBc"
}, },
["icon"]="1614" ["icon"]="452"
}, },
[453]={ [453]={
["type"]=4, ["type"]=4,
@ -3327,7 +3327,7 @@ local equip = {
["num"]=200, ["num"]=200,
["num_for_nothing"]="VAhc" ["num_for_nothing"]="VAhc"
}, },
["icon"]="1714" ["icon"]="453"
}, },
[454]={ [454]={
["type"]=4, ["type"]=4,
@ -3372,7 +3372,7 @@ local equip = {
["num"]=220, ["num"]=220,
["num_for_nothing"]="VApc" ["num_for_nothing"]="VApc"
}, },
["icon"]="1814" ["icon"]="454"
}, },
[455]={ [455]={
["type"]=4, ["type"]=4,
@ -3417,7 +3417,7 @@ local equip = {
["num"]=240, ["num"]=240,
["num_for_nothing"]="VAxc" ["num_for_nothing"]="VAxc"
}, },
["icon"]="1914" ["icon"]="455"
}, },
[511]={ [511]={
["type"]=5, ["type"]=5,
@ -3462,7 +3462,7 @@ local equip = {
["num"]=25, ["num"]=25,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VA0="
}, },
["icon"]="115" ["icon"]="511"
}, },
[512]={ [512]={
["type"]=5, ["type"]=5,
@ -3507,7 +3507,7 @@ local equip = {
["num"]=30, ["num"]=30,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQg="
}, },
["icon"]="215" ["icon"]="512"
}, },
[521]={ [521]={
["type"]=5, ["type"]=5,
@ -3552,7 +3552,7 @@ local equip = {
["num"]=40, ["num"]=40,
["num_for_nothing"]="Ugg=" ["num_for_nothing"]="Ugg="
}, },
["icon"]="315" ["icon"]="521"
}, },
[522]={ [522]={
["type"]=5, ["type"]=5,
@ -3597,7 +3597,7 @@ local equip = {
["num"]=50, ["num"]=50,
["num_for_nothing"]="Uwg=" ["num_for_nothing"]="Uwg="
}, },
["icon"]="415" ["icon"]="522"
}, },
[523]={ [523]={
["type"]=5, ["type"]=5,
@ -3642,7 +3642,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="515" ["icon"]="523"
}, },
[531]={ [531]={
["type"]=5, ["type"]=5,
@ -3687,7 +3687,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="615" ["icon"]="531"
}, },
[532]={ [532]={
["type"]=5, ["type"]=5,
@ -3732,7 +3732,7 @@ local equip = {
["num"]=70, ["num"]=70,
["num_for_nothing"]="UQg=" ["num_for_nothing"]="UQg="
}, },
["icon"]="715" ["icon"]="532"
}, },
[533]={ [533]={
["type"]=5, ["type"]=5,
@ -3777,7 +3777,7 @@ local equip = {
["num"]=80, ["num"]=80,
["num_for_nothing"]="Xgg=" ["num_for_nothing"]="Xgg="
}, },
["icon"]="815" ["icon"]="533"
}, },
[534]={ [534]={
["type"]=5, ["type"]=5,
@ -3822,7 +3822,7 @@ local equip = {
["num"]=90, ["num"]=90,
["num_for_nothing"]="Xwg=" ["num_for_nothing"]="Xwg="
}, },
["icon"]="915" ["icon"]="534"
}, },
[541]={ [541]={
["type"]=5, ["type"]=5,
@ -3867,7 +3867,7 @@ local equip = {
["num"]=100, ["num"]=100,
["num_for_nothing"]="Vwhc" ["num_for_nothing"]="Vwhc"
}, },
["icon"]="1015" ["icon"]="541"
}, },
[542]={ [542]={
["type"]=5, ["type"]=5,
@ -3912,7 +3912,7 @@ local equip = {
["num"]=110, ["num"]=110,
["num_for_nothing"]="Vwlc" ["num_for_nothing"]="Vwlc"
}, },
["icon"]="1115" ["icon"]="542"
}, },
[543]={ [543]={
["type"]=5, ["type"]=5,
@ -3957,7 +3957,7 @@ local equip = {
["num"]=130, ["num"]=130,
["num_for_nothing"]="Vwtc" ["num_for_nothing"]="Vwtc"
}, },
["icon"]="1215" ["icon"]="543"
}, },
[544]={ [544]={
["type"]=5, ["type"]=5,
@ -4002,7 +4002,7 @@ local equip = {
["num"]=140, ["num"]=140,
["num_for_nothing"]="Vwxc" ["num_for_nothing"]="Vwxc"
}, },
["icon"]="1315" ["icon"]="544"
}, },
[545]={ [545]={
["type"]=5, ["type"]=5,
@ -4047,7 +4047,7 @@ local equip = {
["num"]=150, ["num"]=150,
["num_for_nothing"]="Vw1c" ["num_for_nothing"]="Vw1c"
}, },
["icon"]="1415" ["icon"]="545"
}, },
[551]={ [551]={
["type"]=5, ["type"]=5,
@ -4092,7 +4092,7 @@ local equip = {
["num"]=160, ["num"]=160,
["num_for_nothing"]="Vw5c" ["num_for_nothing"]="Vw5c"
}, },
["icon"]="1515" ["icon"]="551"
}, },
[552]={ [552]={
["type"]=5, ["type"]=5,
@ -4137,7 +4137,7 @@ local equip = {
["num"]=180, ["num"]=180,
["num_for_nothing"]="VwBc" ["num_for_nothing"]="VwBc"
}, },
["icon"]="1615" ["icon"]="552"
}, },
[553]={ [553]={
["type"]=5, ["type"]=5,
@ -4182,7 +4182,7 @@ local equip = {
["num"]=200, ["num"]=200,
["num_for_nothing"]="VAhc" ["num_for_nothing"]="VAhc"
}, },
["icon"]="1715" ["icon"]="553"
}, },
[554]={ [554]={
["type"]=5, ["type"]=5,
@ -4227,7 +4227,7 @@ local equip = {
["num"]=220, ["num"]=220,
["num_for_nothing"]="VApc" ["num_for_nothing"]="VApc"
}, },
["icon"]="1815" ["icon"]="554"
}, },
[555]={ [555]={
["type"]=5, ["type"]=5,
@ -4272,7 +4272,7 @@ local equip = {
["num"]=240, ["num"]=240,
["num_for_nothing"]="VAxc" ["num_for_nothing"]="VAxc"
}, },
["icon"]="1915" ["icon"]="555"
}, },
[611]={ [611]={
["type"]=6, ["type"]=6,
@ -4317,7 +4317,7 @@ local equip = {
["num"]=25, ["num"]=25,
["num_for_nothing"]="VA0=" ["num_for_nothing"]="VA0="
}, },
["icon"]="116" ["icon"]="611"
}, },
[612]={ [612]={
["type"]=6, ["type"]=6,
@ -4362,7 +4362,7 @@ local equip = {
["num"]=30, ["num"]=30,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQg="
}, },
["icon"]="216" ["icon"]="612"
}, },
[621]={ [621]={
["type"]=6, ["type"]=6,
@ -4407,7 +4407,7 @@ local equip = {
["num"]=40, ["num"]=40,
["num_for_nothing"]="Ugg=" ["num_for_nothing"]="Ugg="
}, },
["icon"]="316" ["icon"]="621"
}, },
[622]={ [622]={
["type"]=6, ["type"]=6,
@ -4452,7 +4452,7 @@ local equip = {
["num"]=50, ["num"]=50,
["num_for_nothing"]="Uwg=" ["num_for_nothing"]="Uwg="
}, },
["icon"]="416" ["icon"]="622"
}, },
[623]={ [623]={
["type"]=6, ["type"]=6,
@ -4497,7 +4497,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="516" ["icon"]="623"
}, },
[631]={ [631]={
["type"]=6, ["type"]=6,
@ -4542,7 +4542,7 @@ local equip = {
["num"]=60, ["num"]=60,
["num_for_nothing"]="UAg=" ["num_for_nothing"]="UAg="
}, },
["icon"]="616" ["icon"]="631"
}, },
[632]={ [632]={
["type"]=6, ["type"]=6,
@ -4587,7 +4587,7 @@ local equip = {
["num"]=70, ["num"]=70,
["num_for_nothing"]="UQg=" ["num_for_nothing"]="UQg="
}, },
["icon"]="716" ["icon"]="632"
}, },
[633]={ [633]={
["type"]=6, ["type"]=6,
@ -4632,7 +4632,7 @@ local equip = {
["num"]=80, ["num"]=80,
["num_for_nothing"]="Xgg=" ["num_for_nothing"]="Xgg="
}, },
["icon"]="816" ["icon"]="633"
}, },
[634]={ [634]={
["type"]=6, ["type"]=6,
@ -4677,7 +4677,7 @@ local equip = {
["num"]=90, ["num"]=90,
["num_for_nothing"]="Xwg=" ["num_for_nothing"]="Xwg="
}, },
["icon"]="916" ["icon"]="634"
}, },
[641]={ [641]={
["type"]=6, ["type"]=6,
@ -4722,7 +4722,7 @@ local equip = {
["num"]=100, ["num"]=100,
["num_for_nothing"]="Vwhc" ["num_for_nothing"]="Vwhc"
}, },
["icon"]="1016" ["icon"]="641"
}, },
[642]={ [642]={
["type"]=6, ["type"]=6,
@ -4767,7 +4767,7 @@ local equip = {
["num"]=110, ["num"]=110,
["num_for_nothing"]="Vwlc" ["num_for_nothing"]="Vwlc"
}, },
["icon"]="1116" ["icon"]="642"
}, },
[643]={ [643]={
["type"]=6, ["type"]=6,
@ -4812,7 +4812,7 @@ local equip = {
["num"]=130, ["num"]=130,
["num_for_nothing"]="Vwtc" ["num_for_nothing"]="Vwtc"
}, },
["icon"]="1216" ["icon"]="643"
}, },
[644]={ [644]={
["type"]=6, ["type"]=6,
@ -4857,7 +4857,7 @@ local equip = {
["num"]=140, ["num"]=140,
["num_for_nothing"]="Vwxc" ["num_for_nothing"]="Vwxc"
}, },
["icon"]="1316" ["icon"]="644"
}, },
[645]={ [645]={
["type"]=6, ["type"]=6,
@ -4902,7 +4902,7 @@ local equip = {
["num"]=150, ["num"]=150,
["num_for_nothing"]="Vw1c" ["num_for_nothing"]="Vw1c"
}, },
["icon"]="1416" ["icon"]="645"
}, },
[651]={ [651]={
["type"]=6, ["type"]=6,
@ -4947,7 +4947,7 @@ local equip = {
["num"]=160, ["num"]=160,
["num_for_nothing"]="Vw5c" ["num_for_nothing"]="Vw5c"
}, },
["icon"]="1516" ["icon"]="651"
}, },
[652]={ [652]={
["type"]=6, ["type"]=6,
@ -4992,7 +4992,7 @@ local equip = {
["num"]=180, ["num"]=180,
["num_for_nothing"]="VwBc" ["num_for_nothing"]="VwBc"
}, },
["icon"]="1616" ["icon"]="652"
}, },
[653]={ [653]={
["type"]=6, ["type"]=6,
@ -5037,7 +5037,7 @@ local equip = {
["num"]=200, ["num"]=200,
["num_for_nothing"]="VAhc" ["num_for_nothing"]="VAhc"
}, },
["icon"]="1716" ["icon"]="653"
}, },
[654]={ [654]={
["type"]=6, ["type"]=6,
@ -5082,7 +5082,7 @@ local equip = {
["num"]=220, ["num"]=220,
["num_for_nothing"]="VApc" ["num_for_nothing"]="VApc"
}, },
["icon"]="1816" ["icon"]="654"
}, },
[655]={ [655]={
["type"]=6, ["type"]=6,
@ -5127,7 +5127,7 @@ local equip = {
["num"]=240, ["num"]=240,
["num_for_nothing"]="VAxc" ["num_for_nothing"]="VAxc"
}, },
["icon"]="1916" ["icon"]="655"
} }
} }
local config = { local config = {

File diff suppressed because it is too large Load Diff

View File

@ -86,7 +86,7 @@ function EquipManager:onEquipUpgradeRsp(result)
DataManager.HeroData:calcPower() DataManager.HeroData:calcPower()
local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, result.reqData.slot) local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.LV_UP, result.reqData.slot)
if lvOld < lvNew then if lvOld < lvNew then
self:showGetResonateUI(GConst.EquipConst.RESONATE_PAGE.LV_UP, lvNew, attrNum, attrNextNum) self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.LV_UP, lvNew, attrNum, attrNextNum)
-- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.LV_UP, lvNew) -- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.LV_UP, lvNew)
end end
end end
@ -113,7 +113,7 @@ function EquipManager:onEquipRefineRsp(result)
DataManager.HeroData:calcPower() DataManager.HeroData:calcPower()
local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, result.reqData.slot) local lvNew = DataManager.EquipData:getResonateLevel(GConst.EquipConst.RESONATE_PAGE.REFINE, result.reqData.slot)
if lvOld < lvNew then if lvOld < lvNew then
self:showGetResonateUI(GConst.EquipConst.RESONATE_PAGE.REFINE, lvNew, attrNum, attrNextNum) self:showEquipGetResonateUI(GConst.EquipConst.RESONATE_PAGE.REFINE, lvNew, attrNum, attrNextNum)
-- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.REFINE, lvNew) -- DataManager.GiftPopData:activeEquipResonancePopGift(GConst.EquipConst.RESONATE_PAGE.REFINE, lvNew)
end end
end end

View File

@ -6,7 +6,8 @@ function EquipListCell:init()
self.nameTx = uiMap["cell.name_tx"] self.nameTx = uiMap["cell.name_tx"]
self.powerTx = uiMap["cell.power_node.power_tx"] self.powerTx = uiMap["cell.power_node.power_tx"]
self.wearBtn = uiMap["cell.wear_btn"] self.wearBtn = uiMap["cell.wear_btn"]
self.wearBtnIcon = uiMap["cell.wear_btn.icon"] self.wearBtnIcon = uiMap["cell.wear_btn.bg.icon"]
self.wearBtnBg = uiMap["cell.wear_btn.bg"]
self.wearBtnTx = uiMap["cell.wear_btn.text"] self.wearBtnTx = uiMap["cell.wear_btn.text"]
self.powerNode = uiMap["cell.power_node"] self.powerNode = uiMap["cell.power_node"]
self.powerDescTx = uiMap["cell.power_node.power_desc_tx"] self.powerDescTx = uiMap["cell.power_node.power_desc_tx"]
@ -32,10 +33,11 @@ function EquipListCell:refresh(equipEntity, slotId, equipPart)
local useHero = DataManager.EquipData:getEquipUseHero(equipEntity:getUid()) local useHero = DataManager.EquipData:getEquipUseHero(equipEntity:getUid())
if useHero then if useHero then
local heroEntity = DataManager.HeroData:getHeroById(useHero) local heroEntity = DataManager.HeroData:getHeroById(useHero)
self.wearBtnIcon:setActive(true) self.wearBtnBg:setActive(true)
self.wearBtnBg:setSprite(GConst.ATLAS_PATH.ICON_ITEM, GConst.FRAME_QLT[heroEntity:getQlt()])
self.wearBtnIcon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroEntity:getIcon()) self.wearBtnIcon:setSprite(GConst.ATLAS_PATH.ICON_HERO, heroEntity:getIcon())
else else
self.wearBtnIcon:setActive(false) self.wearBtnBg:setActive(false)
end end
end end