Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei
commit
bc3a4457b9
|
@ -1458,7 +1458,7 @@ function TimeToH_M_S(t)
|
|||
local allMin = math.floor(t / 60)
|
||||
local _min = allMin % 60
|
||||
local _hour = math.floor(allMin / 60)
|
||||
return _hour, string.format("%02d",_min), string.format("%02d", _sec)
|
||||
return _hour, _min, string.format("%02d", _sec)
|
||||
end
|
||||
|
||||
--- 将一段时间转换为分秒
|
||||
|
|
|
@ -2,7 +2,7 @@ local ActivityGroups = {
|
|||
__count = 202,
|
||||
__indexs = {1.51,-2.2,1.41,6,1,17,1.31,-2.2,3,4,1,-3.2,1.3,-2.2,1,31,1.8,26,1,3,1.2,4,1,2,1.8,21,1.03,67,1.61,34,1.2,48,401,199,201,1,298,500,1.51,1985,1.5,95,1.02,3881,1.9,990,1.3,12,1.2},
|
||||
__values = {-9999,9898,97,3,1.91,2,1.6,-4.2,1.41,-2.2,3,1.7,3,5,2,1,4,1.3,4,3,13,5,1,3,1.2,2,5,-2.2,1,2,1.5,10,1,-19.2,21,1.31,20,1.2,21,3,2,39,77,7,28,88,165,1.3,2,1,129,1,198,1.31,188,300,500,1.6,2,1.8,2,1.3,5,1,74,1.8,421,470,1.5,103,2,3,6,1,3,4,21,853,10,1.4,6,2.1,4.3,55,1900,1.2,-99.2,1,100,1699,1.01,990,1,996,73.2,1.6,13,58,1,21,-100.5,2400,7000,1.7,37,16,47,64,1,88,740,1.4,997,3,7996,1007,-2000.2,994,1.3,-2.2,1.4,13,982,2993,1.4,3,4,1.4,2,1,32,9950,2,1.4,96,1.3,97,2.1,1.3,695,1.5,6.4,2.1,8696,1.3,998,10,4,8985,10000,1.11,19879,108,410002,-10.2,389993,5100101},
|
||||
__exVals = {219,nil,'0','49010115','49010065','X1_pve_meizhoutexun_02','X1_pve_meizhoutexun_01','49010002','49010112','X1_zhucheng_saiji','49010056','49010057','49010058','X1_shanghaizengfu_yejian_01','X1_shanghaizengfu_yejian_02','X1_shanbizengfu_yejian_01','X1_shanbizengfu_yejian_02','X1_baojizengfu_yejian_01','X1_baojizengfu_yejian_02','X1_zhiliaozengfu_yejian_01','X1_zhiliaozengfu_yejian_02','X1_kongzhizengfu_yejian_01','X1_kongzhizengfu_yejian_02','49010092','49010044','49010037','49010089','49010124','49010090','X1_zhucheng_ciyuanyinqing','X1_duihuan_jinghe_yejian_01','X1_duihuan_jinghe_yejian_02','X1_duihuan_nengyuan_yejian_01','X1_duihuan_nengyuan_yejian_02','X1_tiaozhan_jinghe_yejian_01','X1_tiaozhan_jinghe_yejian_02','49010006','49010054','49010050','49010039','49010055','49010059','49010088','49010110','49010080','X1_zhucheng_meirishouchong','X1_zhucheng_anyingzhixi','X1_zhucheng_xianshirenwu','X1_zhucheng_liutianmowang','X1_zhucheng_xianquhuodong','X1_zhucheng_xianquhuodong1','X1_zhucheng_xianquhuodong2','X1_zhucheng_xianquhuodong3','X1_zhucheng_zhenbaoge','X1_zhucheng_shequn','X1_zhucheng_diaochawenjuan','49010004','49010071','49010001','49010070','49010010','49010014','49010019','49010007','49010075','49010067','49010009','49010074','49010087','49010072','49010047','49010083','49010012','49010017','49010018','49010011','49010003','49010015','49010016','49010013','49010068','49010069','49010033','49010022','49010027','49010026','49010028','49010029','49010020','49010030','49010032','49010031','49010085','49010045','49010048','49010046','49010041','49010043','49010034','49010021','49010042','49010040','49010038','49010073','49010025','49010101','49010102','49010060','49010061','49010062','49010063','49010064','49010066','49010008','49010084','49010079','49010077','49010005','49010121','49010095','49010096','49010097','49010093','49010098','49010100','49010099','49010103','49010104','49010105','49010106','49010107','49010108','49010111','49010123','49010116','49010117','49010113','49010119','49010122','49010114','49010023','49010078','49010076','49010024','49010081','49010082','X1_zhucheng_chaozhishouchong','X1_zhucheng_qirimubiao','X1_zhucheng_baridenglu','X1_zhucheng_chongzhi','X1_zhucheng_fuli','X1_zhucheng_xianshihuodong','X1_zhucheng_xingyunlunpan','X1_zhucheng_xianshizhekou','X1_zhucheng_chaozhijijin','X1_zhucheng_chengzhangshouce','X1_zhucheng_shenmijunhuoshang','X1_zhucheng_moshenzhihui','X1_zhucheng_xinfuremai','X1_zhucheng_wushengjianglin','X1_zhucheng_zhenfuwang','X1_zhucheng_kaifukuanghuan','X1_jingyinghuodong_yeqian_08','X1_jingyinghuodong_yeqianxuanzhong_08','X1_jingyinghuodong_yeqian_10','X1_jingyinghuodong_yeqianxuanzhong_10','X1_jingyinghuodong_yeqian_05','X1_jingyinghuodong_yeqianxuanzhong_05','X1_jingyinghuodong_yeqian_09','X1_jingyinghuodong_yeqianxuanzhong_09','X1_zhuthd_yeqian_kaifushuangbei_01','X1_zhuthd_yeqian_kaifushuangbei_02','X1_jingyinghuodong_yeqian_07','X1_jingyinghuodong_yeqianxuanzhong_07','X1_fuhqixi_yeqian_01','X1_fuhqixi_yeqian_02','X1_zhucheng_zhuangzhilinyun','X1_zhucheng_wanyuanlijin','X1_zhucheng_pve','X1_pve_yingxiongshilian02','X1_pve_yingxiongshilian01','X1_pve_xianshitiaozhan02','X1_pve_xianshitiaozhan01','X1_zhuthd_yeqian_qchyan','X1_zhuthd_yeqian_qchyan_2','X1_pve_baiwanshashen02','X1_pve_baiwanshashen01','X1_card_yingxiongjiadao','X1_zhucheng_chaozhilibao','X1_zhucheng_tiantianzengli','X1_zhucheng_mengyanruq','X1_zhucheng_jinbiaosai','X1_zhucheng_qianChou','X1_zhucheng_zhekouquan_2','X1_zhucheng_fulibi','X1_zhucheng_zixuanzhaomu','X1_zhucheng_tianxuantequan','X1_zhucheng_choujiang','X1_zhucheng_zhizuntequan','X1_zhucheng_meirimiaosha','X1_zhucheng_kaifuchongbang','X1_zhucheng_zaichongyici','X1_zhucheng_zhekou','X1_zhucheng_shengdan','X1_shengdan_yeqian_duihuan_01','X1_shengdan_yeqian_duihuan_02','X1_zhucheng_shoujibangding','X1_zhucheng_ruby','X1_zhucheng_nengyuanjidi','X1_kaufukuizeng_yeqian_02','X1_kaifukuizeng_yeqianxuanzhong_01','X1_zhucheng_zhanzhengdongyuan','X1_zhucheng_Gonghuizhan','X1_xingyunxing_02','X1_xingyunxing_01','X1_zhucheng_kaifuyouli','X1_hunluanzhizhi_huodongrukou','数量有限,先到先得','<size=25><color=#E2C8A0>活动期间,累计充值金额达到条件,即可领取限时豪礼</color></size>\n(购买礼包或者充值妖晶均计算在内)|178|-38.55|0','活动期间,累计充值金额达到条件,即可领取限时豪礼'},
|
||||
__exVals = {219,nil,'0','49010115','49010065','X1_pve_meizhoutexun_02','X1_pve_meizhoutexun_01','49010002','49010112','X1_zhucheng_saiji','49010056','49010057','49010058','X1_shanghaizengfu_yejian_01','X1_shanghaizengfu_yejian_02','X1_shanbizengfu_yejian_01','X1_shanbizengfu_yejian_02','X1_baojizengfu_yejian_01','X1_baojizengfu_yejian_02','X1_zhiliaozengfu_yejian_01','X1_zhiliaozengfu_yejian_02','X1_kongzhizengfu_yejian_01','X1_kongzhizengfu_yejian_02','49010092','49010044','49010037','49010089','49010124','49010090','X1_zhucheng_ciyuanyinqing','X1_duihuan_jinghe_yejian_01','X1_duihuan_jinghe_yejian_02','X1_duihuan_nengyuan_yejian_01','X1_duihuan_nengyuan_yejian_02','X1_tiaozhan_jinghe_yejian_01','X1_tiaozhan_jinghe_yejian_02','49010006','49010054','49010050','49010039','49010055','49010059','49010088','49010110','49010080','X1_zhucheng_meirishouchong','X1_zhucheng_anyingzhixi','X1_zhucheng_xianshirenwu','X1_zhucheng_liutianmowang','X1_zhucheng_xianquhuodong','X1_zhucheng_xianquhuodong1','X1_zhucheng_xianquhuodong2','X1_zhucheng_xianquhuodong3','X1_zhucheng_zhenbaoge','X1_zhucheng_shequn','X1_zhucheng_diaochawenjuan','49010004','49010071','49010001','49010070','49010010','49010014','49010019','49010007','49010075','49010067','49010009','49010074','49010087','49010072','49010047','49010083','49010012','49010017','49010018','49010011','49010003','49010015','49010016','49010013','49010068','49010069','49010033','49010022','49010027','49010026','49010028','49010029','49010020','49010030','49010032','49010031','49010085','49010045','49010048','49010046','49010041','49010043','49010034','49010021','49010042','49010040','49010038','49010073','49010025','49010101','49010102','49010060','49010061','49010062','49010063','49010064','49010066','49010008','49010084','49010079','49010077','49010005','49010121','49010095','49010096','49010097','49010093','49010098','49010100','49010099','49010103','49010104','49010105','49010106','49010107','49010108','49010111','49010123','49010116','49010117','49010113','49010119','49010122','49010114','49010023','49010078','49010076','49010024','49010081','49010082','X1_zhucheng_chaozhishouchong','X1_zhucheng_qirimubiao','X1_zhucheng_baridenglu','X1_zhucheng_chongzhi','X1_zhucheng_fuli','X1_zhucheng_xianshihuodong','X1_zhucheng_xingyunlunpan','X1_zhucheng_xianshizhekou','X1_zhucheng_chaozhijijin','X1_zhucheng_chengzhangshouce','X1_zhucheng_shenmijunhuoshang','X1_zhucheng_moshenzhihui','X1_zhucheng_xinfuremai','X1_zhucheng_wushengjianglin','X1_zhucheng_zhenfuwang','X1_zhucheng_kaifukuanghuan','X1_jingyinghuodong_yeqian_08','X1_jingyinghuodong_yeqianxuanzhong_08','X1_jingyinghuodong_yeqian_10','X1_jingyinghuodong_yeqianxuanzhong_10','X1_jingyinghuodong_yeqian_05','X1_jingyinghuodong_yeqianxuanzhong_05','X1_jingyinghuodong_yeqian_09','X1_jingyinghuodong_yeqianxuanzhong_09','X1_zhuthd_yeqian_kaifushuangbei_01','X1_zhuthd_yeqian_kaifushuangbei_02','X1_jingyinghuodong_yeqian_07','X1_jingyinghuodong_yeqianxuanzhong_07','X1_fuhqixi_yeqian_01','X1_fuhqixi_yeqian_02','X1_zhucheng_zhuangzhilinyun','X1_zhucheng_wanyuanlijin','X1_zhucheng_pve','X1_pve_yingxiongshilian02','X1_pve_yingxiongshilian01','X1_pve_xianshitiaozhan02','X1_pve_xianshitiaozhan01','X1_zhuthd_yeqian_qchyan','X1_zhuthd_yeqian_qchyan_2','X1_pve_baiwanshashen02','X1_pve_baiwanshashen01','X1_card_yingxiongjiadao','X1_zhucheng_chaozhilibao','X1_zhucheng_tiantianzengli','X1_zhucheng_mengyanruq','X1_zhucheng_jinbiaosai','X1_zhucheng_qianChou','X1_zhucheng_zhekouquan_2','X1_zhucheng_fulibi','X1_zhucheng_zixuanzhaomu','X1_zhucheng_tianxuantequan_zh','X1_zhucheng_choujiang','X1_zhucheng_zhizuntequan_zh','X1_zhucheng_meirimiaosha','X1_zhucheng_kaifuchongbang','X1_zhucheng_zaichongyici','X1_zhucheng_zhekou','X1_zhucheng_shengdan','X1_shengdan_yeqian_duihuan_01','X1_shengdan_yeqian_duihuan_02','X1_zhucheng_shoujibangding','X1_zhucheng_ruby','X1_zhucheng_nengyuanjidi','X1_kaufukuizeng_yeqian_02','X1_kaifukuizeng_yeqianxuanzhong_01','X1_zhucheng_zhanzhengdongyuan','X1_zhucheng_Gonghuizhan','X1_xingyunxing_02','X1_xingyunxing_01','X1_zhucheng_kaifuyouli','X1_hunluanzhizhi_huodongrukou','数量有限,先到先得','<size=25><color=#E2C8A0>活动期间,累计充值金额达到条件,即可领取限时豪礼</color></size>\n(购买礼包或者充值妖晶均计算在内)|178|-38.55|0','活动期间,累计充值金额达到条件,即可领取限时豪礼'},
|
||||
__fields = {
|
||||
'Id',
|
||||
'ActId',
|
||||
|
@ -70,7 +70,7 @@ __refs = {
|
|||
{5,.43,270,-5,6,1.2,-7,2,-1,2,-38,1,-232,.7,274,-274,0,282,.2,-4,.2,-278,.5,280,1,3,1,2,-4,3,-7,9,1,-14,-275,.121},
|
||||
{5,.95,46,.2,-46,.5,54,2,-56,.4,48,-48,.421},
|
||||
{{{1,1},{6,.96},{36,1.91,2,1.6,7,1.01,3,2,1.2,3,5,-4.6,3,1.11,4,9,1,2,3,1,43,3}},{{2,1},{19,.32,47,.2,-47,.6,105,0,-105,0,339,-339,.2,339,.6,-337,113,.11,166,57,-338,.3,280,2},{36,1.91,2,1.6,7,1.01,3,2,1.2,3,5,-4.6,3,1.11,4,9,1,2,3,1,43,3}},{{2,2},{21,.33,104,0,-104,.4,6,-6,.4},{36,1.91,2,1.6,7,1.01,5,1.2,32,27,1,2,3,1}},{{2,3},{298,-172,-105,0,277},{70,1,6,1.2}}},
|
||||
{{{1},{7,.991},{40,1}},{{2},{8,4,109,0,-113,-2,0,2,0,12,-7,-3,13,-13,10,23,-12,0,-17,10,7,.9,-13,-8,.3,111,-78,78,-115,2,7,-9,14,0,-12,7,5,101,-101,6.2,30,0,-28,-5.2,.8,8,.2,-8,0,13.2,-5,5,.4,9,35,.3,57,.2,-57,.3,-56,56,.32,-38,.2,5,0,2,.11,-7,6.2,-11,-7,41,-30,-14,111,0,-106,106,0,-101,-6,107,49.2,4,-16,113,.2,-115,14,0,-6,.2,-1,7,47,.4,8,.4,9,.4,2,.4,-48,.9,-23,34,-26,-8,0,-1,43},{40,1}}},
|
||||
{{{1},{7,.991},{40,1}},{{2},{8,4,109,0,-113,-2,0,2,0,12,-7,-3,13,-13,10,23,-12,0,-17,10,7,.9,-13,-8,.3,111,-78,78,-115,2,7,-9,14,0,-12,7,5,101,-101,0,101,-83,0,-28,-5.2,.8,8,.2,-8,10.2,-101,-5,5,.4,9,35,.3,57,.2,-57,.3,-56,56,.32,-38,.2,5,0,2,.11,-7,6.2,-11,-7,41,-30,-14,111,0,-106,106,0,-101,-6,107,49.2,4,-16,113,.2,-115,14,0,-6,.2,-1,7,47,.4,8,.4,9,.4,2,.4,-48,.9,-23,34,-26,-8,0,-1,43},{40,1}}},
|
||||
{359,.15,216,-216,.71,217,1,-218,.821},
|
||||
{{{1},{85,0,-83,3.2},{37,1,5,29,1}},{{2},{3,0,14,17,0},{37,1,5,29,1}},{{3},{5,.4},{37,1,5,29,1}}},
|
||||
{{{1,1},{1,.11,5,.3,1,-1,0},{18,3,1.01,5,1.4,4,11}},{{1,2},{10,.3,14,-14,0},{36,1.4,4,11}},{{1,3},{19,1.2,-13,14,9},{36,1.3,5,11}},{{2,1},{7},{44}},{{2,2},{32},{44}}},
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
local GameSetting = {
|
||||
__count = 1,
|
||||
__indexs = {1},
|
||||
__values = {0,1.7,2,1,-2.2,1,4,4.2,1.2,-2.2,3,7,4,6,4,2,4,2,1,9,7,1,19,1,50,30,121,1.6,3,1.21,38,160,78,602,600,200,1151,449,-1800.2,1001,1798,52,749,401,10399,-10800.2,27799,1,9000,120000},
|
||||
__values = {0,1.7,2,1,-2.2,1,4,4.2,1.2,-2.2,3,7,4,6,4,2,4,2,1,9,7,1,19,1,80,120,1.7,3,1.21,38,160,78,602,600,200,1151,449,-1800.2,1001,1798,52,749,401,10399,-10800.2,27799,1,9000,120000},
|
||||
__exVals = {4,'0',.9,'在探索地图中获得炼造配方后,可以制作更强大的装备。#熔炼矿石而得的铁锭,是锻造装备必不可少的材料。#添加符文可以使得锻造的装备属性更好。#可以对一部分属性不满意的装备进行重铸。','在这蝶梦之境里,云梦的力量无处不在。#交予我光辉灵戒,我将用这云梦之力为你祈福。'},
|
||||
__fields = {
|
||||
'Id',
|
||||
|
@ -68,7 +68,7 @@ __defaults = {
|
|||
33,
|
||||
{2,7},
|
||||
{1,1,2,1},
|
||||
36,
|
||||
37,
|
||||
61,
|
||||
69,
|
||||
80,
|
||||
|
@ -114,7 +114,7 @@ __defaults = {
|
|||
{{3,10}},
|
||||
23,
|
||||
18,
|
||||
{37,5},
|
||||
{36,5},
|
||||
{38,39,40,41,42,43,44},
|
||||
{45,46,47,48,49,50,51,52,53,54,55,56,57},
|
||||
3,
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -31,7 +31,7 @@ __refs = {
|
|||
{4,-1,.51,1,-1,.4,3.2,.6,3.2,.99,1,0,-1,.31,7.2,.5,3.2,.2},
|
||||
{3,-1,.7,1,-1,.6,3.2,.4,3.2,.25,3.2,2.1,4.1,4.1,.11,1,.3,-1,.52,1,0,-1,0,13.3,.2,14.3,.7},
|
||||
{5,-2,2,.9,3.2,.4,3.2,-2,.2,3.2,0,3,0,-1,1,.2,-3,2,.91,1,.4,-1,0,1,3.2,2,0,22.2,-1,.2,2,.2,-2,0,-1,2,-2,2,49,-49,50,-50,52,-52,51,-51,4.2,.3,1,.5,-1,51.2,0,3,104,-104,.81,-3,.2,5,0,31.3,.4,1,.3,-3,2,.3,1,-2,0,4,.7},
|
||||
{{{1,1},{2,1,-1,.9,3.2,.4,3.2,1,.2,3.2,0,-1,.3,9.2,.43,116,13,1,-10,9,-109,-20,15,-15,11,-11,20,-20,211,-211,10,-10,213,-213,.41,27.3,.02,34.3,.21,43.3,117,0,-117,.7},{27,1,44,1.2}},{{1,2},{158,-155,19,-16,-3,9,41,-52,4,17,-19,-1,3,-2,201,-197,46,105,-126,-20,-7,-2,0,155,-154,8,-9,7,-6,-2,3,-1,-1,0,9,.2,200,.2,-209,-1,.4,2,.4,4.2,1,8,-9,-1,-2.2,-3,1.2,21.2,.5,-1,1,2.1,4.1,4.1,-2,1.2,.7,9,-10,.3,-3.2,-5,.02,107,-57,-41,-10,0,1,0,1,18,-18,0,1,-2,0,1,4,-3,-3,0,10,41,-50,.2,-1,.7},{27,1,44,1.2}},{{2,1},{3,.86},{1,2,1.2,2,4,1,4,5.3,10,1.2,8,1.41,3,1.2,2.1,10,-2.5,3,1,8,1.4,3,1,23,1,3,1.5,5,1,6,1.7}},{{2,2},{162,-140,-16,-3,50,-50,0,4,56,101,-152,149,-157,-1,.6,1,.4,4.3,0,1,-1,-1,.2,2.1,1,0,11,13,-23,7.3,13.2,3,17,-18,20.3,-2,.4,1,88,-87,-2,0},{1,2,1.2,2,4,1,4,5.3,10,1.2,8,1.41,3,1.2,2.1,10,-2.5,3,1,8,1.4,3,1,23,1,3,1.5,5,1,6,1.7}},{{3,1},{4,.94},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,16,-2.2,4,8,13.3,24,3,1.4,6,1,7,1.6}},{{3,2},{163,-131,-26,-2,49,-45,59,99,-153,149,-158,-1,.4,1,.4,-1,1,0,1,-1,-1,.3,13,26,-37,-2,2,-2,3,16,-18,0,1,-2,0,39,-40,2,107,-105,-3,-1},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,16,-2.2,4,8,13.3,24,3,1.4,6,1,7,1.6}},{{4,1},{5,.24},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.3,27,1.4,15,1.5}},{{4,2},{164,-132,-25,-3,49,-45,61,99,-155,149,-158,.31,1,-1,-1,15,32,-44,-2,3,0,15,-18,0,2,6,-7,118,-113,-7,0},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.3,27,1.4,15,1.5}},{{5,1},{6,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{5,2},{166,-125,-34,-2,48,-44,62,99,-156,149,-159,.31,1,-1,-1,17,33,-46,-3,4,14,-18,0,2},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{6,1},{7,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{6,2},{168,-127,-34,-2,48,-44,64,99,-158,150,-160,1,.4,-1,.4,1,-1,0,3.2,-1,19,46,-60,-3,4,13,-18,0,2},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{7,1},{8,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{7,2},{169,-127,-34,-2,47,-43,64,100,-159,150,-160,.5,-1,.4,1,-1,0,3.2,-1,21,46,-60,-5,5,12,-18,0,3},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{8,1},{9,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{8,2},{170,-128,-34,-2,47,-43,68,99,-162,151,-161,1,.4,-2,.4,2,-2,0,1,-1,0,22,46,-60,-6,5,11,-18,0,3},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{9,1},{10,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{9,2},{171,-123,-40,-1,46,-42,69,99,-163,151,-162,1,.4,-2,.4,2,-2,0,1,-1,0,24,46,-60,-8,6,10,-18,0,3},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{10,1},{11,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{10,2},{172,-124,-39,-2,46,-42,70,100,-165,152,-163,2,.4,-3,.4,3,-3,0,1,-1,0,26,49,-63,-9,6,9,-18,0,4},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{11,1},{12,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{11,2},{173,-124,-40,-1,45,-41,70,101,-166,152,-164,2,.4,-3,.4,3,-3,0,1,-1,0,28,49,-63,-11,7,8,-18,0,4},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{12,1},{13,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{12,2},{174,-125,-40,-1,45,-41,72,101,-168,153,-164,2,.4,-4,.4,4,-4,0,1,-1,0,30,49,-63,-12,-7.2,-18,0,4},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{13,1},{14,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{13,2},{176,-125,-41,-1,44,-40,71,104,-170,153,-165,2,.4,-4,.4,4,-4,0,1,-1,1,31,49,-63,-14,8,6,-18,0,5},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{14,1},{15,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{14,2},{178,-127,-41,-1,44,-40,71,106,-172,154,-166,3,.4,-5,.4,5,-5,0,1,-1,1,32,49,-62,-15,8,5,-18,0,5},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{15,1},{16,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{15,2},{179,-126,138,-19,-163,.4,-5,.4,5,-5,.2,83,-61,-17,9,4,-18,0,5},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{16,1},{17,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{16,2},{180,-127,139,-20,-162,.4,-6,.4,6,-6,.2,84,-60,-18,9,3,-18,0,6},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{17,1},{18,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{17,2},{182,-129,140,-21,-162,.4,-6,.4,6,-6,.2,85,-59,-20,10,2,-18,0,6},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{18,1},{19,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{18,2},{184,-131,143,-24,-161,.4,-7,.4,7,-7,.2,86,-58,-21,10,1,-18,0,6},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{19,1},{20,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{19,2},{185,-132,144,-25,-161,.4,-7,.4,7,-7,.2,103,-73,-23,11,0,-18,0,7},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{20,1},{21,.32},{1,6,11,6,20,1.9,13,2,33,1,2,31,1.4}},{{20,2},{187,-134,145,-26,-161,.4,-7,.6,104,-72,-25,12,-1,-18,0,7},{1,6,11,6,20,1.9,13,2,33,1,2,31,1.4}},{{21,1},{22,.32},{1,6,11,6,20,1.9,13,2,33,1,2,31,1.4}},{{21,2},{189,-136,146,-27,-161,.4,-7,.6,105,-72,-26,13,-2,-18,0,8},{1,6,11,6,20,1.9,13,2,33,1,2,31,1.4}}},
|
||||
{{{1,1},{2,1,-1,.9,3.2,.4,3.2,1,.2,3.2,0,-1,.3,9.2,.43,116,13,1,-10,9,-109,-20,15,-15,11,-11,20,-20,211,-211,10,-10,213,-213,.41,27.3,.02,34.3,.21,43.3,117,0,-117,.7},{27,1,44,1.2}},{{1,2},{158,-155,19,-16,-3,9,41,-52,4,17,-19,-1,3,-2,201,-197,46,105,-126,-20,-7,-2,0,155,-154,8,-9,7,-6,-2,3,-1,-1,0,9,.2,200,.2,-209,-1,.4,2,.4,4.2,1,8,-9,-1,-2.2,-3,1.2,21.2,.5,-1,1,2.1,4.1,4.1,-2,1.2,.7,9,-10,.3,-3.2,-5,.02,107,-57,-41,-10,0,1,0,1,18,-18,0,1,-2,0,1,4,-3,-3,0,109,-58,-50,.2,-1,.7},{27,1,44,1.2}},{{2,1},{3,.86},{1,2,1.2,2,4,1,4,5.3,10,1.2,8,1.41,3,1.2,2.1,10,-2.5,3,1,8,1.4,3,1,23,1,3,1.5,5,1,6,1.7}},{{2,2},{162,-140,-16,-3,50,-50,0,4,56,101,-152,149,-157,-1,.6,1,.4,4.3,0,1,-1,-1,.2,2.1,1,0,11,13,-23,7.3,13.2,3,17,-18,20.3,-2,.4,1,88,-87,-2,0},{1,2,1.2,2,4,1,4,5.3,10,1.2,8,1.41,3,1.2,2.1,10,-2.5,3,1,8,1.4,3,1,23,1,3,1.5,5,1,6,1.7}},{{3,1},{4,.94},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,16,-2.2,4,8,13.3,24,3,1.4,6,1,7,1.6}},{{3,2},{163,-131,-26,-2,49,-45,59,99,-153,149,-158,-1,.4,1,.4,-1,1,0,1,-1,-1,.3,13,26,-37,-2,2,-2,3,16,-18,0,1,-2,0,39,-40,2,107,-105,-3,-1},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,16,-2.2,4,8,13.3,24,3,1.4,6,1,7,1.6}},{{4,1},{5,.24},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.3,27,1.4,15,1.5}},{{4,2},{164,-132,-25,-3,49,-45,61,99,-155,149,-158,.31,1,-1,-1,15,32,-44,-2,3,0,15,-18,0,2,6,-7,118,-113,-7,0},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.3,27,1.4,15,1.5}},{{5,1},{6,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{5,2},{166,-125,-34,-2,48,-44,62,99,-156,149,-159,.31,1,-1,-1,17,33,-46,-3,4,14,-18,0,2},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{6,1},{7,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{6,2},{168,-127,-34,-2,48,-44,64,99,-158,150,-160,1,.4,-1,.4,1,-1,0,3.2,-1,19,46,-60,-3,4,13,-18,0,2},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{7,1},{8,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{7,2},{169,-127,-34,-2,47,-43,64,100,-159,150,-160,.5,-1,.4,1,-1,0,3.2,-1,21,46,-60,-5,5,12,-18,0,3},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{8,1},{9,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{8,2},{170,-128,-34,-2,47,-43,68,99,-162,151,-161,1,.4,-2,.4,2,-2,0,1,-1,0,22,46,-60,-6,5,11,-18,0,3},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{9,1},{10,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{9,2},{171,-123,-40,-1,46,-42,69,99,-163,151,-162,1,.4,-2,.4,2,-2,0,1,-1,0,24,46,-60,-8,6,10,-18,0,3},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{10,1},{11,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{10,2},{172,-124,-39,-2,46,-42,70,100,-165,152,-163,2,.4,-3,.4,3,-3,0,1,-1,0,26,49,-63,-9,6,9,-18,0,4},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{11,1},{12,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{11,2},{173,-124,-40,-1,45,-41,70,101,-166,152,-164,2,.4,-3,.4,3,-3,0,1,-1,0,28,49,-63,-11,7,8,-18,0,4},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{12,1},{13,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{12,2},{174,-125,-40,-1,45,-41,72,101,-168,153,-164,2,.4,-4,.4,4,-4,0,1,-1,0,30,49,-63,-12,-7.2,-18,0,4},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{13,1},{14,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{13,2},{176,-125,-41,-1,44,-40,71,104,-170,153,-165,2,.4,-4,.4,4,-4,0,1,-1,1,31,49,-63,-14,8,6,-18,0,5},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{14,1},{15,.53},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{14,2},{178,-127,-41,-1,44,-40,71,106,-172,154,-166,3,.4,-5,.4,5,-5,0,1,-1,1,32,49,-62,-15,8,5,-18,0,5},{1,2,1.2,2,9,3.2,4,-10.2,1.9,9,1,3,1.2,24,8,11.2,31,1.4}},{{15,1},{16,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{15,2},{179,-126,138,-19,-163,.4,-5,.4,5,-5,.2,83,-61,-17,9,4,-18,0,5},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{16,1},{17,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{16,2},{180,-127,139,-20,-162,.4,-6,.4,6,-6,.2,84,-60,-18,9,3,-18,0,6},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{17,1},{18,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{17,2},{182,-129,140,-21,-162,.4,-6,.4,6,-6,.2,85,-59,-20,10,2,-18,0,6},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{18,1},{19,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{18,2},{184,-131,143,-24,-161,.4,-7,.4,7,-7,.2,86,-58,-21,10,1,-18,0,6},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{19,1},{20,.52},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{19,2},{185,-132,144,-25,-161,.4,-7,.4,7,-7,.2,103,-73,-23,11,0,-18,0,7},{1,6,11,6,20,1.9,9,1,3,2,33,1,2,31,1.4}},{{20,1},{21,.32},{1,6,11,6,20,1.9,13,2,33,1,2,31,1.4}},{{20,2},{187,-134,145,-26,-161,.4,-7,.6,104,-72,-25,12,-1,-18,0,7},{1,6,11,6,20,1.9,13,2,33,1,2,31,1.4}},{{21,1},{22,.32},{1,6,11,6,20,1.9,13,2,33,1,2,31,1.4}},{{21,2},{189,-136,146,-27,-161,.4,-7,.6,105,-72,-26,13,-2,-18,0,8},{1,6,11,6,20,1.9,13,2,33,1,2,31,1.4}}},
|
||||
{{{1},{217,.82,-1,0,1,.12,-13,.4,13,0,-13,13,.13,3.2,6.2,.2,13,.6,10.3,-3,3,23.3,.51}},{{2},{2,0,1,.01,-1,.2},{30,1,23,1.4,3,33,3,1.2,8,33,2,1}}}
|
||||
},
|
||||
__refPoss = {
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -2,7 +2,7 @@ local ThemeActivityTaskConfig = {
|
|||
__count = 443,
|
||||
__indexs = {21,1.9,49971,1.41,86,2.1,4.3,686,8.7,648705,1.31,17,1.4,966,4.1,8.1,8.7,1294947,1.41,9986,1.21,89988,1.42,899976,1.41,99986,1.21,99988,4.2,1.42,99976,8.7,301976,1.9},
|
||||
__values = {0,1.01,-2.2,1.2,3,1,2,6,5.2,2,1,4,10,4,6,1,4,-2.2,4,2,1.2,2,1,3,4,3,10,3,5,9,3.1,1,2,13,10,-40.2,10,30,20,50,150,400,101,1,2,-3.2,1.01,7,40,433,500,1000,5001,-100.2,200,3600,7999,3,97,900,700,300,3001,1078,2,920,2999,-1000.7,2010,1010,9980,1.3,2,98,-100.2,700,-100.3,8698,407,78,6515,3001,3,97,2.1,4.1,4.3,1496,2000,3000,1,4001,18997,900000,5000007,2,13,5,13,4,45,21,5},
|
||||
__exVals = {110,'40010162','40010166','40010112','40010135','40010136','40010137','40010138','40010139','40010140','40010141','40010142','40010154','40010155','40010156','40010157','40010158','40010159','40010295','40010291','累计<color=#ffd12b><size=42><b>120</b></size></color>任务积分','累计<color=#ffd12b><size=42><b>160</b></size></color>任务积分','累计<color=#ffd12b><size=42><b>200</b></size></color>任务积分','累计<color=#ffd12b><size=42><b>240</b></size></color>任务积分','40010288','40010289','40010290','40010292','40010293','40010294','40010296','40010297','40010298','40010299','40010130','40010131','40010132','40010133','40010134','40010277','40010280','累计<color=#ffd12b><size=42><b>40</b></size></color>任务积分','累计<color=#ffd12b><size=42><b>80</b></size></color>任务积分','累计<color=#ffd12b><size=42><b>280</b></size></color>任务积分','40010105','40010113','40010129','40010275','40010276','40010278','40010279','40010300','40010301','40010302','40010303','40010304','40010305','40010306','40010307','40010122','40010123','40010308','40010309','40010310','40010311','40010312','40010313','40010314','40010315','40010316','40010317','40010318','40010319','40010163','40010164','40010165','40010167','40010321','40010322','40010323','40010324','累计<color=#ffd12b><size=42><b>30</b></size></color>任务积分','累计<color=#ffd12b><size=42><b>60</b></size></color>任务积分','累计<color=#ffd12b><size=42><b>90</b></size></color>任务积分','40010106','40010107','40010108','40010109','40010110','40010111','40010114','40010168','40010169','40010170','40010171','40010172','40010173','40010174','40010325','40010326','40010327','40010328','40010329','40010330','40010331','40010332','40010333','40010334','40010335','40010336','40010337'},
|
||||
__exVals = {110,'40010162','40010166','40010112','40010135','40010136','40010137','40010138','40010139','40010140','40010141','40010142','40010154','40010155','40010156','40010157','40010158','40010159','40010295','40010291','1013014','1013015','1013016','1013017','40010288','40010289','40010290','40010292','40010293','40010294','40010296','40010297','40010298','40010299','40010130','40010131','40010132','40010133','40010134','40010277','40010280','1013012','1013013','1013018','40010105','40010113','40010129','40010275','40010276','40010278','40010279','40010300','40010301','40010302','40010303','40010304','40010305','40010306','40010307','40010122','40010123','40010308','40010309','40010310','40010311','40010312','40010313','40010314','40010315','40010316','40010317','40010318','40010319','40010163','40010164','40010165','40010167','40010321','40010322','40010323','40010324','1013019','1013020','1013021','40010106','40010107','40010108','40010109','40010110','40010111','40010114','40010168','40010169','40010170','40010171','40010172','40010173','40010174','40010325','40010326','40010327','40010328','40010329','40010330','40010331','40010332','40010333','40010334','40010335','40010336','40010337'},
|
||||
__fields = {
|
||||
'Id',
|
||||
'ActivityId',
|
||||
|
|
|
@ -225,14 +225,14 @@ function this.RequestPay(context)
|
|||
if result == SDK_RESULT.SUCCESS then
|
||||
DataCenterManager.CommitPayStatus(
|
||||
"IN_GAME_"..context.Type,
|
||||
SDKMgr:GetPayOrderID(),
|
||||
orderId,
|
||||
"VALID",
|
||||
tostring(context.Price)
|
||||
)
|
||||
elseif result == SDK_RESULT.FAILED then
|
||||
DataCenterManager.CommitPayStatus(
|
||||
"IN_GAME_"..context.Type,
|
||||
SDKMgr:GetPayOrderID(),
|
||||
orderId,
|
||||
"INVALID",
|
||||
tostring(context.Price)
|
||||
)
|
||||
|
|
|
@ -38,7 +38,7 @@ function SettingInfo:InitComponent(gameObject)
|
|||
this.btnCustomerService = Util.GetGameObject(gameObject, "btn/customerService")--客服中心
|
||||
this.btnRelation = Util.GetGameObject(gameObject, "btn/relation")--账号关联
|
||||
this.btnAccountCancellation = Util.GetGameObject(gameObject, "btn/accountCancellation")--账号注销
|
||||
this.submit = Util.GetGameObject(gameObject, "btn/discord")--社交软件
|
||||
this.submit = Util.GetGameObject(gameObject, "btn/submit")--社交软件
|
||||
this.bind = Util.GetGameObject(gameObject, "btn/bind")--绑定
|
||||
this.community = Util.GetGameObject(gameObject, "btn/community")--社区
|
||||
|
||||
|
|
Loading…
Reference in New Issue